Updated runtime files.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 21df37f30196ffc60a620c8030bf174edc471a3b..69ab0a641b28fdabab983f06fe58a527e8091446 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*     For Vim version 7.4.  Last change: 2014 Nov 27
+*eval.txt*     For Vim version 7.4.  Last change: 2014 Dec 07
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2395,6 +2395,10 @@ col({expr})      The result is a Number, which is the byte index of the column
                            number of bytes in the cursor line plus one)
                    'x      position of mark x (if the mark is not set, 0 is
                            returned)
+                   v       In Visual mode: the start of the Visual area (the
+                           cursor is the end).  When not in Visual mode
+                           returns the cursor position.  Differs from |'<| in
+                           that it's updated right away.
                Additionally {expr} can be [lnum, col]: a |List| with the line
                and column number. Most useful when the column is "$", to get
                the last column of a specific line.  When "lnum" or "col" is
@@ -6418,6 +6422,10 @@ virtcol({expr})                                          *virtcol()*
                            plus one)
                    'x      position of mark x (if the mark is not set, 0 is
                            returned)
+                   v       In Visual mode: the start of the Visual area (the
+                           cursor is the end).  When not in Visual mode
+                           returns the cursor position.  Differs from |'<| in
+                           that it's updated right away.
                Note that only marks in the current file can be used.
                Examples: >
   virtcol(".")    with text "foo^Lbar", with cursor on the "^L", returns 5

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 281aa8b1421fd3c705ac31b21d4dbc342d12dced..fb041c6a5eb7e2824048d418c8bee90982874c2d 100644 (file)
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2014 Oct 03
+*map.txt*       For Vim version 7.4.  Last change: 2014 Dec 08
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar

