Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'vim'

Conflicts:
	src/ex_getln.c
	src/option.c
	src/vim.h
  • Loading branch information...
commit 933cfa532cf4572f2ad1196a401a637e3f307cb1 2 parents 1c99b7c + e86d19e
@b4winckler authored
Showing with 3,395 additions and 765 deletions.
  1. +42 −0 .hgtags
  2. +6 −0 Filelist
  3. +113 −14 runtime/autoload/tohtml.vim
  4. +8 −2 runtime/compiler/mcs.vim
  5. +3 −1 runtime/doc/change.txt
  6. +2 −2 runtime/doc/diff.txt
  7. +2 −2 runtime/doc/editing.txt
  8. +4 −2 runtime/doc/eval.txt
  9. +13 −1 runtime/doc/gui_w32.txt
  10. +6 −4 runtime/doc/if_perl.txt
  11. +8 −4 runtime/doc/if_pyth.txt
  12. +5 −5 runtime/doc/if_ruby.txt
  13. +4 −2 runtime/doc/if_tcl.txt
  14. +5 −1 runtime/doc/index.txt
  15. +1 −0  runtime/doc/map.txt
  16. +6 −2 runtime/doc/motion.txt
  17. +7 −1 runtime/doc/options.txt
  18. +3 −1 runtime/doc/pi_gzip.txt
  19. +283 −149 runtime/doc/syntax.txt
  20. +2 −2 runtime/doc/tabpage.txt
  21. +35 −0 runtime/doc/tags
  22. +22 −28 runtime/doc/todo.txt
  23. +3 −2 runtime/doc/various.txt
  24. +4 −4 runtime/doc/version5.txt
  25. +2 −4 runtime/doc/version7.txt
  26. +3 −3 runtime/doc/vi_diff.txt
  27. +22 −3 runtime/doc/visual.txt
  28. +4 −1 runtime/filetype.vim
  29. +11 −1 runtime/indent/vim.vim
  30. +10 −2 runtime/indent/xml.vim
  31. +87 −0 runtime/keymap/belarusian-jcuken.vim
  32. +2 −2 runtime/mswin.vim
  33. +71 −15 runtime/plugin/tohtml.vim
  34. +16 −6 runtime/spell/br/br_FR.diff
  35. +8 −8 runtime/spell/br/main.aap
  36. +652 −166 runtime/syntax/2html.vim
  37. +2 −2 runtime/syntax/cfg.vim
  38. +3 −3 runtime/syntax/group.vim
  39. +3 −3 runtime/syntax/help.vim
  40. +27 −0 runtime/syntax/hgcommit.vim
  41. +21 −20 runtime/syntax/lua.vim
  42. +3 −3 runtime/syntax/rst.vim
  43. +6 −3 runtime/syntax/svn.vim
  44. +1 −1  runtime/tools/efm_perl.pl
  45. +44 −44 runtime/tutor/tutor.hu
  46. +44 −44 runtime/tutor/tutor.hu.cp1250
  47. +44 −44 runtime/tutor/tutor.hu.utf-8
  48. +8 −3 src/Make_ming.mak
  49. +22 −7 src/Make_mvc.mak
  50. +0 −8 src/Makefile
  51. +3 −11 src/auto/configure
  52. +3 −1 src/bigvim.bat
  53. +6 −0 src/bigvim64.bat
  54. +1 −0  src/config.h.in
  55. +3 −13 src/configure.in
  56. +5 −5 src/edit.c
  57. +18 −7 src/eval.c
  58. +26 −1 src/ex_cmds.c
  59. +1 −1  src/ex_cmds.h
  60. +55 −8 src/ex_docmd.c
  61. +6 −2 src/ex_getln.c
  62. +10 −1 src/feature.h
  63. +15 −0 src/fileio.c
  64. +3 −3 src/fold.c
  65. +2 −0  src/globals.h
  66. +1 −4 src/gui.c
  67. +18 −0 src/if_perl.xs
  68. +7 −2 src/if_py_both.h
  69. +4 −0 src/keymap.h
  70. +3 −0  src/macros.h
  71. +109 −16 src/misc1.c
  72. +6 −0 src/misc2.c
  73. +27 −4 src/normal.c
  74. +2 −2 src/ops.c
  75. +11 −2 src/option.c
  76. +2 −1  src/option.h
  77. +43 −3 src/os_unix.c
  78. +16 −9 src/os_win32.c
  79. +1 −1  src/proto/eval.pro
  80. +3 −0  src/proto/misc1.pro
  81. +1 −0  src/proto/option.pro
  82. +1 −0  src/proto/search.pro
  83. +2 −0  src/proto/window.pro
  84. +3 −2 src/screen.c
  85. +219 −10 src/search.c
  86. +2 −2 src/syntax.c
  87. +80 −17 src/term.c
  88. +95 −2 src/testdir/test17.in
  89. +30 −0 src/testdir/test17.ok
  90. +22 −0 src/testdir/test53.in
  91. +6 −0 src/testdir/test53.ok
  92. +10 −0 src/testdir/test55.in
  93. +6 −0 src/testdir/test55.ok
  94. +10 −0 src/testdir/test68.in
  95. +6 −0 src/testdir/test68.ok
  96. +1 −4 src/undo.c
  97. +89 −0 src/version.c
  98. +2 −1  src/vim.h
  99. +3 −5 src/window.c
  100. +31 −0 src/xpm/COPYRIGHT
  101. +23 −0 src/xpm/README.txt
  102. +139 −0 src/xpm/include/simx.h
  103. +501 −0 src/xpm/include/xpm.h
  104. BIN  src/xpm/x64/lib/libXpm.lib
  105. BIN  src/xpm/x86/lib/libXpm.a
  106. BIN  src/xpm/x86/lib/libXpm.lib
