tweaks: normalize some whitespace
parent
2535f51e01
commit
cdcd365d34
|
@ -744,9 +744,9 @@ void findnextfile(const char *needle)
|
||||||
/* If the needle matches, we're done. And if we're back at the file
|
/* If the needle matches, we're done. And if we're back at the file
|
||||||
* where we started, it is the only occurrence. */
|
* where we started, it is the only occurrence. */
|
||||||
if (strstrwrapper(thename, needle, thename)) {
|
if (strstrwrapper(thename, needle, thename)) {
|
||||||
if (looking_at == selected)
|
if (looking_at == selected)
|
||||||
statusbar(_("This is the only occurrence"));
|
statusbar(_("This is the only occurrence"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we're back at the beginning and didn't find any match... */
|
/* If we're back at the beginning and didn't find any match... */
|
||||||
|
|
|
@ -256,7 +256,7 @@ void color_update(void)
|
||||||
/* Now try and find a syntax that matches the magic string. */
|
/* Now try and find a syntax that matches the magic string. */
|
||||||
if (magicstring != NULL) {
|
if (magicstring != NULL) {
|
||||||
for (sint = syntaxes; sint != NULL; sint = sint->next) {
|
for (sint = syntaxes; sint != NULL; sint = sint->next) {
|
||||||
if (found_in_list(sint->magics, magicstring))
|
if (found_in_list(sint->magics, magicstring))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -964,9 +964,9 @@ void shortcut_init(void)
|
||||||
N_("Go To Text"), IFSCHELP(nano_whereis_msg), BLANKAFTER, VIEW);
|
N_("Go To Text"), IFSCHELP(nano_whereis_msg), BLANKAFTER, VIEW);
|
||||||
|
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
add_to_funcs(dos_format_void, MWRITEFILE,
|
add_to_funcs(dos_format_void, MWRITEFILE,
|
||||||
N_("DOS Format"), IFSCHELP(nano_dos_msg), TOGETHER, NOVIEW);
|
N_("DOS Format"), IFSCHELP(nano_dos_msg), TOGETHER, NOVIEW);
|
||||||
add_to_funcs(mac_format_void, MWRITEFILE,
|
add_to_funcs(mac_format_void, MWRITEFILE,
|
||||||
N_("Mac Format"), IFSCHELP(nano_mac_msg), TOGETHER, NOVIEW);
|
N_("Mac Format"), IFSCHELP(nano_mac_msg), TOGETHER, NOVIEW);
|
||||||
|
|
||||||
/* If we're using restricted mode, the Append, Prepend, and Backup toggles
|
/* If we're using restricted mode, the Append, Prepend, and Backup toggles
|
||||||
|
|
12
src/rcfile.c
12
src/rcfile.c
|
@ -728,7 +728,7 @@ void parse_colors(char *ptr, int rex_flags)
|
||||||
fgstr = ++ptr;
|
fgstr = ++ptr;
|
||||||
ptr = parse_next_regex(ptr);
|
ptr = parse_next_regex(ptr);
|
||||||
if (ptr == NULL)
|
if (ptr == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* If the start regex was invalid, skip past the end regex
|
/* If the start regex was invalid, skip past the end regex
|
||||||
* to stay in sync. */
|
* to stay in sync. */
|
||||||
|
@ -889,10 +889,10 @@ static void check_vitals_mapped(void)
|
||||||
const sc *s = first_sc_for(inmenus[v], f->scfunc);
|
const sc *s = first_sc_for(inmenus[v], f->scfunc);
|
||||||
if (!s) {
|
if (!s) {
|
||||||
fprintf(stderr, _("Fatal error: no keys mapped for function "
|
fprintf(stderr, _("Fatal error: no keys mapped for function "
|
||||||
"\"%s\". Exiting.\n"), f->desc);
|
"\"%s\". Exiting.\n"), f->desc);
|
||||||
fprintf(stderr, _("If needed, use nano with the -I option "
|
fprintf(stderr, _("If needed, use nano with the -I option "
|
||||||
"to adjust your nanorc settings.\n"));
|
"to adjust your nanorc settings.\n"));
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1046,9 +1046,9 @@ void parse_rcfile(FILE *rcstream
|
||||||
#endif
|
#endif
|
||||||
/* First handle unsetting. */
|
/* First handle unsetting. */
|
||||||
if (set == -1) {
|
if (set == -1) {
|
||||||
if (rcopts[i].flag != 0)
|
if (rcopts[i].flag != 0)
|
||||||
UNSET(rcopts[i].flag);
|
UNSET(rcopts[i].flag);
|
||||||
else
|
else
|
||||||
rcfile_error(N_("Cannot unset option \"%s\""), rcopts[i].name);
|
rcfile_error(N_("Cannot unset option \"%s\""), rcopts[i].name);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2187,9 +2187,9 @@ void do_justify(bool full_justify)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Break the current line. */
|
/* Break the current line. */
|
||||||
if (ISSET(JUSTIFY_TRIM)) {
|
if (ISSET(JUSTIFY_TRIM)) {
|
||||||
while (break_pos > 0 &&
|
while (break_pos > 0 &&
|
||||||
is_blank_mbchar(&openfile->current->data[break_pos-1])) {
|
is_blank_mbchar(&openfile->current->data[break_pos - 1])) {
|
||||||
break_pos--;
|
break_pos--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1306,7 +1306,7 @@ int get_control_kbinput(int kbinput)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
/* Ctrl-Space (Ctrl-2, Ctrl-@, Ctrl-`) */
|
/* Ctrl-Space (Ctrl-2, Ctrl-@, Ctrl-`) */
|
||||||
if (kbinput == ' ' || kbinput == '2')
|
if (kbinput == ' ' || kbinput == '2')
|
||||||
retval = NANO_CONTROL_SPACE;
|
retval = NANO_CONTROL_SPACE;
|
||||||
/* Ctrl-/ (Ctrl-7, Ctrl-_) */
|
/* Ctrl-/ (Ctrl-7, Ctrl-_) */
|
||||||
|
@ -1633,7 +1633,7 @@ const sc *get_shortcut(int *kbinput)
|
||||||
&& meta_key == (s->type == META)) {
|
&& meta_key == (s->type == META)) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf (stderr, "matched seq \"%s\", and btw meta was %d (menu is %x from %x)\n",
|
fprintf (stderr, "matched seq \"%s\", and btw meta was %d (menu is %x from %x)\n",
|
||||||
s->keystr, meta_key, currmenu, s->menus);
|
s->keystr, meta_key, currmenu, s->menus);
|
||||||
#endif
|
#endif
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue