Dropping the obsolete argument of shortcut_init(),

and removing two unneeded calls of this function.

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

diff --git a/ChangeLog b/ChangeLog
index 1f975d33599ee11fb4bd3de5c87117868b43ff9f..2611d9694557b106b4c91eeb48bb4454d809bb68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
        the functions and shortcuts lists before and after every Justify.
        Also, look for ^U only in the main menu, to which ^W M-J factually
        returns and which shortcut_init() "sneakily" sets.
+       * src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete
+       argument of shortcut_init(), and remove two unneeded calls of it.
 
 2014-04-06  Benno Schulenberg  <bensberg@justemail.net>
        * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to

diff --git a/src/files.c b/src/files.c
index 537e75a20de7020e5dd5dcfadd3b5594846cce46..fd4a966998bec7f5e2ff250be4b1a64df2f071d2 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1277,8 +1277,6 @@ void do_insertfile(
            break;
        }
     }
-    shortcut_init(FALSE);
-
     free(ans);
 }
 

diff --git a/src/global.c b/src/global.c
index 4c7d689bd3f262ff9ca34f2b37866f8483f607fd..e074bef0ef27f753b4408bbfda5e6c598fee130b 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -544,9 +544,8 @@ const char *new_buffer_msg = N_("New Buffer");
 #endif
 
 
-/* Initialize all shortcut lists.  If unjustify is TRUE, replace
- * the Uncut shortcut in the main shortcut list with UnJustify. */
-void shortcut_init(bool unjustify)
+/* Initialize the list of functions and the list of shortcuts. */
+void shortcut_init(void)
 {
     /* TRANSLATORS: Try to keep the following strings at most 10 characters. */
     const char *get_help_msg = N_("Get Help");

diff --git a/src/nano.c b/src/nano.c
index b2a6cbe0bc2a3cf069eed2e5ce238b47044fb488..de3b5c819728d5bbf0a4878db0ed52c5596b4510 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1127,7 +1127,6 @@ void do_exit(void)
     } else if (i != 1)
        statusbar(_("Cancelled"));
 
-    shortcut_init(FALSE);
     display_main_list();
 }
 
@@ -1710,9 +1709,6 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
                            {
                                s->scfunc();
 #ifndef DISABLE_COLOR
-                               /* The command might have re-initialized shortcuts,
-                                * in which case f is now invalid.  Let's reload it. */
-                               f = sctofunc((sc *) s);
                                if (f && !f->viewok && openfile->syntax != NULL
                                        && openfile->syntax->nmultis > 0) {
                                    reset_multis(openfile->current, FALSE);
@@ -2407,9 +2403,9 @@ int main(int argc, char **argv)
 #endif
     }
 
-    /* Set up the shortcut lists.
-     * Need to do this before the rcfile. */
-    shortcut_init(FALSE);
+    /* Set up the function and shortcut lists.  This needs to be done
+     * before reading the rcfile, to be able to rebind/unbind keys. */
+    shortcut_init();
 
 /* We've read through the command line options.  Now back up the flags
  * and values that are set, and read the rcfile(s).  If the values

diff --git a/src/proto.h b/src/proto.h
index 801e14bf20030a453f60a6f64b5fbee2d39a626d..9a816604e7c2d645f237e5b8ceccabd581b3faf5 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -357,7 +357,7 @@ void sc_init_one(shortcut **shortcutage, int ctrlval, const char *desc
 #endif
        , int metaval, int funcval, int miscval, bool view, void
        (*func)(void));
-void shortcut_init(bool unjustify);
+void shortcut_init(void);
 #ifdef DEBUG
 void thanks_for_all_the_fish(void);
 #endif

diff --git a/src/rcfile.c b/src/rcfile.c
index c3798b6879c9c4d15ae37557fa3200fb9ae8c40a..f8297a9b0a6a863dbcab7d1e4c224a1f024b497f 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1281,9 +1281,9 @@ void parse_rcfile(FILE *rcstream
                else
                    rcfile_error(N_("Cannot unset flag \"%s\""),
                        rcopts[i].name);
-               /* Looks like we still need this specific hack for undo */
+               /* If undo/redo was enabled, reinitialize the lists. */
                if (strcasecmp(rcopts[i].name, "undo") == 0)
-                   shortcut_init(0);
+                   shortcut_init();
                break;
            }
        }