diff options
72 files changed, 167 insertions, 166 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index c9cf903d51..2965ad1471 100644 --- a/runtime/plugin/matchparen.vim +++ b/runtime/plugin/matchparen.vim @@ -5,7 +5,7 @@ " Exit quickly when: " - this plugin was already loaded (or disabled) " - when 'compatible' is set -" - the "CursorMoved" autocmd event is not availble. +" - the "CursorMoved" autocmd event is not available. if exists("g:loaded_matchparen") || &cp || !exists("##CursorMoved") finish endif diff --git a/runtime/tools/vim_vs_net.cmd b/runtime/tools/vim_vs_net.cmd index 6307d95a59..bea6353f67 100644 --- a/runtime/tools/vim_vs_net.cmd +++ b/runtime/tools/vim_vs_net.cmd @@ -7,12 +7,12 @@ @rem Arguments - +$(CurLine) $(ItemPath) @rem Init Dir - Empty @rem -@rem Coutesy of Brian Sturk +@rem Courtesy of Brian Sturk @rem @rem --remote-silent +%1 is a command +954, move ahead 954 lines @rem --remote-silent %2 full path to file @rem In Vim -@rem :h --remote-silent for mor details +@rem :h --remote-silent for more details @rem @rem --servername VS_NET @rem This will create a new instance of vim called VS_NET. So if you diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index 975453cafa..70448b8d69 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -527,7 +527,7 @@ STDMETHODIMP_(ULONG) CShellExt::Release() // // PARAMETERS: // pIDFolder - Specifies the parent folder -// pDataObj - Spefifies the set of items selected in that folder. +// pDataObj - Specifies the set of items selected in that folder. // hRegKey - Specifies the type of the focused item in the selection. // // RETURN VALUE: diff --git a/src/INSTALLvms.txt b/src/INSTALLvms.txt index 400d85638a..cbcbc4928b 100644 --- a/src/INSTALLvms.txt +++ b/src/INSTALLvms.txt @@ -330,7 +330,7 @@ perl_env : Also VMS_JACKETS.EXE from OpenVMS Porting Library. Please note, that GTK uses /name=(as_is,short)/float=ieee/ieee=denorm - complier directives that is not compatible with "standard" VMS usage, + compiler directives that is not compatible with "standard" VMS usage, therefore other external features might fail as PERL, PYTHON and TCL support. diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index e35e2e358e..b00ae3b71b 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -1,6 +1,6 @@ # # Makefile for VIM on Win32, using Cygnus gcc -# Last updated by Dan Sharp. Last Change: 2013 Feb 17 +# Last updated by Dan Sharp. Last Change: 2013 Apr 22 # # Also read INSTALLpc.txt! # @@ -48,7 +48,7 @@ # USEDLL no or yes: set to yes to use the Runtime library DLL (no) # For USEDLL=yes the cygwin1.dll is required to run Vim. # For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++ -# package is required to complie Vim. Or set CC to gcc-3 and add +# package is required to compile Vim. Or set CC to gcc-3 and add # -L/lib/w32api to EXTRA_LIBS. # POSTSCRIPT no or yes: set to yes for PostScript printing (no) # FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index e0f48566a7..36da162225 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -418,7 +418,7 @@ MSVCVER = 11.0 !endif !endif -# Abort bulding VIM if version of VC is unrecognised. +# Abort building VIM if version of VC is unrecognised. !ifndef MSVCVER !message *** ERROR !message Cannot determine Visual C version being used. If you are using the diff --git a/src/Make_sas.mak b/src/Make_sas.mak index ff678d171b..bf57c0dcb2 100644 --- a/src/Make_sas.mak +++ b/src/Make_sas.mak @@ -251,7 +251,7 @@ clean: # generate GlobalSymbolTable, which speeds up the compile time. # -# A preprocessing stage is used to work arounda bug in the GST generator, in +# A preprocessing stage is used to work around a bug in the GST generator, in # that it does not handle nested makefiles properly in this stage. # Ignore error message for not producing any code (105). $(GST): scoptions vim.h keymap.h macros.h ascii.h term.h structs.h @@ -283,7 +283,7 @@ $(PRO): $(GST) vim.h .c.pro: $(CC) $(CFLAGS) GPFILE=proto/$*.pro $(PROPT) $*.c -# dependancies +# dependencies blowfish.o: blowfish.c proto/blowfish.pro: blowfish.c buffer.o: buffer.c diff --git a/src/Make_vms.mms b/src/Make_vms.mms index 7cb5614b84..86b61d63f2 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -34,7 +34,7 @@ DECC = YES # SMALL - Few features enabled, as basic as possible # NORMAL - A default selection of features enabled # BIG - Many features enabled, as rich as possible. (default) -# HUGE - All possible featues enabled. +# HUGE - All possible features enabled. # Please select one of these alternatives above. MODEL = HUGE @@ -55,7 +55,7 @@ MODEL = HUGE # Comment out if you want the compiler version with :ver command. # NOTE: This part can make some complications if you're using some # predefined symbols/flags for your compiler. If does, just leave behind -# the comment varialbe CCVER. +# the comment variable CCVER. CCVER = YES # Uncomment if want a debug version. Resulting executable is DVIM.EXE diff --git a/src/Make_w16.mak b/src/Make_w16.mak index e4a6805c8e..bc7809ecaa 100644 --- a/src/Make_w16.mak +++ b/src/Make_w16.mak @@ -4,7 +4,7 @@ # ************************************************************* # * WARNING! # * This was originally produced by the IDE, but has since been -# * modifed to make it work properly. Adjust with care! +# * modified to make it work properly. Adjust with care! # * In particular, leave LinkerLocalOptsAtW16_gvim16dexe alone # * unless you are a guru. # ************************************************************* diff --git a/src/Makefile b/src/Makefile index 5da8198913..fb821ca8c7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -200,7 +200,7 @@ #Solaris 2.5 (sun4m) cc (SC4.0) +X11R6 +GUI (CDE) 4.6b (E) Andrew Large #Solaris 2.5 cc +X11 +GUI Athena 4.2 (9) Sonia Heimann #Solaris 2.5 gcc 2.5.6 +X11 Motif 5.0m (R) Ant. Colombo -#Solaris 2.6 gcc 2.8.1 ncursus 5.3 (G) Larry W. Virden +#Solaris 2.6 gcc 2.8.1 ncurses 5.3 (G) Larry W. Virden #Solaris with -lthread 5.5 (W) K. Nagano #Solaris gcc (b) Riccardo #SunOS 4.1.x +X11 -GUI 5.1b (J) Bram Moolenaar @@ -231,8 +231,8 @@ # (D) Uncomment lines below for QNX # (E) You might want to use termlib instead of termcap, see below. # (F) See below for instructions. -# (G) Using ncursus version 4.2 has reported to cause a crash. Use the -# Sun cursus library instead. +# (G) Using ncurses version 4.2 has reported to cause a crash. Use the +# Sun curses library instead. # (H) See line for EXTRA_LIBS below. # (I) SINIX-N 5.42 and 5.43 need some EXTRA_LIBS. Also for Reliant-Unix. # (J) If you get undefined symbols, see below for a solution. @@ -402,7 +402,7 @@ CClink = $(CC) # to the command line. If you see strange flags during compilation, check in # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting # the next line. -# When you get an error for a missing "perl.exp" file, try creating an emtpy +# When you get an error for a missing "perl.exp" file, try creating an empty # one: "touch perl.exp". # This requires at least "small" features, "tiny" doesn't work. #CONF_OPT_PERL = --enable-perlinterp @@ -601,7 +601,7 @@ LINT_OPTIONS = -beprxzF # Might not work with GUI or Perl. # For unknown reasons adding "-lc" fixes a linking problem with some versions # of GCC. That's probably a bug in the "-pg" implementation. -# After running Vim see the profile result with: gmon vim gmon.out | vim - +# After running Vim see the profile result with: gprof vim gmon.out | vim - # Need to recompile everything after changing this: "make clean" "make". #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING #PROFILE_LIBS = -pg @@ -1294,7 +1294,7 @@ ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gu ### prototype headers are ignored due to -DPROTO, system ### headers #include <...> are ignored if we use the -MM option, as ### e.g. provided by gcc-cpp. -### Include FEAT_GUI to get gependency on gui.h +### Include FEAT_GUI to get dependency on gui.h ### Need to change "-I /<path>" to "-isystem /<path>" for GCC 3.x. CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) \ `echo "$(DEPEND_CFLAGS)" $(DEPEND_CFLAGS_FILTER)` @@ -1717,7 +1717,7 @@ CCC = $(CC) -c -I$(srcdir) $(ALL_CFLAGS) # Link the target for normal use or debugging. -# A shell script is used to try linking without unneccesary libraries. +# A shell script is used to try linking without unnecessary libraries. $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h $(CCC) version.c -o objects/version.o @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ @@ -1837,8 +1837,8 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL) # # This will produce a lot of garbage on your screen, including a few error # messages. Don't worry about that. -# If there is a real error, there will be a difference between "test.out" and -# a "test99.ok" file. +# If there is a real error, there will be a difference between "testXX.out" and +# a "testXX.ok" file. # If everything is alright, the final message will be "ALL DONE". If not you # get "TEST FAILURE". # @@ -2779,9 +2779,9 @@ bundle-rsrc: os_mac.rsr.hqx mv gui_mac.rsrc.rsrcfork $(RESDIR)/$(VIMNAME).rsrc # po/Make_osx.pl says something about generating a Mac message file -# for Ukrananian. Would somebody using Mac OS X in Ukranian +# for Ukrainian. Would somebody using Mac OS X in Ukrainian # *really* be upset that Carbon Vim was not localised in -# Ukranian? +# Ukrainian? # #bundle-language: bundle-dir po/Make_osx.pl # cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG) diff --git a/src/VisVim/OleAut.cpp b/src/VisVim/OleAut.cpp index f96b03d6eb..6902df9a66 100644 --- a/src/VisVim/OleAut.cpp +++ b/src/VisVim/OleAut.cpp @@ -654,7 +654,7 @@ void COleAutomationControl::ErrDiag () } char Buf[256]; - sprintf (Buf, "An OLE error occured:\r\nCode = %s\r\nResult = %lx.", + sprintf (Buf, "An OLE error occurred:\r\nCode = %s\r\nResult = %lx.", (char*) ErrName, m_hResult); MessageBox (NULL, Buf, "OLE Error", MB_OK); } diff --git a/src/VisVim/README_VisVim.txt b/src/VisVim/README_VisVim.txt index abb690459a..fbe4b8b61a 100644 --- a/src/VisVim/README_VisVim.txt +++ b/src/VisVim/README_VisVim.txt @@ -220,7 +220,7 @@ Troubleshooting 2. Close Visual Studio. 3. Delete VisVim.dll or move it somewhere it can't be found. 4. Run Visual Studio. - 5. Tools -> Cursomize ->Add-ins and Macro-Files. + 5. Tools -> Customize ->Add-ins and Macro-Files. 6. A message appears: ".../VisVim.dll" "This add-in no longer exists. It will no longer be displayed." @@ -298,7 +298,7 @@ P9 Switching to DevStudio using ALT-TAB may get annoying. Would be nice to P8 Execute :tag command in Vim for word under cursor in DevStudio P7 Controlling the Visual Studio Debugger from inside Vim - See message above. Also a 'Debug' highligh group and a + See message above. Also a 'Debug' highlight group and a command to highlight a certain line would be necessary. P6 Provide an option to open the current file in VisVim in diff --git a/src/auto/configure b/src/auto/configure index f5fc87f30c..6130945890 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5831,7 +5831,7 @@ else /* If this program fails, then RTLD_GLOBAL is needed. * RTLD_GLOBAL will be used and then it is not possible to * have both python versions enabled in the same vim instance. - * Only the first pyhton version used will be switched on. + * Only the first python version used will be switched on. */ int no_rtl_global_needed_for(char *python_instsoname, char *prefix) @@ -5897,7 +5897,7 @@ else /* If this program fails, then RTLD_GLOBAL is needed. * RTLD_GLOBAL will be used and then it is not possible to * have both python versions enabled in the same vim instance. - * Only the first pyhton version used will be switched on. + * Only the first python version used will be switched on. */ int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix) @@ -10593,7 +10593,7 @@ if test "x$vim_cv_tty_group" != "xworld" ; then _ACEOF if test "x$vim_cv_tty_mode" = "x" ; then - as_fn_error "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (propably 0620)" "$LINENO" 5 + as_fn_error "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)" "$LINENO" 5 else $as_echo "#define PTYMODE 0620" >>confdefs.h diff --git a/src/buffer.c b/src/buffer.c index 1840e10961..54f6544254 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2005,7 +2005,7 @@ buflist_getfile(n, lnum, options, forceit) * "buf" if one exists */ if (swb_flags & SWB_USEOPEN) wp = buf_jump_open_win(buf); - /* If 'switchbuf' contians "usetab": jump to first window in any tab + /* If 'switchbuf' contains "usetab": jump to first window in any tab * page containing "buf" if one exists */ if (wp == NULL && (swb_flags & SWB_USETAB)) wp = buf_jump_open_tab(buf); diff --git a/src/configure.in b/src/configure.in index 310dea4fcb..34a75b3cd8 100644 --- a/src/configure.in +++ b/src/configure.in @@ -306,7 +306,7 @@ esac AC_SUBST(line_break) if test "$cf_cv_ebcdic" = "yes"; then -dnl If we have EBCDIC we most likley have z/OS Unix, let's test it! +dnl If we have EBCDIC we most likely have z/OS Unix, let's test it! AC_MSG_CHECKING(for z/OS Unix) case `uname` in OS/390) zOSUnix="yes"; @@ -1228,7 +1228,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then /* If this program fails, then RTLD_GLOBAL is needed. * RTLD_GLOBAL will be used and then it is not possible to * have both python versions enabled in the same vim instance. - * Only the first pyhton version used will be switched on. + * Only the first python version used will be switched on. */ int no_rtl_global_needed_for(char *python_instsoname, char *prefix) @@ -1274,7 +1274,7 @@ if test "$python_ok" = yes && test "$python3_ok" = yes; then /* If this program fails, then RTLD_GLOBAL is needed. * RTLD_GLOBAL will be used and then it is not possible to * have both python versions enabled in the same vim instance. - * Only the first pyhton version used will be switched on. + * Only the first python version used will be switched on. */ int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix) @@ -3002,7 +3002,7 @@ rm -f conftest_grp if test "x$vim_cv_tty_group" != "xworld" ; then AC_DEFINE_UNQUOTED(PTYGROUP,$vim_cv_tty_group) if test "x$vim_cv_tty_mode" = "x" ; then - AC_MSG_ERROR([It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (propably 0620)]) + AC_MSG_ERROR([It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)]) else AC_DEFINE(PTYMODE, 0620) fi diff --git a/src/diff.c b/src/diff.c index f56046095c..cf091408d4 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1110,7 +1110,7 @@ ex_diffsplit(eap) } /* - * Set options to show difs for the current window. + * Set options to show diffs for the current window. */ void ex_diffthis(eap) diff --git a/src/dosinst.c b/src/dosinst.c index 6bc15fc7d4..3c5e59bd5d 100644 --- a/src/dosinst.c +++ b/src/dosinst.c @@ -1609,7 +1609,7 @@ change_openwith_choice(int idx) /* * Only add the choice for the open-with menu entry when gvim.exe was found - * and and regedit.exe exist. + * and regedit.exe exist. */ static void init_openwith_choice(void) diff --git a/src/edit.c b/src/edit.c index 65038e4372..6c21010156 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1418,7 +1418,7 @@ docomplete: normalchar: /* - * Insert a nomal character. + * Insert a normal character. */ #ifdef FEAT_AUTOCMD if (!p_paste) @@ -7162,7 +7162,7 @@ cursor_up(n, upd_topline) /* * Count each sequence of folded lines as one logical line. */ - /* go to the the start of the current fold */ + /* go to the start of the current fold */ (void)hasFolding(lnum, &lnum, NULL); while (n--) @@ -7213,7 +7213,7 @@ cursor_down(n, upd_topline) (void)hasFolding(lnum, NULL, &lnum); #endif /* This fails if the cursor is already in the last line or would move - * beyound the last line and '-' is in 'cpoptions' */ + * beyond the last line and '-' is in 'cpoptions' */ if (lnum >= curbuf->b_ml.ml_line_count || (lnum + n > curbuf->b_ml.ml_line_count && vim_strchr(p_cpo, CPO_MINUS) != NULL)) @@ -7715,7 +7715,7 @@ fix_indent() /* * return TRUE if 'cinkeys' contains the key "keytyped", * when == '*': Only if key is preceded with '*' (indent before insert) - * when == '!': Only if key is prededed with '!' (don't insert) + * when == '!': Only if key is preceded with '!' (don't insert) * when == ' ': Only if key is not preceded with '*'(indent afterwards) * * "keytyped" can have a few special values: @@ -8541,7 +8541,7 @@ ins_start_select(c) #endif /* - * <Insert> key in Insert mode: toggle insert/remplace mode. + * <Insert> key in Insert mode: toggle insert/replace mode. */ static void ins_insert(replaceState) diff --git a/src/eval.c b/src/eval.c index e757f6bc7f..04ed2c5bce 100644 --- a/src/eval.c +++ b/src/eval.c @@ -16669,7 +16669,7 @@ restore_win(save_curwin, save_curtab) tabpage_T *save_curtab; { #ifdef FEAT_WINDOWS - /* Restore current tabpage and window, if still valid (autocomands can + /* Restore current tabpage and window, if still valid (autocommands can * make them invalid). */ if (valid_tabpage(save_curtab)) goto_tabpage_tp(save_curtab, TRUE); diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 11446efd41..c2f768a1d5 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -2851,7 +2851,7 @@ cmd_source(fname, eap) EMSG(_(e_argreq)); else if (eap != NULL && eap->forceit) - /* ":source!": read Normal mdoe commands + /* ":source!": read Normal mode commands * Need to execute the commands directly. This is required at least * for: * - ":g" command busy diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 30fe937b56..4a372b5953 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1093,7 +1093,7 @@ do_cmdline(cmdline, fgetline, cookie, flags) msg_didany = FALSE; /* no output yet */ msg_start(); |