diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index bf40afa88749f7732e9ecf649ff94d7323e95fdb..ab582dcae07539a5c25dc9db9182287387407e0b 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.3. Last change: 2011 Apr 14
+*diff.txt* For Vim version 7.3. Last change: 2012 May 18
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index d8fa4086d1a3ee8b9096ab0d511769e0ab25e6bc..4629c0f6c04f7171b461a2cb3dfb40937c2f8dd1 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.3. Last change: 2012 Apr 20
+*insert.txt* For Vim version 7.3. Last change: 2012 May 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1017,9 +1017,13 @@ The function must return the column where the completion starts. It must be a
number between zero and the cursor column "col('.')". This involves looking
at the characters just before the cursor and including those characters that
could be part of the completed item. The text between this column and the
-cursor column will be replaced with the matches. Return -1 if no completion
-can be done, the completion will be cancelled with an error message. Return
--2 to cancel silently.
+cursor column will be replaced with the matches.
+
+Special return values:
+ -1 If no completion can be done, the completion will be cancelled with an
+ error message.
+ -2 To cancel silently and stay in completion mode.
+ -3 To cancel silently and leave completion mode.
On the second invocation the arguments are:
a:findstart 0
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 9804c5d28079cb9a6929221daf2f128812c02557..ba824ac8b819028be4e82c6add803cc203e46fbb 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -43,27 +43,17 @@ Bug caused by patch 7.3.449. (Alex Afros, May 16)
Add link to i/OS version on download page:
http://applidium.com/en/applications/vim/
-Patch to fix helptags for multi-byte encoding. (Yasuhiro Matsumoto, 2012 May
-10)
-
GTK: problem with 'L' in 'guioptions' changing the window width.
(Aaron Cornelius, 2012 Feb 6)
-Patch for completefunction. (Mtsushita Shougo, 2012 May 11)
-
Patch: home_replace() does not work whtn 8.3 filename. (Yasuhiro
Matsumoto, 2012 Apr 18) Asked for another version of the patch.
+Again May 18.
Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
-Gvim startup hangs in Ubuntu 12.04. (Yasuhiro Matsumoto, 2012 May 2)
-Patch available on github. Updated May 8 and May 9?.
-
Spell checking: "zg" doesn't pick up the "ß" character. (Axel Bender, 2012 May
-1) Christian Brabandt reports a crash when doing something similar. (May 2)
-Fix for this: Christian Brabandt, 2012 May 9.
-
-Patch to avoid a crash when using MEM_PROFILE. (Dominique Pelle, 2012 May 14)
+1)
Win32: When a directory name contains an exclamation mark, completion doesn't
complete the contents of the directory. No escaping for the "!"? (Jan
@@ -71,9 +61,6 @@ Stocker, 2012 Jan 5)
Issue 54: document behavior of -complete, also expands arg.
-Patch to make ":diffupdate" check for buffers changed outside of Vim.
-(Christian Brabandt, 2012 May 13, update later)
-
Cursor on wrong line after ":copen". (John Beckett, 2012 Apr 30)
Fix by Christian Brabandt, 2012 May 2. But calling changed_window_setting()
would be a simpler solution.
@@ -166,9 +153,6 @@ Updated syntax file for ssh_config, maintainer doesn't respond.
BufWinLeave triggers too late when quitting last window in a tab page. (Lech
Lorens, 2012 Feb 21)
-"fC" doesn't position the cursor correctly when there are concealed
-characters. Patch by Christian Brabandt, 2011 Oct 11)
-
Patch for 'transparency' option. (Sergiu Dotenco, 2011 Sep 17)
Only for MS-Windows. No documentation. Do we want this?
@@ -184,12 +168,9 @@ Christian Brabandt has another incomplete patch. (2011 Jul 13)
Also: Alignment in help with tabs gets messed up, esp. at ":help index".
Probably need to make a tab work like there was no concealing. Possibly with
an option. Like line wrapping works as if there is no concealing.
-
-'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
-2012 Apr 2.
-
-'cursorline' works on a text line only. Add 'cursorscreenline' for
-highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
+Patch by Dominique Pelle, Also fixes "fC" problem.
+ "fC" doesn't position the cursor correctly when there are concealed
+ characters. Patch by Christian Brabandt, 2011 Oct 11)
With concealed text mouse click doesn't put the cursor in the right position.
(Herb Sitz) Fix by Christian Brabandt, 2011 Jun 16. Doesn't work properly,
@@ -199,6 +180,12 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
21, Ben Fritz, 2010 Sep 14)
+'cursorline' is drawn incorrectly in diff mode. Patch by Christian Brabandt,
+2012 Apr 2.
+
+'cursorline' works on a text line only. Add 'cursorscreenline' for
+highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
+
Win32: Does building a 64 bit version with VC9 give warnings for int
conversions? (Mike Williams)
@@ -1121,6 +1108,7 @@ Latest version: 2011 May 18
8 Windows install with NSIS: make it possible to do a silent install, see
http://nsis.sourceforge.net/Docs/Chapter4.html#4.12
Version from Guopeng Wen that does this (2010 Dec 27)
+Alternative: MSI installer: https://github.com/petrkle/vim-msi/
Windows installer should install 32-bit version of right-click handler also on
64-bit systems. (Brian Cunningham, 2011 Dec 28)
diff --git a/runtime/ftplugin/art.vim b/runtime/ftplugin/art.vim
index cb95e6bf8fac147e80dc6012ab43b756c3d64d11..c501a992d8d247b26b72baac723af046132cbff5 100644
--- a/runtime/ftplugin/art.vim
+++ b/runtime/ftplugin/art.vim
@@ -12,5 +12,4 @@ endif
run ftplugin/lisp.vim
setl lw-=if
-setl lw+=def-art-fun,deffacts,defglobal,defrule,defschema,
- \for,schema,while
+setl lw+=def-art-fun,deffacts,defglobal,defrule,defschema,for,schema,while
diff --git a/runtime/ftplugin/cs.vim b/runtime/ftplugin/cs.vim
index 0ff3c9d56f9be9ca3f7d9579f0bd70eb32d5a40e..7c2cbda32f6f4a02be0177a780de071d4b9c2f70 100644
--- a/runtime/ftplugin/cs.vim
+++ b/runtime/ftplugin/cs.vim
@@ -10,6 +10,8 @@ endif
" Don't load another plugin for this buffer
let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
" Set 'formatoptions' to break comment lines but not other lines,
" and insert the comment leader when hitting <CR> or using "o".
@@ -22,3 +24,6 @@ if has("gui_win32") && !exists("b:browsefilter")
let b:browsefilter = "C# Source Files (*.cs)\t*.cs\n" .
\ "All Files (*.*)\t*.*\n"
endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/ftplugin/ishd.vim b/runtime/ftplugin/ishd.vim
index dedb32889d511a4d273b216329b542b127ad247a..33ef1510b5a79e474dfc4a21a203738cc9e20ddf 100644
--- a/runtime/ftplugin/ishd.vim
+++ b/runtime/ftplugin/ishd.vim
@@ -8,6 +8,8 @@ let b:did_ftplugin = 1
setlocal foldmethod=syntax
+" Using line continuation here.
+let s:cpo_save = &cpo
set cpo-=C
" matchit support
@@ -26,3 +28,6 @@ if has("gui_win32") && !exists("b:browsefilter")
let b:browsefilter = "InstallShield Files (*.rul)\t*.rul\n" .
\ "All Files (*.*)\t*.*\n"
endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/ftplugin/occam.vim b/runtime/ftplugin/occam.vim
index 9806318ef3fd54961b91d76a54dd61bf19e43c5f..e9b7c014b38f85cdeea8bfb62a84ff8fc1867945 100644
--- a/runtime/ftplugin/occam.vim
+++ b/runtime/ftplugin/occam.vim
@@ -9,6 +9,8 @@ if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
"{{{ Indent settings
" Set shift width for indent
@@ -42,3 +44,6 @@ let b:undo_ftplugin = "setlocal shiftwidth< softtabstop< expandtab<"
\ . " formatoptions< comments< textwidth<"
\ . "| unlet! b:browsefiler"
"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/ftplugin/pyrex.vim b/runtime/ftplugin/pyrex.vim
index 69bd93dd1a14ad5069425cb63077f84d7a62734a..251da39df43cd446c5807b4dac51e6ec913e8a8f 100644
--- a/runtime/ftplugin/pyrex.vim
+++ b/runtime/ftplugin/pyrex.vim
@@ -2,12 +2,14 @@
" Language: Pyrex
" Maintainer: Marco Barisione <marco.bari@people.it>
" URL: http://marcobari.altervista.org/pyrex_vim.html
-" Last Change: 2004 May 16
+" Last Change: 2012 May 18
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
" Behaves just like Python
runtime! ftplugin/python.vim ftplugin/python_*.vim ftplugin/python/*.vim
@@ -20,3 +22,6 @@ if has("gui_win32") && exists("b:browsefilter")
\ "C++ Source Files (*.cpp *.c++)\t*.cpp;*.c++\n" .
\ "All Files (*.*)\t*.*\n"
endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim
index f6084b703d4fd2c4d93159d47f7ae2c84d545368..c13dcf18697e0724a30ba30b276976c248f2420a 100644
--- a/runtime/ftplugin/sql.vim
+++ b/runtime/ftplugin/sql.vim
@@ -2,7 +2,7 @@
" Language: SQL (Common for Oracle, Microsoft SQL Server, Sybase)
" Version: 8.0
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2012 Mar 11
+" Last Change: 2012 May 18
" Download: http://vim.sourceforge.net/script.php?script_id=454
" For more details please use:
@@ -67,7 +67,7 @@ if exists("b:did_ftplugin")
endif
let s:save_cpo = &cpo
-set cpo=
+set cpo&vim
" Disable autowrapping for code, but enable for comments
" t Auto-wrap text using textwidth
diff --git a/runtime/ftplugin/zimbu.vim b/runtime/ftplugin/zimbu.vim
index e50c1b65b59f16759a67536130e98df929925f9b..85b57f464f4730aab5a5b81b0298e1631081b408 100644
--- a/runtime/ftplugin/zimbu.vim
+++ b/runtime/ftplugin/zimbu.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Zimbu
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 May 17
+" Last Change: 2012 May 18
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -15,7 +15,7 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo-=C
-let b:undo_ftplugin = "setl fo< com< ofu< | if has('vms') | setl isk< | endif"
+let b:undo_ftplugin = "setl fo< com< ofu< efm< tw< et< sts< sw< | if has('vms') | setl isk< | endif"
" Set 'formatoptions' to break comment lines but not other lines,
" and insert the comment leader when hitting <CR> or using "o".
diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim
index 8c408fb1ec530b466b736c999c092baa3a8bf7f7..421afcb6d75caa459992faa6041989ede444aa1d 100644
--- a/runtime/indent/cmake.vim
+++ b/runtime/indent/cmake.vim
@@ -23,6 +23,8 @@ setlocal indentkeys+==ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
if exists("*CMakeGetIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
fun! CMakeGetIndent(lnum)
let this_line = getline(a:lnum)
@@ -83,3 +85,6 @@ fun! CMakeGetIndent(lnum)
return ind
endfun
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim
index 2a09566e1afad3f0ce892c918d2cf51a07bd38a6..f85bb05acb5d30ea8e9a5b17afec4ec5d565e227 100644
--- a/runtime/indent/css.vim
+++ b/runtime/indent/css.vim
@@ -15,6 +15,8 @@ setlocal nosmartindent
if exists("*GetCSSIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
function s:prevnonblanknoncomment(lnum)
let lnum = a:lnum
@@ -74,3 +76,6 @@ function GetCSSIndent()
return indent(pnum) + s:count_braces(pnum, 1) * &sw
\ - s:count_braces(v:lnum, 0) * &sw
endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/indent/eiffel.vim b/runtime/indent/eiffel.vim
index db66bf8fea6c85f318b1d848681694fb6b990ff3..472665275b1bb3b224be82523477e1c63fdbb0ff 100644
--- a/runtime/indent/eiffel.vim
+++ b/runtime/indent/eiffel.vim
@@ -5,7 +5,7 @@
" $Date: 2004/12/09 21:33:52 $
" $Revision: 1.3 $
" URL: http://www.djoce.net/page/vim/
-" Last Change: 2004 Sept 14 : removed specific value for tab (sw)
+" Last Change: 2012 May 18
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -37,6 +37,8 @@ let s:inheritance_dent = '\s*\(redefine\|rename\|export\)\>'
if exists("*GetEiffelIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
function GetEiffelIndent()
@@ -103,4 +105,7 @@ function GetEiffelIndent()
return ind
endfunction
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vim:sw=2
diff --git a/runtime/indent/idlang.vim b/runtime/indent/idlang.vim
index 97c31ada581fe29d35894fb86b654d81f44edab0..b4c6ae6feaae59c04b220d054d02a2d339f6d8d7 100644
--- a/runtime/indent/idlang.vim
+++ b/runtime/indent/idlang.vim
@@ -1,6 +1,6 @@
" IDL (Interactive Data Language) indent file.
" Language: IDL (ft=idlang)
-" Last change: 2002 Sep 23
+" Last change: 2012 May 18
" Maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
" Only load this indent file when no other was loaded.
@@ -9,8 +9,7 @@ if exists("b:did_indent")
endif
let b:did_indent = 1
-setlocal indentkeys=o,O,0=endif,0=ENDIF,0=endelse,0=ENDELSE,0=endwhile,
- \0=ENDWHILE,0=endfor,0=ENDFOR,0=endrep,0=ENDREP
+setlocal indentkeys=o,O,0=endif,0=ENDIF,0=endelse,0=ENDELSE,0=endwhile,0=ENDWHILE,0=endfor,0=ENDFOR,0=endrep,0=ENDREP
setlocal indentexpr=GetIdlangIndent(v:lnum)
diff --git a/runtime/indent/java.vim b/runtime/indent/java.vim
index 3c48d3e35faf8c40c24bd4a58c4cf07b4d14170c..e0aec0faefb729d50ff3f22d926db76d2749eefb 100644
--- a/runtime/indent/java.vim
+++ b/runtime/indent/java.vim
@@ -2,7 +2,7 @@
" Language: Java
" Previous Maintainer: Toby Allsopp <toby.allsopp@peace.com>
" Current Maintainer: Hong Xu <xuhdev@gmail.com>
-" Last Change: 2012 Jan 20
+" Last Change: 2012 May 18
" Version: 1.0
" License: Same as Vim.
" Copyright (c) 2012 Hong Xu
@@ -29,6 +29,8 @@ let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
if exists("*GetJavaIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
function! SkipJavaBlanksAndComments(startline)
let lnum = a:startline
@@ -139,4 +141,7 @@ function GetJavaIndent()
return theIndent
endfunction
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vi: sw=2 et
diff --git a/runtime/indent/mp.vim b/runtime/indent/mp.vim
index 1aea4f809c16e4b89e8b0ec638f7cdf2bae6725c..a118eb8b60922f24d2962f80d15e6d8780fa8869 100644
--- a/runtime/indent/mp.vim
+++ b/runtime/indent/mp.vim
@@ -1,7 +1,7 @@
" MetaPost indent file
" Language: MetaPost
" Maintainer: Eugene Minkovskii <emin@mccme.ru>
-" Last Change: 2003 Nov 21
+" Last Change: 2012 May 18
" Version: 0.1
" ==========================================================================
@@ -56,6 +56,8 @@ setlocal indentkeys+=;,<:>,=if,=for,=def,=end,=else,=fi
if exists("*GetMetaPostIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
" Auxiliary Definitions: {{{1
function! MetaNextNonblankNoncomment(pos)
@@ -203,4 +205,7 @@ function! GetMetaPostIndent()
endfunction
"
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vim:sw=2:fdm=marker
diff --git a/runtime/indent/occam.vim b/runtime/indent/occam.vim
index ba978e00697de0b74893fb0c9282309fd81f81c9..bebb0528bb5f32cbebb10b7f342ba3d4dfc85de7 100644
--- a/runtime/indent/occam.vim
+++ b/runtime/indent/occam.vim
@@ -20,6 +20,8 @@ setlocal indentkeys=o,O,0=:
if exists("*GetOccamIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
"{{{ Indent definitions
" Define carriage return indent
@@ -180,3 +182,6 @@ function GetOccamIndent()
endfunction
"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/indent/sqlanywhere.vim b/runtime/indent/sqlanywhere.vim
index fdafb622e55deb449567eba167934528fb14b9b5..afc312f8e0e520d520d2385ff52e24982566a1ca 100644
--- a/runtime/indent/sqlanywhere.vim
+++ b/runtime/indent/sqlanywhere.vim
@@ -48,6 +48,8 @@ setlocal indentexpr=GetSQLIndent()
if exists("*GetSQLIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
" List of all the statements that start a new block.
" These are typically words that start a line.
@@ -382,4 +384,7 @@ function GetSQLIndent()
return s:ModuloIndent(ind)
endfunction
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vim:sw=4:
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 40117a00700c9529bcbc6ee33b19edae54d72d31..8281d94c09100bb303cbb8bfce90b08a5ba94d76 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2011 Mar 22
+" Last Change: 2012 May 18
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -16,6 +16,8 @@ setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\
if exists("*GetVimIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
function GetVimIndent()
" Find a non-blank line above the current line.
@@ -79,4 +81,7 @@ function GetVimIndent()
return ind
endfunction
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vim:sw=2
diff --git a/runtime/indent/xinetd.vim b/runtime/indent/xinetd.vim
index f7a5341448fe7ca78f11c3d88ee12016aa8cce93..c8127237e8e686cf01898ebc0892dd50c20fc7b7 100644
--- a/runtime/indent/xinetd.vim
+++ b/runtime/indent/xinetd.vim
@@ -15,6 +15,8 @@ setlocal nosmartindent
if exists("*GetXinetdIndent")
finish
endif
+let s:keepcpo= &cpo
+set cpo&vim
function s:count_braces(lnum, count_open)
let n_open = 0
@@ -48,3 +50,6 @@ function GetXinetdIndent()
return indent(pnum) + s:count_braces(pnum, 1) * &sw
\ - s:count_braces(v:lnum, 0) * &sw
endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/indent/xml.vim b/runtime/indent/xml.vim
index 4ac35b6af159d7973d004de55b79845095554365..319dc3916080cab5928bdec3c29d4322f37e53e8 100644
--- a/runtime/indent/xml.vim
+++ b/runtime/indent/xml.vim
@@ -1,6 +1,6 @@
" Language: xml
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: 2009-05-26 00:17:25
+" Last Change: 2012 May 18
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@@ -12,13 +12,13 @@ if exists("b:did_indent")
finish
endif
let b:did_indent = 1
+let s:keepcpo= &cpo
+set cpo&vim
" [-- local settings (must come before aborting the script) --]
setlocal indentexpr=XmlIndentGet(v:lnum,1)
setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
-set cpo-=C
-
if !exists('b:xml_indent_open')
let b:xml_indent_open = '.\{-}<\a'
" pre tag, e.g. <address>
@@ -93,4 +93,7 @@ fun! XmlIndentGet(lnum, use_syntax_check)
return ind
endfun
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" vim:ts=8
diff --git a/runtime/indent/zimbu.vim b/runtime/indent/zimbu.vim
index a01510ded5f4f3bb7bafa08998f1884e948b34a0..8df0eebe6f6febcaa3874b3680520acee7f0cd55 100644
--- a/runtime/indent/zimbu.vim
+++ b/runtime/indent/zimbu.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Zimbu
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 May 17
+" Last Change: 2011 Jun 19
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -16,13 +16,16 @@ setlocal indentkeys=0{,0},!^F,o,O,0=ELSE,0=ELSEIF,0=CASE,0=DEFAULT,0=FINALLY
" We impose recommended defaults: no Tabs, 'shiftwidth' = 2
setlocal sw=2 et
-let b:undo_indent = "setl et< ai< indentexpr="
+let b:undo_indent = "setl et< sw< ai< indentkeys< indentexpr="
" Only define the function once.
if exists("*GetZimbuIndent")
finish
endif
+let s:cpo_save = &cpo
+set cpo&vim
+
" Come here when loading the script the first time.
let s:maxoff = 50 " maximum number of lines to look backwards for ()
@@ -121,3 +124,5 @@ func GetZimbuIndent(lnum)
return plindent
endfunc
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/macros/less.vim b/runtime/macros/less.vim
index 4888ed2b8214b2918595fe13d9d4b7fae575d9e0..6ae5ebc63ba01edabfb19a31ef5a24103445124f 100644
--- a/runtime/macros/less.vim
+++ b/runtime/macros/less.vim
@@ -1,6 +1,6 @@
" Vim script to work like "less"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Dec 05
+" Last Change: 2012 May 18
" Avoid loading this file twice, allow the user to define his own script.
if exists("loaded_less")
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
index 76778ba881321081db3bd906f232358f6817e13c..001dbbddd3461e6f28c380501705fb4ae1e1ba08 100644
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -13,17 +13,11 @@
" TODO:
" - improve synchronizing.
-if version < 600
- syntax clear
- let __dtd_cpo_save__ = &cpo
- set cpo&
-else
- if exists("b:current_syntax")
- finish
- endif
- let s:dtd_cpo_save = &cpo
- set cpo&vim
+if exists("b:current_syntax")
+ finish
endif
+let s:dtd_cpo_save = &cpo
+set cpo&vim
if !exists("dtd_ignore_case")
" I prefer having the case takes into consideration.
@@ -168,13 +162,8 @@ if version >= 508 || !exists("did_dtd_syn_inits")
delcommand HiLink
endif
-if version < 600
- let &cpo = __dtd_cpo_save__
- unlet __dtd_cpo_save__
-else
- let &cpo = s:dtd_cpo_save
- unlet s:dtd_cpo_save
-endif
+let &cpo = s:dtd_cpo_save
+unlet s:dtd_cpo_save
let b:current_syntax = "dtd"
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index ddaad896224b7b9ad5cd78d76d3178d3347f44a9..8d85d02c8a1c81d3c19762b723bf558d66ec3cbe 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Vim help file
" Maintainer: Bram Moolenaar (Bram@vim.org)
-" Last Change: 2012 Apr 25
+" Last Change: 2012 May 18
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -25,10 +25,10 @@ else
syn match helpHyperTextEntry "\*[#-)!+-~]\+\*$" contains=helpStar
endif
if has("conceal")
- syn match helpBar contained "|" conceal
+ syn match helpBar contained "[|`]" conceal
syn match helpStar contained "\*" conceal
else
- syn match helpBar contained "|"
+ syn match helpBar contained "[|`]"
syn match helpStar contained "\*"
endif
syn match helpNormal "|.*====*|"
@@ -38,7 +38,7 @@ syn match helpVim "Vim version [0-9.a-z]\+"
syn match helpVim "VIM REFERENCE.*"
syn match helpOption "'[a-z]\{2,\}'"
syn match helpOption "'t_..'"
-syn match helpCommand "`[^` ]*`"hs=s+1,he=e-1
+syn match helpCommand "`[^` ]*`"hs=s+1,he=e-1 contains=helpBar
syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore
if has("conceal")