View
42 .hgtags
@@ -1941,3 +1941,45 @@ c1780b4cb9955fc113c3c993c18c139e06425ef5 v7-3-601
5cacdf56c94b6fa1992f7e9c07c95bfe52bcccec v7-3-602
085f14642fe828b1cbae5706ca87f2932cebeb75 v7-3-603
acd91c9741a6d0185b7c63db412888de4f904118 v7-3-604
+4873d9c4ad3b7214d3ea8af9712a87ff69948380 v7-3-605
+c612d154bcdd642e4097ae88526a81ed7868c184 v7-3-606
+002f2c5de317aaedb93bd2e506a295efe2d552ce v7-3-607
+d47e6222d1cde1caf08fa63104375f5750c25d90 v7-3-608
+d29aa05b7e311bc05491521f4059ca2b625c5550 v7-3-609
+9f48a54329975434d73ddfc19e33c343653d5c73 v7-3-610
+e13f2f3568e1e21fbd223a1c0627605e2b670c53 v7-3-611
+2b4b6185054ff05fb6ee3ab1bcde47409bf2ebe0 v7-3-612
+c03b6363492b26c02b4f8a725a91849a1a5cf548 v7-3-613
+2bb51730ef4bb0824658f7507edad165e194dd45 v7-3-614
+169ccc471a8a947c046b7ff41023b9045beb3496 v7-3-615
+baba6286c91e63dd42039206e3e0990fb0ac346f v7-3-616
+73db39ca1877a07008310a2ec98a2220e50c52f1 v7-3-617
+0b1cb3f839c48daaccbb3abcbd5f1c394c57cb10 v7-3-618
+27ecf0c87bd20140d9e85d4fd581332e0916191e v7-3-619
+a6ebae140d89f35876628cde44f0e7ee5a0ae1d2 v7-3-620
+ac13ea2b098d98e62408ec2d88026f690f68f940 v7-3-621
+52247eb615118965bb6a949307e9abfd378cd088 v7-3-622
+a46a101bfddd4fcf30759f3847fa1e18546907f4 v7-3-623
+06749e351b1c030acf50cf8c469f8973aff4a96a v7-3-624
+f43ffd820a46bf47b3e55b56d3e5334302383757 v7-3-625
+956b1ed19282518e0287891d4e7b2b8a3f850402 v7-3-626
+dc65e6429d2c1b79719455d7303f3f95c5897965 v7-3-627
+1ed93878d6e224d46a7c125a82e52338b9bf0f6b v7-3-628
+7de7ef01288db1abc944293a28aac13ddd87879e v7-3-629
+3416ac23d0758528919aaffbe02cecc6420b8aac v7-3-630
+99f076ca8d846d553aefd7e626ca938bcf93f259 v7-3-631
+44038a9777aaf0e6502e0eb57b8f7ccf31798ec4 v7-3-632
+ad5fbf3596e0a8ad15c260c5b529efc5ac689e13 v7-3-633
+b7eea24095073d55ac3c59664466b78a0525bebc v7-3-634
+f7f68f83fc335379bc9e3371c5118b8f81c8d5bc v7-3-635
+616bc1ad4f12be0ef37fe67d2f6ed7535f20e515 v7-3-636
+3b62d8f36cdf709d4e0575d63486ebe57ce7150c v7-3-637
+c0256c4bd91ed7b806aab002e4a45e440dd00343 v7-3-638
+1ec385a8faf4002fa300caf370ef2ac380d9702a v7-3-639
+c2c3577021ed4e354853d330e5fc60691d8750c5 v7-3-640
+c068389057c9a89fa351678b5f5776278971dabe v7-3-641
+79ac6744237ce5076a6d2e2b21198dfddc2cc9dd v7-3-642
+fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
+fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
+1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
+e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
View
6 Filelist
@@ -349,6 +349,12 @@ SRC_DOS_BIN = \
src/vim*.ico \
src/vim.tlb \
src/vimtbar.lib \
+ src/xpm/COPYRIGHT \
+ src/xpm/README.txt \
+ src/xpm/include/*.h \
+ src/xpm/x64/lib/libXpm.lib \
+ src/xpm/x86/lib/libXpm.a \
+ src/xpm/x86/lib/libXpm.lib \
src/vimtbar.dll \
nsis/icons/*.bmp \
nsis/icons/*.ico \
View
127 runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
" Vim autoload file for the tohtml plugin.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 Apr 05
+" Last Change: 2012 Jun 30
"
" Additional contributors:
"
@@ -11,7 +11,7 @@
" this file uses line continuations
let s:cpo_sav = &cpo
-set cpo-=C
+set cpo&vim
" Automatically find charsets from all encodings supported natively by Vim. With
" the 8bit- and 2byte- prefixes, Vim can actually support more encodings than
@@ -391,12 +391,25 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
call add(html, '<meta name="settings" content="'.
\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
+ \ ',prevent_copy='.s:settings.prevent_copy.
\ '"'.tag_close)
+ call add(html, '<meta name="colorscheme" content="'.
+ \ (exists('g:colors_name')
+ \ ? g:colors_name
+ \ : 'none'). '"'.tag_close)
call add(html, '</head>')
let body_line_num = len(html)
- call add(html, '<body>')
- call add(html, '<table border="1" width="100%">')
+ if !empty(s:settings.prevent_copy)
+ call add(html, "<body onload='FixCharWidth();'>")
+ call add(html, "<!-- hidden divs used by javascript to get the width of a char -->")
+ call add(html, "<div id='oneCharWidth'>0</div>")
+ call add(html, "<div id='oneInputWidth'><input size='1' value='0'".tag_close."</div>")
+ call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>")
+ else
+ call add(html, '<body>')
+ endif
+ call add(html, "<table border='1' width='100%' id='vimCodeElement'>")
call add(html, '<tr>')
for buf in a:win_list
@@ -454,16 +467,19 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
let insert_index = diff_style_start
endif
- " Delete those parts that are not needed so
- " we can include the rest into the resulting table
- 1,/^<body/d_
+ " Delete those parts that are not needed so we can include the rest into the
+ " resulting table.
+ 1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
$
?</body>?,$d_
let temp = getline(1,'$')
+ " clean out id on the main content container because we already set it on
+ " the table
+ let temp[0] = substitute(temp[0], " id='vimCodeElement'", "", "")
" undo deletion of start and end part
" so we can later save the file as valid html
" TODO: restore using grabbed lines if undolevel is 1?
- normal 2u
+ normal! 2u
if s:settings.use_css
call add(html, '<td valign="top"><div>')
elseif s:settings.use_xhtml
@@ -520,12 +536,47 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
1
let style_start = search('^</head>')-1
+ " add required javascript in reverse order so we can just call append again
+ " and again without adjusting {{{
+
+ " insert script closing tag if any javascript is needed
+ if s:settings.dynamic_folds || !empty(s:settings.prevent_copy)
+ call append(style_start, [
+ \ '',
+ \ s:settings.use_xhtml ? '//]]>' : '-->',
+ \ "</script>"
+ \ ])
+ endif
+
+ " insert script which corrects the size of small input elements in
+ " prevent_copy mode. See 2html.vim for details on why this is needed and how
+ " it works.
+ if !empty(s:settings.prevent_copy)
+ call append(style_start, [
+ \ '',
+ \ '/* simulate a "ch" unit by asking the browser how big a zero character is */',
+ \ 'function FixCharWidth() {',
+ \ ' /* get the hidden element which gives the width of a single character */',
+ \ ' var goodWidth = document.getElementById("oneCharWidth").clientWidth;',
+ \ ' /* get all input elements, we''ll filter on class later */',
+ \ ' var inputTags = document.getElementsByTagName("input");',
+ \ ' var ratio = 5;',
+ \ ' var inputWidth = document.getElementById("oneInputWidth").clientWidth;',
+ \ ' var emWidth = document.getElementById("oneEmWidth").clientWidth;',
+ \ ' if (inputWidth > goodWidth) {',
+ \ ' while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
+ \ ' ratio += 5;',
+ \ ' }',
+ \ ' document.getElementById("vimCodeElement").className = "em"+ratio;',
+ \ ' }',
+ \ '}'
+ \ ])
+ endif
+
" Insert javascript to toggle matching folds open and closed in all windows,
- " if dynamic folding is active. {{{
+ " if dynamic folding is active.
if s:settings.dynamic_folds
call append(style_start, [
- \ "<script type='text/javascript'>",
- \ s:settings.use_xhtml ? '//<![CDATA[' : " <!--",
\ " function toggleFold(objID)",
\ " {",
\ " for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
@@ -542,9 +593,14 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
\ " }",
\ " }",
\ " }",
- \ s:settings.use_xhtml ? '//]]>' : " -->",
- \ "</script>"
\ ])
+ endif
+
+ " insert script tag if any javascript is needed
+ if s:settings.dynamic_folds || s:settings.prevent_copy != ""
+ call append(style_start, [
+ \ "<script type='text/javascript'>",
+ \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
endif "}}}
" Insert styles from all the generated html documents and additional styles
@@ -609,9 +665,10 @@ func! tohtml#GetUserSettings() "{{{
call tohtml#GetOption(user_settings, 'ignore_conceal', 0 )
call tohtml#GetOption(user_settings, 'ignore_folding', 0 )
call tohtml#GetOption(user_settings, 'dynamic_folds', 0 )
- call tohtml#GetOption(user_settings, 'no_foldcolumn', 0 )
+ call tohtml#GetOption(user_settings, 'no_foldcolumn', user_settings.ignore_folding)
call tohtml#GetOption(user_settings, 'hover_unfold', 0 )
call tohtml#GetOption(user_settings, 'no_pre', 0 )
+ call tohtml#GetOption(user_settings, 'no_invalid', 0 )
call tohtml#GetOption(user_settings, 'whole_filler', 0 )
call tohtml#GetOption(user_settings, 'use_xhtml', 0 )
" }}}
@@ -637,6 +694,8 @@ func! tohtml#GetUserSettings() "{{{
" dynamic folding implies css
if user_settings.dynamic_folds
let user_settings.use_css = 1
+ else
+ let user_settings.no_foldcolumn = 1 " won't do anything but for consistency and for the test suite
endif
" if we're not using CSS we cannot use a pre section because <font> tags
@@ -663,6 +722,7 @@ func! tohtml#GetUserSettings() "{{{
endif
" }}}
+ " textual options
if exists("g:html_use_encoding") "{{{
" user specified the desired MIME charset, figure out proper
" 'fileencoding' from it or warn the user if we cannot
@@ -705,6 +765,45 @@ func! tohtml#GetUserSettings() "{{{
endif
endif "}}}
+ " Default to making nothing uncopyable, because we default to
+ " not-standards way of doing things, and also because Microsoft Word and
+ " others paste the <input> elements anyway.
+ "
+ " html_prevent_copy only has an effect when using CSS.
+ "
+ " All options:
+ " f - fold column
+ " n - line numbers (also within fold text)
+ " t - fold text
+ " d - diff filler
+ " c - concealed text (reserved future)
+ " l - listchars (reserved possible future)
+ " s - signs (reserved possible future)
+ "
+ " Normal text is always selectable.
+ let user_settings.prevent_copy = ""
+ if user_settings.use_css
+ if exists("g:html_prevent_copy")
+ if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f'
+ let user_settings.prevent_copy .= 'f'
+ endif
+ if user_settings.number_lines && g:html_prevent_copy =~# 'n'
+ let user_settings.prevent_copy .= 'n'
+ endif
+ if &diff && g:html_prevent_copy =~# 'd'
+ let user_settings.prevent_copy .= 'd'
+ endif
+ if !user_settings.ignore_folding && g:html_prevent_copy =~# 't'
+ let user_settings.prevent_copy .= 't'
+ endif
+ else
+ let user_settings.prevent_copy = ""
+ endif
+ endif
+ if empty(user_settings.prevent_copy)
+ let user_settings.no_invalid = 0
+ endif
+
" TODO: font
return user_settings
View
10 runtime/compiler/mcs.vim
@@ -1,7 +1,8 @@
" Vim compiler file
" Compiler: Mono C# Compiler
" Maintainer: Jarek Sobiecki <harijari@go2.pl>
-" Latest Revision: 2006-06-18
+" Last Updated By: Peter Collingbourne
+" Latest Revision: 2012 Jul 19
if exists("current_compiler")
finish
@@ -12,13 +13,18 @@ let s:cpo_save = &cpo
set cpo-=C
setlocal errorformat=
+ \%D%.%#Project\ \"%f/%[%^/\"]%#\"%.%#,
+ \%X%.%#Done\ building\ project\ \"%f/%[%^/\"]%#\"%.%#,
+ \%-G%\\s%.%#,
+ \%E%f(%l):\ error\ CS%n:%m,
+ \%W%f(%l):\ warning\ CS%n:%m,
\%E%f(%l\\,%c):\ error\ CS%n:%m,
\%W%f(%l\\,%c):\ warning\ CS%n:%m,
\%E%>syntax\ error\\,%m,%Z%f(%l\\,%c):\ error\ CS%n:%m,
\%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
\%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
\%DMaking\ %*\\a\ in\ %f,
- \%G-%.%#
+ \%-G%.%#
let &cpo = s:cpo_save
unlet s:cpo_save
View
4 runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 7.3. Last change: 2012 Jun 13
+*change.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -666,6 +666,8 @@ The flags that you can use for the substitute commands:
[n] Report the number of matches, do not actually substitute. The [c]
flag is ignored. The matches are reported as if 'report' is zero.
Useful to |count-items|.
+ If \= |sub-replace-expression| is used, the expression will be
+ evaluated in the |sandbox| at every match.
[p] Print the line containing the last substitute.
View
4 runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.3. Last change: 2012 May 18
+*diff.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -333,7 +333,7 @@ diff. This example explains the format that Vim expects: >
The "1a2" item appends the line "bbb".
The "4d4" item deletes the line "111".
-The '7c7" item replaces the line "GGG" with "ggg".
+The "7c7" item replaces the line "GGG" with "ggg".
When 'diffexpr' is not empty, Vim evaluates it to obtain a diff file in the
format mentioned. These variables are set to the file names used:
View
4 runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.3. Last change: 2012 Jul 10
+*editing.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -393,7 +393,7 @@ is to use "path\[[]abc]". Then the file "path[abc]" literally.
*starstar-wildcard*
Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.
This allows searching a directory tree. This goes up to 100 directories deep.
-Note there are some commands where this works slightly different, see
+Note there are some commands where this works slightly differently, see
|file-searching|.
Example: >
:n **/*.txt
View
6 runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2012 Jul 10
+*eval.txt* For Vim version 7.3. Last change: 2012 Aug 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3288,8 +3288,9 @@ getfperm({fname}) *getfperm()*
"rwx" flags represent, in turn, the permissions of the owner
of the file, the group the file belongs to, and other users.
If a user does not have a given permission the flag for this
- is replaced with the string "-". Example: >
+ is replaced with the string "-". Examples: >
:echo getfperm("/etc/passwd")
+ :echo getfperm(expand("~/.vimrc"))
< This will hopefully (from a security point of view) display
the string "rw-r--r--" or even "rw-------".
@@ -6327,6 +6328,7 @@ mouse_gpm Compiled with support for gpm (Linux console mouse)
mouse_netterm Compiled with support for netterm mouse.
mouse_pterm Compiled with support for qnx pterm mouse.
mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse)
+mouse_sgr Compiled with support for sgr mouse.
mouse_urxvt Compiled with support for urxvt mouse.
mouse_xterm Compiled with support for xterm mouse.
mouseshape Compiled with support for 'mouseshape'.
View
14 runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt* For Vim version 7.3. Last change: 2011 Jul 23
+*gui_w32.txt* For Vim version 7.3. Last change: 2012 Aug 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -489,4 +489,16 @@ to:
And add gvim to the list of applications. This problem only appears to happen
with the Intellimouse driver 2.2 and when "Universal Scrolling" is turned on.
+
+XPM support *w32-xpm-support*
+
+Gvim can be build on MS-Windows with support for XPM files. |+xpm_w32|
+See the Make_mvc.mak file for instructions, search for XPM.
+
+To try out if XPM support works do this: >
+ :help
+ :exe 'sign define vimxpm icon=' . $VIMRUNTIME . '\\vim16x16.xpm'
+ :exe 'sign place 1 line=1 name=vimxpm file=' . expand('%:p')
+<
+
vim:tw=78:sw=4:ts=8:ft=help:norl:
View
10 runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt* For Vim version 7.3. Last change: 2010 Jul 21
+*if_perl.txt* For Vim version 7.3. Last change: 2012 Aug 02
VIM REFERENCE MANUAL by Sven Verdoolaege
@@ -44,15 +44,17 @@ The Perl patches for Vim were made by:
Sven Verdoolaege <skimo@breughel.ufsia.ac.be>
Matt Gerassimof
-Perl for MS-Windows can be found at:
-http://www.perl.com/CPAN/ports/nt/Standard/x86/
+Perl for MS-Windows can be found at: http://www.perl.com/
+The ActiveState one should work.
==============================================================================
3. Using the Perl interface *perl-using*
*:perl* *:pe*
:pe[rl] {cmd} Execute Perl command {cmd}. The current package
- is "main".
+ is "main". Simple example to test if `:perl` is
+ working: >
+ :perl VIM::Msg("Hello")
:pe[rl] << {endpattern}
{script}
View
12 runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.3. Last change: 2012 Feb 04
+*if_pyth.txt* For Vim version 7.3. Last change: 2012 Aug 02
VIM REFERENCE MANUAL by Paul Moore
@@ -27,7 +27,9 @@ The Python 3 interface is available only when Vim was compiled with the
*:python* *:py* *E205* *E263* *E264*
:[range]py[thon] {stmt}
- Execute Python statement {stmt}.
+ Execute Python statement {stmt}. A simple check if
+ the `:python` command is working: >
+ :python print "Hello"
:[range]py[thon] << {endmarker}
{script}
@@ -362,8 +364,10 @@ sure edit "gvim.exe" and search for "python\d*.dll\c".
8. Python 3 *python3*
*:py3* *:python3*
-The |:py3| and |:python3| commands work similar to |:python|.
- *:py3file*
+The |:py3| and |:python3| commands work similar to |:python|. A simple check
+if the `:py3` command is wrong: >
+ :py3 print("Hello")
+< *:py3file*
The |:py3file| command works similar to |:pyfile|.
View
10 runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt* For Vim version 7.3. Last change: 2010 Oct 27
+*if_ruby.txt* For Vim version 7.3. Last change: 2012 Aug 02
VIM REFERENCE MANUAL by Shugo Maeda
@@ -25,7 +25,8 @@ downloading Ruby there.
1. Commands *ruby-commands*
*:ruby* *:rub*
-:rub[y] {cmd} Execute Ruby command {cmd}.
+:rub[y] {cmd} Execute Ruby command {cmd}. A command to try it out: >
+ :ruby print "Hello"
:rub[y] << {endpattern}
{script}
@@ -40,9 +41,6 @@ downloading Ruby there.
wasn't compiled in. To avoid errors, see
|script-here|.
-Command to try it out: >
- :ruby print "Hello" # this is a comment
-
Example Vim script: >
function! RedGem()
@@ -211,6 +209,8 @@ for sure edit "gvim.exe" and search for "ruby\d*.dll\c".
If you want to build Vim with Ruby 1.9.1, you need to edit the config.h file
and comment-out the check for _MSC_VER.
+You may also need to rename the include directory name to match the version,
+strangely for Ruby 1.9.3 the directory is called 1.9.1.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
View
6 runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt* For Vim version 7.3. Last change: 2008 Aug 16
+*if_tcl.txt* For Vim version 7.3. Last change: 2012 Aug 02
VIM REFERENCE MANUAL by Ingo Wilken
@@ -27,7 +27,9 @@ comments, ideas etc to <Ingo.Wilken@informatik.uni-oldenburg.de>
1. Commands *tcl-ex-commands* *E571* *E572*
*:tcl* *:tc*
-:tc[l] {cmd} Execute Tcl command {cmd}.
+:tc[l] {cmd} Execute Tcl command {cmd}. A simple check if `:tcl`
+ is working: >
+ :tcl puts "Hello"
:[range]tc[l] << {endmarker}
{script}
View
6 runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.3. Last change: 2011 Aug 06
+*index.txt* For Vim version 7.3. Last change: 2012 Jul 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -719,6 +719,8 @@ tag char note action in Normal mode ~
|gH| gH start Select line mode
|gI| gI 2 like "I", but always start in column 1
|gJ| gJ 2 join lines without inserting space
+|gN| gN 1,2 find the previous match with the last used
+ search pattern and Visually select it
|gP| ["x]gP 2 put the text [from register x] before the
cursor N times, leave the cursor after it
|gQ| gQ switch to "Ex" mode with Vim editing
@@ -751,6 +753,8 @@ tag char note action in Normal mode ~
lines down
|gk| gk 1 like "k", but when 'wrap' on go N screen
lines up
+|gn| gn 1,2 find the next match with the last used
+ search pattern and Visually select it
|gm| gm 1 go to character at middle of the screenline
|go| go 1 cursor to byte N in the buffer
|gp| ["x]gp 2 put the text [from register x] after the
View
1  runtime/doc/map.txt
@@ -1244,6 +1244,7 @@ completion can be enabled:
-complete=syntax syntax file names |'syntax'|
-complete=tag tags
-complete=tag_listfiles tags, file names are shown when CTRL-D is hit
+ -complete=user user names
-complete=var user variables
-complete=custom,{func} custom completion, defined via {func}
-complete=customlist,{func} custom completion, defined via {func}
View
8 runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt* For Vim version 7.3. Last change: 2012 Jul 06
+*motion.txt* For Vim version 7.3. Last change: 2012 Aug 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -57,7 +57,7 @@ or change text. The following operators are available:
|>| > shift right
|<| < shift left
|zf| zf define a fold
- |g@| g@ call function set with the 'operatorfunc' option
+ |g@| g@ call function set with the 'operatorfunc' option
If the motion includes a count and the operator also had a count before it,
the two counts are multiplied. For example: "2d3w" deletes six words.
@@ -326,6 +326,7 @@ gg Goto line [count], default first line, on the first
non-blank character |linewise|. If 'startofline' not
set, keep the same column.
+ *:[range]*
:[range] Set the cursor on the last line number in [range].
[range] can also be just one line number, e.g., ":1"
or ":'m".
@@ -513,6 +514,8 @@ always select less text than the "a" commands.
These commands are {not in Vi}.
These commands are not available when the |+textobjects| feature has been
disabled at compile time.
+Also see `gn` and `gN`, operating on the last search pattern.
+
*v_aw* *aw*
aw "a word", select [count] words (see |word|).
Leading or trailing white space is included, but not
@@ -689,6 +692,7 @@ movement commands are used.
"daw" delete a word *daw*
"diW" delete inner WORD (see |WORD|) *diW*
"daW" delete a WORD (see |WORD|) *daW*
+ "dgn" delete the next search pattern match *dgn*
"dd" delete one line |dd|
"dis" delete inner sentence *dis*
"das" delete a sentence *das*
View
8 runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2012 Jul 10
+*options.txt* For Vim version 7.3. Last change: 2012 Aug 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6234,6 +6234,7 @@ A jump table for the options with a short description can be found at |Q_op|.
local to buffer
Number of spaces to use for each step of (auto)indent. Used for
|'cindent'|, |>>|, |<<|, etc.
+ When zero the 'ts' value will be used.
*'shortmess'* *'shm'*
'shortmess' 'shm' string (Vim default "filnxtToO", Vi default: "",
@@ -7552,6 +7553,10 @@ A jump table for the options with a short description can be found at |Q_op|.
pterm QNX pterm mouse handling.
*urxvt-mouse*
urxvt Mouse handling for the urxvt (rxvt-unicode) terminal.
+ *sgr-mouse*
+ sgr Mouse handling for the terminal that emits SGR-styled
+ mouse reporting. Works with xterm version 277 or
+ later.
The mouse handling must be enabled at compile time |+mouse_xterm|
|+mouse_dec| |+mouse_netterm|.
@@ -7564,6 +7569,7 @@ A jump table for the options with a short description can be found at |Q_op|.
or "xterm2" already. The main use of this option is to set it to
"xterm", when the terminal name doesn't start with "xterm", but it can
handle xterm mouse codes.
+ The "sgr" value will be set if the xterm version is 277 or later.
The "xterm2" value will be set if the xterm version is reported to be
95 or higher. This only works when compiled with the |+termresponse|
feature and if |t_RV| is set to the escape sequence to request the
View
4 runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt* For Vim version 7.3. Last change: 2002 Oct 29
+*pi_gzip.txt* For Vim version 7.3. Last change: 2012 Jul 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -25,6 +25,8 @@ with these extensions:
*.Z compress (Lempel-Ziv)
*.gz gzip
*.bz2 bzip2
+ *.lzma lzma
+ *.xz xz
That's actually the only thing you need to know. There are no options.
View
432 runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.3. Last change: 2012 Jun 13
+*syntax.txt* For Vim version 7.3. Last change: 2012 Jul 16
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -380,200 +380,334 @@ settings, depending on which syntax is active. Example: >
This is not a syntax file itself, but a script that converts the current
window into HTML. Vim opens a new window in which it builds the HTML file.
+After you save the resulting file, you can view it with any browser. The
+colors should be exactly the same as you see them in Vim.
+
You are not supposed to set the 'filetype' or 'syntax' option to "2html"!
Source the script to convert the current file: >
:runtime! syntax/2html.vim
<
- *:TOhtml*
-Or use the ":TOhtml" user command. It is defined in a standard plugin.
-":TOhtml" also works with a range and in a Visual area: >
-
- :10,40TOhtml
-
-Warning: This can be slow! The script must process every character of every
-line. Because it can take a long time, by default a progress bar is displayed
-in the statusline for each major step in the conversion process. If you don't
-like seeing this progress bar, you can disable it and get a very minor speed
-improvement with: >
-
- let g:html_no_progress = 1
-
-":TOhtml" has another special feature: if the window is in diff mode, it will
-generate HTML that shows all the related windows. This can be disabled by
-setting the g:html_diff_one_file variable: >
-
- let g:html_diff_one_file = 1
+Many variables affect the output of 2html.vim; see below. Any of the on/off
+options listed below can be enabled or disabled by setting them explicitly to
+the desired value, or restored to their default by removing the variable using
+|:unlet|.
-After you save the resulting file, you can view it with any browser. The
-colors should be exactly the same as you see them in Vim.
+Remarks:
+- Some truly ancient browsers may not show the background colors.
+- From most browsers you can also print the file (in color)!
+- The latest TOhtml may actually work with older versions of Vim, but some
+ features such as conceal support will not function, and the colors may be
+ incorrect for an old Vim without GUI support compiled in.
+Here is an example how to run the script over all .c and .h files from a
+Unix shell: >
+ for f in *.[ch]; do gvim -f +"syn on" +"run! syntax/2html.vim" +"wq" +"q" $f; done
+<
+ *g:html_start_line* *g:html_end_line*
To restrict the conversion to a range of lines, use a range with the |:TOhtml|
-command, or set "g:html_start_line" and "g:html_end_line" to the first and
-last line to be converted. Example, using the last set Visual area: >
+command below, or set "g:html_start_line" and "g:html_end_line" to the first
+and last line to be converted. Example, using the last set Visual area: >
:let g:html_start_line = line("'<")
:let g:html_end_line = line("'>")
+ :runtime! syntax/2html.vim
+<
+ *:TOhtml*
+:[range]TOhtml The ":TOhtml" command is defined in a standard plugin.
+ This command will source |2html.vim| for you. When a
+ range is given, set |g:html_start_line| and
+ |g:html_end_line| to the start and end of the range,
+ respectively. Default range is the entire buffer.
+
+ If the current window is part of a |diff|, unless
+ |g:html_diff_one_file| is set, :TOhtml will convert
+ all windows which are part of the diff in the current
+ tab and place them side-by-side in a <table> element
+ in the generated HTML.
+
+ Examples: >
+
+ :10,40TOhtml " convert lines 10-40 to html
+ :'<,'>TOhtml " convert current/last visual selection
+ :TOhtml " convert entire buffer
+<
+ *g:html_diff_one_file*
+Default: 0.
+When 0, all windows involved in a |diff| in the current tab page are converted
+to HTML and placed side-by-side in a <table> element.
+When 1, only the current buffer is converted.
+Example: >
-The lines are numbered according to 'number' option and the Number
-highlighting. You can force lines to be numbered in the HTML output by
-setting "html_number_lines" to non-zero value: >
+ let g:html_diff_one_file = 1
+<
+ *g:html_whole_filler*
+Default: 0.
+When 0, if |g:html_diff_one_file| is 1, a sequence of more than 3 filler lines
+is displayed as three lines with the middle line mentioning the total number
+of inserted lines.
+When 1, always display all inserted lines as if |g:html_diff_one_file| were
+not set.
+>
+ :let g:html_whole_filler = 1
+<
+ *TOhtml-performance* *g:html_no_progress*
+Default: 0.
+When 0, display a progress bar in the statusline for each major step in the
+2html.vim conversion process.
+When 1, do not display the progress bar. This offers a minor speed improvement
+but you won't have any idea how much longer the conversion might take; for big
+files it can take a long time!
+Example: >
+
+ let g:html_no_progress = 1
+<
+You can obtain better performance improvements by also instructing Vim to not
+run interactively, so that too much time is not taken to redraw as the script
+moves through the buffer, switches windows, and the like: >
+
+ vim -E -s -c "let g:html_no_progress=1" -c "syntax on" -c "set ft=c" -c "runtime syntax/2html.vim" -cwqa myfile.c
+<
+Note that the -s flag prevents loading your .vimrc and any plugins, so you
+need to explicitly source/enable anything that will affect the HTML
+conversion. See |-E| and |-s-ex| for details. It is probably best to create a
+script to replace all the -c commands and use it with the -u flag instead of
+specifying each command separately.
+
+ *g:html_number_lines*
+Default: current 'number' setting.
+When 0, buffer text is displayed in the generated HTML without line numbering.
+When 1, a column of line numbers is added to the generated HTML with the same
+highlighting as the line number column in Vim (|hl-LineNr|).
+Force line numbers even if 'number' is not set: >
:let g:html_number_lines = 1
-Force to omit the line numbers by using a zero value: >
+Force to omit the line numbers: >
:let g:html_number_lines = 0
Go back to the default to use 'number' by deleting the variable: >
:unlet g:html_number_lines
-
-By default, valid HTML 4.01 using cascading style sheets (CSS1) is generated.
-If you need to generate markup for really old browsers or some other user
-agent that lacks basic CSS support, use: >
+<
+ *g:html_use_css*
+Default: 1.
+When 1, generate valid HTML 4.01 markup with CSS1 styling, supported in all
+modern browsers and most old browsers.
+When 0, generate <font> tags and similar outdated markup. This is not
+recommended but it may work better in really old browsers, email clients,
+forum posts, and similar situations where basic CSS support is unavailable.
+Example: >
:let g:html_use_css = 0
-
-Concealed text is removed from the HTML and replaced with the appropriate
-character from |:syn-cchar| or 'listchars' depending on the current value of
-'conceallevel'. If you always want to display all text in your document,
-either set 'conceallevel' to zero before invoking 2html, or use: >
+<
+ *g:html_ignore_conceal*
+Default: 0.
+When 0, concealed text is removed from the HTML and replaced with a character
+from |:syn-cchar| or 'listchars' as appropriate, depending on the current
+value of 'conceallevel'.
+When 1, include all text from the buffer in the generated HTML, even if it is
+|conceal|ed.
+
+Either of the following commands will ensure that all text in the buffer is
+included in the generated HTML (unless it is folded): >
:let g:html_ignore_conceal = 1
-
-Similarly, closed folds are put in the HTML as they are displayed. If you
-don't want this, use the |zR| command before invoking 2html, or use: >
+ :setl conceallevel=0
+<
+ *g:html_ignore_folding*
+Default: 0.
+When 0, text in a closed fold is replaced by the text shown for the fold in
+Vim (|fold-foldtext|). See |g:html_dynamic_folds| if you also want to allow
+the user to expand the fold as in Vim to see the text inside.
+When 1, include all text from the buffer in the generated HTML; whether the
+text is in a fold has no impact at all. |g:html_dynamic_folds| has no effect.
+
+Either of these commands will ensure that all text in the buffer is included
+in the generated HTML (unless it is concealed): >
+ zR
:let g:html_ignore_folding = 1
+<
+ *g:html_dynamic_folds*
+Default: 0.
+When 0, text in a closed fold is not included at all in the generated HTML.
+When 1, generate javascript to open a fold and show the text within, just like
+in Vim.
-You may want to generate HTML that includes all the data within the folds, and
-allow the user to view the folded data similar to how they would in Vim. To
-generate this dynamic fold information, use: >
- :let g:html_dynamic_folds = 1
-
-Using html_dynamic_folds will imply html_use_css, because it would be far too
-difficult to do it for old browsers. However, html_ignore_folding overrides
-html_dynamic_folds.
+Setting this variable to 1 causes 2html.vim to always use CSS for styling,
+regardless of what |g:html_use_css| is set to.
-Using html_dynamic_folds will default to generating a foldcolumn in the html
-similar to Vim's foldcolumn, that will use javascript to open and close the
-folds in the HTML document. The width of this foldcolumn starts at the current
-setting of |'foldcolumn'| but grows to fit the greatest foldlevel in your
-document. If you do not want to show a foldcolumn at all, use: >
+This variable is ignored when |g:html_ignore_folding| is set.
+>
+ :let g:html_dynamic_folds = 1
+<
+ *g:html_no_foldcolumn*
+Default: 0.
+When 0, if |g:html_dynamic_folds| is 1, generate a column of text similar to
+Vim's foldcolumn (|fold-foldcolumn|) the user can click on to toggle folds
+open or closed. The minimum width of the generated text column is the current
+'foldcolumn' setting.
+When 1, do not generate this column; instead, hovering the mouse cursor over
+folded text will open the fold as if |g:html_hover_unfold| were set.
+>
:let g:html_no_foldcolumn = 1
-
-Using this option, there will be no foldcolumn available to open the folds in
-the HTML. For this reason, another option is provided: html_hover_unfold.
-Enabling this option will use CSS 2.0 to allow a user to open a fold by
-hovering the mouse pointer over it. Note that old browsers (notably Internet
-Explorer 6) will not support this feature. Browser-specific markup for IE6 is
-included to fall back to the normal CSS1 code so that the folds show up
-correctly for this browser, but they will not be openable without a
-foldcolumn. Note that using html_hover_unfold will allow modern browsers with
-disabled javascript to view closed folds. To use this option, use: >
+<
+ *TOhtml-uncopyable-text* *g:html_prevent_copy*
+Default: empty string.
+This option prevents certain regions of the generated HTML from being copied,
+when you select all text in document rendered in a browser and copy it. Useful
+for allowing users to copy-paste only the source text even if a fold column or
+line numbers are shown in the generated content. Specify regions to be
+affected in this way as follows:
+ f: fold column
+ n: line numbers (also within fold text)
+ t: fold text
+ d: diff filler
+
+Example, to make the fold column and line numbers uncopyable: >
+ :let g:html_prevent_copy = "fn"
+<
+This feature is currently implemented by inserting read-only <input> elements
+into the markup to contain the uncopyable areas. This does not work well in
+all cases. When pasting to some applications which understand HTML, the
+<input> elements also get pasted. But plain-text paste destinations should
+always work.
+
+ *g:html_no_invalid*
+Default: 0.
+When 0, if |g:html_prevent_copy| is non-empty, an invalid attribute is
+intentionally inserted into the <input> element for the uncopyable areas. This
+increases the number of applications you can paste to without also pasting the
+<input> elements. Specifically, Microsoft Word will not paste the <input>
+elements if they contain this invalid attribute.
+When 1, no invalid markup is ever intentionally inserted, and the generated
+page should validate. However, be careful pasting into Microsoft Word when
+|g:html_prevent_copy| is non-empty; it can be hard to get rid of the <input>
+elements which get pasted.
+
+ *g:html_hover_unfold*
+Default: 0.
+When 0, the only way to open a fold generated by 2html.vim with
+|g:html_dynamic_folds| set, is to click on the generated fold column.
+When 1, use CSS 2.0 to allow the user to open a fold by moving the mouse
+cursor over the displayed fold text. This is useful to allow users with
+disabled javascript to view the folded text.
+
+Note that old browsers (notably Internet Explorer 6) will not support this
+feature. Browser-specific markup for IE6 is included to fall back to the
+normal CSS1 styling so that the folds show up correctly for this browser, but
+they will not be openable without a foldcolumn.
+>
:let g:html_hover_unfold = 1
-
-Setting html_no_foldcolumn with html_dynamic_folds will automatically set
-html_hover_unfold, because otherwise the folds wouldn't be dynamic.
-
-By default "<pre>" and "</pre>" are used around the text. When 'wrap' is set
-in the window being converted, the CSS 2.0 "white-space:pre-wrap" value is
-used to wrap the text. You can explicitly enable the wrapping with: >
+<
+ *TOhtml-wrap-text* *g:html_pre_wrap*
+Default: current 'wrap' setting.
+When 0, if |g:html_no_pre| is 0 or unset, the text in the generated HTML does
+not wrap at the edge of the browser window.
+When 1, if |g:html_use_css| is 1, the CSS 2.0 "white-space:pre-wrap" value is
+used, causing the text to wrap at whitespace at the edge of the browser
+window.
+Explicitly enable text wrapping: >
:let g:html_pre_wrap = 1
-or disable with >
+Explicitly disable wrapping: >
:let g:html_pre_wrap = 0
-This generates HTML that looks very close to the Vim window, but unfortunately
-there can be minor differences such as the lack of a 'showbreak' option in in
-the HTML, or where line breaks can occur.
-
-Another way to obtain text wrapping in the HTML, at the risk of making some
-things look even more different, is to use: >
+Go back to default, determine wrapping from 'wrap' setting: >
+ :unlet g:html_pre_wrap
+<
+ *g:html_no_pre*
+Default: 0.
+When 0, buffer text in the generated HTML is surrounded by <pre>...</pre>
+tags. Series of whitespace is shown as in Vim without special markup, and tab
+characters can be included literally (see |g:html_expand_tabs|).
+When 1 (not recommended), the <pre> tags are omitted, and a plain <div> is
+used instead. Whitespace is replaced by a series of &nbsp; character
+references, and <br> is used to end each line. This is another way to allow
+text in the generated HTML is wrap (see |g:html_pre_wrap|) which also works in
+old browsers, but may cause noticeable differences between Vim's display and
+the rendered page generated by 2html.vim.
+>
:let g:html_no_pre = 1
-This will use <br> at the end of each line and use "&nbsp;" for repeated
-spaces. Doing it this way is more compatible with old browsers, but modern
-browsers support the "white-space" method.
-
-If you do stick with the default "<pre>" tags, <Tab> characters in the text
-are included in the generated output if they will have no effect on the
-appearance of the text and it looks like they are in the document
-intentionally. This allows for the HTML output to be copied and pasted from a
-browser without losing the actual whitespace used in the document.
-
-Specifically, <Tab> characters will be included if the 'tabstop' option is set
-to the default of 8, 'expandtab' is not set, and if neither the foldcolumn nor
-the line numbers are included in the HTML output (see options above). When any
-of these conditions are not met, any <Tab> characters in the text are expanded
-to the appropriate number of spaces in the HTML output.
-
-When "<pre>" is included, you can force |:TOhtml| to keep the tabs even if the
-other conditions are not met with: >
+<
+ *g:html_expand_tabs*
+Default: 1 if 'tabstop' is 8, 'expandtab' is 0, and no fold column or line
+ numbers occur in the generated HTML;
+ 0 otherwise.
+When 0, <Tab> characters in the buffer text are replaced with an appropriate
+number of space characters, or &nbsp; references if |g:html_no_pre| is 1.
+When 1, if |g:html_no_pre| is 0 or unset, <Tab> characters in the buffer text
+are included as-is in the generated HTML. This is useful for when you want to
+allow copy and paste from a browser without losing the actual whitespace in
+the source document. Note that this can easily break text alignment and
+indentation in the HTML, unless set by default.
+
+Force |2html.vim| to keep <Tab> characters: >
:let g:html_expand_tabs = 0
-Note that this can easily break text alignment and indentation in the HTML.
-
-Force tabs to be expanded even when they would be kept using: >
+<
+Force tabs to be expanded: >
:let g:html_expand_tabs = 1
+<
+ *TOhtml-encoding-detect* *TOhtml-encoding*
+It is highly recommended to set your desired encoding with
+|g:html_use_encoding| for any content which will be placed on a web server.
-For diff mode on a single file (with g:html_diff_one_file) a sequence of more
-than 3 filler lines is displayed as three lines with the middle line
-mentioning the total number of inserted lines. If you prefer to see all the
-inserted lines as with the side-by-side diff, use: >
- :let g:html_whole_filler = 1
-And to go back to displaying up to three lines again: >
- :unlet g:html_whole_filler
+If you do not specify an encoding, |2html.vim| uses the preferred IANA name
+for the current value of 'fileencoding' if set, or 'encoding' if not.
+'encoding' is always used for certain 'buftype' values. 'fileencoding' will be
+set to match the chosen document encoding.
+
+Automatic detection works for the encodings mentioned specifically by name in
+|encoding-names|, but TOhtml will only automatically use those encodings with
+wide browser support. However, you can override this to support specific
+encodings that may not be automatically detected by default (see options
+below). See http://www.iana.org/assignments/character-sets for the IANA names.
-For most buffers, TOhtml uses the current value of 'fileencoding' if set, or
-'encoding' if not, to determine the charset and 'fileencoding' of the HTML
-file. 'encoding' is always used for certain 'buftype' values. In general, this
-works for the encodings mentioned specifically by name in |encoding-names|,
-but TOhtml will only automatically use those encodings which are widely
-supported. However, you can override this to support specific encodings that
-may not be automatically detected by default.
+Note, by default all Unicode encodings are converted to UTF-8 with no BOM in
+the generated HTML, as recommended by W3C:
+ http://www.w3.org/International/questions/qa-choosing-encodings
+ http://www.w3.org/International/questions/qa-byte-order-mark
+
+ *g:html_use_encoding*
+Default: none, uses IANA name for current 'fileencoding' as above.
To overrule all automatic charset detection, set g:html_use_encoding to the
-name of the charset to be used. TOhtml will try to determine the appropriate
-'fileencoding' setting from the charset, but you may need to set it manually
-if TOhtml cannot determine the encoding. It is recommended to set this
-variable to something widely supported, like UTF-8, for anything you will be
-hosting on a webserver: >
+name of the charset to be used. It is recommended to set this variable to
+something widely supported, like UTF-8, for anything you will be hosting on a
+webserver: >
:let g:html_use_encoding = "UTF-8"
You can also use this option to omit the line that specifies the charset
-entirely, by setting g:html_use_encoding to an empty string: >
+entirely, by setting g:html_use_encoding to an empty string (NOT recommended): >
:let g:html_use_encoding = ""
-To go back to the automatic mechanism, delete the g:html_use_encoding
+To go back to the automatic mechanism, delete the |g:html_use_encoding|
variable: >
:unlet g:html_use_encoding
+<
+ *g:html_encoding_override*
+Default: none, autoload/tohtml.vim contains default conversions for encodings
+ mentioned by name at |encoding-names|.
+This option allows |2html.vim| to detect the correct 'fileencoding' when you
+specify an encoding with |g:html_use_encoding| which is not in the default
+list of conversions.
-If you specify a charset with g:html_use_encoding for which TOhtml cannot
-automatically detect the corresponding 'fileencoding' setting, you can use
-g:html_encoding_override to allow TOhtml to detect the correct encoding.
This is a dictionary of charset-encoding pairs that will replace existing
-pairs automatically detected by TOhtml, or supplement with new pairs. For
-example, to allow TOhtml to detect the HTML charset "windows-1252" properly as
-the encoding "8bit-cp1252", use: >
+pairs automatically detected by TOhtml, or supplement with new pairs.
+
+Detect the HTML charset "windows-1252" as the encoding "8bit-cp1252": >
:let g:html_encoding_override = {'windows-1252': '8bit-cp1252'}
<
-The g:html_charset_override is similar, it allows TOhtml to detect the HTML
-charset for any 'fileencoding' or 'encoding' which is not detected
-automatically. You can also use it to override specific existing
-encoding-charset pairs. For example, TOhtml will by default use UTF-8 for all
-Unicode/UCS encodings. To use UTF-16 and UTF-32 instead, use: >
+ *g:html_charset_override*
+Default: none, autoload/tohtml.vim contains default conversions for encodings
+ mentioned by name at |encoding-names| and which have wide
+ browser support.
+This option allows |2html.vim| to detect the HTML charset for any
+'fileencoding' or 'encoding' which is not detected automatically. You can also
+use it to override specific existing encoding-charset pairs. For example,
+TOhtml will by default use UTF-8 for all Unicode/UCS encodings. To use UTF-16
+and UTF-32 instead, use: >
:let g:html_charset_override = {'ucs-4': 'UTF-32', 'utf-16': 'UTF-16'}
Note that documents encoded in either UTF-32 or UTF-16 have known
-compatibility problems with at least one major browser.
+compatibility problems with some major browsers.
- *convert-to-XML* *convert-to-XHTML*
-If you do not like plain HTML, an alternative is to have the script generate
-XHTML (XML compliant HTML). To do this set the "html_use_xhtml" variable: >
+ *convert-to-XML* *convert-to-XHTML* *g:html_use_xhtml*
+Default: 0.
+When 0, generate standard HTML 4.01 (strict when possible).
+When 1, generate XHTML 1.0 instead (XML compliant HTML).
+>
:let g:html_use_xhtml = 1
-
-Any of the on/off options listed above can be enabled or disabled by setting
-them explicitly to the desired value, or restored to their default by removing
-the variable using |:unlet|.
-
-Remarks:
-- Some truly ancient browsers may not show the background colors.
-- From most browsers you can also print the file (in color)!
-- This version of TOhtml may work with older versions of Vim, but some
- features such as conceal support will not function, and the colors may be
- incorrect for an old Vim without GUI support compiled in.
-
-Here is an example how to run the script over all .c and .h files from a
-Unix shell: >
- for f in *.[ch]; do gvim -f +"syn on" +"run! syntax/2html.vim" +"wq" +"q" $f; done
<
ABEL *abel.vim* *ft-abel-syntax*
View
4 runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt* For Vim version 7.3. Last change: 2010 Jul 31
+*tabpage.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -113,7 +113,7 @@ something else.
this is a "safe" command.
:tabc[lose][!] {count}
- Close tab page {count}. Fails in the same way as ':tabclose"
+ Close tab page {count}. Fails in the same way as `:tabclose`
above.
*:tabo* *:tabonly*
View
35 runtime/doc/tags
@@ -1201,6 +1201,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
+mouse_gpm various.txt /*+mouse_gpm*
+mouse_netterm various.txt /*+mouse_netterm*
+mouse_pterm various.txt /*+mouse_pterm*
++mouse_sgr various.txt /*+mouse_sgr*
+mouse_sysmouse various.txt /*+mouse_sysmouse*
+mouse_urxvt various.txt /*+mouse_urxvt*
+mouse_xterm various.txt /*+mouse_xterm*
@@ -1853,6 +1854,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
:X editing.txt /*:X*
:XMLent insert.txt /*:XMLent*
:XMLns insert.txt /*:XMLns*
+:[range] motion.txt /*:[range]*
:\bar cmdline.txt /*:\\bar*
:_! cmdline.txt /*:_!*
:_# cmdline.txt /*:_#*
@@ -4512,6 +4514,11 @@ SystemColors.plist gui_mac.txt /*SystemColors.plist*
T motion.txt /*T*
TCL if_tcl.txt /*TCL*
TERM starting.txt /*TERM*
+TOhtml-encoding syntax.txt /*TOhtml-encoding*
+TOhtml-encoding-detect syntax.txt /*TOhtml-encoding-detect*
+TOhtml-performance syntax.txt /*TOhtml-performance*
+TOhtml-uncopyable-text syntax.txt /*TOhtml-uncopyable-text*
+TOhtml-wrap-text syntax.txt /*TOhtml-wrap-text*
TSQL ft_sql.txt /*TSQL*
TTpro-telnet syntax.txt /*TTpro-telnet*
Tab intro.txt /*Tab*
@@ -5338,6 +5345,7 @@ develop-spell develop.txt /*develop-spell*
develop-spell-suggestions develop.txt /*develop-spell-suggestions*
develop.txt develop.txt /*develop.txt*
development develop.txt /*development*
+dgn motion.txt /*dgn*
dh change.txt /*dh*
diB motion.txt /*diB*
diW motion.txt /*diW*
@@ -5882,6 +5890,27 @@ g:gnat.Project_File ft_ada.txt /*g:gnat.Project_File*
g:gnat.Set_Project_File() ft_ada.txt /*g:gnat.Set_Project_File()*
g:gnat.Tags() ft_ada.txt /*g:gnat.Tags()*
g:gnat.Tags_Command ft_ada.txt /*g:gnat.Tags_Command*
+g:html_charset_override syntax.txt /*g:html_charset_override*
+g:html_diff_one_file syntax.txt /*g:html_diff_one_file*
+g:html_dynamic_folds syntax.txt /*g:html_dynamic_folds*
+g:html_encoding_override syntax.txt /*g:html_encoding_override*
+g:html_end_line syntax.txt /*g:html_end_line*
+g:html_expand_tabs syntax.txt /*g:html_expand_tabs*
+g:html_hover_unfold syntax.txt /*g:html_hover_unfold*
+g:html_ignore_conceal syntax.txt /*g:html_ignore_conceal*
+g:html_ignore_folding syntax.txt /*g:html_ignore_folding*
+g:html_no_foldcolumn syntax.txt /*g:html_no_foldcolumn*
+g:html_no_invalid syntax.txt /*g:html_no_invalid*
+g:html_no_pre syntax.txt /*g:html_no_pre*
+g:html_no_progress syntax.txt /*g:html_no_progress*
+g:html_number_lines syntax.txt /*g:html_number_lines*
+g:html_pre_wrap syntax.txt /*g:html_pre_wrap*
+g:html_prevent_copy syntax.txt /*g:html_prevent_copy*
+g:html_start_line syntax.txt /*g:html_start_line*
+g:html_use_css syntax.txt /*g:html_use_css*
+g:html_use_encoding syntax.txt /*g:html_use_encoding*
+g:html_use_xhtml syntax.txt /*g:html_use_xhtml*
+g:html_whole_filler syntax.txt /*g:html_whole_filler*
g:netrw_alto pi_netrw.txt /*g:netrw_alto*
g:netrw_altv pi_netrw.txt /*g:netrw_altv*
g:netrw_banner pi_netrw.txt /*g:netrw_banner*
@@ -6003,6 +6032,7 @@ gF editing.txt /*gF*
gH visual.txt /*gH*
gI insert.txt /*gI*
gJ change.txt /*gJ*
+gN visual.txt /*gN*
gP change.txt /*gP*
gQ intro.txt /*gQ*
gR change.txt /*gR*
@@ -6087,6 +6117,7 @@ glvs-options pi_getscript.txt /*glvs-options*
glvs-plugins pi_getscript.txt /*glvs-plugins*
glvs-usage pi_getscript.txt /*glvs-usage*
gm motion.txt /*gm*
+gn visual.txt /*gn*
gnat#Insert_Tags_Header() ft_ada.txt /*gnat#Insert_Tags_Header()*
gnat#New() ft_ada.txt /*gnat#New()*
gnat-xref ft_ada.txt /*gnat-xref*
@@ -7601,6 +7632,7 @@ setuid change.txt /*setuid*
setwinvar() eval.txt /*setwinvar()*
sftp pi_netrw.txt /*sftp*
sgml.vim syntax.txt /*sgml.vim*
+sgr-mouse options.txt /*sgr-mouse*
sh-awk syntax.txt /*sh-awk*
sh-embed syntax.txt /*sh-embed*
sh.vim syntax.txt /*sh.vim*
@@ -8387,11 +8419,13 @@ v_d change.txt /*v_d*
v_g? change.txt /*v_g?*
v_gF editing.txt /*v_gF*
v_gJ change.txt /*v_gJ*
+v_gN visual.txt /*v_gN*
v_gV visual.txt /*v_gV*
v_g] tagsrch.txt /*v_g]*
v_g_CTRL-G editing.txt /*v_g_CTRL-G*
v_g_CTRL-] tagsrch.txt /*v_g_CTRL-]*
v_gf editing.txt /*v_gf*
+v_gn visual.txt /*v_gn*
v_gq change.txt /*v_gq*
v_gv visual.txt /*v_gv*
v_gw change.txt /*v_gw*
@@ -8555,6 +8589,7 @@ vt100-cursor-keys term.txt /*vt100-cursor-keys*
vt100-function-keys term.txt /*vt100-function-keys*
w motion.txt /*w*
w32-clientserver remote.txt /*w32-clientserver*
+w32-xpm-support gui_w32.txt /*w32-xpm-support*
w:current_syntax syntax.txt /*w:current_syntax*
w:quickfix_title quickfix.txt /*w:quickfix_title*
w:var eval.txt /*w:var*
View
50 runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2012 Jul 11
+*todo.txt* For Vim version 7.3. Last change: 2012 Aug 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -43,33 +43,20 @@ GTK: problem with 'L' in 'guioptions' changing the window width.
Checking runtime scripts: Thilo Six, 2012 Jun 6.
-List of broken mirrors. (Chris Pentago, 2012 Jun 15)
-/tmp/broken-mirrors.csv
-
Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
-Patch to fix black on black for terminal with 8 colors.
-(James McCoy, 2012 Jul 10)
-
-Patch to make winrestview() work better. (Lech Lorens, 2012 Jul 10)
-
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.
-Completefunc gets number passed instead of string.
-Patch from Yakuhiro Matsumoto, 2012 Jul 10
-
-User command complete can't handle spaces. Patch by Yasuhiro Matsumoto, 2012
-Jul 11.
+":gundo" command: global undo. Undoes changes spread over multiple files in
+the order they were made. Also ":gredo". Both with a count. Useful when
+tests fail after making changes and you forgot in which files.
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)
-Help for v/V is not quite right. (Ben Fritz, 2012 Jun 4)
-Change [count]v to select last visual area [count] times?
-
Issue 54: document behavior of -complete, also expands arg.
Issue 72: 'autochdir' causes problems for :vimgrep.
@@ -83,6 +70,14 @@ not correctly updated. (Paul Harris, 2012 Feb 27)
Patch to add getsid(). (Tyru, 2011 Oct 2) Do we want this? Update Oct 4.
Or use expand('<sid>')?
+Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
+
+Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
+2012 Aug 4)
+
+Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
+2012 Aug 11) Disallow :new when BufUnload is being handled?
+
MS-Windows resizing problems:
- Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
20. Uses getWindowRect() instead of GetWindowPlacement()
@@ -105,14 +100,12 @@ URXVT:
http://www.midnight-commander.org/ticket/2662
Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns)
+New tests Jul 13. Update Jul 17. Discussion Jul 18.
When running Vim in silent ex mode, an existing swapfile causes Vim to wait
for a user action without a prompt. (Maarten Billemont, 2012 Feb 3)
Do give the prompt? Quit with an error?
-Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro
-Matsumoto, 2012 Jan 30)
-
Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
2012 Mar 21, update Mar 31)
@@ -123,6 +116,9 @@ Patch for input method status. (Hirohito Higashi, 2012 Apr 18)
Problem with winfixheight and resizing. (Yukihiro Nakadaira, 2011 Sep 17)
Patch Sep 18.
+Patch for IME problems. Remove hacking code for old IM. (Yukihiro Nakadaira,
+2012 Jul 20)
+
Patch for has('unnamedplus') docs. (Tony Mechelynck, 2011 Sep 27)
And one for gui_x11.txt.
@@ -135,9 +131,6 @@ And one for gui_x11.txt.
Problem with starting Visual block mode with :norm when 'virtualedit' is set.
(David glts, 2012 Jun 5)
-When 'guioptions' contains 'c' (use console dialog) then inputdialog() returns
-a different value when the dialog is cancelled. (David Fishburn, 2012 Jul 10)
-
":cd" doesn't work when current directory path contains "**".
finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10)
Requires a rewrite of the file_file_in_path code.
@@ -288,6 +281,10 @@ Vim using lots of memory when joining lines. (John Little, 2010 Dec 3)
Changes to manpage plugin. (Elias Toivanen, 2011 Jul 25)
+Patch to make "z=" work when 'spell' is off. Does this have nasty side
+effects? (Christian Brabandt, 2012 Aug 5)
+Would also need to do this for spellbadword() and spellsuggest().
+
On 64 bit MS-Windows "long" is only 32 bits, but we sometimes need to store a
64 bits value. Change all number options to use nropt_T and define it to the
right type.
@@ -393,7 +390,7 @@ Searching mixed with Visual mode doesn't redraw properly. (James Vega, 2010 Nov
New esperanto spell file can't be processed. (Dominique Pelle, 2011 Jan 30)
- move compflags to separate growarray?
-- instead of a regexp use a hashtable. Expand '?', '*", '+'. What would be
+- instead of a regexp use a hashtable. Expand '?', '*', '+'. What would be
the maximum repeat for * and +?
"L'Italie" noted as a spell error at start of the sentence. (Dominique Pelle,
@@ -546,7 +543,7 @@ Find tail? Might have a / in argument. Find space? Might have space in
path.
Test 51 fails when language set to German. (Marco, 2011 Jan 9)
-Dominique can't reproduc it.
+Dominique can't reproduce it.
'ambiwidth' should be global-local.
@@ -601,9 +598,6 @@ When a:base in 'completefunc' starts with a number it's passed as a number,
not a string. (Sean Ma) Need to add flag to call_func_retlist() to force a
string value.
-":e ~br<Tab>" does not complete to ":e /home/bram/". Would need to use
-getpwent() to find all the matches.
-
Invalid read error in Farsi mode. (Dominique Pelle, 2009 Aug 2)
For running gvim on an USB stick: avoid the OLE registration. Use a command
View
5 runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.3. Last change: 2012 Jan 15
+*various.txt* For Vim version 7.3. Last change: 2012 Aug 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -356,6 +356,7 @@ N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse|
B *+mouse_netterm* Unix only: netterm mouse handling |netterm-mouse|
N *+mouse_pterm* QNX only: pterm mouse handling |qnx-terminal|
N *+mouse_sysmouse* Unix only: *BSD console mouse handling |sysmouse|
+B *+mouse_sgr* Unix only: sgr mouse handling |sgr-mouse|
N *+mouse_urxvt* Unix only: urxvt mouse handling |urxvt-mouse|
N *+mouse_xterm* Unix only: xterm mouse handling |xterm-mouse|
B *+multi_byte* 16 and 32 bit characters |multibyte|
@@ -418,7 +419,7 @@ S *+windows* more than one window
m *+writebackup* |'writebackup'| is default on
m *+xim* X input method |xim|
*+xfontset* X fontset support |xfontset|
-m *+xpm_w32* Win32 GUI only: pixmap support |:sign-define|
+m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support|
*+xsmp* XSMP (X session management) support
*+xsmp_interact* interactive XSMP (X session management) support
N *+xterm_clipboard* Unix only: xterm clipboard handling
View
8 runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt* For Vim version 7.3. Last change: 2008 Dec 17
+*version5.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6,7 +6,7 @@
Welcome to Vim Version 5.0!
This document lists the differences between Vim 4.x and Vim 5.0.
-Although 5.0 is mentioned here, this is also for version 5.1, 5.2, etc..
+Although 5.0 is mentioned here, this is also for version 5.1, 5.2, etc.
See |vi_diff.txt| for an overview of differences between Vi and Vim 5.0.
See |version4.txt| for differences between Vim 3.0 and Vim 4.0.
@@ -3888,7 +3888,7 @@ character is typed. Helps to close a /* */ comment in C. (Webb)
When expand() has a second argument which is non-zero, don't use 'suffixes'
and 'wildignore', return all matches.
-'O' flag in 'cpoptions: When not included, Vim will not overwrite a file, if
+'O' flag in 'cpoptions' When not included, Vim will not overwrite a file, if
it didn't exist when editing started but it does exist when the buffer is
written to the file. The file must have been created outside of Vim, possibly
without the user knowing it. When this is detected after a shell command,
@@ -4499,7 +4499,7 @@ Could not get all windows back when using a smaller terminal screen. Didn't
restore all windows when "winsize" was not in 'sessionoptions'. (Webb)
Command line completion for ":buffer" depended on 'ignorecase' for Unix, but
-not for DOS et al.. Now don't use 'ignorecase', but let it depend on whether
+not for DOS et al. Now don't use 'ignorecase', but let it depend on whether
file names are case sensitive or not (like when expanding file names).
Win32 GUI: (Negri)
View
6 runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.3. Last change: 2010 Nov 03
+*version7.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3589,7 +3589,7 @@ Files: src/eval.c, src/getchar.c, src/globals.h, src/main.c
Patch 7.0.085
Problem: When doing "make test" the viminfo file is modified.
-Solution: Use another viminfo file after setting 'compatible.
+Solution: Use another viminfo file after setting 'compatible'.
Files: src/testdir/test56.in
Patch 7.0.086
@@ -7316,8 +7316,6 @@ Command line completion for :lmap and :lunmap.
Support syntax and filetype completion for user commands. (Christian Brabandt)
-Add completion for ":ownsyntax" and improve completion for ":filetype".
-
Avoid use of the GTK main_loop() so that the GtkFileChooser can be used.
(James Vega)
View
6 runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt* For Vim version 7.3. Last change: 2011 Aug 29
+*vi_diff.txt* For Vim version 7.3. Last change: 2012 Aug 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -192,7 +192,7 @@ Syntax highlighting. |:syntax|
Spell checking. |spell|
When the 'spell' option is set Vim will highlight spelling mistakes.
- About 40 languages are currently supported, selected with the
+ About 50 languages are currently supported, selected with the
'spelllang' option. In source code only comments and strings are
checked for spelling.
@@ -653,7 +653,7 @@ You can backspace, CTRL-U and CTRL-W over line breaks if the 'backspace' (bs)
option includes "eol". You can backspace over the start of insert if the
'backspace' option includes "start".
-When the 'paste' option is set, a few option are reset and mapping in insert
+When the 'paste' option is set, a few options are reset and mapping in insert
mode and abbreviation are disabled. This allows for pasting text in windowing
systems without unexpected results. When the 'paste' option is reset, the old
option values are restored.
View
25 runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt* For Vim version 7.3. Last change: 2012 Jun 14
+*visual.txt* For Vim version 7.3. Last change: 2012 Aug 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -62,8 +62,15 @@ position.
*v* *characterwise-visual*
[count]v Start Visual mode per character.
- With [count] select that many characters, like moving
- the cursor right [count] characters. One less when
+ With [count] select the same number of characters or
+ lines as used for the last Visual operation, but at
+ the current cursor position, multiplied by [count].
+ When the previous Visual operation was on a block both
+ the width and height of the block are multipiled by
+ [count].
+ When there was no previous Visual operation [count]
+ characters are selected. This is like moving the
+ cursor right N * [count] characters. One less when
'selection' is not "exclusive".
*V* *linewise-visual*
@@ -99,6 +106,18 @@ gv Start Visual mode with the same area as the previous
After using "p" or "P" in Visual mode the text that
was put will be selected.
+ *gn* *v_gn*
+gn Search forward for the last used search pattern, like
+ with `n`, and start Visual mode to select the match.
+ If the cursor is on the match, visually selects it.
+ If an operator is pending, operates on the match.
+ E.g., "dgn" deletes the text of the next match.
+ If Visual mode is active, extends the selection
+ until the end of the next match.
+
+ *gN* *v_gN*
+gN Like |gn| but searches backward, like with `N`.
+
*<LeftMouse>*
<LeftMouse> Set the current cursor position. If Visual mode is
active it is stopped. Only when 'mouse' option is
View
5 runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 Jun 20
+" Last Change: 2012 Aug 02
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1119,6 +1119,9 @@ au BufNewFile,BufRead *.nb setf mma
" Maya Extension Language
au BufNewFile,BufRead *.mel setf mel
+" Mercurial (hg) commit file
+au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
+
" Mercurial config (looks like generic config file)
au BufNewFile,BufRead *.hgrc,*hgrc setf cfg
View
12 runtime/indent/vim.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Vim script
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2012 May 20
+" Last Change: 2012 Aug 02
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
@@ -22,6 +22,16 @@ let s:keepcpo= &cpo
set cpo&vim
function GetVimIndent()
+ let ignorecase_save = &ignorecase
+ try
+ let &ignorecase = 0
+ return GetVimIndentIntern()
+ finally
+ let &ignorecase = ignorecase_save
+ endtry
+endfunc
+
+function GetVimIndentIntern()
" Find a non-blank line above the current line.
let lnum = prevnonblank(v:lnum - 1)
View
12 runtime/indent/xml.vim
@@ -1,6 +1,6 @@
" Language: xml
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: 2012 May 18
+" Last Change: 2012 Jul 25
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@@ -31,8 +31,16 @@ if !exists('b:xml_indent_close')
" let b:xml_indent_close = '.\{-}</\(address\)\@!'
endif
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" [-- finish, if the function already exists --]
-if exists('*XmlIndentGet') | finish | endif
+if exists('*XmlIndentGet')
+ finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
fun! <SID>XmlIndentWithPattern(line, pat)
let s = substitute('x'.a:line, a:pat, "\1", 'g')
View
87 runtime/keymap/belarusian-jcuken.vim
@@ -0,0 +1,87 @@
+" Vim Keymap file for Belarusian characters, layout 'jcuken', classical variant
+" Useful mainly with UTF-8, but may work with other encodings.
+
+" Derived From: russian-jcuken.vim
+" Maintainer: Aliaksei Nestserau <aliaksei@screencustoms.com>
+" Last Changed: 2012 Jul 23
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding utf-8
+
+let b:keymap_name = "by"
+
+loadkeymap
+~ Ё CYRILLIC CAPITAL LETTER IO
+` ё CYRILLIC SMALL LETTER IO
+F А CYRILLIC CAPITAL LETTER A
+< Б CYRILLIC CAPITAL LETTER BE
+D В CYRILLIC CAPITAL LETTER VE
+U Г CYRILLIC CAPITAL LETTER GHE
+L Д CYRILLIC CAPITAL LETTER DE
+T Е CYRILLIC CAPITAL LETTER IE
+: Ж CYRILLIC CAPITAL LETTER ZHE
+P З CYRILLIC CAPITAL LETTER ZE
+B І CYRILLIC CAPITAL LETTER I
+Q Й CYRILLIC CAPITAL LETTER SHORT I
+R К CYRILLIC CAPITAL LETTER KA
+K Л CYRILLIC CAPITAL LETTER EL
+V М CYRILLIC CAPITAL LETTER EM
+Y Н CYRILLIC CAPITAL LETTER EN
+J О CYRILLIC CAPITAL LETTER O
+G П CYRILLIC CAPITAL LETTER PE
+H Р CYRILLIC CAPITAL LETTER ER
+C С CYRILLIC CAPITAL LETTER ES
+N Т CYRILLIC CAPITAL LETTER TE
+E У CYRILLIC CAPITAL LETTER U
+A Ф CYRILLIC CAPITAL LETTER EF
+{ Х CYRILLIC CAPITAL LETTER HA
+W Ц CYRILLIC CAPITAL LETTER TSE
+X Ч CYRILLIC CAPITAL LETTER CHE
+I Ш CYRILLIC CAPITAL LETTER SHA
+O Ў CYRILLIC CAPITAL LETTER ASYLLABIC U
+} ' APOSTROPHE
+S Ы CYRILLIC CAPITAL LETTER YERU
+M Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+\" Э CYRILLIC CAPITAL LETTER E
+> Ю CYRILLIC CAPITAL LETTER YU
+Z Я CYRILLIC CAPITAL LETTER YA
+f а CYRILLIC SMALL LETTER A
+, б CYRILLIC SMALL LETTER BE
+d в CYRILLIC SMALL LETTER VE
+u г CYRILLIC SMALL LETTER GHE
+l д CYRILLIC SMALL LETTER DE
+t е CYRILLIC SMALL LETTER IE
+; ж CYRILLIC SMALL LETTER ZHE
+p з CYRILLIC SMALL LETTER ZE
+b і CYRILLIC SMALL LETTER I
+q й CYRILLIC SMALL LETTER SHORT I
+r к CYRILLIC SMALL LETTER KA
+k л CYRILLIC SMALL LETTER EL
+v м CYRILLIC SMALL LETTER EM
+y н CYRILLIC SMALL LETTER EN
+j о CYRILLIC SMALL LETTER O
+g п CYRILLIC SMALL LETTER PE
+h р CYRILLIC SMALL LETTER ER
+c с CYRILLIC SMALL LETTER ES
+n т CYRILLIC SMALL LETTER TE
+e у CYRILLIC SMALL LETTER U
+a ф CYRILLIC SMALL LETTER EF
+[ х CYRILLIC SMALL LETTER HA
+w ц CYRILLIC SMALL LETTER TSE
+x ч CYRILLIC SMALL LETTER CHE
+i ш CYRILLIC SMALL LETTER SHA
+o ў CYRILLIC SMALL LETTER ASYLLABIC U
+] ' APOSTROPHE
+s ы CYRILLIC SMALL LETTER YERU
+m ь CYRILLIC SMALL LETTER SOFT SIGN
+' э CYRILLIC SMALL LETTER E
+. ю CYRILLIC SMALL LETTER YU
+z я CYRILLIC SMALL LETTER YA
+@ "
+# '
+$ *
+% :
+^ ,
+& .
+* ;
View
4 runtime/mswin.vim
@@ -1,7 +1,7 @@
" Set options and add mapping such that Vim behaves a lot like MS-Windows
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last change: 2012 Jun 13
+" Last change: 2012 Jul 25
" bail out if this isn't wanted (mrsvim.vim uses this).
if exists("g:skip_loading_mswin") && g:skip_loading_mswin
@@ -45,7 +45,7 @@ cmap <S-Insert> <C-R>+
" Use CTRL-G u to have CTRL-Z only undo the paste.
exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i']
-exe 'vnoremap <script> <C-V>' . paste#paste_cmd['v']
+exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v']
imap <S-Insert> <C-V>
vmap <S-Insert> <C-V>
View
86 runtime/plugin/tohtml.vim
@@ -1,40 +1,95 @@
" Vim plugin for converting a syntax highlighted file to HTML.
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 May 26
+" Last Change: 2012 Jul 12
"
" The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
" $VIMRUNTIME/syntax/2html.vim
"
-" TODO:
+" TODO: {{{
+" * Bug: still a 1px gap throughout the fold column when html_prevent_copy is
+" "fn" in some browsers. Specifically, in Chromium on Ubuntu (but not Chrome
+" on Windows). Perhaps it is font related?
+" * Bug: still some gaps in the fold column when html_prevent_copy contains
+" 'd' and showing the whole diff (observed in multiple browsers). Only gaps
+" on diff lines though.
+" * anchors on each line so you can do file.html#1234 to get to line 1234
+" * add a modeline to the generated html to set nofoldenable or fdm=manual
+" because syntax folding takes a terribly long time to work with the weird
+" formatting the script does.
" * Options for generating the CSS in external style sheets. New :TOcss
" command to convert the current color scheme into a (mostly) generic CSS
" stylesheet which can be re-used. Alternate stylesheet support?
+" * Undercurl support via CSS3, with fallback to dotted or something:
+" https://groups.google.com/d/topic/vim_use/BzXA6He1pHg/discussion
+" * Redo updates for modified default foldtext (v11) when/if the patch is
+" accepted to modify it.
+" * Test case +diff_one_file-dynamic_folds+expand_tabs-hover_unfold
+" +ignore_conceal-ignore_folding+no_foldcolumn+no_pre+no_progress
+" +number_lines-pre_wrap-use_css+use_xhtml+whole_filler.xhtml
+" does not show the whole diff filler as it is supposed to.
+" * Add option for not generating the hyperlink on stuff that looks like a
+" URL? Or just color the link to fit with the colorscheme (and only special
+" when hovering)?
+" * Bug: when 'isprint' is wrong for the current encoding, will generate
+" invalid content. Can/should anything be done about this? Maybe a separate
+" plugin to correct 'isprint' based on encoding?
+" * Check to see if the windows-125\d encodings actually work in Unix without
+" the 8bit- prefix. Add prefix to autoload dictionaries for Unix if not.
+" * Font auto-detection similar to
+" http://www.vim.org/scripts/script.php?script_id=2384 but for a variety of
+" platforms.
+" * Error thrown when sourcing 2html.vim directly when plugins are not loaded.
" * Pull in code from http://www.vim.org/scripts/script.php?script_id=3113 :
" - listchars support
" - full-line background highlight
" - other?
-" * Font auto-detection similar to
-" http://www.vim.org/scripts/script.php?script_id=2384
-" * Explicitly trigger IE8+ Standards Mode?
-" * Make it so deleted lines in a diff don't create side-scrolling
+" * Explicitly trigger IE8+ Standards Mode? Doesn't seem necessary yet.
+" * Make it so deleted lines in a diff don't create side-scrolling (get it
+" free with full-line background highlight above).
" * Restore open/closed folds and cursor position after processing each file
-" with option not to restore for speed increase
-" * Undercurl support via dotted bottom border?
+" with option not to restore for speed increase.
" * Add extra meta info (generation time, etc.)?
" * Tidy up so we can use strict doctype in even more situations
" * Implementation detail: add threshold for writing the lines to the html
" buffer before we're done (5000 or so lines should do it)
" * TODO comments for code cleanup scattered throughout
-"
+"}}}
if exists('g:loaded_2html_plugin')
finish
endif
-let g:loaded_2html_plugin = 'vim7.3_v10'
+let g:loaded_2html_plugin = 'vim7.3_v12'
"
-" Changelog:
-" 7.3_v10 (this version): Fix error E684 when converting a range wholly inside
+" Changelog: {{{
+"
+" 7.3_v12 (this version): Fix modeline mangling to also work for when multiple
+" highlight groups make up the start-of-modeline text.
+" Improve render time of page with uncopyable regions
+" by not using one-input-per-char. Change name of
+" uncopyable option from html_unselectable to
+" html_prevent_copy. Added html_no_invalid option and
+" default to inserting invalid markup for uncopyable
+" regions to prevent MS Word from pasting undeletable
+" <input> elements. Fix 'cpo' handling (Thilo Six).
+" 7.3_v12b1: Add html_unselectable option. Rework logic to
+" eliminate post-processing substitute commands in
+" favor of doing the work up front. Remove unnecessary
+" special treatment of 'LineNr' highlight group. Minor
+" speed improvements. Fix modeline mangling in
+" generated output so it works for text in the first
+" column. Fix missing line number and fold column in
+" diff filler lines. Fix that some fonts have a 1px
+" gap (using a dirty hack, improvements welcome). Add
+" "colorscheme" meta tag. Does NOT include support for
+" the new default foldtext added in v11, as the patch
+" adding it has not yet been included in Vim.
+" 7.3_v11 ( unreleased ): Support new default foldtext from patch by Christian
+" Brabandt in
+" http://groups.google.com/d/topic/vim_dev/B6FSGfq9VoI/discussion.
+" This patch has not yet been included in Vim, thus
+" these changes are removed in the next version.
+" 7.3_v10 (fd09a9c8468e): Fix error E684 when converting a range wholly inside
" multiple nested folds with dynamic folding on.
" Also fix problem with foldtext in this situation.
" 7.3_v9 (0877b8d6370e): Add html_pre_wrap option active with html_use_css
@@ -81,14 +136,15 @@ let g:loaded_2html_plugin = 'vim7.3_v10'
" diff colors and the normal syntax colors
" 7.3_v1 (e7751177126b): Add conceal support and meta tags in output
" Pre-v1 baseline: Mercurial changeset 3c9324c0800e
+"}}}
" Define the :TOhtml command when:
" - 'compatible' is not set
" - this plugin was not already loaded
-" - user commands are available.
+" - user commands are available. {{{
if !&cp && !exists(":TOhtml") && has("user_commands")
command -range=% TOhtml :call tohtml#Convert2HTML(<line1>, <line2>)
-endif
+endif "}}}
" Make sure any patches will probably use consistent indent
-" vim: ts=8 sw=2 sts=2 noet
+" vim: ts=8 sw=2 sts=2 noet fdm=marker
View
22 runtime/spell/br/br_FR.diff
@@ -1,13 +1,23 @@
-*** br_FR.orig.aff 2010-04-14 18:44:36.365731271 +0200
---- br_FR.aff 2010-04-14 18:43:31.069137439 +0200
+*** br_FR.aff.orig 2012-08-01 22:40:24.000000000 +0200
+--- br_FR.aff 2012-08-01 22:46:03.028851510 +0200
***************
-*** 9,14 ****
---- 9,16 ----
+*** 13,20 ****
+ SET UTF-8
+ TRY esiaùnñrtolcdugmphbyfvkwzESIAÙNÑRTOLCDUGMPHBYFVKWZ'
+
+ # Permet à l'utilitaire en ligne de commande hunspell de fonctionner avec les mots contenant des quotes (lec'hienn, ...)
+! WORDCHARS '
+
+ FLAG long
+
+--- 13,22 ----
SET UTF-8
TRY esiaùnñrtolcdugmphbyfvkwzESIAÙNÑRTOLCDUGMPHBYFVKWZ'
+ MIDWORD '
+
- PFX m Y 1
- PFX m 0 m' [aehiouy]
+ # Permet à l'utilitaire en ligne de commande hunspell de fonctionner avec les mots contenant des quotes (lec'hienn, ...)
+! WORDCHARS '-
+
+ FLAG long
View
16 runtime/spell/br/main.aap
@@ -25,16 +25,16 @@ $SPELLDIR/br.utf-8.spl : $FILES
#
# Fetching the files from OpenOffice.org.
#
-OODIR = http://extensions.services.openoffice.org/e-files/2207/3
-:attr {fetch = $OODIR/%file%} dict-br_0.3.oxt
+OODIR = http://extensions.services.openoffice.org/e-files/2207/6
+:attr {fetch = $OODIR/%file%} dict-br_0.8.oxt
# The files don't depend on the .zip file so that we can delete it.
# Only download the zip file if the targets don't exist.
br_FR.aff br_FR.dic: {buildcheck=}
:assertpkg unzip patch
- :fetch dict-br_0.3.oxt
- :sys $UNZIP dict-br_0.3.oxt
- :delete dict-br_0.3.oxt
+ :fetch dict-br_0.8.oxt
+ :sys $UNZIP dict-br_0.8.oxt
+ :delete dict-br_0.8.oxt
:copy dictionaries/br_FR.aff br_FR.aff
:copy dictionaries/br_FR.dic br_FR.dic
# The br_FR.aff file contains a BOM, remove it.
@@ -65,12 +65,12 @@ diff:
check:
:assertpkg unzip diff
- :fetch dict-br_0.3.oxt
+ :fetch dict-br_0.8.oxt
:mkdir tmp
:cd tmp
@try:
@import stat
- :sys $UNZIP ../dict-br_0.3.oxt
+ :sys $UNZIP ../dict-br_0.8.oxt
:sys {force} diff ../dictionaries/br_FR.aff br_FR.aff >d
@if os.stat('d')[stat.ST_SIZE] > 0:
:copy br_FR.aff ../br_FR.new.aff
@@ -80,7 +80,7 @@ check:
@finally:
:cd ..
:delete {r}{f}{q} tmp
- :delete dict-br_0.3.oxt
+ :delete dict-br_0.8.oxt
# vim: set sts=4 sw=4 :
View
818 runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2011 May 27
+" Last Change: 2012 Jun 30
"
" Additional contributors:
"
@@ -20,7 +20,7 @@
" this file uses line continuations
let s:cpo_sav = &cpo
let s:ls = &ls
-set cpo-=C
+set cpo&vim
let s:end=line('$')
@@ -33,6 +33,17 @@ endif
let s:settings = tohtml#GetUserSettings()
+if !exists('s:FOLDED_ID')
+ let s:FOLDED_ID = hlID("Folded") | lockvar s:FOLDED_ID
+ let s:FOLD_C_ID = hlID("FoldColumn") | lockvar s:FOLD_C_ID
+ let s:LINENR_ID = hlID('LineNr') | lockvar s:LINENR_ID
+ let s:DIFF_D_ID = hlID("DiffDelete") | lockvar s:DIFF_D_ID
+ let s:DIFF_A_ID = hlID("DiffAdd") | lockvar s:DIFF_A_ID
+ let s:DIFF_C_ID = hlID("DiffChange") | lockvar s:DIFF_C_ID
+ let s:DIFF_T_ID = hlID("DiffText") | lockvar s:DIFF_T_ID
+ let s:CONCEAL_ID = hlID('Conceal') | lockvar s:CONCEAL_ID
+endif
+
" Whitespace
if s:settings.pre_wrap
let s:whitespace = "white-space: pre-wrap; "
@@ -40,26 +51,137 @@ else
let s:whitespace = ""
endif
+if !empty(s:settings.prevent_copy)
+ if s:settings.no_invalid
+ " User has decided they don't want invalid markup. Still works in
+ " OpenOffice, and for text editors, but when pasting into Microsoft Word the
+ " input elements get pasted too and they cannot be deleted (at least not
+ " easily).
+ let s:unselInputType = ""
+ else
+ " Prevent from copy-pasting the input elements into Microsoft Word where
+ " they cannot be deleted easily by deliberately inserting invalid markup.
+ let s:unselInputType = " type='invalid_input_type'"
+ endif
+endif
+
" When not in gui we can only guess the colors.
+" TODO - is this true anymore?
if has("gui_running")
let s:whatterm = "gui"
else
let s:whatterm = "cterm"
if &t_Co == 8
- let s:cterm_color = {0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00", 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"}
+ let s:cterm_color = {
+ \ 0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00",
+ \ 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"
+ \ }
else
- let s:cterm_color = {0: "#000000", 1: "#c00000", 2: "#008000", 3: "#804000", 4: "#0000c0", 5: "#c000c0", 6: "#008080", 7: "#c0c0c0", 8: "#808080", 9: "#ff6060", 10: "#00ff00", 11: "#ffff00", 12: "#8080ff", 13: "#ff40ff", 14: "#00ffff", 15: "#ffffff"}
+ let s:cterm_color = {
+ \ 0: "#000000", 1: "#c00000", 2: "#008000", 3: "#804000",
+ \ 4: "#0000c0", 5: "#c000c0", 6: "#008080", 7: "#c0c0c0",
+ \ 8: "#808080", 9: "#ff6060", 10: "#00ff00", 11: "#ffff00",
+ \ 12: "#8080ff", 13: "#ff40ff", 14: "#00ffff", 15: "#ffffff"
+ \ }
" Colors for 88 and 256 come from xterm.
if &t_Co == 88
- call extend(s:cterm_color, {16: "#000000", 17: "#00008b", 18: "#0000cd", 19: "#0000ff", 20: "#008b00", 21: "#008b8b", 22: "#008bcd", 23: "#008bff", 24: "#00cd00", 25: "#00cd8b", 26: "#00cdcd", 27: "#00cdff", 28: "#00ff00", 29: "#00ff8b", 30: "#00ffcd", 31: "#00ffff", 32: "#8b0000", 33: "#8b008b", 34: "#8b00cd", 35: "#8b00ff", 36: "#8b8b00", 37: "#8b8b8b", 38: "#8b8bcd", 39: "#8b8bff", 40: "#8bcd00", 41: "#8bcd8b", 42: "#8bcdcd", 43: "#8bcdff", 44: "#8bff00", 45: "#8bff8b", 46: "#8bffcd", 47: "#8bffff", 48: "#cd0000", 49: "#cd008b", 50: "#cd00cd", 51: "#cd00ff", 52: "#cd8b00", 53: "#cd8b8b", 54: "#cd8bcd", 55: "#cd8bff", 56: "#cdcd00", 57: "#cdcd8b", 58: "#cdcdcd", 59: "#cdcdff", 60: "#cdff00", 61: "#cdff8b", 62: "#cdffcd", 63: "#cdffff", 64: "#ff0000"})
- call extend(s:cterm_color, {65: "#ff008b", 66: "#ff00cd", 67: "#ff00ff", 68: "#ff8b00", 69: "#ff8b8b", 70: "#ff8bcd", 71: "#ff8bff", 72: "#ffcd00", 73: "#ffcd8b", 74: "#ffcdcd", 75: "#ffcdff", 76: "#ffff00", 77: "#ffff8b", 78: "#ffffcd", 79: "#ffffff", 80: "#2e2e2e", 81: "#5c5c5c", 82: "#737373", 83: "#8b8b8b", 84: "#a2a2a2", 85: "#b9b9b9", 86: "#d0d0d0", 87: "#e7e7e7"})
+ call extend(s:cterm_color, {
+ \ 16: "#000000", 17: "#00008b", 18: "#0000cd", 19: "#0000ff",
+ \ 20: "#008b00", 21: "#008b8b", 22: "#008bcd", 23: "#008bff",
+ \ 24: "#00cd00", 25: "#00cd8b", 26: "#00cdcd", 27: "#00cdff",
+ \ 28: "#00ff00", 29: "#00ff8b", 30: "#00ffcd", 31: "#00ffff",
+ \ 32: "#8b0000", 33: "#8b008b", 34: "#8b00cd", 35: "#8b00ff",
+ \ 36: "#8b8b00", 37: "#8b8b8b", 38: "#8b8bcd", 39: "#8b8bff",
+ \ 40: "#8bcd00", 41: "#8bcd8b", 42: "#8bcdcd", 43: "#8bcdff",
+ \ 44: "#8bff00", 45: "#8bff8b", 46: "#8bffcd", 47: "#8bffff",
+ \ 48: "#cd0000", 49: "#cd008b", 50: "#cd00cd", 51: "#cd00ff",
+ \ 52: "#cd8b00", 53: "#cd8b8b", 54: "#cd8bcd", 55: "#cd8bff",
+ \ 56: "#cdcd00", 57: "#cdcd8b", 58: "#cdcdcd", 59: "#cdcdff",
+ \ 60: "#cdff00", 61: "#cdff8b", 62: "#cdffcd", 63: "#cdffff",
+ \ 64: "#ff0000"
+ \ })
+ call extend(s:cterm_color, {
+ \ 65: "#ff008b", 66: "#ff00cd", 67: "#ff00ff", 68: "#ff8b00",
+ \ 69: "#ff8b8b", 70: "#ff8bcd", 71: "#ff8bff", 72: "#ffcd00",
+ \ 73: "#ffcd8b", 74: "#ffcdcd", 75: "#ffcdff", 76: "#ffff00",
+ \ 77: "#ffff8b", 78: "#ffffcd", 79: "#ffffff", 80: "#2e2e2e",
+ \ 81: "#5c5c5c", 82: "#737373", 83: "#8b8b8b", 84: "#a2a2a2",
+ \ 85: "#b9b9b9", 86: "#d0d0d0", 87: "#e7e7e7"
+ \ })
elseif &t_Co == 256
- call extend(s:cterm_color, {16: "#000000", 17: "#00005f", 18: "#000087", 19: "#0000af", 20: "#0000d7", 21: "#0000ff", 22: "#005f00", 23: "#005f5f", 24: "#005f87", 25: "#005faf", 26: "#005fd7", 27: "#005fff", 28: "#008700", 29: "#00875f", 30: "#008787", 31: "#0087af", 32: "#0087d7", 33: "#0087ff", 34: "#00af00", 35: "#00af5f", 36: "#00af87", 37: "#00afaf", 38: "#00afd7", 39: "#00afff", 40: "#00d700", 41: "#00d75f", 42: "#00d787", 43: "#00d7af", 44: "#00d7d7", 45: "#00d7ff", 46: "#00ff00", 47: "#00ff5f", 48: "#00ff87", 49: "#00ffaf", 50: "#00ffd7", 51: "#00ffff", 52: "#5f0000", 53: "#5f005f", 54: "#5f0087", 55: "#5f00af", 56: "#5f00d7", 57: "#5f00ff", 58: "#5f5f00", 59: "#5f5f5f", 60: "#5f5f87", 61: "#5f5faf", 62: "#5f5fd7", 63: "#5f5fff", 64: "#5f8700"})
- call extend(s:cterm_color, {65: "#5f875f", 66: "#5f8787", 67: "#5f87af", 68: "#5f87d7", 69: "#5f87ff", 70: "#5faf00", 71: "#5faf5f", 72: "#5faf87", 73: "#5fafaf", 74: "#5fafd7", 75: "#5fafff", 76: "#5fd700", 77: "#5fd75f", 78: "#5fd787", 79: "#5fd7af", 80: "#5fd7d7", 81: "#5fd7ff", 82: "#5fff00", 83: "#5fff5f", 84: "#5fff87", 85: "#5fffaf", 86: "#5fffd7", 87: "#5fffff", 88: "#870000", 89: "#87005f", 90: "#870087", 91: "#8700af", 92: "#8700d7", 93: "#8700ff", 94: "#875f00", 95: "#875f5f", 96: "#875f87", 97: "#875faf", 98: "#875fd7", 99: "#875fff", 100: "#878700", 101: "#87875f", 102: "#878787", 103: "#8787af", 104: "#8787d7", 105: "#8787ff", 106: "#87af00", 107: "#87af5f", 108: "#87af87", 109: "#87afaf", 110: "#87afd7", 111: "#87afff", 112: "#87d700"})
- call extend(s:cterm_color, {113: "#87d75f", 114: "#87d787", 115: "#87d7af", 116: "#87d7d7", 117: "#87d7ff", 118: "#87ff00", 119: "#87ff5f", 120: "#87ff87", 121: "#87ffaf", 122: "#87ffd7", 123: "#87ffff", 124: "#af0000", 125: "#af005f", 126: "#af0087", 127: "#af00af", 128: "#af00d7", 129: "#af00ff", 130: "#af5f00", 131: "#af5f5f", 132: "#af5f87", 133: "#af5faf", 134: "#af5fd7", 135: "#af5fff", 136: "#af8700", 137: "#af875f", 138: "#af8787", 139: "#af87af", 140: "#af87d7", 141: "#af87ff", 142: "#afaf00", 143: "#afaf5f", 144: "#afaf87", 145: "#afafaf", 146: "#afafd7", 147: "#afafff", 148: "#afd700", 149: "#afd75f", 150: "#afd787", 151: "#afd7af", 152: "#afd7d7", 153: "#afd7ff", 154: "#afff00", 155: "#afff5f", 156: "#afff87", 157: "#afffaf", 158: "#afffd7"})
- call extend(s:cterm_color, {159: "#afffff", 160: "#d70000", 161: "#d7005f", 162: "#d70087", 163: "#d700af", 164: "#d700d7", 165: "#d700ff", 166: "#d75f00", 167: "#d75f5f", 168: "#d75f87", 169: "#d75faf", 170: "#d75fd7", 171: "#d75fff", 172: "#d78700", 173: "#d7875f", 174: "#d78787", 175: "#d787af", 176: "#d787d7", 177: "#d787ff", 178: "#d7af00", 179: "#d7af5f", 180: "#d7af87", 181: "#d7afaf", 182: "#d7afd7", 183: "#d7afff", 184: "#d7d700", 185: "#d7d75f", 186: "#d7d787", 187: "#d7d7af", 188: "#d7d7d7", 189: "#d7d7ff", 190: "#d7ff00", 191: "#d7ff5f", 192: "#d7ff87", 193: "#d7ffaf", 194: "#d7ffd7", 195: "#d7ffff", 196: "#ff0000", 197: "#ff005f", 198: "#ff0087", 199: "#ff00af", 200: "#ff00d7", 201: "#ff00ff", 202: "#ff5f00", 203: "#ff5f5f", 204: "#ff5f87"})
- call extend(s:cterm_color, {205: "#ff5faf", 206: "#ff5fd7", 207: "#ff5fff", 208: "#ff8700", 209: "#ff875f", 210: "#ff8787", 211: "#ff87af", 212: "#ff87d7", 213: "#ff87ff", 214: "#ffaf00", 215: "#ffaf5f", 216: "#ffaf87", 217: "#ffafaf", 218: "#ffafd7", 219: "#ffafff", 220: "#ffd700", 221: "#ffd75f", 222: "#ffd787", 223: "#ffd7af", 224: "#ffd7d7", 225: "#ffd7ff", 226: "#ffff00", 227: "#ffff5f", 228: "#ffff87", 229: "#ffffaf", 230: "#ffffd7", 231: "#ffffff", 232: "#080808", 233: "#121212", 234: "#1c1c1c", 235: "#262626", 236: "#303030", 237: "#3a3a3a", 238: "#444444", 239: "#4e4e4e", 240: "#585858", 241: "#626262", 242: "#6c6c6c", 243: "#767676", 244: "#808080", 245: "#8a8a8a", 246: "#949494", 247: "#9e9e9e", 248: "#a8a8a8", 249: "#b2b2b2", 250: "#bcbcbc", 251: "#c6c6c6", 252: "#d0d0d0", 253: "#dadada", 254: "#e4e4e4", 255: "#eeeeee"})
+ call extend(s:cterm_color, {
+ \ 16: "#000000", 17: "#00005f", 18: "#000087", 19: "#0000af",
+ \ 20: "#0000d7", 21: "#0000ff", 22: "#005f00", 23: "#005f5f",
+ \ 24: "#005f87", 25: "#005faf", 26: "#005fd7", 27: "#005fff",
+ \ 28: "#008700", 29: "#00875f", 30: "#008787", 31: "#0087af",
+ \ 32: "#0087d7", 33: "#0087ff", 34: "#00af00", 35: "#00af5f",
+ \ 36: "#00af87", 37: "#00afaf", 38: "#00afd7", 39: "#00afff",
+ \ 40: "#00d700", 41: "#00d75f", 42: "#00d787", 43: "#00d7af",
+ \ 44: "#00d7d7", 45: "#00d7ff", 46: "#00ff00", 47: "#00ff5f",
+ \ 48: "#00ff87", 49: "#00ffaf", 50: "#00ffd7", 51: "#00ffff",
+ \ 52: "#5f0000", 53: "#5f005f", 54: "#5f0087", 55: "#5f00af",
+ \ 56: "#5f00d7", 57: "#5f00ff", 58: "#5f5f00", 59: "#5f5f5f",
+ \ 60: "#5f5f87", 61: "#5f5faf", 62: "#5f5fd7", 63: "#5f5fff",
+ \ 64: "#5f8700"
+ \ })
+ call extend(s:cterm_color, {
+ \ 65: "#5f875f", 66: "#5f8787", 67: "#5f87af", 68: "#5f87d7",
+ \ 69: "#5f87ff", 70: "#5faf00", 71: "#5faf5f", 72: "#5faf87",
+ \ 73: "#5fafaf", 74: "#5fafd7", 75: "#5fafff", 76: "#5fd700",
+ \ 77: "#5fd75f", 78: "#5fd787", 79: "#5fd7af", 80: "#5fd7d7",
+ \ 81: "#5fd7ff", 82: "#5fff00", 83: "#5fff5f", 84: "#5fff87",
+ \ 85: "#5fffaf", 86: "#5fffd7", 87: "#5fffff", 88: "#870000",
+ \ 89: "#87005f", 90: "#870087", 91: "#8700af", 92: "#8700d7",
+ \ 93: "#8700ff", 94: "#875f00", 95: "#875f5f", 96: "#875f87",
+ \ 97: "#875faf", 98: "#875fd7", 99: "#875fff", 100: "#878700",
+ \ 101: "#87875f", 102: "#878787", 103: "#8787af", 104: "#8787d7",
+ \ 105: "#8787ff", 106: "#87af00", 107: "#87af5f", 108: "#87af87",
+ \ 109: "#87afaf", 110: "#87afd7", 111: "#87afff", 112: "#87d700"
+ \ })
+ call extend(s:cterm_color, {
+ \ 113: "#87d75f", 114: "#87d787", 115: "#87d7af", 116: "#87d7d7",