commit 505125e259254e904742d2287b8e547be24e769d
parent c35eb5a16ec84b2ce11f53583313b3d73b9eb796
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 9 Jun 2014 14:23:53 +0000
A few cosmetic tweaks of comments and whitespace.
Patch by David Lawrence Ramsey.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4948 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2014-06-09 David Lawrence Ramsey <pooka109@gmail.com>
+ * src/*.c: Cosmetic tweaks of comments and whitespace.
+
2014-06-09 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (do_input): Remove two superfluous false conditions.
* src/nano.h, src/text.c (add_undo): Avoid a compiler warning with
diff --git a/src/files.c b/src/files.c
@@ -478,7 +478,7 @@ bool close_buffer(void)
return FALSE;
#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
- update_poshistory(openfile->filename, openfile->current->lineno, xplustabs()+1);
+ update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
#endif
/* Switch to the next file buffer. */
diff --git a/src/global.c b/src/global.c
@@ -388,7 +388,7 @@ void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
/* 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 (void (*func)(void), int defaultval)
+int sc_seq_or(void (*func)(void), int defaultval)
{
const sc *s = first_sc_for(currmenu, func);
diff --git a/src/move.c b/src/move.c
@@ -63,7 +63,6 @@ void do_page_up(void)
/* If we're not in smooth scrolling mode, put the cursor at the
* beginning of the top line of the edit window, as Pico does. */
-
#ifndef NANO_TINY
if (!ISSET(SMOOTH_SCROLL)) {
#endif
diff --git a/src/nano.c b/src/nano.c
@@ -2495,7 +2495,7 @@ int main(int argc, char **argv)
#ifndef DISABLE_WRAPPING
/* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root
- if a --fill option was given on the command line. */
+ * if a --fill option was given on the command line. */
if (fill_used)
UNSET(NO_WRAP);
#endif
diff --git a/src/utils.c b/src/utils.c
@@ -72,8 +72,8 @@ bool parse_num(const char *str, ssize_t *val)
assert(str != NULL);
- /* Man page for strtol() says this is required, and
- it looks like it is! */
+ /* The manual page for strtol() says this is required, and
+ * it looks like it is! */
errno = 0;
j = (ssize_t)strtol(str, &first_error, 10);
diff --git a/src/winio.c b/src/winio.c
@@ -2889,10 +2889,9 @@ int update_line(filestruct *fileptr, size_t index)
#ifdef DEBUG
if (ISSET(SOFTWRAP) && strlen(converted) >= COLS - 2)
- fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
+ fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
#endif
-
/* Paint the line. */
edit_draw(fileptr, converted, line, page_start);
free(converted);
@@ -2907,7 +2906,7 @@ int update_line(filestruct *fileptr, size_t index)
for (index += COLS; index <= full_length && line < editwinrows; index += COLS) {
line++;
#ifdef DEBUG
- fprintf(stderr, "update_line(): Softwrap code, moving to %d index %lu\n", line, (unsigned long) index);
+ fprintf(stderr, "update_line(): Softwrap code, moving to %d index %lu\n", line, (unsigned long)index);
#endif
blank_line(edit, line, 0, COLS);