Making a couple of minimalistic whitespace adjustments.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4954 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
53435b0efc
commit
a8a23abc00
|
@ -1,3 +1,7 @@
|
||||||
|
2014-06-10 Benno Schulenberg <bensberg@justemail.net>
|
||||||
|
* src/browser.c, src/files.c, src/nano.c src/prompt.c, src/winio.c:
|
||||||
|
A few minimalistic whitespace adjustments.
|
||||||
|
|
||||||
2014-06-10 David Lawrence Ramsey <pooka109@gmail.com>
|
2014-06-10 David Lawrence Ramsey <pooka109@gmail.com>
|
||||||
* src/winio.c: One more type fix and two tiny message tweaks.
|
* src/winio.c: One more type fix and two tiny message tweaks.
|
||||||
|
|
||||||
|
|
|
@ -460,7 +460,7 @@ void browser_init(const char *path, DIR *dir)
|
||||||
|
|
||||||
/* Don't show the "." entry. */
|
/* Don't show the "." entry. */
|
||||||
if (strcmp(nextdir->d_name, ".") == 0)
|
if (strcmp(nextdir->d_name, ".") == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
d_len = strlenpt(nextdir->d_name);
|
d_len = strlenpt(nextdir->d_name);
|
||||||
if (d_len > longest)
|
if (d_len > longest)
|
||||||
|
@ -487,7 +487,7 @@ void browser_init(const char *path, DIR *dir)
|
||||||
while ((nextdir = readdir(dir)) != NULL && i < filelist_len) {
|
while ((nextdir = readdir(dir)) != NULL && i < filelist_len) {
|
||||||
/* Don't show the "." entry. */
|
/* Don't show the "." entry. */
|
||||||
if (strcmp(nextdir->d_name, ".") == 0)
|
if (strcmp(nextdir->d_name, ".") == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
filelist[i] = charalloc(path_len + strlen(nextdir->d_name) + 1);
|
filelist[i] = charalloc(path_len + strlen(nextdir->d_name) + 1);
|
||||||
sprintf(filelist[i], "%s%s", path, nextdir->d_name);
|
sprintf(filelist[i], "%s%s", path, nextdir->d_name);
|
||||||
|
|
|
@ -1842,7 +1842,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||||
|
|
||||||
if (ISSET(INSECURE_BACKUP))
|
if (ISSET(INSECURE_BACKUP))
|
||||||
backup_cflags = O_WRONLY | O_CREAT | O_APPEND;
|
backup_cflags = O_WRONLY | O_CREAT | O_APPEND;
|
||||||
else
|
else
|
||||||
backup_cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
|
backup_cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
|
||||||
|
|
||||||
backup_fd = open(backupname, backup_cflags,
|
backup_fd = open(backupname, backup_cflags,
|
||||||
|
@ -1858,8 +1858,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||||
goto cleanup_and_exit;
|
goto cleanup_and_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We shouldn't worry about chown()ing something if we're not
|
/* We shouldn't worry about chown()ing something if we're not
|
||||||
root, since it's likely to fail! */
|
* root, since it's likely to fail! */
|
||||||
if (geteuid() == NANO_ROOT_UID && fchown(backup_fd,
|
if (geteuid() == NANO_ROOT_UID && fchown(backup_fd,
|
||||||
openfile->current_stat->st_uid, openfile->current_stat->st_gid) == -1
|
openfile->current_stat->st_uid, openfile->current_stat->st_gid) == -1
|
||||||
&& !ISSET(INSECURE_BACKUP)) {
|
&& !ISSET(INSECURE_BACKUP)) {
|
||||||
|
|
|
@ -1642,7 +1642,7 @@ int do_input(bool *meta_key, bool *func_key, bool allow_funcs)
|
||||||
* output all the characters in the input buffer if it isn't
|
* output all the characters in the input buffer if it isn't
|
||||||
* empty. Note that it should be empty if we're in view
|
* empty. Note that it should be empty if we're in view
|
||||||
* mode. */
|
* mode. */
|
||||||
if (have_shortcut || get_key_buffer_len() == 0) {
|
if (have_shortcut || get_key_buffer_len() == 0) {
|
||||||
#ifndef DISABLE_WRAPPING
|
#ifndef DISABLE_WRAPPING
|
||||||
/* If we got a shortcut or toggle, and it's not the shortcut
|
/* If we got a shortcut or toggle, and it's not the shortcut
|
||||||
* for verbatim input, turn off prepending of wrapped text. */
|
* for verbatim input, turn off prepending of wrapped text. */
|
||||||
|
@ -1907,7 +1907,7 @@ void precalc_multicolorinfo(void)
|
||||||
goto precalc_cleanup;
|
goto precalc_cleanup;
|
||||||
}
|
}
|
||||||
if (regexec(tmpcolor->end, endptr->data, 1, &endmatch, 0) == 0)
|
if (regexec(tmpcolor->end, endptr->data, 1, &endmatch, 0) == 0)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (endptr == NULL) {
|
if (endptr == NULL) {
|
||||||
|
|
|
@ -1030,7 +1030,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
|
||||||
* move to an older search, which means that finished has
|
* move to an older search, which means that finished has
|
||||||
* been set to TRUE. Set it back to FALSE here, so that
|
* been set to TRUE. Set it back to FALSE here, so that
|
||||||
* we aren't kicked out of the statusbar prompt. */
|
* we aren't kicked out of the statusbar prompt. */
|
||||||
finished = FALSE;
|
finished = FALSE;
|
||||||
}
|
}
|
||||||
} else if (s && s->scfunc == get_history_newer_void) {
|
} else if (s && s->scfunc == get_history_newer_void) {
|
||||||
if (history_list != NULL) {
|
if (history_list != NULL) {
|
||||||
|
|
|
@ -545,9 +545,9 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
|
||||||
/* Slang doesn't support KEY_SDC. */
|
/* Slang doesn't support KEY_SDC. */
|
||||||
case KEY_SDC:
|
case KEY_SDC:
|
||||||
if (ISSET(REBIND_DELETE))
|
if (ISSET(REBIND_DELETE))
|
||||||
retval = sc_seq_or(do_delete, *kbinput);
|
retval = sc_seq_or(do_delete, *kbinput);
|
||||||
else
|
else
|
||||||
retval = sc_seq_or(do_backspace, *kbinput);
|
retval = sc_seq_or(do_backspace, *kbinput);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef KEY_SIC
|
#ifdef KEY_SIC
|
||||||
|
@ -1743,7 +1743,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
|
||||||
* wheel is equivalent to moving down three lines. */
|
* wheel is equivalent to moving down three lines. */
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
unget_kbinput((mevent.bstate & BUTTON4_PRESSED) ?
|
unget_kbinput((mevent.bstate & BUTTON4_PRESSED) ?
|
||||||
sc_seq_or(do_up_void, 0) : sc_seq_or(do_down_void, 0),
|
sc_seq_or(do_up_void, 0) : sc_seq_or(do_down_void, 0),
|
||||||
FALSE, FALSE);
|
FALSE, FALSE);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -3518,7 +3518,7 @@ void do_credits(void)
|
||||||
* Small Letter O with Diaresis) if applicable. */
|
* Small Letter O with Diaresis) if applicable. */
|
||||||
credits[16] =
|
credits[16] =
|
||||||
#ifdef ENABLE_UTF8
|
#ifdef ENABLE_UTF8
|
||||||
using_utf8() ? "Florian K\xC3\xB6nig" :
|
using_utf8() ? "Florian K\xC3\xB6nig" :
|
||||||
#endif
|
#endif
|
||||||
"Florian K\xF6nig";
|
"Florian K\xF6nig";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue