Eliding a variable and condensing a comment.

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

diff --git a/ChangeLog b/ChangeLog
index cd8314023d0201cc6efb718d1b0b3f129bed3cd3..e1fca29a37c947492bcd619169b0cb0e3069b007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * src/*: Remove the unused parameter 'func_key' from get_shortcut(),
        and subsequently from parse_browser_input() and parse_help_input().
        * src/*: Whitespace adjustments, plus a few comment tweaks.
+       * src/winio.c (getfuncfromkey): Elide variable and condense comment.
 
 2014-04-13  Benno Schulenberg  <bensberg@justemail.net>
        * proto.h, global.c, rcfile.c: Remove the unused parameter 'menu'

diff --git a/src/winio.c b/src/winio.c
index a4f8d4ea76248b3f6132eb308025bd81a66e74c4..7c5f6fb86cbcab4a3190bc9d46d4d751009f40d7 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -1793,15 +1793,12 @@ const sc *get_shortcut(int menu, int *kbinput, bool *meta_key)
     return NULL;
 }
 
-/* Try to get a function back from a window.  Just a wrapper
- * functions need to create a function_key meta_key blah blah
- * menu - what menu name to look through for valid funcs. */
+/* Try to get a function back from a window.  Just a wrapper. */
 const subnfunc *getfuncfromkey(WINDOW *win)
 {
     int kbinput;
     bool func_key = FALSE, meta_key = FALSE;
     const sc *s;
-    const subnfunc *f;
 
     kbinput = parse_kbinput(win, &meta_key, &func_key);
     if (kbinput == 0)
@@ -1811,9 +1808,7 @@ const subnfunc *getfuncfromkey(WINDOW *win)
     if (!s)
        return NULL;
 
-    f = sctofunc((sc *) s);
-    return f;
-
+    return sctofunc((sc *) s);
 }
 
 /* Move to (x, y) in win, and display a line of n spaces with the