From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 27 Jun 2015 15:58:20 +0000 (+0000)
Subject: Removing a duplicate binding of ^T, to prevent it being shown twice.
X-Git-Tag: v2.4.2~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=954f98c448935b01ddec06e9d162d868f3e214c7;p=nano.git

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 e5d5c8fa..547efcca 100644
--- 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 f1477308..cd7f23f0 100644
--- 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);