vim-patch:8a94d87

Update runtime files.

https://github.com/vim/vim/commit/8a94d873aa8c753a8522ea86a049bdf2abd0c507

8 files changed, 11 insertions, 11 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 91eae8e49c..8e40186a15 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -953,7 +953,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.
@@ -7597,7 +7597,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 d5b371ab40..5aa77d8a22 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -215,7 +215,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/intro.txt b/runtime/doc/intro.txt
index 0825ca8848..431b6e1ad7 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
@@ -131,7 +131,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 086d05613d..7565d1e976 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -677,7 +677,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 28b0e1c623..c35fb2f139 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 618d4e5df9..9610555dce 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -357,7 +357,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/uganda.txt b/runtime/doc/uganda.txt
index ee1c36d676..c228c65542 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -190,7 +190,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 a8139d60ca..5b6eaa295b 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -528,7 +528,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