Updated runtime files.

diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index f3b11c93ef2a17b872d0c805ae9ae37ea265b77b..36779a8210f35eb4ae869e880892f5f155d5ec70 100644 (file)
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.4.  Last change: 2016 Apr 29
+*quickref.txt*  For Vim version 7.4.  Last change: 2016 Jun 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -831,6 +831,7 @@ Short explanation of each option:           *option-list*
 'printmbcharset'  'pmbcs'   CJK character set to be used for :hardcopy
 'printmbfont'    'pmbfn'   font names to be used for CJK output of :hardcopy
 'printoptions'   'popt'    controls the format of :hardcopy output
+'prompt'         'prompt'  enable prompt in Ex mode
 'pumheight'      'ph'      maximum height of the popup menu
 'pythondll'                name of the Python 2 dynamic library
 'pythonthreedll'           name of the Python 3 dynamic library

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 26aead3e33b4b0c6ef809811f4df574bdd07b7e8..817703d770ca93d8817151ed9973ed60db0c5734 100644 (file)
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4.  Last change: 2016 Jun 12
+*starting.txt*  For Vim version 7.4.  Last change: 2016 Jun 15
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1435,6 +1435,10 @@ always kept.  This is used for:
 - Contents of non-empty registers.
 - The jump list
 - File marks
+The timestamp feature was added before Vim 8.0.  Older versions of Vim,
+starting with 7.4.1131, will keep the items with timestamp, but not use them.
+Thus when using both an older and a newer version of Vim the most recent data
+will be kept.
 
 Notes for Unix:
 - The file protection for the viminfo file will be set to prevent other users

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 912083c9b36f8eec3a7b0cea95c3bea758955c6e..dfa0417c7271ded597fc02e0f966059319b4b76f 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: 2016 Jun 12
+*todo.txt*      For Vim version 7.4.  Last change: 2016 Jun 16
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -35,10 +35,7 @@ not be repeated below, unless there is extra information.
 -------------------- Known bugs and current work -----------------------
 
 Further implement 'barline' in viminfo:
-- jumplist: merge with vi_jumplist.
 - Use timestamp for more items: locations, marks.
-- Docs: lines are copied by Vim since 7.4.1131
-- Check if debug history works.
 
 Problem with setqflist([]): grep 4 times, ":colder 3", setqflist([]) will
 clear the next list, not the current one.  Ramel Eshed, Jun 8.
@@ -64,7 +61,8 @@ Later
 - job_start(): run job in a newly opened terminal.
     With xterm could use -S{pty}.
 
-Quickfix improvements for backgroupd building and grepping:
+Quickfix improvements for background building and grepping:
+  (Yegappan might do some of this)
 - Move 'efm' parsing to a separate function.  If 'efm' is the same as last
   time re-use the fmt_first list.
 - Do not clear "dir_stack", "directory" and "file_stack", "currfile" when
@@ -77,6 +75,8 @@ Quickfix improvements for backgroupd building and grepping:
   buffers. (Ramel Eshed)
 
 Regexp problems:
