diff options
Diffstat (limited to 'src')
56 files changed, 86 insertions, 84 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 5cde1847f5..0ebe08a4e5 100644 --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -3,7 +3,7 @@ # To be used with MingW and Cygwin. # # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 -# Now it is allocated dymanically by the linker by evaluating all DLLs +# Now it is allocated dynamically by the linker by evaluating all DLLs # already loaded in memory. The binary image contains as well information # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 104cb8e942..410abb61ab 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -72,7 +72,7 @@ straightforward. Older versions probably don't work. Visual Studio installed a batch file called vcvarsall.bat, which you must run to set up paths for nmake and MSVC. We provide a batch file -"msvc2015.bat" for this. You may need to edit it if you didn't instal Visual +"msvc2015.bat" for this. You may need to edit it if you didn't install Visual Studio in the standard location. If you use VS2017 or later, you can use "msvc-latest.bat" (or "msvc2017.bat" and so on for the specific version). You must specify the architecture (e.g. diff --git a/src/blob.c b/src/blob.c index 311b87e49c..bfc77231ce 100644 --- a/src/blob.c +++ b/src/blob.c @@ -716,7 +716,7 @@ blob_insert_func(typval_T *argvars, typval_T *rettv) } /* - * Implementaion of reduce() for Blob "argvars[0]" using the function "expr" + * Implementation of reduce() for Blob "argvars[0]" using the function "expr" * starting with the optional initial value "argvars[2]" and return the result * in "rettv". */ diff --git a/src/bufwrite.c b/src/bufwrite.c index f3adcc3e8e..18448dcde4 100644 --- a/src/bufwrite.c +++ b/src/bufwrite.c @@ -1475,7 +1475,7 @@ buf_write( { if (buf_write_bytes(&write_info) == FAIL) { - errmsg = (char_u *)_(e_canot_write_to_backup_file_add_bang_to_override); + errmsg = (char_u *)_(e_cant_write_to_backup_file_add_bang_to_override); break; } ui_breakcheck(); diff --git a/src/change.c b/src/change.c index bcdb703362..7796d29207 100644 --- a/src/change.c +++ b/src/change.c @@ -1378,7 +1378,7 @@ del_bytes( * "second_line_indent": indent for after ^^D in Insert mode or if flag * OPENLINE_COM_LIST * "did_do_comment" is set to TRUE when intentionally putting the comment - * leader in fromt of the new line. + * leader in front of the new line. * * Return OK for success, FAIL for failure */ diff --git a/src/charset.c b/src/charset.c index 0e930776c7..fe1569c635 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2291,7 +2291,7 @@ vim_str2nr( } else { - // prevent a larg unsigned number to become negative + // prevent a large unsigned number to become negative if (un > VARNUM_MAX) un = VARNUM_MAX; *nptr = (varnumber_T)un; diff --git a/src/config.h.in b/src/config.h.in index ef0637a040..b77418c1cc 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -135,7 +135,7 @@ /* Define if struct sigcontext is present */ #undef HAVE_SIGCONTEXT -/* Define if touuper/tolower only work on lower/upercase characters */ +/* Define if toupper/tolower only work on lower/uppercase characters */ #undef BROKEN_TOUPPER /* Define if stat() ignores a trailing slash */ diff --git a/src/dict.c b/src/dict.c index 63b30e06be..82c31de515 100644 --- a/src/dict.c +++ b/src/dict.c @@ -1016,7 +1016,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) item = dict_find(d, key, -1); if (item != NULL) { - semsg(_(e_duplicate_key_in_dicitonary), key); + semsg(_(e_duplicate_key_in_dictionary), key); clear_tv(&tvkey); clear_tv(&tv); goto failret; diff --git a/src/drawline.c b/src/drawline.c index e849f9d782..632fd742ae 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2041,7 +2041,7 @@ win_line( text_prop_follows = TRUE; // When 'wrap' is off then for "below" we need - // to start a new line explictly. + // to start a new line explicitly. if (start_line) { draw_screen_line(wp, &wlv); diff --git a/src/errors.h b/src/errors.h index d3bca1a329..ea33b04754 100644 --- a/src/errors.h +++ b/src/errors.h @@ -1056,7 +1056,7 @@ EXTERN char e_tags_file_not_sorted_str[] INIT(= N_("E432: Tags file not sorted: %s")); EXTERN char e_no_tags_file[] INIT(= N_("E433: No tags file")); -EXTERN char e_canot_find_tag_pattern[] +EXTERN char e_cannot_find_tag_pattern[] INIT(= N_("E434: Can't find tag pattern")); EXTERN char e_couldnt_find_tag_just_guessing[] INIT(= N_("E435: Couldn't find tag, just guessing!")); @@ -1261,7 +1261,7 @@ EXTERN char e_is_read_only_add_bang_to_override[] INIT(= N_("is read-only (add ! to override)")); EXTERN char e_str_is_read_only_add_bang_to_override[] INIT(= N_("E505: \"%s\" is read-only (add ! to override)")); -EXTERN char e_canot_write_to_backup_file_add_bang_to_override[] +EXTERN char e_cant_write_to_backup_file_add_bang_to_override[] INIT(= N_("E506: Can't write to backup file (add ! to override)")); EXTERN char e_close_error_for_backup_file_add_bang_to_write_anyway[] INIT(= N_("E507: Close error for backup file (add ! to write anyway)")); @@ -1808,7 +1808,7 @@ EXTERN char e_cannot_slice_dictionary[] INIT(= N_("E719: Cannot slice a Dictionary")); EXTERN char e_missing_colon_in_dictionary[] INIT(= N_("E720: Missing colon in Dictionary: %s")); -EXTERN char e_duplicate_key_in_dicitonary[] +EXTERN char e_duplicate_key_in_dictionary[] INIT(= N_("E721: Duplicate key in Dictionary: \"%s\"")); EXTERN char e_missing_comma_in_dictionary[] INIT(= N_("E722: Missing comma in Dictionary: %s")); @@ -2890,7 +2890,7 @@ EXTERN char e_using_string_as_bool_str[] #endif EXTERN char e_cmd_mapping_must_end_with_cr_before_second_cmd[] INIT(= N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>")); -EXTERN char e_cmd_maping_must_not_include_str_key[] +EXTERN char e_cmd_mapping_must_not_include_str_key[] INIT(= N_("E1137: <Cmd> mapping must not include %s key")); #ifdef FEAT_EVAL EXTERN char e_using_bool_as_number[] @@ -3262,7 +3262,7 @@ EXTERN char e_atom_engine_must_be_at_start_of_pattern[] #ifdef FEAT_EVAL EXTERN char e_bitshift_ops_must_be_number[] INIT(= N_("E1282: Bitshift operands must be numbers")); -EXTERN char e_bitshift_ops_must_be_postive[] +EXTERN char e_bitshift_ops_must_be_positive[] INIT(= N_("E1283: Bitshift amount must be a positive number")); #endif #if defined(FEAT_PROP_POPUP) diff --git a/src/eval.c b/src/eval.c index 062fab0ac9..b815113e41 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3269,7 +3269,7 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg) if (var2.v_type != VAR_NUMBER) emsg(_(e_bitshift_ops_must_be_number)); else - emsg(_(e_bitshift_ops_must_be_postive)); + emsg(_(e_bitshift_ops_must_be_positive)); clear_tv(rettv); clear_tv(&var2); return FAIL; diff --git a/src/getchar.c b/src/getchar.c index 5d0c99438f..57e184b900 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -3942,7 +3942,7 @@ getcmdkeycmd( ga_concat(&line_ga, (char_u *)"<SNR>"); else { - semsg(e_cmd_maping_must_not_include_str_key, + semsg(e_cmd_mapping_must_not_include_str_key, get_special_key_name(c1, cmod)); aborted = TRUE; } diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 58b793109e..25685ddb28 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -5772,7 +5772,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags) * String received to output to screen can print using pre-cached glyphs * (fast) or Pango (slow). Ligatures and multibype utf-8 must use Pango. * Since we receive mixed content string, split it into logical segments - * that are guaranteed to go trough glyphs as much as possible. Since + * that are guaranteed to go through glyphs as much as possible. Since * single ligature char prints as ascii, print it that way. */ len_sum = 0; // return value needs to add up since we are printing @@ -5781,7 +5781,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags) cs = s; // First char decides starting needs_pango mode, 0=ascii 1=utf8/ligatures. // Even if it is ligature char, two chars or more make ligature. - // Ascii followed by utf8 is also going trough pango. + // Ascii followed by utf8 is also going through pango. is_utf8 = (*cs & 0x80); is_ligature = gui.ligatures_map[*cs] && (len > 1); if (is_ligature) @@ -5808,7 +5808,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags) } is_utf8 = *(cs + slen) & 0x80; // ascii followed by utf8 could be combining - // if so send it trough pango + // if so send it through pango if ((!is_utf8) && ((slen + 1) < (len - byte_sum))) is_utf8 = (*(cs + slen + 1) & 0x80); should_need_pango = (is_ligature || is_utf8); diff --git a/src/gui_w32.c b/src/gui_w32.c index 2dc54bf5f8..8424c6cefd 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -1973,7 +1973,7 @@ process_message(void) if (dead_key != DEAD_KEY_OFF) { /* - * Expell the dead key pressed with Ctrl in a special way. + * Expel the dead key pressed with Ctrl in a special way. * * After dead key was pressed with Ctrl in some cases, ESC was * artificially injected and handled by _OnChar(), now we are @@ -2160,7 +2160,7 @@ process_message(void) ) { // post WM_CHAR='[' - which will be interpreted with CTRL - // stil hold as ESC + // still hold as ESC PostMessageW(msg.hwnd, WM_CHAR, '[', msg.lParam); // ask _OnChar() to not touch this state, wait for next key // press and maintain knowledge that we are "poisoned" with diff --git a/src/highlight.c b/src/highlight.c index d0d6fdef6b..f937e082fe 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -634,7 +634,7 @@ lookup_color(int idx, int foreground, int *boldp) /* * Link highlight group 'from_hg' to 'to_hg'. * 'dodefault' is set to TRUE for ":highlight default link". - * 'forceit' is set to TRUE for ":higlight! link" + * 'forceit' is set to TRUE for ":highlight! link" * 'init' is set to TRUE when initializing all the highlight groups. */ static void diff --git a/src/message_test.c b/src/message_test.c index 6f71aff920..21ec4db8d3 100644 --- a/src/message_test.c +++ b/src/message_test.c @@ -154,7 +154,7 @@ test_trunc_string_mbyte(void) /* * Test vim_snprintf() with a focus on checking that truncation is * correct when buffer is small, since it cannot be tested from - * vim scrip tests. Check that: + * vim script tests. Check that: * - no buffer overflows happens (with valgrind or asan) * - output string is always NUL terminated. * diff --git a/src/os_macosx.m b/src/os_macosx.m index 84a0def9e0..33d29b60e6 100644 --- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -334,7 +334,7 @@ timer_create(clockid_t clockid, struct sigevent *sevp, timer_t *timerid) * * The limitations and differences include: * - * - The flags argument is ignored. The supplied new_value is therfore + * - The flags argument is ignored. The supplied new_value is therefore * always treated as a relative time. * - The old_value argument is ignored. */ diff --git a/src/os_win32.c b/src/os_win32.c index ca1799f131..fc6ea5ea3b 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -1307,7 +1307,7 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *pmer) else direction = zDelta >= 0 ? KE_MOUSEDOWN : KE_MOUSEUP; - // Decode the win32 console key modifers into Vim mouse modifers. + // Decode the win32 console key modifiers into Vim mouse modifiers. if (pmer->dwControlKeyState & SHIFT_PRESSED) modifiers |= MOD_MASK_SHIFT; // MOUSE_SHIFT; if (pmer->dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) diff --git a/src/proto/usercmd.pro b/src/proto/usercmd.pro index 47ef6f097a..d0cd2a3acb 100644 --- a/src/proto/usercmd.pro +++ b/src/proto/usercmd.pro @@ -18,7 +18,7 @@ void ex_command(exarg_T *eap); void ex_comclear(exarg_T *eap); void uc_clear(garray_T *gap); void ex_delcommand(exarg_T *eap); -size_t add_win_cmd_modifers(char_u *buf, cmdmod_T *cmod, int *multi_mods); +size_t add_win_cmd_modifiers(char_u *buf, cmdmod_T *cmod, int *multi_mods); size_t produce_cmdmods(char_u *buf, cmdmod_T *cmod, int quote); void do_ucmd(exarg_T *eap); /* vim: set ft=c : */ diff --git a/src/proto/vim9execute.pro b/src/proto/vim9execute.pro index f8e8106b9d..81f762ec5c 100644 --- a/src/proto/vim9execute.pro +++ b/src/proto/vim9execute.pro @@ -4,7 +4,7 @@ void update_has_breakpoint(ufunc_T *ufunc); int funcstack_check_refcount(funcstack_T *funcstack); int set_ref_in_funcstacks(int copyID); int in_def_function(void); -ectx_T *clear_currrent_ectx(void); +ectx_T *clear_current_ectx(void); void restore_current_ectx(ectx_T *ectx); int add_defer_function(char_u *name, int argcount, typval_T *argvars); char_u *char_from_string(char_u *str, varnumber_T index); diff --git a/src/regexp.c b/src/regexp.c index b15dc3a644..e29e6eaef8 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -1890,7 +1890,7 @@ clear_submatch_list(staticList10_T *sl) * vim_regexec_multi() match. * * If "flags" has REGSUB_COPY really copy into "dest[destlen]". - * Oterwise nothing is copied, only compue the length of the result. + * Otherwise nothing is copied, only compute the length of the result. * * If "flags" has REGSUB_MAGIC then behave like 'magic' is set. * diff --git a/src/register.c b/src/register.c index 21ed43699d..bc687c0b13 100644 --- a/src/register.c +++ b/src/register.c @@ -1857,7 +1857,7 @@ do_put( shortline = (vcol < col) || (vcol == col && !*ptr) ; - if (vcol < col) // line too short, padd with spaces + if (vcol < col) // line too short, pad with spaces bd.startspaces = col - vcol; else if (vcol > col) { diff --git a/src/screen.c b/src/screen.c index f8fca8a282..68142f4858 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2287,7 +2287,7 @@ screen_char_2(unsigned off, int row, int col) if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) return; - // Outputting the last character on the screen may scrollup the screen. + // Outputting the last character on the screen may scroll the screen up. // Don't to it! Mark the character invalid (update it when scrolled up) if (row == screen_Rows - 1 && col >= screen_Columns - 2) { @@ -2734,7 +2734,7 @@ retry: if (enc_dbcs == DBCS_JPNU) new_ScreenLines2 = LALLOC_MULT(schar_T, (Rows + 1) * Columns); new_ScreenAttrs = LALLOC_MULT(sattr_T, (Rows + 1) * Columns); - // Clear ScreenCols to avoid a warning for unitialized memory in + // Clear ScreenCols to avoid a warning for uninitialized memory in // jump_to_mouse(). new_ScreenCols = LALLOC_CLEAR_MULT(colnr_T, (Rows + 1) * Columns); new_LineOffset = LALLOC_MULT(unsigned, Rows); diff --git a/src/scriptfile.c b/src/scriptfile.c index 9623ea0ad9..d348631998 100644 --- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -1201,7 +1201,7 @@ ex_options( int multi_mods = 0; buf[0] = NUL; - (void)add_win_cmd_modifers(buf, &cmdmod, &multi_mods); + (void)add_win_cmd_modifiers(buf, &cmdmod, &multi_mods); vim_setenv((char_u *)"OPTWIN_CMD", buf); cmd_source((char_u *)SYS_OPTWIN_FILE, NULL); diff --git a/src/spell.c b/src/spell.c index 3196ae78f4..508c3ba38b 100644 --- a/src/spell.c +++ b/src/spell.c @@ -111,7 +111,7 @@ typedef struct matchinf_S win_T *mi_win; // buffer being checked // for NOBREAK - int mi_result2; // "mi_resul" without following word + int mi_result2; // "mi_result" without following word char_u *mi_end2; // "mi_end" without following word } matchinf_T; diff --git a/src/spell.h b/src/spell.h index a085b0b0cd..be11c9f612 100644 --- a/src/spell.h +++ b/src/spell.h @@ -17,10 +17,10 @@ # define SPELL_PRINTTREE #endif -// Use SPELL_COMPRESS_ALLWAYS for debugging: compress the word tree after +// Use SPELL_COMPRESS_ALWAYS for debugging: compress the word tree after // adding a word. Only use it for small word lists! #if 0 -# define SPELL_COMPRESS_ALLWAYS +# define SPELL_COMPRESS_ALWAYS #endif // Use DEBUG_TRIEWALK to print the changes made in suggest_trie_walk() for a diff --git a/src/spellfile.c b/src/spellfile.c index 3c934fcfa5..b5db526ed9 100644 --- a/src/spellfile.c +++ b/src/spellfile.c @@ -4588,7 +4588,7 @@ tree_add_word( * (si_compress_cnt == 1) and the number of free nodes drops below the * maximum word length. */ -#ifndef SPELL_COMPRESS_ALLWAYS +#ifndef SPELL_COMPRESS_ALWAYS if (spin->si_compress_cnt == 1 ? spin->si_free_count < MAXWLEN : spin->si_blocks_cnt >= compress_start) diff --git a/src/structs.h b/src/structs.h index dfcdcfb188..1a7a46c193 100644 --- a/src/structs.h +++ b/src/structs.h @@ -823,7 +823,7 @@ typedef struct textprop_S // text is truncated #define TP_FLAG_START_INCL 0x100 // "start_incl" copied from proptype -#define PROP_TEXT_MIN_CELLS 4 // minimun number of cells to use for +#define PROP_TEXT_MIN_CELLS 4 // minimum number of cells to use for // the text, even when truncating /* @@ -1884,7 +1884,7 @@ typedef struct { #define IMP_FLAGS_AUTOLOAD 4 // script still needs to be loaded /* - * Info about an encoutered script. + * Info about an encountered script. * When sn_state has the SN_STATE_NOT_LOADED is has not been sourced yet. */ typedef struct @@ -2095,7 +2095,7 @@ struct funcstack_S }; /* - * Structure to hold the variables declared in a loop that are possiblly used + * Structure to hold the variables declared in a loop that are possibly used * in a closure. */ typedef struct loopvars_S loopvars_T; @@ -3954,7 +3954,7 @@ jumpto_tag( } if (found == 0) { - emsg(_(e_canot_find_tag_pattern)); + emsg(_(e_cannot_find_tag_pattern)); curwin->w_cursor.lnum = save_lnum; } else diff --git a/src/term.c b/src/term.c index 008734c275..e4b6587cdf 100644 --- a/src/term.c +++ b/src/term.c @@ -155,7 +155,7 @@ static termrequest_T *all_termrequests[] = { // received. To avoid redrawing too often, only redraw when t_8u is not reset // and it was supposed to be written. Unless t_8u was set explicitly. // FALSE -> don't output t_8u yet -// MAYBE -> tried outputing t_8u while FALSE +// MAYBE -> tried outputting t_8u while FALSE // OK -> can write t_8u int write_t_8u_state = FALSE; # endif diff --git a/src/terminal.c b/src/terminal.c index 1da9d2d02c..816ab8143b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2396,7 +2396,7 @@ terminal_is_active() } /* - * Return the highight group ID for the terminal and the window. + * Return the highlight group ID for the terminal and the window. */ |