Commit 8f615119 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Whitespace adjustments, plus a few comment tweaks.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4769 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 7828a809
Showing with 44 additions and 46 deletions
+44 -46
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
'file_bot' from copy_from_filestruct(), and rename the other. 'file_bot' from copy_from_filestruct(), and rename the other.
* src/*: Remove the unused parameter 'func_key' from get_shortcut(), * src/*: Remove the unused parameter 'func_key' from get_shortcut(),
and subsequently from parse_browser_input() and parse_help_input(). and subsequently from parse_browser_input() and parse_help_input().
* src/*: Whitespace adjustments, plus a few comment tweaks.
2014-04-13 Benno Schulenberg <bensberg@justemail.net> 2014-04-13 Benno Schulenberg <bensberg@justemail.net>
* proto.h, global.c, rcfile.c: Remove the unused parameter 'menu' * proto.h, global.c, rcfile.c: Remove the unused parameter 'menu'
......
...@@ -47,8 +47,8 @@ void do_help(void (*refresh_func)(void)) ...@@ -47,8 +47,8 @@ void do_help(void (*refresh_func)(void))
/* The line number in help_text of the last help line. This /* The line number in help_text of the last help line. This
* variable is zero-based. */ * variable is zero-based. */
#ifndef DISABLE_MOUSE #ifndef DISABLE_MOUSE
/* The current shortcut list. */
int oldmenu = currmenu; int oldmenu = currmenu;
/* The menu we were called from. */
#endif #endif
const char *ptr; const char *ptr;
/* The current line of the help text. */ /* The current line of the help text. */
...@@ -132,8 +132,7 @@ void do_help(void (*refresh_func)(void)) ...@@ -132,8 +132,7 @@ void do_help(void (*refresh_func)(void))
if (kbinput == KEY_MOUSE) { if (kbinput == KEY_MOUSE) {
int mouse_x, mouse_y; int mouse_x, mouse_y;
get_mouseinput(&mouse_x, &mouse_y, TRUE); get_mouseinput(&mouse_x, &mouse_y, TRUE);
continue; continue; /* Redraw the screen. */
/* Redraw the screen. */
} }
#endif #endif
......
...@@ -550,12 +550,11 @@ void do_undo(void) ...@@ -550,12 +550,11 @@ void do_undo(void)
u->strdata = f->data; u->strdata = f->data;
f->data = data; f->data = data;
break; break;
default: default:
undidmsg = _("Internal error: unknown type. Please save your work."); undidmsg = _("Internal error: unknown type. Please save your work.");
break; break;
} }
renumber(f); renumber(f);
do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE); do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
statusbar(_("Undid action (%s)"), undidmsg); statusbar(_("Undid action (%s)"), undidmsg);
...@@ -669,14 +668,13 @@ void do_redo(void) ...@@ -669,14 +668,13 @@ void do_redo(void)
default: default:
undidmsg = _("Internal error: unknown type. Please save your work."); undidmsg = _("Internal error: unknown type. Please save your work.");
break; break;
} }
do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE); do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
statusbar(_("Redid action (%s)"), undidmsg); statusbar(_("Redid action (%s)"), undidmsg);
openfile->current_undo = u; openfile->current_undo = u;
openfile->last_action = OTHER; openfile->last_action = OTHER;
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
......
...@@ -259,7 +259,7 @@ bool regexp_bol_or_eol(const regex_t *preg, const char *string) ...@@ -259,7 +259,7 @@ bool regexp_bol_or_eol(const regex_t *preg, const char *string)
REG_NOMATCH); REG_NOMATCH);
} }
/* Fix the regex if we're on platforms which requires an adjustment /* Fix the regex if we're on platforms which require an adjustment
* from GNU-style to BSD-style word boundaries. */ * from GNU-style to BSD-style word boundaries. */
const char *fixbounds(const char *r) { const char *fixbounds(const char *r) {
#ifndef GNU_WORDBOUNDS #ifndef GNU_WORDBOUNDS
......
...@@ -2496,13 +2496,13 @@ void edit_draw(filestruct *fileptr, const char *converted, int ...@@ -2496,13 +2496,13 @@ void edit_draw(filestruct *fileptr, const char *converted, int
if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) { if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) {
const colortype *tmpcolor = openfile->colorstrings; const colortype *tmpcolor = openfile->colorstrings;
/* Set up multi-line color data for this line if it's not yet calculated */ /* Set up multi-line color data for this line if it's not yet calculated. */
if (fileptr->multidata == NULL && openfile->syntax if (fileptr->multidata == NULL && openfile->syntax
&& openfile->syntax->nmultis > 0) { && openfile->syntax->nmultis > 0) {
int i; int i;
fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short)); fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
for (i = 0; i < openfile->syntax->nmultis; i++) for (i = 0; i < openfile->syntax->nmultis; i++)
fileptr->multidata[i] = -1; /* Assue this applies until we know otherwise */ fileptr->multidata[i] = -1; /* Assume this applies until we know otherwise. */
} }
for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) { for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
int x_start; int x_start;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment