Skip to content
This repository has been archived by the owner on Dec 20, 2020. It is now read-only.

Commit

Permalink
updated for version 7.3.925
Browse files Browse the repository at this point in the history
Problem:    Typos in source files.
Solution:   Fix the typos. (Ken Takata)
  • Loading branch information
brammool committed May 6, 2013
1 parent e1de03d commit 76e5f82
Show file tree
Hide file tree
Showing 72 changed files with 167 additions and 166 deletions.
2 changes: 1 addition & 1 deletion runtime/plugin/matchparen.vim
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions runtime/tools/vim_vs_net.cmd
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/GvimExt/gvimext.cpp
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/INSTALLvms.txt
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions 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!
#
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Make_mvc.mak
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Make_sas.mak
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Make_vms.mms
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Make_w16.mak
Expand Up @@ -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.
# *************************************************************
Expand Down
22 changes: 11 additions & 11 deletions src/Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)`
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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".
#
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/VisVim/OleAut.cpp
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/VisVim/README_VisVim.txt
Expand Up @@ -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."
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/auto/configure
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/buffer.c
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/configure.in
Expand Up @@ -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";
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/diff.c
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/dosinst.c
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/edit.c
Expand Up @@ -1418,7 +1418,7 @@ edit(cmdchar, startln, count)

normalchar:
/*
* Insert a nomal character.
* Insert a normal character.
*/
#ifdef FEAT_AUTOCMD
if (!p_paste)
Expand Down Expand Up @@ -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--)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/eval.c
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/ex_cmds2.c
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/ex_docmd.c
Expand Up @@ -1093,7 +1093,7 @@ do_cmdline(cmdline, fgetline, cookie, flags)
msg_didany = FALSE; /* no output yet */
msg_start();
msg_scroll = TRUE; /* put messages below each other */
++no_wait_return; /* dont wait for return until finished */
++no_wait_return; /* don't wait for return until finished */
++RedrawingDisabled;
did_inc = TRUE;
}
Expand Down Expand Up @@ -1298,7 +1298,7 @@ do_cmdline(cmdline, fgetline, cookie, flags)
&& !(did_emsg
#ifdef FEAT_EVAL
/* Keep going when inside try/catch, so that the error can be
* dealth with, except when it is a syntax error, it may cause
* deal with, except when it is a syntax error, it may cause
* the :endtry to be missed. */
&& (cstack.cs_trylevel == 0 || did_emsg_syntax)
#endif
Expand Down Expand Up @@ -10982,7 +10982,7 @@ ses_put_fname(fd, name, flagp)
*p = '/';
}

/* escapse special characters */
/* escape special characters */
p = vim_strsave_fnameescape(sname, FALSE);
vim_free(sname);
if (p == NULL)
Expand Down

0 comments on commit 76e5f82

Please sign in to comment.