407 == ^z fix, get rid of unusaed variables

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1074 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index a6daa396274b415282f006869a5777329e29fda8..bc8ca9321a3441e8de6f8abf8a4370c3e875057b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@ CVS code -
 - nano.c:
   help_init()
        - Added message re: having multiple blank buffers (DLR).
+  main()
+       - Add 407 as equiv of 26, this seems to be sent when using
+         ^Z in linux console with keypad() enabled.
 - winio.c:
   do_cursorpos()
        - Rewritten to show col place as well as charcter place, without

diff --git a/nano.c b/nano.c
index de8da4c4b80e62b91419b015a35cf3fdb2cf23c3..105ceedf301c45eb7b19f77b1215ee8a13879b1d 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -2711,7 +2711,7 @@ int main(int argc, char *argv[])
     int kbinput;               /* Input from keyboard */
     long startline = 0;                /* Line to try and start at */
     int keyhandled;            /* Have we handled the keystroke yet? */
-    int i, modify_control_seq;
+    int modify_control_seq;
     char *argv0;
     shortcut *s;
     toggle *t;
@@ -3277,8 +3277,9 @@ int main(int argc, char *argv[])
        if (kbinput == 17 || kbinput == 19)
            keyhandled = 1;
 
-       /* Catch ^Z by hand when triggered also */
-       if (kbinput == 26) {
+       /* Catch ^Z by hand when triggered also 
+          407 == ^Z in Linux console when keypad() is used? */
+       if (kbinput == 26 || kbinput == 407) {
            if (ISSET(SUSPEND))
                do_suspend(0);
            keyhandled = 1;

diff --git a/winio.c b/winio.c
index 4a1f0c292f4127d906aec2b2e1431d1d0f24ddf2..7c5c7b143dda82bb34433e0a05aaab18a6c11c0c 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -261,7 +261,7 @@ void nanoget_repaint(char *buf, char *inputbuf, int x)
 int nanogetstr(int allowtabs, char *buf, char *def, shortcut *s,
               int start_x, int list)
 {
-    int kbinput = 0, j = 0, x = 0, xend, slen;
+    int kbinput = 0, x = 0, xend, slen;
     int x_left = 0, inputlen, tabbed = 0;
     char *inputbuf;
     shortcut *t;
@@ -598,7 +598,7 @@ void clear_bottomwin(void)
 
 void bottombars(shortcut *s)
 {
-    int i, j, k;
+    int i, k;
     char keystr[10];
     shortcut *t;
     int slen;
@@ -1310,7 +1310,7 @@ int statusq(int tabs, shortcut *s, char *def, char *msg, ...)
 {
     va_list ap;
     char foo[133];
-    int ret, slen;
+    int ret;
 
 #ifndef DISABLE_TABCOMP
     int list = 0;
@@ -1669,7 +1669,6 @@ int do_help(void)
     int i, j, row = 0, page = 1, kbinput = 0, no_more = 0, kp, kp2;
     int no_help_flag = 0;
     shortcut *oldshortcut;
-    int oldslen;
 
     blank_edit();
     curs_set(0);