From cda06a9491d9db2f9fc9236444f87e06fd463abd Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 22 Jun 2014 19:17:02 +0000
Subject: [PATCH] Removing two pointless calls of get_shortcut(), and adjusting
the comments.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5009 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 4 ++++
src/browser.c | 9 ++-------
src/help.c | 8 ++------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 86976ecc..8a032bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-22 Benno Schulenberg <bensberg@justemail.net>
+ * src/browser.c (parse_browser_input), src/help.c (parse_help_input):
+ Remove two pointless calls of get_shortcut(), and adjust the comments.
+
2014-06-22 Mark Majeres <mark@engine12.com>
* src/text.c (do_redo): When redoing a line join at the tail
of the file, make sure openfile->filebot is updated.
diff --git a/src/browser.c b/src/browser.c
index b1e7d725..9fb30d90 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -532,15 +532,10 @@ void browser_init(const char *path, DIR *dir)
width = longest;
}
-/* Determine the shortcut key corresponding to the values of kbinput
- * (the key itself) and meta_key (whether the key is a meta sequence).
- * Also convert certain non-shortcut keys into their corresponding
- * shortcut keys. */
+/* Convert certain non-shortcut keys into their corresponding shortcut
+ * sequences, for compatibility with Pico. */
void parse_browser_input(int *kbinput, bool *meta_key)
{
- get_shortcut(MBROWSER, kbinput, meta_key);
-
- /* Pico compatibility. */
if (!*meta_key) {
switch (*kbinput) {
case ' ':
diff --git a/src/help.c b/src/help.c
index 3ec70b81..09f97871 100644
--- a/src/help.c
+++ b/src/help.c
@@ -479,14 +479,10 @@ void help_init(void)
assert(strlen(help_text) <= allocsize + 1);
}
-/* Determine the shortcut key corresponding to the values of kbinput
- * (the key itself) and meta_key (whether the key is a meta sequence).
- * Also convert certain non-shortcut keys into their corresponding
- * shortcut keys. */
+/* Convert certain non-shortcut keys into their corresponding shortcut
+ * sequences. */
void parse_help_input(int *kbinput, bool *meta_key)
{
- get_shortcut(MHELP, kbinput, meta_key);
-
if (!*meta_key) {
switch (*kbinput) {
/* For consistency with the file browser. */
--
GitLab