Runtime file updates.
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 95c607b..7be5f06 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt* For Vim version 7.4. Last change: 2012 Oct 25
+*if_perl.txt* For Vim version 7.4. Last change: 2013 Oct 05
VIM REFERENCE MANUAL by Sven Verdoolaege
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 91b7208..49f28f3 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.4. Last change: 2013 Jul 17
+*index.txt* For Vim version 7.4. Last change: 2013 Oct 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1191,12 +1191,12 @@
|:digraphs| :dig[raphs] show or enter digraphs
|:display| :di[splay] display registers
|:djump| :dj[ump] jump to #define
-|:dl| :dl short for |:delete|
-|:dl| :del[ete]l short for |:delete|
+|:dl| :dl short for |:delete| with the 'l' flag
+|:dl| :del[ete]l short for |:delete| with the 'l' flag
|:dlist| :dli[st] list #defines
|:doautocmd| :do[autocmd] apply autocommands to current buffer
|:doautoall| :doautoa[ll] apply autocommands for all loaded buffers
-|:dp| :d[elete]p short for |:delete|
+|:dp| :d[elete]p short for |:delete| with the 'p' flag
|:drop| :dr[op] jump to window editing file or edit file in
current window
|:dsearch| :ds[earch] list one #define
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index f029a7a..a01a06c 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -93,7 +93,7 @@
$PATH *win32-PATH*
The directory of the Vim executable is appended to $PATH. This is mostly to
-make "!xxd' work, as it is in the Tools menu. And it also means that when
+make "!xxd" work, as it is in the Tools menu. And it also means that when
executable() returns 1 the executable can actually be executed.
==============================================================================
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 74f40e7..06c9838 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt* For Vim version 7.4. Last change: 2013 Jul 28
+*tagsrch.txt* For Vim version 7.4. Last change: 2013 Oct 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -771,11 +771,11 @@
*:dli* *:dlist*
:[range]dli[st][!] [/]string[/]
- Like "[D" and "]D", but search in [range] lines
+ Like `[D` and `]D`, but search in [range] lines
(default: whole file).
See |:search-args| for [/] and [!]. {not in Vi}
- Note that ":dl" works like ":delete" with the "l"
- register.
+ Note that `:dl` works like `:delete` with the "l"
+ flag, not `:dlist`.
*[_CTRL-D*
[ CTRL-D Jump to the first macro definition that contains the
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 0c61721..ae74a41 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.4. Last change: 2013 Sep 22
+*todo.txt* For Vim version 7.4. Last change: 2013 Oct 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,19 +34,9 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-NFA engine mismatch, with example. (ZyX, 2013 Aug 29)
-
-NFA engine difference, with test case. (Axel Bender, 2013 Sep 17)
-Comments from Vlad Irnov Sep 18.
-
Problem positioning the cursor after auto-formatting without a comment. (Tor
Perkins, 2013 Sep 1)
-Patch to fix test 92 and 93 failing in a bad way. (Hirohito Higashi, 2013 Sep
-11)
-
-Patch to fix using "p" in Visual block mode. (Christian Brabandt, 2013 Sep 19)
-
Using \1 in pattern goes one line too far. (Bohr Shaw, 2013 Sep 5)
Column is OK. "/\v(^.+\n)\1/e" (John Little, Sep 5)
Also, matches start of 2nd line, not the whole line.
@@ -55,38 +45,30 @@
Popup menu: first item is not selected when typing more than one character?
-Patch to add async functionality. (Geoff Greer, 2013 Sep 1)
-
-Patch to avoid mouse cursor flickering. (Ken Takata,, 2013 Sep 2)
-
-Patch to make zg and zb work better. (Christian Brabandt, 2013 Sep 8)
-
-Patch to fix that VC10 does not stat() a symlink to a directory.
-(Ken Takata,, 2013 Sep 20) Update Sep 21
-
Should win_redr_custom() not be allowed to use recursively?
(Yasuhiro Matsumoto, 2013 Aug 15)
NFA engine combining character mismatch. (glts, 2013 Aug 27)
Remark Dominique, Aug 27
-Patch to make Tcl 8.6 work. (Issue 167)
-
-Patch to make input() work while inside :normal. (Yasuhiro Matsumoto, 2013 Sep
-19)
+Problem that a previous silent ":throw" causes a following try/catch not to
+work. (ZyX, 2013 Sep 28)
Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
Issue 164: freeze on regexp search.
-Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
+Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in
+ftplugins.
-Patch to fix substitute prompt with line number. (Benoit Pierre, 2013 Aug 27,
-third message)
+Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep
5) Only copy file name when needed: Sep 9.
+Patch to make #N in 'cino' stop not indenting #lines. (Christian Brabandt,
+2013 Sep 25)
+
Include systemverilog file? Two votes yes.
Wrapping around end of file does not work for "." after "cgn". (Dimitar
@@ -108,6 +90,12 @@
Patch to make has() check for Vim version and patch at the same time.
(Marc Weber, 2013 Jun 7)
+Patch to fix Visual-block insert using cursor keys. (Christian Brabandt, 2013
+Sep 28) With test Sept 29.
+
+VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow
+instead. (Samuel Ferencik, 2013 Sep 28)
+
Several syntax file match "^\s*" which may get underlined if that's in the
highlight group. Add a "\zs" after it?
@@ -118,6 +106,14 @@
Go through more coverity reports.
+Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep
+29)
+
+Patch to make ColorScheme autocommand match with the colorscheme name instead
+of the buffer name. (Christian Brabandt, 2013 Sep 25)
+
+Patch to right-align signs. (James Kolb (email james), 2013 Sep 23)
+
With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
2013 Sep 5)
@@ -131,6 +127,9 @@
:help gives example for z?, but it does not work. m? and t? do work.
+Python: Extended funcrefs: use func_T* structure in place of char_u* function
+names. (ZyX, 2013 Jul 15, update Sep 22, 24, 28)
+
Patch to add funcref to Lua. (Luis Carvalho, 2013 Sep 4)
With tests: Sep 5.
@@ -280,9 +279,6 @@
Win32: The Python interface only works with one version of Python, selected at
compile time. Can this be made to work with version 2.1 and 2.2 dynamically?
-Python: Extended funcrefs: use func_T* structure in place of char_u* function
-names. (ZyX, 2013 Jul 15 and later)
-
Python: Be able to define a Python function that can be called directly from
Vim script. Requires converting the arguments and return value, like with
vim.bindeval().
@@ -387,6 +383,7 @@
More recent version: https://retracile.net/wiki/VimBreakIndent
Posted to vim-dev by Taylor Hedberg, 2011 Nov 25
Update by Taylor Hedberg, 2013 May 30.
+ Updated for Vim 7.4 by Ken Takata, 2013 Oct 5.
":cd" doesn't work when current directory path contains "**".
finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10)
@@ -989,7 +986,7 @@
Completion for ":buf" doesn't work properly on Win32 when 'shellslash' is off.
(Henrik Ohman, 2009, Jan 29)
-shellescape() depends on 'shellshash' for quoting. That doesn't work when
+shellescape() depends on 'shellslash' for quoting. That doesn't work when
'shellslash' is set but using cmd.exe. (Ben Fritz)
Use a different option or let it depend on whether 'shell' looks like a
unix-like shell?
@@ -1403,7 +1400,7 @@
Menu item that does "xxd -r" doesn't work when 'fileencoding' is utf-16.
Check for this and use iconv? (Edward L. Fox, 2007 Sep 12)
-Does the conversion in the other direction work when 'filenecodings' is set
+Does the conversion in the other direction work when 'fileencodings' is set
properly?
Cursor displayed in the wrong position when using 'numberwidth'. (James Vega,
@@ -1817,7 +1814,7 @@
How does this work? Missing comments.
8 Add a few more command names to the menus. Patch from Jiri Brezina
(28 feb 2002). Will mess the translations...
-7 ATTENTION dialog choices are more logical when "Delete it' appears
+7 ATTENTION dialog choices are more logical when "Delete it" appears
before "Quit". Patch by Robert Webb, 2004 May 3.
- Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work
for multi-byte characters.
@@ -3250,6 +3247,7 @@
Built-in script language:
8 Make the filename and line number available to script functions, so that
they can give useful debugging info. The whole call stack would be ideal.
+ At least use this for error messages.
7 Execute a function with standard option values. No need to save and
restore option values. Especially useful for new options. Problem: how
to avoid a performance penalty (esp. for string options)?
@@ -4752,7 +4750,7 @@
Digraphs:
7 Make "ga" show the keymap for a character, if it exists.
- Also show the code of the character after conversion to 'filenecoding'.
+ Also show the code of the character after conversion to 'fileencoding'.
- Use digraph table to tell Vim about the collating sequence of special
characters?
8 Add command to remove one or more (all) digraphs. (Brown)
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index 01f21a1..5a68759 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -86,7 +86,7 @@
v4jgq
-"v" to start Visual mode, "4j' to move to the end of the paragraph and then
+"v" to start Visual mode, "4j" to move to the end of the paragraph and then
the "gq" operator. The result is:
1 2 3
diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim
index 110dab3..7591edd 100644
--- a/runtime/ftplugin/fortran.vim
+++ b/runtime/ftplugin/fortran.vim
@@ -1,12 +1,12 @@
" Vim settings file
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version: 0.48
-" Last Change: 2012 Apr. 18
-" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/>
+" Version: 0.49
+" Last Change: 2013 Oct. 01
+" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
" Usage: Do :help fortran-plugin from Vim
" Credits:
-" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, and Ben
-" Fritz.
+" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben
+" Fritz, and David Barnett.
" Only do these settings when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -64,8 +64,8 @@
" setlocal tw=73
else
setlocal comments=:!
- " Free format allows a textwidth of 132 for code but 80 is more usual
- setlocal tw=80
+ " Free format allows a textwidth of 132
+ setlocal tw=132
endif
" Set commentstring for foldmethod=marker
@@ -76,8 +76,8 @@
setlocal expandtab
endif
-" Set 'formatoptions' to break comment and text lines but allow long lines
-setlocal fo+=tcql
+" Set 'formatoptions' to break text lines
+setlocal fo+=t
setlocal include=^\\c#\\=\\s*include\\s\\+
setlocal suffixesadd+=.f08,.f03,.f95,.f90,.for,.f,.F,.f77,.ftn,.fpp
@@ -114,7 +114,7 @@
\ "All Files (*.*)\t*.*\n"
endif
-let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc<"
+let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc< sua<"
\ . "| unlet! b:match_ignorecase b:match_words b:browsefilter"
let &cpoptions=s:cposet
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index 2b091a1..d823d68 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: python
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: Wed, 21 Apr 2004 13:13:08 CEST
+" Last Change: 2013 Sep 25
+" Last Change By Johannes: Wed, 21 Apr 2004 13:13:08 CEST
if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -44,5 +45,21 @@
\ "All Files (*.*)\t*.*\n"
endif
+" As suggested by PEP8.
+setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
+
+" First time: try finding "pydoc".
+if !exists('g:pydoc_executable')
+ if executable('pydoc')
+ let g:pydoc_executable = 1
+ else
+ let g:pydoc_executable = 0
+ endif
+endif
+" If "pydoc" was found use it for keywordprg.
+if g:pydoc_executable
+ setlocal keywordprg=pydoc
+endif
+
let &cpo = s:keepcpo
unlet s:keepcpo
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index 6540864..52c83bf 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -2,8 +2,8 @@
"
" Language: D
" Maintainer: Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
-" Last Change: 2013 May 21
-" Version: 0.25
+" Last Change: 2013 October 5
+" Version: 0.26
"
" Contributors:
" - Jason Mills: original Maintainer
@@ -158,7 +158,7 @@
" Pragma Statement
syn match dPragma "\<pragma\>"
-syn match dPragma "\<pragma\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains=dPragmaIdentifier
+syn match dPragma "\<pragma\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+6 contains=dPragmaIdentifier
" Necessary to highlight C++ in extern modifiers.
syn match dExternIdentifier "C\(++\)\?" contained
@@ -168,16 +168,18 @@
syn match dExtern "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier
" Make import a region to prevent highlighting keywords
-syn region dImport start="import" end=";" contains=dExternal,@dComment
+syn region dImport start="import\_s" end=";" contains=dExternal,@dComment
" Make module a region to prevent highlighting keywords
-syn region dImport start="module" end=";" contains=dExternal,@dComment
+syn region dImport start="module\_s" end=";" contains=dExternal,@dComment
" dTokens is used by the token string highlighting
syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean
syn cluster dTokens add=dConstant,dTypedef,dStructure,dOperator,dOpOverload
syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement
syn cluster dTokens add=dStorageClass,dPragma,dAssert,dAnnotation,dEnum
+syn cluster dTokens add=dParenString,dBrackString,dAngleString,dCurlyString
+syn cluster dTokens add=dTokenString,dDelimString,dHereString
" Create a match for parameter lists to identify storage class
syn region paramlist start="(" end=")" contains=@dTokens
@@ -192,6 +194,9 @@
" Comments
"
+syn match dCommentError display "\*/"
+syn match dNestedCommentError display "+/"
+
syn keyword dTodo contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX
syn match dCommentStar contained "^\s*\*[^/]"me=e-1
syn match dCommentStar contained "^\s*\*$"
@@ -201,15 +206,12 @@
syn region dBlockCommentString contained start=+"+ end=+"+ end=+\*/+me=s-1,he=s-1 contains=dCommentStar,dUnicode,dEscSequence,@Spell
syn region dNestedCommentString contained start=+"+ end=+"+ end="+"me=s-1,he=s-1 contains=dCommentPlus,dUnicode,dEscSequence,@Spell
syn region dLineCommentString contained start=+"+ end=+$\|"+ contains=dUnicode,dEscSequence,@Spell
- syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell fold
- syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold
- syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell
-else
- syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell fold
- syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold
- syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell
endif
+syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,dCommentStartError,@Spell fold
+syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell fold
+syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell
+
hi link dLineCommentString dBlockCommentString
hi link dBlockCommentString dString
hi link dNestedCommentString dString
@@ -249,7 +251,7 @@
syn region dRawString start=+r"+ end=+"[cwd]\=+ contains=@Spell
syn region dHexString start=+x"+ end=+"[cwd]\=+ contains=@Spell
syn region dDelimString start=+q"\z(.\)+ end=+\z1"+ contains=@Spell
-syn region dHereString start=+q"\z(\I\i*\)\n+ end=+\n\z1"+ contains=@Spell
+syn region dHereString start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell
" Nesting delimited string contents
"
@@ -368,6 +370,9 @@
hi def link dLineComment Comment
hi def link dBlockComment Comment
hi def link dNestedComment Comment
+hi def link dCommentError Error
+hi def link dNestedCommentError Error
+hi def link dCommentStartError Error
hi def link dExternal Include
hi def link dAnnotation PreProc
hi def link dSharpBang PreProc