+- When using automatic engine selection there is a false match.  Forcing
+  either engine works OK. (fritzophrenic, 2016 Jun 15, #867)
 - Since 7.4.704 the old regex engine fails to match [[:print:]] in 0xf6.
   (Manuel Ortega, 2016 Apr 24)
   Test fails on Mac.  Avoid using isalpha(), isalnum(), etc?  Depends on
@@ -125,9 +125,14 @@ Regexp problems:
 - Search for /\%d0\+  causes error E363 in a file with consecutive NUL
   characters. (Christian Brabandt, 2016 Jun 7)
 
-jsonencode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
+Patch to fix problem with GUI termcode. (Kazunobu Kuriyama, 2016 Jun 15)
+
+json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
 What if there is an invalid character?
 
+Should json_encode()/json_decode() restrict recursiveness?
+Or avoid recursiveness.
+
 Once .exe with updated installer is available: Add remark to download page
 about /S and /D options (Ken Takata, 2016 Apr 13)
 
@@ -149,6 +154,7 @@ Yasuhiro Matsumoto, 2013 May 31.
 Or should we add a more general mechanism, like a lambda() function?
 Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17.
 Correction for test, Ken Takata, 2016 May 27.
+Merged patch: Ken Takata, 2016 Jun 15.
 
 Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
 
@@ -222,6 +228,7 @@ Update 2016 Mar 28.  Can include all parts into one dist patch.
 
 Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
 Update 2016 Apr 24.
+Update 2016 Jun 14, includes some tests.
 
 Patch to improve cscope. (Adrian Kocis, #843)
 
@@ -274,9 +281,6 @@ Patch to make tests pass with EBCDIC. (Owen Leibman, 2016 Apr 10)
 When repeating the 'confirm' dialog one needs to press Enter. (ds26gte, 2016
 Apr 17)  #762
 
-Should jsonencode()/jsondecode() restrict recursiveness?
-Or avoid recursiveness.
-
 Use vim.vim syntax highlighting for help file examples, but without ":" in
 'iskeyword' for syntax.
 
@@ -285,6 +289,9 @@ Patch to make "%:h:h" return "." instead of the full path.
 
 Remove SPACE_IN_FILENAME ? What could possibly go wrong?
 
+When command names are very long :command output is difficult to read.  Use a
+maximum for the column width?  (#871)
+
 Patch to change GUI behavior: instead of changing the window size change the
 lines/columns when menu/toolbar/etc. is added/removed. (Ychin, 2016 Mar 20,
 #703)
@@ -496,9 +503,6 @@ Breaks test_eval.  Inefficient, can we only compute y_width when needed?
 Patch to use different terminal mode settings for system(). (Hayaki Saito)
 Does this work for everybody?
 
-Patch to fix that wide characters do not work properly after exiting.
-(Yasuhiro Matsumoto, 2015 May 24) Better patch to come.
-
 Patch to add wordcount().  Same info as g CTRL-G. (Christian Brabandt, 2015
 Nov 17)
 

diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 66aa77136525360fefd2413956c8e05c105f52d4..d720344b8fb18fe9707319d53cd0c1dc553ea39b 100644 (file)
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*   For Vim version 7.4.  Last change: 2016 Jun 11
+*usr_41.txt*   For Vim version 7.4.  Last change: 2016 Jun 13
 
                     VIM USER MANUAL - by Bram Moolenaar
 
@@ -938,8 +938,8 @@ Inter-process communication:                    *channel-functions*
        ch_log()                write a message in the channel log file
        ch_logfile()            set the channel log file
        ch_setoptions()         set the options for a channel
-       jsonencode()            encode an expression to a JSON string
-       jsondecode()            decode a JSON string to Vim types
+       json_encode()           encode an expression to a JSON string
+       json_decode()           decode a JSON string to Vim types
        js_encode()             encode an expression to a JSON string
        js_decode()             decode a JSON string to Vim types
 

diff --git a/runtime/keymap/vietnamese-telex_utf-8.vim b/runtime/keymap/vietnamese-telex_utf-8.vim
new file mode 100644 (file)
index 0000000..f9fd055
--- /dev/null
+++ b/runtime/keymap/vietnamese-telex_utf-8.vim
@@ -0,0 +1,196 @@
+" Vim Keymap file for Vietnamese through Telex method
+" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
+" Last Change: 2016-06-13
+
+scriptencoding utf-8
+
+let b:keymap_name = "vi"
+
+loadkeymap
+
+A\\    A
+AF     À
+AS     Á
+AR     Ả
+AX     Ã
+AJ     Ạ
+
+AW     Ă
+AW\\   Ă
+AWF    Ằ
+AWS    Ắ
+AWR    Ẳ
+AWX    Ẵ
+AWJ    Ặ
+
+AA     Â
+AA\\   Â
+AAF    Ầ
+AAS    Ấ
+AAR    Ẩ
+AAX    Ẫ
+AAJ    Ậ
+
+D\\    D
+DD     Đ
+
+E      E
+E\\    E
+EF     È
+ES     É
+ER     Ẻ
+EX     Ẽ
+EJ     Ẹ
+
+EE     Ê
+EE\\   Ê
+EEF    Ề
+EES    Ế
+EER    Ể
+EEX    Ễ
+EEJ    Ệ
+
+I\\    I
+IF     Ì
+IS     Í
+IR     Ỉ
+IX     Ĩ
+IJ     Ị
+
+O\\    O
+OF     Ò
+OS     Ó
+OR     Ỏ
+OX     Õ
+OJ     Ọ
+
+OO     Ô
+OO\\   Ô
+OOF    Ồ
+OOS    Ố
+OOR    Ổ
+OOX    Ỗ
+OOJ    Ộ
+
+OW     Ơ
+OW\\   Ơ
+OWF    Ờ
+OWS    Ớ
+OWR    Ở
+OWX    Ỡ
+OWJ    Ợ
+
+U\\    U
+UF     Ù
+US     Ú
+UR     Ủ
+UX     Ũ
+UJ     Ụ
+
+UW     Ư
+UW\\   Ư
+UWF    Ừ
+UWS    Ứ
+UWR    Ử
+UWX    Ữ
+UWJ    Ự
+
+Y\\    Y
+YF     Ỳ
+YS     Ý
+YR     Ỷ
+YX     Ỹ
+YJ     Ỵ
+
+a\\    a
+af     à
+as     á
+ar     ả
+ax     ã
+aj     ạ
+
+aw     ă
+aw\\   ă
+awf    ằ
+aws    ắ
+awr    ẳ
+awx    ẵ
+awj    ặ
+
+aa     â
+aa\\   â
+aaf    ầ
+aas    ấ
+aar    ẩ
+aax    ẫ
+aaj    ậ
+
+d\\    d
+dd     đ
+
+e\\    e
+ef     è
+es     é
+er     ẻ
+ex     ẽ
+ej     ẹ
+
+ee     ê
+ee\\   ê
+eef    ề
+ees    ế
+eer    ể
+eex    ễ
+eej    ệ
+
+i\\    i
+if     ì
+is     í
+ir     ỉ
+ix     ĩ
+ij     ị
+
+o\\    o
+of     ò
+os     ó
+or     ỏ
+ox     õ
+oj     ọ
+
+oo     ô
+oo\\   ô
+oof    ồ
+oos    ố
+oor    ổ
+oox    ỗ
+ooj    ộ
+
+ow     ơ
+ow\\   ơ
+owf    ờ
+ows    ớ
+owr    ở
+owx    ỡ
+owj    ợ
+
+u\\    u
+uf     ù
+us     ú
+ur     ủ
+ux     ũ
+uj     ụ
+
+uw     ư
+uw\\   ư
+uwf    ừ
+uws    ứ
+uwr    ử
+uwx    ữ
+uwj    ự
+
+y\\    y
+yf     ỳ
+ys     ý
+yr     ỷ
+yx     ỹ
+yj     ỵ

diff --git a/runtime/keymap/vietnamese-vni_utf-8.vim b/runtime/keymap/vietnamese-vni_utf-8.vim
new file mode 100644 (file)
index 0000000..c9312c6
--- /dev/null
+++ b/runtime/keymap/vietnamese-vni_utf-8.vim
@@ -0,0 +1,196 @@
+" Vim Keymap file for Vietnamese through VNI method
+" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
+" Last Change: 2016-06-13
+
+scriptencoding utf-8
+
+let b:keymap_name = "vi"
+
+loadkeymap
+
+A\\    A
+A1     Á
+A2     À
+A3     Ả
+A4     Ã
+A5     Ạ
+
+A8     Ă
+A8\\   Ă
+A81    Ắ
+A82    Ằ
+A83    Ẳ
+A84    Ẵ
+A85    Ặ
+
+A6     Â
+A6\\   Â
+A61    Ấ
+A62    Ầ
+A63    Ẩ
+A64    Ẫ
+A65    Ậ
+
+D      D
+D\\    D
+D9     Đ
+
+E\\    E
+E1     É
+E2     È
+E3     Ẻ
+E4     Ẽ
+E5     Ẹ
+
+E6     Ê
+E6\\   Ê
+E61    Ế
+E62    Ề
+E63    Ể
+E64    Ễ
+E65    Ệ
+
+I\\    I
+I1     Í
+I2     Ì
+I3     Ỉ
+I4     Ĩ
+I5     Ị
+
+O\\    O
+O1     Ó
+O2     Ò
+O3     Ỏ
+O4     Õ
+O5     Ọ
+
+O6     Ô
+O6\\   Ô
+O61    Ố
+O62    Ồ
+O63    Ổ
+O64    Ỗ
+O65    Ộ
+
+O7     Ơ
+O7\\   Ơ
+O71    Ớ
+O72    Ờ
+O73    Ở
+O74    Ỡ
+O75    Ợ
+
+U\\    U
+U1     Ú
+U2     Ù
+U3     Ủ
+U4     Ũ
+U5     Ụ
+
+U7     Ư
+U7\\   Ư
+U71    Ứ
+U72    Ừ
+U73    Ử
+U74    Ữ
+U75    Ự
+
+Y\\    Y
+Y1     Ý
+Y2     Ỳ
+Y3     Ỷ
+Y4     Ỹ
+Y5     Ỵ
+
+a\\    a
+a1     á
+a2     à
+a3     ả
+a4     ã
+a5     ạ
+
+a8     ă
+a8\\   ă
+a81    ắ
+a82    ằ
+a83    ẳ
+a84    ẵ
+a85    ặ
+
+a6     â
+a6\\   â
+a61    ấ
+a62    ầ
+a63    ẩ
+a64    ẫ
+a65    ậ
+
+d\\    d
+d9     đ
+
+e\\    e
+e1     é
+e2     è
+e3     ẻ
+e4     ẽ
+e5     ẹ
+
+e6     ê
+e6\\   ê
+e61    ế
+e62    ề
+e63    ể
+e64    ễ
+e65    ệ
+
+i\\    i
+i1     í
+i2     ì
+i3     ỉ
+i4     ĩ
+i5     ị
+
+o\\    o
+o1     ó
+o2     ò
+o3     ỏ
+o4     õ
+o5     ọ
+
+o6     ô
+o6\\   ô
+o61    ố
+o62    ồ
+o63    ổ
+o64    ỗ
+o65    ộ
+
+o7     ơ
+o7\\   ơ
+o71    ớ
+o72    ờ
+o73    ở
+o74    ỡ
+o75    ợ
+
+u\\    u
+u1     ú
+u2     ù
+u3     ủ
+u4     ũ
+u5     ụ
+
+u7     ư
+u7\\   ư
+u71    ứ
+u72    ừ
+u73    ử
+u74    ữ
+u75    ự
+
+y\\    y
+y1     ý
+y2     ỳ
+y3     ỷ
+y4     ỹ
+y5     ỵ

diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index b3c89f835290c633ec752f83ccde2ce34add32d1..ef07b2267606021e1a549c6bd1c5d980811595c8 100644 (file)
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -2,7 +2,7 @@
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2016-01-05
+" Latest Revision: 2016-06-17
 
 if exists("b:current_syntax")
   finish
@@ -137,7 +137,7 @@ syn match   rstStandaloneHyperlink  contains=@NoSpell
       \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]"
 
 syn region rstCodeBlock contained matchgroup=rstDirective
-      \ start=+\%(sourcecode\|code\%(-block\)\=\)::\_s*\n\ze\z(\s\+\)+
+      \ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+\w*\_s*\n\ze\z(\s\+\)+
       \ skip=+^$+
       \ end=+^\z1\@!+
       \ contains=@NoSpell
@@ -153,10 +153,11 @@ for code in g:rst_syntax_code_list
     " guard against setting 'isk' option which might cause problems (issue #108)
     let prior_isk = &l:iskeyword
     exe 'syn include @rst'.code.' syntax/'.code.'.vim'
-    exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
-                \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
-                \.'skip=#^$# '
-                \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
+    exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold'
+                \.' start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)#'
+                \.' skip=#^$#'
+                \.' end=#^\z1\@!#'
+                \.' contains=@NoSpell,@rst'.code
     exe 'syn cluster rstDirectives add=rstDirective'.code
     " reset 'isk' setting, if it has been changed
     if &l:iskeyword !=# prior_isk
@@ -185,10 +186,11 @@ hi def link rstHyperlinkTarget              String
 hi def link rstExDirective                  String
 hi def link rstSubstitutionDefinition       rstDirective
 hi def link rstDelimiter                    Delimiter
-" TODO: I dunno...
-hi def      rstEmphasis                     term=italic cterm=italic gui=italic
+hi def link rstEmphasis                     Underlined
 hi def link rstStrongEmphasis               Special
-"term=bold cterm=bold gui=bold
+" TODO Append these atttributes somehow
+"hi def rstEmphasis term=italic cterm=italic gui=italic
+"hi def rstStrongEmphasis term=bold cterm=bold gui=bold
 hi def link rstInterpretedTextOrHyperlinkReference  Identifier
 hi def link rstInlineLiteral                String
 hi def link rstSubstitutionReference        PreProc

diff --git a/src/po/it.po b/src/po/it.po
index 5789fee70b16575affa0297dfa0da54a9b48b639..223185f535f9b2fc3b615116144582fba84542ac 100644 (file)
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -2126,7 +2126,7 @@ msgid "E490: No fold found"
 msgstr "E490: Non trovo alcuna piegatura"
 
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Non posso create piegatura con il 'foldmethod' in uso"
+msgstr "E350: Non posso creare piegatura con il 'foldmethod' in uso"
 
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Non posso cancellare piegatura con il 'foldmethod' in uso"