summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--runtime/doc/change.txt2
-rw-r--r--runtime/doc/index.txt8
-rw-r--r--runtime/doc/mbyte.txt2
-rw-r--r--runtime/doc/message.txt8
-rw-r--r--runtime/doc/options.txt8
-rw-r--r--runtime/doc/syntax.txt31
-rw-r--r--runtime/doc/tags4
-rw-r--r--runtime/doc/todo.txt55
-rw-r--r--runtime/filetype.vim13
-rw-r--r--runtime/indent/falcon.vim3
-rw-r--r--runtime/indent/sdl.vim2
-rw-r--r--runtime/lang/menu_ja_jp.euc-jp.vim16
-rw-r--r--runtime/lang/menu_ja_jp.utf-8.vim16
-rw-r--r--runtime/lang/menu_japanese_japan.932.vim16
-rw-r--r--runtime/macros/editexisting.vim4
-rw-r--r--runtime/synmenu.vim21
-rw-r--r--runtime/syntax/c.vim10
-rw-r--r--runtime/syntax/cl.vim14
-rw-r--r--runtime/syntax/csdl.vim536
-rw-r--r--runtime/syntax/python.vim4
-rw-r--r--src/po/ja.po999
-rw-r--r--src/po/ja.sjis.po999
22 files changed, 1841 insertions, 930 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index d5f19a6349..18cc812bd9 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -600,7 +600,7 @@ For other systems the tmpnam() library function is used.
*g&*
g& Synonym for `:%s//~/&` (repeat last substitute with
last search pattern on all lines with the same flags).
- For exaple, when you first do a substitution with
+ For example, when you first do a substitution with
`:s/pattern/repl/flags` and then `/search` for
something else, `g&` will do `:%s/search/repl/flags`.
Mnemonic: global substitute. {not in Vi}
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 57ca2fd790..7ce87cf039 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.3. Last change: 2012 Jul 25
+*index.txt* For Vim version 7.3. Last change: 2013 Feb 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1134,7 +1134,7 @@ tag command action ~
|:cgetbuffer| :cgetb[uffer] get errors from buffer
|:cgetexpr| :cgete[xpr] get errors from expr
|:cgetfile| :cg[etfile] read file with error messages
-|:changes| :cha[nges] print the change list
+|:changes| :changes print the change list
|:chdir| :chd[ir] change directory
|:checkpath| :che[ckpath] list included files
|:checktime| :checkt[ime] check timestamp of loaded buffers
@@ -1383,7 +1383,7 @@ tag command action ~
|:promptrepl| :promptr[epl] open GUI dialog for search/replace
|:perldo| :perld[o] execute Perl command for each line
|:pop| :po[p] jump to older entry in tag stack
-|:popup| :pop[up] popup a menu by name
+|:popup| :popu[p] popup a menu by name
|:ppop| :pp[op] ":pop" in preview window
|:preserve| :pre[serve] write all text to swap file
|:previous| :prev[ious] go to previous file in argument list
@@ -1469,7 +1469,7 @@ tag command action ~
|:slast| :sla[st] split window and go to last file in the
argument list
|:smagic| :sm[agic] :substitute with 'magic'
-|:smap| :sma[p] like ":map" but for Select mode
+|:smap| :smap like ":map" but for Select mode
|:smapclear| :smapc[lear] remove all mappings for Select mode
|:smenu| :sme[nu] add menu for Select mode
|:snext| :sn[ext] split window and go to next file in the
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index c2d95104a3..61647935f7 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1067,7 +1067,7 @@ The actual mappings are in the lines below "loadkeymap". In the example "a"
is mapped to "A" and "b" to "B". Thus the first item is mapped to the second
item. This is done for each line, until the end of the file.
These items are exactly the same as what can be used in a |:lnoremap| command,
-using "<buffer>" to make the mappings local to the buffer..
+using "<buffer>" to make the mappings local to the buffer.
You can check the result with this command: >
:lmap
The two items must be separated by white space. You cannot include white
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 97c452502c..35f6c49de1 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt* For Vim version 7.3. Last change: 2011 May 10
+*message.txt* For Vim version 7.3. Last change: 2013 Feb 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -730,7 +730,11 @@ Vim cannot create a temporary file.
Can't open file {filename}
Can't read file {filename}
-Vim cannot read a temporary file.
+Vim cannot read a temporary file. Especially on Windows, this can be caused
+by wrong escaping of special characters for cmd.exe; the approach was
+changed with patch 7.3.443. Try using |shellescape()| for all shell arguments
+given to |system()|, or explicitly add escaping with ^. Also see
+'shellxquote' and 'shellxescape'.
*E464* >
Ambiguous use of user-defined command
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 559a619870..143656a98f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2013 Feb 20
+*options.txt* For Vim version 7.3. Last change: 2013 Feb 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -986,7 +986,7 @@ A jump table for the options with a short description can be found at |Q_op|.
- The backup file will be created in the first directory in the list
where this is possible. The directory must exist, Vim will not
create it for you.
- - Empty means that no backup file will be created ('patchmode' is
+ - Empty means that no backup file will be created ( 'patchmode' is
impossible!). Writing may fail because of this.
- A directory "." means to put the backup file in the same directory
as the edited file.
@@ -1703,7 +1703,7 @@ A jump table for the options with a short description can be found at |Q_op|.
when CTRL-P or CTRL-N are used. It is also used for whole-line
completion |i_CTRL-X_CTRL-L|. It indicates the type of completion
and the places to scan. It is a comma separated list of flags:
- . scan the current buffer ('wrapscan' is ignored)
+ . scan the current buffer ( 'wrapscan' is ignored)
w scan buffers from other windows
b scan other loaded buffers that are in the buffer list
u scan the unloaded buffers that are in the buffer list
@@ -7085,7 +7085,7 @@ A jump table for the options with a short description can be found at |Q_op|.
{not in Vi}
Encoding used for the terminal. This specifies what character
encoding the keyboard produces and the display will understand. For
- the GUI it only applies to the keyboard ('encoding' is used for the
+ the GUI it only applies to the keyboard ( 'encoding' is used for the
display). Except for the Mac when 'macatsui' is off, then
'termencoding' should be "macroman".
In the Win32 console version the default value is the console codepage
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b48307d015..b69753ad06 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.3. Last change: 2013 Jan 30
+*syntax.txt* For Vim version 7.3. Last change: 2013 Mar 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -999,6 +999,14 @@ comment highlighting, add the following line to your startup file: >
The ColdFusion syntax file is based on the HTML syntax file.
+CPP *cpp.vim* *ft-cpp-syntax*
+
+Most of things are same as |ft-c-syntax|.
+
+Variable Highlight ~
+cpp_no_c11 don't highlight C++11 standard items
+
+
CSH *csh.vim* *ft-csh-syntax*
This covers the shell named "csh". Note that on some systems tcsh is actually
@@ -2440,24 +2448,33 @@ Pascal. Use this if you don't use assembly and Pascal: >
PYTHON *python.vim* *ft-python-syntax*
-There are four options to control Python syntax highlighting.
+There are six options to control Python syntax highlighting.
For highlighted numbers: >
- :let python_highlight_numbers = 1
+ :let python_no_number_highlight = 1
For highlighted builtin functions: >
- :let python_highlight_builtins = 1
+ :let python_no_builtin_highlight = 1
For highlighted standard exceptions: >
- :let python_highlight_exceptions = 1
+ :let python_no_exception_highlight = 1
+
+For highlighted doctests and code inside: >
+ :let python_no_doctest_highlight = 1
+or >
+ :let python_no_doctest_code_highlight = 1
+(first option implies second one).
For highlighted trailing whitespace and mix of spaces and tabs: >
- :let python_highlight_space_errors = 1
+ :let python_space_error_highlight = 1
If you want all possible Python highlighting (the same as setting the
-preceding three options): >
+preceding last option and unsetting all other ones): >
:let python_highlight_all = 1
+Note: only existence of these options matter, not their value. You can replace
+ 1 above with anything.
+
QUAKE *quake.vim* *ft-quake-syntax*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index da079b286a..89ac4a9915 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4251,6 +4251,7 @@ E859 eval.txt /*E859*
E86 windows.txt /*E86*
E860 eval.txt /*E860*
E861 eval.txt /*E861*
+E862 eval.txt /*E862*
E87 windows.txt /*E87*
E88 windows.txt /*E88*
E89 message.txt /*E89*
@@ -6694,6 +6695,7 @@ mapmode-s map.txt /*mapmode-s*
mapmode-v map.txt /*mapmode-v*
mapmode-x map.txt /*mapmode-x*
mapping map.txt /*mapping*
+mapping-functions usr_41.txt /*mapping-functions*
mark motion.txt /*mark*
mark-functions usr_41.txt /*mark-functions*
mark-motions motion.txt /*mark-motions*
@@ -7561,6 +7563,7 @@ sgr-mouse options.txt /*sgr-mouse*
sh-awk syntax.txt /*sh-awk*
sh-embed syntax.txt /*sh-embed*
sh.vim syntax.txt /*sh.vim*
+sha256() eval.txt /*sha256()*
shell-window tips.txt /*shell-window*
shell_error-variable eval.txt /*shell_error-variable*
shellescape() eval.txt /*shellescape()*
@@ -8523,6 +8526,7 @@ white-space pattern.txt /*white-space*
whitespace pattern.txt /*whitespace*
wildcard editing.txt /*wildcard*
wildcards editing.txt /*wildcards*
+wildmenumode() eval.txt /*wildmenumode()*
win16-!start gui_w16.txt /*win16-!start*
win16-clipboard gui_w16.txt /*win16-clipboard*
win16-colors gui_w16.txt /*win16-colors*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index f17d2540aa..7fde2eda98 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2013 Feb 20
+*todo.txt* For Vim version 7.3. Last change: 2013 Mar 07
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,16 +34,6 @@ not be repeated below, unless there is extra information.
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
- Sutcliffe says it works well.
- Update 2007 May 22 for Vim 7.1
- Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
- Update by Ken Takata (2012 Dec 31, 2013 Jan 4, 2013 Jan 26)
-
-Download counter for scripts no longer incremented?
-Because SourceForge does not have the IP address now, see ticket
-https://sourceforge.net/p/forge/site-support/2461/?page=1
-
Several syntax file match "^\s*" which may get underlined if that's in the
highlight group. Add a "\zs" after it?
@@ -55,13 +45,38 @@ Memory leaks in Lua, uncovered by test 85.
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
+Patch to build with Ruby 2.0 and Ming@ 64. (Ken Takata, 2013 Feb 28)
+
Checking runtime scripts: Thilo Six, 2012 Jun 6.
GTK: problem with 'L' in 'guioptions' changing the window width.
(Aaron Cornelius, 2012 Feb 6)
+Patch for this problem: (David B端rgin (glts), 2013 Mar 5)
+8 ":g//" gives "Pattern not found error" with E486. Should not use the
+ error number, it's not a regular error message.
+
+Patch to fix ":vimgrep //". (David B端rgin (glts), 2013 Mar 5)
+
+Updates for Debian runtime files. (James McCoy, 2013 Mar 3)
+Also an update for debcontrol in another message.
+
Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
+Patch for ":sort" not properly handling an empty search pattern when there is
+no previous search pattern. (David B端rgin, 2013 Mar 4)
+
+system() breaks clipboard text. (Yukihiro Nakadaira, 2013 Feb 28)
+Patch by Christian Brabandt, 2013 Mar 1.
+
+Patch for replace multi-byte character in multiple lines. (Yasuhiro Matsumoto,
+2013 Feb 27)
+
+Patch to avoid register being changed when yanking. (Christian Brabandt, 2013
+Feb 26)
+
+Patch to trigger QuitPre in more situations. (Tatsuro Fujii, 2013 Mar 3)
+
The CompleteDone autocommand needs some info passed to it:
- The word that was selected (empty if abandoned complete)
- Type of completion: tag, omnifunc, user func.
@@ -70,8 +85,8 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
complete the contents of the directory. No escaping for the "!"? (Jan
Stocker, 2012 Jan 5)
-Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
-Patch by Christian Brabandt, Nov 22. Tests in another patch, Nov 23.
+Patch to fix wrong completion entry after using backspace. (reported by
+Olivier Teuliere, fixed by Christian Brabandt, 2013 Feb 26)
Patch to detect value of 'ambiwidth' from the termresponse.
(Hayaki Saito, 2013 Feb 11)
@@ -94,6 +109,9 @@ Patch to fix compiler warnings for MingW 4.5.3. (Ken Takata, 2013 Jan 26)
Bug: search() does not use the match at the cursor position if it's empty.
(Christian Brabandt, 2013 Feb 16) Patch later.
+On Mac do not define CASE_INSENSITIVE_FILENAME ? (Richo Healey, 2013 Mar 3)
+But do set 'wildignorecase' ?
+
Patch to make it possible to create Title Case in :s. with \L\u.
(James McCoy, 2013 Feb 13)
@@ -112,6 +130,9 @@ Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
Issue 54: document behavior of -complete, also expands arg.
+Matches might be highlighted correctly. Inefficient patch by Christian
+Brabandt, 2013 Feb 26.
+
New syntax files for apt. (quidame, 2012 Sep 21)
'ff' is wrong for one-line file without EOL. (Issue 77)
@@ -152,7 +173,7 @@ Or use expand('<sid>')?
Patch to make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
-Patch to add functions for signs. (Christian Brabandt,, 2013 Jan 27)
+Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
Patch to use directX to draw text on Windows. Adds the 'directx' option.
(Taro Muraoka, 2013 Jan 25)
@@ -189,7 +210,7 @@ MS-Windows resizing problems:
'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23)
-Help for b:undo_indent'. (Thilo Six, 2012 May 28)
+Help for 'b:undo_indent'. (Thilo Six, 2012 May 28)
Also question if examples are correct.
It should be possible to make globpath() return a list instead of a string,
@@ -261,6 +282,8 @@ Problem with l: dictionary being locked in a function. (ZyX, 2011 Jul 21)
Should use has("browsefilter") in ftplugins. Requires patch 7.3.593.
+Update for vim2html.pl. (Tyru, 2013 Feb 22)
+
Issue 48: foldopen error can't be caught by try/catch
"dg_" deletes including the last character, "d:normal! g_" doesn't.
@@ -2284,8 +2307,6 @@ Macintosh:
the :catch commands are always executed, also when the file is edited
normally. Should reset did_emsg and undo side effects. Also make sure
the ATTENTION message shows up. Servatius Brandt works on this.
-8 ":g//" gives "Pattern not found error" with E486. Should not use the
- error number, it's not a regular error message.
7 Vimtutor leaves escape sequence in terminal. This is the xterm response to
requesting the version number. (Yasuhiro Matsumoto)
8 When redirecting and using ":silent" the current column for displaying and
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c427b1835c..aee617cbeb 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2013 Feb 20
+" Last Change: 2013 Feb 28
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -325,6 +325,9 @@ au BufNewFile,BufRead calendar setf calendar
" C#
au BufNewFile,BufRead *.cs setf cs
+" CSDL
+au BufNewFile,BufRead *.csdl setf csdl
+
" Cabal
au BufNewFile,BufRead *.cabal setf cabal
@@ -2194,8 +2197,12 @@ au BufNewFile,BufRead *.uc setf uc
au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
" Upstart (init(8)) config files
-au BufNewFile,BufRead */etc/init/*.conf,*/.init/*.conf setf upstart
-au BufNewFile,BufRead */etc/init/*.override,*/.init/*.override setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.conf setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.override setf upstart
+au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart
+au BufNewFile,BufRead */.config/upstart/*.conf setf upstart
+au BufNewFile,BufRead */.config/upstart/*.override setf upstart
" Vera
au BufNewFile,BufRead *.vr,*.vri,*.vrh setf vera
diff --git a/runtime/indent/falcon.vim b/runtime/indent/falcon.vim
index 41f8f34705..46a228e8b6 100644
--- a/runtime/indent/falcon.vim
+++ b/runtime/indent/falcon.vim
@@ -5,7 +5,6 @@
" Credits: Thanks to the ruby.vim authors, I borrow a lot!
" Previous Maintainer: Brent A. Fulgham <bfulgham@debian.org>
" -----------------------------------------------------------
-" GetLatestVimScripts: 2752 1 :AutoInstall: falcon.vim
"======================================
" SETUP
@@ -132,7 +131,7 @@ function FalconGetIndent()
" If previous line ends in a semi-colon reset indent to previous
" lines setting
if prevline =~? ';\s*$' && prevnonblank(prevline) =~? ',\s*$'
- return chg = chg - (2 * &sw)
+ let chg = chg - (2 * &sw)
endif
" If previous line ended in a comma, indent again
diff --git a/runtime/indent/sdl.vim b/runtime/indent/sdl.vim
index b5e535eeac..ba03f2d3f4 100644
--- a/runtime/indent/sdl.vim
+++ b/runtime/indent/sdl.vim
@@ -73,7 +73,7 @@ function! GetSDLIndent()
" Systems and packages are always in column 0
if getline(v:lnum) =~? '^\s*\(\(end\)\=system\|\(end\)\=package\)'
- return 0;
+ return 0
endif
" Put each end* where the corresponding begin was
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 23a00930bc..d3961b90cd 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (EUC-JP)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste 貼り付け(&P)
menutrans &Delete 削除(&D)
menutrans Select\ Blockwise 矩形ブロック選択
menutrans Select\ &Word 単語選択(&W)
+menutrans Select\ &Sentence 文選択(&S)
+menutrans Select\ Pa&ragraph 段落選択(&R)
menutrans Select\ &Line 行選択(&L)
menutrans Select\ &Block ブロック選択(&B)
menutrans Select\ &All すべて選択(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTMLへコンバート(&C)
" 成否はiconv次第、必ずしも指定したエンコードになるわけではないことに注意
if has('iconv')
" iconvのバージョン判定
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
" 読み込み
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
" 再読込
an 10.396.110.100 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
" 保存
an 10.396.115 &File.エンコード指定(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 2638c3c1b1..0e48fcf524 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (UTF-8)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste 莢若篁(&P)
menutrans &Delete (&D)
menutrans Select\ Blockwise 綵≪御
menutrans Select\ &Word 茯御(&W)
+menutrans Select\ &Sentence 御(&S)
+menutrans Select\ Pa&ragraph 罧笈初御(&R)
menutrans Select\ &Line 茵御(&L)
menutrans Select\ &Block 御(&B)
menutrans Select\ &All 鴻御(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTML吾潟潟若(&C)
" iconv罨∞綽絎潟潟若с羈
if has('iconv')
" iconv若吾с喝ゅ
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
" 茯粋昭
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.潟潟若絎(&E)\.\.\..(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
" 茯莨
an 10.396.110.100 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.潟潟若絎(&E)\.\.\..茯莨(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
" 篆絖
an 10.396.115 &File.潟潟若絎(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.潟潟若絎(&E)\.\.\..篆絖(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index fc030134e5..eee7e76408 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -2,7 +2,7 @@
"
" Menu Translations: Japanese (CP932)
" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change: 15-Jun-2012.
+" Last Change: 24-Feb-2013.
"
" Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@ menutrans &Paste \t(&P)
menutrans &Delete (&D)
menutrans Select\ Blockwise `ubNI
menutrans Select\ &Word PI(&W)
+menutrans Select\ &Sentence I(&S)
+menutrans Select\ Pa&ragraph iI(&R)
menutrans Select\ &Line sI(&L)
menutrans Select\ &Block ubNI(&B)
menutrans Select\ &All I(&A)
@@ -301,12 +303,12 @@ menutrans &Convert\ to\ HTML HTMLRo[g(&C)
" iconvAKwGR[h
if has('iconv')
" iconvo[W
- let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
- "
+ let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
"
an 10.395 &File.-SEPICONV- <Nop>
an 10.396.100.100 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.100.110 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
an 10.396.100.120 &File.GR[hw(&E)\.\.\..J(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
else
@@ -317,7 +319,7 @@ if has('iconv')
"
an 10.396.110.100 &File.GR[hw(&E)\.\.\..(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.110.110 &File.GR[hw(&E)\.\.\..(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
an 10.396.110.120 &File.GR[hw(&E)\.\.\..(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
else
@@ -329,7 +331,7 @@ if has('iconv')
"
an 10.396.115 &File.GR[hw(&E)\.\.\..-SEP1- <Nop>
an 10.396.120.100 &File.GR[hw(&E)\.\.\..(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
- if !support_jisx0213
+ if !s:support_jisx0213
an 10.396.120.110 &File.GR[hw(&E)\.\.\..(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
an 10.396.120.120 &File.GR[hw(&E)\.\.\..(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
else
@@ -337,6 +339,8 @@ if has('iconv')
an 10.396.120.120 &File.GR[hw(&E)\.\.\..(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
endif
an 10.396.120.130 &File.GR[hw(&E)\.\.\..(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+ unlet s:support_jisx0213
endif
let &cpo = s:keepcpo
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index 07c55f675e..c18f22569f 100644
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
" Vim Plugin: Edit the file with an existing Vim if possible
" Maintainer: Bram Moolenaar
-" Last Change: 2008 May 29
+" Last Change: 2013 Feb 24
" This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
" $VIM/vimfiles/plugin directory. Or make a symbolic link, so that you
@@ -98,7 +98,7 @@ func! EditExisting(fname, command)
" Make this tab page the current one and find the window number.
exe 'tabnext ' . (i + 1)
let winnr = bufwinnr(a:fname)
- break;
+ break
endif
endfor
endif
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 92678d149c..d964d0e912 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -124,16 +124,17 @@ an 50.20.360 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
an 50.20.370 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
an 50.20.380 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
an 50.20.390 &Syntax.C.Crontab :cal SetSyn("crontab")<CR>
-an 50.20.400 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.410 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.420 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
-an 50.20.430 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
-an 50.20.440 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.450 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.460 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.470 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
-an 50.20.480 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
-an 50.20.490 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
+an 50.20.400 &Syntax.C.CSDL :cal SetSyn("csdl")<CR>
+an 50.20.410 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.420 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.430 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
+an 50.20.440 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
+an 50.20.450 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.460 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.470 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.480 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.490 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
+an 50.20.500 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
an 50.30.110 &Syntax.DE.Datascript :cal SetSyn("datascript")<CR>
an 50.30.120 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 501c91a44a..c663c4eb5f 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 Dec 14
+" Last Change: 2013 Mar 07
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -36,7 +36,13 @@ endif
if exists("c_no_cformat")
syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
" cCppString: same as cString, but ends at end of line
- syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,@Spell
+ if !exists("cpp_no_cpp11") " ISO C++11
+ syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+ else
+ syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+ endif
+ syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
+ syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
else
if !exists("c_no_c99") " ISO C99
syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 82660db74b..41c045fb09 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -1,12 +1,14 @@
" Vim syntax file
-" Language: CL
-" (pronounced alphabetically, and NOT known as Clever)
-" (CL was created by