Permalink
Browse files

Merge branch 'vim'

Conflicts:
	src/auto/configure
	src/buffer.c
	src/configure.in
	src/if_python.c
	src/option.c
  • Loading branch information...
b4winckler committed Nov 4, 2012
2 parents 4aeadf5 + 41f429c commit 29343568f976171f89f1d1cb5d9d80371cf89429
Showing with 14,014 additions and 17,732 deletions.
  1. +2 −0 .hgignore
  2. +66 −0 .hgtags
  3. +12 −2 Filelist
  4. +4 −1 runtime/doc/autocmd.txt
  5. +2 −2 runtime/doc/cmdline.txt
  6. +6 −6 runtime/doc/diff.txt
  7. +31 −12 runtime/doc/eval.txt
  8. +1 −1 runtime/doc/hebrew.txt
  9. +21 −1 runtime/doc/if_pyth.txt
  10. +2 −2 runtime/doc/indent.txt
  11. +3 −1 runtime/doc/intro.txt
  12. +8 −1 runtime/doc/mbyte.txt
  13. +5 −3 runtime/doc/options.txt
  14. +1 −0 runtime/doc/tags
  15. +95 −15 runtime/doc/todo.txt
  16. +3 −3 runtime/doc/usr_41.txt
  17. +1 −1 runtime/doc/visual.txt
  18. +16 −2 runtime/filetype.vim
  19. +3 −3 runtime/ftplugin/changelog.vim
  20. +27 −22 runtime/ftplugin/zimbu.vim
  21. +2 −2 runtime/indent/zimbu.vim
  22. +8 −3 runtime/menu.vim
  23. +3 −2 runtime/scripts.vim
  24. +112 −52 runtime/syntax/abap.vim
  25. +493 −0 runtime/syntax/aptconf.vim
  26. +6 −1 runtime/syntax/asn.vim
  27. +68 −68 runtime/syntax/cl.vim
  28. +303 −96 runtime/syntax/css.vim
  29. +3 −2 runtime/syntax/debcontrol.vim
  30. +26 −0 runtime/syntax/dts.vim
  31. +9 −4 runtime/syntax/gdb.vim
  32. +7 −7 runtime/syntax/hgcommit.vim
  33. +16 −9 runtime/syntax/html.vim
  34. +11 −4 runtime/syntax/java.vim
  35. +7 −2 runtime/syntax/javacc.vim
  36. +6 −1 runtime/syntax/javascript.vim
  37. +10 −4 runtime/syntax/make.vim
  38. +58 −58 runtime/syntax/progress.vim
  39. +60 −27 runtime/syntax/rexx.vim
  40. +3 −1 runtime/syntax/synload.vim
  41. +1 −1 runtime/tutor/tutor
  42. +1 −1 runtime/tutor/tutor.eo.utf-8
  43. +1 −1 runtime/tutor/tutor.fr
  44. +1 −1 runtime/tutor/tutor.fr.utf-8
  45. +1 −1 runtime/tutor/tutor.hr
  46. +1 −1 runtime/tutor/tutor.hr.cp1250
  47. +1 −1 runtime/tutor/tutor.hr.utf-8
  48. +6 −6 runtime/tutor/tutor.ja.euc
  49. +6 −6 runtime/tutor/tutor.ja.sjis
  50. +6 −6 runtime/tutor/tutor.ja.utf-8
  51. +1 −1 runtime/tutor/tutor.ko.euc
  52. +1 −1 runtime/tutor/tutor.ko.utf-8
  53. +1 −1 runtime/tutor/tutor.nb
  54. +1 −1 runtime/tutor/tutor.nb.utf-8
  55. +1 −1 runtime/tutor/tutor.no
  56. +1 −1 runtime/tutor/tutor.no.utf-8
  57. +1 −1 runtime/tutor/tutor.sk
  58. +1 −1 runtime/tutor/tutor.sk.cp1250
  59. +1 −1 runtime/tutor/tutor.sk.utf-8
  60. +1 −1 runtime/tutor/tutor.utf-8
  61. +8 −2 runtime/tutor/tutor.vim
  62. +455 −310 runtime/tutor/tutor.zh.euc
  63. +996 −0 runtime/tutor/tutor.zh_cn.utf-8
  64. 0 runtime/tutor/{tutor.zh.utf-8 → tutor.zh_tw.utf-8}
  65. +13 −3 src/INSTALLpc.txt
  66. +46 −23 src/Make_ming.mak
  67. +27 −6 src/Make_mvc.mak
  68. +57 −36 src/auto/configure
  69. +32 −19 src/buffer.c
  70. +9,823 −16,559 src/configure
  71. +52 −33 src/configure.in
  72. +4 −2 src/diff.c
  73. +8 −8 src/edit.c
  74. +19 −0 src/eval.c
  75. +10 −5 src/ex_cmds.c
  76. +1 −2 src/ex_cmds2.c
  77. +2 −2 src/ex_docmd.c
  78. +4 −3 src/ex_getln.c
  79. +2 −0 src/feature.h
  80. +5 −3 src/gui_beval.c
  81. +1 −1 src/gui_gtk.c
  82. +2 −1 src/if_lua.c
  83. +2 −1 src/if_mzsch.c
  84. +14 −3 src/if_perl.xs
  85. +141 −20 src/if_py_both.h
  86. +53 −36 src/if_python.c
  87. +139 −62 src/if_python3.c
  88. +15 −1 src/if_ruby.c
  89. +10 −4 src/mbyte.c
  90. +2 −4 src/memline.c
  91. +7 −2 src/normal.c
  92. +4 −1 src/ops.c
  93. +30 −19 src/option.c
  94. +4 −7 src/os_unix.c
  95. +30 −9 src/os_win32.c
  96. +1 −1 src/os_win32.h
  97. +1 −1 src/proto/buffer.pro
  98. +1 −0 src/proto/option.pro
  99. +1 −1 src/screen.c
  100. +16 −12 src/search.c
  101. +14 −11 src/syntax.c
  102. +3 −1 src/tag.c
  103. +12 −14 src/term.c
  104. +1 −0 src/testdir/Make_dos.mak
  105. +1 −0 src/testdir/Make_ming.mak
  106. +2 −1 src/testdir/Make_vms.mms
  107. +3 −3 src/testdir/Makefile
  108. +1 −0 src/testdir/test16.in
  109. +16 −1 src/testdir/test47.in
  110. +1 −0 src/testdir/test47.ok
  111. +7 −1 src/testdir/test53.in
  112. +2 −0 src/testdir/test53.ok
  113. +80 −10 src/testdir/test86.in
  114. +20 −2 src/testdir/test86.ok
  115. +79 −10 src/testdir/test87.in
  116. +20 −2 src/testdir/test87.ok
  117. +3 −3 src/ui.c
  118. +153 −15 src/version.c
  119. +3 −0 src/xpm/README.txt
  120. BIN src/xpm/x64/lib/libXpm.a
View
@@ -32,6 +32,7 @@ src/auto/pathdef.c
*.suo
*.res
*.RES
+src/if_perl.c
src/pathdef.c
src/Obj*/pathdef.c
gvimext.dll
@@ -43,6 +44,7 @@ gvimext.lib
*.mo
*.swp
*~
+src/po/vim.pot
# Generated by "make test"
src/po/*.ck
View
66 .hgtags
@@ -1983,3 +1983,69 @@ fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
+29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
+76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
+063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
+a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
+ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
+5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
+fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
+73557eda70271b49015265b7147562b63a7a094d v7-3-654
+0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
+a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
+3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
+15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
+e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
+8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
+5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
+87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
+2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
+f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
+35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
+1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
+cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
+dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
+2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
+2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
+530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
+fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
+ca1c025079b11c98363e11576d903af756a593fc v7-3-673
+4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
+9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
+5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
+8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
+de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
+dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
+52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
+a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
+8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
+0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
+1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
+34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
+ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
+0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
+2696da84d37093da0dea419878e4241385eb515b v7-3-688
+3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
+caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
+7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
+337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
+fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
+8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
+cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
+447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
+7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
+b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
+4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
+c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
+48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
+916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
+f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
+be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
+0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
+d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
+d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
+64427849c1582299f2af389c6225eead529f0329 v7-3-708
+fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
+906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
+2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711
+557ef119999ea687ccb84eddca295755c24989da v7-3-712
View
@@ -261,6 +261,7 @@ SRC_DOS = \
src/Make_mvc.mak \
src/Make_w16.mak \
src/bigvim.bat \
+ src/bigvim64.bat \
src/msvcsetup.bat \
src/msvc2008.bat \
src/msvc2010.bat \
@@ -352,6 +353,7 @@ SRC_DOS_BIN = \
src/xpm/COPYRIGHT \
src/xpm/README.txt \
src/xpm/include/*.h \
+ src/xpm/x64/lib/libXpm.a \
src/xpm/x64/lib/libXpm.lib \
src/xpm/x86/lib/libXpm.a \
src/xpm/x86/lib/libXpm.lib \
@@ -691,9 +693,17 @@ LANG_GEN = \
runtime/tutor/Makefile \
runtime/tutor/tutor.utf-8 \
runtime/tutor/tutor.?? \
- runtime/tutor/tutor.??.* \
+ runtime/tutor/tutor.??.utf-8 \
+ runtime/tutor/tutor.??.euc \
+ runtime/tutor/tutor.??.sjis \
+ runtime/tutor/tutor.??.iso9 \
+ runtime/tutor/tutor.??.big5 \
+ runtime/tutor/tutor.??.cp1250 \
+ runtime/tutor/tutor.??.cp1251 \
+ runtime/tutor/tutor.??.cp737 \
+ runtime/tutor/tutor.??_??.utf-8 \
runtime/tutor/tutor.bar \
- runtime/tutor/tutor.bar.* \
+ runtime/tutor/tutor.bar.utf-8 \
runtime/spell/README.txt \
runtime/spell/??/*.diff \
runtime/spell/??/main.aap \
View
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.3. Last change: 2012 Jul 10
+*autocmd.txt* For Vim version 7.3. Last change: 2012 Sep 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -263,8 +263,10 @@ Name triggered by ~
Startup and exit
|VimEnter| after doing all the startup stuff
|GUIEnter| after starting the GUI successfully
+|GUIFailed| after starting the GUI failed
|TermResponse| after the terminal response to |t_RV| is received
+|QuitPre| when using `:quit`, before deciding whether to quit
|VimLeavePre| before exiting Vim, before writing the viminfo file
|VimLeave| before exiting Vim, after writing the viminfo file
@@ -312,6 +314,7 @@ Name triggered by ~
|SessionLoadPost| after loading a session file
|MenuPopup| just before showing the popup menu
+|CompleteDone| after Insert mode completion is done
|User| to be used in combination with ":doautocmd"
View
@@ -1,4 +1,4 @@
-*cmdline.txt* For Vim version 7.3. Last change: 2012 Jun 20
+*cmdline.txt* For Vim version 7.3. Last change: 2012 Oct 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -217,7 +217,7 @@ CTRL-\ e {expr} *c_CTRL-\_e*
:return cmd
:endfunc
< This doesn't work recursively, thus not when already editing
- an expression.
+ an expression. But it is possible to use in a mapping.
*c_CTRL-Y*
CTRL-Y When there is a modeless selection, copy the selection into
View
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.3. Last change: 2012 Aug 08
+*diff.txt* For Vim version 7.3. Last change: 2012 Sep 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -86,16 +86,16 @@ diff mode. You could use a construct like this: >
While already in Vim you can start diff mode in three ways.
*E98*
-:diffsplit {filename} *:diffs* *:diffsplit*
+:diffs[plit] {filename} *:diffs* *:diffsplit*
Open a new window on the file {filename}. The options are set
as for "vimdiff" for the current and the newly opened window.
Also see 'diffexpr'.
*:difft* *:diffthis*
-:diffthis Make the current window part of the diff windows. This sets
+:difft[his] Make the current window part of the diff windows. This sets
the options like for "vimdiff".
-:diffpatch {patchfile} *E816* *:diffp* *:diffpatch*
+:diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch*
Use the current buffer, patch it with the diff found in
{patchfile} and open a buffer on the result. The options are
set as for "vimdiff".
@@ -123,9 +123,9 @@ Since the option values are remembered with the buffer, you can edit another
file for a moment and come back to the same file and be in diff mode again.
*:diffo* *:diffoff*
-:diffoff Switch off diff mode for the current window.
+:diffo[ff] Switch off diff mode for the current window.
-:diffoff! Switch off diff mode for the current window and in all windows
+:diffo[ff]! Switch off diff mode for the current window and in all windows
in the current tab page where 'diff' is set.
The ":diffoff" command resets the relevant options to their default value.
View
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2012 Aug 02
+*eval.txt* For Vim version 7.3. Last change: 2012 Oct 21
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -91,8 +91,8 @@ For boolean operators Numbers are used. Zero is FALSE, non-zero is TRUE.
Note that in the command >
:if "foo"
"foo" is converted to 0, which means FALSE. To test for a non-empty string,
-use strlen(): >
- :if strlen("foo")
+use empty(): >
+ :if !empty("foo")
< *E745* *E728* *E703* *E729* *E730* *E731*
List, Dictionary and Funcref types are not automatically converted.
@@ -759,7 +759,7 @@ of a |List| is different from the original |List|. When using "is" without
a |List| or a |Dictionary| it is equivalent to using "equal", using "isnot"
equivalent to using "not equal". Except that a different type means the
values are different: "4 == '4'" is true, "4 is '4'" is false and "0 is []" is
-false and not a error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
+false and not an error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
and ignore case.
When comparing a String with a Number, the String is converted to a Number,
@@ -1932,6 +1932,7 @@ setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
shellescape( {string} [, {special}])
String escape {string} for use as shell
command argument
+shiftwidth() Number effective value of 'shiftwidth'
simplify( {filename}) String simplify filename as much as possible
sin( {expr}) Float sine of {expr}
sinh( {expr}) Float hyperbolic sine of {expr}
@@ -3754,10 +3755,10 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]]) *inputdialog()*
Like |input()|, but when the GUI is running and text dialogs
are supported, a dialog window pops up to input the text.
Example: >
- :let n = inputdialog("value for shiftwidth", &sw)
- :if n != ""
- : let &sw = n
- :endif
+ :let n = inputdialog("value for shiftwidth", shiftwidth())
+ :if n != ""
+ : let &sw = n
+ :endif
< When the dialog is cancelled {cancelreturn} is returned. When
omitted an empty string is returned.
Hitting <Enter> works like pressing the OK button. Hitting
@@ -4635,8 +4636,8 @@ pyeval({expr}) *pyeval()*
Numbers and strings are returned as they are (strings are
copied though).
Lists are represented as Vim |List| type.
- Dictionaries are represented as Vim |Dictionary| type with
- keys converted to strings.
+ Dictionaries are represented as Vim |Dictionary| type,
+ non-string keys result in error.
{only available when compiled with the |+python| feature}
*E726* *E727*
@@ -5253,8 +5254,9 @@ setreg({regname}, {value} [,{options}])
If {options} contains no register settings, then the default
is to use character mode unless {value} ends in a <NL>.
- Setting the '=' register is not possible.
- Returns zero for success, non-zero for failure.
+ Setting the '=' register is not possible, but you can use >
+ :let @= = var_expr
+< Returns zero for success, non-zero for failure.
Examples: >
:call setreg(v:register, @*)
@@ -5330,6 +5332,23 @@ shellescape({string} [, {special}]) *shellescape()*
:call system("chmod +w -- " . shellescape(expand("%")))
+shiftwidth() *shiftwidth()*
+ Returns the effective value of 'shiftwidth'. This is the
+ 'shiftwidth' value unless it is zero, in which case it is the
+ 'tabstop' value. To be backwards compatible in indent
+ plugins, use this: >
+ if exists('*shiftwidth')
+ func s:sw()
+ return shiftwidth()
+ endfunc
+ else
+ func s:sw()
+ return &sw
+ endfunc
+ endif
+< And then use s:sw() instead of &sw.
+
+
simplify({filename}) *simplify()*
Simplify the file name as much as possible without changing
the meaning. Shortcuts (on MS-Windows) or symbolic links (on
View
@@ -93,7 +93,7 @@ Details
This is also the keymap when 'keymap=hebrew' is set. The advantage of
'keymap' is that it works properly when using UTF8, e.g. it inserts the
correct characters; 'hkmap' does not. The 'keymap' keyboard can also
- insert niqud and te`amim. To see what those mappings are,look at the
+ insert niqud and te`amim. To see what those mappings are, look at the
keymap file 'hebrew.vim' etc.
View
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.3. Last change: 2012 Aug 02
+*if_pyth.txt* For Vim version 7.3. Last change: 2012 Sep 23
VIM REFERENCE MANUAL by Paul Moore
@@ -159,6 +159,26 @@ vim.bindeval(str) *python-bindeval*
vimlist or vimdictionary python type that are connected to original
list or dictionary. Thus modifications to these objects imply
modifications of the original.
+
+ Additionally, vimlist and vimdictionary type have read-write
+ `.locked` attribute that returns
+ Value Meaning ~
+ zero Variable is not locked
+ vim.VAR_LOCKED Variable is locked, but can be unlocked
+ vim.VAR_FIXED Variable is locked and can't be unlocked
+ integer constants. If variable is not fixed, you can do
+ `var.locked=True` to lock it and `var.locked=False` to unlock.
+ There is no recursive locking like |:lockvar|! does. There is also
+ no way to lock a specific key or check whether it is locked (in any
+ case these locks are ignored by anything except |:let|: |extend()|
+ does not care, neither does python interface).
+
+ Vimdictionary type also supports `.scope` attribute which is one of
+ Value Meaning ~
+ zero Dictionary is not a scope one
+ vim.VAR_DEF_SCOPE Function-local or global scope dictionary
+ vim.VAR_SCOPE Other scope dictionary
+
2. if expression evaluates to a function reference, then it returns
callable vimfunction object. Use self keyword argument to assign
|self| object for dictionary functions.
View
@@ -1,4 +1,4 @@
-*indent.txt* For Vim version 7.3. Last change: 2011 Sep 02
+*indent.txt* For Vim version 7.3. Last change: 2012 Aug 30
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -540,7 +540,7 @@ The examples below assume a 'shiftwidth' of 4.
*cino-star*
*N Vim searches for unclosed comments at most N lines away. This
limits the time needed to search for the start of a comment.
- If your /* */ comments stop indenting afer N lines this is the
+ If your /* */ comments stop indenting after N lines this is the
value you will want to change.
(default 70 lines).
View
@@ -1,4 +1,4 @@
-*intro.txt* For Vim version 7.3. Last change: 2011 May 15
+*intro.txt* For Vim version 7.3. Last change: 2012 Sep 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -394,6 +394,8 @@ CTRL-{char} {char} typed as a control character; that is, typing {char}
*quotecommandquote*
"command" A reference to a command that you can type is enclosed in
double quotes.
+`command` New style command, this distinguishes it from other
+ quoted text and strings.
*key-notation* *key-codes* *keycodes*
These names for keys are used in the documentation. They can also be used
View
@@ -1,4 +1,4 @@
-*mbyte.txt* For Vim version 7.3. Last change: 2012 Jun 06
+*mbyte.txt* For Vim version 7.3. Last change: 2012 Oct 06
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -1085,6 +1085,13 @@ Since the mapping is defined with |:lnoremap| the resulting quote will not be
used for the start of another character.
The "accents" keymap uses this. *keymap-accents*
+The first column can also be in |<>| form:
+ <C-c> Ctrl-C
+ <A-c> Alt-c
+ <A-C> Alt-C
+Note that the Alt mappings may not work, depending on your keyboard and
+terminal.
+
Although it's possible to have more than one character in the second column,
this is unusual. But you can use various ways to specify the character: >
A a literal character
Oops, something went wrong.

0 comments on commit 2934356

Please sign in to comment.