diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim
index bfe057cc35fbdbdd90f000d902a17e7a676942a3..5ca201b9d6cb06bb0f8f089ad6cff85c52097c33 100644
--- a/runtime/autoload/getscript.vim
+++ b/runtime/autoload/getscript.vim
@@ -1,8 +1,8 @@
" ---------------------------------------------------------------------
" getscript.vim
" Author: Charles E. Campbell, Jr.
-" Date: Nov 27, 2006
-" Version: 23
+" Date: May 05, 2007
+" Version: 25
" Installing: :help glvs-install
" Usage: :help glvs
"
@@ -15,14 +15,14 @@ if &cp
echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
finish
endif
-let s:keepfo = &fo
let s:keepcpo = &cpo
set cpo&vim
+"DechoTabOn
if exists("g:loaded_getscript")
finish
endif
-let g:loaded_getscript= "v23"
+let g:loaded_getscript= "v25"
" ---------------------------------------------------------------------
" Global Variables: {{{1
@@ -278,22 +278,28 @@ fun! s:GetOneScript(...)
" call Decho("attempting to do autoinstall: getcwd<".getcwd()."> filereadable(".fname.")=".filereadable(fname))
if filereadable(fname)
" call Decho("move <".fname."> to ".s:autoinstall)
-" call Decho("DISABLED for testing")
exe "silent !".g:GetLatestVimScripts_mv." ".fname." ".s:autoinstall
let curdir= escape(substitute(getcwd(),'\','/','ge'),"|[]*'\" #")
+" call Decho("exe cd ".s:autoinstall)
exe "cd ".s:autoinstall
+
+ " decompress
if fname =~ '\.bz2$'
" call Decho("attempt to bunzip2 ".fname)
exe "silent !bunzip2 ".fname
let fname= substitute(fname,'\.bz2$','','')
+" call Decho("new fname<".fname."> after bunzip2")
elseif fname =~ '\.gz$'
" call Decho("attempt to gunzip ".fname)
exe "silent !gunzip ".fname
let fname= substitute(fname,'\.gz$','','')
+" call Decho("new fname<".fname."> after gunzip")
endif
+
+ " distribute archive(.zip, .tar, .vba) contents
if fname =~ '\.zip$'
" call Decho("attempt to unzip ".fname)
- exe "silent !unzip -o".fname
+ exe "silent !unzip -o ".fname
elseif fname =~ '\.tar$'
" call Decho("attempt to untar ".fname)
exe "silent !tar -xvf ".fname
@@ -304,10 +310,13 @@ fun! s:GetOneScript(...)
so %
q
endif
+
if fname =~ '.vim$'
" call Decho("attempt to simply move ".fname." to plugin")
exe "silent !".g:GetLatestVimScripts_mv." ".fname." plugin"
endif
+
+ " helptags step
let docdir= substitute(&rtp,',.*','','e')."/doc"
" call Decho("helptags docdir<".docdir.">")
exe "helptags ".docdir
@@ -318,7 +327,7 @@ fun! s:GetOneScript(...)
" update the data in the <GetLatestVimScripts.dat> file
let modline=scriptid." ".latestsrcid." ".fname.cmmnt
call setline(line("."),modline)
-" call Decho("modline<".modline."> (updated GetLatestVimScripts.dat file)")
+" call Decho("update data in ".expand("%")."#".line(".").": modline<".modline.">")
endif
" restore options
@@ -351,10 +360,11 @@ fun! getscript#GetLatestVimScripts()
break
endif
if filereadable(datadir."GetLatestVimScripts.dat")
-" call Decho("found ".datadir."/GetLatestVimScripts.dat")
- break
+" call Decho("found ".datadir."/GetLatestVimScripts.dat")
+ break
endif
endfor
+
" Sanity checks: readability and writability
if datadir == ""
echoerr 'Missing "GetLatest/" on your runtimepath - see :help glvs-dist-install'
@@ -399,63 +409,84 @@ fun! getscript#GetLatestVimScripts()
" call Decho(" ")
" call Decho("searching plugins for GetLatestVimScripts dependencies")
let lastline = line("$")
- let plugins = globpath(&rtp,"plugin/*.vim")
+" call Decho("lastline#".lastline)
+ let plugins = split(globpath(&rtp,"plugin/*.vim"))
let foundscript = 0
+ let firstdir= ""
-" call Decho("plugins<".plugins."> lastline#".lastline)
- while plugins != ""
- let plugin = substitute(plugins,'\n.*$','','e')
- let plugins= (plugins =~ '\n')? substitute(plugins,'^.\{-}\n\(.*\)$','\1','e') : ""
+ for plugin in plugins
+
+ " don't process plugins in system directories
+ if firstdir == ""
+ let firstdir= substitute(plugin,'[/\\][^/\\]\+$','','')
+" call Decho("firstdir<".firstdir.">")
+ else
+ let curdir= substitute(plugin,'[/\\][^/\\]\+$','','')
+" call Decho("curdir<".curdir.">")
+ if curdir != firstdir
+ break
+ endif
+ endif
+
+ " read plugin in
$
+" call Decho(" ")
" call Decho(".dependency checking<".plugin."> line$=".line("$"))
exe "silent r ".plugin
+
while search('^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+','W') != 0
let newscript= substitute(getline("."),'^"\s\+GetLatestVimScripts:\s\+\d\+\s\+\d\+\s\+\(.*\)$','\1','e')
let llp1 = lastline+1
-
- if newscript !~ '^"'
- " found a "GetLatestVimScripts: # #" line in the script; check if its already in the datafile
- let curline = line(".")
- let noai_script = substitute(newscript,'\s*:AutoInstall:\s*','','e')
- exe llp1
- let srchline = search('\<'.noai_script.'\>','bW')
-" call Decho("..newscript<".newscript."> noai_script<".noai_script."> srch=".srchline." lastline=".lastline)
-
- if srchline == 0
- " found a new script to permanently include in the datafile
- let keep_rega = @a
- let @a = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
- exe lastline."put a"
- echomsg "Appending <".@a."> to ".datafile." for ".newscript
-" call Decho("..APPEND (".noai_script.")<".@a."> to GetLatestVimScripts.dat")
- let @a = keep_rega
- let lastline = llp1
- let curline = curline + 1
- let foundscript = foundscript + 1
-" else " Decho
-" call Decho("..found <".noai_script."> (already in datafile at line#".srchline.")")
- endif
-
- let curline = curline + 1
- exe curline
- endif
-
+" call Decho("..newscript<".newscript.">")
+
+ " don't process ""GetLatestVimScripts lines
+ if newscript !~ '^"'
+ " found a "GetLatestVimScripts: # #" line in the script; check if its already in the datafile
+ let curline = line(".")
+ let noai_script = substitute(newscript,'\s*:AutoInstall:\s*','','e')
+ exe llp1
+ let srchline = search('\<'.noai_script.'\>','bW')
+" call Decho("..noai_script<".noai_script."> srch=".srchline."curline#".line(".")." lastline#".lastline)
+
+ if srchline == 0
+ " found a new script to permanently include in the datafile
+ let keep_rega = @a
+ let @a = substitute(getline(curline),'^"\s\+GetLatestVimScripts:\s\+','','')
+ exe lastline."put a"
+ echomsg "Appending <".@a."> to ".datafile." for ".newscript
+" call Decho("..APPEND (".noai_script.")<".@a."> to GetLatestVimScripts.dat")
+ let @a = keep_rega
+ let lastline = llp1
+ let curline = curline + 1
+ let foundscript = foundscript + 1
+" else " Decho
+" call Decho("..found <".noai_script."> (already in datafile at line#".srchline.")")
+ endif
+
+ let curline = curline + 1
+ exe curline
+ endif
endwhile
+
let llp1= lastline + 1
" call Decho(".deleting lines: ".llp1.",$d")
exe "silent! ".llp1.",$d"
- endwhile
+ endfor
+" call Decho("--- end dependency checking loop --- foundscript=".foundscript)
+" call Decho(" ")
if foundscript == 0
set nomod
endif
" Check on out-of-date scripts using GetLatest/GetLatestVimScripts.dat
+" call Decho("begin: checking out-of-date scripts using datafile<".datafile.">")
set lz
-" call Decho(" --- end of dependency checking loop --- ")
-" call Decho("call GetOneScript on lines at end of datafile<".datafile.">")
1
- /^-----/,$g/^\s*\d/call <SID>GetOneScript()
+" /^-----/,$g/^\s*\d/call Decho(getline("."))
+ 1
+ /^-----/,$g/^\s*\d/call s:GetOneScript()
+" call Decho("--- end out-of-date checking --- ")
" Final report (an echomsg)
try
@@ -495,7 +526,6 @@ endfun
" ---------------------------------------------------------------------
" Restore Options: {{{1
-let &fo = s:keepfo
let &cpo= s:keepcpo
" vim: ts=8 sts=2 fdm=marker nowrap
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 037a3ccb1fd4d4b22485ddca1f73b4eff852a2d1..e9b9ca1e97c552654504b72e6bdf540c2b282129 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt* For Vim version 7.1a. Last change: 2006 Sep 26
+*develop.txt* For Vim version 7.1b. Last change: 2007 May 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -437,7 +437,7 @@ the best method is. Alternatives:
seconds for English, which can be acceptable for interactive use. But for
some languages it takes more than ten seconds (e.g., German, Catalan),
which is unacceptable slow. For batch processing (automatic corrections)
- it's to slow for all languages.
+ it's too slow for all languages.
2. Use a trie for the soundfolded words, so that searching can be done just
like how it works without soundfolding. This requires remembering a list
of good words for each soundfolded word. This makes finding matches very
@@ -471,7 +471,7 @@ initialized from words listed in COMMON items in the affix file, so that it
also works when starting a new file.
This isn't ideal, because the longer Vim is running the higher the counts
-become. But in practice it is a noticable improvement over not using the word
+become. But in practice it is a noticeable improvement over not using the word
count.
==============================================================================
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index 8ca411090939ba416950e70d351d177788fad0ec..70afbf763f2e7eb2f9bf208aca9808148db3d113 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt* For Vim version 7.1a. Last change: 2006 Jul 18
+*digraph.txt* For Vim version 7.1b. Last change: 2006 Jul 18
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 05c46fbfe759cce99d1be028ccdb042e32ab791a..4f7ab523486f56ab932fe8fcaae0efbcf45f2a63 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.1a. Last change: 2006 Oct 10
+*editing.txt* For Vim version 7.1b. Last change: 2006 Oct 10
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 04bbced3474fe953ca8d0b4ee8eb82e86174ff5e..50d53ba61d5a3798455adde0f05f0de8f28fd0a0 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.1a. Last change: 2006 Apr 30
+*if_pyth.txt* For Vim version 7.1b. Last change: 2006 Apr 30
VIM REFERENCE MANUAL by Paul Moore
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 80bc7e00aafd0c2bfe8a66158b5d6b4479aa9d88..20d6ff8a16c1a6e4ed217b53a241dcebc2345d23 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt* For Vim version 7.1a. Last change: 2006 Nov 14
+*netbeans.txt* For Vim version 7.1b. Last change: 2006 Nov 14
VIM REFERENCE MANUAL by Gordon Prieur
diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt
index 52276efaf8a8eda1e4eb093e7d0924ecc7295310..46f19040c07f42ed77669a1c01f5e2f4cb6ae493 100644
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt* For Vim version 7.1a. Last change: 2005 Mar 29
+*os_beos.txt* For Vim version 7.1b. Last change: 2005 Mar 29
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 9377d644373a6cf9a2c3dd978474877d0c04326a..ab95d5e2f61e101c7112487cd7135ce577265d45 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.1a. Last change: 2006 Nov 18
+*quickref.txt* For Vim version 7.1b. Last change: 2006 Nov 18
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt
index 170643ae8f6866ae2ce4dacbe0a8777355619e8c..026262556fe21175fb313afac8ced49bfc265db8 100644
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt* For Vim version 7.1a. Last change: 2007 Jan 05
+*sponsor.txt* For Vim version 7.1b. Last change: 2007 Jan 05
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index d5a9d07b9daecb5f8211e89846de39ed8c8bce3c..560e060e92f35a810e560a977001204233716c4e 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt* For Vim version 7.1a. Last change: 2007 Jan 05
+*uganda.txt* For Vim version 7.1b. Last change: 2007 May 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -13,6 +13,7 @@ below or visit the ICCF web site, available at these URLs:
http://iccf-holland.org/
http://www.vim.org/iccf/
+ http://www.iccf.nl/
You can also sponsor the development of Vim. Vim sponsors can vote for
features. See |sponsor|. The money goes to Uganda anyway.
diff --git a/runtime/spell/en.utf-8.spl b/runtime/spell/en.utf-8.spl
index aa9a6159e0b3a00fd0c3085d82b6c699f076f32f..250d4253b7e4d190b0e2742c20be5b61894cd294 100644
Binary files a/runtime/spell/en.utf-8.spl and b/runtime/spell/en.utf-8.spl differ
diff --git a/runtime/syntax/arch.vim b/runtime/syntax/arch.vim
index 1e7856d2c86b7a28a3a5a9cdf37054990e22eb8b..ad23a7713108397fdd82f9e84d6ed2b56a5c516e 100644
--- a/runtime/syntax/arch.vim
+++ b/runtime/syntax/arch.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: GNU Arch inventory file
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2006-04-19
+" Latest Revision: 2007-05-06
if exists("b:current_syntax")
finish
@@ -17,7 +17,7 @@ syn keyword archTodo TODO FIXME XXX NOTE
syn region archComment display start='^\%(#\|\s\)' end='$'
\ contains=archTodo,@Spell
-syn match argBegin display '^' nextgroup=archKeyword,archComment
+syn match archBegin display '^' nextgroup=archKeyword,archComment
syn keyword archKeyword contained implicit tagline explicit names
syn keyword archKeyword contained untagged-source
diff --git a/runtime/syntax/litestep.vim b/runtime/syntax/litestep.vim
new file mode 100644
index 0000000000000000000000000000000000000000..b4c15faf65a90b97b0e2414be516d3149c5fdd54
--- /dev/null
+++ b/runtime/syntax/litestep.vim
@@ -0,0 +1,269 @@
+" Vim syntax file
+" Language: LiteStep RC file
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2007-02-22
+
+if exists("b:current_syntax")
+ finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword litestepTodo
+ \ contained
+ \ TODO FIXME XXX NOTE
+
+syn match litestepComment
+ \ contained display contains=litestepTodo,@Spell
+ \ ';.*$'
+
+syn case ignore
+
+syn cluster litestepBeginnings
+ \ contains=
+ \ litestepComment,
+ \ litestepPreProc,
+ \ litestepMultiCommandStart,
+ \ litestepBangCommandStart,
+ \ litestepGenericDirective
+
+syn match litestepGenericDirective
+ \ contained display
+ \ '\<\h\w\+\>'
+
+syn match litestepBeginning
+ \ nextgroup=@litestepBeginnings skipwhite
+ \ '^'
+
+syn keyword litestepPreProc
+ \ contained
+ \ Include
+ \ If
+ \ ElseIf
+ \ Else
+ \ EndIf
+
+syn cluster litestepMultiCommands
+ \ contains=
+ \ litestepMultiCommand
+
+syn match litestepMultiCommandStart
+ \ nextgroup=@litestepMultiCommands
+ \ '\*'
+
+syn match litestepMultiCommand
+ \ contained display
+ \ '\<\h\w\+\>'
+
+syn cluster litestepVariables
+ \ contains=
+ \ litestepBuiltinFolderVariable,
+ \ litestepBuiltinConditionalVariable,
+ \ litestepBuiltinResourceVariable,
+ \ litestepBuiltinGUIDFolderMappingVariable,
+ \ litestepVariable
+
+syn region litestepVariableExpansion
+ \ display oneline transparent
+ \ contains=
+ \ @litestepVariables,
+ \ litestepNumber,
+ \ litestepMathOperator
+ \ matchgroup=litestepVariableExpansion
+ \ start='\$'
+ \ end='\$'
+
+syn match litestepNumber
+ \ display
+ \ '\<\d\+\>'
+
+syn region litestepString
+ \ display oneline contains=litestepVariableExpansion
+ \ start=+"+ end=+"+
+
+" TODO: unsure about this one.
+syn region litestepSubValue
+ \ display oneline contains=litestepVariableExpansion
+ \ start=+'+ end=+'+
+
+syn keyword litestepBoolean
+ \ true
+ \ false
+
+"syn keyword litestepLine
+" \ ?
+
+"syn match litestepColor
+" \ display
+" \ '\<\x\+\>'
+
+syn match litestepRelationalOperator
+ \ display
+ \ '=\|<[>=]\=\|>=\='
+
+syn keyword litestepLogicalOperator
+ \ and
+ \ or
+ \ not
+
+syn match litestepMathOperator
+ \ contained display
+ \ '[+*/-]'
+
+syn keyword litestepBuiltinDirective
+ \ LoadModule
+ \ LSNoStartup
+ \ LSAutoHideModules
+ \ LSNoShellWarning
+ \ LSSetAsShell
+ \ LSUseSystemDDE
+ \ LSDisableTrayService
+ \ LSImageFolder
+ \ ThemeAuthor
+ \ ThemeName
+
+syn keyword litestepDeprecatedBuiltinDirective
+ \ LSLogLevel
+ \ LSLogFile
+
+syn match litestepVariable
+ \ contained display
+ \ '\<\h\w\+\>'
+
+syn keyword litestepBuiltinFolderVariable
+ \ contained
+ \ AdminToolsDir
+ \ CommonAdminToolsDir
+ \ CommonDesktopDir
+ \ CommonFavorites
+ \ CommonPrograms
+ \ CommonStartMenu
+ \ CommonStartup
+ \ Cookies
+ \ Desktop
+ \ DesktopDir
+ \ DocumentsDir
+ \ Favorites
+ \ Fonts
+ \ History
+ \ Internet
+ \ InternetCache
+ \ LitestepDir
+ \ Nethood
+ \ Printhood
+ \ Programs
+ \ QuickLaunch
+ \ Recent
+ \ Sendto
+ \ Startmenu
+ \ Startup
+ \ Templates
+ \ WinDir
+ \ LitestepDir
+
+syn keyword litestepBuiltinConditionalVariable
+ \ contained
+ \ Win2000
+ \ Win95
+ \ Win98
+ \ Win9X
+ \ WinME
+ \ WinNT
+ \ WinNT4
+ \ WinXP
+
+syn keyword litestepBuiltinResourceVariable
+ \ contained
+ \ CompileDate
+ \ ResolutionX
+ \ ResolutionY
+ \ UserName
+
+syn keyword litestepBuiltinGUIDFolderMappingVariable
+ \ contained
+ \ AdminTools
+ \ BitBucket
+ \ Controls
+ \ Dialup
+ \ Documents
+ \ Drives
+ \ Network
+ \ NetworkAndDialup
+ \ Printers
+ \ Scheduled
+
+syn cluster litestepBangs
+ \ contains=
+ \ litestepBuiltinBang,
+ \ litestepBang
+
+syn match litestepBangStart
+ \ nextgroup=@litestepBangs
+ \ '!'
+
+syn match litestepBang
+ \ contained display
+ \ '\<\h\w\+\>'
+
+syn keyword litestepBuiltinBang
+ \ contained
+ \ About
+ \ Alert
+ \ CascadeWindows
+ \ Confirm
+ \ Execute
+ \ Gather
+ \ HideModules
+ \ LogOff
+ \ MinimizeWindows
+ \ None
+ \ Quit
+ \ Recycle
+ \ Refresh
+ \ Reload
+ \ ReloadModule
+ \ RestoreWindows
+ \ Run
+ \ ShowModules
+ \ Shutdown
+ \ Switchuser
+ \ TileWindowsH
+ \ TileWindowsV
+ \ ToggleModules
+ \ UnloadModule
+
+hi def link litestepTodo Todo
+hi def link litestepComment Comment
+hi def link litestepDirective Keyword
+hi def link litestepGenericDirective litestepDirective
+hi def link litestepPreProc PreProc
+hi def link litestepMultiCommandStart litestepPreProc
+hi def link litestepMultiCommand litestepDirective
+hi def link litestepDelimiter Delimiter
+hi def link litestepVariableExpansion litestepDelimiter
+hi def link litestepNumber Number
+hi def link litestepString String
+hi def link litestepSubValue litestepString
+hi def link litestepBoolean Boolean
+"hi def link litestepLine
+"hi def link litestepColor Type
+hi def link litestepOperator Operator
+hi def link litestepRelationalOperator litestepOperator
+hi def link litestepLogicalOperator litestepOperator
+hi def link litestepMathOperator litestepOperator
+hi def link litestepBuiltinDirective litestepDirective
+hi def link litestepDeprecatedBuiltinDirective Error
+hi def link litestepVariable Identifier
+hi def link litestepBuiltinFolderVariable Identifier
+hi def link litestepBuiltinConditionalVariable Identifier
+hi def link litestepBuiltinResourceVariable Identifier
+hi def link litestepBuiltinGUIDFolderMappingVariable Identifier
+hi def link litestepBangStart litestepPreProc
+hi def link litestepBang litestepDirective
+hi def link litestepBuiltinBang litestepBang
+
+let b:current_syntax = "litestep"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/src/README.txt b/src/README.txt
index 2ebbda0054eae5ad2e8e6add3f33c169a33de7e0..bd9365205378e6998ee1b4ccac2cd6ebd353eca0 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -138,6 +138,6 @@ DEBUGGING THE GUI
Remember to prevent that gvim forks and the debugger thinks Vim has exited,
add the "-f" argument. In gdb: "run -f -g".
-When stepping through display updating code, the focus event is triggerred
+When stepping through display updating code, the focus event is triggered
when going from the debugger to Vim and back. To avoid this, recompile with
some code in gui_focus_change() disabled.
diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index 3774ff421414fc63485be0a7a5963afa06f36a61..041ed5a461fea6e6cf0efca967ce0d9ec3fb2bf9 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1031,8 +1031,8 @@ LookupName(dpy, name, delete, loose)
}
/*
- * Delete any lingering occurences of window id. We promise that any
- * occurences is not ours since it is not yet put into the registry (by us)
+ * Delete any lingering occurrence of window id. We promise that any
+ * occurrence is not ours since it is not yet put into the registry (by us)
*
* This is necessary in the following scenario:
* 1. There is an old windowid for an exit'ed vim in the registry
@@ -1150,7 +1150,7 @@ GetRegProp(dpy, regPropp, numItemsp, domsg)
}
/*
- * This procedure is invoked by the varous X event loops throughout Vims when
+ * This procedure is invoked by the various X event loops throughout Vims when
* a property changes on the communication window. This procedure reads the
* property and handles command requests and responses.
*/
diff --git a/src/os_vms.c b/src/os_vms.c
index a612d81044e6b7f0f882f00f1a79cab02c45f04d..297d7f7fa40d313a08f92cfed9d7655214912b8e 100644
--- a/src/os_vms.c
+++ b/src/os_vms.c
@@ -323,7 +323,7 @@ vms_read(char *inbuf, size_t nbytes)
inbuf, nbytes-1, 0, 0, &itmlst, sizeof(itmlst));
len = strlen(inbuf); /* how many chars we got? */
- /* read immedatelly the rest in the IO queue */
+ /* read immediately the rest in the IO queue */
function = (IO$_READLBLK | IO$M_TIMED | IO$M_ESCAPE | IO$M_NOECHO | IO$M_NOFILTR);
status = sys$qiow(0, iochan, function, &iosb, 0, 0,
inbuf+len, nbytes-1-len, 0, 0, 0, 0);
@@ -338,7 +338,7 @@ vms_read(char *inbuf, size_t nbytes)
* We want to save each match for later retrieval.
*
* Returns: 1 - continue finding matches
- * 0 - stop trying to find any further mathces
+ * 0 - stop trying to find any further matches
*/
static int
vms_wproc(char *name, int val)
@@ -347,7 +347,8 @@ vms_wproc(char *name, int val)
int nlen;
static int vms_match_alloced = 0;
- if (val != DECC$K_FILE) /* Directories and foreing non VMS files are not counting */
+ if (val != DECC$K_FILE) /* Directories and foreign non VMS files are not
+ counting */
return 1;
if (vms_match_num == 0) {
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 7700ecf5aec655aebafbc0e76be4f283fc008d43..e42b8f74b03475f9c96b94df9602cda25cca2dc1 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -5,7 +5,7 @@
* -c option, mls
* 26.04.94 better option parser, -ps, -l, -s added.
* 1.07.94 -r badly needs - as input file. Per default autoskip over
- * consequtive lines of zeroes, as unix od does.
+ * consecutive lines of zeroes, as unix od does.
* -a shows them too.
* -i dump as c-style #include "file.h"
* 1.11.95 if "xxd -i" knows the filename, an 'unsigned char filename_bits[]'
@@ -48,7 +48,7 @@
* 27.10.98 Fixed: -g option parser required blank.
* option -b added: 01000101 binary output in normal format.
* 16.05.00 Added VAXC changes by Stephen P. Wall
- * 16.05.00 Improved MMS file and merege for VMS by Zoltan Arpadffy
+ * 16.05.00 Improved MMS file and merge for VMS by Zoltan Arpadffy
*
* (c) 1990-1998 by Juergen Weigert (jnweiger@informatik.uni-erlangen.de)
*
@@ -774,7 +774,7 @@ char *argv[];
xxdline(fpo, l, 1);
}
else if (autoskip)
- xxdline(fpo, l, -1); /* last chance to flush out supressed lines */
+ xxdline(fpo, l, -1); /* last chance to flush out suppressed lines */
fclose(fp);
fclose(fpo);