Index: src/global.c
===================================================================
--- src/global.c	(revision 4563)
+++ src/global.c	(working copy)
@@ -443,7 +443,6 @@
 }
 
 #ifdef DEBUG
-
 void print_sclist(void)
 {
     sc *s;
@@ -456,13 +455,12 @@
 	else
 	    fprintf(stderr, "Hmm, didnt find a func for \"%s\"\n", s->keystr);
     }
-
 }
 #endif
 
 
 /* Stuff we need to make at least static here so we can access it below */
-/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
+/* TRANSLATORS: Try to keep the next six strings at most 10 characters. */
 const char *cancel_msg = N_("Cancel");
 const char *replace_msg = N_("Replace");
 const char *no_replace_msg = N_("No Replace");
@@ -498,7 +496,7 @@
 const char *ext_cmd_msg = "";
 
 #else
-/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
+/* TRANSLATORS: Try to keep the next three strings at most 10 characters. */
 const char *prev_history_msg = N_("PrevHstory");
 const char *next_history_msg = N_("NextHstory");
 const char *gototext_msg = N_("Go To Text");
@@ -548,11 +546,11 @@
     const char *go_to_line_msg = N_("Go To Line");
 
 #ifndef DISABLE_JUSTIFY
+    /* TRANSLATORS: The next long series of strings are shortcut descriptions;
+     * they are best kept shorter than 56 characters, but may be longer. */
     const char *nano_justify_msg = N_("Justify the current paragraph");
 #endif
 #ifndef DISABLE_HELP
-    /* TRANSLATORS: The next long series of strings are shortcut descriptions;
-     * they are best kept shorter than 56 characters, but may be longer. */
     const char *nano_cancel_msg = N_("Cancel the current function");
     const char *nano_help_msg = N_("Display this help text");
     const char *nano_exit_msg =
@@ -759,7 +757,6 @@
     add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
 	next_page_msg, IFSCHELP(nano_nextpage_msg), TRUE, VIEW);
 
-
     /* TRANSLATORS: Try to keep this at most 10 characters. */
     add_to_funcs(do_cut_text_void, MMAIN, N_("Cut Text"), IFSCHELP(nano_cut_msg),
 	FALSE, NOVIEW);
@@ -807,9 +804,7 @@
 	FALSE, VIEW);
 #endif
 
-
     add_to_funcs(do_replace, (MMAIN|MWHEREIS), replace_msg, IFSCHELP(nano_replace_msg),
-
 #ifndef NANO_TINY
 	FALSE,
 #else
@@ -818,7 +813,6 @@
 	NOVIEW);
 
 #ifndef NANO_TINY
-
     add_to_funcs(do_mark, MMAIN, N_("Mark Text"),
 	IFSCHELP(nano_mark_msg), FALSE, VIEW);
 
@@ -841,7 +835,6 @@
 	add_to_funcs(do_redo, MMAIN, N_("Redo"),
 	    IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
     }
-
 #endif
 
     add_to_funcs(do_right, MMAIN, N_("Forward"), IFSCHELP(nano_forward_msg),
@@ -865,11 +858,11 @@
     add_to_funcs(do_left, MALL, "", "", FALSE, VIEW);
 
 #ifndef NANO_TINY
-    add_to_funcs(do_next_word_void, MMAIN, N_("Next Word"),
-	IFSCHELP(nano_nextword_msg), FALSE, VIEW);
-
     add_to_funcs(do_prev_word_void, MMAIN, N_("Prev Word"),
 	IFSCHELP(nano_prevword_msg), FALSE, VIEW);
+
+    add_to_funcs(do_next_word_void, MMAIN, N_("Next Word"),
+	IFSCHELP(nano_nextword_msg), FALSE, VIEW);
 #endif
 
     add_to_funcs(do_up_void, (MMAIN|MHELP|MBROWSER), N_("Prev Line"),
@@ -1050,22 +1043,19 @@
 	insert_file_msg, IFSCHELP(nano_insert_msg), FALSE, VIEW);
 
 #ifdef ENABLE_MULTIBUFFER
-     add_to_funcs( new_buffer_void, MEXTCMD,
+    add_to_funcs( new_buffer_void, MEXTCMD,
 	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
 #endif
-#endif
+#endif /* NANO_TINY */
 
 #ifndef DISABLE_HELP
     add_to_funcs(edit_refresh, MHELP,
 	refresh_msg, nano_refresh_msg, FALSE, VIEW);
 
     add_to_funcs(do_exit, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
-
-
 #endif
 
 #ifndef DISABLE_BROWSER
-
     add_to_funcs(do_first_file,
 	(MBROWSER|MWHEREISFILE),
 	first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW);
@@ -1588,7 +1577,7 @@
 }
 
 #ifdef ENABLE_NANORC
-/* Same thing as abnove but for the menu */
+/* Same thing as above but for the menu */
 int strtomenu(char *input)
 {
     if (!strcasecmp(input, "all"))