Removing a duplicate binding of ^T, to prevent it being shown twice.

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

diff --git a/ChangeLog b/ChangeLog
index e5d5c8fa3a94f8280ed16adcda4bffac1053f054..547efccaf7e179870b9881f4253212cf516bd7d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
        first action after this function is to restore the cursor position.
        * src/files.c: Normalize whitespace and comments.
        * src/nano.h: Remove obsolete execute flag from the shortcut struct.
+       * src/global.c (shortcut_init): Remove a duplicate binding of ^T, to
+       prevent it being shown twice in the ^G help text.  It will be rebound
+       dynamically when for the current syntax another function is available.
 
 2015-06-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (edit_draw): Verify that there exists multidata for the

diff --git a/src/global.c b/src/global.c
index f1477308672f63115b80211270b2be37ff46fe58..cd7f23f00a0933f179bda7d459145bac5a40dbb4 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1015,10 +1015,6 @@ void shortcut_init(void)
 #ifndef DISABLE_SPELLER
     add_to_sclist(MMAIN, "^T", do_spell, 0);
     add_to_sclist(MMAIN, "F12", do_spell, 0);
-#ifndef DISABLE_COLOR
-    add_to_sclist(MMAIN, "^T", do_formatter, 0);
-    add_to_sclist(MMAIN, "F12", do_formatter, 0);
-#endif
 #else
 #ifndef DISABLE_COLOR
     add_to_sclist(MMAIN, "^T", do_linter, 0);