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
master
Benno Schulenberg 2016-01-13 20:32:40 +00:00
parent ecf3cd7244
commit 34fbb1f4de
6 changed files with 9 additions and 12 deletions

View File

@ -1,5 +1,6 @@
2016-01-13 Benno Schulenberg <bensberg@justemail.net> 2016-01-13 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (save_poshistory): Reduce the indentation. * src/files.c (save_poshistory): Reduce the indentation.
* src/*.c: Adjust a few comments and rewrap some lines.
2016-01-12 Benno Schulenberg <bensberg@justemail.net> 2016-01-12 Benno Schulenberg <bensberg@justemail.net>
* NEWS: Fix some typos and whitespace, and normalize the dates. * NEWS: Fix some typos and whitespace, and normalize the dates.

View File

@ -28,10 +28,8 @@
static bool keep_cutbuffer = FALSE; static bool keep_cutbuffer = FALSE;
/* Should we keep the contents of the cutbuffer? */ /* 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 /* Indicate that we should no longer keep the contents of the cutbuffer. */
* cutbuffer. */
void cutbuffer_reset(void) void cutbuffer_reset(void)
{ {
keep_cutbuffer = FALSE; keep_cutbuffer = FALSE;

View File

@ -2259,9 +2259,8 @@ int do_writeout(bool exiting)
(append == APPEND) ? _("File Name to Append to") : (append == APPEND) ? _("File Name to Append to") :
_("File Name to Write"); _("File Name to Write");
/* If we're using restricted mode, the filename isn't blank, /* If we're using restricted mode, and the filename isn't blank,
* and we're at the "Write File" prompt, disable tab * disable tab completion. */
* completion. */
i = do_prompt(!ISSET(RESTRICTED) || i = do_prompt(!ISSET(RESTRICTED) ||
openfile->filename[0] == '\0', openfile->filename[0] == '\0',
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
@ -3208,7 +3207,7 @@ void load_poshistory(void)
if (hist == NULL) { if (hist == NULL) {
if (errno != ENOENT) { 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); UNSET(POS_HISTORY);
history_error(N_("Error reading %s: %s"), poshist, strerror(errno)); history_error(N_("Error reading %s: %s"), poshist, strerror(errno));
} }

View File

@ -1260,7 +1260,7 @@ void set_spell_shortcuts(void)
replace_scs_for(do_linter, do_spell); replace_scs_for(do_linter, do_spell);
#endif #endif
} }
#endif #endif /* !DISABLE_COLOR */
const subnfunc *sctofunc(const sc *s) const subnfunc *sctofunc(const sc *s)
{ {

View File

@ -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 * The allow_tabs parameter indicates whether we should allow tabs to be
* interpreted. The allow_files parameter indicates whether we should * interpreted. The allow_files parameter indicates whether we should
* allow all files (as opposed to just directories) to be tab * allow all files (as opposed to just directories) to be tab completed. */
* completed. */
int do_prompt(bool allow_tabs, int do_prompt(bool allow_tabs,
#ifndef DISABLE_TABCOMP #ifndef DISABLE_TABCOMP
bool allow_files, bool allow_files,

View File

@ -1004,8 +1004,8 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
column = openfile->placewewant + 1; column = openfile->placewewant + 1;
} }
for (openfile->current = openfile->fileage; for (openfile->current = openfile->fileage; line > 1 &&
openfile->current != openfile->filebot && line > 1; line--) openfile->current != openfile->filebot; line--)
openfile->current = openfile->current->next; openfile->current = openfile->current->next;
openfile->current_x = actual_x(openfile->current->data, column - 1); openfile->current_x = actual_x(openfile->current->data, column - 1);