# HG changeset patch # User Bram Moolenaar # Date 1385643214 -3600 # Node ID d7d7bac1a163fdd624c50f5eb50b556283e5e783 # Parent 7adbbf32444ecedb1c81f3306af29aa640a4249c Updated runtime files. diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.4. Last change: 2013 Mar 16 +*cmdline.txt* For Vim version 7.4. Last change: 2013 Nov 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -758,6 +758,7 @@ characters have a special meaning. Thes function expand() |expand()|. % Is replaced with the current file name. *:_%* *c_%* # Is replaced with the alternate file name. *:_#* *c_#* + This is remembered for every window. #n (where n is a number) is replaced with *:_#0* *:_#n* the file name of buffer n. "#0" is the same as "#". *c_#n* ## Is replaced with all names in the argument list *:_##* *c_##* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2013 Aug 03 +*editing.txt* For Vim version 7.4. Last change: 2013 Nov 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,6 +38,7 @@ If there already was a current file name file name. It can be used with "#" on the command line |:_#| and you can use the |CTRL-^| command to toggle between the current and the alternate file. However, the alternate file name is not changed when |:keepalt| is used. +An alternate file name is remembered for each window. *:keepalt* *:keepa* :keepalt {cmd} Execute {cmd} while keeping the current alternate file diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.4. Last change: 2012 Jul 10 +*sign.txt* For Vim version 7.4. Last change: 2013 Nov 17 VIM REFERENCE MANUAL by Gordon Prieur @@ -173,7 +173,7 @@ REMOVING SIGNS *:sign-unplace* *E15 Remove the placed sign at the cursor position. -LISTING PLACED SIGNS +LISTING PLACED SIGNS *:sign-place-list* :sign place file={fname} List signs placed in file {fname}. diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2742,6 +2742,7 @@ 90.5 usr_90.txt /*90.5* :sign-jump sign.txt /*:sign-jump* :sign-list sign.txt /*:sign-list* :sign-place sign.txt /*:sign-place* +:sign-place-list sign.txt /*:sign-place-list* :sign-undefine sign.txt /*:sign-undefine* :sign-unplace sign.txt /*:sign-unplace* :sil various.txt /*:sil* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2013 Nov 14 +*todo.txt* For Vim version 7.4. Last change: 2013 Nov 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,28 +34,28 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -Patch From Lech Lorens doesn't quite work: -Problem: When using ":'<,'>del" errors may be given for the visual line - numbers being out of range. -Solution: Reset Visual mode in ":del". (Lech Lorens) -Files: src/ex_docmd.c - - -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. - -NFA regexp doesn't handle backreference correctly. (Ryuichi Hayashida, 2013 -Oct 10) +NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria +Shallon, 2013 Nov 18) + +After patch 7.4.100 there is still a difference between NFA and old engine. +25 a's with pattern \v^(aa+)\1+$ (Urtica Dioica, 2013 Nov 21) +Also: 9 a's with pattern \v^(a{-2,})\1+$ (Nov 23) Error for incomplete help argument. (John Beckett, 2013 Sep 12) +Tutor: adjust text to start the tutor. (Jakson Alves de Aquino, 2013 Nov 19) + 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 fix building with Ruby on Cygwin. (Steve Hall, 2013 Nov 21) + +Patch to fix that in Python vim.eval errors are not caught by try/catch. +(ZyX, 2013 Nov 26) + Problem that a previous silent ":throw" causes a following try/catch not to work. (ZyX, 2013 Sep 28) @@ -72,9 +72,13 @@ Patch to support slices in Python vim.Li Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2) +Patch to fix that "zG" leaves temp files around. (Ken Takata, 2013 Nov 22) + Patch to make Dictionary.update() work without arguments. (ZyX, 2013 Oct 19) +Bug caused by patch 7.3.1288? Issue 183. + Patch for Cobol ftplugin. (ZyX, 2013 Oct 20) Await response from maintainer. @@ -93,6 +97,8 @@ Issue 174: Detect Mason files. Patch to make has() check for Vim version and patch at the same time. (Marc Weber, 2013 Jun 7) +Regression on pach 7.4.034. (Ingo Karkat, 2013 Nov 20) + VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow instead. (Samuel Ferencik, 2013 Sep 28) @@ -119,7 +125,7 @@ 2013 Sep 5) "gUgn" cannot be repeated, while "dgn" can. (Dimitar Dimitrov) Patch by Christian Brabandt (2013 Aug 12) -Also notes by Christian Wellenbrock, Nov 13. +Also notes by Christian Wellenbrock, Nov 13, response from Christian Nov 14. Several Win32 functions are not using Unicode. Patches to fix this. (Ken Takata, 2013 Aug 9) @@ -132,6 +138,11 @@ 3. Doesn't work properly according to Y /[b-a] gives error E16, should probably be E769. +7 Windows XP: When using "ClearType" for text smoothing, a column of yellow + pixels remains when typing spaces in front of a "D" ('guifont' set to + "lucida_console:h8"). +Patch by Thomas Tuegel, also for GTK, 2013 Nov 24 + :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 @@ -140,6 +151,9 @@ names. (ZyX, 2013 Jul 15, update Sep 22, Patch to add funcref to Lua. (Luis Carvalho, 2013 Sep 4) With tests: Sep 5. +Patch to fix that on suckless Terminal mousewheel up does not work. +(Ralph Eastwood, 2013 Nov 25) + Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) Patch to make external commands work with multi-byte characters on Win32 when @@ -150,9 +164,18 @@ Checking runtime scripts: Thilo Six, 201 Fold can't be opened after ":move". (Ein Brown) Patch from Christian Brabandt doesn't fix it completely. +Patch for drag&drop reordering of GUI tab pages reordering. +(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe) + +":sign-jump" uses first window in buffer instead of current window. +Patch by James McCoy, 2013 Nov 22. + GTK: problem with 'L' in 'guioptions' changing the window width. (Aaron Cornelius, 2012 Feb 6) +Patch to add option that tells whether small deletes go into the numbered +registers. (Aryeh Leib Taurog, 2013 Nov 18) + Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3. The BufUnload event is triggered when re-using the empty buffer. @@ -177,6 +200,9 @@ Or should we add a more general mechanis Problem caused by patch 7.3.638: window->open does not update window correctly. Issue 91. +Exception caused by argument of return is not caught by try/catch. +(David Barnett, 2013 Nov 19) + 8 'backupdir' and 'directory' should use $TMPDIR, $TMP and/or $TEMP when defined. Issue 28. @@ -243,6 +269,12 @@ a reboot. MS-Windows: Crash opening very long file name starting with "\\". (Christian Brock, 2012 Jun 29) +Patch to have text objects defined by arbitrary single characters. (Daniel +Thau, 2013 Nov 20) + +Patch to select the next or previous text object if there isn't one under the +cursor. (Daniel Thau, 2013 Nov 20) + patch to add "combine" flag to syntax commands. (so8res, 2012 Dec 6) Syntax update problem in one buffer opened in two windows, bottom window is @@ -516,6 +548,8 @@ following "redir" command gives an error When setqflist() uses a filename that triggers a BufReadCmd autocommand Vim doesn't jump to the correct line with :cfirst. (ZyX, 2011 Sep 18) +Behavior of i" and a" text objects isn't logical. (Ben Fritz, 2013 Nov 19) + 7 Make "ga" show the digraph for a character, if it exists. Patch from Christian Brabandt, 2011 Aug 19. @@ -1399,6 +1433,10 @@ Does the conversion in the other directi properly? Add a few features to xxd. (Vadim Vygonets, 2013 Nov 11) +Patches: 2013 Nov 19 +1: Add -e: little endian hexdump +2: Add -o: add offset to displayed position +3: Change displayed file position width to 8 chars Cursor displayed in the wrong position when using 'numberwidth'. (James Vega, 2007 Jun 21) @@ -1969,9 +2007,6 @@ 8 The -P argument doesn't work very we Tutorial: http://win32assembly.online.fr/tut32.html 8 In eval.c, io.h is included when MSWIN32 is defined. Shouldn't this be WIN32? Or can including io.h be moved to vim.h? (Dan Sharp) -7 Windows XP: When using "ClearType" for text smoothing, a column of yellow - pixels remains when typing spaces in front of a "D" ('guifont' set to - "lucida_console:h8"). 6 Win32 GUI: With "-u NONE -U NONE" and doing "CTRL-W v" "CTRL-W o", the ":" of ":only" is highlighted like the cursor. (Lipelis) 8 When 'encoding' is "utf-8", should use 'guifont' for both normal and wide diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.4. Last change: 2013 Sep 03 +*version7.txt* For Vim version 7.4. Last change: 2013 Nov 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7188,7 +7188,7 @@ More encryption *new-more-encryption --------------- Support for Blowfish encryption. Added the 'cryptmethod' option. -Mostly by Moshin Ahmed. +Mostly by Mohsin Ahmed. Also encrypt the text in the swap file and the undo file. diff --git a/runtime/ftplugin/jproperties.vim b/runtime/ftplugin/jproperties.vim new file mode 100644 --- /dev/null +++ b/runtime/ftplugin/jproperties.vim @@ -0,0 +1,15 @@ +" Vim filetype plugin +" Language: Java properties file +" Maintainer: David Bürgin <676c7473@gmail.com> +" Last Change: 2013-11-19 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +setlocal formatoptions-=t +setlocal comments=:#,:! +setlocal commentstring=#\ %s + +let b:undo_ftplugin = "setl cms< com< fo<" diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: python " Maintainer: Johannes Zellner -" Last Change: 2013 Sep 25 +" Last Change: 2013 Nov 28 " Last Change By Johannes: Wed, 21 Apr 2004 13:13:08 CEST if exists("b:did_ftplugin") | finish | endif @@ -14,8 +14,8 @@ setlocal indentkeys-=0# setlocal include=\s*\\(from\\\|import\\) setlocal includeexpr=substitute(v:fname,'\\.','/','g') setlocal suffixesadd=.py -setlocal comments-=:% -setlocal commentstring=#%s +setlocal comments=b:#,fb:- +setlocal commentstring=#\ %s setlocal omnifunc=pythoncomplete#Complete @@ -26,21 +26,21 @@ nnoremap [[ :call ]m :call Python_jump('/^\s*\(class\\|def\)') nnoremap [m :call Python_jump('?^\s*\(class\\|def\)') -if exists('*Python_jump') | finish | endif +if !exists('*Python_jump') + fun! Python_jump(motion) range + let cnt = v:count1 + let save = @/ " save last search pattern + mark ' + while cnt > 0 + silent! exe a:motion + let cnt = cnt - 1 + endwhile + call histdel('/', -1) + let @/ = save " restore last search pattern + endfun +endif -fun! Python_jump(motion) range - let cnt = v:count1 - let save = @/ " save last search pattern - mark ' - while cnt > 0 - silent! exe a:motion - let cnt = cnt - 1 - endwhile - call histdel('/', -1) - let @/ = save " restore last search pattern -endfun - -if has("gui_win32") && !exists("b:browsefilter") +if has("browsefilter") && !exists("b:browsefilter") let b:browsefilter = "Python Files (*.py)\t*.py\n" . \ "All Files (*.*)\t*.*\n" endif diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim --- 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: 2013 Sep 05 +" Last Change: 2013 Nov 17 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -153,7 +153,7 @@ syn sync minlines=40 " Define the default highlighting. " Only used when an item doesn't have highlighting yet hi def link helpIgnore Ignore -hi def link helpHyperTextJump Subtitle +hi def link helpHyperTextJump Identifier hi def link helpBar Ignore hi def link helpBacktick Ignore hi def link helpStar Ignore @@ -168,7 +168,6 @@ hi def link helpOption Type hi def link helpNotVi Special hi def link helpSpecial Special hi def link helpNote Todo -hi def link Subtitle Identifier hi def link helpComment Comment hi def link helpConstant Constant diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim --- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: reStructuredText documentation format " Maintainer: Nikolai Weibull -" Latest Revision: 2013-06-03 +" Latest Revision: 2013-11-26 if exists("b:current_syntax") finish @@ -152,7 +152,7 @@ for code in g:rst_syntax_code_list exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold ' \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\s*$# ' \.'skip=#^$# ' - \.'end=#^\s\@!# contains=@NoSpell,@rst'.code + \.'end=#^\s\@!# contains=@NoSpell,@rst'.code.' keepend' exe 'syn cluster rstDirectives add=rstDirective'.code endfor