diff --git a/runtime/doc/tags b/runtime/doc/tags
index 9a23ce4cf9f104a48055aaa607ae0b92564505b3..ae7e22f7d8ce754ac5586e06a7610de5f5e95633 100644 (file)
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2057,6 +2057,7 @@ $VIMRUNTIME       starting.txt    /*$VIMRUNTIME*
 :comc  map.txt /*:comc*
 :comclear      map.txt /*:comclear*
 :command       map.txt /*:command*
+:command-addr  map.txt /*:command-addr*
 :command-bang  map.txt /*:command-bang*
 :command-bar   map.txt /*:command-bar*
 :command-buffer        map.txt /*:command-buffer*
@@ -4335,6 +4336,7 @@ E885      sign.txt        /*E885*
 E886   starting.txt    /*E886*
 E887   if_pyth.txt     /*E887*
 E888   pattern.txt     /*E888*
+E889   map.txt /*E889*
 E89    message.txt     /*E89*
 E90    message.txt     /*E90*
 E91    options.txt     /*E91*

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 04f9a44b95f9dd67057360d32c282e890c6f2149..d114d36c59d74817f6efe0c6d340c56f841b14c4 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2014 Dec 06
+*todo.txt*      For Vim version 7.4.  Last change: 2014 Dec 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -34,19 +34,6 @@ not be repeated below, unless there is extra information.
                                                        *known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Patch to fix list range assign crash. (Yukihiro Nakadaira, 2014 Dec 1)
-
-Patch to fix range with user command. (Marcin Szamotulski, 2014 Dec 2)
-Update Dec 6, with support for user commands.
-
-When window number in Ex range is too high, give an error?
-Only when backwards compatible.
-
-:s/\n// doesn't change anything.  Since 7.4.232? (Eliseo Martínez, 2014 Nov
-28)  Patch on Issue 287
-
-Using vim_snprintf() in window.c can be in a function.
-
 Regexp problems:
 - The NFA engine does not implement the time limit passed to
   nfa_regexec_multi()
@@ -78,35 +65,41 @@ Breaks test_eval.  Inefficient, can we only compute y_width when needed?
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28)
 
-Patch to fix recognizing function name. (Ozaki Kiichi, 2014 Nov 28)
-
 ":cd C:\Windows\System32\drivers\etc*" does not work, even though the
 directory exists. (Sergio Gallelli, 2013 Dec 29)
 
-The entries added by matchaddpos() are returned by getmatches() but can't be
-set with setmatches(). (lcd47, 2014 Jun 29)
-
 Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
 
 Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
 Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
-Change behavior of v:hlsearch?  Patch from Christian, 2014 Oct 22.
+When window number in Ex range is too high, should give an error:
+    :3close  " fails if there are only 2 windows.
+Patch from Marcin Szamotulski, 2014 Dec 13.
 
 Patch to recover from X server restart: hint on Issue 203 (2014 Nov 21 18:44)
 
+Insert a block with virtualedit set does not work correctly.
+Patch by James McCoy, 2014 Dec 10.
+
 MS-Windows: When editing a file with a leading space, writing it uses the
 wrong name. (Aram, 2014 Nov 7)  Vim 7.4.
 
 Add LessCss support. (Jenoma / Alessandro Vioni, 2014 Nov 24)
 Now with updated license, Nov 24.
 
+Memory leak using :wviminfo. Issue 296.  With Patch by Christian.
+
 patch to remove FEAT_OSFILETYPE from fileio.c. (Christian, 2014 Nov 12)
 
 Value returned by virtcol() changes depending on how lines wrap.  This is
 inconsistent with the documentation.
 
+Patch to also support range for :argdo, :bufdo, etc.
+(Marcin Szamotulski, 2014 Dec 7)
+Asked for tests.
+
 Ukrainian vimtutor. (Issue 288)
 
 Regenerate the Unicode tables in mbyte.c.
@@ -115,11 +108,19 @@ Diff from ZyX, 2014 Dec 6.
 Patch to fix relative numbers. (Christian Brabandt, 2014 Nov 17)
 Update Nov 26.
 
+Patch to fix that getcurpos() returns a negative number, instead of MAXCOL.
+(Hirohito Higashi, 2014 Dec 8)
+
 Patch to fix wrong formatting if 'linebreak' is set. (Christian Brabandt, 2014
 Nov 12)
 
 Patch to avoid recognizing polkit as hog files. (Issue 292)
 
+Patch 7.4.468 changed how CTRL-C is handled.  It does not take care of mapping
+CTRL-C in different modes. (Ingo Karkat, 2014 Dec 12)
+Patch from Christian Brabandt, 2014 Dec 13.
+Needs to be improved.
+
 Patch to support hex values for setting option value.
 (Zyx, 2015 Nov 6)
 
@@ -150,6 +151,9 @@ Just remove one trailing newline. (lcd, 2014 Oct 17)
 
 Make comments in the test Makefile silent. (Kartik Agaram, 2014 Sep 24)
 
+Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
+26, update 2013 Dec 14, another 2014 Nov 22)
+
 Result of systemlist() does not show whether text ended in line break.
 (Bjorn Linse, 2014 Nov 27)
 
@@ -161,6 +165,9 @@ Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
 Patch to add the EndOfBuffer highlight group, used instead of NonText for "~"
 lines. (Marco Hinz, 2014 Nov 2)
 
+Patch for fixing a problem of the combination of conceal and linebreak.
+(Christian Brabandt, 2014 Dec 11)
+
 Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
 Plugins need to make a lot of effort, lots of mappings, to know what happened
@@ -182,6 +189,7 @@ was already defined.
 (Yasuhiro Matsumoto, 2014 Nov 3)
 
 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
+Remark from Roland Eggner: does it cause crashes? (2014 Dec 12)
 
 Patch for building a 32bit Vim with 64bit MingW compiler.
 (Michael Soyka, 2014 Oct 15)
@@ -213,6 +221,9 @@ No error for missing endwhile. (ZyX, 2014 Mar 20)
 start_global_changes() plus end_global_changes() causes problem for
 clip_unnamed_plus. (Jason Pleau, 2014 Sep 12)
 
+The entries added by matchaddpos() are returned by getmatches() but can't be
+set with setmatches(). (lcd47, 2014 Jun 29)
+
 Patch to add :arglocal and :arglists. (Marcin Szamotulski, 2014 Aug 6)
 
 PHP syntax is extremely slow. (Anhad Jai Singh, 2014 Jan 19)
@@ -472,6 +483,9 @@ optional. (2013 Jul 12)
 
 Dialog is too big on Linux too. (David Fishburn, 2013 Sep 2)
 
+Patch to check whether a buffer is quickfix or a location list.
+(Yasuhiro Matsumoto, 2014 Dec 9)
+
 Patch to allow setting w:quickfix_title via setqflist() and setloclist()
 functions. (Christian Brabandt, 2013 May 8, update May 21)
 Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
@@ -915,9 +929,6 @@ names, shell commands and the like.  (Kikuchan, 2010 Oct 14)
 Assume the system converts between the actual encoding of the filesystem to
 the system encoding (usually utf-8).
 
-Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
-26, update 2013 Dec 14, another 2014 Nov 22)
-
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
 

diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index ff4af027b427cdf0ce24ebfb3cbb5fa4ec306d4b..7511325af4de0265cb18ff6ba00a551d5235f88b 100644 (file)
--- 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: 2014 Sep 19
+" Last Change: 2014 Dec 12
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -89,7 +89,7 @@ function GetVimIndentIntern()
 
   " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
   " :endfun, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+END\)'
+  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
     let ind = ind - &sw
   endif