Update runtime files.

11 files changed, 37 insertions, 38 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 69ab0a641b..b778e34578 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -956,7 +956,7 @@ Decimal, Hexadecimal (starting with 0x or 0X), or Octal (starting with 0).
 Floating point numbers can be written in two forms:
 
 	[-+]{N}.{M}
-	[-+]{N}.{M}e[-+]{exp}
+	[-+]{N}.{M}[eE][-+]{exp}
 
 {N} and {M} are numbers.  Both {N} and {M} must be present and can only
 contain digits.
@@ -7371,7 +7371,7 @@ This does NOT work: >
 				:unlet v
 <							*E741*
 			If you try to change a locked variable you get an
-			error message: "E741: Value of {name} is locked"
+			error message: "E741: Value is locked: {name}"
 
 			[depth] is relevant when locking a |List| or
 			|Dictionary|.  It specifies how deep the locking goes:
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index 77ec419d1f..c901d9272b 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -222,7 +222,7 @@ o  Keyboard
 Note:
 	¡  stands for Farsi PSP (break without space)
 
-	¢  stands for Farsi PCN (for HAMZE attribute )
+	¢  stands for Farsi PCN (for HAMZE attribute)
 
 Restrictions
 ------------
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
index 7d77b660f1..63e6e312c2 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -197,7 +197,7 @@ files in it.
 --remote-silent "+call cursor(10, 27)"
 	      - Places the cursor on line 10 column 27
 In Vim >
-   :h --remote-silent for mor details
+   :h --remote-silent for more details
 
 [.Net remarks provided by Dave Fishburn and Brian Sturk]
 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index a03079c798..9f6dc033e4 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.4.  Last change: 2014 May 24
+*intro.txt*     For Vim version 7.4.  Last change: 2015 Jan 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -135,7 +135,7 @@ http://www.vim.org/maillist.php
 
 Bug reports:				*bugs* *bug-reports* *bugreport.vim*
 
-Send bug reports to: Vim Developers <vim_dev@vim.org>
+Send bug reports to: Vim Developers <vim-dev@vim.org>
 This is a maillist, you need to become a member first and many people will see
 the message.  If you don't want that, e.g. because it is a security issue,
 send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram).
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 2ff6b1063c..e12d7f814e 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -693,7 +693,7 @@ It is possible to achieve a poor man's version of duplex printing using the PS
 utility psselect.  This utility has options -e and -o for printing just the
 even or odd pages of a PS file respectively.
 
-First generate a PS file with the 'hardcopy' command, then generate a new
+First generate a PS file with the 'hardcopy' command, then generate new
 files with all the odd and even numbered pages with: >
 
 	psselect -o test.ps odd.ps
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
index 11d8550121..5900eb6976 100644
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -178,14 +178,14 @@ Hurrah for VIM!! It is "at your fingertips" like vi, and has the extensions
 that vi sorely needs: highlighting for executing commands on blocks, an easily
 navigable and digestible help screen, and more.  (Paul Pax)
 
-The reason WHY I don't have this amazingly useful macro any more, is that I
+The reason WHY I don't have this amazingly useful macro anymore, is that I
 now use VIM - and this is built in!! (Stephen Riehm, Germany)
 
 I am a user of VIM and I love it.  I use it to do all my programming, C,
 C++, HTML what ever.  (Tim Allwine)
 
 I discovered VIM after years of struggling with the original vi, and I just
-can't live without it any more.  (Emmanuel Mogenet, USA)
+can't live without it anymore.  (Emmanuel Mogenet, USA)
 
 Emacs has not a bit of chance to survive so long as VIM is around.  Besides,
 it also has the most detailed software documentation I have ever seen---much
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index d2dd547061..2076e83421 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -410,7 +410,7 @@ adjust the various t_ codes.  This avoids the problem that the xterm can
 produce different codes, depending on the mode it is in (8-bit, VT102,
 VT220, etc.).  The result is that codes like <xF1> are no longer needed.
 Note: This is only done on startup.  If the xterm options are changed after
-Vim has started, the escape sequences may not be recognized any more.
+Vim has started, the escape sequences may not be recognized anymore.
 
 							*xterm-resize*
 Window resizing with xterm only works if the allowWindowOps resource is
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7d53f86867..1df73185ea 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2015 Jan 14
+*todo.txt*      For Vim version 7.4.  Last change: 2015 Jan 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -37,6 +37,8 @@ not be repeated below, unless there is extra information.
 Regexp problems:
 - The NFA engine does not implement the time limit passed to
   nfa_regexec_multi()
+- Using win_linetabsize() can still be slow. Cache the result, store col and
+  vcol. Reset them when moving to another line.
 - Very slow with a long line and Ruby highlighting. (John Whitley, 2014 Dec 4)
 - Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
   (Lech Lorens, 2014 Feb 3)
@@ -55,6 +57,12 @@ Regexp problems:
   engine, can we do this with the new engine?  E.g. with
   "/\%(<\1>\)\@<=.*\%(<\/\(\w\+\)>\)\@=" matching text inside HTML tags.
 - Diff highlighting can be very slow. (Issue 309)
