From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 14 Jan 2016 14:44:11 +0000 (+0000)
Subject: Showing a key only when it was rebound.
X-Git-Tag: v2.5.2~73
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=63370954bd79d1d24f4060f1eeb2e383dbc3d040;p=nano.git

Showing a key only when it was rebound.


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

diff --git a/ChangeLog b/ChangeLog
index b6825ed8..4524b33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	some wrappings and whitespace.
 	* src/proto.h: Delete two duplicate declarations.
 	* src/rcfile.c (check_bad_binding): Elide this unneeded function.
+	* src/rcfile.c (parse_binding): Show key only when it was rebound.
 
 2016-01-13  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (save_poshistory): Reduce the indentation.
diff --git a/src/rcfile.c b/src/rcfile.c
index b4c1a29a..7223cba5 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -525,10 +525,6 @@ void parse_binding(char *ptr, bool dobind)
 	newsc->menus = menu;
 	newsc->type = strtokeytype(newsc->keystr);
 	assign_keyinfo(newsc);
-#ifdef DEBUG
-	fprintf(stderr, "s->keystr = \"%s\"\n", newsc->keystr);
-	fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq);
-#endif
 
 	/* Do not allow rebinding the equivalent of the Escape key. */
 	if (newsc->type == META && newsc->seq == 91) {
@@ -536,6 +532,10 @@ void parse_binding(char *ptr, bool dobind)
 	    free(newsc);
 	    goto free_copy;
 	}
+#ifdef DEBUG
+	fprintf(stderr, "s->keystr = \"%s\"\n", newsc->keystr);
+	fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq);
+#endif
     }
 
     /* Now find and delete any existing same shortcut in the menu(s). */