nano.c:main() - Fixed off by one when checking for MAIN_LIST_LEN. Ugh.

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

diff --git a/ChangeLog b/ChangeLog
index 9224a437433d599670f3315c233b3c62a6874785..21bffd8b6d179cbfc00f5928cc08c8b42cfb1c6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@ CVS code -
          goofy logic setting x pos to value of last line when hitting the
          beginning of first line, prog should simply abort.  Added
          the #ifdefs around the code in main().
+  main()
+       - Fixed off by one when checking for MAIN_LIST_LEN. Ugh.
 - rcfile.c:
        - Fix incorrect number of rc options (David Lawrence Ramsey).
 - po/sv.po:

diff --git a/nano.c b/nano.c
index 87d16a5391f2b24e0ecec674b8eefd6fd3facdab..f0006fb203c91528209925a67e3467f5ba072973 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -3115,7 +3115,7 @@ int main(int argc, char *argv[])
 
        /* Look through the main shortcut list to see if we've hit a
           shortcut key */
-       for (i = 0; i < MAIN_LIST_LEN && !keyhandled; i++) {
+       for (i = 0; i < MAIN_LIST_LEN  - 1 && !keyhandled; i++) {
            if (kbinput == main_list[i].val ||
                (main_list[i].misc1 && kbinput == main_list[i].misc1) ||
                (main_list[i].misc2 && kbinput == main_list[i].misc2)) {
@@ -3167,8 +3167,8 @@ int main(int argc, char *argv[])
 #endif
 #endif
 
-#ifndef NANO_SMALL
            case 0:             /* Erg */
+#ifndef NANO_SMALL
                do_next_word();
                break;
 #endif