Index: global.c =================================================================== --- global.c (revision 4518) +++ global.c (working copy) @@ -149,11 +149,10 @@ /* The global list of color syntaxes. */ char *syntaxstr = NULL; /* The color syntax name specified on the command line. */ - #endif bool edit_refresh_needed = NULL; - /* Did a command mangle enough of the buffer refresh that we + /* Did a command mangle enough of the buffer refresh that we should repaint the screen */ const shortcut *currshortcut; @@ -226,8 +225,8 @@ return RAW; } -/* Add a string to the new function list strict. - Does not allow updates, yet anyway */ +/* Add a string to the function list struct. + Does not allow updates, not yet anyway. */ void add_to_funcs(short func, int menus, const char *desc, const char *help, bool blank_after, bool viewok) { @@ -327,8 +326,8 @@ } /* Return the given menu's first shortcut sequence, or the default value - (2nd arg). Assumes currmenu for the menu to check*/ -int sc_seq_or (short func, int defaultval) + (2nd arg). Assumes currmenu for the menu to check. */ +int sc_seq_or (short func, int defaultval) { const sc *s = first_sc_for(currmenu, func); @@ -339,8 +338,8 @@ } -/* Assign the info to the shortcut struct - Assumes keystr is already assigned, naturally */ +/* Assign the info to the shortcut struct. + Assumes keystr is already assigned, naturally. */ void assign_keyinfo(sc *s) { if (s->type == CONTROL) { @@ -392,7 +391,6 @@ } #ifdef DEBUG - void print_sclist(void) { sc *s; @@ -405,7 +403,6 @@ else fprintf(stderr, "Hmm, didnt find a func for \"%s\"\n", s->keystr); } - } #endif @@ -707,7 +704,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); @@ -758,7 +754,6 @@ add_to_funcs(DO_REPLACE, (MMAIN|MWHEREIS), replace_msg, IFSCHELP(nano_replace_msg), - #ifndef NANO_TINY FALSE, #else @@ -767,8 +762,7 @@ NOVIEW); #ifndef NANO_TINY - - add_to_funcs(DO_MARK, MMAIN, N_("Mark Text"), + add_to_funcs(DO_MARK, MMAIN, N_("Mark Text"), IFSCHELP(nano_mark_msg), FALSE, VIEW); add_to_funcs(DO_RESEARCH, (MMAIN|MBROWSER), whereis_next_msg, @@ -790,7 +784,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), @@ -907,7 +900,7 @@ IFSCHELP(nano_wordcount_msg), FALSE, VIEW); #endif - add_to_funcs(TOTAL_REFRESH, (MMAIN|MHELP), refresh_msg, + add_to_funcs(TOTAL_REFRESH, (MMAIN|MHELP), refresh_msg, IFSCHELP(nano_refresh_msg), FALSE, VIEW); add_to_funcs(DO_SUSPEND_VOID, MMAIN, suspend_msg, @@ -999,22 +992,19 @@ insert_file_msg, IFSCHELP(nano_insert_msg), FALSE, VIEW); #ifdef ENABLE_MULTIBUFFER - add_to_funcs( NEW_BUFFER_MSG, MEXTCMD, + add_to_funcs( NEW_BUFFER_MSG, MEXTCMD, new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW); #endif -#endif +#endif /* NANO_TINY */ #ifndef DISABLE_HELP add_to_funcs( REFRESH_MSG, 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( FIRST_FILE_MSG, (MBROWSER|MWHEREISFILE), first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW); @@ -1416,7 +1394,7 @@ #ifndef DISABLE_HELP if (!strcasecmp(input, "help")) s->scfunc = DO_HELP_VOID; - else + else #endif if (!strcasecmp(input, "cancel")) { s->scfunc = CANCEL_MSG; @@ -1654,7 +1632,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"))