From 104ea6b0c306ce8bad0e08bc84d50a278ad1c582 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 30 Jul 2015 11:29:45 +0000 Subject: [PATCH] Normalizing whitespace after the preceding changes. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5330 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/global.c | 33 ++++++++++++++++----------------- src/nano.c | 35 ++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0e566bd..674877ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2015-07-30 Benno Schulenberg * src/global.c (shortcut_init): Don't show ^R and ^T in the help lines in restricted mode (if possible), to give visual feedback. + * src/*.c: Normalize the whitespace after the preceding changes. 2015-07-29 Benno Schulenberg * src/text.c (do_linter): When the linter is called in restricted mode diff --git a/src/global.c b/src/global.c index 07170c45..ad62d876 100644 --- a/src/global.c +++ b/src/global.c @@ -692,19 +692,19 @@ void shortcut_init(void) * keep the help items nicely paired also in restricted mode. */ if (TRUE) { #endif - add_to_funcs(do_insertfile_void, MMAIN, - read_file_tag, IFSCHELP(nano_insert_msg), BLANKAFTER, + add_to_funcs(do_insertfile_void, MMAIN, + read_file_tag, IFSCHELP(nano_insert_msg), BLANKAFTER, /* We allow inserting files in view mode if multibuffer mode * is switched on, so that we can view multiple files. */ #ifndef DISABLE_MULTIBUFFER - VIEW); + VIEW); #else - NOVIEW); + NOVIEW); #endif } else { #ifndef DISABLE_JUSTIFY - add_to_funcs(do_justify_void, MMAIN, - N_("Justify"), IFSCHELP(nano_justify_msg), BLANKAFTER, NOVIEW); + add_to_funcs(do_justify_void, MMAIN, + N_("Justify"), IFSCHELP(nano_justify_msg), BLANKAFTER, NOVIEW); #endif } @@ -741,26 +741,25 @@ void shortcut_init(void) /* Remember the entry for Uncut, to be able to replace it with Unjustify. */ uncutfunc = tailfunc; -if (!ISSET(RESTRICTED)) { + if (!ISSET(RESTRICTED)) { #ifndef DISABLE_JUSTIFY - add_to_funcs(do_justify_void, MMAIN, - N_("Justify"), IFSCHELP(nano_justify_msg), TOGETHER, NOVIEW); + add_to_funcs(do_justify_void, MMAIN, + N_("Justify"), IFSCHELP(nano_justify_msg), TOGETHER, NOVIEW); #endif #ifndef DISABLE_SPELLER - add_to_funcs(do_spell, MMAIN, - N_("To Spell"), IFSCHELP(nano_spell_msg), TOGETHER, NOVIEW); + add_to_funcs(do_spell, MMAIN, + N_("To Spell"), IFSCHELP(nano_spell_msg), TOGETHER, NOVIEW); #endif - #ifndef DISABLE_COLOR - add_to_funcs(do_linter, MMAIN, - N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW); + add_to_funcs(do_linter, MMAIN, + N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW); #ifndef DISABLE_SPELLER - add_to_funcs(do_formatter, MMAIN, - N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW); + add_to_funcs(do_formatter, MMAIN, + N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW); #endif #endif -} + } #ifndef NANO_TINY add_to_funcs(case_sens_void, MWHEREIS|MREPLACE, diff --git a/src/nano.c b/src/nano.c index 75309e9c..da315fea 100644 --- a/src/nano.c +++ b/src/nano.c @@ -843,9 +843,9 @@ void usage(void) #ifndef NANO_TINY print_opt("-A", "--smarthome", N_("Enable smart home key")); if (!ISSET(RESTRICTED)) { - print_opt("-B", "--backup", N_("Save backups of existing files")); - print_opt(_("-C "), _("--backupdir="), - N_("Directory for saving unique backup files")); + print_opt("-B", "--backup", N_("Save backups of existing files")); + print_opt(_("-C "), _("--backupdir="), + N_("Directory for saving unique backup files")); } #endif print_opt("-D", "--boldtext", N_("Use bold instead of reverse video text")); @@ -854,20 +854,20 @@ void usage(void) #endif #ifndef DISABLE_MULTIBUFFER if (!ISSET(RESTRICTED)) - print_opt("-F", "--multibuffer", - N_("Read a file into a new buffer by default")); + print_opt("-F", "--multibuffer", + N_("Read a file into a new buffer by default")); #endif #ifndef NANO_TINY print_opt("-G", "--locking", N_("Use (vim-style) lock files")); #endif #ifndef DISABLE_HISTORIES if (!ISSET(RESTRICTED)) - print_opt("-H", "--historylog", - N_("Log & read search/replace string history")); + print_opt("-H", "--historylog", + N_("Log & read search/replace string history")); #endif #ifndef DISABLE_NANORC if (!ISSET(RESTRICTED)) - print_opt("-I", "--ignorercfiles", N_("Don't look at nanorc files")); + print_opt("-I", "--ignorercfiles", N_("Don't look at nanorc files")); #endif print_opt("-K", "--rebindkeypad", N_("Fix numeric keypad key confusion problem")); @@ -880,13 +880,14 @@ void usage(void) print_opt("-O", "--morespace", N_("Use one more line for editing")); #ifndef DISABLE_HISTORIES if (!ISSET(RESTRICTED)) - print_opt("-P", "--positionlog", N_("Log & read location of cursor position")); + print_opt("-P", "--positionlog", + N_("Log & read location of cursor position")); #endif #ifndef DISABLE_JUSTIFY print_opt(_("-Q "), _("--quotestr="), N_("Quoting string")); #endif if (!ISSET(RESTRICTED)) - print_opt("-R", "--restricted", N_("Restricted mode")); + print_opt("-R", "--restricted", N_("Restricted mode")); #ifndef NANO_TINY print_opt("-S", "--smooth", N_("Scroll by line instead of half-screen")); #endif @@ -902,8 +903,8 @@ void usage(void) #endif #ifndef DISABLE_COLOR if (!ISSET(RESTRICTED)) - print_opt(_("-Y "), _("--syntax="), - N_("Syntax definition to use for coloring")); + print_opt(_("-Y "), _("--syntax="), + N_("Syntax definition to use for coloring")); #endif print_opt("-c", "--constantshow", N_("Constantly show cursor position")); print_opt("-d", "--rebinddelete", @@ -925,8 +926,8 @@ void usage(void) print_opt("-p", "--preserve", N_("Preserve XON (^Q) and XOFF (^S) keys")); #ifndef DISABLE_NANORC if (!ISSET(RESTRICTED)) - print_opt("-q", "--quiet", - N_("Silently ignore startup issues like rc file errors")); + print_opt("-q", "--quiet", + N_("Silently ignore startup issues like rc file errors")); #endif #ifndef DISABLE_WRAPJUSTIFY print_opt(_("-r <#cols>"), _("--fill=<#cols>"), @@ -934,8 +935,8 @@ void usage(void) #endif #ifndef DISABLE_SPELLER if (!ISSET(RESTRICTED)) - print_opt(_("-s "), _("--speller="), - N_("Enable alternate speller")); + print_opt(_("-s "), _("--speller="), + N_("Enable alternate speller")); #endif print_opt("-t", "--tempfile", N_("Auto save on exit, don't prompt")); print_opt("-v", "--view", N_("View mode (read-only)")); @@ -944,7 +945,7 @@ void usage(void) #endif print_opt("-x", "--nohelp", N_("Don't show the two help lines")); if (!ISSET(RESTRICTED)) - print_opt("-z", "--suspend", N_("Enable suspension")); + print_opt("-z", "--suspend", N_("Enable suspension")); #ifndef NANO_TINY print_opt("-$", "--softwrap", N_("Enable soft line wrapping")); #endif