diff options
52 files changed, 264 insertions, 59 deletions
diff --git a/runtime/compiler/decada.vim b/runtime/compiler/decada.vim index 4670bbd914..0bf5487c89 100644 --- a/runtime/compiler/decada.vim +++ b/runtime/compiler/decada.vim @@ -15,14 +15,11 @@ " Help Page: compiler-decada "------------------------------------------------------------------------------ -let s:keepcpo= &cpo -set cpo&vim - -if (exists("current_compiler") && - \ current_compiler == "decada") || - \ version < 700 +if (exists("current_compiler") && current_compiler == "decada") || version < 700 finish endif +let s:keepcpo= &cpo +set cpo&vim let current_compiler = "decada" diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index bb11f9cad5..3e19b1d3e7 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.3. Last change: 2012 Apr 25 +*change.txt* For Vim version 7.3. Last change: 2012 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -260,6 +260,12 @@ r{char} Replace the character under the cursor with {char}. <CR>. CTRL-V <NL> replaces with a <Nul>. {Vi: CTRL-V <CR> still replaces with a line break, cannot replace something with a <CR>} + + If {char} is CTRL-E or CTRL-Y the character from the + line below or above is used, just like with |i_CTRL-E| + and |i_CTRL-Y|. This also works with a count, thus + `10r<C-E>` copies 10 characters from the line below. + If you give a [count], Vim replaces [count] characters with [count] {char}s. When {char} is a <CR> or <NL>, however, Vim inserts only one <CR>: "5r<CR>" replaces diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index be31f44bd7..91ee7f4975 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2012 Apr 25 +*eval.txt* For Vim version 7.3. Last change: 2012 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5964,6 +5964,8 @@ undofile({name}) *undofile()* the undo file exists. {name} is always expanded to the full path, since that is what is used internally. + If {name} is empty undofile() returns an empty string, since a + buffer without a file name will not write an undo file. Useful in combination with |:wundo| and |:rundo|. When compiled without the +persistent_undo option this always returns an empty string. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index d1df4cb277..ac8e62c074 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2012 Apr 30 +*todo.txt* For Vim version 7.3. Last change: 2012 May 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,6 +34,8 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- +patch to fix helphelp.txt from Ken Takata. https://gist.github.com/2559599 + Go through more coverity reports. Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) @@ -41,9 +43,6 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) Stack trace of crash: http://vpaste.net/GBt9S (Alexandre Provencio) -Once syntax and other runtime files have been fixed: add "set cp" to -check.vim. Use a function to run both with 'cp' and 'nocp'. - GTK: problem with 'L' in 'guioptions' changing the window width. (Aaron Cornelius, 2012 Feb 6) @@ -54,10 +53,6 @@ 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) -Patch for crash involving curwin->w_s. (Christian Brabandt, 2012 Apr 20) -What is the cause? Leaks memory? Other solution? -More debug info Apr 26. Patch with proper fix Apr 26. Update 28 Apr. - Issue 54: document behavior of -complete, also expands arg. Cursor on wrong line after ":copen". (John Beckett, 2012 Apr 30) @@ -81,12 +76,6 @@ 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 undofile(). (Christian Brabandt, 2012 Apr 27) - -Patch for: (Christian Brabandt, 2011 Aug 22) -- Make it possible to enter "r<C-E>" and "r<C-Y>" (get character from line - below/above). - Patch for: (Christian Brabandt, 2011 Aug 24, updated patch) 8 ":sign unplace * file={filename}" should work. Also: ":sign unplace * buffer={bufnr}". So one can remove all signs for one file/buffer. @@ -101,8 +90,6 @@ Name it "CompleteFuncDone". Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro Matsumoto, 2012 Jan 30) -Patch to add completion for :history command. (Dominique Pelle, 2012 Feb 26) - Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope, 2012 Mar 21, update Mar 31) diff --git a/runtime/ftplugin/qf.vim b/runtime/ftplugin/qf.vim index 9d438b520d..98c8f932bc 100644 --- a/runtime/ftplugin/qf.vim +++ b/runtime/ftplugin/qf.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Vim's quickfix window " Maintainer: Lech Lorens <Lech.Lorens@gmail.com> -" Last Changed: 18 Dec 2010 +" Last Changed: 30 Apr 2012 if exists("b:did_ftplugin") finish @@ -13,4 +13,4 @@ let b:did_ftplugin = 1 let b:undo_ftplugin = "set stl<" " Display the command that produced the list in the quickfix window: -setlocal stl=%t%{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''} +setlocal stl=%t%{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}\ %=%-15(%l,%c%V%)\ %P diff --git a/runtime/indent/ada.vim b/runtime/indent/ada.vim index c7f8864362..03fbaa3a18 100644 --- a/runtime/indent/ada.vim +++ b/runtime/indent/ada.vim @@ -28,8 +28,6 @@ if exists("b:did_indent") || version < 700 finish endif -let s:keepcpo= &cpo -set cpo&vim let b:did_indent = 45 @@ -41,6 +39,8 @@ setlocal indentkeys+=0=~then,0=~end,0=~elsif,0=~when,0=~exception,0=~begin,0=~is if exists("*GetAdaIndent") finish endif +let s:keepcpo= &cpo +set cpo&vim if exists("g:ada_with_gnat_project_files") let s:AdaBlockStart = '^\s*\(if\>\|while\>\|else\>\|elsif\>\|loop\>\|for\>.*\<\(loop\|use\)\>\|declare\>\|begin\>\|type\>.*\<is\>[^;]*$\|\(type\>.*\)\=\<record\>\|procedure\>\|function\>\|accept\>\|do\>\|task\>\|package\>\|project\>\|then\>\|when\>\|is\>\)' diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim index 838865f87f..54ed123429 100644 --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -2,15 +2,13 @@ " Language: Python " Maintainer: Bram Moolenaar <Bram@vim.org> " Original Author: David Bustos <bustos@caltech.edu> -" Last Change: 2012 Apr 30 +" Last Change: 2012 May 01 " Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif let b:did_indent = 1 -let s:keepcpo= &cpo -set cpo&vim " Some preliminary settings setlocal nolisp " Make sure lisp indenting doesn't supersede us @@ -23,6 +21,8 @@ setlocal indentkeys+=<:>,=elif,=except if exists("*GetPythonIndent") finish endif +let s:keepcpo= &cpo +set cpo&vim " Come here when loading the script the first time. diff --git a/runtime/lang/menu_af_af.latin1.vim b/runtime/lang/menu_af_af.latin1.vim index 7b16b0fcfb..46331e7ac6 100644 --- a/runtime/lang/menu_af_af.latin1.vim +++ b/runtime/lang/menu_af_af.latin1.vim @@ -1,6 +1,6 @@ " Menu Translations: Afrikaas " Maintainer: Danie Roux <droux@tuks.co.za> -" Last Change: 2012 Apr 30 +" Last Change: 2012 May 01 " Quit when menu translations have already been done. if exists("did_menu_trans") @@ -153,5 +153,5 @@ menutrans Co&lor\ test Toets\ die\ &kleure menutrans &Highlight\ test Toets\ die\ verligting menutrans &Convert\ to\ HTML Verwissel\ na\ HTML -let s:keepcpo= &cpo -set cpo&vim +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_ca_es.latin1.vim b/runtime/lang/menu_ca_es.latin1.vim index c78e173b68..1d77dc926b 100644 --- a/runtime/lang/menu_ca_es.latin1.vim +++ b/runtime/lang/menu_ca_es.latin1.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " The translations below are in latin1, but they work for cp1252, " iso-8859-15 without conversion as well. @@ -311,3 +313,5 @@ menutrans Config Configuració menutrans Set\ '&syntax'\ only Només\ el\ ressalt\ de\ sintaxi menutrans Set\ '&filetype'\ too Carrega\ també\ els\ plugins +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim index 193826bdc9..e636a42319 100644 --- a/runtime/lang/menu_chinese_gb.936.vim +++ b/runtime/lang/menu_chinese_gb.936.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding cp936 @@ -261,3 +263,6 @@ menutrans &Highlight\ test ¸ßÁÁ²âÊÔ(&H) menutrans &Convert\ to\ HTML ת»»³É\ HTML(&C) menutrans Set\ '&syntax'\ only ½öÉ趨\ 'syntax'(&S) menutrans Set\ '&filetype'\ too Ò²É趨\ 'filetype'(&F) + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_chinese_taiwan.950.vim b/runtime/lang/menu_chinese_taiwan.950.vim index 60dc2a799e..7631e3e1a3 100644 --- a/runtime/lang/menu_chinese_taiwan.950.vim +++ b/runtime/lang/menu_chinese_taiwan.950.vim @@ -1,6 +1,6 @@ " Menu Translations: Traditional Chinese " Translated By: Hung-Te Lin <piaip@csie.ntu.edu.tw> -" Last Change: 2005/01/28 02:51:38 +" Last Change: 2012 May 01 " {{{ Quit when menu translations have already been done. if exists("did_menu_trans") @@ -8,6 +8,8 @@ if exists("did_menu_trans") endif let did_menu_trans = 1 " }}} +let s:keepcpo= &cpo +set cpo&vim scriptencoding cp950 @@ -282,4 +284,7 @@ if has("toolbar") endif " }}} +let &cpo = s:keepcpo +unlet s:keepcpo + " vim:foldmethod=marker:nowrap:foldcolumn=2:foldlevel=1 diff --git a/runtime/lang/menu_cs_cz.iso_8859-2.vim b/runtime/lang/menu_cs_cz.iso_8859-2.vim index a5bc82e967..88cf7e2528 100644 --- a/runtime/lang/menu_cs_cz.iso_8859-2.vim +++ b/runtime/lang/menu_cs_cz.iso_8859-2.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding ISO-8859-2 @@ -262,3 +264,6 @@ if has("toolbar") endfun endif " }}} + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_czech_czech_republic.1250.vim b/runtime/lang/menu_czech_czech_republic.1250.vim index 4f21e89210..ebaab9b679 100644 --- a/runtime/lang/menu_czech_czech_republic.1250.vim +++ b/runtime/lang/menu_czech_czech_republic.1250.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding cp1250 @@ -262,3 +264,6 @@ if has("toolbar") endfun endif " }}} + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_czech_czech_republic.ascii.vim b/runtime/lang/menu_czech_czech_republic.ascii.vim index f2faec90de..7ac8c34e04 100644 --- a/runtime/lang/menu_czech_czech_republic.ascii.vim +++ b/runtime/lang/menu_czech_czech_republic.ascii.vim @@ -9,8 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 - - +let s:keepcpo= &cpo +set cpo&vim " {{{ File menu menutrans &File &Soubor @@ -262,3 +262,6 @@ if has("toolbar") endfun endif " }}} + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_de_de.latin1.vim b/runtime/lang/menu_de_de.latin1.vim index 6bfc072484..70feb74d23 100644 --- a/runtime/lang/menu_de_de.latin1.vim +++ b/runtime/lang/menu_de_de.latin1.vim @@ -10,6 +10,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " The translations below are in latin1, but they work for cp1252 and " iso-8859-15 without conversion as well. @@ -302,3 +304,6 @@ let g:menutrans_tags_dialog = "Geben Sie die Namen der 'tag'-Dateien ein.\nTrenn let g:menutrans_textwidth_dialog = "Geben Sie eine neue Text-Breite ein (oder 0, um die Formatierung abzuschalten)" let g:menutrans_fileformat_dialog = "Wählen Sie ein Datei-Format aus" " }}} + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_eo.utf-8.vim b/runtime/lang/menu_eo.utf-8.vim index 761ae0b81a..7e363f904e 100644 --- a/runtime/lang/menu_eo.utf-8.vim +++ b/runtime/lang/menu_eo.utf-8.vim @@ -1,12 +1,14 @@ " Menu Translations: Esperanto " Maintainer: Dominique PELLE <dominique.pelle@free.fr> -" Last Change: 2008 Mar 01 +" Last Change: 2012 May 01 " " Quit when menu translations have already been done. if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding utf-8 @@ -455,3 +457,6 @@ menutrans &Off M&alÅaltita menutrans Co&lor\ test Testo\ de\ &koloroj menutrans &Highlight\ test Testo\ de\ &emfazo menutrans &Convert\ to\ HTML Konverti\ al\ &HTML + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_es_es.latin1.vim b/runtime/lang/menu_es_es.latin1.vim index b943e230ad..97f38a765d 100644 --- a/runtime/lang/menu_es_es.latin1.vim +++ b/runtime/lang/menu_es_es.latin1.vim @@ -2,7 +2,7 @@ " Previous translator: Alejandro López-Valencia <dradul@users.sourceforge.net> " Last translator: Omar Campagne Polaino <ocampagne@gmail.com> " Version: 7.2.245 -" Last Change: 2009 Sep 03 +" Last Change: 2012 May 01 " " Quit when menu translations have already been done. @@ -10,6 +10,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " The translations below are in latin1, but they work for cp1252, " iso-8859-15 without conversion as well. @@ -316,3 +318,6 @@ menutrans &Convert\ to\ HTML &Convertir\ a\ HTML " Find Help dialog text let g:menutrans_help_dialog = "Introduzca un nombre de comando o palabra para obtener ayuda;\n\nAnteponga i_ para comandos de entrada (e.g.: i_CTRL-X)\nAnteponga c_ para comandos de la línea de comandos (e.g.: c_<Del>)\nAnteponga ` para un nombre de opción (e.g.: `shiftwidth`)" + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_fi_fi.latin1.vim b/runtime/lang/menu_fi_fi.latin1.vim index 1f1f5072c3..6a2c1e9053 100644 --- a/runtime/lang/menu_fi_fi.latin1.vim +++ b/runtime/lang/menu_fi_fi.latin1.vim @@ -1,12 +1,14 @@ " Menu Translations: Finnish " Maintainer: Flammie Pirinen <flammie@iki.fi> -" Last Change: 2007 Sep 04 +" Last Change: 2012 May 01 " Quit when menu translations have already been done. if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " Translations should be in latin1, if it requires latin9 or even unicode, " change this: @@ -470,4 +472,7 @@ fun! Do_toolbar_tmenu() tmenu ToolBar.FindHelp Etsi ohjeesta endfun +let &cpo = s:keepcpo +unlet s:keepcpo + " vim: set fileencoding=latin1 diff --git a/runtime/lang/menu_fr_fr.latin1.vim b/runtime/lang/menu_fr_fr.latin1.vim index e8881bd693..c4b63c7833 100644 --- a/runtime/lang/menu_fr_fr.latin1.vim +++ b/runtime/lang/menu_fr_fr.latin1.vim @@ -2,13 +2,15 @@ " Maintainer: Adrien Beau <version.francaise@free.fr> " First Version: Francois Thunus <thunus@systran.fr> " Last Modification: David Blanchet <david.blanchet@free.fr> -" Last Change: 2006 Apr 30 +" Last Change: 2012 May 01 " Quit when menu translations have already been done. if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim " The translations below are in latin1, but they work for cp1252 and " iso-8859-15 without conversion as well. @@ -466,3 +468,6 @@ menutrans &Off &Off menutrans Co&lor\ test Tester\ les\ co&uleurs menutrans &Highlight\ test Tester\ les\ g&roupes\ de\ surbrillance menutrans &Convert\ to\ HTML Con&vertir\ en\ HTML + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_hu_hu.iso_8859-2.vim b/runtime/lang/menu_hu_hu.iso_8859-2.vim index d3fafce103..c7821d2b32 100644 --- a/runtime/lang/menu_hu_hu.iso_8859-2.vim +++ b/runtime/lang/menu_hu_hu.iso_8859-2.vim @@ -1,7 +1,7 @@ " Menu Translations: Hungarian (Magyar) " Original Translation: Zoltán Árpádffy " Maintained By: Kontra Gergely <kgergely@mcl.hu> -" Last Change: 2003 May 31 +" Last Change: 2012 May 01 " I'm working on defining (unaccented) hotkeys for everything. " I want to remove y and z hotkeys, because on the hungarian keymap they're at " a differrent place. @@ -27,6 +27,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding iso-8859-2 @@ -256,3 +258,6 @@ let g:menutrans_path_dialog = "Írd be a keresett fájl lehetséges elérési útjait, let g:menutrans_tags_dialog = "Írd be a tag fájl lehetséges elérési útjait, vesszõvel elválasztva" let g:menutrans_textwidth_dialog = "Írd be a szöveg szélességét (0 = formázás kikapcsolva)" let g:menutrans_fileformat_dialog = "Válaszd ki a fájl formátumát" + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_hu_hu.utf-8.vim b/runtime/lang/menu_hu_hu.utf-8.vim index 83a4dca40a..f3adf91882 100644 --- a/runtime/lang/menu_hu_hu.utf-8.vim +++ b/runtime/lang/menu_hu_hu.utf-8.vim @@ -1,7 +1,7 @@ " Menu Translations: Hungarian (Magyar) " Original Translation: Zoltán Ãrpádffy " Maintained By: Kontra Gergely <kgergely@mcl.hu> -" Last Change: 2004 Jun 10 +" Last Change: 2012 May 01 " " This file was converted from menu_hu_hu.iso_8859-2.vim. See there for " remarks. @@ -11,6 +11,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding utf-8 @@ -240,3 +242,6 @@ let g:menutrans_path_dialog = "Ãrd be a keresett fájl lehetséges elérési ú let g:menutrans_tags_dialog = "Ãrd be a tag fájl lehetséges elérési útjait, vesszÅ‘vel elválasztva" let g:menutrans_textwidth_dialog = "Ãrd be a szöveg szélességét (0 = formázás kikapcsolva)" let g:menutrans_fileformat_dialog = "Válaszd ki a fájl formátumát" + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_it_it.latin1.vim b/runtime/lang/menu_it_it.latin1.vim index 5a87bf00b2..092136bf0b 100644 --- a/runtime/lang/menu_it_it.latin1.vim +++ b/runtime/lang/menu_it_it.latin1.vim @@ -2,13 +2,15 @@ " Maintainer: Antonio Colombo <azc100@gmail.com> " Vlad Sandrini <vlad.gently@gmail.com> " Luciano Montanaro <mikelima@cirulla.net> -" Last Change: 2010 Ago 13 +" Last Change: 2012 May 01 " Quit when menu translations have already been done. if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding iso-8859-1 @@ -348,4 +350,7 @@ endif endfun endif +let &cpo = s:keepcpo +unlet s:keepcpo + " vim: set sw=2 : diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim index 16b7eee11b..fcc49d6920 100644 --- a/runtime/lang/menu_ja_jp.euc-jp.vim +++ b/runtime/lang/menu_ja_jp.euc-jp.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding euc-jp @@ -334,7 +336,8 @@ if has('iconv') an 10.396.120.130 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR> endif +let &cpo = s:keepcpo +unlet s:keepcpo + " filler to avoid the line above being recognized as a modeline " filler -" filler -" filler diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim index d54dfd51a1..dc52872649 100644 --- a/runtime/lang/menu_ja_jp.utf-8.vim +++ b/runtime/lang/menu_ja_jp.utf-8.vim @@ -9,6 +9,8 @@ if exists("did_menu_trans") finish endif let did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim scriptencoding utf-8 @@ -334,7 +336,8 @@ if has('iconv') an 10.396. |