From f0aa3a4bd8fc6e7dba2d6154d797ca2f6f83d83d Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Thu, 27 Aug 2015 23:03:39 +0000 Subject: [PATCH] cosmetics: untabify, remove trailing spaces --- archive.c | 2 +- buffer.c | 8 ++++---- charset.c | 4 ++-- clang.c | 22 ++++++++++---------- dired.c | 14 ++++++------- extra-modes.c | 20 +++++++++--------- extras.c | 20 +++++++++--------- groovy.c | 2 +- icon.c | 2 +- markdown.c | 2 +- orgmode.c | 2 +- qe.c | 10 ++++----- qeconfig.h | 56 +++++++++++++++++++++++++-------------------------- qfribidi.h | 2 +- rust.c | 6 +++--- script.c | 2 +- shell.c | 10 ++++----- util.c | 10 ++++----- variables.h | 4 ++-- x11.c | 2 +- 20 files changed, 100 insertions(+), 100 deletions(-) diff --git a/archive.c b/archive.c index c2ed5c6..4bd22f4 100644 --- a/archive.c +++ b/archive.c @@ -429,7 +429,7 @@ static int man_mode_probe(ModeDef *mode, ModeProbeData *p) "4.gz|5.gz|5ssl.gz|6.gz|7.gz|7ssl.gz|8.gz|9.gz")) { goto has_man; } - + if (match_extension(p->real_filename, "1|1m|1ssl|1tcl|2|3|3o|3ssl|4|5|5ssl|6|7|7ssl|8|9|" "n|ntcl") diff --git a/buffer.c b/buffer.c index 02a6b30..ea2e193 100644 --- a/buffer.c +++ b/buffer.c @@ -1471,7 +1471,7 @@ int eb_nextc(EditBuffer *b, int offset, int *next_ptr) /* compute offset after moving 'n' chars from 'offset'. * 'n' can be negative - */ + */ int eb_skip_chars(EditBuffer *b, int offset, int n) { while (n < 0) { @@ -1489,7 +1489,7 @@ int eb_skip_chars(EditBuffer *b, int offset, int n) int eb_delete_uchar(EditBuffer *b, int offset) { int offset1; - + eb_nextc(b, offset, &offset1); if (offset < offset1) { return eb_delete(b, offset, offset1 - offset); @@ -1510,7 +1510,7 @@ int eb_delete_chars(EditBuffer *b, int offset, int n) offset += size; offset1 -= size; size = -size; - } + } return eb_delete(b, offset, size); } @@ -2444,7 +2444,7 @@ int eb_goto_bol2(EditBuffer *b, int offset, int *countp) int eb_is_blank_line(EditBuffer *b, int offset, int *offset1) { int c; - + while ((c = eb_nextc(b, offset, &offset)) != '\n') { if (!qe_isblank(c)) return 0; diff --git a/charset.c b/charset.c index 9175f48..72ed6d2 100644 --- a/charset.c +++ b/charset.c @@ -533,7 +533,7 @@ static int charset_goto_char_utf8(CharsetDecodeState *s, c = *buf_ptr; if (c == '\n' && s->eol_type == EOL_DOS) { /* ignore \n in EOL_DOS scan, but count \r. - * see comment above. + * see comment above. */ continue; } @@ -1473,7 +1473,7 @@ done_utf8: { /* Need a more reliable generic ucs2/ucs4 detection */ int maxc[4]; - + maxc[0] = maxc[1] = maxc[2] = maxc[3] = 0; for (i = 0; i < size; i += 2) { if (buf[i] > maxc[i & 3]) diff --git a/clang.c b/clang.c index 04bbabe..6f7b464 100644 --- a/clang.c +++ b/clang.c @@ -377,7 +377,7 @@ static const char dart_types[] = { "Date|DateTime|TimeZone|Duration|Stopwatch|DartType|" "Collection|Comparable|Completer|Future|Match|Options|Pattern|" "HashMap|HashSet|Iterable|Iterator|LinkedHashMap|List|Map|Queue|Set|" - "Dynamic|Exception|Error|AssertionError|TypeError|FallThroughError|" + "Dynamic|Exception|Error|AssertionError|TypeError|FallThroughError|" }; static const char pike_keywords[] = { @@ -860,7 +860,7 @@ static void c_colorize_line(QEColorizeContext *cp, if (str[i] == '\"') { /* Csharp and Squirrel Verbatim strings */ /* ignore escape sequences and newlines */ - state |= IN_C_STRING; // XXX: IN_RAW_STRING + state |= IN_C_STRING; // XXX: IN_RAW_STRING style1 = C_STYLE_STRING; delim = str[i]; style = style1; @@ -1042,7 +1042,7 @@ static void c_colorize_line(QEColorizeContext *cp, } the_end: if (state & (IN_C_COMMENT | IN_C_COMMENT1 | IN_C_COMMENT_D | - IN_C_PREPROCESS | + IN_C_PREPROCESS | IN_C_STRING | IN_C_STRING_Q | IN_C_STRING_BQ)) { /* set style on eol char */ SET_COLOR1(str, n, style); @@ -1228,11 +1228,11 @@ static void c_indent_line(EditState *s, int offset0) state = INDENT_FIND_EQ; } } else { - if (stack[--stack_ptr] != '}') { - /* XXX: syntax check ? */ - goto check_instr; - } - goto check_instr; + if (stack[--stack_ptr] != '}') { + /* XXX: syntax check ? */ + goto check_instr; + } + goto check_instr; } break; case ')': @@ -1247,9 +1247,9 @@ static void c_indent_line(EditState *s, int offset0) pos = find_pos(s, buf, p - buf) + 1; goto end_parse; } else { - if (stack[--stack_ptr] != (c == '(' ? ')' : ']')) { - /* XXX: syntax check ? */ - } + if (stack[--stack_ptr] != (c == '(' ? ')' : ']')) { + /* XXX: syntax check ? */ + } } break; case ' ': diff --git a/dired.c b/dired.c index 6e75a5d..573030e 100644 --- a/dired.c +++ b/dired.c @@ -299,7 +299,7 @@ static int format_date(char *dest, int size, case TF_TOUCH: case TF_TOUCH_LONG: buf_printf(out, "%02d%02d%02d%02d%02d", - systm.tm_year % 100, /* year */ + systm.tm_year % 100, /* year */ fmonth, /* month */ systm.tm_mday, /* day */ systm.tm_hour, /* hours */ @@ -313,7 +313,7 @@ static int format_date(char *dest, int size, buf_printf(out, "%s %2d %4d %2d:%02d", month[fmonth], /* month */ systm.tm_mday, /* day */ - systm.tm_year + 1900, /* year */ + systm.tm_year + 1900, /* year */ systm.tm_hour, /* hours */ systm.tm_min); /* minutes */ if (time_format == TF_DOS_LONG) { @@ -327,7 +327,7 @@ static int format_date(char *dest, int size, systm.tm_hour, /* hours */ systm.tm_min, /* minutes */ systm.tm_sec, /* seconds */ - systm.tm_year + 1900); /* year */ + systm.tm_year + 1900); /* year */ break; case TF_SECONDS: buf_printf(out, "%10lu", systime); /* seconds */ @@ -345,7 +345,7 @@ static int format_date(char *dest, int size, buf_printf(out, "%s %2d %4d", month[fmonth], /* month */ systm.tm_mday, /* day */ - systm.tm_year + 1900); /* year */ + systm.tm_year + 1900); /* year */ } break; } @@ -425,7 +425,7 @@ static char *compute_attr(char *atts, mode_t mode) if (S_ISSOCK(mode) /* socket */) atts[0] = 's'; #endif - if (S_ISLNK(mode)) /* symbolic link */ + if (S_ISLNK(mode)) /* symbolic link */ atts[0] = 'l'; /* overrides directory */ } @@ -825,7 +825,7 @@ static void dired_build_list(DiredState *ds, const char *path, } } find_file_close(&ffst); - + dired_sort_list(ds, b, s); if (s) { index = dired_find_target(ds, target); @@ -924,7 +924,7 @@ static void dired_parent(EditState *s) if (e && (e->b->flags & BF_DIRED)) { s->qe_state->active_window = e; return; - } + } } if (!(ds = dired_get_state(s, 1))) diff --git a/extra-modes.c b/extra-modes.c index 911aadf..7ccaea8 100644 --- a/extra-modes.c +++ b/extra-modes.c @@ -44,7 +44,7 @@ static char const asm_prepkeywords1[] = { static char const asm_prepkeywords2[] = { "|catstr|endp|ends|enum|equ|group" "|label|macro|proc|record|segment|struc" - "|" + "|" }; /* colstate is used to store the comment character */ @@ -956,11 +956,11 @@ static void fortran_colorize_line(QEColorizeContext *cp, i++; if (str[i] == '{') { preprocess: - i = n; + i = n; SET_COLOR(str, start, i, FORTRAN_STYLE_PREPROCESS); continue; } - i = n; + i = n; SET_COLOR(str, start, i, FORTRAN_STYLE_COMMENT); continue; case '\'': @@ -2091,7 +2091,7 @@ static void haskell_colorize_line(QEColorizeContext *cp, case '`': /* special */ continue; - + case '\'': case '\"': /* parse string const */ @@ -2268,7 +2268,7 @@ static void python_colorize_line(QEColorizeContext *cp, i = n; SET_COLOR(str, start, i, PYTHON_STYLE_COMMENT); continue; - + case '\'': case '\"': /* parse string const */ @@ -2382,7 +2382,7 @@ static void python_colorize_line(QEColorizeContext *cp, if (qe_tolower(str[i]) == 'j') { i++; } - + /* XXX: should detect malformed number constants */ SET_COLOR(str, start, i, PYTHON_STYLE_NUMBER); continue; @@ -2509,7 +2509,7 @@ static void ruby_colorize_line(QEColorizeContext *cp, while (qe_isblank(str[i])) i++; } - sig = 0; + sig = 0; if (qe_isalpha_(str[i])) { sig = str[i++] % 61; for (; qe_isalnum_(str[i]); i++) { @@ -2619,7 +2619,7 @@ static void ruby_colorize_line(QEColorizeContext *cp, comment: SET_COLOR(str, start, i, RUBY_STYLE_COMMENT); continue; - + case '%': /* parse alternate string/array syntaxes */ if (str[i] != '\0' && !qe_isblank(str[i]) && !qe_isalnum(str[i])) @@ -2745,7 +2745,7 @@ static void ruby_colorize_line(QEColorizeContext *cp, * as eval(<eol_type == EOL_MAC) buf_puts(desc, " mac"); - + eb_printf(b1, " eol_type: %d %s\n", b->eol_type, buf); eb_printf(b1, " charset: %s (bytes=%d, shift=%d)\n", b->charset->name, b->char_bytes, b->char_shift); @@ -978,7 +978,7 @@ static void do_describe_buffer(EditState *s, int argval) int total_size = b->total_size; int offset, c, i, col, max_count, count_width; int word_char, word_count, nb_chars, line, column; - + eb_get_pos(b, &line, &column, total_size); nb_chars = eb_get_char_offset(b, total_size); @@ -1128,35 +1128,35 @@ static CmdDef extra_commands[] = { CMD3( KEY_NONE, KEY_NONE, "global-unset-key", do_unset_key, ESsi, 0, "s{Unset key globally: }[key]" - "v") + "v") CMD3( KEY_NONE, KEY_NONE, "local-unset-key", do_unset_key, ESsi, 1, "s{Unset key locally: }[key]" - "v") + "v") CMD0( KEY_CTRLH('?'), KEY_F1, "about-qemacs", do_about_qemacs) CMD2( KEY_CTRLH('a'), KEY_NONE, "apropos", do_apropos, ESs, - "s{Apropos: }|apropos|") + "s{Apropos: }|apropos|") CMD0( KEY_CTRLH('b'), KEY_NONE, "describe-bindings", do_describe_bindings) CMD2( KEY_CTRLH('B'), KEY_NONE, "show-bindings", do_show_bindings, ESs, - "s{Show bindings of command: }[command]|command|") + "s{Show bindings of command: }[command]|command|") CMD2( KEY_CTRLC('c'), KEY_NONE, "set-region-color", do_set_region_color, ESs, - "s{Select color: }[color]|color|") + "s{Select color: }[color]|color|") CMD2( KEY_CTRLC('s'), KEY_NONE, "set-region-style", do_set_region_style, ESs, - "s{Select style: }[style]|style|") + "s{Select style: }[style]|style|") CMD0( KEY_NONE, KEY_NONE, "drop-styles", do_drop_styles) CMD2( KEY_NONE, KEY_NONE, "set-eol-type", do_set_eol_type, ESi, - "ui{EOL Type [0=Unix, 1=Dos, 2=Mac]: }") + "ui{EOL Type [0=Unix, 1=Dos, 2=Mac]: }") CMD2( KEY_NONE, KEY_NONE, "describe-buffer", do_describe_buffer, ESi, "ui") diff --git a/groovy.c b/groovy.c index 50e0d53..00037fc 100644 --- a/groovy.c +++ b/groovy.c @@ -254,7 +254,7 @@ static void groovy_colorize_line(QEColorizeContext *cp, break; } continue; - + case '~': while (qe_isblank(str[i])) i++; diff --git a/icon.c b/icon.c index 8d43701..3f6c824 100644 --- a/icon.c +++ b/icon.c @@ -92,7 +92,7 @@ static void icon_colorize_line(QEColorizeContext *cp, i = n; style = ICON_STYLE_COMMENT; break; - + case '\'': /* character constant */ parse_string_q: state |= IN_ICON_STRING_Q; diff --git a/markdown.c b/markdown.c index ec21800..036b8d3 100644 --- a/markdown.c +++ b/markdown.c @@ -619,7 +619,7 @@ static void do_mkd_insert_heading(EditState *s, int flags) offset += eb_insert_uchar(s->b, offset, '\n'); } else { offset = offset0; - } + } offset1 = offset; while (eb_match_uchar(s->b, offset1, ' ', &offset1)) continue; diff --git a/orgmode.c b/orgmode.c index 2388e06..2a5e19c 100644 --- a/orgmode.c +++ b/orgmode.c @@ -532,7 +532,7 @@ static void do_org_insert_heading(EditState *s, int flags) offset += eb_insert_uchar(s->b, offset, '\n'); } else { offset = offset0; - } + } offset1 = offset; while (eb_match_uchar(s->b, offset1, ' ', &offset1)) continue; diff --git a/qe.c b/qe.c index 385c83c..5528c13 100644 --- a/qe.c +++ b/qe.c @@ -965,7 +965,7 @@ void do_left_right(EditState *s, int dir) && dir < 0 && eb_at_bol(s->b, s->offset)) { s->qe_state->active_window = e; return; - } + } } #endif if (s->mode->move_left_right) @@ -1686,7 +1686,7 @@ EditBuffer *new_yank_buffer(QEmacsState *qs, EditBuffer *base) if (qs->yank_buffers[cur]) { cur = (cur + 1) % NB_YANK_BUFFERS; - qs->yank_current = cur; + qs->yank_current = cur; /* Maybe should instead just clear the buffer and reset styles */ qe_kill_buffer(qs->yank_buffers[cur]); qs->yank_buffers[cur] = NULL; @@ -1976,7 +1976,7 @@ int qe_free_mode_data(QEModeData *md) md->s->mode_data = NULL; rc = 0; } - } + } qe_free(&md); return rc; } @@ -4642,7 +4642,7 @@ void do_define_kbd_macro(EditState *s, const char *name, const char *keys, size = strlen(name) + 1 + 2 + strlen(keys) + 2; buf = qe_malloc_array(char, size); - /* CG: should parse macro keys to an array and pass index + /* CG: should parse macro keys to an array and pass index * to do_execute_macro. */ snprintf(buf, size, "%s%cS{%s}", name, 0, keys); @@ -6133,7 +6133,7 @@ static int probe_mode(EditState *s, EditBuffer *b, } /* Select appropriate mode for buffer: - * iff dir == 0, select best mode + * iff dir == 0, select best mode * iff dir > 0, select next mode * iff dir < 0, select previous mode */ diff --git a/qeconfig.h b/qeconfig.h index ccb4a36..64c92bb 100644 --- a/qeconfig.h +++ b/qeconfig.h @@ -29,7 +29,7 @@ static CmdDef basic_commands[] = { /* Character insertion */ CMD2( KEY_DEFAULT, KEY_NONE, - "self-insert-command", do_char, ESii, + "self-insert-command", do_char, ESii, "*" "kiui") CMD2( KEY_META('#'), KEY_NONE, "insert-char", do_char, ESii, @@ -162,8 +162,8 @@ static CmdDef basic_commands[] = { "not-modified", do_not_modified, ESi, "ui") CMD2( KEY_NONE, KEY_NONE, "set-visited-file-name", do_set_visited_file_name, ESss, - "s{Set visited file name: }[file]|file|" - "s{Rename file? }|newname|") + "s{Set visited file name: }[file]|file|" + "s{Rename file? }|newname|") /*---------------- Search and replace ----------------*/ @@ -171,14 +171,14 @@ static CmdDef basic_commands[] = { /* mg binds search-forward to M-s */ CMD3( KEY_META('S'), KEY_NONE, "search-forward", do_search_string, ESsi, 1, - "s{Search forward: }|search|" - "v") + "s{Search forward: }|search|" + "v") /* M-C-r should be bound to isearch-backward-regex */ /* mg binds search-forward to M-r */ CMD3( KEY_META('R'), KEY_NONE, "search-backward", do_search_string, ESsi, -1, - "s{Search backward: }|search|" - "v") + "s{Search backward: }|search|" + "v") /* passing argument should switch to regex incremental search */ CMD1( KEY_CTRL('r'), KEY_NONE, "isearch-backward", do_isearch, -1 ) @@ -186,15 +186,15 @@ static CmdDef basic_commands[] = { "isearch-forward", do_isearch, 1 ) CMD2( KEY_META('%'), KEY_NONE, "query-replace", do_query_replace, ESss, - "*" "s{Query replace: }|search|" - "s{With: }|replace|") + "*" "s{Query replace: }|search|" + "s{With: }|replace|") /* passing argument restricts replace to word matches */ /* XXX: non standard binding */ CMD2( KEY_META('r'), KEY_NONE, "replace-string", do_replace_string, ESssi, - "*" "s{Replace String: }|search|" - "s{With: }|replace|" - "ui") + "*" "s{Replace String: }|search|" + "s{With: }|replace|" + "ui") /*---------------- Paragraph / case handling ----------------*/ @@ -226,8 +226,8 @@ static CmdDef basic_commands[] = { CMD2( KEY_META('x'), KEY_NONE, "execute-command", do_execute_command, ESsi, - "s{Command: }[command]|command|" - "ui") + "s{Command: }[command]|command|" + "ui") /* M-0 thru M-9 also start numeric argument */ CMD0( KEY_CTRL('u'), KEY_META('-'), "numeric-argument", do_numeric_argument) @@ -241,20 +241,20 @@ static CmdDef basic_commands[] = { "call-last-kbd-macro", do_call_macro) CMD2( KEY_NONE, KEY_NONE, "define-kbd-macro", do_define_kbd_macro, ESsss, - "s{Macro name: }[command]" - "s{Macro keys: }|macrokeys|" - "s{Bind to key: }[key]") + "s{Macro name: }[command]" + "s{Macro keys: }|macrokeys|" + "s{Bind to key: }[key]") /* set/unset key? */ CMD3( KEY_NONE, KEY_NONE, "global-set-key", do_set_key, ESssi, 0, "s{Set key globally: }[key]" - "s{command: }[command]|command|" - "v") + "s{command: }[command]|command|" + "v") CMD3( KEY_NONE, KEY_NONE, "local-set-key", do_set_key, ESssi, 1, "s{Set key locally: }[key]" - "s{command: }[command]|command|" - "v") + "s{command: }[command]|command|" + "v") /*---------------- Window handling ----------------*/ @@ -324,8 +324,8 @@ static CmdDef basic_commands[] = { CMD2( KEY_NONE, KEY_NONE, "define-color", do_define_color, ESss, - "s{Color name: }[color]|color|" - "s{Color value: }[color]|color|") + "s{Color name: }[color]|color|" + "s{Color value: }[color]|color|") CMD2( KEY_NONE, KEY_NONE, "set-style", do_set_style, ESsss, "s{Style: }[style]|style|" @@ -333,12 +333,12 @@ static CmdDef basic_commands[] = { "s{CSS Property Value: }|value|") CMD2( KEY_NONE, KEY_NONE, "set-display-size", do_set_display_size, ESii, - "i{Width: }|width|" - "i{Height: }|height|") + "i{Width: }|width|" + "i{Height: }|height|") CMD2( KEY_NONE, KEY_NONE, "set-system-font", do_set_system_font, ESss, - "s{Font family: }|fontfamily|" - "s{System fonts: }|fontnames|") + "s{Font family: }|fontfamily|" + "s{System fonts: }|fontnames|") /*---------------- Miscellaneous ----------------*/ @@ -422,7 +422,7 @@ static CmdDef basic_commands[] = { CmdDef minibuffer_commands[] = { CMD2( KEY_DEFAULT, KEY_NONE, - "minibuffer-insert", do_minibuffer_char, ESii, + "minibuffer-insert", do_minibuffer_char, ESii, "*" "kiui") CMD1( KEY_RET, KEY_NONE, "minibuffer-exit", do_minibuffer_exit, 0) diff --git a/qfribidi.h b/qfribidi.h index 568f0ed..bffef1d 100644 --- a/qfribidi.h +++ b/qfribidi.h @@ -1,6 +1,6 @@ /* * FriBidi - Library of BiDi algorithm - * + * * Copyright (C) 1999 Dov Grobgeld * * The optimizations to reduce the code size from 13 KB to 3 KB and diff --git a/rust.c b/rust.c index 568d9f5..1c2abf9 100644 --- a/rust.c +++ b/rust.c @@ -158,9 +158,9 @@ static void rust_colorize_line(QEColorizeContext *cp, if (qe_isdigit(c)) { int j; // Integers: - // 0x[0-9a-fA-F_]+ // - // 0o[0-8_]+ // - // 0b[01_]+ // + // 0x[0-9a-fA-F_]+ // + // 0o[0-8_]+ // + // 0b[01_]+ // // [0-9][0-9_]* // // Floats: // [0-9][0-9_]*\.[0-9_]*([eE][-\+]?[0-9_]+)? diff --git a/script.c b/script.c index c2c0fdf..5e2fbde 100644 --- a/script.c +++ b/script.c @@ -73,7 +73,7 @@ static void script_colorize_line(QEColorizeContext *cp, c = str[i++]; if (c == '\\' && i < n && str[start] == '"') i++; - else + else if ((unsigned int)c == str[start]) break; } diff --git a/shell.c b/shell.c index b36ffcd..2fbd840 100644 --- a/shell.c +++ b/shell.c @@ -867,7 +867,7 @@ static void tty_emulate(ShellState *s, int c) /* CG: Charset support is inherently broken here because * bytes are inserted one at a time and charset conversion * should not be performed between shell output and buffer - * contents. UTF8 is special cased, other charsets need work. + * contents. UTF8 is special cased, other charsets need work. */ /* CG: further improvement direction includes automatic * conversion from ISO-8859-1 to UTF-8 for invalid UTF-8 @@ -1174,7 +1174,7 @@ static void tty_emulate(ShellState *s, int c) case 'g': /* TBC: clear tabs */ break; case 'r': /* DECSTBM: set scroll margins */ - //put_status(NULL, "set scroll margins %d %d", + //put_status(NULL, "set scroll margins %d %d", // s->esc_params[0], s->esc_params[1]); break; case 'm': /* SGR: set graphics rendition (style and colors) */ @@ -1289,7 +1289,7 @@ static void shell_mode_free(EditBuffer *b, void *state) while (waitpid(s->pid, &status, 0) != s->pid) continue; } - set_pid_handler(s->pid, NULL, NULL); + set_pid_handler(s->pid, NULL, NULL); s->pid = -1; } if (s->pty_fd >= 0) { @@ -1511,7 +1511,7 @@ static void do_man(EditState *s, const char *arg) char bufname[32]; char cmd[128]; EditBuffer *b; - + /* Assume standard man command */ snprintf(cmd, sizeof(cmd), "man %s", arg); @@ -1535,7 +1535,7 @@ static void do_ssh(EditState *s, const char *arg) char bufname[64]; char cmd[128]; EditBuffer *b; - + /* Use standard ssh command */ snprintf(cmd, sizeof(cmd), "ssh %s", arg); snprintf(bufname, sizeof(bufname), "*ssh-%s*", arg); diff --git a/util.c b/util.c index b25b728..269d2fc 100644 --- a/util.c +++ b/util.c @@ -295,7 +295,7 @@ char *make_user_path(char *buf, int buf_size, const char *path) homedir = getenv("HOME"); if (homedir) { int len = strlen(homedir); - + if (len && homedir[len - 1] == '/') len--; @@ -318,7 +318,7 @@ char *reduce_filename(char *dest, int size, const char *filename) /* Strip cvs temp file prefix */ if (base[0] == '.' && base[1] == '#' && base[2] != '\0') base += 2; - + pstrcat(dest, size, base); dbase = get_basename_nc(dest); @@ -341,7 +341,7 @@ char *reduce_filename(char *dest, int size, const char *filename) break; *ext = '\0'; } - + if (*ext == '.') { /* Convert all upper case filenames with extension to lower * case */ @@ -644,7 +644,7 @@ int strfind(const char *list, const char *s) for (;;) { if (c2 == '|') goto scan; - + if (c2 == '\0') return 0; skip: @@ -693,7 +693,7 @@ int strxfind(const char *list, const char *s) for (;;) { if (c2 == '|') goto scan; - + if (c2 == '\0') return 0; skip: diff --git a/variables.h b/variables.h index cde5c1b..e5e0c4b 100644 --- a/variables.h +++ b/variables.h @@ -81,9 +81,9 @@ VarDef *qe_find_variable(const char *name); void qe_complete_variable(CompleteState *cp); QVarType qe_get_variable(EditState *s, const char *name, - char *buf, int size, int *pnum, int as_source); + char *buf, int size, int *pnum, int as_source); QVarType qe_set_variable(EditState *s, const char *name, - const char *value, int num); + const char *value, int num); void qe_list_variables(EditState *s, EditBuffer *b); diff --git a/x11.c b/x11.c index 6bbb443..e107efe 100644 --- a/x11.c +++ b/x11.c @@ -1231,7 +1231,7 @@ static int x11_is_user_input_pending(__unused__ QEditScreen *s) typedef struct QExposeRegion QExposeRegion; struct QExposeRegion { int pending; - /* simplistic single rectangle region */ + /* simplistic single rectangle region */ int x0, y0, x1, y1; };