Commit 03c3e2b7 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey Committed by Benno Schulenberg
Browse files

tweaks: fix several whitespace irregularities

Add missing spaces, remove excess spaces, and
replace groups of indentation spaces with tabs.
No related merge requests found
Showing with 30 additions and 31 deletions
+30 -31
...@@ -390,7 +390,7 @@ size_t move_mbleft(const char *buf, size_t pos) ...@@ -390,7 +390,7 @@ size_t move_mbleft(const char *buf, size_t pos)
before = pos - 2; before = pos - 2;
else if ((signed char)*(--ptr) > -65) else if ((signed char)*(--ptr) > -65)
before = pos - 3; before = pos - 3;
else if ((signed char)*(--ptr) > -65) else if ((signed char)*(--ptr) > -65)
before = pos - 4; before = pos - 4;
else else
before = pos - 1; before = pos - 1;
......
...@@ -3075,7 +3075,7 @@ bool has_old_position(const char *file, ssize_t *line, ssize_t *column) ...@@ -3075,7 +3075,7 @@ bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
free(fullpath); free(fullpath);
if (posptr == NULL) if (posptr == NULL)
return FALSE; return FALSE;
*line = posptr->lineno; *line = posptr->lineno;
*column = posptr->xno; *column = posptr->xno;
......
...@@ -728,7 +728,7 @@ void shortcut_init(void) ...@@ -728,7 +728,7 @@ void shortcut_init(void)
add_to_funcs(do_research, MHELP, whereis_next_tag, "x", 0, VIEW); 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_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 #endif
add_to_funcs(do_cut_text_void, MMAIN, add_to_funcs(do_cut_text_void, MMAIN,
......
...@@ -1386,7 +1386,7 @@ void do_toggle(int flag) ...@@ -1386,7 +1386,7 @@ void do_toggle(int flag)
case MORE_SPACE: case MORE_SPACE:
case NO_HELP: case NO_HELP:
window_init(); window_init();
focusing=FALSE; focusing = FALSE;
total_refresh(); total_refresh();
break; break;
case SUSPEND: case SUSPEND:
...@@ -1620,7 +1620,7 @@ int do_input(bool allow_funcs) ...@@ -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 /* 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 * character: add the character to the input buffer -- or display a
* warning when we're in view mode. */ * warning when we're in view mode. */
if (input != ERR && !have_shortcut) { if (input != ERR && !have_shortcut) {
if (ISSET(VIEW_MODE)) if (ISSET(VIEW_MODE))
print_view_warning(); print_view_warning();
else { else {
......
...@@ -95,7 +95,7 @@ int do_statusbar_input(bool *ran_func, bool *finished) ...@@ -95,7 +95,7 @@ int do_statusbar_input(bool *ran_func, bool *finished)
kbinput = (int *)nrealloc(kbinput, kbinput_len * sizeof(int)); kbinput = (int *)nrealloc(kbinput, kbinput_len * sizeof(int));
kbinput[kbinput_len - 1] = input; kbinput[kbinput_len - 1] = input;
} }
} }
/* If we got a shortcut, or if there aren't any other keystrokes waiting /* 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 * after the one we read in, we need to insert all the characters in the
......
...@@ -60,30 +60,29 @@ void get_homedir(void) ...@@ -60,30 +60,29 @@ void get_homedir(void)
int digits(ssize_t n) int digits(ssize_t n)
{ {
if (n < 100000) { if (n < 100000) {
if (n < 1000) { if (n < 1000) {
if (n < 100) if (n < 100)
return 2; return 2;
else else
return 3; return 3;
} else { } else {
if (n < 10000) if (n < 10000)
return 4; return 4;
else else
return 5; return 5;
} }
} else { } else {
if (n < 10000000) { if (n < 10000000) {
if (n < 1000000) if (n < 1000000)
return 6; return 6;
else else
return 7; return 7;
} } else {
else { if (n < 100000000)
if (n < 100000000) return 8;
return 8; else
else return 9;
return 9; }
}
} }
} }
#endif #endif
...@@ -117,7 +116,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column) ...@@ -117,7 +116,7 @@ bool parse_line_column(const char *str, ssize_t *line, ssize_t *column)
const char *comma; const char *comma;
while (*str == ' ') while (*str == ' ')
str++; str++;
comma = strpbrk(str, "m,. /;"); comma = strpbrk(str, "m,. /;");
......
...@@ -2014,7 +2014,7 @@ void titlebar(const char *path) ...@@ -2014,7 +2014,7 @@ void titlebar(const char *path)
prefixlen = strlenpt(prefix); prefixlen = strlenpt(prefix);
if (prefixlen > 0) if (prefixlen > 0)
prefixlen++; prefixlen++;
pathlen= strlenpt(path); pathlen = strlenpt(path);
statelen = strlenpt(state) + 2; statelen = strlenpt(state) + 2;
if (statelen > 2) { if (statelen > 2) {
pathlen++; pathlen++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment