tweaks: fix several whitespace irregularities

Add missing spaces, remove excess spaces, and
replace groups of indentation spaces with tabs.
master
David Lawrence Ramsey 2017-05-05 15:48:54 -05:00 committed by Benno Schulenberg
parent 4953dcec20
commit 03c3e2b7c0
7 changed files with 30 additions and 31 deletions

View File

@ -390,7 +390,7 @@ size_t move_mbleft(const char *buf, size_t pos)
before = pos - 2;
else if ((signed char)*(--ptr) > -65)
before = pos - 3;
else if ((signed char)*(--ptr) > -65)
else if ((signed char)*(--ptr) > -65)
before = pos - 4;
else
before = pos - 1;

View File

@ -3075,7 +3075,7 @@ bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
free(fullpath);
if (posptr == NULL)
return FALSE;
return FALSE;
*line = posptr->lineno;
*column = posptr->xno;

View File

@ -728,7 +728,7 @@ void shortcut_init(void)
add_to_funcs(do_research, MHELP, whereis_next_tag, "x", 0, VIEW);
add_to_funcs(do_up_void, MHELP, prev_line_tag, "x", 0, VIEW);
add_to_funcs(do_down_void, MHELP, next_line_tag, "x" , 0, VIEW);
add_to_funcs(do_down_void, MHELP, next_line_tag, "x", 0, VIEW);
#endif
add_to_funcs(do_cut_text_void, MMAIN,

View File

@ -1386,7 +1386,7 @@ void do_toggle(int flag)
case MORE_SPACE:
case NO_HELP:
window_init();
focusing=FALSE;
focusing = FALSE;
total_refresh();
break;
case SUSPEND:
@ -1620,7 +1620,7 @@ int do_input(bool allow_funcs)
/* If the keystroke isn't a shortcut nor a toggle, it's a normal text
* character: add the character to the input buffer -- or display a
* warning when we're in view mode. */
if (input != ERR && !have_shortcut) {
if (input != ERR && !have_shortcut) {
if (ISSET(VIEW_MODE))
print_view_warning();
else {

View File

@ -95,7 +95,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
kbinput = (int *)nrealloc(kbinput, kbinput_len * sizeof(int));
kbinput[kbinput_len - 1] = input;
}
}
}
/* If we got a shortcut, or if there aren't any other keystrokes waiting
* after the one we read in, we need to insert all the characters in the

View File

@ -60,30 +60,29 @@ void get_homedir(void)
int digits(ssize_t n)
{
if (n < 100000) {
if (n < 1000) {
if (n < 100)
return 2;
else
return 3;
} else {
if (n < 10000)
return 4;
else
return 5;
}
if (n < 1000) {
if (n < 100)
return 2;
else
return 3;
} else {
if (n < 10000)
return 4;
else
return 5;
}
} else {
if (n < 10000000) {
if (n < 1000000)
return 6;
else
return 7;
}
else {
if (n < 100000000)
return 8;
else
return 9;
}
if (n < 10000000) {
if (n < 1000000)
return 6;
else
return 7;
} else {
if (n < 100000000)
return 8;
else
return 9;
}
}
}
#endif
@ -117,7 +116,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
const char *comma;
while (*str == ' ')
str++;
str++;
comma = strpbrk(str, "m,. /;");

View File

@ -2014,7 +2014,7 @@ void titlebar(const char *path)
prefixlen = strlenpt(prefix);
if (prefixlen > 0)
prefixlen++;
pathlen= strlenpt(path);
pathlen = strlenpt(path);
statelen = strlenpt(state) + 2;
if (statelen > 2) {
pathlen++;