+- Using "{1,1000}" is much slower than it was with the old engine.
+  (Dominique Pelle, 2015 Jan 22) 
+- Using %> for a virtual column has a check based on 'tabsize'.  Better would
+  be to cache the result of win_linetabsize(col), storing both col and vcol,
+  and use them to decide whether win_linetabsize() needs to be called.  Reset
+  col and vcol when moving to another line.
 
 Still using freed memory after using setloclist(). (lcd, 2014 Jul 23)
 More info Jul 24.  Not clear why.
@@ -83,30 +91,21 @@ inconsistent with the documentation.
 
 Better greek spell checking.  Issue 299.
 
-Patch to fix wrong formatting if 'linebreak' is set. (Christian Brabandt, 2014
-Nov 12)
+Patch to fix slow valgrind highlighting. (Dominique, 2015 Jan 15)
+Does maintainer respond?
 
-Patch for fixing a problem of the combination of conceal and linebreak.
-(Christian Brabandt, 2014 Dec 11)
-
-Any more changes from 
-https://github.com/chrisbra/vim-mq-patches/blob/master/linebreak_bug
-?
-
-Patch to avoid recognizing polkit as hog files. (Issue 292)
-
-":0argedit foo" puts new argument in second place instead of first.
-Patch from Ingo Karkat, 2014 Dec 19.
-
-Patch for greek characters on MS-Windows console. (Yasuhiro Matsumoto, 2014
-Dec 17)
+Patch on issue 212: feedkeys() with dot doesn't work as expected.
 
 Patch to support hex values for setting option value.
-(Zyx, 2015 Nov 6)
+(Zyx, 2014 Nov 6)
 
 Patch to fix problems with small screen sizes. (Christian Brabandt, 2015 Jan
 8)
 
+":tabdo windo echo 'hi'" causes "* register not to be changed.
+(Salman Halim, 2015 Jan 17)
+Patch by Christian, 2015 Jan 20.  There is another problem, wait a bit.
+
 On MS-Windows running tests with Mercurial has problems when the fileformat of
 the input files are changed. (Ken Takata, Taro Muraoka, 2014 Sep 25)
 Update Nov 5.
@@ -154,6 +153,9 @@ Mixup of highlighting when there is a match and SpellBad. (ZyX, 2015 Jan 1)
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.  With patch.
 
+Patch for drag&drop reordering of GUI tab pages reordering.
+(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
+
 'ff' is wrong for one-line file without EOL. (Patch on Issue 77)
 
 Patch on Issue 72: 'autochdir' causes problems for :vimgrep.
@@ -209,6 +211,9 @@ Patch for building a 32bit Vim with 64bit MingW compiler.
 
 Delete old code in os_msdos.c, mch_FullName().
 
+Patch: On MS-Windows shellescape() may have to triple double quotes.
+(Ingo Karkat, 2015 Jan 16)
+
 Redo only remembers the last change.  Could use "{count}g." to redo an older
 change.  How does the user know which change?  At least have a way to list
 them: ":repeats".
@@ -233,9 +238,6 @@ Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
 
 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)
 
@@ -257,7 +259,7 @@ More tests May 14. Update May 29.  Update Aug 10.
 
 The garbage collector may use too much stack.  Make set_ref_in_item()
 iterative instead of recursive.   Test program by Marc Weber (2013 Dec 10)
-Patch by Ben Fritz, 2014 Jun 22.
+Patch by Ben Fritz, 2014 Jun 22.  Update 2015 Jan 21.
 Related: Vim hangs when freeing a lot of objects.  Patch by Yasuhiro
 Matsumoto, 2014 Aug 26.
 
@@ -430,9 +432,6 @@ Patch from Christian Brabandt doesn't fix it completely.
 Patch from Christian Brabandt to preserve upper case marks when wiping out a
 buffer. (2013 Dec 9)
 
-Patch for drag&drop reordering of GUI tab pages reordering.
-(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 113df4f64f..167f1baed3 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -194,7 +194,7 @@ child, you should have the intention to do this for at least one year.
 
 How do you know that the money will be spent right?  First of all you have my
 personal guarantee as the author of Vim.  I trust the people that are working
-at the centre, I know them personally.  Further more, the centre has been
+at the centre, I know them personally.  Furthermore, the centre has been
 co-sponsored and inspected by World Vision, Save the Children Fund and is now
 under the supervision of Pacific Academy Outreach Society.  The centre is
 visited about once a year to check the progress (at our own cost).  I have
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index 6173260895..8cbcf13a14 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -532,7 +532,7 @@ MATCHING ANY SINGLE CHARACTER
 
 The . (dot) character matches any existing character.  For example, the
 pattern "c.m" matches a string whose first character is a c, whose second
-character is anything, and whose the third character is m.  Example:
+character is anything, and whose third character is m.  Example:
 
 	We use a computer that became the cummin winter. ~
 		 xxx		 xxx	  xxx
diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1
index 820caa24f5..e2dcd42c2f 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/vim.1
@@ -135,7 +135,7 @@ For the first file the cursor will be positioned on line "num".
 If "num" is missing, the cursor will be positioned on the last line.
 .TP
 +/{pat}
-For the first file the cursor will be positioned on the
+For the first file the cursor will be positioned in the line with the
 first occurrence of {pat}.
 See ":help search\-pattern" for the available search patterns.
 .TP