From 34fbb1f4ded81a48767eb5c51d4cb74031c96070 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 13 Jan 2016 20:32:40 +0000 Subject: [PATCH] Adjusting a few comments and rewrapping some lines. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5556 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/cut.c | 4 +--- src/files.c | 7 +++---- src/global.c | 2 +- src/prompt.c | 3 +-- src/search.c | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e9ece41..9e3515ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2016-01-13 Benno Schulenberg * src/files.c (save_poshistory): Reduce the indentation. + * src/*.c: Adjust a few comments and rewrap some lines. 2016-01-12 Benno Schulenberg * NEWS: Fix some typos and whitespace, and normalize the dates. diff --git a/src/cut.c b/src/cut.c index c7dffbf7..de90e247 100644 --- a/src/cut.c +++ b/src/cut.c @@ -28,10 +28,8 @@ static bool keep_cutbuffer = FALSE; /* Should we keep the contents of the cutbuffer? */ - /* Pointer to the end of the cutbuffer. */ -/* Indicate that we should no longer keep the contents of the - * cutbuffer. */ +/* Indicate that we should no longer keep the contents of the cutbuffer. */ void cutbuffer_reset(void) { keep_cutbuffer = FALSE; diff --git a/src/files.c b/src/files.c index a5c5ed0f..2daeaf91 100644 --- a/src/files.c +++ b/src/files.c @@ -2259,9 +2259,8 @@ int do_writeout(bool exiting) (append == APPEND) ? _("File Name to Append to") : _("File Name to Write"); - /* If we're using restricted mode, the filename isn't blank, - * and we're at the "Write File" prompt, disable tab - * completion. */ + /* If we're using restricted mode, and the filename isn't blank, + * disable tab completion. */ i = do_prompt(!ISSET(RESTRICTED) || openfile->filename[0] == '\0', #ifndef DISABLE_TABCOMP @@ -3208,7 +3207,7 @@ void load_poshistory(void) if (hist == NULL) { if (errno != ENOENT) { - /* When reading failed, don't save history when we quit. */ + /* When reading failed, don't save history when we quit. */ UNSET(POS_HISTORY); history_error(N_("Error reading %s: %s"), poshist, strerror(errno)); } diff --git a/src/global.c b/src/global.c index 74860729..f7b904bb 100644 --- a/src/global.c +++ b/src/global.c @@ -1260,7 +1260,7 @@ void set_spell_shortcuts(void) replace_scs_for(do_linter, do_spell); #endif } -#endif +#endif /* !DISABLE_COLOR */ const subnfunc *sctofunc(const sc *s) { diff --git a/src/prompt.c b/src/prompt.c index dbe84546..7cce2869 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -955,8 +955,7 @@ functionptrtype get_prompt_string(int *actual, bool allow_tabs, * * The allow_tabs parameter indicates whether we should allow tabs to be * interpreted. The allow_files parameter indicates whether we should - * allow all files (as opposed to just directories) to be tab - * completed. */ + * allow all files (as opposed to just directories) to be tab completed. */ int do_prompt(bool allow_tabs, #ifndef DISABLE_TABCOMP bool allow_files, diff --git a/src/search.c b/src/search.c index 0556d81e..c1f84fc1 100644 --- a/src/search.c +++ b/src/search.c @@ -1004,8 +1004,8 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer, column = openfile->placewewant + 1; } - for (openfile->current = openfile->fileage; - openfile->current != openfile->filebot && line > 1; line--) + for (openfile->current = openfile->fileage; line > 1 && + openfile->current != openfile->filebot; line--) openfile->current = openfile->current->next; openfile->current_x = actual_x(openfile->current->data, column - 1); -- 2.39.5