From 4317e4c19d98a0f976b0aa5c06842efd711a4eb1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 17 May 2010 20:40:34 +0200 Subject: [PATCH] vim: compress the patch with gzip. --- srcpkgs/vim/patches/vim-7.2-fixes-5.patch | 30013 ---------------- srcpkgs/vim/patches/vim-7.2-fixes-5.patch.gz | Bin 0 -> 226431 bytes ...tch.args => vim-7.2-fixes-5.patch.gz.args} | 0 3 files changed, 30013 deletions(-) delete mode 100644 srcpkgs/vim/patches/vim-7.2-fixes-5.patch create mode 100644 srcpkgs/vim/patches/vim-7.2-fixes-5.patch.gz rename srcpkgs/vim/patches/{vim-7.2-fixes-5.patch.args => vim-7.2-fixes-5.patch.gz.args} (100%) diff --git a/srcpkgs/vim/patches/vim-7.2-fixes-5.patch b/srcpkgs/vim/patches/vim-7.2-fixes-5.patch deleted file mode 100644 index 2e8142c188..0000000000 --- a/srcpkgs/vim/patches/vim-7.2-fixes-5.patch +++ /dev/null @@ -1,30013 +0,0 @@ -Submitted By: Matt Burgess -Date: 2009-07-22 -Initial Package Version: 7.2 -Upstream Status: Already in upstream patch repo -Origin: Upstream -Description: This patch contains upstream patch numbers 1 thru 239. - -diff -Naur vim72.orig/Filelist vim72/Filelist ---- vim72.orig/Filelist 2008-07-06 19:02:23.000000000 +0100 -+++ vim72/Filelist 2009-07-22 22:54:22.000000000 +0100 -@@ -285,6 +285,7 @@ - src/proto/os_win32.pro \ - src/proto/os_mswin.pro \ - src/testdir/Make_dos.mak \ -+ src/testdir/Make_ming.mak \ - src/testdir/dos.vim \ - src/uninstal.c \ - src/vim.def \ -@@ -682,9 +683,7 @@ - runtime/spell/??/main.aap \ - runtime/spell/yi/README.txt \ - runtime/spell/main.aap \ -- runtime/spell/cleanadd.vim \ - runtime/spell/*.vim \ -- runtime/spell/fixdup \ - - # generic language files, binary - LANG_GEN_BIN = \ -diff -Naur vim72.orig/runtime/doc/autocmd.txt vim72/runtime/doc/autocmd.txt ---- vim72.orig/runtime/doc/autocmd.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/autocmd.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -335,6 +335,8 @@ - NOTE: When this autocommand is executed, the - current buffer "%" may be different from the - buffer being deleted "" and "". -+ Don't change to another buffer, it will cause -+ problems. - *BufEnter* - BufEnter After entering a buffer. Useful for setting - options for a file type. Also executed when -@@ -397,6 +399,8 @@ - NOTE: When this autocommand is executed, the - current buffer "%" may be different from the - buffer being unloaded "". -+ Don't change to another buffer, it will cause -+ problems. - *BufWinEnter* - BufWinEnter After a buffer is displayed in a window. This - can be when the buffer is loaded (after -@@ -428,6 +432,8 @@ - NOTE: When this autocommand is executed, the - current buffer "%" may be different from the - buffer being deleted "". -+ Don't change to another buffer, it will cause -+ problems. - *BufWrite* *BufWritePre* - BufWrite or BufWritePre Before writing the whole buffer to a file. - *BufWriteCmd* -@@ -748,8 +754,10 @@ - 'a' abort, like hitting CTRL-C - When set to an empty string the user will be - asked, as if there was no SwapExists autocmd. -- Note: Do not try to change the buffer, the -- results are unpredictable. -+ *E812* -+ It is not allowed to change to another buffer, -+ change a buffer name or change directory -+ here. - *Syntax* - Syntax When the 'syntax' option has been set. The - pattern is matched against the syntax name. -diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt ---- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/cmdline.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -1,4 +1,4 @@ --*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 -+*cmdline.txt* For Vim version 7.2. Last change: 2008 Sep 18 - - - VIM REFERENCE MANUAL by Bram Moolenaar -@@ -157,6 +157,11 @@ - (doesn't work at the expression prompt; some - things such as changing the buffer or current - window are not allowed to avoid side effects) -+ When the result is a |List| the items are used -+ as lines. They can have line breaks inside -+ too. -+ When the result is a Float it's automatically -+ converted to a String. - See |registers| about registers. {not in Vi} - Implementation detail: When using the |expression| register - and invoking setcmdpos(), this sets the position before -@@ -436,13 +441,20 @@ - those files with an extension that is in the 'suffixes' option are ignored. - The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending - in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored. --It is impossible to ignore suffixes with two dots. Examples: -+ -+An empty entry, two consecutive commas, match a file name that does not -+contain a ".", thus has no suffix. This is useful to ignore "prog" and prefer -+"prog.c". -+ -+Examples: - - pattern: files: match: ~ - test* test.c test.h test.o test.c - test* test.h test.o test.h and test.o - test* test.i test.h test.c test.i and test.c - -+It is impossible to ignore suffixes with two dots. -+ - If there is more than one matching file (after ignoring the ones matching - the 'suffixes' option) the first file name is inserted. You can see that - there is only one match when you type 'wildchar' twice and the completed -@@ -730,19 +742,29 @@ - In Ex commands, at places where a file name can be used, the following - characters have a special meaning. These can also be used in the expression - function expand() |expand()|. -- % is replaced with the current file name *:_%* -- # is replaced with the alternate file name *:_#* -+ % Is replaced with the current file name. *:_%* *c_%* -+ # Is replaced with the alternate file name. *:_#* *c_#* - #n (where n is a number) is replaced with the file name of -- buffer n. "#0" is the same as "#" -- ## is replaced with all names in the argument list *:_##* -+ buffer n. "#0" is the same as "#". -+ ## Is replaced with all names in the argument list *:_##* *c_##* - concatenated, separated by spaces. Each space in a name - is preceded with a backslash. --Note that these give the file name as it was typed. If an absolute path is --needed (when using the file name from a different directory), you need to add --":p". See |filename-modifiers|. -+ # 0) is replaced with old *:_#<* *c_#<* -+ file name n. See |:oldfiles| or |v:oldfiles| to get the -+ number. *E809* -+ {only when compiled with the +eval and +viminfo features} -+ -+Note that these, except "# -+commands. For those you probably have to use quotes (this fails for files -+that contain a quote and wildcards): > - :!ls "%" - :r !spell "%" - -diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt ---- vim72.orig/runtime/doc/eval.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/eval.txt 2009-07-22 22:54:21.000000000 +0100 -@@ -1,4 +1,4 @@ --*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 -+*eval.txt* For Vim version 7.2. Last change: 2008 Nov 27 - - - VIM REFERENCE MANUAL by Bram Moolenaar -@@ -1484,6 +1484,17 @@ - This is the screen column number, like with |virtcol()|. The - value is zero when there was no mouse button click. - -+ *v:oldfiles* *oldfiles-variable* -+v:oldfiles List of file names that is loaded from the |viminfo| file on -+ startup. These are the files that Vim remembers marks for. -+ The length of the List is limited by the ' argument of the -+ 'viminfo' option (default is 100). -+ Also see |:oldfiles| and |c_#<|. -+ The List can be modified, but this has no effect on what is -+ stored in the |viminfo| file later. If you use values other -+ than String this will cause trouble. -+ {only when compiled with the +viminfo feature} -+ - *v:operator* *operator-variable* - v:operator The last operator given in Normal mode. This is a single - character except for commands starting with or , -@@ -1695,7 +1706,7 @@ - exists( {expr}) Number TRUE if {expr} exists - extend({expr1}, {expr2} [, {expr3}]) - List/Dict insert items of {expr2} into {expr1} --expand( {expr}) String expand special keywords in {expr} -+expand( {expr} [, {flag}]) String expand special keywords in {expr} - feedkeys( {string} [, {mode}]) Number add key sequence to typeahead buffer - filereadable( {file}) Number TRUE if {file} is a readable file - filewritable( {file}) Number TRUE if {file} is a writable file -@@ -1747,8 +1758,9 @@ - getwinposx() Number X coord in pixels of GUI Vim window - getwinposy() Number Y coord in pixels of GUI Vim window - getwinvar( {nr}, {varname}) any variable {varname} in window {nr} --glob( {expr}) String expand file wildcards in {expr} --globpath( {path}, {expr}) String do glob({expr}) for all dirs in {path} -+glob( {expr} [, {flag}]) String expand file wildcards in {expr} -+globpath( {path}, {expr} [, {flag}]) -+ String do glob({expr}) for all dirs in {path} - has( {feature}) Number TRUE if feature {feature} supported - has_key( {dict}, {key}) Number TRUE if {dict} has entry {key} - haslocaldir() Number TRUE if current window executed |:lcd| -@@ -2402,6 +2414,7 @@ - When 'virtualedit' is used {off} specifies the offset in - screen columns from the start of the character. E.g., a - position within a or after the last character. -+ Returns 0 when the position could be set, -1 otherwise. - - - deepcopy({expr}[, {noref}]) *deepcopy()* *E698* -@@ -3275,14 +3288,16 @@ - :let list_is_on = getwinvar(2, '&list') - :echo "myvar = " . getwinvar(1, 'myvar') - < -- *glob()* --glob({expr}) Expand the file wildcards in {expr}. See |wildcards| for the -+glob({expr} [, {flag}]) *glob()* -+ Expand the file wildcards in {expr}. See |wildcards| for the - use of special characters. - The result is a String. - When there are several matches, they are separated by - characters. -- The 'wildignore' option applies: Names matching one of the -- patterns in 'wildignore' will be skipped. -+ Unless the optional {flag} argument is given and is non-zero, -+ the 'suffixes' and 'wildignore' options apply: Names matching -+ one of the patterns in 'wildignore' will be skipped and -+ 'suffixes' affect the ordering of matches. - If the expansion fails, the result is an empty string. - A name for a non-existing file is not included. - -@@ -3296,20 +3311,22 @@ - See |expand()| for expanding special Vim variables. See - |system()| for getting the raw output of an external command. - --globpath({path}, {expr}) *globpath()* -+globpath({path}, {expr} [, {flag}]) *globpath()* - Perform glob() on all directories in {path} and concatenate - the results. Example: > - :echo globpath(&rtp, "syntax/c.vim") - < {path} is a comma-separated list of directory names. Each - directory name is prepended to {expr} and expanded like with -- glob(). A path separator is inserted when needed. -+ |glob()|. A path separator is inserted when needed. - To add a comma inside a directory name escape it with a - backslash. Note that on MS-Windows a directory may have a - trailing backslash, remove it if you put a comma after it. - If the expansion fails for one of the directories, there is no - error message. -- The 'wildignore' option applies: Names matching one of the -- patterns in 'wildignore' will be skipped. -+ Unless the optional {flag} argument is given and is non-zero, -+ the 'suffixes' and 'wildignore' options apply: Names matching -+ one of the patterns in 'wildignore' will be skipped and -+ 'suffixes' affect the ordering of matches. - - The "**" item can be used to search in a directory tree. - For example, to find all "README.txt" files in the directories -@@ -4500,6 +4517,7 @@ - should also work to move files across file systems. The - result is a Number, which is 0 if the file was renamed - successfully, and non-zero when the renaming failed. -+ NOTE: If {to} exists it is overwritten without warning. - This function is not available in the |sandbox|. - - repeat({expr}, {count}) *repeat()* -@@ -5332,10 +5350,12 @@ - "fg" foreground color (GUI: color name used to set - the color, cterm: color number as a string, - term: empty string) -- "bg" background color (like "fg") -+ "bg" background color (as with "fg") -+ "sp" special color (as with "fg") |highlight-guisp| - "fg#" like "fg", but for the GUI and the GUI is - running the name in "#RRGGBB" form - "bg#" like "fg#" for "bg" -+ "sp#" like "fg#" for "sp" - "bold" "1" if bold - "italic" "1" if italic - "reverse" "1" if reverse -@@ -5823,7 +5843,8 @@ - mouse_pterm Compiled with support for qnx pterm mouse. - mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse) - mouse_xterm Compiled with support for xterm mouse. --multi_byte Compiled with support for editing Korean et al. -+multi_byte Compiled with support for 'encoding' -+multi_byte_encoding 'encoding' is set to a multi-byte encoding. - multi_byte_ime Compiled with support for IME input method. - multi_lang Compiled with support for multiple languages. - mzscheme Compiled with MzScheme interface |mzscheme|. -diff -Naur vim72.orig/runtime/doc/if_cscop.txt vim72/runtime/doc/if_cscop.txt ---- vim72.orig/runtime/doc/if_cscop.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/if_cscop.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -1,4 +1,4 @@ --*if_cscop.txt* For Vim version 7.2. Last change: 2005 Mar 29 -+*if_cscop.txt* For Vim version 7.2. Last change: 2009 Mar 18 - - - VIM REFERENCE MANUAL by Andy Kahn -@@ -131,11 +131,22 @@ - 7 or f: Find this file - 8 or i: Find files #including this file - -+ For all types, except 4 and 6, leading white space for {name} is -+ removed. For 4 and 6 there is exactly one space between {querytype} -+ and {name}. Further white space is included in {name}. -+ - EXAMPLES > - :cscope find c vim_free -- :cscope find 3 vim_free -+ :cscope find 3 vim_free -+< -+ These two examples perform the same query: functions calling -+ "vim_free". > -+ -+ :cscope find t initOnce -+ :cscope find t initOnce - < -- These two examples perform the same query. > -+ The first one searches for the text "initOnce", the second one for -+ " initOnce". > - - :cscope find 0 DEFAULT_TERM - < -@@ -344,13 +355,8 @@ - The DJGPP-built version from http://cscope.sourceforge.net is known to not - work with Vim. - --There are a couple of hard-coded limitations: -- -- 1. The maximum number of cscope connections allowed is 8. Do you -- really need more? -- -- 2. Doing a |:tjump| when |:cstag| searches the tag files is not -- configurable (e.g., you can't do a tselect instead). -+Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files -+is not configurable (e.g., you can't do a tselect instead). - - ============================================================================== - 6. Suggested usage *cscope-suggestions* -diff -Naur vim72.orig/runtime/doc/if_mzsch.txt vim72/runtime/doc/if_mzsch.txt ---- vim72.orig/runtime/doc/if_mzsch.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/if_mzsch.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -1,4 +1,4 @@ --*if_mzsch.txt* For Vim version 7.2. Last change: 2008 Jun 28 -+*if_mzsch.txt* For Vim version 7.2. Last change: 2009 Jun 24 - - - VIM REFERENCE MANUAL by Sergey Khorev -@@ -42,10 +42,6 @@ - - *:mzfile* *:mzf* - :[range]mzf[ile] {file} Execute the MzScheme script in {file}. {not in Vi} -- All statements are executed in the namespace of the -- buffer that was current during :mzfile start. -- If you want to access other namespaces, use -- 'parameterize'. - - All of these commands do essentially the same thing - they execute a piece of - MzScheme code, with the "current range" set to the given line -@@ -54,8 +50,6 @@ - In the case of :mzscheme, the code to execute is in the command-line. - In the case of :mzfile, the code to execute is the contents of the given file. - --Each buffer has its own MzScheme namespace. Global namespace is bound to --the "global-namespace" value from the 'vimext' module. - MzScheme interface defines exception exn:vim, derived from exn. - It is raised for various Vim errors. - -@@ -79,40 +73,8 @@ - e.g.: > - :mzscheme (require (prefix vim- vimext)) - < --All the examples below assume this naming scheme. Note that you need to do --this again for every buffer. -+All the examples below assume this naming scheme. - --The auto-instantiation can be achieved with autocommands, e.g. you can put --something like this in your .vimrc (EOFs should not have indentation): > -- function s:MzRequire() -- if has("mzscheme") -- :mz << EOF -- (require (prefix vim- vimext)) -- (let ((buf (vim-get-buff-by-name (vim-eval "expand(\"\")")))) -- (when (and buf (not (eq? buf (vim-curr-buff)))) -- (parameterize ((current-namespace (vim-get-buff-namespace buf))) -- (namespace-attach-module vim-global-namespace 'vimext) -- (namespace-require '(prefix vim vimext))))) -- EOF -- endif -- endfunction -- -- function s:MzStartup() -- if has("mzscheme") -- au BufNew,BufNewFile,BufAdd,BufReadPre * :call s:MzRequire() -- :mz << EOF -- (current-library-collection-paths -- (cons -- (build-path (find-system-path 'addon-dir) (version) "collects") -- (current-library-collection-paths))) -- EOF -- endif -- endfunction -- -- call s:MzStartup() --< -- --The global namespace just instantiated this module with the prefix "vimext:". - *mzscheme-sandbox* - When executed in the |sandbox|, access to some filesystem and Vim interface - procedures is restricted. -@@ -121,15 +83,20 @@ - 2. Examples *mzscheme-examples* - > - :mzscheme (display "Hello") -+ :mz (display (string-append "Using MzScheme version " (version))) -+ :mzscheme (require (prefix vim- vimext)) ; for MzScheme < 4.x -+ :mzscheme (require (prefix-in vim- 'vimext)) ; MzScheme 4.x - :mzscheme (vim-set-buff-line 10 "This is line #10") - < - Inline script usage: > - function! SetFirstLine() - :mz << EOF - (display "!!!") -+ (require (prefix vim- vimext)) -+ ; for newer versions (require (prefix-in vim- 'vimext)) - (vim-set-buff-line 1 "This is line #1") - (vim-beep) -- EOF -+ EOF - endfunction - - nmap :call SetFirstLine() -@@ -137,17 +104,33 @@ - File execution: > - :mzfile supascript.scm - < --Accessing the current buffer namespace from an MzScheme program running in --another buffer within |:mzfile|-executed script : > -- ; Move to the window below -- (vim-command "wincmd j") -- ; execute in the context of buffer, to which window belongs -- ; assume that buffer has 'textstring' defined -- (parameterize ((current-namespace -- (vim-get-buff-namespace (vim-curr-buff)))) -- (eval '(vim-set-buff-line 1 textstring))) --< -+Vim exception handling: > -+ :mz << EOF -+ (require (prefix vim- vimext)) -+ ; for newer versions (require (prefix-in vim- 'vimext)) -+ (with-handlers -+ ([exn:vim? (lambda (e) (display (exn-message e)))]) -+ (vim-eval "nonsense-string")) -+ EOF -+< -+Auto-instantiation of vimext module (can be placed in your |vimrc|): > -+ function! MzRequire() -+ :redir => l:mzversion -+ :mz (version) -+ :redir END -+ if strpart(l:mzversion, 1, 1) < "4" -+ " MzScheme versions < 4.x: -+ :mz (require (prefix vim- vimext)) -+ else -+ " newer versions: -+ :mz (require (prefix-in vim- 'vimext)) -+ endif -+ endfunction - -+ if has("mzscheme") -+ silent call MzRequire() -+ endif -+< - ============================================================================== - 3. Threads *mzscheme-threads* - -@@ -168,11 +151,11 @@ - Common - ------ - (command {command-string}) Perform the vim ":Ex" style command. -- (eval {expr-string}) Evaluate the vim expression to a string. -- A |List| is turned into a string by -- joining the items and inserting line -- breaks. -- NOTE clashes with MzScheme eval -+ (eval {expr-string}) Evaluate the vim expression into -+ respective MzScheme object: |Lists| are -+ represented as Scheme lists, -+ |Dictionaries| as hash tables. -+ NOTE the name clashes with MzScheme eval - (range-start) Start/End of the range passed with - (range-end) the Scheme command. - (beep) beep -@@ -186,7 +169,6 @@ - be set. The symbol 'global can be passed - as {buffer-or-window}. Then |:setglobal| - will be used. -- global-namespace The MzScheme main namespace. - - Buffers *mzscheme-buffer* - ------- -@@ -228,7 +210,6 @@ - if there is no such buffer. - (get-buff-by-num {buffernum}) Get a buffer by its number (return #f if - there is no buffer with this number). -- (get-buff-namespace [buffer]) Get buffer namespace. - - Windows *mzscheme-window* - ------ -@@ -250,7 +231,7 @@ - (set-cursor (line . col) [window]) Set cursor position. - - ============================================================================== --5. Dynamic loading *mzscheme-dynamic* -+5. Dynamic loading *mzscheme-dynamic* *E815* - - On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version| - output then includes |+mzscheme/dyn|. -diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt ---- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/netbeans.txt 2009-07-22 22:54:19.000000000 +0100 -@@ -1,4 +1,4 @@ --*netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 -+*netbeans.txt* For Vim version 7.2. Last change: 2009 Jan 06 - - - VIM REFERENCE MANUAL by Gordon Prieur et al. -@@ -722,8 +722,10 @@ - of the cursor. - New in version 2.1. - --killed A file was closed by the user. Only for files that have been -- assigned a number by the IDE. -+killed A file was deleted or wiped out by the user and the buffer -+ annotations have been removed. The bufID number for this -+ buffer has become invalid. Only for files that have been -+ assigned a bufID number by the IDE. - - newDotAndMark off off - Reports the position of the cursor being at "off" bytes into -diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt ---- vim72.orig/runtime/doc/options.txt 2008-08-09 15:22:59.000000000 +0100 -+++ vim72/runtime/doc/options.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -1,4 +1,4 @@ --*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 -+*options.txt* For Vim version 7.2. Last change: 2008 Nov 25 - - - VIM REFERENCE MANUAL by Bram Moolenaar -@@ -1443,6 +1443,14 @@ - autoselectml Like "autoselect", but for the modeless selection - only. Compare to the 'A' flag in 'guioptions'. - -+ html When the clipboard contains HTML, use this when -+ pasting. When putting text on the clipboard, mark it -+ as HTML. This works to copy rendered HTML from -+ Firefox, paste it as raw HTML in Vim, select the HTML -+ in Vim and paste it in a rich edit box in Firefox. -+ Only supported for GTK version 2 and later. -+ Only available with the |+multi_byte| feature. -+ - exclude:{pattern} - Defines a pattern that is matched against the name of - the terminal 'term'. If there is a match, no -@@ -4175,9 +4183,6 @@ - be able to execute Normal mode commands. - This is the opposite of the 'keymap' option, where characters are - mapped in Insert mode. -- This only works for 8-bit characters. The value of 'langmap' may be -- specified with multi-byte characters (e.g., UTF-8), but only the lower -- 8 bits of each character will be used. - - Example (for Greek, in UTF-8): *greek* > - :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz -@@ -7472,7 +7477,9 @@ - {not available when compiled without the |+wildignore| - feature} - A list of file patterns. A file that matches with one of these -- patterns is ignored when completing file or directory names. -+ patterns is ignored when completing file or directory names, and -+ influences the result of |expand()|, |glob()| and |globpath()| unless -+ a flag is passed to disable this. - The pattern is used like with |:autocmd|, see |autocmd-patterns|. - Also see 'suffixes'. - Example: > -diff -Naur vim72.orig/runtime/doc/os_vms.txt vim72/runtime/doc/os_vms.txt ---- vim72.orig/runtime/doc/os_vms.txt 2008-08-09 15:23:00.000000000 +0100 -+++ vim72/runtime/doc/os_vms.txt 2009-07-22 22:54:16.000000000 +0100 -@@ -1,4 +1,4 @@ --*os_vms.txt* For Vim version 7.2. Last change: 2006 Nov 18 -+*os_vms.txt* For Vim version 7.2. Last change: 2008 Aug 19 - - - VIM REFERENCE MANUAL -@@ -312,7 +312,7 @@ - - 8. Useful notes *vms-notes* - --8.1 backspace/delete -+8.1 Backspace/delete - 8.2 Filters - 8.3 VMS file version numbers - 8.4 Directory conversion -@@ -326,8 +326,10 @@ - 8.12 diff-mode - 8.13 Allow '$' in C keywords - 8.14 VIMTUTOR for beginners -+8.15 Slow start in console mode issue -+8.16 Common VIM directory - different architectures - --8.1 backspace/delete -+8.1 Backspace/delete - - There are backspace/delete key inconsistencies with VMS. - :fixdel doesn't do the trick, but the solution is: > -@@ -663,12 +665,130 @@ - - (Thomas.R.Wyant III, Vim 6.1) - -+8.14 Slow start in console mode issue -+ -+As GUI/GTK Vim works equally well in console mode, many administartors -+deploy those executables system wide. -+Unfortunately, on a remote slow connections GUI/GTK executables behave rather -+slow when user wants to run Vim just in the console mode - because of X environment detection timeout. -+ -+Luckily, there is a simple solution for that. Administrators need to deploy -+both GUI/GTK build and just console build executables, like below: > -+ -+ |- vim72 -+ |----- doc -+ |----- syntax -+ vimrc (system rc files) -+ gvimrc -+ gvim.exe (the remaned GUI or GTK built vim.exe) -+ vim.exe (the console only executable) -+ -+Define system symbols like below in for ex in LOGIN.COM or SYLOGIN.COM: > -+ -+ $ define/nolog VIM RF10:[UTIL.VIM72] ! where you VIM directory is -+ $ vi*m :== mcr VIM:VIM.EXE -+ $ gvi*m :== mcr VIM:GVIM.EXE -+ $ ! or you can try to spawn with -+ $ gv*im :== spawn/nowait/input=NLA0 mcr VIM:GVIM.EXE -g -GEOMETRY 80x40 -+ -+ -+Like this, users that do not have X environment and want to use Vim just in -+console mode can avoid performance problems. -+ -+(Zoltan Arpadffy, Vim 7.2) -+ -+8.15 Common VIM directory - different architectures -+ -+In a cluster that contains nodes with different architectures like below: -+ -+$show cluster -+View of Cluster from system ID 11655 node: TOR 18-AUG-2008 11:58:31 -++---------------------------------+ -+ SYSTEMS MEMBERS -++-----------------------+--------- -+ NODE SOFTWARE STATUS -++--------+--------------+--------- -+ TOR VMS V7.3-2 MEMBER -+ TITAN2 VMS V8.3 MEMBER -+ ODIN VMS V7.3-2 MEMBER -++---------------------------------+ -+ -+It is convinient to have a common VIM directory but execute different -+executables. -+There are more solutions for this problem: -+ -+solution 1. all executables in the same directory with different names -+This is easily done with the following script that can be added -+to the login.com or sylogin.com: > -+ -+ $ if f$getsyi("NODE_HWTYPE") .eqs. "VAX" -+ $ then -+ $ say "VAX platform" -+ $ vi*m:== mcr vim:VIM.EXE_VAX -+ $ endif -+ $ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH" -+ $ then -+ $ say "ALPHA platform" -+ $ vi*m :== mcr vim:VIM.EXE_AXP -+ $ endif -+ $ if f$getsyi("ARCH_NAME") .eqs. "IA64" -+ $ then -+ $ say "IA64 platform" -+ $ vi*m :== mcr vim:VIM.EXE_IA64 -+ $ endif -+ -+solution 2. different directories: > -+ -+ $ if f$getsyi("NODE_HWTYPE") .eqs. "VAX" -+ $ then -+ $ say "VAX platform" -+ $ define/nolog VIM RF10:[UTIL.VAX_EXE] ! VAX executables -+ $ endif -+ $ if f$getsyi("NODE_HWTYPE") .eqs. "ALPH" -+ $ then -+ $ say "ALPHA platform" -+ $ define/nolog VIM RF10:[UTIL.AXP_EXE] ! AXP executables -+ $ endif -+ $ if f$getsyi("ARCH_NAME") .eqs. "IA64" -+ $ then -+ $ say "IA64 platform" -+ $ define/nolog VIM RF10:[UTIL.IA64_EXE] ! IA64 executables -+ $ endif -+ $! VIMRUNTIME must be defined in order to find runtime files -+ $ define/nolog VIMRUNTIME RF10:[UTIL.VIM72] -+ -+A good examle for this approach is the [GNU]gnu_tools.com script from GNU_TOOLS.ZIP -+package downloadable from http://www.polarhome.com/vim/ -+ -+(Zoltan Arpadffy, Vim 7.2) -+ - ============================================================================== - - 9. VMS related changes *vms-changes* - --Version 7 -+Recent changes -+- The following plugins are included into VMS runtime: -+ genutils 2.4, multiselect 2.2, multvals 3.1, selectbuf 4.3, -+ bufexplorer 7.1.7, taglist 4.5 -+- minor changes in vimrc (just in VMS runtime) -+- make_vms.mms - HUGE model is the default -+- [TESTDIR]make_vms.mms include as many tests possible -+- modify test30 and test54 for VMS -+- enable FLOAT feature in VMS port -+- os_vms.txt updated -+ -+Version 7.2 (2008 Aug 9) -+- VCF files write corrected -+- CTAGS 5.7 included -+- corrected make_vms.mms (on VAX gave syntax error) -+ -+Version 7.1 (2007 Jun 15) -+- create TAGS file from menu -+ -+Version 7 (2006 May 8) - - Improved low level char input (affects just console mode) -+- Fixed plugin bug -+- CTAGS 5.6 included - - Version 6.4 (2005 Oct 15) - - GTKLIB and Vim build on IA64 -@@ -806,6 +926,7 @@ - - OpenVMS documentation and executables are maintained by: - Zoltan Arpadffy -+OpenVMS Vim page: http://www.polarhome.com/vim/ - - This document uses parts and remarks from earlier authors and contributors - of OS_VMS.TXT: -diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt ---- vim72.orig/runtime/doc/spell.txt 2008-08-09 15:23:00.000000000 +0100 -+++ vim72/runtime/doc/spell.txt 2009-07-22 22:54:18.000000000 +0100 -@@ -1,4 +1,4 @@ --*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21 -+*spell.txt* For Vim version 7.2. Last change: 2008 Nov 30 - - - VIM REFERENCE MANUAL by Bram Moolenaar -@@ -831,8 +831,11 @@ - - # comment line ~ - --With some items it's also possible to put a comment after it, but this isn't --supported in general. -+Items with a fixed number of arguments can be followed by a comment. But only -+if none of the arguments can contain white space. The comment must start with -+a "#" character. Example: -+ -+ KEEPCASE = # fix case for words with this flag ~ - - - ENCODING *spell-SET* -@@ -965,6 +968,9 @@ - - Note: When using utf-8 only characters up to 65000 may be used for flags. - -+Note: even when using "num" or "long" the number of flags available to -+compounding and prefixes is limited to about 250. -+ - - AFFIXES - *spell-PFX* *spell-SFX* -@@ -1178,6 +1184,9 @@ - The flag also applies to the word with affixes, thus this can be used to mark - a whole bunch of related words as bad. - -+ *spell-FORBIDDENWORD* -+FORBIDDENWORD can be used just like BAD. For compatibility with Hunspell. -+ - *spell-NEEDAFFIX* - The NEEDAFFIX flag is used to require that a word is used with an affix. The - word itself is not a good word (unless there is an empty affix). Example: -@@ -1268,6 +1277,10 @@ - - NEEDCOMPOUND & ~ - -+ *spell-ONLYINCOMPOUND* -+The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND. Supported for -+compatiblity with Hunspell. -+ - *spell-COMPOUNDMIN* - The minimal character length of a word used for compounding is specified with - COMPOUNDMIN. Example: -@@ -1328,6 +1341,20 @@ - rules. Can also be used for an affix to count the affix as a compounding - word. - -+ *spell-CHECKCOMPOUNDPATTERN* -+CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the -+position where two words are compounded together forbids the compound. -+For example: -+ CHECKCOMPOUNDPATTERN o e ~ -+ -+This forbids compounding if the first word ends in "o" and the second word -+starts with "e". -+ -+The arguments must be plain text, no patterns are actually supported, despite -+the item name. Case is always ignored. -+ -+The Hunspell feature to use three arguments and flags is not supported. -+ - *spell-SYLLABLE* - The SYLLABLE item defines characters or character sequences that are used to - count the number of syllables in a word. Example: -@@ -1496,6 +1523,10 @@ - ACCENT (Hunspell) *spell-ACCENT* - Use MAP instead. |spell-MAP| - -+BREAK (Hunspell) *spell-BREAK* -+ Define break points. Unclear how it works exactly. -+ Not supported. -+ - CHECKCOMPOUNDCASE (Hunspell) *spell-CHECKCOMPOUNDCASE* - Disallow uppercase letters at compound word boundaries. - Not supported. -@@ -1512,9 +1543,6 @@ - Forbid three identical characters when compounding. Not - supported. - --CHECKCOMPOUNDPATTERN (Hunspell) *spell-CHECKCOMPOUNDPATTERN* -- Forbid compounding when patterns match. Not supported. -- - COMPLEXPREFIXES (Hunspell) *spell-COMPLEXPREFIXES* - Enables using two prefixes. Not supported. - -@@ -1536,13 +1564,18 @@ - COMPOUNDMIDDLE (Hunspell) *spell-COMPOUNDMIDDLE* - Use COMPOUNDRULE instead. |spell-COMPOUNDRULE| - -+COMPOUNDRULES (Hunspell) *spell-COMPOUNDRULES* -+ Number of COMPOUNDRULE lines following. Ignored, but the -+ argument must be a number. -+ - COMPOUNDSYLLABLE (Hunspell) *spell-COMPOUNDSYLLABLE* - Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE| - |spell-COMPOUNDSYLMAX| - --FORBIDDENWORD (Hunspell) *spell-FORBIDDENWORD* -- Use BAD instead. |spell-BAD| -- -+KEY (Hunspell) *spell-KEY* -+ Define characters that are close together on the keyboard. -+ Used to give better suggestions. Not supported. -+ - LANG (Hunspell) *spell-LANG* - This specifies language-specific behavior. This actually - moves part of the language knowledge into the program, -@@ -1553,10 +1586,7 @@ - Only needed for morphological analysis. - - MAXNGRAMSUGS (Hunspell) *spell-MAXNGRAMSUGS* -- Not supported. -- --ONLYINCOMPOUND (Hunspell) *spell-ONLYINCOMPOUND* -- Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND| -+ Set number of n-gram suggestions. Not supported. - - PSEUDOROOT (Hunspell) *spell-PSEUDOROOT* - Use NEEDAFFIX instead. |spell-NEEDAFFIX| -diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt ---- vim72.orig/runtime/doc/starting.txt 2008-08-09 15:23:00.000000000 +0100 -+++ vim72/runtime/doc/starting.txt 2009-07-22 22:54:17.000000000 +0100 -@@ -1,4 +1,4 @@ --*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21 -+*starting.txt* For Vim version 7.2. Last change: 2008 Nov 09 - - - VIM REFERENCE MANUAL by Bram Moolenaar -@@ -1337,8 +1337,9 @@ - *viminfo-read* - When Vim is started and the 'viminfo' option is non-empty, the contents of - the viminfo file are read and the info can be used in the appropriate places. --The marks are not read in at startup (but file marks are). See --|initialization| for how to set the 'viminfo' option upon startup. -+The |v:oldfiles| variable is filled. The marks are not read in at startup -+(but file marks are). See |initialization| for how to set the 'viminfo' -+option upon startup. - - *viminfo-write* - When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo -@@ -1372,6 +1373,8 @@ - that start with any string given with the "r" flag in 'viminfo'. This can be - used to avoid saving marks for files on removable media (for MS-DOS you would - use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:"). -+The |v:oldfiles| variable is filled with the file names that the viminfo file -+has marks for. - - *viminfo-file-marks* - Uppercase marks ('A to 'Z) are stored when writing the viminfo file. The -@@ -1463,8 +1466,8 @@ - *:rv* *:rviminfo* *E195* - :rv[iminfo][!] [file] Read from viminfo file [file] (default: see above). - If [!] is given, then any information that is -- already set (registers, marks, etc.) will be -- overwritten. {not in Vi} -+ already set (registers, marks, |v:oldfiles|, etc.) -+ will be overwritten {not in Vi} - - *:wv* *:wviminfo* *E137* *E138* *E574* - :wv[iminfo][!] [file] Write to viminfo file [file] (default: see above). -@@ -1479,4 +1482,20 @@ - the .viminfo file. - {not in Vi} - -+ *:ol* *:oldfiles* -+:ol[dfiles] List the files that have marks stored in the viminfo -+ file. This list is read on startup and only changes -+ afterwards with ":rviminfo!". Also see |v:oldfiles|. -+ The number can be used with |c_#<|. -+ {not in Vi, only when compiled with the +eval feature} -+ -+:bro[wse] ol[dfiles][!] -+ List file names as with |:oldfiles|, and then prompt -+ for a number. When the number is valid that file from -+ the list is edited. -+ If you get the |press-enter| prompt you can press "q" -+ and still get the prompt to enter a file number. -+ Use ! to abondon a modified buffer. |abandon| -+ {not when compiled with tiny or small features} -+ - vim:tw=78:ts=8:ft=help:norl: -diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt ---- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 15:23:01.000000000 +0100 -+++ vim72/runtime/doc/usr_21.txt 2009-07-22 22:54:17.000000000 +0100 -@@ -1,4 +1,4 @@ --*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01 -+*usr_21.txt* For Vim version 7.2. Last change: 2008 Nov 09 - - VIM USER MANUAL - by Bram Moolenaar - -@@ -153,7 +153,7 @@ - to be lost. Each item can be remembered only once. - - --GETTING BACK TO WHERE YOU WERE -+GETTING BACK TO WHERE YOU STOPPED VIM - - You are halfway editing a file and it's time to leave for holidays. You exit - Vim and go enjoy yourselves, forgetting all about your work. After a couple -@@ -168,6 +168,48 @@ - The |:marks| command is useful to find out where '0 to '9 will take you. - - -+GETTING BACK TO SOME FILE -+ -+If you want to go back to a file that you edited recently, but not when -+exiting Vim, there is a slightly more complicated way. You can see a list of -+files by typing the command: > -+ -+ :oldfiles -+< 1: ~/.viminfo ~ -+ 2: ~/text/resume.txt ~ -+ 3: /tmp/draft ~ -+ -+Now you would like to edit the second file, which is in the list preceded by -+"2:". You type: > -+ -+ :e #<2 -+ -+Instead of ":e" you can use any command that has a file name argument, the -+"#<2" item works in the same place as "%" (current file name) and "#" -+(alternate file name). So you can also split the window to edit the third -+file: > -+ -+ :split #<3 -+ -+That #<123 thing is a bit complicated when you just want to edit a file. -+Fortunately there is a simpler way: > -+ -+ :browse oldfiles -+< 1: ~/.viminfo ~ -+ 2: ~/text/resume.txt ~ -+ 3: /tmp/draft ~ -+ -- More -- -+ -+You get the same list of files as with |:oldfiles|. If you want to edit -+"resume.txt" first press "q" to stop the listing. You will get a prompt: -+ -+ Type number and (empty cancels): ~ -+ -+Type "2" and press to edit the second file. -+ -+More info at |:oldfiles|, |v:oldfiles| and |c_#<|. -+ -+ - MOVE INFO FROM ONE VIM TO ANOTHER - - You can use the ":wviminfo" and ":rviminfo" commands to save and restore the -diff -Naur vim72.orig/runtime/doc/various.txt vim72/runtime/doc/various.txt ---- vim72.orig/runtime/doc/various.txt 2008-08-09 15:23:01.000000000 +0100 -+++ vim72/runtime/doc/various.txt 2009-07-22 22:54:23.000000000 +0100 -@@ -508,6 +508,17 @@ - messages though. Use ":silent" in the command itself - to avoid that: ":silent menu .... :silent command". - -+ *:uns* *:unsilent* -+:uns[ilent] {command} Execute {command} not silently. Only makes a -+ difference when |:silent| was used to get to this -+ command. -+ Use this for giving a message even when |:silent| was -+ used. In this example |:silent| is used to avoid the -+ message about reading the file and |:unsilent| to be -+ able to list the first line of each file. > -+ :silent argdo unsilent echo expand('%') . ": " . getline(1) -+< -+ - *:verb* *:verbose* - :[count]verb[ose] {command} - Execute {command} with 'verbose' set to [count]. If -diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim ---- vim72.orig/runtime/scripts.vim 2008-08-08 23:27:21.000000000 +0100 -+++ vim72/runtime/scripts.vim 2009-07-22 22:54:16.000000000 +0100 -@@ -234,6 +234,10 @@ - elseif s:line1 =~ '\' -+ set ft=html -+ - " PDF - elseif s:line1 =~ '^%PDF-' - set ft=pdf -diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure ---- vim72.orig/src/auto/configure 2008-07-24 13:40:36.000000000 +0100 -+++ vim72/src/auto/configure 2009-07-22 22:54:24.000000000 +0100 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.62. -+# Generated by GNU Autoconf 2.63. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -@@ -635,138 +635,140 @@ - # include - #endif" - --ac_subst_vars='SHELL --PATH_SEPARATOR --PACKAGE_NAME --PACKAGE_TARNAME --PACKAGE_VERSION --PACKAGE_STRING --PACKAGE_BUGREPORT --exec_prefix --prefix --program_transform_name --bindir --sbindir --libexecdir --datarootdir --datadir --sysconfdir --sharedstatedir --localstatedir --includedir --oldincludedir --docdir --infodir --htmldir --dvidir --pdfdir --psdir --libdir --localedir --mandir --DEFS --ECHO_C --ECHO_N --ECHO_T --LIBS --build_alias --host_alias --target_alias --SET_MAKE --CC --CFLAGS --LDFLAGS --CPPFLAGS --ac_ct_CC --EXEEXT --OBJEXT --CPP --GREP --EGREP --AWK --STRIP --CPP_MM --OS_EXTRA_SRC --OS_EXTRA_OBJ --VIMNAME --EXNAME --VIEWNAME --line_break --dovimdiff --dogvimdiff --compiledby --vi_cv_path_mzscheme --MZSCHEME_SRC --MZSCHEME_OBJ --MZSCHEME_PRO --MZSCHEME_LIBS --MZSCHEME_CFLAGS --vi_cv_path_perl --vi_cv_perllib --shrpenv --PERL_SRC --PERL_OBJ --PERL_PRO --PERL_CFLAGS --PERL_LIBS --vi_cv_path_python --PYTHON_CONFDIR --PYTHON_LIBS --PYTHON_GETPATH_CFLAGS --PYTHON_CFLAGS --PYTHON_SRC --PYTHON_OBJ --vi_cv_path_tcl --TCL_SRC --TCL_OBJ --TCL_PRO --TCL_CFLAGS --TCL_LIBS --vi_cv_path_ruby --RUBY_SRC --RUBY_OBJ --RUBY_PRO --RUBY_CFLAGS --RUBY_LIBS --WORKSHOP_SRC --WORKSHOP_OBJ --NETBEANS_SRC --NETBEANS_OBJ --SNIFF_SRC --SNIFF_OBJ --xmkmfpath --XMKMF --X_CFLAGS --X_PRE_LIBS --X_LIBS --X_EXTRA_LIBS --X_LIB --GTK_CONFIG --GTK12_CONFIG --PKG_CONFIG --GTK_CFLAGS --GTK_LIBS --GTK_LIBNAME --GNOME_LIBS --GNOME_LIBDIR --GNOME_INCLUDEDIR --GNOME_CONFIG --MOTIF_LIBNAME --NARROW_PROTO --GUI_INC_LOC --GUI_LIB_LOC --GUITYPE --GUI_X_LIBS --HANGULIN_SRC --HANGULIN_OBJ --TAGPRG --INSTALL_LANGS --INSTALL_TOOL_LANGS --MSGFMT --MAKEMO --DEPEND_CFLAGS_FILTER -+ac_subst_vars='LTLIBOBJS - LIBOBJS --LTLIBOBJS' -+DEPEND_CFLAGS_FILTER -+MAKEMO -+MSGFMT -+INSTALL_TOOL_LANGS -+INSTALL_LANGS -+TAGPRG -+HANGULIN_OBJ -+HANGULIN_SRC -+GUI_X_LIBS -+GUITYPE -+GUI_LIB_LOC -+GUI_INC_LOC -+NARROW_PROTO -+MOTIF_LIBNAME -+GNOME_CONFIG -+GNOME_INCLUDEDIR -+GNOME_LIBDIR -+GNOME_LIBS -+GTK_LIBNAME -+GTK_LIBS -+GTK_CFLAGS -+PKG_CONFIG -+GTK12_CONFIG -+GTK_CONFIG -+X_LIB -+X_EXTRA_LIBS -+X_LIBS -+X_PRE_LIBS -+X_CFLAGS -+XMKMF -+xmkmfpath -+SNIFF_OBJ -+SNIFF_SRC -+NETBEANS_OBJ -+NETBEANS_SRC -+WORKSHOP_OBJ -+WORKSHOP_SRC -+RUBY_LIBS -+RUBY_CFLAGS -+RUBY_PRO -+RUBY_OBJ -+RUBY_SRC -+vi_cv_path_ruby -+TCL_LIBS -+TCL_CFLAGS -+TCL_PRO -+TCL_OBJ -+TCL_SRC -+vi_cv_path_tcl -+PYTHON_OBJ -+PYTHON_SRC -+PYTHON_CFLAGS -+PYTHON_GETPATH_CFLAGS -+PYTHON_LIBS -+PYTHON_CONFDIR -+vi_cv_path_python -+PERL_LIBS -+PERL_CFLAGS -+PERL_PRO -+PERL_OBJ -+PERL_SRC -+shrpenv -+vi_cv_perllib -+vi_cv_path_perl -+MZSCHEME_MZC -+MZSCHEME_EXTRA -+MZSCHEME_CFLAGS -+MZSCHEME_LIBS -+MZSCHEME_PRO -+MZSCHEME_OBJ -+MZSCHEME_SRC -+vi_cv_path_mzscheme -+compiledby -+dogvimdiff -+dovimdiff -+line_break -+VIEWNAME -+EXNAME -+VIMNAME -+OS_EXTRA_OBJ -+OS_EXTRA_SRC -+CPP_MM -+STRIP -+AWK -+EGREP -+GREP -+CPP -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+SET_MAKE -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' - ac_user_opts=' - enable_option_checking -@@ -1253,9 +1255,9 @@ - if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 -+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; -- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac - fi - -@@ -1308,7 +1310,7 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: Working directory cannot be determined" >&2 -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -@@ -1587,7 +1589,7 @@ - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.62 -+generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -@@ -1601,7 +1603,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.62. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ - -@@ -1724,8 +1726,8 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -@@ -1928,6 +1930,8 @@ - fi - done - if $ac_cache_corrupted; then -+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 - $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -@@ -2084,12 +2088,8 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -2288,12 +2288,8 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -2303,11 +2299,13 @@ - fi - - --test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - - # Provide some information about the compiler. - $as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -@@ -2437,11 +2435,13 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+ { (exit 77); exit 77; }; }; } - fi - - ac_exeext=$ac_cv_exeext -@@ -2469,13 +2469,15 @@ - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - fi - fi -@@ -2518,11 +2520,13 @@ - esac - done - else -- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest$ac_cv_exeext -@@ -2576,11 +2580,13 @@ - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext -@@ -3148,11 +3154,13 @@ - if $ac_preproc_ok; then - : - else -- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&5 - $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - ac_ext=c -@@ -4016,8 +4024,9 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -4154,7 +4163,7 @@ - $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; } - - fi --if test $ac_cv_header_Carbon_Carbon_h = yes; then -+if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then - CARBON=yes - fi - -@@ -4484,7 +4493,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 - $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } --if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then -+if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then - LIBS="$LIBS -lselinux" - cat >>confdefs.h <<\_ACEOF - #define HAVE_SELINUX 1 -@@ -4634,8 +4643,8 @@ - $as_echo "\"$PLTHOME\"" >&6; } - vi_cv_path_mzscheme_pfx="$PLTHOME" - else -- { $as_echo "$as_me:$LINENO: result: \"not set\"" >&5 --$as_echo "\"not set\"" >&6; } -+ { $as_echo "$as_me:$LINENO: result: not set" >&5 -+$as_echo "not set" >&6; } - # Extract the first word of "mzscheme", so it can be a program name with args. - set dummy mzscheme; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -@@ -4690,16 +4699,16 @@ - if test "${vi_cv_path_mzscheme_pfx+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- vi_cv_path_mzscheme_pfx=` -- ${vi_cv_path_mzscheme} -evm \ -- "(display (simplify-path \ -+ echo "(display (simplify-path \ - (build-path (call-with-values \ - (lambda () (split-path (find-system-path (quote exec-file)))) \ -- (lambda (base name must-be-dir?) base)) (quote up))))"` -+ (lambda (base name must-be-dir?) base)) (quote up))))" > mzdirs.scm -+ vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \ -+ sed -e 's+/$++'` - fi - { $as_echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5 - $as_echo "$vi_cv_path_mzscheme_pfx" >&6; } -- vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'` -+ rm -f mzdirs.scm - fi - fi - fi -@@ -4709,21 +4718,32 @@ - { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 - $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } - if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then -- { $as_echo "$as_me:$LINENO: result: \"yes\"" >&5 --$as_echo "\"yes\"" >&6; } -+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: \"no\"" >&5 --$as_echo "\"no\"" >&6; } -- { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include" >&5 --$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 -+$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } - if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then -- { $as_echo "$as_me:$LINENO: result: \"yes\"" >&5 --$as_echo "\"yes\"" >&6; } -- SCHEME_INC=/plt -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt - else -- { $as_echo "$as_me:$LINENO: result: \"no\"" >&5 --$as_echo "\"no\"" >&6; } -- vi_cv_path_mzscheme_pfx= -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if scheme.h can be found in /usr/include/plt/" >&5 -+$as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; } -+ if test -f /usr/include/plt/scheme.h; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ SCHEME_INC=/usr/include/plt -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ vi_cv_path_mzscheme_pfx= -+ fi - fi - fi - fi -@@ -4731,21 +4751,34 @@ - if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - if test "x$MACOSX" = "xyes"; then - MZSCHEME_LIBS="-framework PLT_MzScheme" -+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then -+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a" -+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" - elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then - MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" - else -- MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" -+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then -+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m" -+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" -+ else -+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" -+ fi - if test "$GCC" = yes; then -- MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" -+ MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" - elif test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then -- MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" -+ MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" - fi - fi - if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then - SCHEME_COLLECTS=lib/plt/ - fi -- MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC} \ -+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then -+ MZSCHEME_EXTRA="mzscheme_base.c" -+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" -+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" -+ fi -+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ - -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'" - MZSCHEME_SRC="if_mzsch.c" - MZSCHEME_OBJ="objects/if_mzsch.o" -@@ -4760,6 +4793,8 @@ - - - -+ -+ - fi - - -@@ -5745,7 +5780,10 @@ - fi - rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` - if test "X$rubyldflags" != "X"; then -- LDFLAGS="$rubyldflags $LDFLAGS" -+ rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` -+ if test "X$rubyldflags" != "X"; then -+ LDFLAGS="$rubyldflags $LDFLAGS" -+ fi - fi - RUBY_SRC="if_ruby.c" - RUBY_OBJ="objects/if_ruby.o" -@@ -5891,7 +5929,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 - $as_echo "$ac_cv_lib_socket_socket" >&6; } --if test $ac_cv_lib_socket_socket = yes; then -+if test "x$ac_cv_lib_socket_socket" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBSOCKET 1 - _ACEOF -@@ -5966,7 +6004,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 - $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } --if test $ac_cv_lib_nsl_gethostbyname = yes; then -+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBNSL 1 - _ACEOF -@@ -6203,8 +6241,8 @@ - have_x=disabled - else - case $x_includes,$x_libraries in #( -- *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 --$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;} -+ *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 -+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - $as_echo_n "(cached) " >&6 -@@ -6242,7 +6280,7 @@ - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -- /usr/lib | /lib) ;; -+ /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi -@@ -6682,7 +6720,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 - $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } --if test $ac_cv_lib_dnet_dnet_ntoa = yes; then -+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - -@@ -6752,7 +6790,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 - $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } --if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then -+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" - fi - -@@ -6924,7 +6962,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 - $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } --if test $ac_cv_lib_nsl_gethostbyname = yes; then -+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" - fi - -@@ -6994,7 +7032,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 - $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } --if test $ac_cv_lib_bsd_gethostbyname = yes; then -+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" - fi - -@@ -7160,7 +7198,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 - $as_echo "$ac_cv_lib_socket_connect" >&6; } --if test $ac_cv_lib_socket_connect = yes; then -+if test "x$ac_cv_lib_socket_connect" = x""yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi - -@@ -7319,7 +7357,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 - $as_echo "$ac_cv_lib_posix_remove" >&6; } --if test $ac_cv_lib_posix_remove = yes; then -+if test "x$ac_cv_lib_posix_remove" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi - -@@ -7478,7 +7516,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 - $as_echo "$ac_cv_lib_ipc_shmat" >&6; } --if test $ac_cv_lib_ipc_shmat = yes; then -+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi - -@@ -7559,7 +7597,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 - $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } --if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then -+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi - -@@ -7727,7 +7765,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 - $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } --if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then -+if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" - fi - -@@ -7797,7 +7835,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 - $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; } --if test $ac_cv_lib_ICE_IceOpenConnection = yes; then -+if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" - fi - -@@ -7868,7 +7906,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 - $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } --if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then -+if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then - X_PRE_LIBS="$X_PRE_LIBS -lXpm" - fi - -@@ -7970,6 +8008,82 @@ - - LDFLAGS="$ac_save_LDFLAGS" - -+ { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5 -+$as_echo_n "checking size of wchar_t is 2 bytes... " >&6; } -+ if test "${ac_cv_small_wchar_t+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5 -+$as_echo "$as_me: error: failed to compile test program" >&2;} -+ { (exit 1); exit 1; }; } -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include -+#if STDC_HEADERS -+# include -+# include -+#endif -+ main() -+ { -+ if (sizeof(wchar_t) <= 2) -+ exit(1); -+ exit(0); -+ } -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_small_wchar_t="no" -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_small_wchar_t="yes" -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi -+ -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5 -+$as_echo "$ac_cv_small_wchar_t" >&6; } -+ if test "x$ac_cv_small_wchar_t" = "xyes" ; then -+ cat >>confdefs.h <<\_ACEOF -+#define SMALL_WCHAR_T 1 -+_ACEOF -+ -+ fi -+ - fi - fi - -@@ -9251,7 +9365,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 - $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } --if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then -+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then - GUI_X_LIBS="-lXext" - fi - -@@ -9320,7 +9434,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5 - $as_echo "$ac_cv_lib_w_wslen" >&6; } --if test $ac_cv_lib_w_wslen = yes; then -+if test "x$ac_cv_lib_w_wslen" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" - fi - -@@ -9389,7 +9503,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 - $as_echo "$ac_cv_lib_dl_dlsym" >&6; } --if test $ac_cv_lib_dl_dlsym = yes; then -+if test "x$ac_cv_lib_dl_dlsym" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" - fi - -@@ -9458,7 +9572,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 - $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } --if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then -+if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then - GUI_X_LIBS="-lXmu $GUI_X_LIBS" - fi - -@@ -9528,7 +9642,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5 - $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; } --if test $ac_cv_lib_Xp_XpEndJob = yes; then -+if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then - GUI_X_LIBS="-lXp $GUI_X_LIBS" - fi - -@@ -9699,8 +9813,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -9852,8 +9967,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -10098,8 +10214,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -10362,6 +10479,56 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -+{ $as_echo "$as_me:$LINENO: checking whether __attribute__((unused)) is allowed" >&5 -+$as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+int x __attribute__((unused)); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF -+#define HAVE_ATTRIBUTE_UNUSED 1 -+_ACEOF -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ - if test "${ac_cv_header_elf_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for elf.h" >&5 - $as_echo_n "checking for elf.h... " >&6; } -@@ -10489,7 +10656,7 @@ - $as_echo "$ac_cv_header_elf_h" >&6; } - - fi --if test $ac_cv_header_elf_h = yes; then -+if test "x$ac_cv_header_elf_h" = x""yes; then - HAS_ELF=1 - fi - -@@ -10555,7 +10722,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 - $as_echo "$ac_cv_lib_elf_main" >&6; } --if test $ac_cv_lib_elf_main = yes; then -+if test "x$ac_cv_lib_elf_main" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBELF 1 - _ACEOF -@@ -10629,8 +10796,9 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 - _ACEOF -@@ -10916,7 +11084,6 @@ - - - -- - for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ - termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \ - iconv.h langinfo.h math.h unistd.h stropts.h errno.h \ -@@ -10924,7 +11091,7 @@ - sys/stream.h termios.h libc.h sys/statfs.h \ - poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ - libgen.h util/debug.h util/msg18n.h frame.h \ -- sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h -+ sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -11058,8 +11225,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -11122,8 +11290,74 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+for ac_header in sys/sysctl.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#if defined HAVE_SYS_PARAM_H -+# include -+#endif -+ -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ eval "$as_ac_Header=yes" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_Header=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -11322,8 +11556,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -11565,6 +11800,67 @@ - - fi - -+{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5 -+$as_echo_n "checking for working volatile... " >&6; } -+if test "${ac_cv_c_volatile+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+volatile int x; -+int * volatile y = (int *) 0; -+return !x && !y; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_volatile=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_c_volatile=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 -+$as_echo "$ac_cv_c_volatile" >&6; } -+if test $ac_cv_c_volatile = no; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define volatile /**/ -+_ACEOF -+ -+fi -+ - { $as_echo "$as_me:$LINENO: checking for mode_t" >&5 - $as_echo_n "checking for mode_t... " >&6; } - if test "${ac_cv_type_mode_t+set}" = set; then -@@ -11659,7 +11955,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 - $as_echo "$ac_cv_type_mode_t" >&6; } --if test $ac_cv_type_mode_t = yes; then -+if test "x$ac_cv_type_mode_t" = x""yes; then - : - else - -@@ -11763,7 +12059,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 - $as_echo "$ac_cv_type_off_t" >&6; } --if test $ac_cv_type_off_t = yes; then -+if test "x$ac_cv_type_off_t" = x""yes; then - : - else - -@@ -11867,7 +12163,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 - $as_echo "$ac_cv_type_pid_t" >&6; } --if test $ac_cv_type_pid_t = yes; then -+if test "x$ac_cv_type_pid_t" = x""yes; then - : - else - -@@ -11971,7 +12267,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 - $as_echo "$ac_cv_type_size_t" >&6; } --if test $ac_cv_type_size_t = yes; then -+if test "x$ac_cv_type_size_t" = x""yes; then - : - else - -@@ -12175,7 +12471,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 - $as_echo "$ac_cv_type_ino_t" >&6; } --if test $ac_cv_type_ino_t = yes; then -+if test "x$ac_cv_type_ino_t" = x""yes; then - : - else - -@@ -12279,7 +12575,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 - $as_echo "$ac_cv_type_dev_t" >&6; } --if test $ac_cv_type_dev_t = yes; then -+if test "x$ac_cv_type_dev_t" = x""yes; then - : - else - -@@ -12569,8 +12865,9 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_Lib'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Lib'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 - _ACEOF -@@ -13818,8 +14115,9 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -14202,7 +14500,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5 - $as_echo "$ac_cv_lib_m_strtod" >&6; } --if test $ac_cv_lib_m_strtod = yes; then -+if test "x$ac_cv_lib_m_strtod" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBM 1 - _ACEOF -@@ -14362,7 +14660,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5 - $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; } --if test $ac_cv_lib_posix1e_acl_get_file = yes; then -+if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then - LIBS="$LIBS -lposix1e" - else - { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 -@@ -14430,7 +14728,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 - $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } --if test $ac_cv_lib_acl_acl_get_file = yes; then -+if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then - LIBS="$LIBS -lacl" - { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 - $as_echo_n "checking for fgetxattr in -lattr... " >&6; } -@@ -14497,7 +14795,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5 - $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } --if test $ac_cv_lib_attr_fgetxattr = yes; then -+if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then - LIBS="$LIBS -lattr" - fi - -@@ -15226,7 +15524,6 @@ - - - -- - bcopy_test_prog=' - #include "confdefs.h" - #ifdef HAVE_STRING_H -@@ -15458,7 +15755,7 @@ - if test "$enable_multibyte" = "yes"; then - cflags_save=$CFLAGS - ldflags_save=$LDFLAGS -- if test -n "$x_includes" ; then -+ if test "x$x_includes" != "xNONE" ; then - CFLAGS="$CFLAGS -I$x_includes" - LDFLAGS="$X_LIBS $LDFLAGS -lX11" - { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 -@@ -15635,7 +15932,7 @@ - fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 - $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } --if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then -+if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then - LIBS="$LIBS -lxpg4" - fi - -@@ -15646,6 +15943,7 @@ - if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then - TAGPRG="ctags -I INIT+ --fields=+S" - else -+ TAGPRG="ctags" - (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" - (eval etags -c /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c" - (eval ctags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags" -@@ -15933,8 +16231,9 @@ - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -16134,7 +16433,7 @@ - $as_echo "$ac_cv_header_dlfcn_h" >&6; } - - fi --if test $ac_cv_header_dlfcn_h = yes; then -+if test "x$ac_cv_header_dlfcn_h" = x""yes; then - DLL=dlfcn.h - else - if test "${ac_cv_header_dl_h+set}" = set; then -@@ -16264,7 +16563,7 @@ - $as_echo "$ac_cv_header_dl_h" >&6; } - - fi --if test $ac_cv_header_dl_h = yes; then -+if test "x$ac_cv_header_dl_h" = x""yes; then - DLL=dl.h - fi - -@@ -16783,8 +17082,9 @@ - $as_echo "$ac_res" >&6; } - - fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -16819,21 +17119,29 @@ - LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" - fi - --{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 --$as_echo_n "checking for GCC 3 or later... " >&6; } - DEPEND_CFLAGS_FILTER= - if test "$GCC" = yes; then -+ { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 -+$as_echo_n "checking for GCC 3 or later... " >&6; } - gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` - if test "$gccmajor" -gt "2"; then - DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" -- fi --fi --if test "$DEPEND_CFLAGS_FILTER" = ""; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ fi -+ { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 -+$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } -+ if test "$gccmajor" -gt "3"; then -+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ fi - fi - - -@@ -16866,8 +17174,8 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -@@ -17259,7 +17567,7 @@ - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.62. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -17272,6 +17580,15 @@ - - _ACEOF - -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac -+ -+ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. - config_files="$ac_config_files" -@@ -17284,16 +17601,17 @@ - \`$as_me' instantiates files from templates according to the - current configuration. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -- -q, --quiet do not print progress messages -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -+ --file=FILE[:TEMPLATE] - instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -+ --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - - Configuration files: -@@ -17308,7 +17626,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.62, -+configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - - Copyright (C) 2008 Free Software Foundation, Inc. -@@ -17505,7 +17823,8 @@ - $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -17710,9 +18029,9 @@ - } - split(mac1, mac2, "(") #) - macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". -- prefix = substr(line, 1, index(line, defundef) - 1) - print prefix "define", macro P[macro] D[macro] - next - } else { -@@ -17720,7 +18039,7 @@ - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { -- print "/*", line, "*/" -+ print "/*", prefix defundef, macro, "*/" - next - } - } -@@ -17744,8 +18063,8 @@ - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 --$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -18063,8 +18382,8 @@ - $ac_cs_success || { (exit 1); exit 1; } - fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 --$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - -diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c ---- vim72.orig/src/buffer.c 2008-08-06 12:00:48.000000000 +0100 -+++ vim72/src/buffer.c 2009-07-22 22:54:22.000000000 +0100 -@@ -33,7 +33,7 @@ - static char_u *fname_match __ARGS((regprog_T *prog, char_u *name)); - #endif - static void buflist_setfpos __ARGS((buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options)); --static wininfo_T *find_wininfo __ARGS((buf_T *buf)); -+static wininfo_T *find_wininfo __ARGS((buf_T *buf, int skip_diff_buffer)); - #ifdef UNIX - static buf_T *buflist_findname_stat __ARGS((char_u *ffname, struct stat *st)); - static int otherfile_buf __ARGS((buf_T *buf, char_u *ffname, struct stat *stp)); -@@ -44,6 +44,7 @@ - #ifdef FEAT_TITLE - static int ti_change __ARGS((char_u *str, char_u **last)); - #endif -+static int append_arg_number __ARGS((win_T *wp, char_u *buf, int buflen, int add_file)); - static void free_buffer __ARGS((buf_T *)); - static void free_buffer_stuff __ARGS((buf_T *buf, int free_options)); - static void clear_wininfo __ARGS((buf_T *buf)); -@@ -437,10 +438,6 @@ - return; - #endif - --#ifdef FEAT_NETBEANS_INTG -- if (usingNetbeans) -- netbeans_file_closed(buf); --#endif - /* Change directories when the 'acd' option is set. */ - DO_AUTOCHDIR - -@@ -515,12 +512,11 @@ - * buf_freeall() - free all things allocated for a buffer that are related to - * the file. - */ --/*ARGSUSED*/ - void - buf_freeall(buf, del_buf, wipe_buf) - buf_T *buf; -- int del_buf; /* buffer is going to be deleted */ -- int wipe_buf; /* buffer is going to be wiped out */ -+ int del_buf UNUSED; /* buffer is going to be deleted */ -+ int wipe_buf UNUSED; /* buffer is going to be wiped out */ - { - #ifdef FEAT_AUTOCMD - int is_curbuf = (buf == curbuf); -@@ -639,6 +635,10 @@ - #ifdef FEAT_SIGNS - buf_delete_signs(buf); /* delete any signs */ - #endif -+#ifdef FEAT_NETBEANS_INTG -+ if (usingNetbeans) -+ netbeans_file_killed(buf); -+#endif - #ifdef FEAT_LOCALMAP - map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE); /* clear local mappings */ - map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE); /* clear local abbrevs */ -@@ -647,6 +647,9 @@ - vim_free(buf->b_start_fenc); - buf->b_start_fenc = NULL; - #endif -+#ifdef FEAT_SPELL -+ ga_clear(&buf->b_langp); -+#endif - } - - /* -@@ -812,9 +815,6 @@ - int bnr; /* buffer number */ - char_u *p; - --#ifdef FEAT_NETBEANS_INTG -- netbeansCloseFile = 1; --#endif - if (addr_count == 0) - { - (void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit); -@@ -909,9 +909,6 @@ - } - } - --#ifdef FEAT_NETBEANS_INTG -- netbeansCloseFile = 0; --#endif - - return errormsg; - } -@@ -1090,7 +1087,7 @@ - #endif - setpcmark(); - retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, -- forceit ? ECMD_FORCEIT : 0); -+ forceit ? ECMD_FORCEIT : 0, curwin); - - /* - * do_ecmd() may create a new buffer, then we have to delete -@@ -1237,7 +1234,7 @@ - * "buf" if one exists */ - if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf)) - return OK; -- /* If 'switchbuf' contians "usetab": jump to first window in any tab -+ /* If 'switchbuf' contains "usetab": jump to first window in any tab - * page containing "buf" if one exists */ - if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf)) - return OK; -@@ -1313,7 +1310,7 @@ - setpcmark(); - if (!cmdmod.keepalt) - curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */ -- buflist_altfpos(); /* remember curpos */ -+ buflist_altfpos(curwin); /* remember curpos */ - - #ifdef FEAT_VISUAL - /* Don't restart Select mode after switching to another buffer. */ -@@ -1351,11 +1348,12 @@ - } - } - #ifdef FEAT_AUTOCMD -+ /* An autocommand may have deleted "buf", already entered it (e.g., when -+ * it did ":bunload") or aborted the script processing! */ - # ifdef FEAT_EVAL -- /* An autocommand may have deleted buf or aborted the script processing! */ -- if (buf_valid(buf) && !aborting()) -+ if (buf_valid(buf) && buf != curbuf && !aborting()) - # else -- if (buf_valid(buf)) /* an autocommand may have deleted buf! */ -+ if (buf_valid(buf) && buf != curbuf) - # endif - #endif - enter_buffer(buf); -@@ -1397,6 +1395,9 @@ - curwin->w_cursor.coladd = 0; - #endif - curwin->w_set_curswant = TRUE; -+#ifdef FEAT_AUTOCMD -+ curwin->w_topline_was_set = FALSE; -+#endif - - /* Make sure the buffer is loaded. */ - if (curbuf->b_ml.ml_mfp == NULL) /* need to load the file */ -@@ -1436,7 +1437,8 @@ - maketitle(); - #endif - #ifdef FEAT_AUTOCMD -- if (curwin->w_topline == 1) /* when autocmds didn't change it */ -+ /* when autocmds didn't change it */ -+ if (curwin->w_topline == 1 && !curwin->w_topline_was_set) - #endif - scroll_cursor_halfway(FALSE); /* redisplay at correct position */ - -@@ -1451,13 +1453,13 @@ - - #ifdef FEAT_KEYMAP - if (curbuf->b_kmap_state & KEYMAP_INIT) -- keymap_init(); -+ (void)keymap_init(); - #endif - #ifdef FEAT_SPELL - /* May need to set the spell language. Can only do this after the buffer - * has been properly setup. */ - if (!curbuf->b_help && curwin->w_p_spell && *curbuf->b_p_spl != NUL) -- did_set_spelllang(curbuf); -+ (void)did_set_spelllang(curbuf); - #endif - - redraw_later(NOT_VALID); -@@ -1675,9 +1677,10 @@ - buf->b_fname = buf->b_sfname; - #ifdef UNIX - if (st.st_dev == (dev_T)-1) -- buf->b_dev = -1; -+ buf->b_dev_valid = FALSE; - else - { -+ buf->b_dev_valid = TRUE; - buf->b_dev = st.st_dev; - buf->b_ino = st.st_ino; - } -@@ -2022,13 +2025,12 @@ - * Return fnum of the found buffer. - * Return < 0 for error. - */ --/*ARGSUSED*/ - int - buflist_findpat(pattern, pattern_end, unlisted, diffmode) - char_u *pattern; - char_u *pattern_end; /* pointer to first char after pattern */ - int unlisted; /* find unlisted buffers */ -- int diffmode; /* find diff-mode buffers only */ -+ int diffmode UNUSED; /* find diff-mode buffers only */ - { - buf_T *buf; - regprog_T *prog; -@@ -2400,22 +2402,69 @@ - return; - } - -+#ifdef FEAT_DIFF -+static int wininfo_other_tab_diff __ARGS((wininfo_T *wip)); -+ -+/* -+ * Return TRUE when "wip" has 'diff' set and the diff is only for another tab -+ * page. That's because a diff is local to a tab page. -+ */ -+ static int -+wininfo_other_tab_diff(wip) -+ wininfo_T *wip; -+{ -+ win_T *wp; -+ -+ if (wip->wi_opt.wo_diff) -+ { -+ for (wp = firstwin; wp != NULL; wp = wp->w_next) -+ /* return FALSE when it's a window in the current tab page, thus -+ * the buffer was in diff mode here */ -+ if (wip->wi_win == wp) -+ return FALSE; -+ return TRUE; -+ } -+ return FALSE; -+} -+#endif -+ - /* - * Find info for the current window in buffer "buf". - * If not found, return the info for the most recently used window. -+ * When "skip_diff_buffer" is TRUE avoid windows with 'diff' set that is in -+ * another tab page. - * Returns NULL when there isn't any info. - */ - static wininfo_T * --find_wininfo(buf) -+find_wininfo(buf, skip_diff_buffer) - buf_T *buf; -+ int skip_diff_buffer UNUSED; - { - wininfo_T *wip; - - for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next) -- if (wip->wi_win == curwin) -+ if (wip->wi_win == curwin -+#ifdef FEAT_DIFF -+ && (!skip_diff_buffer || !wininfo_other_tab_diff(wip)) -+#endif -+ ) - break; -- if (wip == NULL) /* if no fpos for curwin, use the first in the list */ -- wip = buf->b_wininfo; -+ -+ /* If no wininfo for curwin, use the first in the list (that doesn't have -+ * 'diff' set and is in another tab page). */ -+ if (wip == NULL) -+ { -+#ifdef FEAT_DIFF -+ if (skip_diff_buffer) -+ { -+ for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next) -+ if (!wininfo_other_tab_diff(wip)) -+ break; -+ } -+ else -+#endif -+ wip = buf->b_wininfo; -+ } - return wip; - } - -@@ -2436,7 +2485,7 @@ - clearFolding(curwin); - #endif - -- wip = find_wininfo(buf); -+ wip = find_wininfo(buf, TRUE); - if (wip != NULL && wip->wi_optset) - { - copy_winopt(&wip->wi_opt, &curwin->w_onebuf_opt); -@@ -2466,9 +2515,9 @@ - buf_T *buf; - { - wininfo_T *wip; -- static pos_T no_position = {1, 0}; -+ static pos_T no_position = INIT_POS_T(1, 0, 0); - -- wip = find_wininfo(buf); -+ wip = find_wininfo(buf, FALSE); - if (wip != NULL) - return &(wip->wi_fpos); - else -@@ -2489,7 +2538,6 @@ - /* - * List all know file names (for :files and :buffers command). - */ --/*ARGSUSED*/ - void - buflist_list(eap) - exarg_T *eap; -@@ -2527,8 +2575,8 @@ - { - IObuff[len++] = ' '; - } while (--i > 0 && len < IOSIZE - 18); -- vim_snprintf((char *)IObuff + len, IOSIZE - len, _("line %ld"), -- buf == curbuf ? curwin->w_cursor.lnum -+ vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len), -+ _("line %ld"), buf == curbuf ? curwin->w_cursor.lnum - : (long)buflist_findlnum(buf)); - msg_outtrans(IObuff); - out_flush(); /* output one line at a time */ -@@ -2642,9 +2690,10 @@ - buf->b_fname = buf->b_sfname; - #ifdef UNIX - if (st.st_dev == (dev_T)-1) -- buf->b_dev = -1; -+ buf->b_dev_valid = FALSE; - else - { -+ buf->b_dev_valid = TRUE; - buf->b_dev = st.st_dev; - buf->b_ino = st.st_ino; - } -@@ -2789,14 +2838,14 @@ - #endif - - /* -- * Set alternate cursor position for current window. -+ * Set alternate cursor position for the current buffer and window "win". - * Also save the local window option values. - */ - void --buflist_altfpos() -+buflist_altfpos(win) -+ win_T *win; - { -- buflist_setfpos(curbuf, curwin, curwin->w_cursor.lnum, -- curwin->w_cursor.col, TRUE); -+ buflist_setfpos(curbuf, win, win->w_cursor.lnum, win->w_cursor.col, TRUE); - } - - /* -@@ -2838,7 +2887,7 @@ - /* If no struct stat given, get it now */ - if (stp == NULL) - { -- if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0) -+ if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0) - st.st_dev = (dev_T)-1; - stp = &st; - } -@@ -2875,11 +2924,12 @@ - - if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0) - { -+ buf->b_dev_valid = TRUE; - buf->b_dev = st.st_dev; - buf->b_ino = st.st_ino; - } - else -- buf->b_dev = -1; -+ buf->b_dev_valid = FALSE; - } - - /* -@@ -2890,7 +2940,7 @@ - buf_T *buf; - struct stat *stp; - { -- return (buf->b_dev >= 0 -+ return (buf->b_dev_valid - && stp->st_dev == buf->b_dev - && stp->st_ino == buf->b_ino); - } -@@ -2917,7 +2967,7 @@ - - if (fullname > 1) /* 2 CTRL-G: include buffer number */ - { -- sprintf((char *)buffer, "buf %d: ", curbuf->b_fnum); -+ vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum); - p = buffer + STRLEN(buffer); - } - else -@@ -2991,11 +3041,12 @@ - (long)curbuf->b_ml.ml_line_count, - n); - validate_virtcol(); -- col_print(buffer + STRLEN(buffer), -+ len = STRLEN(buffer); -+ col_print(buffer + len, IOSIZE - len, - (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1); - } - -- (void)append_arg_number(curwin, buffer, !shortmess(SHM_FILE), IOSIZE); -+ (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE)); - - if (dont_truncate) - { -@@ -3023,15 +3074,16 @@ - } - - void --col_print(buf, col, vcol) -+col_print(buf, buflen, col, vcol) - char_u *buf; -+ size_t buflen; - int col; - int vcol; - { - if (col == vcol) -- sprintf((char *)buf, "%d", col); -+ vim_snprintf((char *)buf, buflen, "%d", col); - else -- sprintf((char *)buf, "%d-%d", col, vcol); -+ vim_snprintf((char *)buf, buflen, "%d-%d", col, vcol); - } - - #if defined(FEAT_TITLE) || defined(PROTO) -@@ -3144,18 +3196,18 @@ - if (p == buf + off) - /* must be a help buffer */ - vim_strncpy(buf + off, (char_u *)_("help"), -- IOSIZE - off - 1); -+ (size_t)(IOSIZE - off - 1)); - else - *p = NUL; - - /* translate unprintable chars */ - p = transstr(buf + off); -- vim_strncpy(buf + off, p, IOSIZE - off - 1); -+ vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1)); - vim_free(p); - STRCAT(buf, ")"); - } - -- append_arg_number(curwin, buf, FALSE, IOSIZE); -+ append_arg_number(curwin, buf, IOSIZE, FALSE); - - #if defined(FEAT_CLIENTSERVER) - if (serverName != NULL) -@@ -3292,14 +3344,13 @@ - * If maxwidth is not zero, the string will be filled at any middle marker - * or truncated if too long, fillchar is used for all whitespace. - */ --/*ARGSUSED*/ - int - build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab) - win_T *wp; - char_u *out; /* buffer to write into != NameBuff */ - size_t outlen; /* length of out[] */ - char_u *fmt; -- int use_sandbox; /* "fmt" was set insecurely, use sandbox */ -+ int use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */ - int fillchar; - int maxwidth; - struct stl_hlrec *hltab; /* return: HL attributes (can be NULL) */ -@@ -3470,7 +3521,7 @@ - n = (long)(p - t) - item[groupitem[groupdepth]].maxwid + 1; - - *t = '<'; -- mch_memmove(t + 1, t + n, p - (t + n)); -+ mch_memmove(t + 1, t + n, (size_t)(p - (t + n))); - p = p - n + 1; - #ifdef FEAT_MBYTE - /* Fill up space left over by half a double-wide char. */ -@@ -3500,7 +3551,7 @@ - else - { - /* fill by inserting characters */ -- mch_memmove(t + n - l, t, p - t); -+ mch_memmove(t + n - l, t, (size_t)(p - t)); - l = n - l; - if (p + l >= out + outlen) - l = (long)((out + outlen) - p - 1); -@@ -3636,7 +3687,7 @@ - p = t; - - #ifdef FEAT_EVAL -- sprintf((char *)tmp, "%d", curbuf->b_fnum); -+ vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum); - set_internal_string_var((char_u *)"actual_curbuf", tmp); - - o_curbuf = curbuf; -@@ -3703,13 +3754,13 @@ - - case STL_ALTPERCENT: - str = tmp; -- get_rel_pos(wp, str); -+ get_rel_pos(wp, str, TMPLEN); - break; - - case STL_ARGLISTSTAT: - fillable = FALSE; - tmp[0] = 0; -- if (append_arg_number(wp, tmp, FALSE, (int)sizeof(tmp))) -+ if (append_arg_number(wp, tmp, (int)sizeof(tmp), FALSE)) - str = tmp; - break; - -@@ -3744,7 +3795,7 @@ - case STL_BYTEVAL_X: - base = 'X'; - case STL_BYTEVAL: -- if (wp->w_cursor.col > STRLEN(linecont)) -+ if (wp->w_cursor.col > (colnr_T)STRLEN(linecont)) - num = 0; - else - { -@@ -3917,7 +3968,7 @@ - if (zeropad) - *t++ = '0'; - *t++ = '*'; -- *t++ = nbase == 16 ? base : (nbase == 8 ? 'o' : 'd'); -+ *t++ = nbase == 16 ? base : (char_u)(nbase == 8 ? 'o' : 'd'); - *t = 0; - - for (n = num, l = 1; n >= nbase; n /= nbase) -@@ -3963,7 +4014,7 @@ - width = vim_strsize(out); - if (maxwidth > 0 && width > maxwidth) - { -- /* Result is too long, must trunctate somewhere. */ -+ /* Result is too long, must truncate somewhere. */ - l = 0; - if (itemcnt == 0) - s = out; -@@ -4110,13 +4161,14 @@ - #if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \ - || defined(FEAT_GUI_TABLINE) || defined(PROTO) - /* -- * Get relative cursor position in window into "str[]", in the form 99%, using -- * "Top", "Bot" or "All" when appropriate. -+ * Get relative cursor position in window into "buf[buflen]", in the form 99%, -+ * using "Top", "Bot" or "All" when appropriate. - */ - void --get_rel_pos(wp, str) -+get_rel_pos(wp, buf, buflen) - win_T *wp; -- char_u *str; -+ char_u *buf; -+ int buflen; - { - long above; /* number of lines above window */ - long below; /* number of lines below window */ -@@ -4127,34 +4179,35 @@ - #endif - below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1; - if (below <= 0) -- STRCPY(str, above == 0 ? _("All") : _("Bot")); -+ vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")), -+ (size_t)(buflen - 1)); - else if (above <= 0) -- STRCPY(str, _("Top")); -+ vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1)); - else -- sprintf((char *)str, "%2d%%", above > 1000000L -+ vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L - ? (int)(above / ((above + below) / 100L)) - : (int)(above * 100L / (above + below))); - } - #endif - - /* -- * Append (file 2 of 8) to 'buf', if editing more than one file. -+ * Append (file 2 of 8) to "buf[buflen]", if editing more than one file. - * Return TRUE if it was appended. - */ -- int --append_arg_number(wp, buf, add_file, maxlen) -+ static int -+append_arg_number(wp, buf, buflen, add_file) - win_T *wp; - char_u *buf; -+ int buflen; - int add_file; /* Add "file" before the arg number */ -- int maxlen; /* maximum nr of chars in buf or zero*/ - { - char_u *p; - - if (ARGCOUNT <= 1) /* nothing to do */ - return FALSE; - -- p = buf + STRLEN(buf); /* go to the end of the buffer */ -- if (maxlen && p - buf + 35 >= maxlen) /* getting too long */ -+ p = buf + STRLEN(buf); /* go to the end of the buffer */ -+ if (p - buf + 35 >= buflen) /* getting too long */ - return FALSE; - *p++ = ' '; - *p++ = '('; -@@ -4163,7 +4216,8 @@ - STRCPY(p, "file "); - p += 5; - } -- sprintf((char *)p, wp->w_arg_idx_invalid ? "(%d) of %d)" -+ vim_snprintf((char *)p, (size_t)(buflen - (p - buf)), -+ wp->w_arg_idx_invalid ? "(%d) of %d)" - : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT); - return TRUE; - } -@@ -4219,10 +4273,9 @@ - * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL. - * "ffname" becomes a pointer to allocated memory (or NULL). - */ --/*ARGSUSED*/ - void - fname_expand(buf, ffname, sfname) -- buf_T *buf; -+ buf_T *buf UNUSED; - char_u **ffname; - char_u **sfname; - { -@@ -4488,7 +4541,7 @@ - ECMD_ONE, - ((P_HID(curwin->w_buffer) - || bufIsChanged(curwin->w_buffer)) ? ECMD_HIDE : 0) -- + ECMD_OLDBUF); -+ + ECMD_OLDBUF, curwin); - #ifdef FEAT_AUTOCMD - if (use_firstwin) - ++autocmd_no_leave; -@@ -4946,7 +4999,7 @@ - if (tab != NULL) - { - *tab++ = '\0'; -- col = atoi((char *)tab); -+ col = (colnr_T)atoi((char *)tab); - tab = vim_strrchr(xline, '\t'); - if (tab != NULL) - { -@@ -4984,6 +5037,7 @@ - #endif - char_u *line; - int max_buffers; -+ size_t len; - - if (find_viminfo_parameter('%') == NULL) - return; -@@ -4992,7 +5046,8 @@ - max_buffers = get_viminfo_parameter('%'); - - /* Allocate room for the file name, lnum and col. */ -- line = alloc(MAXPATHL + 40); -+#define LINE_BUF_LEN (MAXPATHL + 40) -+ line = alloc(LINE_BUF_LEN); - if (line == NULL) - return; - -@@ -5018,7 +5073,8 @@ - break; - putc('%', fp); - home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE); -- sprintf((char *)line + STRLEN(line), "\t%ld\t%d", -+ len = STRLEN(line); -+ vim_snprintf((char *)line + len, len - LINE_BUF_LEN, "\t%ld\t%d", - (long)buf->b_last_cursor.lnum, - buf->b_last_cursor.col); - viminfo_writestring(fp, line); -@@ -5048,7 +5104,8 @@ - */ - FOR_ALL_TAB_WINDOWS(tp, win) - if (win->w_buffer == buf) -- break; -+ goto win_found; -+win_found: - if (win != NULL && win->w_llist_ref != NULL) - return _("[Location List]"); - else -@@ -5062,7 +5119,7 @@ - { - if (buf->b_sfname != NULL) - return (char *)buf->b_sfname; -- return "[Scratch]"; -+ return _("[Scratch]"); - } - #endif - if (buf->b_fname == NULL) -@@ -5175,7 +5232,7 @@ - return; - } - -- int -+ linenr_T - buf_change_sign_type(buf, markId, typenr) - buf_T *buf; /* buffer to store sign in */ - int markId; /* sign ID */ -@@ -5192,10 +5249,10 @@ - } - } - -- return 0; -+ return (linenr_T)0; - } - -- int_u -+ int - buf_getsigntype(buf, lnum, type) - buf_T *buf; - linenr_T lnum; -@@ -5514,11 +5571,10 @@ - * this buffer. Call this to wipe out a temp buffer that does not contain any - * marks. - */ --/*ARGSUSED*/ - void - wipe_buffer(buf, aucmd) - buf_T *buf; -- int aucmd; /* When TRUE trigger autocommands. */ -+ int aucmd UNUSED; /* When TRUE trigger autocommands. */ - { - if (buf->b_fnum == top_file_num - 1) - --top_file_num; -diff -Naur vim72.orig/src/charset.c vim72/src/charset.c ---- vim72.orig/src/charset.c 2008-07-24 15:59:44.000000000 +0100 -+++ vim72/src/charset.c 2009-07-22 22:54:21.000000000 +0100 -@@ -17,7 +17,7 @@ - static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp)); - #endif - --static int nr2hex __ARGS((int c)); -+static unsigned nr2hex __ARGS((unsigned c)); - - static int chartab_initialized = FALSE; - -@@ -664,7 +664,7 @@ - } - #endif - buf[++i] = nr2hex((unsigned)c >> 4); -- buf[++i] = nr2hex(c); -+ buf[++i] = nr2hex((unsigned)c); - buf[++i] = '>'; - buf[++i] = NUL; - } -@@ -674,9 +674,9 @@ - * Lower case letters are used to avoid the confusion of being 0xf1 or - * function key 1. - */ -- static int -+ static unsigned - nr2hex(c) -- int c; -+ unsigned c; - { - if ((c & 0xf) <= 9) - return (c & 0xf) + '0'; -@@ -884,7 +884,7 @@ - if (c >= 0x100) - { - if (enc_dbcs != 0) -- return dbcs_class((unsigned)c >> 8, c & 0xff) >= 2; -+ return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2; - if (enc_utf8) - return utf_class(c) >= 2; - } -@@ -1026,13 +1026,12 @@ - * string at start of line. Warning: *headp is only set if it's a non-zero - * value, init to 0 before calling. - */ --/*ARGSUSED*/ - int - win_lbr_chartabsize(wp, s, col, headp) - win_T *wp; - char_u *s; - colnr_T col; -- int *headp; -+ int *headp UNUSED; - { - #ifdef FEAT_LINEBREAK - int c; -@@ -1090,7 +1089,7 @@ - */ - numberextra = win_col_off(wp); - col2 = col; -- colmax = W_WIDTH(wp) - numberextra; -+ colmax = (colnr_T)(W_WIDTH(wp) - numberextra); - if (col >= colmax) - { - n = colmax + win_col_off2(wp); -@@ -1201,17 +1200,17 @@ - win_T *wp; - colnr_T vcol; - { -- colnr_T width1; /* width of first line (after line number) */ -- colnr_T width2; /* width of further lines */ -+ int width1; /* width of first line (after line number) */ -+ int width2; /* width of further lines */ - - #ifdef FEAT_VERTSPLIT - if (wp->w_width == 0) /* there is no border */ - return FALSE; - #endif - width1 = W_WIDTH(wp) - win_col_off(wp); -- if (vcol < width1 - 1) -+ if ((int)vcol < width1 - 1) - return FALSE; -- if (vcol == width1 - 1) -+ if ((int)vcol == width1 - 1) - return TRUE; - width2 = width1 + win_col_off2(wp); - return ((vcol - width1) % width2 == width2 - 1); -@@ -1396,13 +1395,13 @@ - # ifdef FEAT_MBYTE - /* Cannot put the cursor on part of a wide character. */ - ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE); -- if (pos->col < STRLEN(ptr)) -+ if (pos->col < (colnr_T)STRLEN(ptr)) - { - int c = (*mb_ptr2char)(ptr + pos->col); - - if (c != TAB && vim_isprintc(c)) - { -- endadd = char2cells(c) - 1; -+ endadd = (colnr_T)(char2cells(c) - 1); - if (coladd > endadd) /* past end of line */ - endadd = 0; - else -diff -Naur vim72.orig/src/config.h.in vim72/src/config.h.in ---- vim72.orig/src/config.h.in 2008-06-21 16:01:41.000000000 +0100 -+++ vim72/src/config.h.in 2009-07-22 22:54:22.000000000 +0100 -@@ -30,12 +30,18 @@ - /* Define when __DATE__ " " __TIME__ can be used */ - #undef HAVE_DATE_TIME - -+/* Define when __attribute__((unused)) can be used */ -+#undef HAVE_ATTRIBUTE_UNUSED -+ - /* defined always when using configure */ - #undef UNIX - - /* Defined to the size of an int */ - #undef SIZEOF_INT - -+/* Define when wchar_t is only 2 bytes. */ -+#undef SMALL_WCHAR_T -+ - /* - * If we cannot trust one of the following from the libraries, we use our - * own safe but probably slower vim_memmove(). -@@ -50,6 +56,9 @@ - /* Define to empty if the keyword does not work. */ - #undef const - -+/* Define to empty if the keyword does not work. */ -+#undef volatile -+ - /* Define to `int' if doesn't define. */ - #undef mode_t - -diff -Naur vim72.orig/src/config.mk.in vim72/src/config.mk.in ---- vim72.orig/src/config.mk.in 2008-06-21 16:56:41.000000000 +0100 -+++ vim72/src/config.mk.in 2009-07-22 22:54:22.000000000 +0100 -@@ -41,6 +41,8 @@ - MZSCHEME_OBJ = @MZSCHEME_OBJ@ - MZSCHEME_CFLAGS = @MZSCHEME_CFLAGS@ - MZSCHEME_PRO = @MZSCHEME_PRO@ -+MZSCHEME_EXTRA = @MZSCHEME_EXTRA@ -+MZSCHEME_MZC = @MZSCHEME_MZC@ - - PERL = @vi_cv_path_perl@ - PERLLIB = @vi_cv_perllib@ -diff -Naur vim72.orig/src/configure.in vim72/src/configure.in ---- vim72.orig/src/configure.in 2008-07-24 13:40:26.000000000 +0100 -+++ vim72/src/configure.in 2009-07-22 22:54:24.000000000 +0100 -@@ -414,7 +414,7 @@ - AC_MSG_RESULT("$PLTHOME") - vi_cv_path_mzscheme_pfx="$PLTHOME" - else -- AC_MSG_RESULT("not set") -+ AC_MSG_RESULT(not set) - dnl -- try to find MzScheme executable - AC_PATH_PROG(vi_cv_path_mzscheme, mzscheme) - -@@ -430,14 +430,16 @@ - if test "X$vi_cv_path_mzscheme" != "X"; then - dnl -- find where MzScheme thinks it was installed - AC_CACHE_CHECK(MzScheme install prefix,vi_cv_path_mzscheme_pfx, -- [ vi_cv_path_mzscheme_pfx=` -- ${vi_cv_path_mzscheme} -evm \ -- "(display (simplify-path \ -+ dnl different versions of MzScheme differ in command line processing -+ dnl use universal approach -+ echo "(display (simplify-path \ - (build-path (call-with-values \ - (lambda () (split-path (find-system-path (quote exec-file)))) \ -- (lambda (base name must-be-dir?) base)) (quote up))))"` ]) -- dnl Remove a trailing slash. -- vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'` -+ (lambda (base name must-be-dir?) base)) (quote up))))" > mzdirs.scm -+ dnl Remove a trailing slash -+ [ vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \ -+ sed -e 's+/$++'` ]) -+ rm -f mzdirs.scm - fi - fi - fi -@@ -446,16 +448,24 @@ - if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) - if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then -- AC_MSG_RESULT("yes") -+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include -+ AC_MSG_RESULT(yes) - else -- AC_MSG_RESULT("no") -- AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include) -+ AC_MSG_RESULT(no) -+ AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt) - if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then -- AC_MSG_RESULT("yes") -- SCHEME_INC=/plt -+ AC_MSG_RESULT(yes) -+ SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt - else -- AC_MSG_RESULT("no") -- vi_cv_path_mzscheme_pfx= -+ AC_MSG_RESULT(no) -+ AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/) -+ if test -f /usr/include/plt/scheme.h; then -+ AC_MSG_RESULT(yes) -+ SCHEME_INC=/usr/include/plt -+ else -+ AC_MSG_RESULT(no) -+ vi_cv_path_mzscheme_pfx= -+ fi - fi - fi - fi -@@ -463,23 +473,38 @@ - if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - if test "x$MACOSX" = "xyes"; then - MZSCHEME_LIBS="-framework PLT_MzScheme" -+ elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then -+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a" -+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" - elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then - MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" - else -- MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" -+ dnl Using shared objects -+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then -+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m" -+ MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" -+ else -+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" -+ fi - if test "$GCC" = yes; then - dnl Make Vim remember the path to the library. For when it's not in - dnl $LD_LIBRARY_PATH. -- MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" -+ MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" - elif test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then -- MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" -+ MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" - fi - fi - if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then - SCHEME_COLLECTS=lib/plt/ - fi -- MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC} \ -+ if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then -+ dnl need to generate bytecode for MzScheme base -+ MZSCHEME_EXTRA="mzscheme_base.c" -+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" -+ MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" -+ fi -+ MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ - -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'" - MZSCHEME_SRC="if_mzsch.c" - MZSCHEME_OBJ="objects/if_mzsch.o" -@@ -491,6 +516,8 @@ - AC_SUBST(MZSCHEME_PRO) - AC_SUBST(MZSCHEME_LIBS) - AC_SUBST(MZSCHEME_CFLAGS) -+ AC_SUBST(MZSCHEME_EXTRA) -+ AC_SUBST(MZSCHEME_MZC) - fi - - -@@ -957,7 +984,13 @@ - fi - rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` - if test "X$rubyldflags" != "X"; then -- LDFLAGS="$rubyldflags $LDFLAGS" -+ dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only -+ dnl be included if requested by passing --with-mac-arch to -+ dnl configure, so strip these flags first (if present) -+ rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` -+ if test "X$rubyldflags" != "X"; then -+ LDFLAGS="$rubyldflags $LDFLAGS" -+ fi - fi - RUBY_SRC="if_ruby.c" - RUBY_OBJ="objects/if_ruby.o" -@@ -1193,6 +1226,28 @@ - - LDFLAGS="$ac_save_LDFLAGS" - -+ AC_MSG_CHECKING(size of wchar_t is 2 bytes) -+ AC_CACHE_VAL(ac_cv_small_wchar_t, -+ [AC_TRY_RUN([ -+#include -+#if STDC_HEADERS -+# include -+# include -+#endif -+ main() -+ { -+ if (sizeof(wchar_t) <= 2) -+ exit(1); -+ exit(0); -+ }], -+ ac_cv_small_wchar_t="no", -+ ac_cv_small_wchar_t="yes", -+ AC_MSG_ERROR(failed to compile test program))]) -+ AC_MSG_RESULT($ac_cv_small_wchar_t) -+ if test "x$ac_cv_small_wchar_t" = "xyes" ; then -+ AC_DEFINE(SMALL_WCHAR_T) -+ fi -+ - fi - fi - -@@ -2067,6 +2122,11 @@ - AC_MSG_RESULT(yes); AC_DEFINE(HAVE_DATE_TIME), - AC_MSG_RESULT(no)) - -+AC_MSG_CHECKING(whether __attribute__((unused)) is allowed) -+AC_TRY_COMPILE([#include ], [int x __attribute__((unused));], -+ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED), -+ AC_MSG_RESULT(no)) -+ - dnl Checks for header files. - AC_CHECK_HEADER(elf.h, HAS_ELF=1) - dnl AC_CHECK_HEADER(dwarf.h, SVR4=1) -@@ -2095,7 +2155,7 @@ - sys/stream.h termios.h libc.h sys/statfs.h \ - poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ - libgen.h util/debug.h util/msg18n.h frame.h \ -- sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h) -+ sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h) - - dnl sys/ptem.h depends on sys/stream.h on Solaris - AC_CHECK_HEADERS(sys/ptem.h, [], [], -@@ -2103,6 +2163,12 @@ - # include - #endif]) - -+dnl sys/sysctl.h depends on sys/param.h on OpenBSD -+AC_CHECK_HEADERS(sys/sysctl.h, [], [], -+[#if defined HAVE_SYS_PARAM_H -+# include -+#endif]) -+ - - dnl pthread_np.h may exist but can only be used after including pthread.h - AC_MSG_CHECKING([for pthread_np.h]) -@@ -2148,6 +2214,7 @@ - dnl Checks for typedefs, structures, and compiler characteristics. - AC_PROG_GCC_TRADITIONAL - AC_C_CONST -+AC_C_VOLATILE - AC_TYPE_MODE_T - AC_TYPE_OFF_T - AC_TYPE_PID_T -@@ -2869,7 +2936,6 @@ - AC_MSG_RESULT($ac_cv_sizeof_int) - AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int) - -- - dnl Check for memmove() before bcopy(), makes memmove() be used when both are - dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. - -@@ -2951,7 +3017,7 @@ - if test "$enable_multibyte" = "yes"; then - cflags_save=$CFLAGS - ldflags_save=$LDFLAGS -- if test -n "$x_includes" ; then -+ if test "x$x_includes" != "xNONE" ; then - CFLAGS="$CFLAGS -I$x_includes" - LDFLAGS="$X_LIBS $LDFLAGS -lX11" - AC_MSG_CHECKING(whether X_LOCALE needed) -@@ -2967,7 +3033,7 @@ - dnl Link with xpg4, it is said to make Korean locale working - AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) - --dnl Check how we can run ctags -+dnl Check how we can run ctags. Default to "ctags" when nothing works. - dnl --version for Exuberant ctags (preferred) - dnl Add --fields=+S to get function signatures for omni completion. - dnl -t for typedefs (many ctags have this) -@@ -2979,6 +3045,7 @@ - if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then - TAGPRG="ctags -I INIT+ --fields=+S" - else -+ TAGPRG="ctags" - (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" - (eval etags -c /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c" - (eval ctags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="ctags" -@@ -3152,18 +3219,25 @@ - dnl But only when making dependencies, cproto and lint don't take "-isystem". - dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow - dnl the number before the version number. --AC_MSG_CHECKING(for GCC 3 or later) - DEPEND_CFLAGS_FILTER= - if test "$GCC" = yes; then -+ AC_MSG_CHECKING(for GCC 3 or later) - gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'` - if test "$gccmajor" -gt "2"; then - DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is -+ dnl declared as char x[1] but actually longer. Introduced in gcc 4.0. -+ AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) -+ if test "$gccmajor" -gt "3"; then -+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) - fi --fi --if test "$DEPEND_CFLAGS_FILTER" = ""; then -- AC_MSG_RESULT(no) --else -- AC_MSG_RESULT(yes) - fi - AC_SUBST(DEPEND_CFLAGS_FILTER) - -diff -Naur vim72.orig/src/diff.c vim72/src/diff.c ---- vim72.orig/src/diff.c 2008-03-05 11:16:56.000000000 +0000 -+++ vim72/src/diff.c 2009-07-22 22:54:24.000000000 +0100 -@@ -8,7 +8,7 @@ - */ - - /* -- * diff.c: code for diff'ing two or three buffers. -+ * diff.c: code for diff'ing two, three or four buffers. - */ - - #include "vim.h" -@@ -73,6 +73,8 @@ - { - tp->tp_diffbuf[i] = NULL; - tp->tp_diff_invalid = TRUE; -+ if (tp == curtab) -+ diff_redraw(TRUE); - } - } - } -@@ -102,6 +104,7 @@ - { - curtab->tp_diffbuf[i] = NULL; - curtab->tp_diff_invalid = TRUE; -+ diff_redraw(TRUE); - } - } - } -@@ -113,7 +116,7 @@ - * Add a buffer to make diffs for. - * Call this when a new buffer is being edited in the current window where - * 'diff' is set. -- * Marks the current buffer as being part of the diff and requireing updating. -+ * Marks the current buffer as being part of the diff and requiring updating. - * This must be done before any autocmd, because a command may use info - * about the screen contents. - */ -@@ -131,6 +134,7 @@ - { - curtab->tp_diffbuf[i] = buf; - curtab->tp_diff_invalid = TRUE; -+ diff_redraw(TRUE); - return; - } - -@@ -648,10 +652,9 @@ - * The buffers are written to a file, also for unmodified buffers (the file - * could have been produced by autocommands, e.g. the netrw plugin). - */ --/*ARGSUSED*/ - void - ex_diffupdate(eap) -- exarg_T *eap; /* can be NULL, it's not used */ -+ exarg_T *eap UNUSED; /* can be NULL */ - { - buf_T *buf; - int idx_orig; -@@ -661,6 +664,7 @@ - char_u *tmp_diff; - FILE *fd; - int ok; -+ int io_error = FALSE; - - /* Delete all diffblocks. */ - diff_clear(curtab); -@@ -697,18 +701,26 @@ - { - ok = FALSE; - fd = mch_fopen((char *)tmp_orig, "w"); -- if (fd != NULL) -+ if (fd == NULL) -+ io_error = TRUE; -+ else - { -- fwrite("line1\n", (size_t)6, (size_t)1, fd); -+ if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1) -+ io_error = TRUE; - fclose(fd); - fd = mch_fopen((char *)tmp_new, "w"); -- if (fd != NULL) -+ if (fd == NULL) -+ io_error = TRUE; -+ else - { -- fwrite("line2\n", (size_t)6, (size_t)1, fd); -+ if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1) -+ io_error = TRUE; - fclose(fd); - diff_file(tmp_orig, tmp_new, tmp_diff); - fd = mch_fopen((char *)tmp_diff, "r"); -- if (fd != NULL) -+ if (fd == NULL) -+ io_error = TRUE; -+ else - { - char_u linebuf[LBUFLEN]; - -@@ -761,6 +773,8 @@ - } - if (!ok) - { -+ if (io_error) -+ EMSG(_("E810: Cannot read or write temp files")); - EMSG(_("E97: Cannot create diffs")); - diff_a_works = MAYBE; - #if defined(MSWIN) || defined(MSDOS) -@@ -812,6 +826,7 @@ - char_u *tmp_diff; - { - char_u *cmd; -+ size_t len; - - #ifdef FEAT_EVAL - if (*p_dex != NUL) -@@ -820,8 +835,9 @@ - else - #endif - { -- cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new) -- + STRLEN(tmp_diff) + STRLEN(p_srr) + 27)); -+ len = STRLEN(tmp_orig) + STRLEN(tmp_new) -+ + STRLEN(tmp_diff) + STRLEN(p_srr) + 27; -+ cmd = alloc((unsigned)len); - if (cmd != NULL) - { - /* We don't want $DIFF_OPTIONS to get in the way. */ -@@ -831,7 +847,7 @@ - /* Build the diff command and execute it. Always use -a, binary - * differences are of no use. Ignore errors, diff returns - * non-zero when differences have been found. */ -- sprintf((char *)cmd, "diff %s%s%s%s%s %s", -+ vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", - diff_a_works == FALSE ? "" : "-a ", - #if defined(MSWIN) || defined(MSDOS) - diff_bin_works == TRUE ? "--binary " : "", -@@ -841,7 +857,7 @@ - (diff_flags & DIFF_IWHITE) ? "-b " : "", - (diff_flags & DIFF_ICASE) ? "-i " : "", - tmp_orig, tmp_new); -- append_redir(cmd, p_srr, tmp_diff); -+ append_redir(cmd, (int)len, p_srr, tmp_diff); - #ifdef FEAT_AUTOCMD - block_autocmds(); /* Avoid ShellCmdPost stuff */ - #endif -@@ -866,6 +882,7 @@ - char_u *tmp_orig; /* name of original temp file */ - char_u *tmp_new; /* name of patched temp file */ - char_u *buf = NULL; -+ size_t buflen; - win_T *old_curwin = curwin; - char_u *newname = NULL; /* name of patched file buffer */ - #ifdef UNIX -@@ -876,6 +893,7 @@ - char_u *browseFile = NULL; - int browse_flag = cmdmod.browse; - #endif -+ struct stat st; - - #ifdef FEAT_BROWSE - if (cmdmod.browse) -@@ -905,16 +923,17 @@ - /* Get the absolute path of the patchfile, changing directory below. */ - fullname = FullName_save(eap->arg, FALSE); - #endif -- buf = alloc((unsigned)(STRLEN(tmp_orig) + ( -+ buflen = STRLEN(tmp_orig) + ( - # ifdef UNIX - fullname != NULL ? STRLEN(fullname) : - # endif -- STRLEN(eap->arg)) + STRLEN(tmp_new) + 16)); -+ STRLEN(eap->arg)) + STRLEN(tmp_new) + 16; -+ buf = alloc((unsigned)buflen); - if (buf == NULL) - goto theend; - - #ifdef UNIX -- /* Temporaraly chdir to /tmp, to avoid patching files in the current -+ /* Temporarily chdir to /tmp, to avoid patching files in the current - * directory when the patch file contains more than one patch. When we - * have our own temp dir use that instead, it will be cleaned up when we - * exit (any .rej files created). Don't change directory if we can't -@@ -925,10 +944,10 @@ - { - # ifdef TEMPDIRNAMES - if (vim_tempdir != NULL) -- mch_chdir((char *)vim_tempdir); -+ ignored = mch_chdir((char *)vim_tempdir); - else - # endif -- mch_chdir("/tmp"); -+ ignored = mch_chdir("/tmp"); - shorten_fnames(TRUE); - } - #endif -@@ -946,7 +965,8 @@ - { - /* Build the patch command and execute it. Ignore errors. Switch to - * cooked mode to allow the user to respond to prompts. */ -- sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig, -+ vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", -+ tmp_new, tmp_orig, - # ifdef UNIX - fullname != NULL ? fullname : - # endif -@@ -980,44 +1000,51 @@ - STRCAT(buf, ".rej"); - mch_remove(buf); - -- if (curbuf->b_fname != NULL) -+ /* Only continue if the output file was created. */ -+ if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) -+ EMSG(_("E816: Cannot read patch output")); -+ else - { -- newname = vim_strnsave(curbuf->b_fname, -+ if (curbuf->b_fname != NULL) -+ { -+ newname = vim_strnsave(curbuf->b_fname, - (int)(STRLEN(curbuf->b_fname) + 4)); -- if (newname != NULL) -- STRCAT(newname, ".new"); -- } -+ if (newname != NULL) -+ STRCAT(newname, ".new"); -+ } - - #ifdef FEAT_GUI -- need_mouse_correct = TRUE; -+ need_mouse_correct = TRUE; - #endif -- /* don't use a new tab page, each tab page has its own diffs */ -- cmdmod.tab = 0; -+ /* don't use a new tab page, each tab page has its own diffs */ -+ cmdmod.tab = 0; - -- if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) -- { -- /* Pretend it was a ":split fname" command */ -- eap->cmdidx = CMD_split; -- eap->arg = tmp_new; -- do_exedit(eap, old_curwin); -- -- if (curwin != old_curwin) /* split must have worked */ -+ if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) - { -- /* Set 'diff', 'scrollbind' on and 'wrap' off. */ -- diff_win_options(curwin, TRUE); -- diff_win_options(old_curwin, TRUE); -+ /* Pretend it was a ":split fname" command */ -+ eap->cmdidx = CMD_split; -+ eap->arg = tmp_new; -+ do_exedit(eap, old_curwin); - -- if (newname != NULL) -+ /* check that split worked and editing tmp_new */ -+ if (curwin != old_curwin && win_valid(old_curwin)) - { -- /* do a ":file filename.new" on the patched buffer */ -- eap->arg = newname; -- ex_file(eap); -+ /* Set 'diff', 'scrollbind' on and 'wrap' off. */ -+ diff_win_options(curwin, TRUE); -+ diff_win_options(old_curwin, TRUE); -+ -+ if (newname != NULL) -+ { -+ /* do a ":file filename.new" on the patched buffer */ -+ eap->arg = newname; -+ ex_file(eap); - - #ifdef FEAT_AUTOCMD -- /* Do filetype detection with the new name. */ -- if (au_has_group((char_u *)"filetypedetect")) -- do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); -+ /* Do filetype detection with the new name. */ -+ if (au_has_group((char_u *)"filetypedetect")) -+ do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); - #endif -+ } - } - } - } -@@ -1074,10 +1101,9 @@ - /* - * Set options to show difs for the current window. - */ --/*ARGSUSED*/ - void - ex_diffthis(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - /* Set 'diff', 'scrollbind' on and 'wrap' off. */ - diff_win_options(curwin, TRUE); -@@ -1138,7 +1164,7 @@ - - for (wp = firstwin; wp != NULL; wp = wp->w_next) - { -- if (wp == curwin || eap->forceit) -+ if (wp == curwin || (eap->forceit && wp->w_p_diff)) - { - /* Set 'diff', 'scrollbind' off and 'wrap' on. */ - wp->w_p_diff = FALSE; -@@ -2114,6 +2140,8 @@ - EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); - return; - } -+ if (buf == curbuf) -+ return; /* nothing to do */ - idx_other = diff_buf_idx(buf); - if (idx_other == DB_COUNT) - { -diff -Naur vim72.orig/src/digraph.c vim72/src/digraph.c ---- vim72.orig/src/digraph.c 2008-06-23 22:12:51.000000000 +0100 -+++ vim72/src/digraph.c 2009-07-22 22:54:21.000000000 +0100 -@@ -32,7 +32,7 @@ - static void printdigraph __ARGS((digr_T *)); - - /* digraphs added by the user */ --static garray_T user_digraphs = {0, 0, sizeof(digr_T), 10, NULL}; -+static garray_T user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL}; - - /* - * Note: Characters marked with XX are not included literally, because some -@@ -2371,10 +2371,10 @@ - } - else - #endif -- *p++ = dp->result; -+ *p++ = (char_u)dp->result; - if (char2cells(dp->result) == 1) - *p++ = ' '; -- sprintf((char *)p, " %3d", dp->result); -+ vim_snprintf((char *)p, sizeof(buf) - (p - buf), " %3d", dp->result); - msg_outtrans(buf); - } - } -@@ -2395,7 +2395,10 @@ - static void keymap_unload __ARGS((void)); - - /* -- * Set up key mapping tables for the 'keymap' option -+ * Set up key mapping tables for the 'keymap' option. -+ * Returns NULL if OK, an error message for failure. This only needs to be -+ * used when setting the option, not later when the value has already been -+ * checked. - */ - char_u * - keymap_init() -@@ -2412,25 +2415,29 @@ - else - { - char_u *buf; -+ size_t buflen; - - /* Source the keymap file. It will contain a ":loadkeymap" command - * which will call ex_loadkeymap() below. */ -- buf = alloc((unsigned)(STRLEN(curbuf->b_p_keymap) -+ buflen = STRLEN(curbuf->b_p_keymap) - # ifdef FEAT_MBYTE -- + STRLEN(p_enc) -+ + STRLEN(p_enc) - # endif -- + 14)); -+ + 14; -+ buf = alloc((unsigned)buflen); - if (buf == NULL) - return e_outofmem; - - # ifdef FEAT_MBYTE - /* try finding "keymap/'keymap'_'encoding'.vim" in 'runtimepath' */ -- sprintf((char *)buf, "keymap/%s_%s.vim", curbuf->b_p_keymap, p_enc); -+ vim_snprintf((char *)buf, buflen, "keymap/%s_%s.vim", -+ curbuf->b_p_keymap, p_enc); - if (source_runtime(buf, FALSE) == FAIL) - # endif - { - /* try finding "keymap/'keymap'.vim" in 'runtimepath' */ -- sprintf((char *)buf, "keymap/%s.vim", curbuf->b_p_keymap); -+ vim_snprintf((char *)buf, buflen, "keymap/%s.vim", -+ curbuf->b_p_keymap); - if (source_runtime(buf, FALSE) == FAIL) - { - vim_free(buf); -diff -Naur vim72.orig/src/edit.c vim72/src/edit.c ---- vim72.orig/src/edit.c 2008-08-06 13:51:17.000000000 +0100 -+++ vim72/src/edit.c 2009-07-22 22:54:23.000000000 +0100 -@@ -57,7 +57,7 @@ - N_(" Keyword Local completion (^N^P)"), - }; - --static char_u e_hitend[] = N_("Hit end of paragraph"); -+static char e_hitend[] = N_("Hit end of paragraph"); - - /* - * Structure used to store one match for insert completion. -@@ -114,6 +114,10 @@ - * FALSE the word to be completed must be located. */ - static int compl_started = FALSE; - -+/* Set when doing something for completion that may call edit() recursively, -+ * which is not allowed. */ -+static int compl_busy = FALSE; -+ - static int compl_matches = 0; - static char_u *compl_pattern = NULL; - static int compl_direction = FORWARD; -@@ -147,6 +151,7 @@ - static int ins_compl_bs __ARGS((void)); - static void ins_compl_new_leader __ARGS((void)); - static void ins_compl_addleader __ARGS((int c)); -+static int ins_compl_len __ARGS((void)); - static void ins_compl_restart __ARGS((void)); - static void ins_compl_set_original_text __ARGS((char_u *str)); - static void ins_compl_addfrommatch __ARGS((void)); -@@ -164,7 +169,7 @@ - static int ins_compl_key2count __ARGS((int c)); - static int ins_compl_use_match __ARGS((int c)); - static int ins_complete __ARGS((int c)); --static int quote_meta __ARGS((char_u *dest, char_u *str, int len)); -+static unsigned quote_meta __ARGS((char_u *dest, char_u *str, int len)); - #endif /* FEAT_INS_EXPAND */ - - #define BACKSPACE_CHAR 1 -@@ -197,7 +202,8 @@ - static void mb_replace_pop_ins __ARGS((int cc)); - #endif - static void replace_flush __ARGS((void)); --static void replace_do_bs __ARGS((void)); -+static void replace_do_bs __ARGS((int limit_col)); -+static int del_char_after_col __ARGS((int limit_col)); - #ifdef FEAT_CINDENT - static int cindent_on __ARGS((void)); - #endif -@@ -304,7 +310,7 @@ - int c = 0; - char_u *ptr; - int lastc; -- colnr_T mincol; -+ int mincol; - static linenr_T o_lnum = 0; - int i; - int did_backspace = TRUE; /* previous char was backspace */ -@@ -344,7 +350,7 @@ - - #ifdef FEAT_INS_EXPAND - /* Don't allow recursive insert mode when busy with completion. */ -- if (compl_started || pum_visible()) -+ if (compl_started || compl_busy || pum_visible()) - { - EMSG(_(e_secure)); - return FALSE; -@@ -385,7 +391,7 @@ - if (startln) - Insstart.col = 0; - } -- Insstart_textlen = linetabsize(ml_get_curline()); -+ Insstart_textlen = (colnr_T)linetabsize(ml_get_curline()); - Insstart_blank_vcol = MAXCOL; - if (!did_ai) - ai_col = 0; -@@ -651,7 +657,7 @@ - mincol = curwin->w_wcol; - validate_cursor_col(); - -- if ((int)curwin->w_wcol < (int)mincol - curbuf->b_p_ts -+ if ((int)curwin->w_wcol < mincol - curbuf->b_p_ts - && curwin->w_wrow == W_WINROW(curwin) - + curwin->w_height - 1 - p_so - && (curwin->w_cursor.lnum != curwin->w_topline -@@ -751,7 +757,7 @@ - * there is nothing to add, CTRL-L works like CTRL-P then. */ - if (c == Ctrl_L - && (ctrl_x_mode != CTRL_X_WHOLE_LINE -- || STRLEN(compl_shown_match->cp_str) -+ || (int)STRLEN(compl_shown_match->cp_str) - > curwin->w_cursor.col - compl_col)) - { - ins_compl_addfrommatch(); -@@ -1338,8 +1344,10 @@ - goto normalchar; - - docomplete: -+ compl_busy = TRUE; - if (ins_complete(c) == FAIL) - compl_cont_status = 0; -+ compl_busy = FALSE; - break; - #endif /* FEAT_INS_EXPAND */ - -@@ -1441,10 +1449,9 @@ - * Only redraw when there are no characters available. This speeds up - * inserting sequences of characters (e.g., for CTRL-R). - */ --/*ARGSUSED*/ - static void - ins_redraw(ready) -- int ready; /* not busy with something */ -+ int ready UNUSED; /* not busy with something */ - { - if (!char_avail()) - { -@@ -1771,7 +1778,7 @@ - * Compute the screen column where the cursor should be. - */ - vcol = get_indent() - vcol; -- curwin->w_virtcol = (vcol < 0) ? 0 : vcol; -+ curwin->w_virtcol = (colnr_T)((vcol < 0) ? 0 : vcol); - - /* - * Advance the cursor until we reach the right screen column. -@@ -1798,9 +1805,9 @@ - */ - if (vcol != (int)curwin->w_virtcol) - { -- curwin->w_cursor.col = new_cursor_col; -+ curwin->w_cursor.col = (colnr_T)new_cursor_col; - i = (int)curwin->w_virtcol - vcol; -- ptr = alloc(i + 1); -+ ptr = alloc((unsigned)(i + 1)); - if (ptr != NULL) - { - new_cursor_col += i; -@@ -1824,7 +1831,7 @@ - if (new_cursor_col <= 0) - curwin->w_cursor.col = 0; - else -- curwin->w_cursor.col = new_cursor_col; -+ curwin->w_cursor.col = (colnr_T)new_cursor_col; - curwin->w_set_curswant = TRUE; - changed_cline_bef_curs(); - -@@ -1933,6 +1940,8 @@ - /* - * Backspace the cursor until the given column. Handles REPLACE and VREPLACE - * modes correctly. May also be used when not in insert mode at all. -+ * Will attempt not to go before "col" even when there is a composing -+ * character. - */ - void - backspace_until_column(col) -@@ -1942,13 +1951,49 @@ - { - curwin->w_cursor.col--; - if (State & REPLACE_FLAG) -- replace_do_bs(); -- else -- (void)del_char(FALSE); -+ replace_do_bs(col); -+ else if (!del_char_after_col(col)) -+ break; - } - } - #endif - -+/* -+ * Like del_char(), but make sure not to go before column "limit_col". -+ * Only matters when there are composing characters. -+ * Return TRUE when something was deleted. -+ */ -+ static int -+del_char_after_col(limit_col) -+ int limit_col UNUSED; -+{ -+#ifdef FEAT_MBYTE -+ if (enc_utf8 && limit_col >= 0) -+ { -+ colnr_T ecol = curwin->w_cursor.col + 1; -+ -+ /* Make sure the cursor is at the start of a character, but -+ * skip forward again when going too far back because of a -+ * composing character. */ -+ mb_adjust_cursor(); -+ while (curwin->w_cursor.col < (colnr_T)limit_col) -+ { -+ int l = utf_ptr2len(ml_get_cursor()); -+ -+ if (l == 0) /* end of line */ -+ break; -+ curwin->w_cursor.col += l; -+ } -+ if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol) -+ return FALSE; -+ del_bytes((long)((int)ecol - curwin->w_cursor.col), FALSE, TRUE); -+ } -+ else -+#endif -+ (void)del_char(FALSE); -+ return TRUE; -+} -+ - #if defined(FEAT_INS_EXPAND) || defined(PROTO) - /* - * CTRL-X pressed in Insert mode. -@@ -2160,7 +2205,7 @@ - actual_compl_length = compl_length; - - /* Allocate wide character array for the completion and fill it. */ -- wca = (int *)alloc(actual_len * sizeof(int)); -+ wca = (int *)alloc((unsigned)(actual_len * sizeof(int))); - if (wca != NULL) - { - p = str; -@@ -2418,7 +2463,7 @@ - { - had_match = (curwin->w_cursor.col > compl_col); - ins_compl_delete(); -- ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_leader + ins_compl_len()); - ins_redraw(FALSE); - - /* When the match isn't there (to avoid matching itself) remove it -@@ -2470,7 +2515,7 @@ - *p = NUL; - had_match = (curwin->w_cursor.col > compl_col); - ins_compl_delete(); -- ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_leader + ins_compl_len()); - ins_redraw(FALSE); - - /* When the match isn't there (to avoid matching itself) remove it -@@ -2539,7 +2584,7 @@ - */ - void - set_completion(startcol, list) -- int startcol; -+ colnr_T startcol; - list_T *list; - { - /* If already doing completions stop it. */ -@@ -2550,10 +2595,10 @@ - if (stop_arrow() == FAIL) - return; - -- if (startcol > (int)curwin->w_cursor.col) -+ if (startcol > curwin->w_cursor.col) - startcol = curwin->w_cursor.col; - compl_col = startcol; -- compl_length = curwin->w_cursor.col - startcol; -+ compl_length = (int)curwin->w_cursor.col - (int)startcol; - /* compl_pattern doesn't need to be set */ - compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length); - if (compl_orig_text == NULL || ins_compl_add(compl_orig_text, -@@ -2819,7 +2864,6 @@ - regmatch_T regmatch; - char_u **files; - int count; -- int i; - int save_p_scs; - int dir = compl_direction; - -@@ -2851,17 +2895,18 @@ - if (ctrl_x_mode == CTRL_X_WHOLE_LINE) - { - char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\"); -+ size_t len; - - if (pat_esc == NULL) - goto theend; -- i = (int)STRLEN(pat_esc) + 10; -- ptr = alloc(i); -+ len = STRLEN(pat_esc) + 10; -+ ptr = alloc((unsigned)len); - if (ptr == NULL) - { - vim_free(pat_esc); - goto theend; - } -- vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc); -+ vim_snprintf((char *)ptr, len, "^\\s*\\zs\\V%s", pat_esc); - regmatch.regprog = vim_regcomp(ptr, RE_MAGIC); - vim_free(pat_esc); - vim_free(ptr); -@@ -2952,7 +2997,7 @@ - { - vim_snprintf((char *)IObuff, IOSIZE, - _("Scanning dictionary: %s"), (char *)files[i]); -- msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); -+ (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); - } - - if (fp != NULL) -@@ -3133,6 +3178,7 @@ - vim_free(match); - } while (compl_curr_match != NULL && compl_curr_match != compl_first_match); - compl_first_match = compl_curr_match = NULL; -+ compl_shown_match = NULL; - } - - static void -@@ -3209,7 +3255,7 @@ - { - ins_compl_del_pum(); - ins_compl_delete(); -- ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_leader + ins_compl_len()); - compl_used_match = FALSE; - - if (compl_started) -@@ -3264,6 +3310,20 @@ - } - - /* -+ * Return the length of the completion, from the completion start column to -+ * the cursor column. Making sure it never goes below zero. -+ */ -+ static int -+ins_compl_len() -+{ -+ int off = (int)curwin->w_cursor.col - (int)compl_col; -+ -+ if (off < 0) -+ return 0; -+ return off; -+} -+ -+/* - * Append one character to the match leader. May reduce the number of - * matches. - */ -@@ -3292,7 +3352,7 @@ - - vim_free(compl_leader); - compl_leader = vim_strnsave(ml_get_curline() + compl_col, -- curwin->w_cursor.col - compl_col); -+ (int)(curwin->w_cursor.col - compl_col)); - if (compl_leader != NULL) - ins_compl_new_leader(); - } -@@ -3340,7 +3400,7 @@ - ins_compl_addfrommatch() - { - char_u *p; -- int len = curwin->w_cursor.col - compl_col; -+ int len = (int)curwin->w_cursor.col - (int)compl_col; - int c; - compl_T *cp; - -@@ -3621,10 +3681,9 @@ - { - ins_compl_delete(); - if (compl_leader != NULL) -- ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_leader + ins_compl_len()); - else if (compl_first_match != NULL) -- ins_bytes(compl_orig_text -- + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_orig_text + ins_compl_len()); - retval = TRUE; - } - -@@ -3907,7 +3966,7 @@ - : ins_buf->b_sfname == NULL - ? (char *)ins_buf->b_fname - : (char *)ins_buf->b_sfname); -- msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); -+ (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); - } - else if (*e_cpt == NUL) - break; -@@ -3936,8 +3995,8 @@ - else if (*e_cpt == ']' || *e_cpt == 't') - { - type = CTRL_X_TAGS; -- sprintf((char*)IObuff, _("Scanning tags.")); -- msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); -+ vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); -+ (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); - } - else - type = -1; -@@ -4035,7 +4094,7 @@ - case CTRL_X_SPELL: - #ifdef FEAT_SPELL - num_matches = expand_spelling(first_match_pos.lnum, -- first_match_pos.col, compl_pattern, &matches); -+ compl_pattern, &matches); - if (num_matches > 0) - ins_compl_add_matches(num_matches, matches, p_ic); - #endif -@@ -4187,7 +4246,7 @@ - } - - /* check if compl_curr_match has changed, (e.g. other type of -- * expansion added somenthing) */ -+ * expansion added something) */ - if (type != 0 && compl_curr_match != old_match) - found_new_match = OK; - -@@ -4256,7 +4315,7 @@ - static void - ins_compl_insert() - { -- ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_shown_match->cp_str + ins_compl_len()); - if (compl_shown_match->cp_flags & ORIGINAL_TEXT) - compl_used_match = FALSE; - else -@@ -4425,7 +4484,7 @@ - if (!compl_get_longest || compl_used_match) - ins_compl_insert(); - else -- ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); -+ ins_bytes(compl_leader + ins_compl_len()); - } - else - compl_used_match = FALSE; -@@ -4688,7 +4747,7 @@ - } - compl_length = curwin->w_cursor.col - (int)compl_col; - /* IObuff is used to add a "word from the next line" would we -- * have enough space? just being paranoic */ -+ * have enough space? just being paranoid */ - #define MIN_SPACE 75 - if (compl_length > (IOSIZE - MIN_SPACE)) - { -@@ -4745,10 +4804,9 @@ - { - char_u *prefix = (char_u *)"\\<"; - -- /* we need 3 extra chars, 1 for the NUL and -- * 2 >= strlen(prefix) -- Acevedo */ -+ /* we need up to 2 extra chars for the prefix */ - compl_pattern = alloc(quote_meta(NULL, line + compl_col, -- compl_length) + 3); -+ compl_length) + 2); - if (compl_pattern == NULL) - return FAIL; - if (!vim_iswordp(line + compl_col) -@@ -4823,7 +4881,7 @@ - else - { - compl_pattern = alloc(quote_meta(NULL, line + compl_col, -- compl_length) + 3); -+ compl_length) + 2); - if (compl_pattern == NULL) - return FAIL; - STRCPY((char *)compl_pattern, "\\<"); -@@ -4905,7 +4963,7 @@ - if (col < 0) - col = curs_col; - compl_col = col; -- if ((colnr_T)compl_col > curs_col) -+ if (compl_col > curs_col) - compl_col = curs_col; - - /* Setup variables for completion. Need to obtain "line" again, -@@ -5178,15 +5236,15 @@ - * a backslash) the metachars, and dest would be NUL terminated. - * Returns the length (needed) of dest - */ -- static int -+ static unsigned - quote_meta(dest, src, len) - char_u *dest; - char_u *src; - int len; - { -- int m; -+ unsigned m = (unsigned)len + 1; /* one extra for the NUL */ - -- for (m = len; --len >= 0; src++) -+ for ( ; --len >= 0; src++) - { - switch (*src) - { -@@ -6015,7 +6073,7 @@ - * in 'formatoptions' and there is a single character before the cursor. - * Otherwise the line would be broken and when typing another non-white - * next they are not joined back together. */ -- wasatend = (pos.col == STRLEN(old)); -+ wasatend = (pos.col == (colnr_T)STRLEN(old)); - if (*old != NUL && !trailblank && wasatend) - { - dec_cursor(); -@@ -6192,7 +6250,7 @@ - * three digits. */ - if (VIM_ISDIGIT(c)) - { -- sprintf((char *)buf, "%03d", c); -+ vim_snprintf((char *)buf, sizeof(buf), "%03d", c); - AppendToRedobuff(buf); - } - else -@@ -6266,7 +6324,7 @@ - ins_need_undo = FALSE; - } - Insstart = curwin->w_cursor; /* new insertion starts here */ -- Insstart_textlen = linetabsize(ml_get_curline()); -+ Insstart_textlen = (colnr_T)linetabsize(ml_get_curline()); - ai_col = 0; - #ifdef FEAT_VREPLACE - if (State & VREPLACE_FLAG) -@@ -6369,13 +6427,17 @@ - - /* If we just did an auto-indent, remove the white space from the end - * of the line, and put the cursor back. -- * Do this when ESC was used or moving the cursor up/down. */ -+ * Do this when ESC was used or moving the cursor up/down. -+ * Check for the old position still being valid, just in case the text -+ * got changed unexpectedly. */ - if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL -- && curwin->w_cursor.lnum != end_insert_pos->lnum))) -+ && curwin->w_cursor.lnum != end_insert_pos->lnum)) -+ && end_insert_pos->lnum <= curbuf->b_ml.ml_line_count) - { - pos_T tpos = curwin->w_cursor; - - curwin->w_cursor = *end_insert_pos; -+ check_cursor_col(); /* make sure it is not past the line */ - for (;;) - { - if (gchar_cursor() == NUL && curwin->w_cursor.col > 0) -@@ -6383,7 +6445,8 @@ - cc = gchar_cursor(); - if (!vim_iswhite(cc)) - break; -- (void)del_char(TRUE); -+ if (del_char(TRUE) == FAIL) -+ break; /* should not happen */ - } - if (curwin->w_cursor.lnum != tpos.lnum) - curwin->w_cursor = tpos; -@@ -6395,10 +6458,11 @@ - * deleted characters. */ - if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum) - { -- cc = (int)STRLEN(ml_get_curline()); -- if (VIsual.col > (colnr_T)cc) -+ int len = (int)STRLEN(ml_get_curline()); -+ -+ if (VIsual.col > len) - { -- VIsual.col = cc; -+ VIsual.col = len; - # ifdef FEAT_VIRTUALEDIT - VIsual.coladd = 0; - # endif -@@ -7123,9 +7187,12 @@ - * cc == 0: character was inserted, delete it - * cc > 0: character was replaced, put cc (first byte of original char) back - * and check for more characters to be put back -+ * When "limit_col" is >= 0, don't delete before this column. Matters when -+ * using composing characters, use del_char_after_col() instead of del_char(). - */ - static void --replace_do_bs() -+replace_do_bs(limit_col) -+ int limit_col; - { - int cc; - #ifdef FEAT_VREPLACE -@@ -7153,7 +7220,7 @@ - #ifdef FEAT_MBYTE - if (has_mbyte) - { -- del_char(FALSE); -+ (void)del_char_after_col(limit_col); - # ifdef FEAT_VREPLACE - if (State & VREPLACE_FLAG) - orig_len = (int)STRLEN(ml_get_cursor()); -@@ -7203,7 +7270,7 @@ - changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); - } - else if (cc == 0) -- (void)del_char(FALSE); -+ (void)del_char_after_col(limit_col); - } - - #ifdef FEAT_CINDENT -@@ -7646,9 +7713,7 @@ - */ - ++no_mapping; - regname = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(regname, TRUE); --#endif - if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P) - { - /* Get a third key for literal register insertion */ -@@ -7657,9 +7722,7 @@ - add_to_showcmd_c(literally); - #endif - regname = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(regname, TRUE); --#endif - } - --no_mapping; - -@@ -8150,7 +8213,7 @@ - /* - * If the cursor is on an indent, ^T/^D insert/delete one - * shiftwidth. Otherwise ^T/^D behave like a "<<" or ">>". -- * Always round the indent to 'shiftwith', this is compatible -+ * Always round the indent to 'shiftwidth', this is compatible - * with vi. But vi only supports ^T and ^D after an - * autoindent, we support it everywhere. - */ -@@ -8239,7 +8302,7 @@ - * Replace mode */ - if (curwin->w_cursor.lnum != Insstart.lnum - || curwin->w_cursor.col >= Insstart.col) -- replace_do_bs(); -+ replace_do_bs(-1); - } - else - (void)del_char(FALSE); -@@ -8258,6 +8321,7 @@ - linenr_T lnum; - int cc; - int temp = 0; /* init for GCC */ -+ colnr_T save_col; - colnr_T mincol; - int did_backspace = FALSE; - int in_indent; -@@ -8415,13 +8479,13 @@ - */ - while (cc > 0) - { -- temp = curwin->w_cursor.col; -+ save_col = curwin->w_cursor.col; - #ifdef FEAT_MBYTE - mb_replace_pop_ins(cc); - #else - ins_char(cc); - #endif -- curwin->w_cursor.col = temp; -+ curwin->w_cursor.col = save_col; - cc = replace_pop(); - } - /* restore the characters that NL replaced */ -@@ -8453,11 +8517,11 @@ - #endif - ) - { -- temp = curwin->w_cursor.col; -+ save_col = curwin->w_cursor.col; - beginline(BL_WHITE); - if (curwin->w_cursor.col < (colnr_T)temp) - mincol = curwin->w_cursor.col; -- curwin->w_cursor.col = temp; -+ curwin->w_cursor.col = save_col; - } - - /* -@@ -8556,7 +8620,7 @@ - break; - } - if (State & REPLACE_FLAG) -- replace_do_bs(); -+ replace_do_bs(-1); - else - { - #ifdef FEAT_MBYTE -@@ -8931,7 +8995,10 @@ - foldOpenCursor(); - #endif - undisplay_dollar(); -- if (gchar_cursor() != NUL || virtual_active() -+ if (gchar_cursor() != NUL -+#ifdef FEAT_VIRTUALEDIT -+ || virtual_active() -+#endif - ) - { - start_arrow(&curwin->w_cursor); -diff -Naur vim72.orig/src/eval.c vim72/src/eval.c ---- vim72.orig/src/eval.c 2008-08-07 20:37:22.000000000 +0100 -+++ vim72/src/eval.c 2009-07-22 22:54:22.000000000 +0100 -@@ -32,6 +32,9 @@ - - #define DICT_MAXNEST 100 /* maximum nesting of lists and dicts */ - -+#define DO_NOT_FREE_CNT 99999 /* refcount for dict or list that should not -+ be freed. */ -+ - /* - * In a hashtab item "hi_key" points to "di_key" in a dictitem. - * This avoids adding a pointer to the hashtab item. -@@ -126,8 +129,11 @@ - /* - * When recursively copying lists and dicts we need to remember which ones we - * have done to avoid endless recursiveness. This unique ID is used for that. -+ * The last bit is used for previous_funccal, ignored when comparing. - */ - static int current_copyID = 0; -+#define COPYID_INC 2 -+#define COPYID_MASK (~0x1) - - /* - * Array to hold the hashtab with variables local to each sourced script. -@@ -280,7 +286,7 @@ - #define VV_RO 2 /* read-only */ - #define VV_RO_SBX 4 /* read-only in the sandbox */ - --#define VV_NAME(s, t) s, {{t}}, {0} -+#define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}, {0} - - static struct vimvar - { -@@ -348,6 +354,7 @@ - {VV_NAME("mouse_col", VAR_NUMBER), 0}, - {VV_NAME("operator", VAR_STRING), VV_RO}, - {VV_NAME("searchforward", VAR_NUMBER), 0}, -+ {VV_NAME("oldfiles", VAR_LIST), 0}, - }; - - /* shorthand */ -@@ -355,6 +362,7 @@ - #define vv_nr vv_di.di_tv.vval.v_number - #define vv_float vv_di.di_tv.vval.v_float - #define vv_str vv_di.di_tv.vval.v_string -+#define vv_list vv_di.di_tv.vval.v_list - #define vv_tv vv_di.di_tv - - /* -@@ -426,7 +434,6 @@ - static long list_idx_of_item __ARGS((list_T *l, listitem_T *item)); - static void list_append __ARGS((list_T *l, listitem_T *item)); - static int list_append_tv __ARGS((list_T *l, typval_T *tv)); --static int list_append_string __ARGS((list_T *l, char_u *str, int len)); - static int list_append_number __ARGS((list_T *l, varnumber_T n)); - static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item)); - static int list_extend __ARGS((list_T *l1, list_T *l2, listitem_T *bef)); -@@ -435,6 +442,7 @@ - static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2)); - static char_u *list2string __ARGS((typval_T *tv, int copyID)); - static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID)); -+static int free_unref_items __ARGS((int copyID)); - static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID)); - static void set_ref_in_list __ARGS((list_T *l, int copyID)); - static void set_ref_in_item __ARGS((typval_T *tv, int copyID)); -@@ -788,6 +796,8 @@ - static void func_unref __ARGS((char_u *name)); - static void func_ref __ARGS((char_u *name)); - static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict)); -+static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ; -+static void free_funccal __ARGS((funccall_T *fc, int free_val)); - static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr)); - static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp)); - static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off)); -@@ -845,11 +855,17 @@ - p = &vimvars[i]; - if (p->vv_di.di_tv.v_type == VAR_STRING) - { -- vim_free(p->vv_di.di_tv.vval.v_string); -- p->vv_di.di_tv.vval.v_string = NULL; -+ vim_free(p->vv_str); -+ p->vv_str = NULL; -+ } -+ else if (p->vv_di.di_tv.v_type == VAR_LIST) -+ { -+ list_unref(p->vv_list); -+ p->vv_list = NULL; - } - } - hash_clear(&vimvarht); -+ hash_init(&vimvarht); /* garbage_collect() will access it */ - hash_clear(&compat_hashtab); - - /* script-local variables */ -@@ -916,6 +932,10 @@ - /* pointer to funccal for currently active function */ - funccall_T *current_funccal = NULL; - -+/* pointer to list of previously used funccal, still around because some -+ * item in it is still being used. */ -+funccall_T *previous_funccal = NULL; -+ - /* - * Return TRUE when a function was ended by a ":return" command. - */ -@@ -1256,23 +1276,28 @@ - - /* - * Top level evaluation function, returning a string. -+ * When "convert" is TRUE convert a List into a sequence of lines and convert -+ * a Float to a String. - * Return pointer to allocated memory, or NULL for failure. - */ - char_u * --eval_to_string(arg, nextcmd, dolist) -+eval_to_string(arg, nextcmd, convert) - char_u *arg; - char_u **nextcmd; -- int dolist; /* turn List into sequence of lines */ -+ int convert; - { - typval_T tv; - char_u *retval; - garray_T ga; -+#ifdef FEAT_FLOAT -+ char_u numbuf[NUMBUFLEN]; -+#endif - - if (eval0(arg, &tv, nextcmd, TRUE) == FAIL) - retval = NULL; - else - { -- if (dolist && tv.v_type == VAR_LIST) -+ if (convert && tv.v_type == VAR_LIST) - { - ga_init2(&ga, (int)sizeof(char), 80); - if (tv.vval.v_list != NULL) -@@ -1280,6 +1305,13 @@ - ga_append(&ga, NUL); - retval = (char_u *)ga.ga_data; - } -+#ifdef FEAT_FLOAT -+ else if (convert && tv.v_type == VAR_FLOAT) -+ { -+ vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float); -+ retval = vim_strsave(numbuf); -+ } -+#endif - else - retval = vim_strsave(get_tv_string(&tv)); - clear_tv(&tv); -@@ -3277,7 +3309,7 @@ - - if (*startarg != '(') - { -- EMSG2(_("E107: Missing braces: %s"), eap->arg); -+ EMSG2(_("E107: Missing parentheses: %s"), eap->arg); - goto end; - } - -@@ -3657,8 +3689,8 @@ - } - - /* -- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or -- * it refers to a List or Dictionary that is locked. -+ * Return TRUE if typeval "tv" is locked: Either that value is locked itself -+ * or it refers to a List or Dictionary that is locked. - */ - static int - tv_islocked(tv) -@@ -3744,7 +3776,6 @@ - * Function given to ExpandGeneric() to obtain the list of user defined - * (global/buffer/window/built-in) variable names. - */ --/*ARGSUSED*/ - char_u * - get_user_var_name(xp, idx) - expand_T *xp; -@@ -3902,7 +3933,7 @@ - - /* - * Handle top level expression: -- * expr1 ? expr0 : expr0 -+ * expr2 ? expr1 : expr1 - * - * "arg" must point to the first non-white of the expression. - * "arg" is advanced to the next non-white after the recognized expression. -@@ -5835,7 +5866,7 @@ - return item1 == NULL && item2 == NULL; - } - --#if defined(FEAT_PYTHON) || defined(PROTO) -+#if defined(FEAT_PYTHON) || defined(FEAT_MZSCHEME) || defined(PROTO) - /* - * Return the dictitem that an entry in a hashtable points to. - */ -@@ -6047,6 +6078,25 @@ - } - - /* -+ * Get list item "l[idx - 1]" as a string. Returns NULL for failure. -+ */ -+ char_u * -+list_find_str(l, idx) -+ list_T *l; -+ long idx; -+{ -+ listitem_T *li; -+ -+ li = list_find(l, idx - 1); -+ if (li == NULL) -+ { -+ EMSGN(_(e_listidx), idx); -+ return NULL; -+ } -+ return get_tv_string(&li->li_tv); -+} -+ -+/* - * Locate "item" list "l" and return its index. - * Returns -1 when "item" is not in the list. - */ -@@ -6137,7 +6187,7 @@ - * When "len" >= 0 use "str[len]". - * Returns FAIL when out of memory. - */ -- static int -+ int - list_append_string(l, str, len) - list_T *l; - char_u *str; -@@ -6448,14 +6498,13 @@ - int - garbage_collect() - { -- dict_T *dd; -- list_T *ll; -- int copyID = ++current_copyID; -+ int copyID; - buf_T *buf; - win_T *wp; - int i; -- funccall_T *fc; -- int did_free = FALSE; -+ funccall_T *fc, **pfc; -+ int did_free; -+ int did_free_funccal = FALSE; - #ifdef FEAT_WINDOWS - tabpage_T *tp; - #endif -@@ -6465,10 +6514,25 @@ - may_garbage_collect = FALSE; - garbage_collect_at_exit = FALSE; - -+ /* We advance by two because we add one for items referenced through -+ * previous_funccal. */ -+ current_copyID += COPYID_INC; -+ copyID = current_copyID; -+ - /* - * 1. Go through all accessible variables and mark all lists and dicts - * with copyID. - */ -+ -+ /* Don't free variables in the previous_funccal list unless they are only -+ * referenced through previous_funccal. This must be first, because if -+ * the item is referenced elsewhere the funccal must not be freed. */ -+ for (fc = previous_funccal; fc != NULL; fc = fc->caller) -+ { -+ set_ref_in_ht(&fc->l_vars.dv_hashtab, copyID + 1); -+ set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID + 1); -+ } -+ - /* script-local variables */ - for (i = 1; i <= ga_scripts.ga_len; ++i) - set_ref_in_ht(&SCRIPT_VARS(i), copyID); -@@ -6497,11 +6561,54 @@ - set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID); - } - -+ /* v: vars */ -+ set_ref_in_ht(&vimvarht, copyID); -+ -+ /* -+ * 2. Free lists and dictionaries that are not referenced. -+ */ -+ did_free = free_unref_items(copyID); -+ - /* -- * 2. Go through the list of dicts and free items without the copyID. -+ * 3. Check if any funccal can be freed now. -+ */ -+ for (pfc = &previous_funccal; *pfc != NULL; ) -+ { -+ if (can_free_funccal(*pfc, copyID)) -+ { -+ fc = *pfc; -+ *pfc = fc->caller; -+ free_funccal(fc, TRUE); -+ did_free = TRUE; -+ did_free_funccal = TRUE; -+ } -+ else -+ pfc = &(*pfc)->caller; -+ } -+ if (did_free_funccal) -+ /* When a funccal was freed some more items might be garbage -+ * collected, so run again. */ -+ (void)garbage_collect(); -+ -+ return did_free; -+} -+ -+/* -+ * Free lists and dictionaries that are no longer referenced. -+ */ -+ static int -+free_unref_items(copyID) -+ int copyID; -+{ -+ dict_T *dd; -+ list_T *ll; -+ int did_free = FALSE; -+ -+ /* -+ * Go through the list of dicts and free items without the copyID. - */ - for (dd = first_dict; dd != NULL; ) -- if (dd->dv_copyID != copyID) -+ if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)) - { - /* Free the Dictionary and ordinary items it contains, but don't - * recurse into Lists and Dictionaries, they will be in the list -@@ -6516,12 +6623,13 @@ - dd = dd->dv_used_next; - - /* -- * 3. Go through the list of lists and free items without the copyID. -- * But don't free a list that has a watcher (used in a for loop), these -- * are not referenced anywhere. -+ * Go through the list of lists and free items without the copyID. -+ * But don't free a list that has a watcher (used in a for loop), these -+ * are not referenced anywhere. - */ - for (ll = first_list; ll != NULL; ) -- if (ll->lv_copyID != copyID && ll->lv_watch == NULL) -+ if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK) -+ && ll->lv_watch == NULL) - { - /* Free the List and ordinary items it contains, but don't recurse - * into Lists and Dictionaries, they will be in the list of dicts -@@ -6587,7 +6695,7 @@ - { - case VAR_DICT: - dd = tv->vval.v_dict; -- if (dd->dv_copyID != copyID) -+ if (dd != NULL && dd->dv_copyID != copyID) - { - /* Didn't see this dict yet. */ - dd->dv_copyID = copyID; -@@ -6597,7 +6705,7 @@ - - case VAR_LIST: - ll = tv->vval.v_list; -- if (ll->lv_copyID != copyID) -+ if (ll != NULL && ll->lv_copyID != copyID) - { - /* Didn't see this list yet. */ - ll->lv_copyID = copyID; -@@ -7525,8 +7633,8 @@ - {"getwinposx", 0, 0, f_getwinposx}, - {"getwinposy", 0, 0, f_getwinposy}, - {"getwinvar", 2, 2, f_getwinvar}, -- {"glob", 1, 1, f_glob}, -- {"globpath", 2, 2, f_globpath}, -+ {"glob", 1, 2, f_glob}, -+ {"globpath", 2, 3, f_globpath}, - {"has", 1, 1, f_has}, - {"has_key", 2, 2, f_has_key}, - {"haslocaldir", 0, 0, f_haslocaldir}, -@@ -7723,7 +7831,6 @@ - * Function given to ExpandGeneric() to obtain the list of internal or - * user defined variable or function names. - */ --/*ARGSUSED*/ - char_u * - get_expr_name(xp, idx) - expand_T *xp; -@@ -7856,9 +7963,9 @@ - else if (!aborting()) - { - if (argcount == MAX_FUNC_ARGS) -- emsg_funcname("E740: Too many arguments for function %s", name); -+ emsg_funcname(N_("E740: Too many arguments for function %s"), name); - else -- emsg_funcname("E116: Invalid arguments for function %s", name); -+ emsg_funcname(N_("E116: Invalid arguments for function %s"), name); - } - - while (--argcount >= 0) -@@ -7956,7 +8063,8 @@ - /* execute the function if no errors detected and executing */ - if (evaluate && error == ERROR_NONE) - { -- rettv->v_type = VAR_NUMBER; /* default is number rettv */ -+ rettv->v_type = VAR_NUMBER; /* default rettv is number zero */ -+ rettv->vval.v_number = 0; - error = ERROR_UNKNOWN; - - if (!builtin_function(fname)) -@@ -8091,6 +8199,7 @@ - - /* - * Give an error message with a function name. Handle things. -+ * "ermsg" is to be passed without translation, use N_() instead of _(). - */ - static void - emsg_funcname(ermsg, name) -@@ -8205,7 +8314,6 @@ - return; - li = l->lv_first; - } -- rettv->vval.v_number = 0; /* Default: Success */ - for (;;) - { - if (l == NULL) -@@ -8238,10 +8346,9 @@ - /* - * "argc()" function - */ --/* ARGSUSED */ - static void - f_argc(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = ARGCOUNT; -@@ -8250,10 +8357,9 @@ - /* - * "argidx()" function - */ --/* ARGSUSED */ - static void - f_argidx(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = curwin->w_arg_idx; -@@ -8331,10 +8437,9 @@ - /* - * "browse(save, title, initdir, default)" function - */ --/* ARGSUSED */ - static void - f_browse(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_BROWSE -@@ -8366,10 +8471,9 @@ - /* - * "browsedir(title, initdir)" function - */ --/* ARGSUSED */ - static void - f_browsedir(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_BROWSE -@@ -8594,10 +8698,9 @@ - /* - * "byte2line(byte)" function - */ --/*ARGSUSED*/ - static void - f_byte2line(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifndef FEAT_BYTEOFF -@@ -8617,7 +8720,6 @@ - /* - * "byteidx()" function - */ --/*ARGSUSED*/ - static void - f_byteidx(argvars, rettv) - typval_T *argvars; -@@ -8665,7 +8767,6 @@ - int dummy; - dict_T *selfdict = NULL; - -- rettv->vval.v_number = 0; - if (argvars[1].v_type != VAR_LIST) - { - EMSG(_(e_listreq)); -@@ -8737,10 +8838,9 @@ - /* - * "changenr()" function - */ --/*ARGSUSED*/ - static void - f_changenr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = curbuf->b_u_seq_cur; -@@ -8790,11 +8890,10 @@ - /* - * "clearmatches()" function - */ --/*ARGSUSED*/ - static void - f_clearmatches(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_SEARCH_EXTRA - clear_matches(curwin); -@@ -8858,11 +8957,10 @@ - /* - * "complete()" function - */ --/*ARGSUSED*/ - static void - f_complete(argvars, rettv) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - { - int startcol; - -@@ -8893,7 +8991,6 @@ - /* - * "complete_add()" function - */ --/*ARGSUSED*/ - static void - f_complete_add(argvars, rettv) - typval_T *argvars; -@@ -8905,10 +9002,9 @@ - /* - * "complete_check()" function - */ --/*ARGSUSED*/ - static void - f_complete_check(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int saved = RedrawingDisabled; -@@ -8923,11 +9019,10 @@ - /* - * "confirm(message, buttons[, default [, type]])" function - */ --/*ARGSUSED*/ - static void - f_confirm(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - char_u *message; -@@ -8973,13 +9068,9 @@ - if (buttons == NULL || *buttons == NUL) - buttons = (char_u *)_("&Ok"); - -- if (error) -- rettv->vval.v_number = 0; -- else -+ if (!error) - rettv->vval.v_number = do_dialog(type, NULL, message, buttons, - def, NULL); --#else -- rettv->vval.v_number = 0; - #endif - } - -@@ -9096,11 +9187,10 @@ - * - * Checks the existence of a cscope connection. - */ --/*ARGSUSED*/ - static void - f_cscope_connection(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_CSCOPE - int num = 0; -@@ -9118,17 +9208,15 @@ - } - - rettv->vval.v_number = cs_connection(num, dbpath, prepend); --#else -- rettv->vval.v_number = 0; - #endif - } - - /* - * "cursor(lnum, col)" function - * -- * Moves the cursor to the specified line and column -+ * Moves the cursor to the specified line and column. -+ * Returns 0 when the position could be set, -1 otherwise. - */ --/*ARGSUSED*/ - static void - f_cursor(argvars, rettv) - typval_T *argvars; -@@ -9139,6 +9227,7 @@ - long coladd = 0; - #endif - -+ rettv->vval.v_number = -1; - if (argvars[1].v_type == VAR_UNKNOWN) - { - pos_T pos; -@@ -9183,6 +9272,7 @@ - #endif - - curwin->w_set_curswant = TRUE; -+ rettv->vval.v_number = 0; - } - - /* -@@ -9200,7 +9290,10 @@ - if (noref < 0 || noref > 1) - EMSG(_(e_invarg)); - else -- item_copy(&argvars[0], rettv, TRUE, noref == 0 ? ++current_copyID : 0); -+ { -+ current_copyID += COPYID_INC; -+ item_copy(&argvars[0], rettv, TRUE, noref == 0 ? current_copyID : 0); -+ } - } - - /* -@@ -9220,27 +9313,23 @@ - /* - * "did_filetype()" function - */ --/*ARGSUSED*/ - static void - f_did_filetype(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_AUTOCMD - rettv->vval.v_number = did_filetype; --#else -- rettv->vval.v_number = 0; - #endif - } - - /* - * "diff_filler()" function - */ --/*ARGSUSED*/ - static void - f_diff_filler(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_DIFF - rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars)); -@@ -9250,11 +9339,10 @@ - /* - * "diff_hlID()" function - */ --/*ARGSUSED*/ - static void - f_diff_hlID(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_DIFF - linenr_T lnum = get_tv_lnum(argvars); -@@ -9367,7 +9455,6 @@ - /* - * "eval()" function - */ --/*ARGSUSED*/ - static void - f_eval(argvars, rettv) - typval_T *argvars; -@@ -9391,10 +9478,9 @@ - /* - * "eventhandler()" function - */ --/*ARGSUSED*/ - static void - f_eventhandler(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = vgetc_busy; -@@ -9518,7 +9604,7 @@ - else - { - /* When the optional second argument is non-zero, don't remove matches -- * for 'suffixes' and 'wildignore' */ -+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */ - if (argvars[1].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[1], &error)) - flags |= WILD_KEEP_ALL; -@@ -9542,7 +9628,6 @@ - typval_T *argvars; - typval_T *rettv; - { -- rettv->vval.v_number = 0; - if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) - { - list_T *l1, *l2; -@@ -9652,11 +9737,10 @@ - /* - * "feedkeys()" function - */ --/*ARGSUSED*/ - static void - f_feedkeys(argvars, rettv) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - { - int remap = TRUE; - char_u *keys, *flags; -@@ -9670,7 +9754,6 @@ - if (check_secure()) - return; - -- rettv->vval.v_number = 0; - keys = get_tv_string(&argvars[0]); - if (*keys != NUL) - { -@@ -9838,7 +9921,6 @@ - char_u *ermsg = map ? (char_u *)"map()" : (char_u *)"filter()"; - int save_did_emsg; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type == VAR_LIST) - { - if ((l = argvars[0].vval.v_list) == NULL -@@ -10021,8 +10103,6 @@ - else - rettv->vval.v_number = (varnumber_T)f; - } -- else -- rettv->vval.v_number = 0; - } - - /* -@@ -10156,18 +10236,15 @@ - lnum = get_tv_lnum(argvars); - if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count) - rettv->vval.v_number = foldLevel(lnum); -- else - #endif -- rettv->vval.v_number = 0; - } - - /* - * "foldtext()" function - */ --/*ARGSUSED*/ - static void - f_foldtext(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_FOLDING -@@ -10232,10 +10309,9 @@ - /* - * "foldtextresult(lnum)" function - */ --/*ARGSUSED*/ - static void - f_foldtextresult(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_FOLDING -@@ -10268,13 +10344,11 @@ - /* - * "foreground()" function - */ --/*ARGSUSED*/ - static void - f_foreground(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { -- rettv->vval.v_number = 0; - #ifdef FEAT_GUI - if (gui.in_use) - gui_mch_set_foreground(); -@@ -10288,7 +10362,6 @@ - /* - * "function()" function - */ --/*ARGSUSED*/ - static void - f_function(argvars, rettv) - typval_T *argvars; -@@ -10296,11 +10369,11 @@ - { - char_u *s; - -- rettv->vval.v_number = 0; - s = get_tv_string(&argvars[0]); - if (s == NULL || *s == NUL || VIM_ISDIGIT(*s)) - EMSG2(_(e_invarg2), s); -- else if (!function_exists(s)) -+ /* Don't check an autoload name for existence here. */ -+ else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s)) - EMSG2(_("E700: Unknown function: %s"), s); - else - { -@@ -10312,11 +10385,10 @@ - /* - * "garbagecollect()" function - */ --/*ARGSUSED*/ - static void - f_garbagecollect(argvars, rettv) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - { - /* This is postponed until we are back at the toplevel, because we may be - * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */ -@@ -10365,9 +10437,7 @@ - - if (tv == NULL) - { -- if (argvars[2].v_type == VAR_UNKNOWN) -- rettv->vval.v_number = 0; -- else -+ if (argvars[2].v_type != VAR_UNKNOWN) - copy_tv(&argvars[2], rettv); - } - else -@@ -10392,13 +10462,8 @@ - { - char_u *p; - -- if (retlist) -- { -- if (rettv_list_alloc(rettv) == FAIL) -- return; -- } -- else -- rettv->vval.v_number = 0; -+ if (retlist && rettv_list_alloc(rettv) == FAIL) -+ return; - - if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0) - return; -@@ -10602,7 +10667,7 @@ - # ifdef FEAT_WINDOWS - win_T *wp; - # endif -- int n = 1; -+ int winnr = 1; - - if (row >= 0 && col >= 0) - { -@@ -10612,9 +10677,9 @@ - (void)mouse_comp_pos(win, &row, &col, &lnum); - # ifdef FEAT_WINDOWS - for (wp = firstwin; wp != win; wp = wp->w_next) -- ++n; -+ ++winnr; - # endif -- vimvars[VV_MOUSE_WIN].vv_nr = n; -+ vimvars[VV_MOUSE_WIN].vv_nr = winnr; - vimvars[VV_MOUSE_LNUM].vv_nr = lnum; - vimvars[VV_MOUSE_COL].vv_nr = col + 1; - } -@@ -10626,10 +10691,9 @@ - /* - * "getcharmod()" function - */ --/*ARGSUSED*/ - static void - f_getcharmod(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = mod_mask; -@@ -10638,10 +10702,9 @@ - /* - * "getcmdline()" function - */ --/*ARGSUSED*/ - static void - f_getcmdline(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->v_type = VAR_STRING; -@@ -10651,10 +10714,9 @@ - /* - * "getcmdpos()" function - */ --/*ARGSUSED*/ - static void - f_getcmdpos(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = get_cmdline_pos() + 1; -@@ -10663,10 +10725,9 @@ - /* - * "getcmdtype()" function - */ --/*ARGSUSED*/ - static void - f_getcmdtype(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->v_type = VAR_STRING; -@@ -10681,10 +10742,9 @@ - /* - * "getcwd()" function - */ --/*ARGSUSED*/ - static void - f_getcwd(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u cwd[MAXPATHL]; -@@ -10705,10 +10765,9 @@ - /* - * "getfontname()" function - */ --/*ARGSUSED*/ - static void - f_getfontname(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->v_type = VAR_STRING; -@@ -10935,18 +10994,15 @@ - /* - * "getmatches()" function - */ --/*ARGSUSED*/ - static void - f_getmatches(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_SEARCH_EXTRA - dict_T *dict; - matchitem_T *cur = curwin->w_match_head; - -- rettv->vval.v_number = 0; -- - if (rettv_list_alloc(rettv) == OK) - { - while (cur != NULL) -@@ -10968,10 +11024,9 @@ - /* - * "getpid()" function - */ --/*ARGSUSED*/ - static void - f_getpid(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = mch_get_pid(); -@@ -11015,17 +11070,15 @@ - /* - * "getqflist()" and "getloclist()" functions - */ --/*ARGSUSED*/ - static void - f_getqflist(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_QUICKFIX - win_T *wp; - #endif - -- rettv->vval.v_number = 0; - #ifdef FEAT_QUICKFIX - if (rettv_list_alloc(rettv) == OK) - { -@@ -11135,10 +11188,9 @@ - /* - * "getwinposx()" function - */ --/*ARGSUSED*/ - static void - f_getwinposx(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = -1; -@@ -11156,10 +11208,9 @@ - /* - * "getwinposy()" function - */ --/*ARGSUSED*/ - static void - f_getwinposy(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = -1; -@@ -11284,13 +11335,25 @@ - typval_T *argvars; - typval_T *rettv; - { -+ int flags = WILD_SILENT|WILD_USE_NL; - expand_T xpc; -+ int error = FALSE; - -- ExpandInit(&xpc); -- xpc.xp_context = EXPAND_FILES; -+ /* When the optional second argument is non-zero, don't remove matches -+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */ -+ if (argvars[1].v_type != VAR_UNKNOWN -+ && get_tv_number_chk(&argvars[1], &error)) -+ flags |= WILD_KEEP_ALL; - rettv->v_type = VAR_STRING; -- rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]), -- NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL); -+ if (!error) -+ { -+ ExpandInit(&xpc); -+ xpc.xp_context = EXPAND_FILES; -+ rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]), -+ NULL, flags, WILD_ALL); -+ } -+ else -+ rettv->vval.v_string = NULL; - } - - /* -@@ -11301,14 +11364,22 @@ - typval_T *argvars; - typval_T *rettv; - { -+ int flags = 0; - char_u buf1[NUMBUFLEN]; - char_u *file = get_tv_string_buf_chk(&argvars[1], buf1); -+ int error = FALSE; - -+ /* When the optional second argument is non-zero, don't remove matches -+ * for 'wildignore' and don't put matches for 'suffixes' at the end. */ -+ if (argvars[2].v_type != VAR_UNKNOWN -+ && get_tv_number_chk(&argvars[2], &error)) -+ flags |= WILD_KEEP_ALL; - rettv->v_type = VAR_STRING; -- if (file == NULL) -+ if (file == NULL || error) - rettv->vval.v_string = NULL; - else -- rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file); -+ rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file, -+ flags); - } - - /* -@@ -11782,6 +11853,10 @@ - n = has_patch(atoi((char *)name + 5)); - else if (STRICMP(name, "vim_starting") == 0) - n = (starting != 0); -+#ifdef FEAT_MBYTE -+ else if (STRICMP(name, "multi_byte_encoding") == 0) -+ n = has_mbyte; -+#endif - #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32) - else if (STRICMP(name, "balloon_multiline") == 0) - n = multiline_balloon_available(); -@@ -11847,7 +11922,6 @@ - typval_T *argvars; - typval_T *rettv; - { -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_DICT) - { - EMSG(_(e_dictreq)); -@@ -11863,10 +11937,9 @@ - /* - * "haslocaldir()" function - */ --/*ARGSUSED*/ - static void - f_haslocaldir(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = (curwin->w_localdir != NULL); -@@ -11904,10 +11977,9 @@ - /* - * "histadd()" function - */ --/*ARGSUSED*/ - static void - f_histadd(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_CMDHIST -@@ -11938,11 +12010,10 @@ - /* - * "histdel()" function - */ --/*ARGSUSED*/ - static void - f_histdel(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_CMDHIST - int n; -@@ -11964,18 +12035,15 @@ - n = del_history_entry(get_histtype(str), - get_tv_string_buf(&argvars[1], buf)); - rettv->vval.v_number = n; --#else -- rettv->vval.v_number = 0; - #endif - } - - /* - * "histget()" function - */ --/*ARGSUSED*/ - static void - f_histget(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_CMDHIST -@@ -12005,10 +12073,9 @@ - /* - * "histnr()" function - */ --/*ARGSUSED*/ - static void - f_histnr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int i; -@@ -12050,10 +12117,9 @@ - /* - * "hostname()" function - */ --/*ARGSUSED*/ - static void - f_hostname(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u hostname[256]; -@@ -12066,10 +12132,9 @@ - /* - * iconv() function - */ --/*ARGSUSED*/ - static void - f_iconv(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_MBYTE -@@ -12327,7 +12392,6 @@ - int selected; - int mouse_used; - -- rettv->vval.v_number = 0; - #ifdef NO_CONSOLE_INPUT - /* While starting up, there is no place to enter text. */ - if (no_console_input()) -@@ -12365,10 +12429,9 @@ - /* - * "inputrestore()" function - */ --/*ARGSUSED*/ - static void - f_inputrestore(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - if (ga_userinput.ga_len > 0) -@@ -12376,7 +12439,7 @@ - --ga_userinput.ga_len; - restore_typeahead((tasave_T *)(ga_userinput.ga_data) - + ga_userinput.ga_len); -- rettv->vval.v_number = 0; /* OK */ -+ /* default return is zero == OK */ - } - else if (p_verbose > 1) - { -@@ -12388,10 +12451,9 @@ - /* - * "inputsave()" function - */ --/*ARGSUSED*/ - static void - f_inputsave(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - /* Add an entry to the stack of typeahead storage. */ -@@ -12400,7 +12462,7 @@ - save_typeahead((tasave_T *)(ga_userinput.ga_data) - + ga_userinput.ga_len); - ++ga_userinput.ga_len; -- rettv->vval.v_number = 0; /* OK */ -+ /* default return is zero == OK */ - } - else - rettv->vval.v_number = 1; /* Failed */ -@@ -12434,7 +12496,6 @@ - list_T *l; - int error = FALSE; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_LIST) - EMSG2(_(e_listarg), "insert()"); - else if ((l = argvars[0].vval.v_list) != NULL -@@ -12553,7 +12614,6 @@ - dict_T *d; - int todo; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_DICT) - { - EMSG(_(e_dictreq)); -@@ -12641,7 +12701,6 @@ - garray_T ga; - char_u *sep; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_LIST) - { - EMSG(_(e_listreq)); -@@ -12681,10 +12740,9 @@ - /* - * "last_buffer_nr()" function. - */ --/*ARGSUSED*/ - static void - f_last_buffer_nr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int n = 0; -@@ -12739,9 +12797,7 @@ - #endif - - rettv->v_type = type; -- if (type == VAR_NUMBER) -- rettv->vval.v_number = 0; -- else -+ if (type != VAR_NUMBER) - rettv->vval.v_string = NULL; - - if (check_restricted() || check_secure()) -@@ -12813,10 +12869,9 @@ - /* - * "line2byte(lnum)" function - */ --/*ARGSUSED*/ - static void - f_line2byte(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifndef FEAT_BYTEOFF -@@ -12862,10 +12917,9 @@ - /* - * "localtime()" function - */ --/*ARGSUSED*/ - static void - f_localtime(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->vval.v_number = (varnumber_T)time(NULL); -@@ -13447,7 +13501,6 @@ - /* - * "mode()" function - */ --/*ARGSUSED*/ - static void - f_mode(argvars, rettv) - typval_T *argvars; -@@ -13676,13 +13729,11 @@ - /* - * "pumvisible()" function - */ --/*ARGSUSED*/ - static void - f_pumvisible(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { -- rettv->vval.v_number = 0; - #ifdef FEAT_INS_EXPAND - if (pum_visible()) - rettv->vval.v_number = 1; -@@ -13716,7 +13767,6 @@ - stride = get_tv_number_chk(&argvars[2], &error); - } - -- rettv->vval.v_number = 0; - if (error) - return; /* type error; errmsg already given */ - if (stride == 0) -@@ -14083,10 +14133,9 @@ - /* - * "remote_expr()" function - */ --/*ARGSUSED*/ - static void - f_remote_expr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->v_type = VAR_STRING; -@@ -14099,13 +14148,11 @@ - /* - * "remote_foreground()" function - */ --/*ARGSUSED*/ - static void - f_remote_foreground(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { -- rettv->vval.v_number = 0; - #ifdef FEAT_CLIENTSERVER - # ifdef WIN32 - /* On Win32 it's done in this application. */ -@@ -14126,10 +14173,9 @@ - #endif - } - --/*ARGSUSED*/ - static void - f_remote_peek(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_CLIENTSERVER -@@ -14161,7 +14207,6 @@ - rettv->vval.v_number = (s != NULL); - } - # else -- rettv->vval.v_number = 0; - if (check_connection() == FAIL) - return; - -@@ -14185,10 +14230,9 @@ - #endif - } - --/*ARGSUSED*/ - static void - f_remote_read(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u *r = NULL; -@@ -14220,10 +14264,9 @@ - /* - * "remote_send()" function - */ --/*ARGSUSED*/ - static void - f_remote_send(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - rettv->v_type = VAR_STRING; -@@ -14250,7 +14293,6 @@ - dict_T *d; - dictitem_T *di; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type == VAR_DICT) - { - if (argvars[2].v_type != VAR_UNKNOWN) -@@ -14353,7 +14395,6 @@ - /* - * "repeat()" function - */ --/*ARGSUSED*/ - static void - f_repeat(argvars, rettv) - typval_T *argvars; -@@ -14608,7 +14649,6 @@ - list_T *l; - listitem_T *li, *ni; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_LIST) - EMSG2(_(e_listarg), "reverse()"); - else if ((l = argvars[0].vval.v_list) != NULL -@@ -14960,8 +15000,6 @@ - int lnum = 0; - int col = 0; - -- rettv->vval.v_number = 0; -- - if (rettv_list_alloc(rettv) == FAIL) - return; - -@@ -15148,8 +15186,6 @@ - int n; - int flags = 0; - -- rettv->vval.v_number = 0; -- - if (rettv_list_alloc(rettv) == FAIL) - return; - -@@ -15167,10 +15203,9 @@ - } - - --/*ARGSUSED*/ - static void - f_server2client(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_CLIENTSERVER -@@ -15199,10 +15234,9 @@ - #endif - } - --/*ARGSUSED*/ - static void - f_serverlist(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u *r = NULL; -@@ -15223,11 +15257,10 @@ - /* - * "setbufvar()" function - */ --/*ARGSUSED*/ - static void - f_setbufvar(argvars, rettv) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - { - buf_T *buf; - aco_save_T aco; -@@ -15235,8 +15268,6 @@ - typval_T *varp; - char_u nbuf[NUMBUFLEN]; - -- rettv->vval.v_number = 0; -- - if (check_restricted() || check_secure()) - return; - (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */ -@@ -15316,7 +15347,7 @@ - else - line = get_tv_string_chk(&argvars[1]); - -- rettv->vval.v_number = 0; /* OK */ -+ /* default result is zero == OK */ - for (;;) - { - if (l != NULL) -@@ -15364,12 +15395,11 @@ - /* - * Used by "setqflist()" and "setloclist()" functions - */ --/*ARGSUSED*/ - static void - set_qf_ll_list(wp, list_arg, action_arg, rettv) -- win_T *wp; -- typval_T *list_arg; -- typval_T *action_arg; -+ win_T *wp UNUSED; -+ typval_T *list_arg UNUSED; -+ typval_T *action_arg UNUSED; - typval_T *rettv; - { - #ifdef FEAT_QUICKFIX -@@ -15404,7 +15434,6 @@ - /* - * "setloclist()" function - */ --/*ARGSUSED*/ - static void - f_setloclist(argvars, rettv) - typval_T *argvars; -@@ -15482,7 +15511,6 @@ - /* - * "setpos()" function - */ --/*ARGSUSED*/ - static void - f_setpos(argvars, rettv) - typval_T *argvars; -@@ -15526,7 +15554,6 @@ - /* - * "setqflist()" function - */ --/*ARGSUSED*/ - static void - f_setqflist(argvars, rettv) - typval_T *argvars; -@@ -15632,7 +15659,7 @@ - static void - setwinvar(argvars, rettv, off) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - int off; - { - win_T *win; -@@ -15645,8 +15672,6 @@ - char_u nbuf[NUMBUFLEN]; - tabpage_T *tp; - -- rettv->vval.v_number = 0; -- - if (check_restricted() || check_secure()) - return; - -@@ -15838,10 +15863,9 @@ - if (res == FAIL) - res = ITEM_COMPARE_FAIL; - else -- /* return value has wrong type */ - res = get_tv_number_chk(&rettv, &item_compare_func_err); - if (item_compare_func_err) -- res = ITEM_COMPARE_FAIL; -+ res = ITEM_COMPARE_FAIL; /* return value has wrong type */ - clear_tv(&rettv); - return res; - } -@@ -15860,7 +15884,6 @@ - long len; - long i; - -- rettv->vval.v_number = 0; - if (argvars[0].v_type != VAR_LIST) - EMSG2(_(e_listarg), "sort()"); - else -@@ -15952,10 +15975,9 @@ - /* - * "spellbadword()" function - */ --/* ARGSUSED */ - static void - f_spellbadword(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u *word = (char_u *)""; -@@ -16007,10 +16029,9 @@ - /* - * "spellsuggest()" function - */ --/*ARGSUSED*/ - static void - f_spellsuggest(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_SPELL -@@ -16493,10 +16514,9 @@ - /* - * "synID(lnum, col, trans)" function - */ --/*ARGSUSED*/ - static void - f_synID(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int id = 0; -@@ -16521,10 +16541,9 @@ - /* - * "synIDattr(id, what [, mode])" function - */ --/*ARGSUSED*/ - static void - f_synIDattr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u *p = NULL; -@@ -16590,8 +16609,11 @@ - p = highlight_has_attr(id, HL_INVERSE, modec); - break; - -- case 's': /* standout */ -- p = highlight_has_attr(id, HL_STANDOUT, modec); -+ case 's': -+ if (TOLOWER_ASC(what[1]) == 'p') /* sp[#] */ -+ p = highlight_color(id, what, modec); -+ else /* standout */ -+ p = highlight_has_attr(id, HL_STANDOUT, modec); - break; - - case 'u': -@@ -16614,10 +16636,9 @@ - /* - * "synIDtrans(id)" function - */ --/*ARGSUSED*/ - static void - f_synIDtrans(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int id; -@@ -16637,10 +16658,9 @@ - /* - * "synstack(lnum, col)" function - */ --/*ARGSUSED*/ - static void - f_synstack(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_SYN_HL -@@ -16658,7 +16678,7 @@ - col = get_tv_number(&argvars[1]) - 1; /* -1 on type error */ - - if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count -- && col >= 0 && col < (long)STRLEN(ml_get(lnum)) -+ && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum))) - && rettv_list_alloc(rettv) != FAIL) - { - (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE); -@@ -16774,15 +16794,12 @@ - /* - * "tabpagebuflist()" function - */ --/* ARGSUSED */ - static void - f_tabpagebuflist(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { --#ifndef FEAT_WINDOWS -- rettv->vval.v_number = 0; --#else -+#ifdef FEAT_WINDOWS - tabpage_T *tp; - win_T *wp = NULL; - -@@ -16794,19 +16811,12 @@ - if (tp != NULL) - wp = (tp == curtab) ? firstwin : tp->tp_firstwin; - } -- if (wp == NULL) -- rettv->vval.v_number = 0; -- else -+ if (wp != NULL && rettv_list_alloc(rettv) != FAIL) - { -- if (rettv_list_alloc(rettv) == FAIL) -- rettv->vval.v_number = 0; -- else -- { -- for (; wp != NULL; wp = wp->w_next) -- if (list_append_number(rettv->vval.v_list, -+ for (; wp != NULL; wp = wp->w_next) -+ if (list_append_number(rettv->vval.v_list, - wp->w_buffer->b_fnum) == FAIL) -- break; -- } -+ break; - } - #endif - } -@@ -16815,10 +16825,9 @@ - /* - * "tabpagenr()" function - */ --/* ARGSUSED */ - static void - f_tabpagenr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int nr = 1; -@@ -16900,10 +16909,9 @@ - /* - * "tabpagewinnr()" function - */ --/* ARGSUSED */ - static void - f_tabpagewinnr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int nr = 1; -@@ -16923,10 +16931,9 @@ - /* - * "tagfiles()" function - */ --/*ARGSUSED*/ - static void - f_tagfiles(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - char_u fname[MAXPATHL + 1]; -@@ -16934,10 +16941,7 @@ - int first; - - if (rettv_list_alloc(rettv) == FAIL) -- { -- rettv->vval.v_number = 0; - return; -- } - - for (first = TRUE; ; first = FALSE) - if (get_tagfname(&tn, first, fname) == FAIL -@@ -16969,10 +16973,9 @@ - /* - * "tempname()" function - */ --/*ARGSUSED*/ - static void - f_tempname(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - static int x = 'A'; -@@ -17005,11 +17008,10 @@ - /* - * "test(list)" function: Just checking the walls... - */ --/*ARGSUSED*/ - static void - f_test(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - /* Used for unit testing. Change the code below to your liking. */ - #if 0 -@@ -17294,11 +17296,10 @@ - /* - * "visualmode()" function - */ --/*ARGSUSED*/ - static void - f_visualmode(argvars, rettv) -- typval_T *argvars; -- typval_T *rettv; -+ typval_T *argvars UNUSED; -+ typval_T *rettv UNUSED; - { - #ifdef FEAT_VISUAL - char_u str[2]; -@@ -17311,8 +17312,6 @@ - /* A non-zero number or non-empty string argument: reset mode. */ - if (non_zero_arg(&argvars[0])) - curbuf->b_visual_mode_eval = NUL; --#else -- rettv->vval.v_number = 0; /* return anything, it won't work anyway */ - #endif - } - -@@ -17336,10 +17335,9 @@ - /* - * "wincol()" function - */ --/*ARGSUSED*/ - static void - f_wincol(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - validate_cursor(); -@@ -17366,10 +17364,9 @@ - /* - * "winline()" function - */ --/*ARGSUSED*/ - static void - f_winline(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - validate_cursor(); -@@ -17379,10 +17376,9 @@ - /* - * "winnr()" function - */ --/* ARGSUSED */ - static void - f_winnr(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - int nr = 1; -@@ -17396,10 +17392,9 @@ - /* - * "winrestcmd()" function - */ --/* ARGSUSED */ - static void - f_winrestcmd(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - #ifdef FEAT_WINDOWS -@@ -17431,11 +17426,10 @@ - /* - * "winrestview()" function - */ --/* ARGSUSED */ - static void - f_winrestview(argvars, rettv) - typval_T *argvars; -- typval_T *rettv; -+ typval_T *rettv UNUSED; - { - dict_T *dict; - -@@ -17477,10 +17471,9 @@ - /* - * "winsaveview()" function - */ --/* ARGSUSED */ - static void - f_winsaveview(argvars, rettv) -- typval_T *argvars; -+ typval_T *argvars UNUSED; - typval_T *rettv; - { - dict_T *dict; -@@ -18097,14 +18090,28 @@ - } - - /* -- * Set v:count, v:count1 and v:prevcount. -+ * Get List v: variable value. Caller must take care of reference count when -+ * needed. -+ */ -+ list_T * -+get_vim_var_list(idx) -+ int idx; -+{ -+ return vimvars[idx].vv_list; -+} -+ -+/* -+ * Set v:count to "count" and v:count1 to "count1". -+ * When "set_prevcount" is TRUE first set v:prevcount from v:count. - */ - void --set_vcount(count, count1) -+set_vcount(count, count1, set_prevcount) - long count; - long count1; -+ int set_prevcount; - { -- vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr; -+ if (set_prevcount) -+ vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr; - vimvars[VV_COUNT].vv_nr = count; - vimvars[VV_COUNT1].vv_nr = count1; - } -@@ -18132,6 +18139,20 @@ - } - - /* -+ * Set List v: variable to "val". -+ */ -+ void -+set_vim_var_list(idx, val) -+ int idx; -+ list_T *val; -+{ -+ list_unref(vimvars[idx].vv_list); -+ vimvars[idx].vv_list = val; -+ if (val != NULL) -+ ++val->lv_refcount; -+} -+ -+/* - * Set v:register if needed. - */ - void -@@ -18868,7 +18889,8 @@ - dictitem_T *dict_var; - { - hash_init(&dict->dv_hashtab); -- dict->dv_refcount = 99999; -+ dict->dv_refcount = DO_NOT_FREE_CNT; -+ dict->dv_copyID = 0; - dict_var->di_tv.vval.v_dict = dict; - dict_var->di_tv.v_type = VAR_DICT; - dict_var->di_tv.v_lock = VAR_FIXED; -@@ -18951,7 +18973,8 @@ - char_u *s; - char_u numbuf[NUMBUFLEN]; - -- s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID); -+ current_copyID += COPYID_INC; -+ s = echo_string(&v->di_tv, &tofree, numbuf, current_copyID); - list_one_var_a(prefix, v->di_key, v->di_tv.v_type, - s == NULL ? (char_u *)"" : s, first); - vim_free(tofree); -@@ -19205,6 +19228,8 @@ - * Copy the values from typval_T "from" to typval_T "to". - * When needed allocates string or increases reference count. - * Does not make a copy of a list or dict but copies the reference! -+ * It is OK for "from" and "to" to point to the same item. This is used to -+ * make a copy later. - */ - static void - copy_tv(from, to) -@@ -19384,7 +19409,8 @@ - } - else if (eap->cmdidx == CMD_echo) - msg_puts_attr((char_u *)" ", echo_attr); -- p = echo_string(&rettv, &tofree, numbuf, ++current_copyID); -+ current_copyID += COPYID_INC; -+ p = echo_string(&rettv, &tofree, numbuf, current_copyID); - if (p != NULL) - for ( ; *p != NUL && !got_int; ++p) - { -@@ -19660,6 +19686,7 @@ - list_func_head(fp, FALSE); - } - } -+ vim_free(regmatch.regprog); - } - } - if (*p == '/') -@@ -19748,7 +19775,7 @@ - } - } - else -- emsg_funcname("E123: Undefined function: %s", name); -+ emsg_funcname(N_("E123: Undefined function: %s"), name); - } - goto ret_free; - } -@@ -19792,7 +19819,7 @@ - : eval_isnamec(arg[j]))) - ++j; - if (arg[j] != NUL) -- emsg_funcname(_(e_invarg2), arg); -+ emsg_funcname((char *)e_invarg2, arg); - } - } - -@@ -20064,7 +20091,7 @@ - v = find_var(name, &ht); - if (v != NULL && v->di_tv.v_type == VAR_FUNC) - { -- emsg_funcname("E707: Function name conflicts with variable: %s", -+ emsg_funcname(N_("E707: Function name conflicts with variable: %s"), - name); - goto erret; - } -@@ -20079,7 +20106,7 @@ - } - if (fp->uf_calls > 0) - { -- emsg_funcname("E127: Cannot redefine function %s: It is in use", -+ emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"), - name); - goto erret; - } -@@ -20590,6 +20617,9 @@ - int st_len = 0; - - todo = (int)func_hashtab.ht_used; -+ if (todo == 0) -+ return; /* nothing to dump */ -+ - sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo)); - - for (hi = func_hashtab.ht_array; todo > 0; ++hi) -@@ -20638,6 +20668,8 @@ - prof_self_cmp); - prof_sort_list(fd, sorttab, st_len, "SELF", TRUE); - } -+ -+ vim_free(sorttab); - } - - static void -@@ -21012,7 +21044,7 @@ - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - scid_T save_current_SID; -- funccall_T fc; -+ funccall_T *fc; - int save_did_emsg; - static int depth = 0; - dictitem_T *v; -@@ -21038,36 +21070,37 @@ - - line_breakcheck(); /* check for CTRL-C hit */ - -- fc.caller = current_funccal; -- current_funccal = &fc; -- fc.func = fp; -- fc.rettv = rettv; -+ fc = (funccall_T *)alloc(sizeof(funccall_T)); -+ fc->caller = current_funccal; -+ current_funccal = fc; -+ fc->func = fp; -+ fc->rettv = rettv; - rettv->vval.v_number = 0; -- fc.linenr = 0; -- fc.returned = FALSE; -- fc.level = ex_nesting_level; -+ fc->linenr = 0; -+ fc->returned = FALSE; -+ fc->level = ex_nesting_level; - /* Check if this function has a breakpoint. */ -- fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0); -- fc.dbg_tick = debug_tick; -+ fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0); -+ fc->dbg_tick = debug_tick; - - /* -- * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables -+ * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables - * with names up to VAR_SHORT_LEN long. This avoids having to alloc/free - * each argument variable and saves a lot of time. - */ - /* - * Init l: variables. - */ -- init_var_dict(&fc.l_vars, &fc.l_vars_var); -+ init_var_dict(&fc->l_vars, &fc->l_vars_var); - if (selfdict != NULL) - { - /* Set l:self to "selfdict". Use "name" to avoid a warning from - * some compiler that checks the destination size. */ -- v = &fc.fixvar[fixvar_idx++].var; -+ v = &fc->fixvar[fixvar_idx++].var; - name = v->di_key; - STRCPY(name, "self"); - v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX; -- hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v)); -+ hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v)); - v->di_tv.v_type = VAR_DICT; - v->di_tv.v_lock = 0; - v->di_tv.vval.v_dict = selfdict; -@@ -21079,28 +21112,31 @@ - * Set a:0 to "argcount". - * Set a:000 to a list with room for the "..." arguments. - */ -- init_var_dict(&fc.l_avars, &fc.l_avars_var); -- add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0", -+ init_var_dict(&fc->l_avars, &fc->l_avars_var); -+ add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0", - (varnumber_T)(argcount - fp->uf_args.ga_len)); -- v = &fc.fixvar[fixvar_idx++].var; -- STRCPY(v->di_key, "000"); -+ /* Use "name" to avoid a warning from some compiler that checks the -+ * destination size. */ -+ v = &fc->fixvar[fixvar_idx++].var; -+ name = v->di_key; -+ STRCPY(name, "000"); - v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX; -- hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v)); -+ hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v)); - v->di_tv.v_type = VAR_LIST; - v->di_tv.v_lock = VAR_FIXED; -- v->di_tv.vval.v_list = &fc.l_varlist; -- vim_memset(&fc.l_varlist, 0, sizeof(list_T)); -- fc.l_varlist.lv_refcount = 99999; -- fc.l_varlist.lv_lock = VAR_FIXED; -+ v->di_tv.vval.v_list = &fc->l_varlist; -+ vim_memset(&fc->l_varlist, 0, sizeof(list_T)); -+ fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT; -+ fc->l_varlist.lv_lock = VAR_FIXED; - - /* - * Set a:firstline to "firstline" and a:lastline to "lastline". - * Set a:name to named arguments. - * Set a:N to the "..." arguments. - */ -- add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline", -+ add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline", - (varnumber_T)firstline); -- add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline", -+ add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline", - (varnumber_T)lastline); - for (i = 0; i < argcount; ++i) - { -@@ -21116,7 +21152,7 @@ - } - if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN) - { -- v = &fc.fixvar[fixvar_idx++].var; -+ v = &fc->fixvar[fixvar_idx++].var; - v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX; - } - else -@@ -21128,7 +21164,7 @@ - v->di_flags = DI_FLAGS_RO; - } - STRCPY(v->di_key, name); -- hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v)); -+ hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v)); - - /* Note: the values are copied directly to avoid alloc/free. - * "argvars" must have VAR_FIXED for v_lock. */ -@@ -21137,9 +21173,9 @@ - - if (ai >= 0 && ai < MAX_FUNC_ARGS) - { -- list_append(&fc.l_varlist, &fc.l_listitems[ai]); -- fc.l_listitems[ai].li_tv = argvars[i]; -- fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED; -+ list_append(&fc->l_varlist, &fc->l_listitems[ai]); -+ fc->l_listitems[ai].li_tv = argvars[i]; -+ fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED; - } - } - -@@ -21204,7 +21240,7 @@ - if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL)) - func_do_profile(fp); - if (fp->uf_profiling -- || (fc.caller != NULL && &fc.caller->func->uf_profiling)) -+ || (fc->caller != NULL && fc->caller->func->uf_profiling)) - { - ++fp->uf_tm_count; - profile_start(&call_start); -@@ -21220,7 +21256,7 @@ - did_emsg = FALSE; - - /* call do_cmdline() to execute the lines */ -- do_cmdline(NULL, get_func_line, (void *)&fc, -+ do_cmdline(NULL, get_func_line, (void *)fc, - DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT); - - --RedrawingDisabled; -@@ -21235,16 +21271,16 @@ - - #ifdef FEAT_PROFILE - if (do_profiling == PROF_YES && (fp->uf_profiling -- || (fc.caller != NULL && &fc.caller->func->uf_profiling))) -+ || (fc->caller != NULL && fc->caller->func->uf_profiling))) - { - profile_end(&call_start); - profile_sub_wait(&wait_start, &call_start); - profile_add(&fp->uf_tm_total, &call_start); - profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children); -- if (fc.caller != NULL && &fc.caller->func->uf_profiling) -+ if (fc->caller != NULL && fc->caller->func->uf_profiling) - { -- profile_add(&fc.caller->func->uf_tm_children, &call_start); -- profile_add(&fc.caller->func->uf_tml_children, &call_start); -+ profile_add(&fc->caller->func->uf_tm_children, &call_start); -+ profile_add(&fc->caller->func->uf_tml_children, &call_start); - } - } - #endif -@@ -21257,9 +21293,9 @@ - - if (aborting()) - smsg((char_u *)_("%s aborted"), sourcing_name); -- else if (fc.rettv->v_type == VAR_NUMBER) -+ else if (fc->rettv->v_type == VAR_NUMBER) - smsg((char_u *)_("%s returning #%ld"), sourcing_name, -- (long)fc.rettv->vval.v_number); -+ (long)fc->rettv->vval.v_number); - else - { - char_u buf[MSG_BUF_LEN]; -@@ -21270,7 +21306,7 @@ - /* The value may be very long. Skip the middle part, so that we - * have some idea how it starts and ends. smsg() would always - * truncate it at the end. */ -- s = tv2string(fc.rettv, &tofree, numbuf2, 0); -+ s = tv2string(fc->rettv, &tofree, numbuf2, 0); - if (s != NULL) - { - trunc_string(s, buf, MSG_BUF_CLEN); -@@ -21306,14 +21342,84 @@ - } - - did_emsg |= save_did_emsg; -- current_funccal = fc.caller; -+ current_funccal = fc->caller; -+ --depth; - -- /* The a: variables typevals were not allocated, only free the allocated -- * variables. */ -- vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE); -+ /* If the a:000 list and the l: and a: dicts are not referenced we can -+ * free the funccall_T and what's in it. */ -+ if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT -+ && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT -+ && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT) -+ { -+ free_funccal(fc, FALSE); -+ } -+ else -+ { -+ hashitem_T *hi; -+ listitem_T *li; -+ int todo; - -- vars_clear(&fc.l_vars.dv_hashtab); /* free all l: variables */ -- --depth; -+ /* "fc" is still in use. This can happen when returning "a:000" or -+ * assigning "l:" to a global variable. -+ * Link "fc" in the list for garbage collection later. */ -+ fc->caller = previous_funccal; -+ previous_funccal = fc; -+ -+ /* Make a copy of the a: variables, since we didn't do that above. */ -+ todo = (int)fc->l_avars.dv_hashtab.ht_used; -+ for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi) -+ { -+ if (!HASHITEM_EMPTY(hi)) -+ { -+ --todo; -+ v = HI2DI(hi); -+ copy_tv(&v->di_tv, &v->di_tv); -+ } -+ } -+ -+ /* Make a copy of the a:000 items, since we didn't do that above. */ -+ for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next) -+ copy_tv(&li->li_tv, &li->li_tv); -+ } -+} -+ -+/* -+ * Return TRUE if items in "fc" do not have "copyID". That means they are not -+ * referenced from anywhere that is in use. -+ */ -+ static int -+can_free_funccal(fc, copyID) -+ funccall_T *fc; -+ int copyID; -+{ -+ return (fc->l_varlist.lv_copyID != copyID -+ && fc->l_vars.dv_copyID != copyID -+ && fc->l_avars.dv_copyID != copyID); -+} -+ -+/* -+ * Free "fc" and what it contains. -+ */ -+ static void -+free_funccal(fc, free_val) -+ funccall_T *fc; -+ int free_val; /* a: vars were allocated */ -+{ -+ listitem_T *li; -+ -+ /* The a: variables typevals may not have been allocated, only free the -+ * allocated variables. */ -+ vars_clear_ext(&fc->l_avars.dv_hashtab, free_val); -+ -+ /* free all l: variables */ -+ vars_clear(&fc->l_vars.dv_hashtab); -+ -+ /* Free the a:000 variables if they were allocated. */ -+ if (free_val) -+ for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next) -+ clear_tv(&li->li_tv); -+ -+ vim_free(fc); - } - - /* -@@ -21512,12 +21618,11 @@ - * Called by do_cmdline() to get the next line. - * Returns allocated string, or NULL for end of function. - */ --/* ARGSUSED */ - char_u * - get_func_line(c, cookie, indent) -- int c; /* not used */ -+ int c UNUSED; - void *cookie; -- int indent; /* not used */ -+ int indent UNUSED; - { - funccall_T *fcp = (funccall_T *)cookie; - ufunc_T *fp = fcp->func; -@@ -21886,6 +21991,61 @@ - } - } - -+/* -+ * List v:oldfiles in a nice way. -+ */ -+ void -+ex_oldfiles(eap) -+ exarg_T *eap UNUSED; -+{ -+ list_T *l = vimvars[VV_OLDFILES].vv_list; -+ listitem_T *li; -+ int nr = 0; -+ -+ if (l == NULL) -+ msg((char_u *)_("No old files")); -+ else -+ { -+ msg_start(); -+ msg_scroll = TRUE; -+ for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) -+ { -+ msg_outnum((long)++nr); -+ MSG_PUTS(": "); -+ msg_outtrans(get_tv_string(&li->li_tv)); -+ msg_putchar('\n'); -+ out_flush(); /* output one line at a time */ -+ ui_breakcheck(); -+ } -+ /* Assume "got_int" was set to truncate the listing. */ -+ got_int = FALSE; -+ -+#ifdef FEAT_BROWSE_CMD -+ if (cmdmod.browse) -+ { -+ quit_more = FALSE; -+ nr = prompt_for_number(FALSE); -+ msg_starthere(); -+ if (nr > 0) -+ { -+ char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES), -+ (long)nr); -+ -+ if (p != NULL) -+ { -+ p = expand_env_save(p); -+ eap->arg = p; -+ eap->cmdidx = CMD_edit; -+ cmdmod.browse = FALSE; -+ do_exedit(eap, NULL); -+ vim_free(p); -+ } -+ } -+ } -+#endif -+ } -+} -+ - #endif /* FEAT_EVAL */ - - -diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c ---- vim72.orig/src/ex_cmds2.c 2008-07-13 17:18:22.000000000 +0100 -+++ vim72/src/ex_cmds2.c 2009-07-22 22:54:22.000000000 +0100 -@@ -28,7 +28,8 @@ - { - char_u *sn_name; - # ifdef UNIX -- int sn_dev; -+ int sn_dev_valid; -+ dev_t sn_dev; - ino_t sn_ino; - # endif - # ifdef FEAT_PROFILE -@@ -680,10 +681,9 @@ - /* - * ":breaklist". - */ --/*ARGSUSED*/ - void - ex_breaklist(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - struct debuggy *bp; - int i; -@@ -1342,14 +1342,13 @@ - /* - * return TRUE if buffer was changed and cannot be abandoned. - */ --/*ARGSUSED*/ - int - check_changed(buf, checkaw, mult_win, forceit, allbuf) - buf_T *buf; - int checkaw; /* do autowrite if buffer was changed */ - int mult_win; /* check also when several wins for the buf */ - int forceit; -- int allbuf; /* may write all buffers */ -+ int allbuf UNUSED; /* may write all buffers */ - { - if ( !forceit - && bufIsChanged(buf) -@@ -1759,12 +1758,11 @@ - * - * Return FAIL for failure, OK otherwise. - */ --/*ARGSUSED*/ - static int - do_arglist(str, what, after) - char_u *str; -- int what; -- int after; /* 0 means before first one */ -+ int what UNUSED; -+ int after UNUSED; /* 0 means before first one */ - { - garray_T new_ga; - int exp_count; -@@ -2132,8 +2130,8 @@ - * argument index. */ - if (do_ecmd(0, alist_name(&ARGLIST[curwin->w_arg_idx]), NULL, - eap, ECMD_LAST, -- (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0) + -- (eap->forceit ? ECMD_FORCEIT : 0)) == FAIL) -+ (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0) -+ + (eap->forceit ? ECMD_FORCEIT : 0), curwin) == FAIL) - curwin->w_arg_idx = old_arg_idx; - /* like Vi: set the mark where the cursor is in the file. */ - else if (eap->cmdidx != CMD_argdo) -@@ -2549,11 +2547,10 @@ - - static void source_callback __ARGS((char_u *fname, void *cookie)); - --/*ARGSUSED*/ - static void - source_callback(fname, cookie) - char_u *fname; -- void *cookie; -+ void *cookie UNUSED; - { - (void)do_source(fname, FALSE, DOSO_NONE); - } -@@ -2680,10 +2677,9 @@ - /* - * ":options" - */ --/*ARGSUSED*/ - void - ex_options(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - cmd_source((char_u *)SYS_OPTWIN_FILE, NULL); - } -@@ -2842,6 +2838,7 @@ - linenr_T save_sourcing_lnum; - char_u *p; - char_u *fname_exp; -+ char_u *firstline = NULL; - int retval = FAIL; - #ifdef FEAT_EVAL - scid_T save_current_SID; -@@ -2992,23 +2989,6 @@ - - cookie.level = ex_nesting_level; - #endif --#ifdef FEAT_MBYTE -- cookie.conv.vc_type = CONV_NONE; /* no conversion */ -- -- /* Try reading the first few bytes to check for a UTF-8 BOM. */ -- { -- char_u buf[3]; -- -- if (fread((char *)buf, sizeof(char_u), (size_t)3, cookie.fp) -- == (size_t)3 -- && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf) -- /* Found BOM, setup conversion and skip over it. */ -- convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc); -- else -- /* No BOM found, rewind. */ -- fseek(cookie.fp, 0L, SEEK_SET); -- } --#endif - - /* - * Keep the sourcing name/lnum, for recursive calls. -@@ -3018,6 +2998,27 @@ - save_sourcing_lnum = sourcing_lnum; - sourcing_lnum = 0; - -+#ifdef FEAT_MBYTE -+ cookie.conv.vc_type = CONV_NONE; /* no conversion */ -+ -+ /* Read the first line so we can check for a UTF-8 BOM. */ -+ firstline = getsourceline(0, (void *)&cookie, 0); -+ if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef -+ && firstline[1] == 0xbb && firstline[2] == 0xbf) -+ { -+ /* Found BOM; setup conversion, skip over BOM and recode the line. */ -+ convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc); -+ p = string_convert(&cookie.conv, firstline + 3, NULL); -+ if (p == NULL) -+ p = vim_strsave(firstline + 3); -+ if (p != NULL) -+ { -+ vim_free(firstline); -+ firstline = p; -+ } -+ } -+#endif -+ - #ifdef STARTUPTIME - time_push(&tv_rel, &tv_start); - #endif -@@ -3049,7 +3050,7 @@ - /* Compare dev/ino when possible, it catches symbolic - * links. Also compare file names, the inode may change - * when the file was edited. */ -- ((stat_ok && si->sn_dev != -1) -+ ((stat_ok && si->sn_dev_valid) - && (si->sn_dev == st.st_dev - && si->sn_ino == st.st_ino)) || - # endif -@@ -3076,11 +3077,12 @@ - # ifdef UNIX - if (stat_ok) - { -+ si->sn_dev_valid = TRUE; - si->sn_dev = st.st_dev; - si->sn_ino = st.st_ino; - } - else -- si->sn_dev = -1; -+ si->sn_dev_valid = FALSE; - # endif - - /* Allocate the local script variables to use for this script. */ -@@ -3111,9 +3113,8 @@ - /* - * Call do_cmdline, which will call getsourceline() to get the lines. - */ -- do_cmdline(NULL, getsourceline, (void *)&cookie, -+ do_cmdline(firstline, getsourceline, (void *)&cookie, - DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT); -- - retval = OK; - - #ifdef FEAT_PROFILE -@@ -3145,8 +3146,8 @@ - verbose_leave(); - } - #ifdef STARTUPTIME -- vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname); -- time_msg(IObuff, &tv_start); -+ vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname); -+ time_msg((char *)IObuff, &tv_start); - time_pop(&tv_rel); - #endif - -@@ -3171,6 +3172,7 @@ - #endif - fclose(cookie.fp); - vim_free(cookie.nextline); -+ vim_free(firstline); - #ifdef FEAT_MBYTE - convert_setup(&cookie.conv, NULL, NULL); - #endif -@@ -3185,10 +3187,9 @@ - /* - * ":scriptnames" - */ --/*ARGSUSED*/ - void - ex_scriptnames(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int i; - -@@ -3312,12 +3313,11 @@ - * Return a pointer to the line in allocated memory. - * Return NULL for end-of-file or some error. - */ --/* ARGSUSED */ - char_u * - getsourceline(c, cookie, indent) -- int c; /* not used */ -+ int c UNUSED; - void *cookie; -- int indent; /* not used */ -+ int indent UNUSED; - { - struct source_cookie *sp = (struct source_cookie *)cookie; - char_u *line; -@@ -3368,7 +3368,7 @@ - p = skipwhite(sp->nextline); - if (*p != '\\') - break; -- s = alloc((int)(STRLEN(line) + STRLEN(p))); -+ s = alloc((unsigned)(STRLEN(line) + STRLEN(p))); - if (s == NULL) /* out of memory */ - break; - STRCPY(s, line); -@@ -3644,10 +3644,9 @@ - * ":scriptencoding": Set encoding conversion for a sourced script. - * Without the multi-byte feature it's simply ignored. - */ --/*ARGSUSED*/ - void - ex_scriptencoding(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - #ifdef FEAT_MBYTE - struct source_cookie *sp; -@@ -4096,10 +4095,9 @@ - * Function given to ExpandGeneric() to obtain the possible arguments of the - * ":language" command. - */ --/*ARGSUSED*/ - char_u * - get_lang_arg(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (idx == 0) -diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c ---- vim72.orig/src/ex_cmds.c 2008-08-04 20:15:00.000000000 +0100 -+++ vim72/src/ex_cmds.c 2009-07-22 22:54:23.000000000 +0100 -@@ -24,7 +24,7 @@ - static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out)); - #ifdef FEAT_VIMINFO - static char_u *viminfo_filename __ARGS((char_u *)); --static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read)); -+static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags)); - static int viminfo_encoding __ARGS((vir_T *virp)); - static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing)); - #endif -@@ -43,12 +43,12 @@ - /* - * ":ascii" and "ga". - */ --/*ARGSUSED*/ - void - do_ascii(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int c; -+ int cval; - char buf1[20]; - char buf2[20]; - char_u buf3[7]; -@@ -75,6 +75,10 @@ - { - if (c == NL) /* NUL is stored as NL */ - c = NUL; -+ if (c == CAR && get_fileformat(curbuf) == EOL_MAC) -+ cval = NL; /* NL is stored as CR */ -+ else -+ cval = c; - if (vim_isprintc_strict(c) && (c < ' ' - #ifndef EBCDIC - || c > '~' -@@ -82,19 +86,20 @@ - )) - { - transchar_nonprint(buf3, c); -- sprintf(buf1, " <%s>", (char *)buf3); -+ vim_snprintf(buf1, sizeof(buf1), " <%s>", (char *)buf3); - } - else - buf1[0] = NUL; - #ifndef EBCDIC - if (c >= 0x80) -- sprintf(buf2, " ", transchar(c & 0x7f)); -+ vim_snprintf(buf2, sizeof(buf2), " ", -+ (char *)transchar(c & 0x7f)); - else - #endif - buf2[0] = NUL; - vim_snprintf((char *)IObuff, IOSIZE, - _("<%s>%s%s %d, Hex %02x, Octal %03o"), -- transchar(c), buf1, buf2, c, c, c); -+ transchar(c), buf1, buf2, cval, cval, cval); - #ifdef FEAT_MBYTE - if (enc_utf8) - c = cc[ci++]; -@@ -353,7 +358,7 @@ - linenr_T lnum; - long maxlen = 0; - sorti_T *nrs; -- size_t count = eap->line2 - eap->line1 + 1; -+ size_t count = (size_t)(eap->line2 - eap->line1 + 1); - size_t i; - char_u *p; - char_u *s; -@@ -952,7 +957,7 @@ - } - len += (int)STRLEN(prevcmd); - } -- if ((t = alloc(len)) == NULL) -+ if ((t = alloc((unsigned)len)) == NULL) - { - vim_free(newcmd); - return; -@@ -1543,7 +1548,7 @@ - * redirecting input and/or output. - */ - if (itmp != NULL || otmp != NULL) -- sprintf((char *)buf, "(%s)", (char *)cmd); -+ vim_snprintf((char *)buf, len, "(%s)", (char *)cmd); - else - STRCPY(buf, cmd); - if (itmp != NULL) -@@ -1592,37 +1597,41 @@ - } - #endif - if (otmp != NULL) -- append_redir(buf, p_srr, otmp); -+ append_redir(buf, (int)len, p_srr, otmp); - - return buf; - } - - /* -- * Append output redirection for file "fname" to the end of string buffer "buf" -+ * Append output redirection for file "fname" to the end of string buffer -+ * "buf[buflen]" - * Works with the 'shellredir' and 'shellpipe' options. - * The caller should make sure that there is enough room: - * STRLEN(opt) + STRLEN(fname) + 3 - */ - void --append_redir(buf, opt, fname) -+append_redir(buf, buflen, opt, fname) - char_u *buf; -+ int buflen; - char_u *opt; - char_u *fname; - { - char_u *p; -+ char_u *end; - -- buf += STRLEN(buf); -+ end = buf + STRLEN(buf); - /* find "%s", skipping "%%" */ - for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p) - if (p[1] == 's') - break; - if (p != NULL) - { -- *buf = ' '; /* not really needed? Not with sh, ksh or bash */ -- sprintf((char *)buf + 1, (char *)opt, (char *)fname); -+ *end = ' '; /* not really needed? Not with sh, ksh or bash */ -+ vim_snprintf((char *)end + 1, (size_t)(buflen - (end + 1 - buf)), -+ (char *)opt, (char *)fname); - } - else -- sprintf((char *)buf, -+ vim_snprintf((char *)end, (size_t)(buflen - (end - buf)), - #ifdef FEAT_QUICKFIX - # ifndef RISCOS - opt != p_sp ? " %s%s" : -@@ -1676,14 +1685,12 @@ - - /* - * read_viminfo() -- Read the viminfo file. Registers etc. which are already -- * set are not over-written unless force is TRUE. -- webb -+ * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb - */ - int --read_viminfo(file, want_info, want_marks, forceit) -- char_u *file; -- int want_info; -- int want_marks; -- int forceit; -+read_viminfo(file, flags) -+ char_u *file; /* file name or NULL to use default name */ -+ int flags; /* VIF_WANT_INFO et al. */ - { - FILE *fp; - char_u *fname; -@@ -1691,7 +1698,7 @@ - if (no_viminfo()) - return FAIL; - -- fname = viminfo_filename(file); /* may set to default if NULL */ -+ fname = viminfo_filename(file); /* get file name in allocated buffer */ - if (fname == NULL) - return FAIL; - fp = mch_fopen((char *)fname, READBIN); -@@ -1701,8 +1708,9 @@ - verbose_enter(); - smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"), - fname, -- want_info ? _(" info") : "", -- want_marks ? _(" marks") : "", -+ (flags & VIF_WANT_INFO) ? _(" info") : "", -+ (flags & VIF_WANT_MARKS) ? _(" marks") : "", -+ (flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "", - fp == NULL ? _(" FAILED") : ""); - verbose_leave(); - } -@@ -1712,10 +1720,9 @@ - return FAIL; - - viminfo_errcnt = 0; -- do_viminfo(fp, NULL, want_info, want_marks, forceit); -+ do_viminfo(fp, NULL, flags); - - fclose(fp); -- - return OK; - } - -@@ -1786,7 +1793,7 @@ - * overwrite a user's viminfo file after a "su root", with a - * viminfo file that the user can't read. - */ -- st_old.st_dev = 0; -+ st_old.st_dev = (dev_t)0; - st_old.st_ino = 0; - st_old.st_mode = 0600; - if (mch_stat((char *)fname, &st_old) == 0 -@@ -1943,7 +1950,7 @@ - * root. - */ - if (fp_out != NULL) -- (void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid); -+ ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid); - #endif - } - } -@@ -1968,7 +1975,7 @@ - } - - viminfo_errcnt = 0; -- do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE); -+ do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS)); - - fclose(fp_out); /* errors are ignored !? */ - if (fp_in != NULL) -@@ -2041,12 +2048,10 @@ - * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo(). - */ - static void --do_viminfo(fp_in, fp_out, want_info, want_marks, force_read) -+do_viminfo(fp_in, fp_out, flags) - FILE *fp_in; - FILE *fp_out; -- int want_info; -- int want_marks; -- int force_read; -+ int flags; - { - int count = 0; - int eof = FALSE; -@@ -2061,8 +2066,9 @@ - - if (fp_in != NULL) - { -- if (want_info) -- eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL); -+ if (flags & VIF_WANT_INFO) -+ eof = read_viminfo_up_to_marks(&vir, -+ flags & VIF_FORCEIT, fp_out != NULL); - else - /* Skip info, find start of marks */ - while (!(eof = viminfo_readline(&vir)) -@@ -2092,8 +2098,9 @@ - write_viminfo_bufferlist(fp_out); - count = write_viminfo_marks(fp_out); - } -- if (fp_in != NULL && want_marks) -- copy_viminfo_marks(&vir, fp_out, count, eof); -+ if (fp_in != NULL -+ && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT))) -+ copy_viminfo_marks(&vir, fp_out, count, eof, flags); - - vim_free(vir.vir_line); - #ifdef FEAT_MBYTE -@@ -2248,12 +2255,11 @@ - * - * Return the string in allocated memory (NULL when out of memory). - */ --/*ARGSUSED*/ - char_u * - viminfo_readstring(virp, off, convert) - vir_T *virp; - int off; /* offset for virp->vir_line */ -- int convert; /* convert the string */ -+ int convert UNUSED; /* convert the string */ - { - char_u *retval; - char_u *s, *d; -@@ -2365,10 +2371,9 @@ - * ^? ^H - * not ^? ^? - */ --/*ARGSUSED*/ - void - do_fixdel(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - char_u *p; - -@@ -2387,7 +2392,8 @@ - - if (curwin->w_p_nu || use_number) - { -- sprintf((char *)numbuf, "%*ld ", number_width(curwin), (long)lnum); -+ vim_snprintf((char *)numbuf, sizeof(numbuf), -+ "%*ld ", number_width(curwin), (long)lnum); - msg_puts_attr(numbuf, hl_attr(HLF_N)); /* Highlight line nrs */ - } - msg_prt_line(ml_get(lnum), list); -@@ -2414,8 +2420,8 @@ - cursor_on(); /* msg_start() switches it off */ - out_flush(); - silent_mode = save_silent; -- info_message = FALSE; - } -+ info_message = FALSE; - } - - /* -@@ -2704,7 +2710,12 @@ - if (eap->cmdidx == CMD_saveas) - { - if (retval == OK) -+ { - curbuf->b_p_ro = FALSE; -+#ifdef FEAT_WINDOWS -+ redraw_tabline = TRUE; -+#endif -+ } - /* Change directories when the 'acd' option is set. */ - DO_AUTOCHDIR - } -@@ -2724,7 +2735,6 @@ - * May set eap->forceit if a dialog says it's OK to overwrite. - * Return OK if it's OK, FAIL if it is not. - */ --/*ARGSUSED*/ - static int - check_overwrite(eap, buf, fname, ffname, other) - exarg_T *eap; -@@ -3054,7 +3064,8 @@ - retval = 0; /* it's in the same file */ - } - else if (do_ecmd(fnum, ffname, sfname, NULL, lnum, -- (P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0)) == OK) -+ (P_HID(curbuf) ? ECMD_HIDE : 0) + (forceit ? ECMD_FORCEIT : 0), -+ curwin) == OK) - retval = -1; /* opened another file */ - else - retval = 1; /* error encountered */ -@@ -3087,17 +3098,21 @@ - * ECMD_OLDBUF: use existing buffer if it exists - * ECMD_FORCEIT: ! used for Ex command - * ECMD_ADDBUF: don't edit, just add to buffer list -+ * oldwin: Should be "curwin" when editing a new buffer in the current -+ * window, NULL when splitting the window first. When not NULL info -+ * of the previous buffer for "oldwin" is stored. - * - * return FAIL for failure, OK otherwise - */ - int --do_ecmd(fnum, ffname, sfname, eap, newlnum, flags) -+do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin) - int fnum; - char_u *ffname; - char_u *sfname; - exarg_T *eap; /* can be NULL! */ - linenr_T newlnum; - int flags; -+ win_T *oldwin; - { - int other_file; /* TRUE if editing another file */ - int oldbuf; /* TRUE if using existing buffer */ -@@ -3269,7 +3284,8 @@ - { - if (!cmdmod.keepalt) - curwin->w_alt_fnum = curbuf->b_fnum; -- buflist_altfpos(); -+ if (oldwin != NULL) -+ buflist_altfpos(oldwin); - } - - if (fnum) -@@ -3373,7 +3389,7 @@ - - /* close the link to the current buffer */ - u_sync(FALSE); -- close_buffer(curwin, curbuf, -+ close_buffer(oldwin, curbuf, - (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD); - - #ifdef FEAT_AUTOCMD -@@ -3701,7 +3717,7 @@ - /* If the window options were changed may need to set the spell language. - * Can only do this after the buffer has been properly setup. */ - if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL) -- did_set_spelllang(curbuf); -+ (void)did_set_spelllang(curbuf); - #endif - - if (command == NULL) -@@ -3774,7 +3790,7 @@ - - #ifdef FEAT_KEYMAP - if (curbuf->b_kmap_state & KEYMAP_INIT) -- keymap_init(); -+ (void)keymap_init(); - #endif - - --RedrawingDisabled; -@@ -3997,6 +4013,9 @@ - break; - ml_delete(eap->line1, FALSE); - } -+ -+ /* make sure the cursor is not beyond the end of the file now */ -+ check_cursor_lnum(); - deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum)); - - /* ":append" on the line above the deleted lines. */ -@@ -4022,8 +4041,10 @@ - bigness = curwin->w_height; - else if (firstwin == lastwin) - bigness = curwin->w_p_scr * 2; -+#ifdef FEAT_WINDOWS - else - bigness = curwin->w_height - 3; -+#endif - if (bigness < 1) - bigness = 1; - -@@ -4472,7 +4493,7 @@ - char_u *p1; - int did_sub = FALSE; - int lastone; -- unsigned len, needed_len; -+ int len, copy_len, needed_len; - long nmatch_tl = 0; /* nr of lines matched below lnum */ - int do_again; /* do it again after joining lines */ - int skip_match = FALSE; -@@ -4617,6 +4638,8 @@ - - if (do_ask) - { -+ int typed = 0; -+ - /* change State to CONFIRM, so that the mouse works - * properly */ - save_State = State; -@@ -4655,7 +4678,7 @@ - resp = getexmodeline('?', NULL, 0); - if (resp != NULL) - { -- i = *resp; -+ typed = *resp; - vim_free(resp); - } - } -@@ -4707,7 +4730,7 @@ - #endif - ++no_mapping; /* don't map this key */ - ++allow_keys; /* allow special keys */ -- i = plain_vgetc(); -+ typed = plain_vgetc(); - --allow_keys; - --no_mapping; - -@@ -4718,35 +4741,35 @@ - } - - need_wait_return = FALSE; /* no hit-return prompt */ -- if (i == 'q' || i == ESC || i == Ctrl_C -+ if (typed == 'q' || typed == ESC || typed == Ctrl_C - #ifdef UNIX -- || i == intr_char -+ || typed == intr_char - #endif - ) - { - got_quit = TRUE; - break; - } -- if (i == 'n') -+ if (typed == 'n') - break; -- if (i == 'y') -+ if (typed == 'y') - break; -- if (i == 'l') -+ if (typed == 'l') - { - /* last: replace and then stop */ - do_all = FALSE; - line2 = lnum; - break; - } -- if (i == 'a') -+ if (typed == 'a') - { - do_ask = FALSE; - break; - } - #ifdef FEAT_INS_EXPAND -- if (i == Ctrl_E) -+ if (typed == Ctrl_E) - scrollup_clamp(); -- else if (i == Ctrl_Y) -+ else if (typed == Ctrl_Y) - scrolldown_clamp(); - #endif - } -@@ -4757,7 +4780,7 @@ - if (vim_strchr(p_cpo, CPO_UNDO) != NULL) - --no_u_sync; - -- if (i == 'n') -+ if (typed == 'n') - { - /* For a multi-line match, put matchcol at the NUL at - * the end of the line and set nmatch to one, so that -@@ -4808,9 +4831,9 @@ - p1 = ml_get(sub_firstlnum + nmatch - 1); - nmatch_tl += nmatch - 1; - } -- i = regmatch.startpos[0].col - copycol; -- needed_len = i + ((unsigned)STRLEN(p1) - regmatch.endpos[0].col) -- + sublen + 1; -+ copy_len = regmatch.startpos[0].col - copycol; -+ needed_len = copy_len + ((unsigned)STRLEN(p1) -+ - regmatch.endpos[0].col) + sublen + 1; - if (new_start == NULL) - { - /* -@@ -4833,7 +4856,7 @@ - */ - len = (unsigned)STRLEN(new_start); - needed_len += len; -- if (needed_len > new_start_len) -+ if (needed_len > (int)new_start_len) - { - new_start_len = needed_len + 50; - if ((p1 = alloc_check(new_start_len)) == NULL) -@@ -4851,8 +4874,8 @@ - /* - * copy the text up to the part that matched - */ -- mch_memmove(new_end, sub_firstline + copycol, (size_t)i); -- new_end += i; -+ mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len); -+ new_end += copy_len; - - (void)vim_regsub_multi(®match, - sub_firstlnum - regmatch.startpos[0].lnum, -@@ -5059,6 +5082,7 @@ - - if (did_sub) - ++sub_nlines; -+ vim_free(new_start); /* for when substitute was cancelled */ - vim_free(sub_firstline); /* free the copy of the original line */ - sub_firstline = NULL; - } -@@ -5610,7 +5634,13 @@ - */ - alt_fnum = curbuf->b_fnum; - (void)do_ecmd(0, NULL, NULL, NULL, ECMD_LASTL, -- ECMD_HIDE + ECMD_SET_HELP); -+ ECMD_HIDE + ECMD_SET_HELP, -+#ifdef FEAT_WINDOWS -+ NULL /* buffer is still open, don't store info */ -+#else -+ curwin -+#endif -+ ); - if (!cmdmod.keepalt) - curwin->w_alt_fnum = alt_fnum; - empty_fnum = curbuf->b_fnum; -@@ -5769,7 +5799,7 @@ - * Recognize a few exceptions to the rule. Some strings that contain '*' - * with "star". Otherwise '*' is recognized as a wildcard. - */ -- for (i = sizeof(mtable) / sizeof(char *); --i >= 0; ) -+ for (i = (int)(sizeof(mtable) / sizeof(char *)); --i >= 0; ) - if (STRCMP(arg, mtable[i]) == 0) - { - STRCPY(d, rtable[i]); -@@ -6093,10 +6123,9 @@ - /* - * ":exusage" - */ --/*ARGSUSED*/ - void - ex_exusage(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - do_cmdline_cmd((char_u *)"help ex-cmd-index"); - } -@@ -6104,10 +6133,9 @@ - /* - * ":viusage" - */ --/*ARGSUSED*/ - void - ex_viusage(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - do_cmdline_cmd((char_u *)"help normal-index"); - } -@@ -6519,22 +6547,11 @@ - static sign_T *first_sign = NULL; - static int last_sign_typenr = MAX_TYPENR; /* is decremented */ - -+static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd)); - static void sign_list_defined __ARGS((sign_T *sp)); -+static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev)); - --/* -- * ":sign" command -- */ -- void --ex_sign(eap) -- exarg_T *eap; --{ -- char_u *arg = eap->arg; -- char_u *p; -- int idx; -- sign_T *sp; -- sign_T *sp_prev; -- buf_T *buf; -- static char *cmds[] = { -+static char *cmds[] = { - "define", - #define SIGNCMD_DEFINE 0 - "undefine", -@@ -6547,22 +6564,51 @@ - #define SIGNCMD_UNPLACE 4 - "jump", - #define SIGNCMD_JUMP 5 -+ NULL - #define SIGNCMD_LAST 6 -- }; -+}; -+ -+/* -+ * Find index of a ":sign" subcmd from its name. -+ * "*end_cmd" must be writable. -+ */ -+ static int -+sign_cmd_idx(begin_cmd, end_cmd) -+ char_u *begin_cmd; /* begin of sign subcmd */ -+ char_u *end_cmd; /* just after sign subcmd */ -+{ -+ int idx; -+ char save = *end_cmd; -+ -+ *end_cmd = NUL; -+ for (idx = 0; ; ++idx) -+ if (cmds[idx] == NULL || STRCMP(begin_cmd, cmds[idx]) == 0) -+ break; -+ *end_cmd = save; -+ return idx; -+} -+ -+/* -+ * ":sign" command -+ */ -+ void -+ex_sign(eap) -+ exarg_T *eap; -+{ -+ char_u *arg = eap->arg; -+ char_u *p; -+ int idx; -+ sign_T *sp; -+ sign_T *sp_prev; -+ buf_T *buf; - - /* Parse the subcommand. */ - p = skiptowhite(arg); -- if (*p != NUL) -- *p++ = NUL; -- for (idx = 0; ; ++idx) -+ idx = sign_cmd_idx(arg, p); -+ if (idx == SIGNCMD_LAST) - { -- if (idx == SIGNCMD_LAST) -- { -- EMSG2(_("E160: Unknown sign command: %s"), arg); -- return; -- } -- if (STRCMP(arg, cmds[idx]) == 0) -- break; -+ EMSG2(_("E160: Unknown sign command: %s"), arg); -+ return; - } - arg = skipwhite(p); - -@@ -6728,24 +6774,8 @@ - /* ":sign list {name}" */ - sign_list_defined(sp); - else -- { - /* ":sign undefine {name}" */ -- vim_free(sp->sn_name); -- vim_free(sp->sn_icon); --#ifdef FEAT_SIGN_ICONS -- if (sp->sn_image != NULL) -- { -- out_flush(); -- gui_mch_destroy_sign(sp->sn_image); -- } --#endif -- vim_free(sp->sn_text); -- if (sp_prev == NULL) -- first_sign = sp->sn_next; -- else -- sp_prev->sn_next = sp->sn_next; -- vim_free(sp); -- } -+ sign_undefine(sp, sp_prev); - } - } - else -@@ -6994,6 +7024,31 @@ - } - - /* -+ * Undefine a sign and free its memory. -+ */ -+ static void -+sign_undefine(sp, sp_prev) -+ sign_T *sp; -+ sign_T *sp_prev; -+{ -+ vim_free(sp->sn_name); -+ vim_free(sp->sn_icon); -+#ifdef FEAT_SIGN_ICONS -+ if (sp->sn_image != NULL) -+ { -+ out_flush(); -+ gui_mch_destroy_sign(sp->sn_image); -+ } -+#endif -+ vim_free(sp->sn_text); -+ if (sp_prev == NULL) -+ first_sign = sp->sn_next; -+ else -+ sp_prev->sn_next = sp->sn_next; -+ vim_free(sp); -+} -+ -+/* - * Get highlighting attribute for sign "typenr". - * If "line" is TRUE: line highl, if FALSE: text highl. - */ -@@ -7067,6 +7122,197 @@ - return (char_u *)_("[Deleted]"); - } - -+#if defined(EXITFREE) || defined(PROTO) -+/* -+ * Undefine/free all signs. -+ */ -+ void -+free_signs() -+{ -+ while (first_sign != NULL) -+ sign_undefine(first_sign, NULL); -+} -+#endif -+ -+#if defined(FEAT_CMDL_COMPL) || defined(PROTO) -+static enum -+{ -+ EXP_SUBCMD, /* expand :sign sub-commands */ -+ EXP_DEFINE, /* expand :sign define {name} args */ -+ EXP_PLACE, /* expand :sign place {id} args */ -+ EXP_UNPLACE, /* expand :sign unplace" */ -+ EXP_SIGN_NAMES /* expand with name of placed signs */ -+} expand_what; -+ -+/* -+ * Function given to ExpandGeneric() to obtain the sign command -+ * expansion. -+ */ -+ char_u * -+get_sign_name(xp, idx) -+ expand_T *xp UNUSED; -+ int idx; -+{ -+ sign_T *sp; -+ int current_idx; -+ -+ switch (expand_what) -+ { -+ case EXP_SUBCMD: -+ return (char_u *)cmds[idx]; -+ case EXP_DEFINE: -+ { -+ char *define_arg[] = -+ { -+ "icon=", "linehl=", "text=", "texthl=", NULL -+ }; -+ return (char_u *)define_arg[idx]; -+ } -+ case EXP_PLACE: -+ { -+ char *place_arg[] = -+ { -+ "line=", "name=", "file=", "buffer=", NULL -+ }; -+ return (char_u *)place_arg[idx]; -+ } -+ case EXP_UNPLACE: -+ { -+ char *unplace_arg[] = { "file=", "buffer=", NULL }; -+ return (char_u *)unplace_arg[idx]; -+ } -+ case EXP_SIGN_NAMES: -+ /* Complete with name of signs already defined */ -+ current_idx = 0; -+ for (sp = first_sign; sp != NULL; sp = sp->sn_next) -+ if (current_idx++ == idx) -+ return sp->sn_name; -+ return NULL; -+ default: -+ return NULL; -+ } -+} -+ -+/* -+ * Handle command line completion for :sign command. -+ */ -+ void -+set_context_in_sign_cmd(xp, arg) -+ expand_T *xp; -+ char_u *arg; -+{ -+ char_u *p; -+ char_u *end_subcmd; -+ char_u *last; -+ int cmd_idx; -+ char_u *begin_subcmd_args; -+ -+ /* Default: expand subcommands. */ -+ xp->xp_context = EXPAND_SIGN; -+ expand_what = EXP_SUBCMD; -+ xp->xp_pattern = arg; -+ -+ end_subcmd = skiptowhite(arg); -+ if (*end_subcmd == NUL) -+ /* expand subcmd name -+ * :sign {subcmd}*/ -+ return; -+ -+ cmd_idx = sign_cmd_idx(arg, end_subcmd); -+ -+ /* :sign {subcmd} {subcmd_args} -+ * | -+ * begin_subcmd_args */ -+ begin_subcmd_args = skipwhite(end_subcmd); -+ p = skiptowhite(begin_subcmd_args); -+ if (*p == NUL) -+ { -+ /* -+ * Expand first argument of subcmd when possible. -+ * For ":jump {id}" and ":unplace {id}", we could -+ * possibly expand the ids of all signs already placed. -+ */ -+ xp->xp_pattern = begin_subcmd_args; -+ switch (cmd_idx) -+ { -+ case SIGNCMD_LIST: -+ case SIGNCMD_UNDEFINE: -+ /* :sign list -+ * :sign undefine */ -+ expand_what = EXP_SIGN_NAMES; -+ break; -+ default: -+ xp->xp_context = EXPAND_NOTHING; -+ } -+ return; -+ } -+ -+ /* expand last argument of subcmd */ -+ -+ /* :sign define {name} {args}... -+ * | -+ * p */ -+ -+ /* Loop until reaching last argument. */ -+ do -+ { -+ p = skipwhite(p); -+ last = p; -+ p = skiptowhite(p); -+ } while (*p != NUL); -+ -+ p = vim_strchr(last, '='); -+ -+ /* :sign define {name} {args}... {last}= -+ * | | -+ * last p */ -+ if (p == NUL) -+ { -+ /* Expand last argument name (before equal sign). */ -+ xp->xp_pattern = last; -+ switch (cmd_idx) -+ { -+ case SIGNCMD_DEFINE: -+ expand_what = EXP_DEFINE; -+ break; -+ case SIGNCMD_PLACE: -+ expand_what = EXP_PLACE; -+ break; -+ case SIGNCMD_JUMP: -+ case SIGNCMD_UNPLACE: -+ expand_what = EXP_UNPLACE; -+ break; -+ default: -+ xp->xp_context = EXPAND_NOTHING; -+ } -+ } -+ else -+ { -+ /* Expand last argument value (after equal sign). */ -+ xp->xp_pattern = p + 1; -+ switch (cmd_idx) -+ { -+ case SIGNCMD_DEFINE: -+ if (STRNCMP(last, "texthl", p - last) == 0 || -+ STRNCMP(last, "linehl", p - last) == 0) -+ xp->xp_context = EXPAND_HIGHLIGHT; -+ else if (STRNCMP(last, "icon", p - last) == 0) -+ xp->xp_context = EXPAND_FILES; -+ else -+ xp->xp_context = EXPAND_NOTHING; -+ break; -+ case SIGNCMD_PLACE: -+ if (STRNCMP(last, "name", p - last) == 0) -+ expand_what = EXP_SIGN_NAMES; -+ else -+ xp->xp_context = EXPAND_NOTHING; -+ break; -+ default: -+ xp->xp_context = EXPAND_NOTHING; -+ } -+ } -+} -+#endif - #endif - - #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO) -diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h ---- vim72.orig/src/ex_cmds.h 2008-06-21 19:47:57.000000000 +0100 -+++ vim72/src/ex_cmds.h 2009-07-22 22:54:23.000000000 +0100 -@@ -278,7 +278,7 @@ - EX(CMD_crewind, "crewind", ex_cc, - RANGE|NOTADR|COUNT|TRLBAR|BANG), - EX(CMD_cscope, "cscope", do_cscope, -- EXTRA|NOTRLCOM|SBOXOK|XFILE), -+ EXTRA|NOTRLCOM|XFILE), - EX(CMD_cstag, "cstag", do_cstag, - BANG|TRLBAR|WORD1), - EX(CMD_cunmap, "cunmap", ex_unmap, -@@ -506,7 +506,7 @@ - EX(CMD_lclose, "lclose", ex_cclose, - RANGE|NOTADR|COUNT|TRLBAR), - EX(CMD_lcscope, "lcscope", do_cscope, -- EXTRA|NOTRLCOM|SBOXOK|XFILE), -+ EXTRA|NOTRLCOM|XFILE), - EX(CMD_left, "left", ex_align, - TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), - EX(CMD_leftabove, "leftabove", ex_wrongmodifier, -@@ -635,6 +635,8 @@ - RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), - EX(CMD_noremap, "noremap", ex_map, - BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), -+EX(CMD_noautocmd, "noautocmd", ex_wrongmodifier, -+ NEEDARG|EXTRA|NOTRLCOM), - EX(CMD_nohlsearch, "nohlsearch", ex_nohlsearch, - TRLBAR|SBOXOK|CMDWIN), - EX(CMD_noreabbrev, "noreabbrev", ex_abbreviate, -@@ -651,6 +653,8 @@ - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), - EX(CMD_open, "open", ex_open, - RANGE|EXTRA), -+EX(CMD_oldfiles, "oldfiles", ex_oldfiles, -+ BANG|TRLBAR|SBOXOK|CMDWIN), - EX(CMD_omap, "omap", ex_map, - EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), - EX(CMD_omapclear, "omapclear", ex_mapclear, -@@ -802,7 +806,7 @@ - EX(CMD_scriptencoding, "scriptencoding", ex_scriptencoding, - WORD1|TRLBAR|CMDWIN), - EX(CMD_scscope, "scscope", do_scscope, -- EXTRA|NOTRLCOM|SBOXOK), -+ EXTRA|NOTRLCOM), - EX(CMD_set, "set", ex_set, - TRLBAR|EXTRA|CMDWIN|SBOXOK), - EX(CMD_setfiletype, "setfiletype", ex_setfiletype, -@@ -987,6 +991,8 @@ - BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), - EX(CMD_unmenu, "unmenu", ex_menu, - BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), -+EX(CMD_unsilent, "unsilent", ex_wrongmodifier, -+ NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN), - EX(CMD_update, "update", ex_update, - RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR), - EX(CMD_vglobal, "vglobal", ex_global, -diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c ---- vim72.orig/src/ex_docmd.c 2008-07-26 12:51:05.000000000 +0100 -+++ vim72/src/ex_docmd.c 2009-07-22 22:54:23.000000000 +0100 -@@ -364,6 +364,7 @@ - # define ex_function ex_ni - # define ex_delfunction ex_ni - # define ex_return ex_ni -+# define ex_oldfiles ex_ni - #endif - static char_u *arg_all __ARGS((void)); - #ifdef FEAT_SESSION -@@ -1577,11 +1578,10 @@ - * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals - * "func". * Otherwise return TRUE when "fgetline" equals "func". - */ --/*ARGSUSED*/ - int - getline_equal(fgetline, cookie, func) - char_u *(*fgetline) __ARGS((int, void *, int)); -- void *cookie; /* argument for fgetline() */ -+ void *cookie UNUSED; /* argument for fgetline() */ - char_u *(*func) __ARGS((int, void *, int)); - { - #ifdef FEAT_EVAL -@@ -1609,10 +1609,9 @@ - * If "fgetline" is get_loop_line(), return the cookie used by the original - * getline function. Otherwise return "cookie". - */ --/*ARGSUSED*/ - void * - getline_cookie(fgetline, cookie) -- char_u *(*fgetline) __ARGS((int, void *, int)); -+ char_u *(*fgetline) __ARGS((int, void *, int)) UNUSED; - void *cookie; /* argument for fgetline() */ - { - # ifdef FEAT_EVAL -@@ -1678,8 +1677,8 @@ - char_u *errormsg = NULL; /* error message */ - exarg_T ea; /* Ex command arguments */ - long verbose_save = -1; -- int save_msg_scroll = 0; -- int did_silent = 0; -+ int save_msg_scroll = msg_scroll; -+ int save_msg_silent = -1; - int did_esilent = 0; - #ifdef HAVE_SANDBOX - int did_sandbox = FALSE; -@@ -1770,7 +1769,7 @@ - } - if (checkforcmd(&ea.cmd, "browse", 3)) - { --#ifdef FEAT_BROWSE -+#ifdef FEAT_BROWSE_CMD - cmdmod.browse = TRUE; - #endif - continue; -@@ -1857,9 +1856,9 @@ - } - if (!checkforcmd(&ea.cmd, "silent", 3)) - break; -- ++did_silent; -+ if (save_msg_silent == -1) -+ save_msg_silent = msg_silent; - ++msg_silent; -- save_msg_scroll = msg_scroll; - if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1])) - { - /* ":silent!", but not "silent !cmd" */ -@@ -1887,6 +1886,13 @@ - #endif - continue; - -+ case 'u': if (!checkforcmd(&ea.cmd, "unsilent", 3)) -+ break; -+ if (save_msg_silent == -1) -+ save_msg_silent = msg_silent; -+ msg_silent = 0; -+ continue; -+ - case 'v': if (checkforcmd(&ea.cmd, "vertical", 4)) - { - #ifdef FEAT_VERTSPLIT -@@ -2685,19 +2691,23 @@ - - cmdmod = save_cmdmod; - -- if (did_silent > 0) -+ if (save_msg_silent != -1) - { - /* messages could be enabled for a serious error, need to check if the - * counters don't become negative */ -- msg_silent -= did_silent; -- if (msg_silent < 0) -- msg_silent = 0; -+ if (!did_emsg) -+ msg_silent = save_msg_silent; - emsg_silent -= did_esilent; - if (emsg_silent < 0) - emsg_silent = 0; - /* Restore msg_scroll, it's set by file I/O commands, even when no - * message is actually displayed. */ - msg_scroll = save_msg_scroll; -+ -+ /* "silent reg" or "silent echo x" inside "redir" leaves msg_col -+ * somewhere in the line. Put it back in the first column. */ -+ if (redirecting()) -+ msg_col = 0; - } - - #ifdef HAVE_SANDBOX -@@ -2731,7 +2741,7 @@ - int i; - - for (i = 0; cmd[i] != NUL; ++i) -- if (cmd[i] != (*pp)[i]) -+ if (((char_u *)cmd)[i] != (*pp)[i]) - break; - if (i >= len && !isalpha((*pp)[i])) - { -@@ -2748,11 +2758,10 @@ - * "full" is set to TRUE if the whole command name matched. - * Returns NULL for an ambiguous user command. - */ --/*ARGSUSED*/ - static char_u * - find_command(eap, full) - exarg_T *eap; -- int *full; -+ int *full UNUSED; - { - int len; - char_u *p; -@@ -2797,7 +2806,7 @@ - /* Check for ":dl", ":dell", etc. to ":deletel": that's - * :delete with the 'l' flag. Same for 'p'. */ - for (i = 0; i < len; ++i) -- if (eap->cmd[i] != "delete"[i]) -+ if (eap->cmd[i] != ((char_u *)"delete")[i]) - break; - if (i == len - 1) - { -@@ -2978,11 +2987,13 @@ - {"keepmarks", 3, FALSE}, - {"leftabove", 5, FALSE}, - {"lockmarks", 3, FALSE}, -+ {"noautocmd", 3, FALSE}, - {"rightbelow", 6, FALSE}, - {"sandbox", 3, FALSE}, - {"silent", 3, FALSE}, - {"tab", 3, TRUE}, - {"topleft", 2, FALSE}, -+ {"unsilent", 3, FALSE}, - {"verbose", 4, TRUE}, - {"vertical", 4, FALSE}, - }; -@@ -3000,7 +3011,7 @@ - - if (VIM_ISDIGIT(*cmd)) - p = skipwhite(skipdigits(cmd)); -- for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) -+ for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) - { - for (j = 0; p[j] != NUL; ++j) - if (p[j] != cmdmods[i].name[j]) -@@ -3028,7 +3039,7 @@ - char_u *p; - - /* Check command modifiers. */ -- for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i) -+ for (i = 0; i < (int)(sizeof(cmdmods) / sizeof(struct cmdmod)); ++i) - { - for (j = 0; name[j] != NUL; ++j) - if (name[j] != cmdmods[i].name[j]) -@@ -3608,6 +3619,7 @@ - return set_context_in_autocmd(xp, arg, FALSE); - - case CMD_doautocmd: -+ case CMD_doautoall: - return set_context_in_autocmd(xp, arg, TRUE); - #endif - case CMD_set: -@@ -3680,6 +3692,18 @@ - case CMD_highlight: - set_context_in_highlight_cmd(xp, arg); - break; -+#ifdef FEAT_CSCOPE -+ case CMD_cscope: -+ case CMD_lcscope: -+ case CMD_scscope: -+ set_context_in_cscope_cmd(xp, arg, ea.cmdidx); -+ break; -+#endif -+#ifdef FEAT_SIGNS -+ case CMD_sign: -+ set_context_in_sign_cmd(xp, arg); -+ break; -+#endif - #ifdef FEAT_LISTCMDS - case CMD_bdelete: - case CMD_bwipeout: -@@ -3803,7 +3827,7 @@ - char_u *cmd; - int *ctx; /* pointer to xp_context or NULL */ - { -- int delim; -+ unsigned delim; - - while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL) - { -@@ -5033,10 +5057,9 @@ - /* - * Function given to ExpandGeneric() to obtain the list of command names. - */ --/*ARGSUSED*/ - char_u * - get_command_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (idx >= (int)CMD_SIZE) -@@ -5121,7 +5144,11 @@ - } - - vim_free(cmd->uc_rep); -- cmd->uc_rep = 0; -+ cmd->uc_rep = NULL; -+#if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) -+ vim_free(cmd->uc_compl_arg); -+ cmd->uc_compl_arg = NULL; -+#endif - break; - } - -@@ -5180,6 +5207,9 @@ - {EXPAND_AUGROUP, "augroup"}, - {EXPAND_BUFFERS, "buffer"}, - {EXPAND_COMMANDS, "command"}, -+#if defined(FEAT_CSCOPE) -+ {EXPAND_CSCOPE, "cscope"}, -+#endif - #if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL) - {EXPAND_USER_DEFINED, "custom"}, - {EXPAND_USER_LIST, "customlist"}, -@@ -5196,6 +5226,9 @@ - {EXPAND_MENUS, "menu"}, - {EXPAND_SETTINGS, "option"}, - {EXPAND_SHELLCMD, "shellcmd"}, -+#if defined(FEAT_SIGNS) -+ {EXPAND_SIGN, "sign"}, -+#endif - {EXPAND_TAGS, "tag"}, - {EXPAND_TAGS_LISTFILES, "tag_listfiles"}, - {EXPAND_USER_VARS, "var"}, -@@ -5479,6 +5512,9 @@ - return OK; - } - -+/* -+ * ":command ..." -+ */ - static void - ex_command(eap) - exarg_T *eap; -@@ -5540,10 +5576,9 @@ - * ":comclear" - * Clear all user commands, global and for current buffer. - */ --/*ARGSUSED*/ - void - ex_comclear(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - uc_clear(&ucmds); - uc_clear(&curbuf->b_ucmds); -@@ -5910,7 +5945,8 @@ - char_u *q; - - char_u *start; -- char_u *end; -+ char_u *end = NULL; -+ char_u *ksp; - size_t len, totlen; - - size_t split_len = 0; -@@ -5927,16 +5963,51 @@ - - /* - * Replace <> in the command by the arguments. -+ * First round: "buf" is NULL, compute length, allocate "buf". -+ * Second round: copy result into "buf". - */ - buf = NULL; - for (;;) - { -- p = cmd->uc_rep; -- q = buf; -+ p = cmd->uc_rep; /* source */ -+ q = buf; /* destination */ - totlen = 0; -- while ((start = vim_strchr(p, '<')) != NULL -- && (end = vim_strchr(start + 1, '>')) != NULL) -+ -+ for (;;) - { -+ start = vim_strchr(p, '<'); -+ if (start != NULL) -+ end = vim_strchr(start + 1, '>'); -+ if (buf != NULL) -+ { -+ ksp = vim_strchr(p, K_SPECIAL); -+ if (ksp != NULL && (start == NULL || ksp < start || end == NULL) -+ && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER) -+# ifdef FEAT_GUI -+ || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI) -+# endif -+ )) -+ { -+ /* K_SPECIAL han been put in the buffer as K_SPECIAL -+ * KS_SPECIAL KE_FILLER, like for mappings, but -+ * do_cmdline() doesn't handle that, so convert it back. -+ * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */ -+ len = ksp - p; -+ if (len > 0) -+ { -+ mch_memmove(q, p, len); -+ q += len; -+ } -+ *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI; -+ p = ksp + 3; -+ continue; -+ } -+ } -+ -+ /* break if there no is found */ -+ if (start == NULL || end == NULL) -+ break; -+ - /* Include the '>' */ - ++end; - -@@ -6003,10 +6074,9 @@ - /* - * Function given to ExpandGeneric() to obtain the list of user command names. - */ --/*ARGSUSED*/ - char_u * - get_user_commands(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (idx < curbuf->b_ucmds.ga_len) -@@ -6021,17 +6091,16 @@ - * Function given to ExpandGeneric() to obtain the list of user command - * attributes. - */ --/*ARGSUSED*/ - char_u * - get_user_cmd_flags(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - static char *user_cmd_flags[] = - {"bang", "bar", "buffer", "complete", "count", - "nargs", "range", "register"}; - -- if (idx >= sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0])) -+ if (idx >= (int)(sizeof(user_cmd_flags) / sizeof(user_cmd_flags[0]))) - return NULL; - return (char_u *)user_cmd_flags[idx]; - } -@@ -6039,15 +6108,14 @@ - /* - * Function given to ExpandGeneric() to obtain the list of values for -nargs. - */ --/*ARGSUSED*/ - char_u * - get_user_cmd_nargs(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"}; - -- if (idx >= sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0])) -+ if (idx >= (int)(sizeof(user_cmd_nargs) / sizeof(user_cmd_nargs[0]))) - return NULL; - return (char_u *)user_cmd_nargs[idx]; - } -@@ -6055,10 +6123,9 @@ - /* - * Function given to ExpandGeneric() to obtain the list of values for -complete. - */ --/*ARGSUSED*/ - char_u * - get_user_cmd_complete(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - return (char_u *)command_complete[idx].name; -@@ -6236,10 +6303,9 @@ - /* - * ":cquit". - */ --/*ARGSUSED*/ - static void - ex_cquit(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - getout(1); /* this does not always pass on the exit code to the Manx - compiler. why? */ -@@ -6681,10 +6747,9 @@ - /* - * ":shell". - */ --/*ARGSUSED*/ - static void - ex_shell(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - do_shell(NULL, 0); - } -@@ -6988,10 +7053,9 @@ - /* - * ":preserve". - */ --/*ARGSUSED*/ - static void - ex_preserve(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - curbuf->b_flags |= BF_PRESERVED; - ml_preserve(curbuf, TRUE); -@@ -7223,10 +7287,9 @@ - /* - * :tabs command: List tabs and their contents. - */ --/*ARGSUSED*/ - static void - ex_tabs(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - tabpage_T *tp; - win_T *wp; -@@ -7413,7 +7476,6 @@ - /* - * ":edit " command and alikes. - */ --/*ARGSUSED*/ - void - do_exedit(eap, old_curwin) - exarg_T *eap; -@@ -7485,7 +7547,8 @@ - /* ":new" or ":tabnew" without argument: edit an new empty buffer */ - setpcmark(); - (void)do_ecmd(0, NULL, NULL, eap, ECMD_ONE, -- ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0)); -+ ECMD_HIDE + (eap->forceit ? ECMD_FORCEIT : 0), -+ old_curwin == NULL ? curwin : NULL); - } - else if ((eap->cmdidx != CMD_split - #ifdef FEAT_VERTSPLIT -@@ -7522,7 +7585,7 @@ - #ifdef FEAT_LISTCMDS - + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 ) - #endif -- ) == FAIL) -+ , old_curwin == NULL ? curwin : NULL) == FAIL) - { - /* Editing the file failed. If the window was split, close it. */ - #ifdef FEAT_WINDOWS -@@ -7624,10 +7687,9 @@ - } - #endif - --/*ARGSUSED*/ - static void - ex_swapname(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) - MSG(_("No swap file")); -@@ -7640,10 +7702,9 @@ - * offset. - * (1998-11-02 16:21:01 R. Edward Ralston ) - */ --/*ARGSUSED*/ - static void - ex_syncbind(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - #ifdef FEAT_SCROLLBIND - win_T *wp; -@@ -7784,10 +7845,10 @@ - if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK) - { - ml_delete(lnum, FALSE); -- deleted_lines_mark(lnum, 1L); - if (curwin->w_cursor.lnum > 1 - && curwin->w_cursor.lnum >= lnum) - --curwin->w_cursor.lnum; -+ deleted_lines_mark(lnum, 1L); - } - } - redraw_curbuf_later(VALID); -@@ -7803,6 +7864,9 @@ - { - vim_free(prev_dir); - prev_dir = NULL; -+ -+ vim_free(globaldir); -+ globaldir = NULL; - } - #endif - -@@ -7825,6 +7889,10 @@ - else - #endif - { -+#ifdef FEAT_AUTOCMD -+ if (allbuf_locked()) -+ return; -+#endif - if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged() - && !eap->forceit) - { -@@ -7896,7 +7964,7 @@ - shorten_fnames(TRUE); - - /* Echo the new current directory if the command was typed. */ -- if (KeyTyped) -+ if (KeyTyped || p_verbose >= 5) - ex_pwd(eap); - } - vim_free(tofree); -@@ -7906,10 +7974,9 @@ - /* - * ":pwd". - */ --/*ARGSUSED*/ - static void - ex_pwd(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - if (mch_dirname(NameBuff, MAXPATHL) == OK) - { -@@ -8340,10 +8407,9 @@ - /* - * ":undo". - */ --/*ARGSUSED*/ - static void - ex_undo(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - if (eap->addr_count == 1) /* :undo 123 */ - undo_time(eap->line2, FALSE, TRUE); -@@ -8354,10 +8420,9 @@ - /* - * ":redo". - */ --/*ARGSUSED*/ - static void - ex_redo(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - u_redo(1); - } -@@ -8365,7 +8430,6 @@ - /* - * ":earlier" and ":later". - */ --/*ARGSUSED*/ - static void - ex_later(eap) - exarg_T *eap; -@@ -8550,10 +8614,9 @@ - /* - * ":redrawstatus": force redraw of status line(s) - */ --/*ARGSUSED*/ - static void - ex_redrawstatus(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - #if defined(FEAT_WINDOWS) - int r = RedrawingDisabled; -@@ -8630,6 +8693,8 @@ - } - - #ifdef FEAT_SESSION -+ /* Use the short file name until ":lcd" is used. We also don't use the -+ * short file name when 'acd' is set, that is checked later. */ - did_lcd = FALSE; - - /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */ -@@ -8749,8 +8814,8 @@ - else if (*dirnow != NUL - && (ssop_flags & SSOP_CURDIR) && globaldir != NULL) - { -- (void)mch_chdir((char *)globaldir); -- shorten_fnames(TRUE); -+ if (mch_chdir((char *)globaldir) == 0) -+ shorten_fnames(TRUE); - } - - failed |= (makeopens(fd, dirnow) == FAIL); -@@ -8814,11 +8879,10 @@ - - #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \ - || defined(PROTO) --/*ARGSUSED*/ - int - vim_mkdir_emsg(name, prot) - char_u *name; -- int prot; -+ int prot UNUSED; - { - if (vim_mkdir(name, prot) != 0) - { -@@ -9089,10 +9153,9 @@ - /* - * ":stopinsert" - */ --/*ARGSUSED*/ - static void - ex_stopinsert(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - restart_edit = 0; - stop_insert_mode = TRUE; -@@ -9366,9 +9429,8 @@ - # define SPEC_CLIENT 9 - #endif - }; --#define SPEC_COUNT (sizeof(spec_str) / sizeof(char *)) - -- for (i = 0; i < SPEC_COUNT; ++i) -+ for (i = 0; i < (int)(sizeof(spec_str) / sizeof(char *)); ++i) - { - len = (int)STRLEN(spec_str[i]); - if (STRNCMP(src, spec_str[i], len) == 0) -@@ -9506,24 +9568,50 @@ - break; - } - s = src + 1; -+ if (*s == '<') /* "#<99" uses v:oldfiles */ -+ ++s; - i = (int)getdigits(&s); - *usedlen = (int)(s - src); /* length of what we expand */ - -- buf = buflist_findnr(i); -- if (buf == NULL) -+ if (src[1] == '<') - { -- *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'"); -+ if (*usedlen < 2) -+ { -+ /* Should we give an error message for #b_fname == NULL) -+ else - { -- result = (char_u *)""; -- valid = 0; /* Must have ":p:h" to be valid */ -+ buf = buflist_findnr(i); -+ if (buf == NULL) -+ { -+ *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'"); -+ return NULL; -+ } -+ if (lnump != NULL) -+ *lnump = ECMD_LAST; -+ if (buf->b_fname == NULL) -+ { -+ result = (char_u *)""; -+ valid = 0; /* Must have ":p:h" to be valid */ -+ } -+ else -+ result = buf->b_fname; - } -- else -- result = buf->b_fname; - break; - - #ifdef FEAT_SEARCHPATH -@@ -9541,6 +9629,15 @@ - #ifdef FEAT_AUTOCMD - case SPEC_AFILE: /* file name for autocommand */ - result = autocmd_fname; -+ if (result != NULL && !autocmd_fname_full) -+ { -+ /* Still need to turn the fname into a full path. It is -+ * postponed to avoid a delay when is not used. */ -+ autocmd_fname_full = TRUE; -+ result = FullName_save(autocmd_fname, FALSE); -+ vim_free(autocmd_fname); -+ autocmd_fname = result; -+ } - if (result == NULL) - { - *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"\""); -@@ -9684,7 +9781,7 @@ - } - - /* allocate memory */ -- retval = alloc(len + 1); -+ retval = alloc((unsigned)len + 1); - if (retval == NULL) - break; - } -@@ -10067,7 +10164,7 @@ - */ - if (put_line(fd, "let s:sx = expand(\":p:r\").\"x.vim\"") == FAIL - || put_line(fd, "if file_readable(s:sx)") == FAIL -- || put_line(fd, " exe \"source \" . s:sx") == FAIL -+ || put_line(fd, " exe \"source \" . fnameescape(s:sx)") == FAIL - || put_line(fd, "endif") == FAIL) - return FAIL; - -@@ -10485,6 +10582,9 @@ - if (buf->b_sfname != NULL - && flagp == &ssop_flags - && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR)) -+#ifdef FEAT_AUTOCHDIR -+ && !p_acd -+#endif - && !did_lcd) - name = buf->b_sfname; - else -@@ -10689,7 +10789,8 @@ - p_viminfo = (char_u *)"'100"; - if (eap->cmdidx == CMD_rviminfo) - { -- if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL) -+ if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS -+ | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL) - EMSG(_("E195: Cannot open viminfo file for reading")); - } - else -@@ -10850,10 +10951,9 @@ - } - #endif - --/*ARGSUSED*/ - static void - ex_digraphs(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - #ifdef FEAT_DIGRAPHS - if (*eap->arg != NUL) -@@ -10887,10 +10987,9 @@ - /* - * ":nohlsearch" - */ --/*ARGSUSED*/ - static void - ex_nohlsearch(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - no_hlsearch = TRUE; - redraw_all_later(SOME_VALID); -@@ -10969,10 +11068,9 @@ - /* - * ":X": Get crypt key - */ --/*ARGSUSED*/ - static void - ex_X(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - (void)get_crypt_key(TRUE, TRUE); - } -diff -Naur vim72.orig/src/ex_eval.c vim72/src/ex_eval.c ---- vim72.orig/src/ex_eval.c 2007-11-24 15:34:09.000000000 +0000 -+++ vim72/src/ex_eval.c 2009-07-22 22:54:21.000000000 +0100 -@@ -60,7 +60,9 @@ - #else - /* Values used for the Vim release. */ - # define THROW_ON_ERROR TRUE -+# define THROW_ON_ERROR_TRUE - # define THROW_ON_INTERRUPT TRUE -+# define THROW_ON_INTERRUPT_TRUE - #endif - - static void catch_exception __ARGS((except_T *excp)); -@@ -1320,16 +1322,20 @@ - * and reset the did_emsg or got_int flag, so this won't happen again at - * the next surrounding try conditional. - */ -+#ifndef THROW_ON_ERROR_TRUE - if (did_emsg && !THROW_ON_ERROR) - { - inactivate_try = TRUE; - did_emsg = FALSE; - } -+#endif -+#ifndef THROW_ON_INTERRUPT_TRUE - if (got_int && !THROW_ON_INTERRUPT) - { - inactivate_try = TRUE; - got_int = FALSE; - } -+#endif - idx = cleanup_conditionals(cstack, 0, inactivate_try); - if (idx >= 0) - { -@@ -2254,10 +2260,9 @@ - /* - * ":endfunction" when not after a ":function" - */ --/*ARGSUSED*/ - void - ex_endfunction(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - EMSG(_("E193: :endfunction not inside a function")); - } -diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c ---- vim72.orig/src/ex_getln.c 2008-08-08 10:31:33.000000000 +0100 -+++ vim72/src/ex_getln.c 2009-07-22 22:54:23.000000000 +0100 -@@ -31,6 +31,8 @@ - int cmdattr; /* attributes for prompt */ - int overstrike; /* Typing mode on the command line. Shared by - getcmdline() and put_on_cmdline(). */ -+ expand_T *xpc; /* struct being used for expansion, xp_pattern -+ may point into cmdbuff */ - int xp_context; /* type of expansion */ - # ifdef FEAT_EVAL - char_u *xp_arg; /* user-defined expansion arg */ -@@ -38,7 +40,11 @@ - # endif - }; - --static struct cmdline_info ccline; /* current cmdline_info */ -+/* The current cmdline_info. It is initialized in getcmdline() and after that -+ * used by other functions. When invoking getcmdline() recursively it needs -+ * to be saved with save_cmdline() and restored with restore_cmdline(). -+ * TODO: make it local to getcmdline() and pass it around. */ -+static struct cmdline_info ccline; - - static int cmd_showtail; /* Only show path tail in lists ? */ - -@@ -134,11 +140,10 @@ - * Return pointer to allocated string if there is a commandline, NULL - * otherwise. - */ --/*ARGSUSED*/ - char_u * - getcmdline(firstc, count, indent) - int firstc; -- long count; /* only used for incremental search */ -+ long count UNUSED; /* only used for incremental search */ - int indent; /* indent for inside conditionals */ - { - int c; -@@ -238,6 +243,7 @@ - } - - ExpandInit(&xpc); -+ ccline.xpc = &xpc; - - #ifdef FEAT_RIGHTLEFT - if (curwin->w_p_rl && *curwin->w_p_rlc == 's' -@@ -318,7 +324,7 @@ - #endif - - #ifdef FEAT_DIGRAPHS -- do_digraph(-1); /* init digraph typahead */ -+ do_digraph(-1); /* init digraph typeahead */ - #endif - - /* -@@ -408,9 +414,10 @@ - #endif - - /* -- * works like CTRL-P (unless 'wc' is ). -+ * When there are matching completions to select works like -+ * CTRL-P (unless 'wc' is ). - */ -- if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1) -+ if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0) - c = Ctrl_P; - - #ifdef FEAT_WILDMENU -@@ -1513,6 +1520,7 @@ - int old_firstc; - - vim_free(ccline.cmdbuff); -+ xpc.xp_context = EXPAND_NOTHING; - if (hiscnt == hislen) - p = lookfor; /* back to the old one */ - else -@@ -1839,6 +1847,7 @@ - #endif - - ExpandCleanup(&xpc); -+ ccline.xpc = NULL; - - #ifdef FEAT_SEARCH_EXTRA - if (did_incsearch) -@@ -1990,8 +1999,8 @@ - - #if defined(FEAT_AUTOCMD) || defined(PROTO) - /* -- * Check if "curbuf_lock" is set and return TRUE when it is and give an error -- * message. -+ * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is -+ * and give an error message. - */ - int - curbuf_locked() -@@ -2001,6 +2010,21 @@ - EMSG(_("E788: Not allowed to edit another buffer now")); - return TRUE; - } -+ return allbuf_locked(); -+} -+ -+/* -+ * Check if "allbuf_lock" is set and return TRUE when it is and give an error -+ * message. -+ */ -+ int -+allbuf_locked() -+{ -+ if (allbuf_lock > 0) -+ { -+ EMSG(_("E811: Not allowed to change buffer information now")); -+ return TRUE; -+ } - return FALSE; - } - #endif -@@ -2088,11 +2112,10 @@ - /* - * Get an Ex command line for the ":" command. - */ --/* ARGSUSED */ - char_u * --getexline(c, dummy, indent) -+getexline(c, cookie, indent) - int c; /* normally ':', NUL for ":append" */ -- void *dummy; /* cookie not used */ -+ void *cookie UNUSED; - int indent; /* indent for inside conditionals */ - { - /* When executing a register, remove ':' that's in front of each line. */ -@@ -2107,12 +2130,11 @@ - * mappings or abbreviations. - * Returns a string in allocated memory or NULL. - */ --/* ARGSUSED */ - char_u * --getexmodeline(promptc, dummy, indent) -+getexmodeline(promptc, cookie, indent) - int promptc; /* normally ':', NUL for ":append" and '?' for - :s prompt */ -- void *dummy; /* cookie not used */ -+ void *cookie UNUSED; - int indent; /* indent for inside conditionals */ - { - garray_T line_ga; -@@ -2508,6 +2530,20 @@ - } - mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1); - vim_free(p); -+ -+ if (ccline.xpc != NULL -+ && ccline.xpc->xp_pattern != NULL -+ && ccline.xpc->xp_context != EXPAND_NOTHING -+ && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL) -+ { -+ int i = (int)(ccline.xpc->xp_pattern - p); -+ -+ /* If xp_pattern points inside the old cmdbuff it needs to be adjusted -+ * to point into the newly allocated memory. */ -+ if (i >= 0 && i <= ccline.cmdlen) -+ ccline.xpc->xp_pattern = ccline.cmdbuff + i; -+ } -+ - return OK; - } - -@@ -2875,6 +2911,7 @@ - prev_ccline = ccline; - ccline.cmdbuff = NULL; - ccline.cmdprompt = NULL; -+ ccline.xpc = NULL; - } - - /* -@@ -3582,6 +3619,7 @@ - ExpandInit(xp) - expand_T *xp; - { -+ xp->xp_pattern = NULL; - xp->xp_backslash = XP_BS_NONE; - #ifndef BACKSLASH_IN_FILENAME - xp->xp_shell = FALSE; -@@ -3791,11 +3829,10 @@ - * Returns EXPAND_NOTHING when the character that triggered expansion should - * be inserted like a normal character. - */ --/*ARGSUSED*/ - static int - showmatches(xp, wildmenu) - expand_T *xp; -- int wildmenu; -+ int wildmenu UNUSED; - { - #define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m]) - int num_files; -@@ -4477,6 +4514,12 @@ - {EXPAND_EVENTS, get_event_name, TRUE}, - {EXPAND_AUGROUP, get_augroup_name, TRUE}, - #endif -+#ifdef FEAT_CSCOPE -+ {EXPAND_CSCOPE, get_cscope_name, TRUE}, -+#endif -+#ifdef FEAT_SIGNS -+ {EXPAND_SIGN, get_sign_name, TRUE}, -+#endif - #if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \ - && (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) - {EXPAND_LANGUAGE, get_lang_arg, TRUE}, -@@ -4490,7 +4533,7 @@ - * right function to do the expansion. - */ - ret = FAIL; -- for (i = 0; i < sizeof(tab) / sizeof(struct expgen); ++i) -+ for (i = 0; i < (int)(sizeof(tab) / sizeof(struct expgen)); ++i) - if (xp->xp_context == tab[i].context) - { - if (tab[i].ic) -@@ -4831,14 +4874,14 @@ - /* Loop over the items in the list. */ - for (li = retlist->lv_first; li != NULL; li = li->li_next) - { -- if (li->li_tv.v_type != VAR_STRING) -- continue; /* Skip non-string items */ -+ if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL) -+ continue; /* Skip non-string items and empty strings */ - - if (ga_grow(&ga, 1) == FAIL) - break; - - ((char_u **)ga.ga_data)[ga.ga_len] = -- vim_strsave(li->li_tv.vval.v_string); -+ vim_strsave(li->li_tv.vval.v_string); - ++ga.ga_len; - } - list_unref(retlist); -@@ -4871,7 +4914,7 @@ - if (s == NULL) - return FAIL; - sprintf((char *)s, "%s/%s*.vim", dirname, pat); -- all = globpath(p_rtp, s); -+ all = globpath(p_rtp, s, 0); - vim_free(s); - if (all == NULL) - return FAIL; -@@ -4912,9 +4955,10 @@ - * newlines. Returns NULL for an error or no matches. - */ - char_u * --globpath(path, file) -+globpath(path, file, expand_options) - char_u *path; - char_u *file; -+ int expand_options; - { - expand_T xpc; - char_u *buf; -@@ -4943,10 +4987,10 @@ - { - add_pathsep(buf); - STRCAT(buf, file); -- if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL -- && num_p > 0) -+ if (ExpandFromContext(&xpc, buf, &num_p, &p, -+ WILD_SILENT|expand_options) != FAIL && num_p > 0) - { -- ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT); -+ ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options); - for (len = 0, i = 0; i < num_p; ++i) - len += (int)STRLEN(p[i]) + 1; - -@@ -5641,7 +5685,7 @@ - histype1 = get_histtype(arg); - if (histype1 == -1) - { -- if (STRICMP(arg, "all") == 0) -+ if (STRNICMP(arg, "all", STRLEN(arg)) == 0) - { - histype1 = 0; - histype2 = HIST_COUNT-1; -@@ -6020,16 +6064,17 @@ - # endif - return K_IGNORE; - } -- cmdwin_type = ccline.cmdfirstc; -- if (cmdwin_type == NUL) -- cmdwin_type = '-'; -+ cmdwin_type = get_cmdline_type(); - - /* Create the command-line buffer empty. */ -- (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE); -+ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL); - (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE); - set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL); - set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL); - curbuf->b_p_ma = TRUE; -+#ifdef FEAT_FOLDING -+ curwin->w_p_fen = FALSE; -+#endif - # ifdef FEAT_RIGHTLEFT - curwin->w_p_rl = cmdmsg_rl; - cmdmsg_rl = FALSE; -@@ -6046,7 +6091,7 @@ - /* Showing the prompt may have set need_wait_return, reset it. */ - need_wait_return = FALSE; - -- histtype = hist_char2type(ccline.cmdfirstc); -+ histtype = hist_char2type(cmdwin_type); - if (histtype == HIST_CMD || histtype == HIST_DEBUG) - { - if (p_wc == TAB) -diff -Naur vim72.orig/src/farsi.c vim72/src/farsi.c ---- vim72.orig/src/farsi.c 2007-12-31 16:28:10.000000000 +0000 -+++ vim72/src/farsi.c 2009-07-22 22:54:22.000000000 +0100 -@@ -103,7 +103,8 @@ - case F_HE: - tempc = _HE; - -- if (p_ri && (curwin->w_cursor.col+1 < STRLEN(ml_get_curline()))) -+ if (p_ri && (curwin->w_cursor.col + 1 -+ < (colnr_T)STRLEN(ml_get_curline()))) - { - inc_cursor(); - -@@ -344,7 +345,7 @@ - if (curwin->w_p_rl && p_ri) - return; - -- if ( (curwin->w_cursor.col < STRLEN(ml_get_curline()))) -+ if ((curwin->w_cursor.col < (colnr_T)STRLEN(ml_get_curline()))) - { - if ((p_ri && curwin->w_cursor.col) || !p_ri) - { -@@ -565,7 +566,7 @@ - - tempc = gchar_cursor(); - -- if (curwin->w_cursor.col+1 < STRLEN(ml_get_curline())) -+ if (curwin->w_cursor.col + 1 < (colnr_T)STRLEN(ml_get_curline())) - { - inc_cursor(); - -@@ -594,8 +595,8 @@ - { - int tempc; - -- if (!curwin->w_cursor.col && -- (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) -+ if (curwin->w_cursor.col != 0 && -+ (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) - return; - - if (!curwin->w_cursor.col && p_ri) -@@ -663,8 +664,8 @@ - { - int tempc; - -- if (!curwin->w_cursor.col && -- (curwin->w_cursor.col+1 == STRLEN(ml_get_curline()))) -+ if (curwin->w_cursor.col != 0 && -+ (curwin->w_cursor.col + 1 == (colnr_T)STRLEN(ml_get_curline()))) - return; - - if (!curwin->w_cursor.col && p_ri) -diff -Naur vim72.orig/src/feature.h vim72/src/feature.h ---- vim72.orig/src/feature.h 2008-08-06 12:00:39.000000000 +0100 -+++ vim72/src/feature.h 2009-07-22 22:54:17.000000000 +0100 -@@ -767,9 +767,13 @@ - - /* - * +browse ":browse" command. -+ * or just the ":browse" command modifier - */ --#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)) --# define FEAT_BROWSE -+#if defined(FEAT_NORMAL) -+# define FEAT_BROWSE_CMD -+# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC) -+# define FEAT_BROWSE -+# endif - #endif - - /* -diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c ---- vim72.orig/src/fileio.c 2008-08-06 12:01:03.000000000 +0100 -+++ vim72/src/fileio.c 2009-07-22 22:54:23.000000000 +0100 -@@ -69,7 +69,7 @@ - static int au_find_group __ARGS((char_u *name)); - - # define AUGROUP_DEFAULT -1 /* default autocmd group */ --# define AUGROUP_ERROR -2 /* errornouse autocmd group */ -+# define AUGROUP_ERROR -2 /* erroneous autocmd group */ - # define AUGROUP_ALL -3 /* all autocmd groups */ - #endif - -@@ -144,7 +144,9 @@ - # endif - #endif - static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf)); -- -+#ifdef FEAT_AUTOCMD -+static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name"); -+#endif - - void - filemess(buf, name, s, attr) -@@ -295,6 +297,19 @@ - int conv_restlen = 0; /* nr of bytes in conv_rest[] */ - #endif - -+#ifdef FEAT_AUTOCMD -+ /* Remember the initial values of curbuf, curbuf->b_ffname and -+ * curbuf->b_fname to detect whether they are altered as a result of -+ * executing nasty autocommands. Also check if "fname" and "sfname" -+ * point to one of these values. */ -+ buf_T *old_curbuf = curbuf; -+ char_u *old_b_ffname = curbuf->b_ffname; -+ char_u *old_b_fname = curbuf->b_fname; -+ int using_b_ffname = (fname == curbuf->b_ffname) -+ || (sfname == curbuf->b_ffname); -+ int using_b_fname = (fname == curbuf->b_fname) -+ || (sfname == curbuf->b_fname); -+#endif - write_no_eol_lnum = 0; /* in case it was set by the previous read */ - - /* -@@ -589,7 +604,21 @@ - #ifdef FEAT_QUICKFIX - if (!bt_dontwrite(curbuf)) - #endif -+ { - check_need_swap(newfile); -+#ifdef FEAT_AUTOCMD -+ /* SwapExists autocommand may mess things up */ -+ if (curbuf != old_curbuf -+ || (using_b_ffname -+ && (old_b_ffname != curbuf->b_ffname)) -+ || (using_b_fname -+ && (old_b_fname != curbuf->b_fname))) -+ { -+ EMSG(_(e_auchangedbuf)); -+ return FAIL; -+ } -+#endif -+ } - if (dir_of_file_exists(fname)) - filemess(curbuf, sfname, (char_u *)_("[New File]"), 0); - else -@@ -668,9 +697,21 @@ - #endif - { - check_need_swap(newfile); -+#ifdef FEAT_AUTOCMD -+ if (!read_stdin && (curbuf != old_curbuf -+ || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) -+ || (using_b_fname && (old_b_fname != curbuf->b_fname)))) -+ { -+ EMSG(_(e_auchangedbuf)); -+ if (!read_buffer) -+ close(fd); -+ return FAIL; -+ } -+#endif - #ifdef UNIX - /* Set swap file protection bits after creating it. */ -- if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL) -+ if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL -+ && curbuf->b_ml.ml_mfp->mf_fname != NULL) - (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode); - #endif - } -@@ -698,7 +739,6 @@ - { - int m = msg_scroll; - int n = msg_scrolled; -- buf_T *old_curbuf = curbuf; - - /* - * The file must be closed again, the autocommands may want to change -@@ -740,8 +780,13 @@ - /* - * Don't allow the autocommands to change the current buffer. - * Try to re-open the file. -+ * -+ * Don't allow the autocommands to change the buffer name either -+ * (cd for example) if it invalidates fname or sfname. - */ - if (!read_stdin && (curbuf != old_curbuf -+ || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) -+ || (using_b_fname && (old_b_fname != curbuf->b_fname)) - || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0)) - { - --no_wait_return; -@@ -932,7 +977,10 @@ - else - { - if (eap != NULL && eap->force_ff != 0) -+ { - fileformat = get_fileformat_force(curbuf, eap); -+ try_unix = try_dos = try_mac = FALSE; -+ } - else if (curbuf->b_p_bin) - fileformat = EOL_UNIX; /* binary: use Unix format */ - else if (*p_ffs == NUL) -@@ -2211,7 +2259,7 @@ - { - /* Use stderr for stdin, makes shell commands work. */ - close(0); -- dup(2); -+ ignored = dup(2); - } - #endif - -@@ -2341,11 +2389,6 @@ - STRCAT(IObuff, _("[CR missing]")); - c = TRUE; - } -- if (ff_error == EOL_MAC) -- { -- STRCAT(IObuff, _("[NL found]")); -- c = TRUE; -- } - if (split) - { - STRCAT(IObuff, _("[long lines split]")); -@@ -2711,7 +2754,7 @@ - { - if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0 - && curbuf->b_ffname != NULL) -- read_viminfo(NULL, FALSE, TRUE, FALSE); -+ read_viminfo(NULL, VIF_WANT_MARKS); - - /* Always set b_marks_read; needed when 'viminfo' is changed to include - * the ' parameter after opening a buffer. */ -@@ -3451,12 +3494,12 @@ - { - # ifdef UNIX - # ifdef HAVE_FCHOWN -- fchown(fd, st_old.st_uid, st_old.st_gid); -+ ignored = fchown(fd, st_old.st_uid, st_old.st_gid); - # endif - if (mch_stat((char *)IObuff, &st) < 0 - || st.st_uid != st_old.st_uid - || st.st_gid != st_old.st_gid -- || st.st_mode != perm) -+ || (long)st.st_mode != perm) - backup_copy = TRUE; - # endif - /* Close the file before removing it, on MS-Windows we -@@ -4367,14 +4410,14 @@ - || st.st_uid != st_old.st_uid - || st.st_gid != st_old.st_gid) - { -- fchown(fd, st_old.st_uid, st_old.st_gid); -+ ignored = fchown(fd, st_old.st_uid, st_old.st_gid); - if (perm >= 0) /* set permission again, may have changed */ - (void)mch_setperm(wfname, perm); - } - # endif - buf_setino(buf); - } -- else if (buf->b_dev < 0) -+ else if (!buf->b_dev_valid) - /* Set the inode when creating a new file. */ - buf_setino(buf); - #endif -@@ -4782,6 +4825,8 @@ - char_u *sfname; - { - #ifdef FEAT_AUTOCMD -+ buf_T *buf = curbuf; -+ - /* It's like the unnamed buffer is deleted.... */ - if (curbuf->b_p_bl) - apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf); -@@ -4790,6 +4835,12 @@ - if (aborting()) /* autocmds may abort script processing */ - return FAIL; - # endif -+ if (curbuf != buf) -+ { -+ /* We are in another buffer now, don't do the renaming. */ -+ EMSG(_(e_auchangedbuf)); -+ return FAIL; -+ } - #endif - - if (setfname(curbuf, fname, sfname, FALSE) == OK) -@@ -5246,13 +5297,16 @@ - /* Convert with iconv(). */ - if (ip->bw_restlen > 0) - { -+ char *fp; -+ - /* Need to concatenate the remainder of the previous call and - * the bytes of the current call. Use the end of the - * conversion buffer for this. */ - fromlen = len + ip->bw_restlen; -- from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; -- mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen); -- mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len); -+ fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; -+ mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen); -+ mch_memmove(fp + ip->bw_restlen, buf, (size_t)len); -+ from = fp; - tolen = ip->bw_conv_buflen - fromlen; - } - else -@@ -5550,9 +5604,10 @@ - name = "ucs-4le"; /* FF FE 00 00 */ - len = 4; - } -- else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L)) -+ else if (flags == (FIO_UCS2 | FIO_ENDIAN_L)) - name = "ucs-2le"; /* FF FE */ -- else if (flags == (FIO_UTF16 | FIO_ENDIAN_L)) -+ else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L)) -+ /* utf-16le is preferred, it also works for ucs-2le text */ - name = "utf-16le"; /* FF FE */ - } - else if (p[0] == 0xfe && p[1] == 0xff -@@ -5917,7 +5972,7 @@ - else if (*ext == '.') - #endif - { -- if (s - ptr > (size_t)8) -+ if ((size_t)(s - ptr) > (size_t)8) - { - s = ptr + 8; - *s = '\0'; -@@ -6031,9 +6086,9 @@ - { - tbuf[FGETS_SIZE - 2] = NUL; - #ifdef USE_CR -- fgets_cr((char *)tbuf, FGETS_SIZE, fp); -+ ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp); - #else -- fgets((char *)tbuf, FGETS_SIZE, fp); -+ ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp); - #endif - } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n'); - } -@@ -6107,12 +6162,24 @@ - #ifdef HAVE_ACL - vim_acl_T acl; /* ACL from original file */ - #endif -+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME) -+ int use_tmp_file = FALSE; -+#endif - - /* -- * When the names are identical, there is nothing to do. -+ * When the names are identical, there is nothing to do. When they refer -+ * to the same file (ignoring case and slash/backslash differences) but -+ * the file name differs we need to go through a temp file. - */ - if (fnamecmp(from, to) == 0) -- return 0; -+ { -+#ifdef CASE_INSENSITIVE_FILENAME -+ if (STRCMP(gettail(from), gettail(to)) != 0) -+ use_tmp_file = TRUE; -+ else -+#endif -+ return 0; -+ } - - /* - * Fail if the "from" file doesn't exist. Avoids that "to" is deleted. -@@ -6120,6 +6187,55 @@ - if (mch_stat((char *)from, &st) < 0) - return -1; - -+#ifdef UNIX -+ { -+ struct stat st_to; -+ -+ /* It's possible for the source and destination to be the same file. -+ * This happens when "from" and "to" differ in case and are on a FAT32 -+ * filesystem. In that case go through a temp file name. */ -+ if (mch_stat((char *)to, &st_to) >= 0 -+ && st.st_dev == st_to.st_dev -+ && st.st_ino == st_to.st_ino) -+ use_tmp_file = TRUE; -+ } -+#endif -+ -+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME) -+ if (use_tmp_file) -+ { -+ char tempname[MAXPATHL + 1]; -+ -+ /* -+ * Find a name that doesn't exist and is in the same directory. -+ * Rename "from" to "tempname" and then rename "tempname" to "to". -+ */ -+ if (STRLEN(from) >= MAXPATHL - 5) -+ return -1; -+ STRCPY(tempname, from); -+ for (n = 123; n < 99999; ++n) -+ { -+ sprintf((char *)gettail((char_u *)tempname), "%d", n); -+ if (mch_stat(tempname, &st) < 0) -+ { -+ if (mch_rename((char *)from, tempname) == 0) -+ { -+ if (mch_rename(tempname, (char *)to) == 0) -+ return 0; -+ /* Strange, the second step failed. Try moving the -+ * file back and return failure. */ -+ mch_rename(tempname, (char *)from); -+ return -1; -+ } -+ /* If it fails for one temp name it will most likely fail -+ * for any temp name, give up. */ -+ return -1; -+ } -+ } -+ return -1; -+ } -+#endif -+ - /* - * Delete the "to" file, this is required on some systems to make the - * mch_rename() work, on other systems it makes sure that we don't have -@@ -6260,7 +6376,7 @@ - - if (!stuff_empty() || global_busy || !typebuf_typed() - #ifdef FEAT_AUTOCMD -- || autocmd_busy || curbuf_lock > 0 -+ || autocmd_busy || curbuf_lock > 0 || allbuf_lock > 0 - #endif - ) - need_check_timestamps = TRUE; /* check later */ -@@ -6353,11 +6469,10 @@ - * return 2 if a message has been displayed. - * return 0 otherwise. - */ --/*ARGSUSED*/ - int - buf_check_timestamp(buf, focus) - buf_T *buf; -- int focus; /* called for GUI focus event */ -+ int focus UNUSED; /* called for GUI focus event */ - { - struct stat st; - int stat_res; -@@ -6462,8 +6577,10 @@ - set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1); - set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1); - # endif -+ ++allbuf_lock; - n = apply_autocmds(EVENT_FILECHANGEDSHELL, - buf->b_fname, buf->b_fname, FALSE, buf); -+ --allbuf_lock; - busy = FALSE; - if (n) - { -@@ -6511,7 +6628,10 @@ - mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started"); - mesg2 = _("See \":help W16\" for more info."); - } -- /* Else: only timestamp changed, ignored */ -+ else -+ /* Only timestamp changed, store it to avoid a warning -+ * in check_mtime() later. */ -+ buf->b_mtime_read = buf->b_mtime; - } - } - } -@@ -6538,6 +6658,11 @@ - tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg) - + STRLEN(mesg2) + 2)); - sprintf((char *)tbuf, mesg, path); -+#ifdef FEAT_EVAL -+ /* Set warningmsg here, before the unimportant and output-specific -+ * mesg2 has been appended. */ -+ set_vim_var_string(VV_WARNINGMSG, tbuf, -1); -+#endif - #if defined(FEAT_CON_DIALOG) || defined(FEAT_GUI_DIALOG) - if (can_reload) - { -@@ -6732,10 +6857,11 @@ - #endif - #ifdef FEAT_FOLDING - { -- win_T *wp; -+ win_T *wp; -+ tabpage_T *tp; - - /* Update folds unless they are defined manually. */ -- FOR_ALL_WINDOWS(wp) -+ FOR_ALL_TAB_WINDOWS(tp, wp) - if (wp->w_buffer == curwin->w_buffer - && !foldmethodIsManual(wp)) - foldUpdateAll(wp); -@@ -6753,12 +6879,11 @@ - /* Careful: autocommands may have made "buf" invalid! */ - } - --/*ARGSUSED*/ - void - buf_store_time(buf, st, fname) - buf_T *buf; - struct stat *st; -- char_u *fname; -+ char_u *fname UNUSED; - { - buf->b_mtime = (long)st->st_mtime; - buf->b_orig_size = (size_t)st->st_size; -@@ -6821,10 +6946,9 @@ - * The returned pointer is to allocated memory. - * The returned pointer is NULL if no valid name was found. - */ --/*ARGSUSED*/ - char_u * - vim_tempname(extra_char) -- int extra_char; /* character to use in the name instead of '?' */ -+ int extra_char UNUSED; /* char to use in the name instead of '?' */ - { - #ifdef USE_TMPNAM - char_u itmp[L_tmpnam]; /* use tmpnam() */ -@@ -6853,7 +6977,7 @@ - /* - * Try the entries in TEMPDIRNAMES to create the temp directory. - */ -- for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i) -+ for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i) - { - /* expand $TMP, leave room for "/v1100000/999999999" */ - expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20); -@@ -8245,7 +8369,7 @@ - - /* Execute the modeline settings, but don't set window-local - * options if we are using the current window for another buffer. */ -- do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0); -+ do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0); - - /* restore the current window */ - aucmd_restbuf(&aco); -@@ -8261,8 +8385,8 @@ - - /* - * Prepare for executing autocommands for (hidden) buffer "buf". -- * Search a window for the current buffer. Save the cursor position and -- * screen offset. -+ * Search for a visible window containing the current buffer. If there isn't -+ * one then use "aucmd_win". - * Set "curbuf" and "curwin" to match "buf". - * When FEAT_AUTOCMD is not defined another version is used, see below. - */ -@@ -8272,8 +8396,9 @@ - buf_T *buf; /* new curbuf */ - { - win_T *win; -- -- aco->new_curbuf = buf; -+#ifdef FEAT_WINDOWS -+ int save_ea; -+#endif - - /* Find a window that is for the new buffer */ - if (buf == curbuf) /* be quick when buf is curbuf */ -@@ -8287,42 +8412,51 @@ - win = NULL; - #endif - -- /* -- * Prefer to use an existing window for the buffer, it has the least side -- * effects (esp. if "buf" is curbuf). -- * Otherwise, use curwin for "buf". It might make some items in the -- * window invalid. At least save the cursor and topline. -- */ -+ /* Allocate "aucmd_win" when needed. If this fails (out of memory) fall -+ * back to using the current window. */ -+ if (win == NULL && aucmd_win == NULL) -+ { -+ win_alloc_aucmd_win(); -+ if (aucmd_win == NULL) -+ win = curwin; -+ } -+ -+ aco->save_curwin = curwin; -+ aco->save_curbuf = curbuf; - if (win != NULL) - { -- /* there is a window for "buf", make it the curwin */ -- aco->save_curwin = curwin; -+ /* There is a window for "buf" in the current tab page, make it the -+ * curwin. This is preferred, it has the least side effects (esp. if -+ * "buf" is curbuf). */ - curwin = win; -- aco->save_buf = win->w_buffer; -- aco->new_curwin = win; - } - else - { -- /* there is no window for "buf", use curwin */ -- aco->save_curwin = NULL; -- aco->save_buf = curbuf; -- --curbuf->b_nwindows; -- curwin->w_buffer = buf; -+ /* There is no window for "buf", use "aucmd_win". To minimize the side -+ * effects, insert it in a the current tab page. -+ * Anything related to a window (e.g., setting folds) may have -+ * unexpected results. */ -+ aucmd_win->w_buffer = buf; - ++buf->b_nwindows; -+ win_init_empty(aucmd_win); /* set cursor and topline to safe values */ - -- /* save cursor and topline, set them to safe values */ -- aco->save_cursor = curwin->w_cursor; -- curwin->w_cursor.lnum = 1; -- curwin->w_cursor.col = 0; -- aco->save_topline = curwin->w_topline; -- curwin->w_topline = 1; --#ifdef FEAT_DIFF -- aco->save_topfill = curwin->w_topfill; -- curwin->w_topfill = 0; -+#ifdef FEAT_WINDOWS -+ /* Split the current window, put the aucmd_win in the upper half. -+ * We don't want the BufEnter or WinEnter autocommands. */ -+ block_autocmds(); -+ make_snapshot(SNAP_AUCMD_IDX); -+ save_ea = p_ea; -+ p_ea = FALSE; -+ (void)win_split_ins(0, WSP_TOP, aucmd_win, 0); -+ (void)win_comp_pos(); /* recompute window positions */ -+ p_ea = save_ea; -+ unblock_autocmds(); - #endif -+ curwin = aucmd_win; - } -- - curbuf = buf; -+ aco->new_curwin = curwin; -+ aco->new_curbuf = curbuf; - } - - /* -@@ -8334,21 +8468,88 @@ - aucmd_restbuf(aco) - aco_save_T *aco; /* structure holding saved values */ - { -- if (aco->save_curwin != NULL) -+#ifdef FEAT_WINDOWS -+ int dummy; -+#endif -+ -+ if (aco->new_curwin == aucmd_win) -+ { -+ --curbuf->b_nwindows; -+#ifdef FEAT_WINDOWS -+ /* Find "aucmd_win", it can't be closed, but it may be in another tab -+ * page. Do not trigger autocommands here. */ -+ block_autocmds(); -+ if (curwin != aucmd_win) -+ { -+ tabpage_T *tp; -+ win_T *wp; -+ -+ FOR_ALL_TAB_WINDOWS(tp, wp) -+ { -+ if (wp == aucmd_win) -+ { -+ if (tp != curtab) -+ goto_tabpage_tp(tp); -+ win_goto(aucmd_win); -+ break; -+ } -+ } -+ } -+ -+ /* Remove the window and frame from the tree of frames. */ -+ (void)winframe_remove(curwin, &dummy, NULL); -+ win_remove(curwin, NULL); -+ last_status(FALSE); /* may need to remove last status line */ -+ restore_snapshot(SNAP_AUCMD_IDX, FALSE); -+ (void)win_comp_pos(); /* recompute window positions */ -+ unblock_autocmds(); -+ -+ if (win_valid(aco->save_curwin)) -+ curwin = aco->save_curwin; -+ else -+ /* Hmm, original window disappeared. Just use the first one. */ -+ curwin = firstwin; -+# ifdef FEAT_EVAL -+ vars_clear(&aucmd_win->w_vars.dv_hashtab); /* free all w: variables */ -+# endif -+#else -+ curwin = aco->save_curwin; -+#endif -+ curbuf = curwin->w_buffer; -+ -+ /* the buffer contents may have changed */ -+ check_cursor(); -+ if (curwin->w_topline > curbuf->b_ml.ml_line_count) -+ { -+ curwin->w_topline = curbuf->b_ml.ml_line_count; -+#ifdef FEAT_DIFF -+ curwin->w_topfill = 0; -+#endif -+ } -+#if defined(FEAT_GUI) -+ /* Hide the scrollbars from the aucmd_win and update. */ -+ gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE); -+ gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE); -+ gui_may_update_scrollbars(); -+#endif -+ } -+ else - { - /* restore curwin */ - #ifdef FEAT_WINDOWS - if (win_valid(aco->save_curwin)) - #endif - { -- /* restore the buffer which was previously edited by curwin, if -- * it's still the same window and it's valid */ -+ /* Restore the buffer which was previously edited by curwin, if -+ * it was chagned, we are still the same window and the buffer is -+ * valid. */ - if (curwin == aco->new_curwin -- && buf_valid(aco->save_buf) -- && aco->save_buf->b_ml.ml_mfp != NULL) -+ && curbuf != aco->new_curbuf -+ && buf_valid(aco->new_curbuf) -+ && aco->new_curbuf->b_ml.ml_mfp != NULL) - { - --curbuf->b_nwindows; -- curbuf = aco->save_buf; -+ curbuf = aco->new_curbuf; - curwin->w_buffer = curbuf; - ++curbuf->b_nwindows; - } -@@ -8357,34 +8558,6 @@ - curbuf = curwin->w_buffer; - } - } -- else -- { -- /* restore buffer for curwin if it still exists and is loaded */ -- if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL) -- { -- --curbuf->b_nwindows; -- curbuf = aco->save_buf; -- curwin->w_buffer = curbuf; -- ++curbuf->b_nwindows; -- curwin->w_cursor = aco->save_cursor; -- check_cursor(); -- /* check topline < line_count, in case lines got deleted */ -- if (aco->save_topline <= curbuf->b_ml.ml_line_count) -- { -- curwin->w_topline = aco->save_topline; --#ifdef FEAT_DIFF -- curwin->w_topfill = aco->save_topfill; --#endif -- } -- else -- { -- curwin->w_topline = curbuf->b_ml.ml_line_count; --#ifdef FEAT_DIFF -- curwin->w_topfill = 0; --#endif -- } -- } -- } - } - - static int autocmd_nested = FALSE; -@@ -8523,6 +8696,7 @@ - char_u *save_sourcing_name; - linenr_T save_sourcing_lnum; - char_u *save_autocmd_fname; -+ int save_autocmd_fname_full; - int save_autocmd_bufnr; - char_u *save_autocmd_match; - int save_autocmd_busy; -@@ -8601,6 +8775,7 @@ - * Save the autocmd_* variables and info about the current buffer. - */ - save_autocmd_fname = autocmd_fname; -+ save_autocmd_fname_full = autocmd_fname_full; - save_autocmd_bufnr = autocmd_bufnr; - save_autocmd_match = autocmd_match; - save_autocmd_busy = autocmd_busy; -@@ -8618,14 +8793,15 @@ - if (fname != NULL && *fname != NUL) - autocmd_fname = fname; - else if (buf != NULL) -- autocmd_fname = buf->b_fname; -+ autocmd_fname = buf->b_ffname; - else - autocmd_fname = NULL; - } - else - autocmd_fname = fname_io; - if (autocmd_fname != NULL) -- autocmd_fname = FullName_save(autocmd_fname, FALSE); -+ autocmd_fname = vim_strsave(autocmd_fname); -+ autocmd_fname_full = FALSE; /* call FullName_save() later */ - - /* - * Set the buffer number to be used for . -@@ -8667,9 +8843,11 @@ - else - { - sfname = vim_strsave(fname); -- /* Don't try expanding FileType, Syntax, WindowID or QuickFixCmd* */ -+ /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or -+ * QuickFixCmd* */ - if (event == EVENT_FILETYPE - || event == EVENT_SYNTAX -+ || event == EVENT_FUNCUNDEFINED - || event == EVENT_REMOTEREPLY - || event == EVENT_SPELLFILEMISSING - || event == EVENT_QUICKFIXCMDPRE -@@ -8810,6 +8988,7 @@ - sourcing_lnum = save_sourcing_lnum; - vim_free(autocmd_fname); - autocmd_fname = save_autocmd_fname; -+ autocmd_fname_full = save_autocmd_fname_full; - autocmd_bufnr = save_autocmd_bufnr; - autocmd_match = save_autocmd_match; - #ifdef FEAT_EVAL -@@ -8918,7 +9097,7 @@ - { - apc->curpat = NULL; - -- /* only use a pattern when it has not been removed, has commands and -+ /* Only use a pattern when it has not been removed, has commands and - * the group matches. For buffer-local autocommands only check the - * buffer number. */ - if (ap->pat != NULL && ap->cmds != NULL -@@ -8967,12 +9146,11 @@ - * Called by do_cmdline() to get the next line for ":if". - * Returns allocated string, or NULL for end of autocommands. - */ --/* ARGSUSED */ - static char_u * - getnextac(c, cookie, indent) -- int c; /* not used */ -+ int c UNUSED; - void *cookie; -- int indent; /* not used */ -+ int indent UNUSED; - { - AutoPatCmd *acp = (AutoPatCmd *)cookie; - char_u *retval; -@@ -9083,10 +9261,9 @@ - * Function given to ExpandGeneric() to obtain the list of autocommand group - * names. - */ --/*ARGSUSED*/ - char_u * - get_augroup_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (idx == augroups.ga_len) /* add "END" add the end */ -@@ -9104,7 +9281,7 @@ - set_context_in_autocmd(xp, arg, doautocmd) - expand_T *xp; - char_u *arg; -- int doautocmd; /* TRUE for :doautocmd, FALSE for :autocmd */ -+ int doautocmd; /* TRUE for :doauto*, FALSE for :autocmd */ - { - char_u *p; - int group; -@@ -9152,10 +9329,9 @@ - /* - * Function given to ExpandGeneric() to obtain the list of event names. - */ --/*ARGSUSED*/ - char_u * - get_event_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (idx < augroups.ga_len) /* First list group names, if wanted */ -@@ -9296,9 +9472,11 @@ - aco_save_T *aco; /* structure to save values in */ - buf_T *buf; /* new curbuf */ - { -- aco->save_buf = curbuf; -+ aco->save_curbuf = curbuf; -+ --curbuf->b_nwindows; - curbuf = buf; - curwin->w_buffer = buf; -+ ++curbuf->b_nwindows; - } - - /* -@@ -9309,8 +9487,10 @@ - aucmd_restbuf(aco) - aco_save_T *aco; /* structure holding saved values */ - { -- curbuf = aco->save_buf; -+ --curbuf->b_nwindows; -+ curbuf = aco->save_curbuf; - curwin->w_buffer = curbuf; -+ ++curbuf->b_nwindows; - } - - #endif /* FEAT_AUTOCMD */ -@@ -9467,13 +9647,12 @@ - * - * Returns NULL when out of memory. - */ --/*ARGSUSED*/ - char_u * - file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) - char_u *pat; - char_u *pat_end; /* first char after pattern or NULL */ - char *allow_dirs; /* Result passed back out in here */ -- int no_bslash; /* Don't use a backward slash as pathsep */ -+ int no_bslash UNUSED; /* Don't use a backward slash as pathsep */ - { - int size; - char_u *endp; -diff -Naur vim72.orig/src/fold.c vim72/src/fold.c ---- vim72.orig/src/fold.c 2008-08-06 12:01:12.000000000 +0100 -+++ vim72/src/fold.c 2009-07-22 22:54:19.000000000 +0100 -@@ -48,7 +48,7 @@ - static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); - static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum)); - static void checkupdate __ARGS((win_T *wp)); --static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open)); -+static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open)); - static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep)); - static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep)); - static void foldOpenNested __ARGS((fold_T *fpr)); -@@ -740,7 +740,7 @@ - garray_T *found_ga; - fold_T *found_fp = NULL; - linenr_T found_off = 0; -- int use_level = FALSE; -+ int use_level; - int maybe_small = FALSE; - int level = 0; - linenr_T lnum = start; -@@ -757,6 +757,7 @@ - gap = &curwin->w_folds; - found_ga = NULL; - lnum_off = 0; -+ use_level = FALSE; - for (;;) - { - if (!foldFind(gap, lnum - lnum_off, &fp)) -@@ -783,20 +784,21 @@ - else - { - lnum = found_fp->fd_top + found_fp->fd_len + found_off; -- did_one = TRUE; - - if (foldmethodIsManual(curwin)) - deleteFoldEntry(found_ga, - (int)(found_fp - (fold_T *)found_ga->ga_data), recursive); - else - { -- if (found_fp->fd_top + found_off < first_lnum) -- first_lnum = found_fp->fd_top; -- if (lnum > last_lnum) -+ if (first_lnum > found_fp->fd_top + found_off) -+ first_lnum = found_fp->fd_top + found_off; -+ if (last_lnum < lnum) - last_lnum = lnum; -- parseMarker(curwin); -+ if (!did_one) -+ parseMarker(curwin); - deleteFoldMarkers(found_fp, recursive, found_off); - } -+ did_one = TRUE; - - /* redraw window */ - changed_window_setting(); -@@ -811,6 +813,10 @@ - redraw_curbuf_later(INVERTED); - #endif - } -+ else -+ /* Deleting markers may make cursor column invalid. */ -+ check_cursor_col(); -+ - if (last_lnum > 0) - changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L); - } -@@ -1241,10 +1247,10 @@ - * Repeat "count" times. - */ - static void --setFoldRepeat(lnum, count, open) -+setFoldRepeat(lnum, count, do_open) - linenr_T lnum; - long count; -- int open; -+ int do_open; - { - int done; - long n; -@@ -1252,7 +1258,7 @@ - for (n = 0; n < count; ++n) - { - done = DONE_NOTHING; -- (void)setManualFold(lnum, open, FALSE, &done); -+ (void)setManualFold(lnum, do_open, FALSE, &done); - if (!(done & DONE_ACTION)) - { - /* Only give an error message when no fold could be opened. */ -diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c ---- vim72.orig/src/getchar.c 2008-07-22 17:57:48.000000000 +0100 -+++ vim72/src/getchar.c 2009-07-22 22:54:23.000000000 +0100 -@@ -1309,6 +1309,9 @@ - return OK; - } - -+static int old_char = -1; /* character put back by vungetc() */ -+static int old_mod_mask; /* mod_mask for ungotten character */ -+ - #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO) - - /* -@@ -1323,6 +1326,10 @@ - if (!tp->typebuf_valid) - typebuf = tp->save_typebuf; - -+ tp->old_char = old_char; -+ tp->old_mod_mask = old_mod_mask; -+ old_char = -1; -+ - tp->save_stuffbuff = stuffbuff; - stuffbuff.bh_first.b_next = NULL; - # ifdef USE_INPUT_BUF -@@ -1344,6 +1351,9 @@ - typebuf = tp->save_typebuf; - } - -+ old_char = tp->old_char; -+ old_mod_mask = tp->old_mod_mask; -+ - free_buff(&stuffbuff); - stuffbuff = tp->save_stuffbuff; - # ifdef USE_INPUT_BUF -@@ -1499,9 +1509,6 @@ - #define KL_PART_KEY -1 /* keylen value for incomplete key-code */ - #define KL_PART_MAP -2 /* keylen value for incomplete mapping */ - --static int old_char = -1; /* character put back by vungetc() */ --static int old_mod_mask; /* mod_mask for ungotten character */ -- - /* - * Get the next input character. - * Can return a special key or a multi-byte character. -@@ -3701,11 +3708,10 @@ - * Clear all mappings or abbreviations. - * 'abbr' should be FALSE for mappings, TRUE for abbreviations. - */ --/*ARGSUSED*/ - void - map_clear(cmdp, arg, forceit, abbr) - char_u *cmdp; -- char_u *arg; -+ char_u *arg UNUSED; - int forceit; - int abbr; - { -@@ -3734,13 +3740,12 @@ - /* - * Clear all mappings in "mode". - */ --/*ARGSUSED*/ - void - map_clear_int(buf, mode, local, abbr) -- buf_T *buf; /* buffer for local mappings */ -- int mode; /* mode in which to delete */ -- int local; /* TRUE for buffer-local mappings */ -- int abbr; /* TRUE for abbreviations */ -+ buf_T *buf UNUSED; /* buffer for local mappings */ -+ int mode; /* mode in which to delete */ -+ int local UNUSED; /* TRUE for buffer-local mappings */ -+ int abbr; /* TRUE for abbreviations */ - { - mapblock_T *mp, **mpp; - int hash; -@@ -3816,7 +3821,11 @@ - int len = 1; - - if (msg_didout || msg_silent != 0) -+ { - msg_putchar('\n'); -+ if (got_int) /* 'q' typed at MORE prompt */ -+ return; -+ } - if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE) - msg_putchar('!'); /* :map! */ - else if (mp->m_mode & INSERT) -@@ -4702,7 +4711,7 @@ - return FAIL; - if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0) - return FAIL; -- if (fprintf(fd, cmd) < 0) -+ if (fputs(cmd, fd) < 0) - return FAIL; - if (buf != NULL && fputs(" ", fd) < 0) - return FAIL; -@@ -4801,7 +4810,7 @@ - } - if (IS_SPECIAL(c) || modifiers) /* special key */ - { -- if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0) -+ if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0) - return FAIL; - continue; - } -diff -Naur vim72.orig/src/globals.h vim72/src/globals.h ---- vim72.orig/src/globals.h 2008-07-26 12:53:29.000000000 +0100 -+++ vim72/src/globals.h 2009-07-22 22:54:23.000000000 +0100 -@@ -482,8 +482,10 @@ - /* - * While executing external commands or in Ex mode, should not insert GUI - * events in the input buffer: Set hold_gui_events to non-zero. -+ * -+ * volatile because it is used in signal handler sig_sysmouse(). - */ --EXTERN int hold_gui_events INIT(= 0); -+EXTERN volatile int hold_gui_events INIT(= 0); - - /* - * When resizing the shell is postponed, remember the new size, and call -@@ -507,6 +509,7 @@ - EXTERN int clip_unnamed INIT(= FALSE); - EXTERN int clip_autoselect INIT(= FALSE); - EXTERN int clip_autoselectml INIT(= FALSE); -+EXTERN int clip_html INIT(= FALSE); - EXTERN regprog_T *clip_exclude_prog INIT(= NULL); - #endif - -@@ -522,7 +525,7 @@ - EXTERN win_T *prevwin INIT(= NULL); /* previous window */ - # define W_NEXT(wp) ((wp)->w_next) - # define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next) --#define FOR_ALL_TAB_WINDOWS(tp, wp) \ -+# define FOR_ALL_TAB_WINDOWS(tp, wp) \ - for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \ - for ((wp) = ((tp) == curtab) \ - ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next) -@@ -536,6 +539,10 @@ - - EXTERN win_T *curwin; /* currently active window */ - -+#ifdef FEAT_AUTOCMD -+EXTERN win_T *aucmd_win; /* window used in aucmd_prepbuf() */ -+#endif -+ - /* - * The window layout is kept in a tree of frames. topframe points to the top - * of the tree. -@@ -597,7 +604,8 @@ - EXTERN int really_exiting INIT(= FALSE); - /* TRUE when we are sure to exit, e.g., after - * a deadly signal */ --EXTERN int full_screen INIT(= FALSE); -+/* volatile because it is used in signal handler deathtrap(). */ -+EXTERN volatile int full_screen INIT(= FALSE); - /* TRUE when doing full-screen output - * otherwise only writing some messages */ - -@@ -616,6 +624,11 @@ - EXTERN int curbuf_lock INIT(= 0); - /* non-zero when the current buffer can't be - * changed. Used for FileChangedRO. */ -+EXTERN int allbuf_lock INIT(= 0); -+ /* non-zero when no buffer name can be -+ * changed, no buffer can be deleted and -+ * current directory can't be changed. -+ * Used for SwapExists et al. */ - #endif - #ifdef FEAT_EVAL - # define HAVE_SANDBOX -@@ -710,7 +723,7 @@ - - EXTERN pos_T saved_cursor /* w_cursor before formatting text. */ - # ifdef DO_INIT -- = INIT_POS_T -+ = INIT_POS_T(0, 0, 0) - # endif - ; - -@@ -739,10 +752,12 @@ - */ - EXTERN JMP_BUF lc_jump_env; /* argument to SETJMP() */ - # ifdef SIGHASARG --EXTERN int lc_signal; /* catched signal number, 0 when no was signal -- catched; used for mch_libcall() */ -+/* volatile because it is used in signal handlers. */ -+EXTERN volatile int lc_signal; /* caught signal number, 0 when no was signal -+ caught; used for mch_libcall() */ - # endif --EXTERN int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */ -+/* volatile because it is used in signal handler deathtrap(). */ -+EXTERN volatile int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */ - #endif - - #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT) -@@ -800,11 +815,14 @@ - */ - /* length of char in bytes, including following composing chars */ - EXTERN int (*mb_ptr2len) __ARGS((char_u *p)) INIT(= latin_ptr2len); -+/* idem, with limit on string length */ -+EXTERN int (*mb_ptr2len_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2len_len); - /* byte length of char */ - EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len); - /* convert char to bytes, return the length */ - EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes); - EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells); -+EXTERN int (*mb_ptr2cells_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2cells_len); - EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells); - EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells); - EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char); -@@ -950,7 +968,7 @@ - ; - EXTERN typebuf_T typebuf /* typeahead buffer */ - #ifdef DO_INIT -- = {NULL, NULL} -+ = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0} - #endif - ; - #ifdef FEAT_EX_EXTRA -@@ -986,7 +1004,8 @@ - EXTERN FILE *scriptout INIT(= NULL); /* stream to write script to */ - EXTERN int read_cmd_fd INIT(= 0); /* fd to read commands from */ - --EXTERN int got_int INIT(= FALSE); /* set to TRUE when interrupt -+/* volatile because it is used in signal handler catch_sigint(). */ -+EXTERN volatile int got_int INIT(= FALSE); /* set to TRUE when interrupt - signal occurred */ - #ifdef USE_TERM_CONSOLE - EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */ -@@ -1022,12 +1041,13 @@ - #endif - #ifdef FEAT_AUTOCMD - EXTERN char_u *autocmd_fname INIT(= NULL); /* fname for on cmdline */ -+EXTERN int autocmd_fname_full; /* autocmd_fname is full path */ - EXTERN int autocmd_bufnr INIT(= 0); /* fnum for on cmdline */ - EXTERN char_u *autocmd_match INIT(= NULL); /* name for on cmdline */ - EXTERN int did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */ - EXTERN pos_T last_cursormoved /* for CursorMoved event */ - # ifdef DO_INIT -- = INIT_POS_T -+ = INIT_POS_T(0, 0, 0) - # endif - ; - #endif -@@ -1339,7 +1359,6 @@ - - #ifdef FEAT_NETBEANS_INTG - EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */ --EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */ - EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */ - EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */ - EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */ -@@ -1548,6 +1567,14 @@ - EXTERN time_t starttime; - - /* -+ * Some compilers warn for not using a return value, but in some situations we -+ * can't do anything useful with the value. Assign to this variable to avoid -+ * the warning. -+ */ -+EXTERN int ignored; -+EXTERN char *ignoredp; -+ -+/* - * Optional Farsi support. Include it here, so EXTERN and INIT are defined. - */ - #ifdef FEAT_FKMAP -diff -Naur vim72.orig/src/gui_at_fs.c vim72/src/gui_at_fs.c ---- vim72.orig/src/gui_at_fs.c 2006-05-12 10:26:24.000000000 +0100 -+++ vim72/src/gui_at_fs.c 2009-07-22 22:54:22.000000000 +0100 -@@ -829,7 +829,7 @@ - text.format = FMT8BIT; - - #ifdef XtNinternational -- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) -+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide) - { - XawTextReplace(selFileField, (XawTextPosition)0, - (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text); -@@ -851,17 +851,15 @@ - #endif - } - --/* ARGSUSED */ - static void - SFbuttonPressList(w, n, event) -- Widget w; -- int n; -- XButtonPressedEvent *event; -+ Widget w UNUSED; -+ int n UNUSED; -+ XButtonPressedEvent *event UNUSED; - { - SFbuttonPressed = 1; - } - --/* ARGSUSED */ - static void - SFbuttonReleaseList(w, n, event) - Widget w; -@@ -989,11 +987,10 @@ - return result; - } - --/* ARGSUSED */ - static void - SFdirModTimer(cl, id) -- XtPointer cl; -- XtIntervalId *id; -+ XtPointer cl UNUSED; -+ XtIntervalId *id UNUSED; - { - static int n = -1; - static int f = 0; -@@ -1596,11 +1593,10 @@ - - static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id)); - --/* ARGSUSED */ - static void - SFscrollTimer(p, id) - XtPointer p; -- XtIntervalId *id; -+ XtIntervalId *id UNUSED; - { - SFDir *dir; - int save; -@@ -1695,10 +1691,9 @@ - } - } - --/* ARGSUSED */ - static void - SFenterList(w, n, event) -- Widget w; -+ Widget w UNUSED; - int n; - XEnterWindowEvent *event; - { -@@ -1719,12 +1714,11 @@ - } - } - --/* ARGSUSED */ - static void - SFleaveList(w, n, event) -- Widget w; -+ Widget w UNUSED; - int n; -- XEvent *event; -+ XEvent *event UNUSED; - { - if (SFcurrentInvert[n] != -1) - { -@@ -1733,10 +1727,9 @@ - } - } - --/* ARGSUSED */ - static void - SFmotionList(w, n, event) -- Widget w; -+ Widget w UNUSED; - int n; - XMotionEvent *event; - { -@@ -1754,7 +1747,6 @@ - } - } - --/* ARGSUSED */ - static void - SFvFloatSliderMovedCallback(w, n, fnew) - Widget w; -@@ -1767,10 +1759,9 @@ - SFvSliderMovedCallback(w, (int)(long)n, nw); - } - --/* ARGSUSED */ - static void - SFvSliderMovedCallback(w, n, nw) -- Widget w; -+ Widget w UNUSED; - int n; - int nw; - { -@@ -1853,10 +1844,9 @@ - } - } - --/* ARGSUSED */ - static void - SFvAreaSelectedCallback(w, n, pnew) -- Widget w; -+ Widget w; - XtPointer n; - XtPointer pnew; - { -@@ -1914,10 +1904,9 @@ - SFvSliderMovedCallback(w, (int)(long)n, nw); - } - --/* ARGSUSED */ - static void - SFhSliderMovedCallback(w, n, nw) -- Widget w; -+ Widget w UNUSED; - XtPointer n; - XtPointer nw; - { -@@ -1933,10 +1922,9 @@ - SFdrawList((int)(long)n, SF_DO_NOT_SCROLL); - } - --/* ARGSUSED */ - static void - SFhAreaSelectedCallback(w, n, pnew) -- Widget w; -+ Widget w; - XtPointer n; - XtPointer pnew; - { -@@ -1994,11 +1982,10 @@ - } - } - --/* ARGSUSED */ - static void - SFpathSliderMovedCallback(w, client_data, nw) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XtPointer nw; - { - SFDir *dir; -@@ -2031,11 +2018,10 @@ - XawTextSetInsertionPoint(selFileField, pos); - } - --/* ARGSUSED */ - static void - SFpathAreaSelectedCallback(w, client_data, pnew) - Widget w; -- XtPointer client_data; -+ XtPointer client_data UNUSED; - XtPointer pnew; - { - int nw = (int)(long)pnew; -@@ -2206,13 +2192,12 @@ - - static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont)); - --/* ARGSUSED */ - static void - SFexposeList(w, n, event, cont) -- Widget w; -+ Widget w UNUSED; - XtPointer n; - XEvent *event; -- Boolean *cont; -+ Boolean *cont UNUSED; - { - if ((event->type == NoExpose) || event->xexpose.count) - return; -@@ -2222,13 +2207,12 @@ - - static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont)); - --/* ARGSUSED */ - static void - SFmodVerifyCallback(w, client_data, event, cont) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *cont; -+ Boolean *cont UNUSED; - { - char buf[2]; - -@@ -2241,11 +2225,11 @@ - - static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); - --/* ARGSUSED */ - static void - SFokCallback(w, cl, cd) -- Widget w; -- XtPointer cl, cd; -+ Widget w UNUSED; -+ XtPointer cl UNUSED; -+ XtPointer cd UNUSED; - { - SFstatus = SEL_FILE_OK; - } -@@ -2258,11 +2242,11 @@ - - static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd)); - --/* ARGSUSED */ - static void - SFcancelCallback(w, cl, cd) -- Widget w; -- XtPointer cl, cd; -+ Widget w UNUSED; -+ XtPointer cl UNUSED; -+ XtPointer cd UNUSED; - { - SFstatus = SEL_FILE_CANCEL; - } -@@ -2275,16 +2259,15 @@ - - static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params)); - --/* ARGSUSED */ - static void - SFdismissAction(w, event, params, num_params) -- Widget w; -- XEvent *event; -- String *params; -- Cardinal *num_params; -+ Widget w UNUSED; -+ XEvent *event; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { -- if (event->type == ClientMessage && -- event->xclient.data.l[0] != SFwmDeleteWindow) -+ if (event->type == ClientMessage -+ && (Atom)event->xclient.data.l[0] != SFwmDeleteWindow) - return; - - SFstatus = SEL_FILE_CANCEL; -@@ -2703,7 +2686,7 @@ - SFtextChanged() - { - #if defined(FEAT_XFONTSET) && defined(XtNinternational) -- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) -+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide) - { - wchar_t *wcbuf=(wchar_t *)SFtextBuffer; - -@@ -2749,7 +2732,7 @@ - #if defined(FEAT_XFONTSET) && defined(XtNinternational) - char *buf; - -- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide) -+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide) - { - wchar_t *wcbuf; - int mbslength; -diff -Naur vim72.orig/src/gui_athena.c vim72/src/gui_athena.c ---- vim72.orig/src/gui_athena.c 2008-06-21 20:38:58.000000000 +0100 -+++ vim72/src/gui_athena.c 2009-07-22 22:54:22.000000000 +0100 -@@ -86,10 +86,9 @@ - * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the - * left or middle mouse button. - */ --/* ARGSUSED */ - static void - gui_athena_scroll_cb_jump(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data, call_data; - { - scrollbar_T *sb, *sb_info; -@@ -122,10 +121,9 @@ - * Scrollbar callback (XtNscrollProc) for paging up or down with the left or - * right mouse buttons. - */ --/* ARGSUSED */ - static void - gui_athena_scroll_cb_scroll(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data, call_data; - { - scrollbar_T *sb, *sb_info; -@@ -492,7 +490,7 @@ - if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL) - { - if (menu->iconidx >= 0 && menu->iconidx -- < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) -+ < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) - xpm = built_in_pixmaps[menu->iconidx]; - else - xpm = tb_blank_xpm; -@@ -763,7 +761,7 @@ - XtGetValues(XtParent(widget), args, n); - - retval = num_children; -- for (i = 0; i < num_children; ++i) -+ for (i = 0; i < (int)num_children; ++i) - { - Widget current = children[i]; - vimmenu_T *menu = NULL; -@@ -780,11 +778,10 @@ - return retval; - } - --/* ARGSUSED */ - void - gui_mch_add_menu(menu, idx) - vimmenu_T *menu; -- int idx; -+ int idx UNUSED; - { - char_u *pullright_name; - Dimension height, space, border; -@@ -869,7 +866,7 @@ - XtVaGetValues(parent->submenu_id, XtNchildren, &children, - XtNnumChildren, &num_children, - NULL); -- for (i = 0; i < num_children; ++i) -+ for (i = 0; i < (int)num_children; ++i) - { - XtVaSetValues(children[i], - XtNrightMargin, puller_width, -@@ -913,7 +910,7 @@ - XtVaGetValues(id, XtNchildren, &children, - XtNnumChildren, &num_children, - NULL); -- for (i = 0; i < num_children; ++i) -+ for (i = 0; i < (int)num_children; ++i) - { - if (children[i] == ignore) - continue; -@@ -1175,11 +1172,10 @@ - return pname; - } - --/* ARGSUSED */ - void - gui_mch_add_menu_item(menu, idx) - vimmenu_T *menu; -- int idx; -+ int idx UNUSED; - { - vimmenu_T *parent = menu->parent; - -@@ -1444,7 +1440,7 @@ - XtNchildren, &children, - XtNnumChildren, &numChildren, - NULL); -- for (i = 0; i < numChildren; i++) -+ for (i = 0; i < (int)numChildren; i++) - { - whgt = 0; - -@@ -1473,10 +1469,9 @@ - #endif - - --/* ARGSUSED */ - void - gui_mch_toggle_tearoffs(enable) -- int enable; -+ int enable UNUSED; - { - /* no tearoff menus */ - } -@@ -1537,7 +1532,7 @@ - else - get_left_margin = True; - -- for (i = 0; i < num_children; ++i) -+ for (i = 0; i < (int)num_children; ++i) - { - if (children[i] == menu->id) - continue; -@@ -1645,11 +1640,10 @@ - } - } - --/*ARGSUSED*/ - static void - gui_athena_menu_timeout(client_data, id) - XtPointer client_data; -- XtIntervalId *id; -+ XtIntervalId *id UNUSED; - { - Widget w = (Widget)client_data; - Widget popup; -@@ -1678,12 +1672,11 @@ - * - * This is called when XtPopup() is called. - */ --/*ARGSUSED*/ - static void - gui_athena_popup_callback(w, client_data, call_data) - Widget w; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */ - vimmenu_T *menu = (vimmenu_T *)client_data; -@@ -1711,7 +1704,6 @@ - NULL); - } - --/* ARGSUSED */ - static void - gui_athena_popdown_submenus_action(w, event, args, nargs) - Widget w; -@@ -1756,7 +1748,6 @@ - return False; - } - --/* ARGSUSED */ - static void - gui_athena_delayed_arm_action(w, event, args, nargs) - Widget w; -@@ -1837,7 +1828,6 @@ - * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */ - } - --/* ARGSUSED */ - void - gui_mch_show_popupmenu(menu) - vimmenu_T *menu; -@@ -2046,15 +2036,14 @@ - * Put up a file requester. - * Returns the selected name in allocated memory, or NULL for Cancel. - */ --/* ARGSUSED */ - char_u * - gui_mch_browse(saving, title, dflt, ext, initdir, filter) -- int saving; /* select file to write */ -- char_u *title; /* not used (title for the window) */ -- char_u *dflt; /* not used (default name) */ -- char_u *ext; /* not used (extension added) */ -+ int saving UNUSED; /* select file to write */ -+ char_u *title; /* title for the window */ -+ char_u *dflt; /* default name */ -+ char_u *ext UNUSED; /* extension added */ - char_u *initdir; /* initial directory, NULL for current dir */ -- char_u *filter; /* not used (file name filter) */ -+ char_u *filter UNUSED; /* file name filter */ - { - Position x, y; - char_u dirbuf[MAXPATHL]; -@@ -2100,13 +2089,12 @@ - * Callback function for the textfield. When CR is hit this works like - * hitting the "OK" button, ESC like "Cancel". - */ --/* ARGSUSED */ - static void - keyhit_callback(w, client_data, event, cont) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *cont; -+ Boolean *cont UNUSED; - { - char buf[2]; - -@@ -2119,12 +2107,11 @@ - } - } - --/* ARGSUSED */ - static void - butproc(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - dialogStatus = (int)(long)client_data + 1; - } -@@ -2132,27 +2119,25 @@ - /* - * Function called when dialog window closed. - */ --/*ARGSUSED*/ - static void - dialog_wm_handler(w, client_data, event, dum) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - if (event->type == ClientMessage -- && ((XClientMessageEvent *)event)->data.l[0] == dialogatom) -+ && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom) - dialogStatus = 0; - } - --/* ARGSUSED */ - int - gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield) -- int type; -+ int type UNUSED; - char_u *title; - char_u *message; - char_u *buttons; -- int dfltbutton; -+ int dfltbutton UNUSED; - char_u *textfield; - { - char_u *buts; -diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c ---- vim72.orig/src/gui_at_sb.c 2004-06-07 15:32:25.000000000 +0100 -+++ vim72/src/gui_at_sb.c 2009-07-22 22:54:22.000000000 +0100 -@@ -198,10 +198,13 @@ - /* extension */ NULL - }, - { /* simple fields */ -- /* change_sensitive */ XtInheritChangeSensitive -+ /* change_sensitive */ XtInheritChangeSensitive, -+#ifndef OLDXAW -+ /* extension */ NULL -+#endif - }, - { /* scrollbar fields */ -- /* ignore */ 0 -+ /* empty */ 0 - } - }; - -@@ -241,7 +244,8 @@ - - if (bottom <= 0 || bottom <= top) - return; -- if ((sw = sbw->scrollbar.shadow_width) < 0) -+ sw = sbw->scrollbar.shadow_width; -+ if (sw < 0) - sw = 0; - margin = MARGIN (sbw); - floor = sbw->scrollbar.length - margin + 2; -@@ -516,13 +520,12 @@ - } - } - --/* ARGSUSED */ - static void - Initialize(request, new, args, num_args) -- Widget request; /* what the client asked for */ -+ Widget request UNUSED; /* what the client asked for */ - Widget new; /* what we're going to give him */ -- ArgList args; -- Cardinal *num_args; -+ ArgList args UNUSED; -+ Cardinal *num_args UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget) new; - -@@ -556,14 +559,13 @@ - (w, valueMask, attributes); - } - --/* ARGSUSED */ - static Boolean - SetValues(current, request, desired, args, num_args) -- Widget current, /* what I am */ -- request, /* what he wants me to be */ -- desired; /* what I will become */ -- ArgList args; -- Cardinal *num_args; -+ Widget current; /* what I am */ -+ Widget request UNUSED; /* what he wants me to be */ -+ Widget desired; /* what I will become */ -+ ArgList args UNUSED; -+ Cardinal *num_args UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget) current; - ScrollbarWidget dsbw = (ScrollbarWidget) desired; -@@ -609,7 +611,6 @@ - } - - --/* ARGSUSED */ - static void - Redisplay(w, event, region) - Widget w; -@@ -789,11 +790,10 @@ - } - } - --/* ARGSUSED */ - static void - RepeatNotify(client_data, idp) - XtPointer client_data; -- XtIntervalId *idp; -+ XtIntervalId *idp UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget) client_data; - int call_data; -@@ -839,46 +839,42 @@ - return (num < small) ? small : ((num > big) ? big : num); - } - --/* ARGSUSED */ - static void - ScrollOneLineUp(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; -- Cardinal *num_params; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollSome(w, event, -ONE_LINE_DATA); - } - --/* ARGSUSED */ - static void - ScrollOneLineDown(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; -- Cardinal *num_params; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollSome(w, event, ONE_LINE_DATA); - } - --/* ARGSUSED */ - static void - ScrollPageDown(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; -- Cardinal *num_params; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollSome(w, event, ONE_PAGE_DATA); - } - --/* ARGSUSED */ - static void - ScrollPageUp(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; -- Cardinal *num_params; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollSome(w, event, -ONE_PAGE_DATA); - } -@@ -901,13 +897,12 @@ - XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data); - } - --/* ARGSUSED */ - static void - NotifyScroll(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; -- Cardinal *num_params; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget) w; - Position x, y, loc; -@@ -991,13 +986,12 @@ - delay, RepeatNotify, (XtPointer)w); - } - --/* ARGSUSED */ - static void - EndScroll(w, event, params, num_params) - Widget w; -- XEvent *event; /* unused */ -- String *params; /* unused */ -- Cardinal *num_params; /* unused */ -+ XEvent *event UNUSED; -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget) w; - -@@ -1023,13 +1017,12 @@ - return PICKLENGTH(sbw, x / width, y / height); - } - --/* ARGSUSED */ - static void - MoveThumb(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; /* unused */ -- Cardinal *num_params; /* unused */ -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget)w; - Position x, y; -@@ -1069,15 +1062,20 @@ - } - - --/* ARGSUSED */ - static void - NotifyThumb(w, event, params, num_params) - Widget w; - XEvent *event; -- String *params; /* unused */ -- Cardinal *num_params; /* unused */ -+ String *params UNUSED; -+ Cardinal *num_params UNUSED; - { - ScrollbarWidget sbw = (ScrollbarWidget)w; -+ /* Use a union to avoid a warning for the weird conversion from float to -+ * XtPointer. Comes from Xaw/Scrollbar.c. */ -+ union { -+ XtPointer xtp; -+ float xtf; -+ } xtpf; - - if (LookAhead(w, event)) - return; -@@ -1085,11 +1083,11 @@ - /* thumbProc is not pretty, but is necessary for backwards - compatibility on those architectures for which it work{s,ed}; - the intent is to pass a (truncated) float by value. */ -- XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top); -+ xtpf.xtf = sbw->scrollbar.top; -+ XtCallCallbacks(w, XtNthumbProc, xtpf.xtp); - XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top); - } - --/* ARGSUSED */ - static void - AllocTopShadowGC(w) - Widget w; -@@ -1103,7 +1101,6 @@ - sbw->scrollbar.top_shadow_GC = XtGetGC(w, valuemask, &myXGCV); - } - --/* ARGSUSED */ - static void - AllocBotShadowGC(w) - Widget w; -@@ -1117,11 +1114,10 @@ - sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV); - } - --/* ARGSUSED */ - static void - _Xaw3dDrawShadows(gw, event, region, out) - Widget gw; -- XEvent *event; -+ XEvent *event UNUSED; - Region region; - int out; - { -diff -Naur vim72.orig/src/gui_beval.c vim72/src/gui_beval.c ---- vim72.orig/src/gui_beval.c 2007-05-07 20:33:41.000000000 +0100 -+++ vim72/src/gui_beval.c 2009-07-22 22:54:22.000000000 +0100 -@@ -15,11 +15,10 @@ - /* - * Common code, invoked when the mouse is resting for a moment. - */ --/*ARGSUSED*/ - void - general_beval_cb(beval, state) - BalloonEval *beval; -- int state; -+ int state UNUSED; - { - win_T *wp; - int col; -@@ -551,9 +550,8 @@ - return FALSE; /* continue emission */ - } - --/*ARGSUSED*/ - static gint --mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) -+mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data) - { - BalloonEval *beval = (BalloonEval *)data; - -@@ -663,9 +661,10 @@ - return FALSE; /* don't call me again */ - } - --/*ARGSUSED2*/ - static gint --balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) -+balloon_expose_event_cb(GtkWidget *widget, -+ GdkEventExpose *event, -+ gpointer data UNUSED) - { - gtk_paint_flat_box(widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, -@@ -676,7 +675,6 @@ - } - - # ifndef HAVE_GTK2 --/*ARGSUSED2*/ - static void - balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data) - { -@@ -726,13 +724,12 @@ - /* - * The X event handler. All it does is call the real event handler. - */ --/*ARGSUSED*/ - static void - pointerEventEH(w, client_data, event, unused) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; - XEvent *event; -- Boolean *unused; -+ Boolean *unused UNUSED; - { - BalloonEval *beval = (BalloonEval *)client_data; - pointerEvent(beval, event); -@@ -877,11 +874,10 @@ - } - } - --/*ARGSUSED*/ - static void - timerRoutine(dx, id) - XtPointer dx; -- XtIntervalId *id; -+ XtIntervalId *id UNUSED; - { - BalloonEval *beval = (BalloonEval *)dx; - -@@ -1291,6 +1287,23 @@ - XtNy, ty, - NULL); - #endif -+ /* Set tooltip colors */ -+ { -+ Arg args[2]; -+ -+#ifdef FEAT_GUI_MOTIF -+ args[0].name = XmNbackground; -+ args[0].value = gui.tooltip_bg_pixel; -+ args[1].name = XmNforeground; -+ args[1].value = gui.tooltip_fg_pixel; -+#else /* Athena */ -+ args[0].name = XtNbackground; -+ args[0].value = gui.tooltip_bg_pixel; -+ args[1].name = XtNforeground; -+ args[1].value = gui.tooltip_fg_pixel; -+#endif -+ XtSetValues(beval->balloonLabel, &args[0], XtNumber(args)); -+ } - - XtPopup(beval->balloonShell, XtGrabNone); - -diff -Naur vim72.orig/src/gui.c vim72/src/gui.c ---- vim72.orig/src/gui.c 2008-07-27 20:32:14.000000000 +0100 -+++ vim72/src/gui.c 2009-07-22 22:54:23.000000000 +0100 -@@ -139,7 +139,7 @@ - /* The read returns when the child closes the pipe (or when - * the child dies for some reason). */ - close(pipefd[1]); -- (void)read(pipefd[0], &dummy, (size_t)1); -+ ignored = (int)read(pipefd[0], &dummy, (size_t)1); - close(pipefd[0]); - } - -@@ -678,11 +678,10 @@ - * Return OK when able to set the font. When it failed FAIL is returned and - * the fonts are unchanged. - */ --/*ARGSUSED*/ - int - gui_init_font(font_list, fontset) - char_u *font_list; -- int fontset; -+ int fontset UNUSED; - { - #define FONTLEN 320 - char_u font_name[FONTLEN]; -@@ -960,7 +959,7 @@ - guicolor_T fg, bg; - - if ( --# ifdef HAVE_GTK2 -+# if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN) - preedit_get_status() - # else - im_get_status() -@@ -1138,10 +1137,9 @@ - * Position the various GUI components (text area, menu). The vertical - * scrollbars are NOT handled here. See gui_update_scrollbars(). - */ --/*ARGSUSED*/ - static void - gui_position_components(total_width) -- int total_width; -+ int total_width UNUSED; - { - int text_area_x; - int text_area_y; -@@ -1374,10 +1372,9 @@ - * If "fit_to_display" is TRUE then the size may be reduced to fit the window - * on the screen. - */ --/*ARGSUSED*/ - void - gui_set_shellsize(mustset, fit_to_display, direction) -- int mustset; /* set by the user */ -+ int mustset UNUSED; /* set by the user */ - int fit_to_display; - int direction; /* RESIZE_HOR, RESIZE_VER */ - { -@@ -3120,10 +3117,9 @@ - * If "oldval" is not NULL, "oldval" is the previous value, the new value is - * in p_go. - */ --/*ARGSUSED*/ - void - gui_init_which_components(oldval) -- char_u *oldval; -+ char_u *oldval UNUSED; - { - #ifdef FEAT_MENU - static int prev_menu_is_active = -1; -@@ -3241,7 +3237,7 @@ - i = Rows; - gui_update_tabline(); - Rows = i; -- need_set_size = RESIZE_VERT; -+ need_set_size |= RESIZE_VERT; - if (using_tabline) - fix_size = TRUE; - if (!gui_use_tabline()) -@@ -3275,9 +3271,9 @@ - if (gui.which_scrollbars[i] != prev_which_scrollbars[i]) - { - if (i == SBAR_BOTTOM) -- need_set_size = RESIZE_VERT; -+ need_set_size |= RESIZE_VERT; - else -- need_set_size = RESIZE_HOR; -+ need_set_size |= RESIZE_HOR; - if (gui.which_scrollbars[i]) - fix_size = TRUE; - } -@@ -3297,7 +3293,7 @@ - gui_mch_enable_menu(gui.menu_is_active); - Rows = i; - prev_menu_is_active = gui.menu_is_active; -- need_set_size = RESIZE_VERT; -+ need_set_size |= RESIZE_VERT; - if (gui.menu_is_active) - fix_size = TRUE; - } -@@ -3308,7 +3304,7 @@ - { - gui_mch_show_toolbar(using_toolbar); - prev_toolbar = using_toolbar; -- need_set_size = RESIZE_VERT; -+ need_set_size |= RESIZE_VERT; - if (using_toolbar) - fix_size = TRUE; - } -@@ -3318,7 +3314,7 @@ - { - gui_mch_enable_footer(using_footer); - prev_footer = using_footer; -- need_set_size = RESIZE_VERT; -+ need_set_size |= RESIZE_VERT; - if (using_footer) - fix_size = TRUE; - } -@@ -3330,10 +3326,11 @@ - prev_tearoff = using_tearoff; - } - #endif -- if (need_set_size) -+ if (need_set_size != 0) - { - #ifdef FEAT_GUI_GTK -- long c = Columns; -+ long prev_Columns = Columns; -+ long prev_Rows = Rows; - #endif - /* Adjust the size of the window to make the text area keep the - * same size and to avoid that part of our window is off-screen -@@ -3349,11 +3346,14 @@ - * If you remove this, please test this command for resizing - * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q". - * Don't do this while starting up though. -- * And don't change Rows, it may have be reduced intentionally -- * when adding menu/toolbar/tabline. */ -- if (!gui.starting) -+ * Don't change Rows when adding menu/toolbar/tabline. -+ * Don't change Columns when adding vertical toolbar. */ -+ if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR)) - (void)char_avail(); -- Columns = c; -+ if ((need_set_size & RESIZE_VERT) == 0) -+ Rows = prev_Rows; -+ if ((need_set_size & RESIZE_HOR) == 0) -+ Columns = prev_Columns; - #endif - } - #ifdef FEAT_WINDOWS -@@ -3879,6 +3879,21 @@ - * Scrollbar stuff: - */ - -+/* -+ * Called when something in the window layout has changed. -+ */ -+ void -+gui_may_update_scrollbars() -+{ -+ if (gui.in_use && starting == 0) -+ { -+ out_flush(); -+ gui_init_which_components(NULL); -+ gui_update_scrollbars(TRUE); -+ } -+ need_mouse_correct = TRUE; -+} -+ - void - gui_update_scrollbars(force) - int force; /* Force all scrollbars to get updated */ -@@ -4407,7 +4422,7 @@ - if (curwin->w_p_wrap) - return FALSE; - -- if (curwin->w_leftcol == scrollbar_value) -+ if ((long_u)curwin->w_leftcol == scrollbar_value) - return FALSE; - - curwin->w_leftcol = (colnr_T)scrollbar_value; -@@ -4420,7 +4435,7 @@ - && longest_lnum < curwin->w_botline - && !virtual_active()) - { -- if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum)) -+ if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum)) - { - curwin->w_cursor.lnum = longest_lnum; - curwin->w_cursor.col = 0; -@@ -4666,11 +4681,10 @@ - /* - * Find window where the mouse pointer "y" coordinate is in. - */ --/*ARGSUSED*/ - static win_T * - xy2win(x, y) -- int x; -- int y; -+ int x UNUSED; -+ int y UNUSED; - { - #ifdef FEAT_WINDOWS - int row; -@@ -5120,11 +5134,10 @@ - * of dropped files, they will be freed in this function, and caller can't use - * fnames after call this function. - */ --/*ARGSUSED*/ - void - gui_handle_drop(x, y, modifiers, fnames, count) -- int x; -- int y; -+ int x UNUSED; -+ int y UNUSED; - int_u modifiers; - char_u **fnames; - int count; -diff -Naur vim72.orig/src/gui_gtk.c vim72/src/gui_gtk.c ---- vim72.orig/src/gui_gtk.c 2008-07-31 20:48:20.000000000 +0100 -+++ vim72/src/gui_gtk.c 2009-07-22 22:54:22.000000000 +0100 -@@ -285,14 +285,14 @@ - return image; - } - --/*ARGSUSED*/ - static gint --toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) --{ -- /* When we're in a GtkPlug, we don't have window focus events, only widget focus. -- * To emulate stand-alone gvim, if a button gets focus (e.g., into GtkPlug) -- * immediately pass it to mainwin. -- */ -+toolbar_button_focus_in_event(GtkWidget *widget UNUSED, -+ GdkEventFocus *event UNUSED, -+ gpointer data UNUSED) -+{ -+ /* When we're in a GtkPlug, we don't have window focus events, only widget -+ * focus. To emulate stand-alone gvim, if a button gets focus (e.g., -+ * into GtkPlug) immediately pass it to mainwin. */ - if (gtk_socket_id != 0) - gtk_widget_grab_focus(gui.drawarea); - -@@ -585,9 +585,8 @@ - gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle); - } - --/*ARGSUSED*/ - static void --menu_item_activate(GtkWidget *widget, gpointer data) -+menu_item_activate(GtkWidget *widget UNUSED, gpointer data) - { - gui_menu_cb((vimmenu_T *)data); - -@@ -1202,9 +1201,8 @@ - #endif - - #ifndef USE_FILE_CHOOSER --/*ARGSUSED*/ - static void --browse_ok_cb(GtkWidget *widget, gpointer cbdata) -+browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata) - { - gui_T *vw = (gui_T *)cbdata; - -@@ -1218,9 +1216,8 @@ - gtk_main_quit(); - } - --/*ARGSUSED*/ - static void --browse_cancel_cb(GtkWidget *widget, gpointer cbdata) -+browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata) - { - gui_T *vw = (gui_T *)cbdata; - -@@ -1234,9 +1231,8 @@ - gtk_main_quit(); - } - --/*ARGSUSED*/ - static gboolean --browse_destroy_cb(GtkWidget * widget) -+browse_destroy_cb(GtkWidget *widget UNUSED) - { - if (gui.browse_fname != NULL) - { -@@ -1262,14 +1258,13 @@ - * initdir initial directory, NULL for current dir - * filter not used (file name filter) - */ --/*ARGSUSED*/ - char_u * --gui_mch_browse(int saving, -+gui_mch_browse(int saving UNUSED, - char_u *title, - char_u *dflt, -- char_u *ext, -+ char_u *ext UNUSED, - char_u *initdir, -- char_u *filter) -+ char_u *filter UNUSED) - { - #ifdef USE_FILE_CHOOSER - GtkWidget *fc; -@@ -1377,7 +1372,6 @@ - * dflt default name - * initdir initial directory, NULL for current dir - */ --/*ARGSUSED*/ - char_u * - gui_mch_browsedir( - char_u *title, -@@ -1460,7 +1454,6 @@ - } - - # ifdef FEAT_GUI_GNOME --/* ARGSUSED */ - static int - gui_gnome_dialog( int type, - char_u *title, -@@ -1611,7 +1604,6 @@ - GtkWidget *dialog; - } CancelData; - --/* ARGSUSED */ - static void - dlg_button_clicked(GtkWidget * widget, ButtonData *data) - { -@@ -1622,7 +1614,6 @@ - /* - * This makes the Escape key equivalent to the cancel button. - */ --/*ARGSUSED*/ - static int - dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data) - { -@@ -1655,7 +1646,6 @@ - gtk_main_quit(); - } - --/* ARGSUSED */ - int - gui_mch_dialog( int type, /* type of dialog */ - char_u *title, /* title of dialog */ -@@ -2215,7 +2205,6 @@ - GtkDialog *dialog; /* Widget of the dialog */ - } DialogInfo; - --/*ARGSUSED2*/ - static gboolean - dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) - { -@@ -2398,14 +2387,13 @@ - * Note: The push_in output argument seems to affect scrolling of huge - * menus that don't fit on the screen. Leave it at the default for now. - */ --/*ARGSUSED0*/ - static void --popup_menu_position_func(GtkMenu *menu, -+popup_menu_position_func(GtkMenu *menu UNUSED, - gint *x, gint *y, - # ifdef HAVE_GTK2 -- gboolean *push_in, -+ gboolean *push_in UNUSED, - # endif -- gpointer user_data) -+ gpointer user_data UNUSED) - { - gdk_window_get_origin(gui.drawarea->window, x, y); - -@@ -2464,13 +2452,12 @@ - GtkWidget *all; /* 'Replace All' action button */ - } SharedFindReplace; - --static SharedFindReplace find_widgets = { NULL, }; --static SharedFindReplace repl_widgets = { NULL, }; -+static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; -+static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; - --/* ARGSUSED */ - static int - find_key_press_event( -- GtkWidget *widget, -+ GtkWidget *widget UNUSED, - GdkEventKey *event, - SharedFindReplace *frdp) - { -@@ -2962,9 +2949,8 @@ - /* - * Callback for actions of the find and replace dialogs - */ --/*ARGSUSED*/ - static void --find_replace_cb(GtkWidget *widget, gpointer data) -+find_replace_cb(GtkWidget *widget UNUSED, gpointer data) - { - int flags; - char_u *find_text; -@@ -3010,9 +2996,8 @@ - } - - /* our usual callback function */ --/*ARGSUSED*/ - static void --entry_activate_cb(GtkWidget *widget, gpointer data) -+entry_activate_cb(GtkWidget *widget UNUSED, gpointer data) - { - gtk_widget_grab_focus(GTK_WIDGET(data)); - } -@@ -3055,10 +3040,9 @@ - /* - * ":helpfind" - */ --/*ARGSUSED*/ - void - ex_helpfind(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - /* This will fail when menus are not loaded. Well, it's only for - * backwards compatibility anyway. */ -diff -Naur vim72.orig/src/gui_gtk_f.c vim72/src/gui_gtk_f.c ---- vim72.orig/src/gui_gtk_f.c 2007-05-07 20:38:02.000000000 +0100 -+++ vim72/src/gui_gtk_f.c 2009-07-22 22:54:22.000000000 +0100 -@@ -227,14 +227,14 @@ - - if (!form_type) - { -- GtkTypeInfo form_info = -- { -- "GtkForm", -- sizeof(GtkForm), -- sizeof(GtkFormClass), -- (GtkClassInitFunc) gtk_form_class_init, -- (GtkObjectInitFunc) gtk_form_init -- }; -+ GtkTypeInfo form_info; -+ -+ vim_memset(&form_info, 0, sizeof(form_info)); -+ form_info.type_name = "GtkForm"; -+ form_info.object_size = sizeof(GtkForm); -+ form_info.class_size = sizeof(GtkFormClass); -+ form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init; -+ form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init; - - form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info); - } -@@ -611,10 +611,9 @@ - } - } - --/*ARGSUSED1*/ - static void - gtk_form_forall(GtkContainer *container, -- gboolean include_internals, -+ gboolean include_internals UNUSED, - GtkCallback callback, - gpointer callback_data) - { -@@ -786,9 +785,8 @@ - * them or discards them, depending on whether we are obscured - * or not. - */ --/*ARGSUSED1*/ - static GdkFilterReturn --gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) -+gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data) - { - XEvent *xevent; - GtkForm *form; -@@ -821,9 +819,10 @@ - * there is no corresponding event in GTK, so we have - * to get the events from a filter - */ --/*ARGSUSED1*/ - static GdkFilterReturn --gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) -+gtk_form_main_filter(GdkXEvent *gdk_xevent, -+ GdkEvent *event UNUSED, -+ gpointer data) - { - XEvent *xevent; - GtkForm *form; -@@ -911,9 +910,8 @@ - #endif - } - --/*ARGSUSED0*/ - static void --gtk_form_child_map(GtkWidget *widget, gpointer user_data) -+gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data) - { - GtkFormChild *child; - -@@ -923,9 +921,8 @@ - gdk_window_show(child->window); - } - --/*ARGSUSED0*/ - static void --gtk_form_child_unmap(GtkWidget *widget, gpointer user_data) -+gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data) - { - GtkFormChild *child; - -diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c ---- vim72.orig/src/gui_gtk_x11.c 2008-07-04 11:46:24.000000000 +0100 -+++ vim72/src/gui_gtk_x11.c 2009-07-22 22:54:23.000000000 +0100 -@@ -107,6 +107,7 @@ - TARGET_UTF8_STRING, - TARGET_STRING, - TARGET_COMPOUND_TEXT, -+ TARGET_HTML, - TARGET_TEXT, - TARGET_TEXT_URI_LIST, - TARGET_TEXT_PLAIN, -@@ -123,6 +124,7 @@ - {VIMENC_ATOM_NAME, 0, TARGET_VIMENC}, - {VIM_ATOM_NAME, 0, TARGET_VIM}, - #ifdef FEAT_MBYTE -+ {"text/html", 0, TARGET_HTML}, - {"UTF8_STRING", 0, TARGET_UTF8_STRING}, - #endif - {"COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT}, -@@ -140,6 +142,7 @@ - { - {"text/uri-list", 0, TARGET_TEXT_URI_LIST}, - # ifdef FEAT_MBYTE -+ {"text/html", 0, TARGET_HTML}, - {"UTF8_STRING", 0, TARGET_UTF8_STRING}, - # endif - {"STRING", 0, TARGET_STRING}, -@@ -178,6 +181,7 @@ - * Atoms used to control/reference X11 selections. - */ - #ifdef FEAT_MBYTE -+static GdkAtom html_atom = GDK_NONE; - static GdkAtom utf8_string_atom = GDK_NONE; - #endif - #ifndef HAVE_GTK2 -@@ -412,6 +416,7 @@ - #endif - #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION) - static const char *restart_command = NULL; -+static char *abs_restart_command = NULL; - #endif - static int found_iconic_arg = FALSE; - -@@ -449,8 +454,10 @@ - char_u buf[MAXPATHL]; - - if (mch_FullName((char_u *)argv[0], buf, (int)sizeof(buf), TRUE) == OK) -- /* Tiny leak; doesn't matter, and usually we don't even get here */ -- restart_command = (char *)vim_strsave(buf); -+ { -+ abs_restart_command = (char *)vim_strsave(buf); -+ restart_command = abs_restart_command; -+ } - } - #endif - -@@ -611,6 +618,9 @@ - gui_mch_free_all() - { - vim_free(gui_argv); -+#if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION) -+ vim_free(abs_restart_command); -+#endif - } - #endif - -@@ -619,9 +629,10 @@ - * Doesn't seem possible, since check_copy_area() relies on - * this information. --danielk - */ --/*ARGSUSED*/ - static gint --visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data) -+visibility_event(GtkWidget *widget UNUSED, -+ GdkEventVisibility *event, -+ gpointer data UNUSED) - { - gui.visibility = event->state; - /* -@@ -638,9 +649,10 @@ - /* - * Redraw the corresponding portions of the screen. - */ --/*ARGSUSED*/ - static gint --expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) -+expose_event(GtkWidget *widget UNUSED, -+ GdkEventExpose *event, -+ gpointer data UNUSED) - { - /* Skip this when the GUI isn't set up yet, will redraw later. */ - if (gui.starting) -@@ -668,9 +680,10 @@ - /* - * Handle changes to the "Comm" property - */ --/*ARGSUSED2*/ - static gint --property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data) -+property_event(GtkWidget *widget, -+ GdkEventProperty *event, -+ gpointer data UNUSED) - { - if (event->type == GDK_PROPERTY_NOTIFY - && event->state == (int)GDK_PROPERTY_NEW_VALUE -@@ -740,9 +753,8 @@ - blink_state = BLINK_NONE; - } - --/*ARGSUSED*/ - static gint --blink_cb(gpointer data) -+blink_cb(gpointer data UNUSED) - { - if (blink_state == BLINK_ON) - { -@@ -781,9 +793,10 @@ - } - } - --/*ARGSUSED*/ - static gint --enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) -+enter_notify_event(GtkWidget *widget UNUSED, -+ GdkEventCrossing *event UNUSED, -+ gpointer data UNUSED) - { - if (blink_state == BLINK_NONE) - gui_mch_start_blink(); -@@ -795,9 +808,10 @@ - return FALSE; - } - --/*ARGSUSED*/ - static gint --leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data) -+leave_notify_event(GtkWidget *widget UNUSED, -+ GdkEventCrossing *event UNUSED, -+ gpointer data UNUSED) - { - if (blink_state != BLINK_NONE) - gui_mch_stop_blink(); -@@ -805,9 +819,10 @@ - return FALSE; - } - --/*ARGSUSED*/ - static gint --focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) -+focus_in_event(GtkWidget *widget, -+ GdkEventFocus *event UNUSED, -+ gpointer data UNUSED) - { - gui_focus_change(TRUE); - -@@ -826,9 +841,10 @@ - return TRUE; - } - --/*ARGSUSED*/ - static gint --focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data) -+focus_out_event(GtkWidget *widget UNUSED, -+ GdkEventFocus *event UNUSED, -+ gpointer data UNUSED) - { - gui_focus_change(FALSE); - -@@ -956,9 +972,10 @@ - /* - * Main keyboard handler: - */ --/*ARGSUSED*/ - static gint --key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -+key_press_event(GtkWidget *widget UNUSED, -+ GdkEventKey *event, -+ gpointer data UNUSED) - { - #ifdef HAVE_GTK2 - /* 256 bytes is way over the top, but for safety let's reduce it only -@@ -1225,9 +1242,10 @@ - } - - #if defined(FEAT_XIM) && defined(HAVE_GTK2) --/*ARGSUSED0*/ - static gboolean --key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -+key_release_event(GtkWidget *widget UNUSED, -+ GdkEventKey *event, -+ gpointer data UNUSED) - { - /* - * GTK+ 2 input methods may do fancy stuff on key release events too. -@@ -1243,11 +1261,10 @@ - * Selection handlers: - */ - --/*ARGSUSED*/ - static gint --selection_clear_event(GtkWidget *widget, -+selection_clear_event(GtkWidget *widget UNUSED, - GdkEventSelection *event, -- gpointer user_data) -+ gpointer user_data UNUSED) - { - if (event->selection == clip_plus.gtk_sel_atom) - clip_lose_selection(&clip_plus); -@@ -1265,12 +1282,11 @@ - #define RS_FAIL 2 /* selection_received_cb() called and failed */ - static int received_selection = RS_NONE; - --/*ARGSUSED*/ - static void --selection_received_cb(GtkWidget *widget, -+selection_received_cb(GtkWidget *widget UNUSED, - GtkSelectionData *data, -- guint time_, -- gpointer user_data) -+ guint time_ UNUSED, -+ gpointer user_data UNUSED) - { - VimClipboard *cbd; - char_u *text; -@@ -1352,6 +1368,24 @@ - else - text = tmpbuf_utf8; - } -+ else if (len >= 2 && text[0] == 0xff && text[1] == 0xfe) -+ { -+ vimconv_T conv; -+ -+ /* UTF-16, we get this for HTML */ -+ conv.vc_type = CONV_NONE; -+ convert_setup_ext(&conv, (char_u *)"utf-16le", FALSE, p_enc, TRUE); -+ -+ if (conv.vc_type != CONV_NONE) -+ { -+ text += 2; -+ len -= 2; -+ tmpbuf = string_convert(&conv, text, &len); -+ convert_setup(&conv, NULL, NULL); -+ } -+ if (tmpbuf != NULL) -+ text = tmpbuf; -+ } - } - #else /* !HAVE_GTK2 */ - # ifdef FEAT_MBYTE -@@ -1414,13 +1448,12 @@ - * Prepare our selection data for passing it to the external selection - * client. - */ --/*ARGSUSED*/ - static void --selection_get_cb(GtkWidget *widget, -+selection_get_cb(GtkWidget *widget UNUSED, - GtkSelectionData *selection_data, - guint info, -- guint time_, -- gpointer user_data) -+ guint time_ UNUSED, -+ gpointer user_data UNUSED) - { - char_u *string; - char_u *tmpbuf; -@@ -1440,6 +1473,7 @@ - - if (info != (guint)TARGET_STRING - #ifdef FEAT_MBYTE -+ && (!clip_html || info != (guint)TARGET_HTML) - && info != (guint)TARGET_UTF8_STRING - && info != (guint)TARGET_VIMENC - #endif -@@ -1475,6 +1509,40 @@ - } - - #ifdef FEAT_MBYTE -+ else if (info == (guint)TARGET_HTML) -+ { -+ vimconv_T conv; -+ -+ /* Since we get utf-16, we probably should set it as well. */ -+ conv.vc_type = CONV_NONE; -+ convert_setup_ext(&conv, p_enc, TRUE, (char_u *)"utf-16le", FALSE); -+ if (conv.vc_type != CONV_NONE) -+ { -+ tmpbuf = string_convert(&conv, string, &length); -+ convert_setup(&conv, NULL, NULL); -+ vim_free(string); -+ string = tmpbuf; -+ } -+ -+ /* Prepend the BOM: "fffe" */ -+ if (string != NULL) -+ { -+ tmpbuf = alloc(length + 2); -+ tmpbuf[0] = 0xff; -+ tmpbuf[1] = 0xfe; -+ mch_memmove(tmpbuf + 2, string, (size_t)length); -+ vim_free(string); -+ string = tmpbuf; -+ length += 2; -+ -+ selection_data->type = selection_data->target; -+ selection_data->format = 16; /* 16 bits per char */ -+ gtk_selection_data_set(selection_data, html_atom, 16, -+ string, length); -+ vim_free(string); -+ } -+ return; -+ } - else if (info == (guint)TARGET_VIMENC) - { - int l = STRLEN(p_enc); -@@ -1678,7 +1746,7 @@ - - offshoot = dx > dy ? dx : dy; - -- /* Make a linearly declaying timer delay with a threshold of 5 at a -+ /* Make a linearly decaying timer delay with a threshold of 5 at a - * distance of 127 pixels from the main window. - * - * One could think endlessly about the most ergonomic variant here. -@@ -1707,9 +1775,8 @@ - /* - * Timer used to recognize multiple clicks of the mouse button. - */ --/*ARGSUSED0*/ - static gint --motion_repeat_timer_cb(gpointer data) -+motion_repeat_timer_cb(gpointer data UNUSED) - { - int x; - int y; -@@ -1749,9 +1816,10 @@ - return FALSE; - } - --/*ARGSUSED2*/ - static gint --motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data) -+motion_notify_event(GtkWidget *widget, -+ GdkEventMotion *event, -+ gpointer data UNUSED) - { - if (event->is_hint) - { -@@ -1777,9 +1845,10 @@ - * by our own timeout mechanism instead of the one provided by GTK+ itself. - * This is due to the way the generic VIM code is recognizing multiple clicks. - */ --/*ARGSUSED2*/ - static gint --button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -+button_press_event(GtkWidget *widget, -+ GdkEventButton *event, -+ gpointer data UNUSED) - { - int button; - int repeated_click = FALSE; -@@ -1855,9 +1924,10 @@ - * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1. - * Instead, it abstracts scrolling via the new GdkEventScroll. - */ --/*ARGSUSED2*/ - static gboolean --scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data) -+scroll_event(GtkWidget *widget, -+ GdkEventScroll *event, -+ gpointer data UNUSED) - { - int button; - int_u vim_modifiers; -@@ -1896,9 +1966,10 @@ - #endif /* HAVE_GTK2 */ - - --/*ARGSUSED*/ - static gint --button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data) -+button_release_event(GtkWidget *widget UNUSED, -+ GdkEventButton *event, -+ gpointer data UNUSED) - { - int x, y; - int_u vim_modifiers; -@@ -2100,7 +2171,6 @@ - /* - * DND receiver. - */ --/*ARGSUSED2*/ - static void - drag_data_received_cb(GtkWidget *widget, - GdkDragContext *context, -@@ -2109,7 +2179,7 @@ - GtkSelectionData *data, - guint info, - guint time_, -- gpointer user_data) -+ gpointer user_data UNUSED) - { - GdkModifierType state; - -@@ -2143,7 +2213,6 @@ - * be abandoned and pop up a dialog asking the user for confirmation if - * necessary. - */ --/*ARGSUSED0*/ - static void - sm_client_check_changed_any(GnomeClient *client, - gint key, -@@ -2251,7 +2320,6 @@ - * for confirmation if necessary. Save the current editing session and tell - * the session manager how to restart Vim. - */ --/*ARGSUSED1*/ - static gboolean - sm_client_save_yourself(GnomeClient *client, - gint phase, -@@ -2339,7 +2407,6 @@ - * here since "save_yourself" has been emitted before (unless serious trouble - * is happening). - */ --/*ARGSUSED0*/ - static void - sm_client_die(GnomeClient *client, gpointer data) - { -@@ -2379,10 +2446,9 @@ - /* - * GTK tells us that XSMP needs attention - */ --/*ARGSUSED*/ - static gboolean - local_xsmp_handle_requests(source, condition, data) -- GIOChannel *source; -+ GIOChannel *source UNUSED; - GIOCondition condition; - gpointer data; - { -@@ -2480,16 +2546,18 @@ - * WM_SAVE_YOURSELF hack it actually stores the session... And yes, - * it should work with KDE as well. - */ --/*ARGSUSED1*/ - static GdkFilterReturn --global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) -+global_event_filter(GdkXEvent *xev, -+ GdkEvent *event UNUSED, -+ gpointer data UNUSED) - { - XEvent *xevent = (XEvent *)xev; - - if (xevent != NULL - && xevent->type == ClientMessage - && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom) -- && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom)) -+ && (long_u)xevent->xclient.data.l[0] -+ == GET_X_ATOM(save_yourself_atom)) - { - out_flush(); - ml_sync_all(FALSE, FALSE); /* preserve all swap files */ -@@ -2512,7 +2580,6 @@ - /* - * GDK handler for X ClientMessage events. - */ --/*ARGSUSED2*/ - static GdkFilterReturn - gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data) - { -@@ -2558,9 +2625,8 @@ - /* - * Setup the window icon & xcmdsrv comm after the main window has been realized. - */ --/*ARGSUSED*/ - static void --mainwin_realize(GtkWidget *widget, gpointer data) -+mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) - { - /* If you get an error message here, you still need to unpack the runtime - * archive! */ -@@ -2712,11 +2778,10 @@ - } - - #ifdef HAVE_GTK_MULTIHEAD --/*ARGSUSED1*/ - static void - mainwin_screen_changed_cb(GtkWidget *widget, -- GdkScreen *previous_screen, -- gpointer data) -+ GdkScreen *previous_screen UNUSED, -+ gpointer data UNUSED) - { - if (!gtk_widget_has_screen(widget)) - return; -@@ -2757,9 +2822,8 @@ - * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the - * fact that the main VIM engine doesn't take them into account anywhere. - */ --/*ARGSUSED1*/ - static void --drawarea_realize_cb(GtkWidget *widget, gpointer data) -+drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED) - { - GtkWidget *sbar; - -@@ -2789,9 +2853,8 @@ - /* - * Properly clean up on shutdown. - */ --/*ARGSUSED0*/ - static void --drawarea_unrealize_cb(GtkWidget *widget, gpointer data) -+drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED) - { - /* Don't write messages to the GUI anymore */ - full_screen = FALSE; -@@ -2827,11 +2890,10 @@ - #endif - } - --/*ARGSUSED0*/ - static void --drawarea_style_set_cb(GtkWidget *widget, -- GtkStyle *previous_style, -- gpointer data) -+drawarea_style_set_cb(GtkWidget *widget UNUSED, -+ GtkStyle *previous_style UNUSED, -+ gpointer data UNUSED) - { - gui_mch_new_colors(); - } -@@ -2840,9 +2902,10 @@ - * Callback routine for the "delete_event" signal on the toplevel window. - * Tries to vim gracefully, or refuses to exit with changed buffers. - */ --/*ARGSUSED*/ - static gint --delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) -+delete_event_cb(GtkWidget *widget UNUSED, -+ GdkEventAny *event UNUSED, -+ gpointer data UNUSED) - { - gui_shell_closed(); - return TRUE; -@@ -2964,7 +3027,7 @@ - - /* At start-up, don't try to set the hints until the initial - * values have been used (those that dictate our initial size) -- * Let forced (i.e., correct) values thruogh always. -+ * Let forced (i.e., correct) values through always. - */ - if (!(force_width && force_height) && init_window_hints_state > 0) - { -@@ -3142,9 +3205,8 @@ - /* - * Handle selecting an item in the tab line popup menu. - */ --/*ARGSUSED*/ - static void --tabline_menu_handler(GtkMenuItem *item, gpointer user_data) -+tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data) - { - /* Add the string cmd into input buffer */ - send_tabline_menu_event(clicked_page, (int)(long)user_data); -@@ -3244,13 +3306,12 @@ - /* - * Handle selecting one of the tabs. - */ --/*ARGSUSED*/ - static void - on_select_tab( -- GtkNotebook *notebook, -- GtkNotebookPage *page, -+ GtkNotebook *notebook UNUSED, -+ GtkNotebookPage *page UNUSED, - gint idx, -- gpointer data) -+ gpointer data UNUSED) - { - if (!ignore_tabline_evt) - { -@@ -3460,6 +3521,7 @@ - - /* Initialise atoms */ - #ifdef FEAT_MBYTE -+ html_atom = gdk_atom_intern("text/html", FALSE); - utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE); - #endif - #ifndef HAVE_GTK2 -@@ -3784,7 +3846,7 @@ - #endif - - if (gtk_socket_id != 0) -- /* make sure keybord input can go to the drawarea */ -+ /* make sure keyboard input can go to the drawarea */ - GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS); - - /* -@@ -3922,10 +3984,10 @@ - /* - * This signal informs us about the need to rearrange our sub-widgets. - */ --/*ARGSUSED*/ - static gint --form_configure_event(GtkWidget *widget, GdkEventConfigure *event, -- gpointer data) -+form_configure_event(GtkWidget *widget UNUSED, -+ GdkEventConfigure *event, -+ gpointer data UNUSED) - { - int usable_height = event->height; - -@@ -3948,9 +4010,8 @@ - * We can't do much more here than to trying to preserve what had been done, - * since the window is already inevitably going away. - */ --/*ARGSUSED0*/ - static void --mainwin_destroy_cb(GtkObject *object, gpointer data) -+mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED) - { - /* Don't write messages to the GUI anymore */ - full_screen = FALSE; -@@ -3980,9 +4041,8 @@ - * scrollbar init.), actually do the standard hinst and stop the timer. - * We'll not let the default hints be set while this timer's active. - */ --/*ARGSUSED*/ - static gboolean --check_startup_plug_hints(gpointer data) -+check_startup_plug_hints(gpointer data UNUSED) - { - if (init_window_hints_state == 1) - { -@@ -4055,7 +4115,7 @@ - Columns = w; - if (mask & HeightValue) - { -- if (p_window > h - 1 || !option_was_set((char_u *)"window")) -+ if (p_window > (long)h - 1 || !option_was_set((char_u *)"window")) - p_window = h - 1; - Rows = h; - } -@@ -4070,14 +4130,14 @@ - - if (mask & (XValue | YValue)) - { -- int w, h; -- gui_mch_get_screen_dimensions(&w, &h); -- h += p_ghr + get_menu_tool_height(); -- w += get_menu_tool_width(); -+ int ww, hh; -+ gui_mch_get_screen_dimensions(&ww, &hh); -+ hh += p_ghr + get_menu_tool_height(); -+ ww += get_menu_tool_width(); - if (mask & XNegative) -- x += w - pixel_width; -+ x += ww - pixel_width; - if (mask & YNegative) -- y += h - pixel_height; -+ y += hh - pixel_height; - #ifdef HAVE_GTK2 - gtk_window_move(GTK_WINDOW(gui.mainwin), x, y); - #else -@@ -4229,9 +4289,8 @@ - } - - --/*ARGSUSED0*/ - void --gui_mch_exit(int rc) -+gui_mch_exit(int rc UNUSED) - { - if (gui.mainwin != NULL) - gtk_widget_destroy(gui.mainwin); -@@ -4286,7 +4345,6 @@ - * report the new size through form_configure_event(). That caused the window - * layout to be messed up. - */ --/*ARGSUSED0*/ - static gboolean - force_shell_resize_idle(gpointer data) - { -@@ -4314,12 +4372,11 @@ - /* - * Set the windows size. - */ --/*ARGSUSED2*/ - void - gui_mch_set_shellsize(int width, int height, -- int min_width, int min_height, -- int base_width, int base_height, -- int direction) -+ int min_width UNUSED, int min_height UNUSED, -+ int base_width UNUSED, int base_height UNUSED, -+ int direction UNUSED) - { - #ifndef HAVE_GTK2 - /* Hack: When the form already is at the desired size, the window might -@@ -4413,9 +4470,8 @@ - } - - #if defined(FEAT_TITLE) || defined(PROTO) --/*ARGSUSED*/ - void --gui_mch_settitle(char_u *title, char_u *icon) -+gui_mch_settitle(char_u *title, char_u *icon UNUSED) - { - # ifdef HAVE_GTK2 - if (title != NULL && output_conv.vc_type != CONV_NONE) -@@ -4493,7 +4549,6 @@ - * Get a font structure for highlighting. - * "cbdata" is a pointer to the global gui structure. - */ --/*ARGSUSED*/ - static void - font_sel_ok(GtkWidget *wgt, gpointer cbdata) - { -@@ -4509,7 +4564,6 @@ - gtk_main_quit(); - } - --/*ARGSUSED*/ - static void - font_sel_cancel(GtkWidget *wgt, gpointer cbdata) - { -@@ -4520,7 +4574,6 @@ - gtk_main_quit(); - } - --/*ARGSUSED*/ - static void - font_sel_destroy(GtkWidget *wgt, gpointer cbdata) - { -@@ -4620,7 +4673,6 @@ - /* - * Try to load the requested fontset. - */ --/*ARGSUSED2*/ - GuiFontset - gui_mch_get_fontset(char_u *name, int report_error, int fixed_width) - { -@@ -4863,7 +4915,7 @@ - styled_font[1] = &gui.ital_font; - styled_font[2] = &gui.boldital_font; - -- /* First free whatever was freviously there. */ -+ /* First free whatever was previously there. */ - for (i = 0; i < 3; ++i) - if (*styled_font[i]) - { -@@ -5012,9 +5064,8 @@ - * Initialize Vim to use the font or fontset with the given name. - * Return FAIL if the font could not be loaded, OK otherwise. - */ --/*ARGSUSED1*/ - int --gui_mch_init_font(char_u *font_name, int fontset) -+gui_mch_init_font(char_u *font_name, int fontset UNUSED) - { - #ifdef HAVE_GTK2 - PangoFontDescription *font_desc; -@@ -5326,9 +5377,8 @@ - /* - * Return the name of font "font" in allocated memory. - */ --/*ARGSUSED*/ - char_u * --gui_mch_get_fontname(GuiFont font, char_u *name) -+gui_mch_get_fontname(GuiFont font, char_u *name UNUSED) - { - # ifdef HAVE_GTK2 - if (font != NOFONT) -@@ -5732,7 +5782,7 @@ - { - int i; - int offset; -- const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; -+ static const int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; - int y = FILL_Y(row + 1) - 1; - - /* Undercurl: draw curl at the bottom of the character cell. */ -@@ -6085,12 +6135,15 @@ - # ifdef FEAT_MBYTE - if (enc_utf8) - { -- c = utf_ptr2char(p); -+ int pcc[MAX_MCO]; -+ -+ /* TODO: use the composing characters */ -+ c = utfc_ptr2char_len(p, &pcc, len - (p - s)); - if (c >= 0x10000) /* show chars > 0xffff as ? */ - c = 0xbf; - buf[textlen].byte1 = c >> 8; - buf[textlen].byte2 = c; -- p += utf_ptr2len(p); -+ p += utfc_ptr2len_len(p, len - (p - s)); - width += utf_char2cells(c); - } - else -@@ -6114,8 +6167,8 @@ - if (has_mbyte) - { - width = 0; -- for (p = s; p < s + len; p += (*mb_ptr2len)(p)) -- width += (*mb_ptr2cells)(p); -+ for (p = s; p < s + len; p += (*mb_ptr2len_len)(p, len - (p - s))) -+ width += (*mb_ptr2cells_len)(p, len - (p - s)); - } - else - # endif -@@ -6402,7 +6455,6 @@ - /* - * Callback function, used when data is available on the SNiFF connection. - */ --/* ARGSUSED */ - static void - sniff_request_cb( - gpointer data, -@@ -6665,12 +6717,14 @@ - { - GdkAtom target; - unsigned i; -- int nbytes; -- char_u *buffer; - time_t start; - - for (i = 0; i < N_SELECTION_TARGETS; ++i) - { -+#ifdef FEAT_MBYTE -+ if (!clip_html && selection_targets[i].info == TARGET_HTML) -+ continue; -+#endif - received_selection = RS_NONE; - target = gdk_atom_intern(selection_targets[i].target, FALSE); - -@@ -6690,30 +6744,14 @@ - } - - /* Final fallback position - use the X CUT_BUFFER0 store */ -- nbytes = 0; -- buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window), -- &nbytes, 0); -- if (nbytes > 0) -- { -- /* Got something */ -- clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); -- if (p_verbose > 0) -- { -- verbose_enter(); -- smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); -- verbose_leave(); -- } -- } -- if (buffer != NULL) -- XFree(buffer); -+ yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd); - } - - /* - * Disown the selection. - */ --/*ARGSUSED*/ - void --clip_mch_lose_selection(VimClipboard *cbd) -+clip_mch_lose_selection(VimClipboard *cbd UNUSED) - { - /* WEIRD: when using NULL to actually disown the selection, we lose the - * selection the first time we own it. */ -@@ -6741,9 +6779,8 @@ - * Send the current selection to the clipboard. Do nothing for X because we - * will fill in the selection only when requested by another app. - */ --/*ARGSUSED*/ - void --clip_mch_set_selection(VimClipboard *cbd) -+clip_mch_set_selection(VimClipboard *cbd UNUSED) - { - } - -@@ -6950,7 +6987,7 @@ - else - id &= ~1; /* they are always even (why?) */ - } -- else if (shape < sizeof(mshape_ids) / sizeof(int)) -+ else if (shape < (int)(sizeof(mshape_ids) / sizeof(int))) - id = mshape_ids[shape]; - else - return; -diff -Naur vim72.orig/src/gui_motif.c vim72/src/gui_motif.c ---- vim72.orig/src/gui_motif.c 2008-06-07 14:06:33.000000000 +0100 -+++ vim72/src/gui_motif.c 2009-07-22 22:54:22.000000000 +0100 -@@ -117,10 +117,9 @@ - * Call-back routines. - */ - --/* ARGSUSED */ - static void - scroll_cb(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data, call_data; - { - scrollbar_T *sb; -@@ -136,11 +135,11 @@ - } - - #ifdef FEAT_GUI_TABLINE --/*ARGSUSED*/ - static void - tabline_cb(w, client_data, call_data) -- Widget w; -- XtPointer client_data, call_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; -+ XtPointer call_data; - { - XmNotebookCallbackStruct *nptr; - -@@ -149,11 +148,11 @@ - send_tabline_event(nptr->page_number); - } - --/*ARGSUSED*/ - static void - tabline_button_cb(w, client_data, call_data) - Widget w; -- XtPointer client_data, call_data; -+ XtPointer client_data UNUSED; -+ XtPointer call_data UNUSED; - { - int cmd, tab_idx; - -@@ -166,11 +165,10 @@ - /* - * Tabline single mouse click timeout handler - */ --/*ARGSUSED*/ - static void - motif_tabline_timer_cb (timed_out, interval_id) - XtPointer timed_out; -- XtIntervalId *interval_id; -+ XtIntervalId *interval_id UNUSED; - { - *((int *)timed_out) = TRUE; - } -@@ -203,13 +201,12 @@ - return FALSE; - } - --/*ARGSUSED*/ - static void - tabline_menu_cb(w, closure, e, continue_dispatch) - Widget w; -- XtPointer closure; -+ XtPointer closure UNUSED; - XEvent *e; -- Boolean *continue_dispatch; -+ Boolean *continue_dispatch UNUSED; - { - Widget tab_w; - XButtonPressedEvent *event; -@@ -277,11 +274,10 @@ - XtManageChild(tabLine_menu); - } - --/*ARGSUSED*/ - static void - tabline_balloon_cb(beval, state) - BalloonEval *beval; -- int state; -+ int state UNUSED; - { - int nr; - tabpage_T *tp; -@@ -642,13 +638,12 @@ - #endif - } - --/*ARGSUSED*/ - void - gui_mch_set_text_area_pos(x, y, w, h) -- int x; -- int y; -- int w; -- int h; -+ int x UNUSED; -+ int y UNUSED; -+ int w UNUSED; -+ int h UNUSED; - { - #ifdef FEAT_TOOLBAR - /* Give keyboard focus to the textArea instead of the toolbar. */ -@@ -1261,7 +1256,7 @@ - if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL) - { - if (menu->iconidx >= 0 && menu->iconidx -- < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) -+ < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0]))) - xpm = built_in_pixmaps[menu->iconidx]; - else - xpm = tb_blank_xpm; -@@ -1716,10 +1711,9 @@ - } - } - --/* ARGSUSED */ - void - gui_mch_show_popupmenu(menu) -- vimmenu_T *menu; -+ vimmenu_T *menu UNUSED; - { - #ifdef MOTIF_POPUP - XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event()); -@@ -2046,9 +2040,8 @@ - /* - * Callback routine for dialog mnemonic processing. - */ --/*ARGSUSED*/ - static void --mnemonic_event(Widget w, XtPointer call_data, XKeyEvent *event) -+mnemonic_event(Widget w, XtPointer call_data UNUSED, XKeyEvent *event) - { - do_mnemonic(w, event->keycode); - } -@@ -2287,13 +2280,12 @@ - * Put up a file requester. - * Returns the selected name in allocated memory, or NULL for Cancel. - */ --/* ARGSUSED */ - char_u * - gui_mch_browse(saving, title, dflt, ext, initdir, filter) -- int saving; /* select file to write */ -+ int saving UNUSED; /* select file to write */ - char_u *title; /* title for the window */ - char_u *dflt; /* default name */ -- char_u *ext; /* not used (extension added) */ -+ char_u *ext UNUSED; /* not used (extension added) */ - char_u *initdir; /* initial directory, NULL for current dir */ - char_u *filter; /* file name filter */ - { -@@ -2413,12 +2405,11 @@ - /* - * Process callback from Dialog cancel actions. - */ --/* ARGSUSED */ - static void - DialogCancelCB(w, client_data, call_data) -- Widget w; /* widget id */ -- XtPointer client_data; /* data from application */ -- XtPointer call_data; /* data from widget class */ -+ Widget w UNUSED; /* widget id */ -+ XtPointer client_data UNUSED; /* data from application */ -+ XtPointer call_data UNUSED; /* data from widget class */ - { - if (browse_fname != NULL) - { -@@ -2431,12 +2422,11 @@ - /* - * Process callback from Dialog actions. - */ --/* ARGSUSED */ - static void - DialogAcceptCB(w, client_data, call_data) -- Widget w; /* widget id */ -- XtPointer client_data; /* data from application */ -- XtPointer call_data; /* data from widget class */ -+ Widget w UNUSED; /* widget id */ -+ XtPointer client_data UNUSED; /* data from application */ -+ XtPointer call_data; /* data from widget class */ - { - XmFileSelectionBoxCallbackStruct *fcb; - -@@ -2467,13 +2457,12 @@ - * Callback function for the textfield. When CR is hit this works like - * hitting the "OK" button, ESC like "Cancel". - */ --/* ARGSUSED */ - static void - keyhit_callback(w, client_data, event, cont) - Widget w; -- XtPointer client_data; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *cont; -+ Boolean *cont UNUSED; - { - char buf[2]; - KeySym key_sym; -@@ -2490,12 +2479,11 @@ - XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy)); - } - --/* ARGSUSED */ - static void - butproc(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - dialogStatus = (int)(long)client_data + 1; - } -@@ -2567,10 +2555,9 @@ - } - #endif - --/* ARGSUSED */ - int - gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield) -- int type; -+ int type UNUSED; - char_u *title; - char_u *message; - char_u *button_names; -@@ -3197,7 +3184,7 @@ - XmNchildren, &children, - XmNnumChildren, &numChildren, NULL); - borders += tst + tmh; -- for (i = 0; i < numChildren; i++) -+ for (i = 0; i < (int)numChildren; i++) - { - whgt = 0; - XtVaGetValues(children[i], XmNheight, &whgt, NULL); -@@ -3237,13 +3224,12 @@ - * I have to use footer help for backwards compatability. Hopefully both will - * get implemented and the user will have a choice. - */ --/*ARGSUSED*/ - static void - toolbarbutton_enter_cb(w, client_data, event, cont) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XEvent *event; -- Boolean *cont; -+ XEvent *event UNUSED; -+ Boolean *cont UNUSED; - { - vimmenu_T *menu = (vimmenu_T *) client_data; - -@@ -3254,13 +3240,12 @@ - } - } - --/*ARGSUSED*/ - static void - toolbarbutton_leave_cb(w, client_data, event, cont) -- Widget w; -- XtPointer client_data; -- XEvent *event; -- Boolean *cont; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; -+ XEvent *event UNUSED; -+ Boolean *cont UNUSED; - { - gui_mch_set_footer((char_u *) ""); - } -@@ -3492,10 +3477,9 @@ - /* - * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font. - */ --/*ARGSUSED*/ - void - gui_motif_menu_fontlist(id) -- Widget id; -+ Widget id UNUSED; - { - #ifdef FEAT_MENU - #ifdef FONTSET_ALWAYS -@@ -3566,8 +3550,8 @@ - Widget cancel; - } SharedFindReplace; - --static SharedFindReplace find_widgets = { NULL }; --static SharedFindReplace repl_widgets = { NULL }; -+static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; -+static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; - - static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); - static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data)); -@@ -3576,12 +3560,11 @@ - static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event)); - static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace)); - --/*ARGSUSED*/ - static void - find_replace_destroy_callback(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - SharedFindReplace *cd = (SharedFindReplace *)client_data; - -@@ -3590,12 +3573,11 @@ - cd->dialog = (Widget)0; - } - --/*ARGSUSED*/ - static void - find_replace_dismiss_callback(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - SharedFindReplace *cd = (SharedFindReplace *)client_data; - -@@ -3603,22 +3585,20 @@ - XtUnmanageChild(cd->dialog); - } - --/*ARGSUSED*/ - static void - entry_activate_callback(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT); - } - --/*ARGSUSED*/ - static void - find_replace_callback(w, client_data, call_data) -- Widget w; -+ Widget w UNUSED; - XtPointer client_data; -- XtPointer call_data; -+ XtPointer call_data UNUSED; - { - long_u flags = (long_u)client_data; - char *find_text, *repl_text; -@@ -3668,10 +3648,9 @@ - XtFree(repl_text); - } - --/*ARGSUSED*/ - static void - find_replace_keypress(w, frdp, event) -- Widget w; -+ Widget w UNUSED; - SharedFindReplace *frdp; - XKeyEvent *event; - { -diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c ---- vim72.orig/src/gui_x11.c 2008-06-08 16:13:45.000000000 +0100 -+++ vim72/src/gui_x11.c 2009-07-22 22:54:22.000000000 +0100 -@@ -570,22 +570,20 @@ - * Call-back routines. - */ - --/* ARGSUSED */ - static void - gui_x11_timer_cb(timed_out, interval_id) - XtPointer timed_out; -- XtIntervalId *interval_id; -+ XtIntervalId *interval_id UNUSED; - { - *((int *)timed_out) = TRUE; - } - --/* ARGSUSED */ - static void - gui_x11_visibility_cb(w, dud, event, dum) -- Widget w; -- XtPointer dud; -+ Widget w UNUSED; -+ XtPointer dud UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - if (event->type != VisibilityNotify) - return; -@@ -603,13 +601,12 @@ - gui_mch_update(); - } - --/* ARGSUSED */ - static void - gui_x11_expose_cb(w, dud, event, dum) -- Widget w; -- XtPointer dud; -+ Widget w UNUSED; -+ XtPointer dud UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - XExposeEvent *gevent; - int new_x; -@@ -680,13 +677,12 @@ - } - #endif - --/* ARGSUSED */ - static void - gui_x11_resize_window_cb(w, dud, event, dum) -- Widget w; -- XtPointer dud; -+ Widget w UNUSED; -+ XtPointer dud UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - static int lastWidth, lastHeight; - -@@ -727,35 +723,32 @@ - #endif - } - --/* ARGSUSED */ - static void - gui_x11_focus_change_cb(w, data, event, dum) -- Widget w; -- XtPointer data; -+ Widget w UNUSED; -+ XtPointer data UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - gui_focus_change(event->type == FocusIn); - } - --/* ARGSUSED */ - static void - gui_x11_enter_cb(w, data, event, dum) -- Widget w; -- XtPointer data; -- XEvent *event; -- Boolean *dum; -+ Widget w UNUSED; -+ XtPointer data UNUSED; -+ XEvent *event UNUSED; -+ Boolean *dum UNUSED; - { - gui_focus_change(TRUE); - } - --/* ARGSUSED */ - static void - gui_x11_leave_cb(w, data, event, dum) -- Widget w; -- XtPointer data; -- XEvent *event; -- Boolean *dum; -+ Widget w UNUSED; -+ XtPointer data UNUSED; -+ XEvent *event UNUSED; -+ Boolean *dum UNUSED; - { - gui_focus_change(FALSE); - } -@@ -766,13 +759,12 @@ - # endif - #endif - --/* ARGSUSED */ - void - gui_x11_key_hit_cb(w, dud, event, dum) -- Widget w; -- XtPointer dud; -+ Widget w UNUSED; -+ XtPointer dud UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - XKeyPressedEvent *ev_press; - #ifdef FEAT_XIM -@@ -1078,13 +1070,12 @@ - #endif - } - --/* ARGSUSED */ - static void - gui_x11_mouse_cb(w, dud, event, dum) -- Widget w; -- XtPointer dud; -+ Widget w UNUSED; -+ XtPointer dud UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - static XtIntervalId timer = (XtIntervalId)0; - static int timed_out = TRUE; -@@ -1210,11 +1201,11 @@ - while (arg < *argc) - { - /* Look for argv[arg] in cmdline_options[] table */ -- for (i = 0; i < XtNumber(cmdline_options); i++) -+ for (i = 0; i < (int)XtNumber(cmdline_options); i++) - if (strcmp(argv[arg], cmdline_options[i].option) == 0) - break; - -- if (i < XtNumber(cmdline_options)) -+ if (i < (int)XtNumber(cmdline_options)) - { - /* Remember finding "-rv" or "-reverse" */ - if (strcmp("-rv", argv[arg]) == 0 -@@ -1319,12 +1310,11 @@ - - static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i)); - --/*ARGSUSED*/ - static void - local_xsmp_handle_requests(c, s, i) -- XtPointer c; -- int *s; -- XtInputId *i; -+ XtPointer c UNUSED; -+ int *s UNUSED; -+ XtInputId *i UNUSED; - { - if (xsmp_handle_requests() == FAIL) - XtRemoveInput(_xsmp_xtinputid); -@@ -1438,7 +1428,7 @@ - Columns = w; - if (mask & HeightValue) - { -- if (p_window > h - 1 || !option_was_set((char_u *)"window")) -+ if (p_window > (long)h - 1 || !option_was_set((char_u *)"window")) - p_window = h - 1; - Rows = h; - } -@@ -1587,6 +1577,8 @@ - XtCloseDisplay(gui.dpy); - gui.dpy = NULL; - vimShell = (Widget)0; -+ vim_free(gui_argv); -+ gui_argv = NULL; - } - - /* -@@ -1751,16 +1743,17 @@ - } - #endif - --/*ARGSUSED*/ - void - gui_mch_exit(rc) -- int rc; -+ int rc UNUSED; - { - #if 0 - /* Lesstif gives an error message here, and so does Solaris. The man page - * says that this isn't needed when exiting, so just skip it. */ - XtCloseDisplay(gui.dpy); - #endif -+ vim_free(gui_argv); -+ gui_argv = NULL; - } - - /* -@@ -1795,7 +1788,6 @@ - NULL); - } - --/*ARGSUSED*/ - void - gui_mch_set_shellsize(width, height, min_width, min_height, - base_width, base_height, direction) -@@ -1805,7 +1797,7 @@ - int min_height; - int base_width; - int base_height; -- int direction; -+ int direction UNUSED; - { - #ifdef FEAT_XIM - height += xim_get_status_area_height(), -@@ -1843,11 +1835,10 @@ - * If "fontset" is TRUE, load the "font_name" as a fontset. - * Return FAIL if the font could not be loaded, OK otherwise. - */ --/*ARGSUSED*/ - int - gui_mch_init_font(font_name, do_fontset) - char_u *font_name; -- int do_fontset; -+ int do_fontset UNUSED; - { - XFontStruct *font = NULL; - -@@ -2025,10 +2016,9 @@ - * Return the name of font "font" in allocated memory. - * Don't know how to get the actual name, thus use the provided name. - */ --/*ARGSUSED*/ - char_u * - gui_mch_get_fontname(font, name) -- GuiFont font; -+ GuiFont font UNUSED; - char_u *name; - { - if (name == NULL) -@@ -2450,7 +2440,7 @@ - *colorPtr = colortable[closest]; - } - -- free(colortable); -+ vim_free(colortable); - return OK; - } - -@@ -2517,7 +2507,7 @@ - { - int i; - int offset; -- const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; -+ static const int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 }; - - XSetForeground(gui.dpy, gui.text_gc, prev_sp_color); - for (i = FILL_X(col); i < FILL_X(col + cells); ++i) -@@ -2565,8 +2555,10 @@ - # ifdef FEAT_XFONTSET - if (current_fontset != NULL) - { -- if (c >= 0x10000 && sizeof(wchar_t) <= 2) -+# ifdef SMALL_WCHAR_T -+ if (c >= 0x10000) - c = 0xbf; /* show chars > 0xffff as ? */ -+# endif - ((wchar_t *)buf)[wlen] = c; - } - else -@@ -3132,11 +3124,11 @@ - /* Nothing to do in X */ - } - --/* ARGSUSED */ - void - gui_x11_menu_cb(w, client_data, call_data) -- Widget w; -- XtPointer client_data, call_data; -+ Widget w UNUSED; -+ XtPointer client_data; -+ XtPointer call_data UNUSED; - { - gui_menu_cb((vimmenu_T *)client_data); - } -@@ -3149,13 +3141,12 @@ - * Function called when window closed. Works like ":qa". - * Should put up a requester! - */ --/*ARGSUSED*/ - static void - gui_x11_wm_protocol_handler(w, client_data, event, dum) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - /* - * Only deal with Client messages. -@@ -3168,7 +3159,7 @@ - * exit. That can be cancelled though, thus Vim shouldn't exit here. - * Just sync our swap files. - */ -- if (((XClientMessageEvent *)event)->data.l[0] == -+ if ((Atom)((XClientMessageEvent *)event)->data.l[0] == - wm_atoms[SAVE_YOURSELF_IDX]) - { - out_flush(); -@@ -3181,7 +3172,7 @@ - return; - } - -- if (((XClientMessageEvent *)event)->data.l[0] != -+ if ((Atom)((XClientMessageEvent *)event)->data.l[0] != - wm_atoms[DELETE_WINDOW_IDX]) - return; - -@@ -3192,13 +3183,12 @@ - /* - * Function called when property changed. Check for incoming commands - */ --/*ARGSUSED*/ - static void - gui_x11_send_event_handler(w, client_data, event, dum) -- Widget w; -- XtPointer client_data; -+ Widget w UNUSED; -+ XtPointer client_data UNUSED; - XEvent *event; -- Boolean *dum; -+ Boolean *dum UNUSED; - { - XPropertyEvent *e = (XPropertyEvent *) event; - -@@ -3273,11 +3263,10 @@ - } - } - --/* ARGSUSED */ - static void - gui_x11_blink_cb(timed_out, interval_id) -- XtPointer timed_out; -- XtIntervalId *interval_id; -+ XtPointer timed_out UNUSED; -+ XtIntervalId *interval_id UNUSED; - { - if (blink_state == BLINK_ON) - { -@@ -3439,47 +3428,37 @@ - char_u *signfile; - { - XpmAttributes attrs; -- XImage *sign; -+ XImage *sign = NULL; - int status; - - /* - * Setup the color substitution table. - */ -- sign = NULL; - if (signfile[0] != NUL && signfile[0] != '-') - { -- sign = (XImage *)alloc(sizeof(XImage)); -- if (sign != NULL) -+ XpmColorSymbol color[5] = - { -- XpmColorSymbol color[5] = -- { -- {"none", NULL, 0}, -- {"iconColor1", NULL, 0}, -- {"bottomShadowColor", NULL, 0}, -- {"topShadowColor", NULL, 0}, -- {"selectColor", NULL, 0} -- }; -- attrs.valuemask = XpmColorSymbols; -- attrs.numsymbols = 2; -- attrs.colorsymbols = color; -- attrs.colorsymbols[0].pixel = gui.back_pixel; -- attrs.colorsymbols[1].pixel = gui.norm_pixel; -- status = XpmReadFileToImage(gui.dpy, (char *)signfile, -+ {"none", NULL, 0}, -+ {"iconColor1", NULL, 0}, -+ {"bottomShadowColor", NULL, 0}, -+ {"topShadowColor", NULL, 0}, -+ {"selectColor", NULL, 0} -+ }; -+ attrs.valuemask = XpmColorSymbols; -+ attrs.numsymbols = 2; -+ attrs.colorsymbols = color; -+ attrs.colorsymbols[0].pixel = gui.back_pixel; -+ attrs.colorsymbols[1].pixel = gui.norm_pixel; -+ status = XpmReadFileToImage(gui.dpy, (char *)signfile, - &sign, NULL, &attrs); -- -- if (status == 0) -- { -- /* Sign width is fixed at two columns now. -- if (sign->width > gui.sign_width) -- gui.sign_width = sign->width + 8; */ -- } -- else -- { -- vim_free(sign); -- sign = NULL; -- EMSG(_(e_signdata)); -- } -+ if (status == 0) -+ { -+ /* Sign width is fixed at two columns now. -+ if (sign->width > gui.sign_width) -+ gui.sign_width = sign->width + 8; */ - } -+ else -+ EMSG(_(e_signdata)); - } - - return (void *)sign; -@@ -3489,8 +3468,7 @@ - gui_mch_destroy_sign(sign) - void *sign; - { -- XFree(((XImage *)sign)->data); -- vim_free(sign); -+ XDestroyImage((XImage*)sign); - } - #endif - -diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c ---- vim72.orig/src/gui_xmdlg.c 2008-06-21 17:05:32.000000000 +0100 -+++ vim72/src/gui_xmdlg.c 2009-07-22 22:54:22.000000000 +0100 -@@ -369,10 +369,10 @@ - char buf[TEMP_BUF_SIZE]; - XmString items[MAX_ENTRIES_IN_LIST]; - int i; -- int index; -+ int idx; - -- for (index = (int)ENCODING; index < (int)NONE; ++index) -- count[index] = 0; -+ for (idx = (int)ENCODING; idx < (int)NONE; ++idx) -+ count[idx] = 0; - - /* First we insert the wild char into every single list. */ - if (fix != ENCODING) -@@ -448,7 +448,7 @@ - - items[i] = XmStringCreateLocalized(list[ENCODING][i]); - -- if (i < n_items) -+ if (i < (int)n_items) - { - /* recycle old button */ - XtVaSetValues(children[i], -@@ -481,7 +481,7 @@ - - /* Destroy all the outstanding menu items. - */ -- for (i = count[ENCODING]; i < n_items; ++i) -+ for (i = count[ENCODING]; i < (int)n_items; ++i) - { - XtUnmanageChild(children[i]); - XtDestroyWidget(children[i]); -@@ -503,14 +503,14 @@ - /* - * Now loop trough the remaining lists and set them up. - */ -- for (index = (int)NAME; index < (int)NONE; ++index) -+ for (idx = (int)NAME; idx < (int)NONE; ++idx) - { - Widget w; - -- if (fix == (enum ListSpecifier)index) -+ if (fix == (enum ListSpecifier)idx) - continue; - -- switch ((enum ListSpecifier)index) -+ switch ((enum ListSpecifier)idx) - { - case NAME: - w = data->list[NAME]; -@@ -525,28 +525,27 @@ - w = (Widget)0; /* for lint */ - } - -- for (i = 0; i < count[index]; ++i) -+ for (i = 0; i < count[idx]; ++i) - { -- items[i] = XmStringCreateLocalized(list[index][i]); -- XtFree(list[index][i]); -+ items[i] = XmStringCreateLocalized(list[idx][i]); -+ XtFree(list[idx][i]); - } - XmListDeleteAllItems(w); -- XmListAddItems(w, items, count[index], 1); -- if (data->sel[index]) -+ XmListAddItems(w, items, count[idx], 1); -+ if (data->sel[idx]) - { - XmStringFree(items[0]); -- items[0] = XmStringCreateLocalized(data->sel[index]); -+ items[0] = XmStringCreateLocalized(data->sel[idx]); - XmListSelectItem(w, items[0], False); - XmListSetBottomItem(w, items[0]); - } -- for (i = 0; i < count[index]; ++i) -+ for (i = 0; i < count[idx]; ++i) - XmStringFree(items[i]); - } - } - --/*ARGSUSED*/ - static void --stoggle_callback(Widget w, -+stoggle_callback(Widget w UNUSED, - SharedFontSelData *data, - XmToggleButtonCallbackStruct *call_data) - { -@@ -695,25 +694,24 @@ - int n; - XmString str; - Arg args[4]; -- char *msg = _("no specific match"); -+ char *nomatch_msg = _("no specific match"); - - n = 0; -- str = XmStringCreateLocalized(msg); -+ str = XmStringCreateLocalized(nomatch_msg); - XtSetArg(args[n], XmNlabelString, str); ++n; - XtSetValues(data->sample, args, n); - apply_fontlist(data->sample); -- XmTextSetString(data->name, msg); -+ XmTextSetString(data->name, nomatch_msg); - XmStringFree(str); - - return False; - } - } - --/*ARGSUSED*/ - static void - encoding_callback(Widget w, - SharedFontSelData *data, -- XtPointer dummy) -+ XtPointer dummy UNUSED) - { - XmString str; - XmListCallbackStruct fake_data; -@@ -752,11 +750,10 @@ - do_choice(w, data, call_data, SIZE); - } - --/*ARGSUSED*/ - static void --cancel_callback(Widget w, -+cancel_callback(Widget w UNUSED, - SharedFontSelData *data, -- XmListCallbackStruct *call_data) -+ XmListCallbackStruct *call_data UNUSED) - { - if (data->sel[ENCODING]) - { -@@ -789,11 +786,10 @@ - data->exit = True; - } - --/*ARGSUSED*/ - static void --ok_callback(Widget w, -+ok_callback(Widget w UNUSED, - SharedFontSelData *data, -- XmPushButtonCallbackStruct *call_data) -+ XmPushButtonCallbackStruct *call_data UNUSED) - { - char *pattern; - char **name; -@@ -886,21 +882,21 @@ - { - int i; - int max; -- int index = 0; -+ int idx = 0; - int size; -- char str[128]; -+ char buf[128]; - - for (i = 0, max = 0; i < data->num; i++) - { -- get_part(fn(data, i), 7, str); -- size = atoi(str); -+ get_part(fn(data, i), 7, buf); -+ size = atoi(buf); - if ((size > max) && (size < MAX_DISPLAY_SIZE)) - { -- index = i; -+ idx = i; - max = size; - } - } -- strcpy(big_font, fn(data, index)); -+ strcpy(big_font, fn(data, idx)); - } - data->old = XLoadQueryFont(XtDisplay(parent), big_font); - data->old_list = gui_motif_create_fontlist(data->old); -@@ -1217,28 +1213,28 @@ - - if (i != 0) - { -- char name[TEMP_BUF_SIZE]; -- char style[TEMP_BUF_SIZE]; -- char size[TEMP_BUF_SIZE]; -- char encoding[TEMP_BUF_SIZE]; -+ char namebuf[TEMP_BUF_SIZE]; -+ char stylebuf[TEMP_BUF_SIZE]; -+ char sizebuf[TEMP_BUF_SIZE]; -+ char encodingbuf[TEMP_BUF_SIZE]; - char *found; - - found = names[0]; - -- name_part(found, name); -- style_part(found, style); -- size_part(found, size, data->in_pixels); -- encoding_part(found, encoding); -- -- if (strlen(name) > 0 -- && strlen(style) > 0 -- && strlen(size) > 0 -- && strlen(encoding) > 0) -+ name_part(found, namebuf); -+ style_part(found, stylebuf); -+ size_part(found, sizebuf, data->in_pixels); -+ encoding_part(found, encodingbuf); -+ -+ if (strlen(namebuf) > 0 -+ && strlen(stylebuf) > 0 -+ && strlen(sizebuf) > 0 -+ && strlen(encodingbuf) > 0) - { -- data->sel[NAME] = XtNewString(name); -- data->sel[STYLE] = XtNewString(style); -- data->sel[SIZE] = XtNewString(size); -- data->sel[ENCODING] = XtNewString(encoding); -+ data->sel[NAME] = XtNewString(namebuf); -+ data->sel[STYLE] = XtNewString(stylebuf); -+ data->sel[SIZE] = XtNewString(sizebuf); -+ data->sel[ENCODING] = XtNewString(encodingbuf); - data->font_name = XtNewString(names[0]); - display_sample(data); - XmTextSetString(data->name, data->font_name); -diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c ---- vim72.orig/src/gui_xmebw.c 2007-09-06 11:57:51.000000000 +0100 -+++ vim72/src/gui_xmebw.c 2009-07-22 22:54:22.000000000 +0100 -@@ -235,13 +235,12 @@ - return tmp; - } - --/*ARGSUSED*/ - static int - alloc_color(Display *display, - Colormap colormap, - char *colorname, - XColor *xcolor, -- void *closure) -+ void *closure UNUSED) - { - int status; - -@@ -595,9 +594,10 @@ - XtHeight(eb), eb->primitive.highlight_thickness); - } - --/*ARGSUSED*/ - static void --draw_pixmap(XmEnhancedButtonWidget eb, XEvent *event, Region region) -+draw_pixmap(XmEnhancedButtonWidget eb, -+ XEvent *event UNUSED, -+ Region region UNUSED) - { - Pixmap pix; - GC gc = eb->label.normal_GC; -@@ -641,7 +641,7 @@ - height = eb->core.height - 2 * y; - if (h < height) - height = h; -- if (depth == eb->core.depth) -+ if (depth == (int)eb->core.depth) - XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0, - width, height, x, y); - else if (depth == 1) -@@ -731,9 +731,11 @@ - eb->label.normal_GC = tmp_gc; - } - --/*ARGSUSED*/ - static void --Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params) -+Enter(Widget wid, -+ XEvent *event, -+ String *params UNUSED, -+ Cardinal *num_params UNUSED) - { - XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid; - XmPushButtonCallbackStruct call_value; -@@ -818,9 +820,11 @@ - } - } - --/*ARGSUSED*/ - static void --Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params) -+Leave(Widget wid, -+ XEvent *event, -+ String *params UNUSED, -+ Cardinal *num_params UNUSED) - { - XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid; - XmPushButtonCallbackStruct call_value; -@@ -976,9 +980,8 @@ - } - } - --/*ARGSUSED*/ - static void --Initialize(Widget rq, Widget ebw, ArgList args, Cardinal *n) -+Initialize(Widget rq, Widget ebw, ArgList args UNUSED, Cardinal *n UNUSED) - { - XmEnhancedButtonWidget request = (XmEnhancedButtonWidget)rq; - XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)ebw; -@@ -1056,9 +1059,12 @@ - free_pixmaps((XmEnhancedButtonWidget)w); - } - --/*ARGSUSED*/ - static Boolean --SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n) -+SetValues(Widget current, -+ Widget request UNUSED, -+ Widget new, -+ ArgList args UNUSED, -+ Cardinal *n UNUSED) - { - XmEnhancedButtonWidget cur = (XmEnhancedButtonWidget) current; - XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) new; -@@ -1108,7 +1114,7 @@ - if ((win_x < 0) || (win_y < 0)) - return False; - -- if ((win_x > r_width) || (win_y > r_height)) -+ if ((win_x > (int)r_width) || (win_y > (int)r_height)) - return False; - draw_highlight(eb); - draw_shadows(eb); -@@ -1256,7 +1262,7 @@ - } - else - { -- int adjust = 0; -+ adjust = 0; - - #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) - /* -@@ -1268,12 +1274,11 @@ - { - case XmEXTERNAL_HIGHLIGHT: - adjust = (eb->primitive.highlight_thickness - -- (eb->pushbutton.default_button_shadow_thickness ? -- Xm3D_ENHANCE_PIXEL : 0)); -+ (eb->pushbutton.default_button_shadow_thickness -+ ? Xm3D_ENHANCE_PIXEL : 0)); - break; - - case XmINTERNAL_HIGHLIGHT: -- adjust = 0; - break; - - default: -diff -Naur vim72.orig/src/hardcopy.c vim72/src/hardcopy.c ---- vim72.orig/src/hardcopy.c 2008-01-11 20:46:20.000000000 +0000 -+++ vim72/src/hardcopy.c 2009-07-22 22:54:22.000000000 +0100 -@@ -442,12 +442,11 @@ - /* - * Print the page header. - */ --/*ARGSUSED*/ - static void - prt_header(psettings, pagenum, lnum) - prt_settings_T *psettings; - int pagenum; -- linenr_T lnum; -+ linenr_T lnum UNUSED; - { - int width = psettings->chars_per_line; - int page_line; -@@ -1881,7 +1880,7 @@ - return FALSE; - - /* Find type of DSC comment */ -- for (comment = 0; comment < NUM_ELEMENTS(prt_dsc_table); comment++) -+ for (comment = 0; comment < (int)NUM_ELEMENTS(prt_dsc_table); comment++) - if (prt_resfile_strncmp(0, prt_dsc_table[comment].string, - prt_dsc_table[comment].len) == 0) - break; -@@ -2454,12 +2453,11 @@ - } - #endif - --/*ARGSUSED*/ - int - mch_print_init(psettings, jobname, forceit) - prt_settings_T *psettings; - char_u *jobname; -- int forceit; -+ int forceit UNUSED; - { - int i; - char *paper_name; -@@ -2514,7 +2512,7 @@ - if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) - { - p_mbenc_first = NULL; -- for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++) -+ for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++) - if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap], - &p_mbenc)) - { -@@ -2642,7 +2640,7 @@ - paper_name = "A4"; - paper_strlen = 2; - } -- for (i = 0; i < PRT_MEDIASIZE_LEN; ++i) -+ for (i = 0; i < (int)PRT_MEDIASIZE_LEN; ++i) - if (STRLEN(prt_mediasize[i].name) == (unsigned)paper_strlen - && STRNICMP(prt_mediasize[i].name, paper_name, - paper_strlen) == 0) -@@ -3308,10 +3306,9 @@ - return !prt_file_error; - } - --/*ARGSUSED*/ - int - mch_print_begin_page(str) -- char_u *str; -+ char_u *str UNUSED; - { - int page_num[2]; - -@@ -3379,11 +3376,10 @@ - #endif - } - --/*ARGSUSED*/ - int - mch_print_text_out(p, len) - char_u *p; -- int len; -+ int len UNUSED; - { - int need_break; - char_u ch; -diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c ---- vim72.orig/src/if_cscope.c 2008-06-24 17:32:34.000000000 +0100 -+++ vim72/src/if_cscope.c 2009-07-22 22:54:23.000000000 +0100 -@@ -46,7 +46,6 @@ - static int cs_find __ARGS((exarg_T *eap)); - static int cs_find_common __ARGS((char *opt, char *pat, int, int, int)); - static int cs_help __ARGS((exarg_T *eap)); --static void cs_init __ARGS((void)); - static void clear_csinfo __ARGS((int i)); - static int cs_insert_filelist __ARGS((char *, char *, char *, - struct stat *)); -@@ -66,7 +65,10 @@ - static int cs_show __ARGS((exarg_T *eap)); - - --static csinfo_T csinfo[CSCOPE_MAX_CONNECTIONS]; -+static csinfo_T * csinfo = NULL; -+static int csinfo_size = 0; /* number of items allocated in -+ csinfo[] */ -+ - static int eap_arg_len; /* length of eap->arg, set in - cs_lookup_cmd() */ - static cscmd_T cs_cmds[] = -@@ -74,7 +76,7 @@ - { "add", cs_add, - N_("Add a new database"), "add file|dir [pre-path] [flags]", 0 }, - { "find", cs_find, -- N_("Query for a pattern"), FIND_USAGE, 1 }, -+ N_("Query for a pattern"), "find c|d|e|f|g|i|s|t name", 1 }, - { "help", cs_help, - N_("Show this message"), "help", 0 }, - { "kill", cs_kill, -@@ -83,7 +85,7 @@ - N_("Reinit all connections"), "reset", 0 }, - { "show", cs_show, - N_("Show connections"), "show", 0 }, -- { NULL } -+ { NULL, NULL, NULL, NULL, 0 } - }; - - static void -@@ -93,12 +95,125 @@ - (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage); - } - -+#if defined(FEAT_CMDL_COMPL) || defined(PROTO) -+ -+static enum -+{ -+ EXP_CSCOPE_SUBCMD, /* expand ":cscope" sub-commands */ -+ EXP_SCSCOPE_SUBCMD, /* expand ":scscope" sub-commands */ -+ EXP_CSCOPE_FIND, /* expand ":cscope find" arguments */ -+ EXP_CSCOPE_KILL /* expand ":cscope kill" arguments */ -+} expand_what; -+ -+/* -+ * Function given to ExpandGeneric() to obtain the cscope command -+ * expansion. -+ */ -+ char_u * -+get_cscope_name(xp, idx) -+ expand_T *xp UNUSED; -+ int idx; -+{ -+ int current_idx; -+ int i; -+ -+ switch (expand_what) -+ { -+ case EXP_CSCOPE_SUBCMD: -+ /* Complete with sub-commands of ":cscope": -+ * add, find, help, kill, reset, show */ -+ return (char_u *)cs_cmds[idx].name; -+ case EXP_SCSCOPE_SUBCMD: -+ /* Complete with sub-commands of ":scscope": same sub-commands as -+ * ":cscope" but skip commands which don't support split windows */ -+ for (i = 0, current_idx = 0; cs_cmds[i].name != NULL; i++) -+ if (cs_cmds[i].cansplit) -+ if (current_idx++ == idx) -+ break; -+ return (char_u *)cs_cmds[i].name; -+ case EXP_CSCOPE_FIND: -+ { -+ const char *query_type[] = -+ { -+ "c", "d", "e", "f", "g", "i", "s", "t", NULL -+ }; -+ -+ /* Complete with query type of ":cscope find {query_type}". -+ * {query_type} can be letters (c, d, ... t) or numbers (0, 1, -+ * ..., 8) but only complete with letters, since numbers are -+ * redundant. */ -+ return (char_u *)query_type[idx]; -+ } -+ case EXP_CSCOPE_KILL: -+ { -+ static char connection[5]; -+ -+ /* ":cscope kill" accepts connection numbers or partial names of -+ * the pathname of the cscope database as argument. Only complete -+ * with connection numbers. -1 can also be used to kill all -+ * connections. */ -+ for (i = 0, current_idx = 0; i < csinfo_size; i++) -+ { -+ if (csinfo[i].fname == NULL) -+ continue; -+ if (current_idx++ == idx) -+ { -+ vim_snprintf(connection, sizeof(connection), "%d", i); -+ return (char_u *)connection; -+ } -+ } -+ return (current_idx == idx && idx > 0) ? (char_u *)"-1" : NULL; -+ } -+ default: -+ return NULL; -+ } -+} -+ -+/* -+ * Handle command line completion for :cscope command. -+ */ -+ void -+set_context_in_cscope_cmd(xp, arg, cmdidx) -+ expand_T *xp; -+ char_u *arg; -+ cmdidx_T cmdidx; -+{ -+ char_u *p; -+ -+ /* Default: expand subcommands */ -+ xp->xp_context = EXPAND_CSCOPE; -+ xp->xp_pattern = arg; -+ expand_what = (cmdidx == CMD_scscope) -+ ? EXP_SCSCOPE_SUBCMD : EXP_CSCOPE_SUBCMD; -+ -+ /* (part of) subcommand already typed */ -+ if (*arg != NUL) -+ { -+ p = skiptowhite(arg); -+ if (*p != NUL) /* past first word */ -+ { -+ xp->xp_pattern = skipwhite(p); -+ if (*skiptowhite(xp->xp_pattern) != NUL) -+ xp->xp_context = EXPAND_NOTHING; -+ else if (STRNICMP(arg, "add", p - arg) == 0) -+ xp->xp_context = EXPAND_FILES; -+ else if (STRNICMP(arg, "kill", p - arg) == 0) -+ expand_what = EXP_CSCOPE_KILL; -+ else if (STRNICMP(arg, "find", p - arg) == 0) -+ expand_what = EXP_CSCOPE_FIND; -+ else -+ xp->xp_context = EXPAND_NOTHING; -+ } -+ } -+} -+ -+#endif /* FEAT_CMDL_COMPL */ -+ - /* - * PRIVATE: do_cscope_general - * -- * find the command, print help if invalid, and the then call the -- * corresponding command function, -- * called from do_cscope and do_scscope -+ * Find the command, print help if invalid, and then call the corresponding -+ * command function. - */ - static void - do_cscope_general(eap, make_split) -@@ -107,7 +222,6 @@ - { - cscmd_T *cmdp; - -- cs_init(); - if ((cmdp = cs_lookup_cmd(eap)) == NULL) - { - cs_help(eap); -@@ -168,8 +282,6 @@ - { - int ret = FALSE; - -- cs_init(); -- - if (*eap->arg == NUL) - { - (void)EMSG(_("E562: Usage: cstag ")); -@@ -325,7 +437,7 @@ - if (num < 0 || num > 4 || (num > 0 && !dbpath)) - return FALSE; - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (!csinfo[i].fname) - continue; -@@ -379,10 +491,9 @@ - * - * MAXPATHL 256 - */ --/* ARGSUSED */ - static int - cs_add(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - char *fname, *ppath, *flags = NULL; - -@@ -569,7 +680,7 @@ - short i; - short cnt = 0; - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (csinfo[i].fname != NULL) - cnt++; -@@ -659,6 +770,7 @@ - { - char *cmd; - short search; -+ char *pat; - - switch (csoption[0]) - { -@@ -692,10 +804,17 @@ - return NULL; - } - -- if ((cmd = (char *)alloc((unsigned)(strlen(pattern) + 2))) == NULL) -+ /* Skip white space before the patter, except for text and pattern search, -+ * they may want to use the leading white space. */ -+ pat = pattern; -+ if (search != 4 && search != 6) -+ while vim_iswhite(*pat) -+ ++pat; -+ -+ if ((cmd = (char *)alloc((unsigned)(strlen(pat) + 2))) == NULL) - return NULL; - -- (void)sprintf(cmd, "%d%s", search, pattern); -+ (void)sprintf(cmd, "%d%s", search, pat); - - return cmd; - } /* cs_create_cmd */ -@@ -869,7 +988,7 @@ - vim_free(ppath); - - #if defined(UNIX) -- if (execl("/bin/sh", "sh", "-c", cmd, NULL) == -1) -+ if (execl("/bin/sh", "sh", "-c", cmd, (char *)NULL) == -1) - PERROR(_("cs_create_connection exec failed")); - - exit(127); -@@ -989,7 +1108,8 @@ - { - int i; - char *cmd; -- int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches; -+ int *nummatches; -+ int totmatches; - #ifdef FEAT_QUICKFIX - char cmdletter; - char *qfpos; -@@ -1000,13 +1120,17 @@ - if (cmd == NULL) - return FALSE; - -+ nummatches = (int *)alloc(sizeof(int)*csinfo_size); -+ if (nummatches == NULL) -+ return FALSE; -+ - /* send query to all open connections, then count the total number - * of matches so we can alloc matchesp all in one swell foop - */ -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - nummatches[i] = 0; - totmatches = 0; -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL) - continue; -@@ -1031,7 +1155,10 @@ - char *buf; - - if (!verbose) -+ { -+ vim_free(nummatches); - return FALSE; -+ } - - buf = (char *)alloc((unsigned)(strlen(opt) + strlen(pat) + strlen(nf))); - if (buf == NULL) -@@ -1042,6 +1169,7 @@ - (void)EMSG(buf); - vim_free(buf); - } -+ vim_free(nummatches); - return FALSE; - } - -@@ -1094,6 +1222,7 @@ - (void)EMSG(buf); - vim_free(buf); - } -+ vim_free(nummatches); - return FALSE; - } - } -@@ -1141,6 +1270,7 @@ - } - mch_remove(tmp); - vim_free(tmp); -+ vim_free(nummatches); - return TRUE; - } - else -@@ -1152,6 +1282,7 @@ - /* read output */ - cs_fill_results((char *)pat, totmatches, nummatches, &matches, - &contexts, &matched); -+ vim_free(nummatches); - if (matches == NULL) - return FALSE; - -@@ -1167,20 +1298,36 @@ - * - * print help - */ --/* ARGSUSED */ - static int - cs_help(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - cscmd_T *cmdp = cs_cmds; - - (void)MSG_PUTS(_("cscope commands:\n")); - while (cmdp->name != NULL) - { -- (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"), -- cmdp->name, _(cmdp->help), cmdp->usage); -+ char *help = _(cmdp->help); -+ int space_cnt = 30 - vim_strsize((char_u *)help); -+ -+ /* Use %*s rather than %30s to ensure proper alignment in utf-8 */ -+ if (space_cnt < 0) -+ space_cnt = 0; -+ (void)smsg((char_u *)_("%-5s: %s%*s (Usage: %s)"), -+ cmdp->name, -+ help, space_cnt, " ", -+ cmdp->usage); - if (strcmp(cmdp->name, "find") == 0) -- MSG_PUTS(FIND_HELP); -+ MSG_PUTS(_("\n" -+ " c: Find functions calling this function\n" -+ " d: Find functions called by this function\n" -+ " e: Find this egrep pattern\n" -+ " f: Find this file\n" -+ " g: Find this definition\n" -+ " i: Find files #including this file\n" -+ " s: Find this C symbol\n" -+ " t: Find assignments to\n")); -+ - cmdp++; - } - -@@ -1189,26 +1336,6 @@ - } /* cs_help */ - - --/* -- * PRIVATE: cs_init -- * -- * initialize cscope structure if not already -- */ -- static void --cs_init() --{ -- short i; -- static int init_already = FALSE; -- -- if (init_already) -- return; -- -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -- clear_csinfo(i); -- -- init_already = TRUE; --} /* cs_init */ -- - static void - clear_csinfo(i) - int i; -@@ -1257,13 +1384,12 @@ - * - * insert a new cscope database filename into the filelist - */ --/*ARGSUSED*/ - static int - cs_insert_filelist(fname, ppath, flags, sb) - char *fname; - char *ppath; - char *flags; -- struct stat *sb; -+ struct stat *sb UNUSED; - { - short i, j; - #ifndef UNIX -@@ -1306,7 +1432,7 @@ - #endif - - i = -1; /* can be set to the index of an empty item in csinfo */ -- for (j = 0; j < CSCOPE_MAX_CONNECTIONS; j++) -+ for (j = 0; j < csinfo_size; j++) - { - if (csinfo[j].fname != NULL - #if defined(UNIX) -@@ -1333,9 +1459,25 @@ - - if (i == -1) - { -- if (p_csverbose) -- (void)EMSG(_("E569: maximum number of cscope connections reached")); -- return -1; -+ i = csinfo_size; -+ if (csinfo_size == 0) -+ { -+ /* First time allocation: allocate only 1 connection. It should -+ * be enough for most users. If more is needed, csinfo will be -+ * reallocated. */ -+ csinfo_size = 1; -+ csinfo = (csinfo_T *)alloc_clear(sizeof(csinfo_T)); -+ } -+ else -+ { -+ /* Reallocate space for more connections. */ -+ csinfo_size *= 2; -+ csinfo = vim_realloc(csinfo, sizeof(csinfo_T)*csinfo_size); -+ } -+ if (csinfo == NULL) -+ return -1; -+ for (j = csinfo_size/2; j < csinfo_size; j++) -+ clear_csinfo(j); - } - - if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL) -@@ -1419,10 +1561,9 @@ - * - * nuke em - */ --/* ARGSUSED */ - static int - cs_kill(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - char *stok; - short i; -@@ -1443,15 +1584,14 @@ - /* It must be part of a name. We will try to find a match - * within all the names in the csinfo data structure - */ -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok)) - break; - } - } - -- if ((i >= CSCOPE_MAX_CONNECTIONS || i < -1 || csinfo[i].fname == NULL) -- && i != -1) -+ if ((i != -1) && (i >= csinfo_size || i < -1 || csinfo[i].fname == NULL)) - { - if (p_csverbose) - (void)EMSG2(_("E261: cscope connection %s not found"), stok); -@@ -1460,7 +1600,7 @@ - { - if (i == -1) - { -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (csinfo[i].fname) - cs_kill_execute(i, csinfo[i].fname); -@@ -1720,7 +1860,7 @@ - if (buf == NULL) - return; - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (nummatches_a[i] < 1) - continue; -@@ -1792,7 +1932,7 @@ - if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL) - goto parse_out; - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (nummatches_a[i] < 1) - continue; -@@ -2099,7 +2239,6 @@ - /* - * Used to catch and ignore SIGALRM below. - */ --/* ARGSUSED */ - static RETSIGTYPE - sig_handler SIGDEFARG(sigarg) - { -@@ -2239,19 +2378,21 @@ - * - * calls cs_kill on all cscope connections then reinits - */ --/* ARGSUSED */ - static int - cs_reset(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - char **dblist = NULL, **pplist = NULL, **fllist = NULL; - int i; - char buf[20]; /* for sprintf " (#%d)" */ - -+ if (csinfo_size == 0) -+ return CSCOPE_SUCCESS; -+ - /* malloc our db and ppath list */ -- dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *)); -- pplist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *)); -- fllist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *)); -+ dblist = (char **)alloc(csinfo_size * sizeof(char *)); -+ pplist = (char **)alloc(csinfo_size * sizeof(char *)); -+ fllist = (char **)alloc(csinfo_size * sizeof(char *)); - if (dblist == NULL || pplist == NULL || fllist == NULL) - { - vim_free(dblist); -@@ -2260,7 +2401,7 @@ - return CSCOPE_FAILURE; - } - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - dblist[i] = csinfo[i].fname; - pplist[i] = csinfo[i].ppath; -@@ -2270,7 +2411,7 @@ - } - - /* rebuild the cscope connection list */ -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (dblist[i] != NULL) - { -@@ -2355,10 +2496,9 @@ - * - * show all cscope connections - */ --/* ARGSUSED */ - static int - cs_show(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - short i; - if (cs_cnt_connections() == 0) -@@ -2368,7 +2508,7 @@ - MSG_PUTS_ATTR( - _(" # pid database name prepend path\n"), - hl_attr(HLF_T)); -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - { - if (csinfo[i].fname == NULL) - continue; -@@ -2397,8 +2537,10 @@ - { - int i; - -- for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++) -+ for (i = 0; i < csinfo_size; i++) - cs_release_csp(i, TRUE); -+ vim_free(csinfo); -+ csinfo_size = 0; - } - - #endif /* FEAT_CSCOPE */ -diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h ---- vim72.orig/src/if_cscope.h 2007-09-02 15:51:08.000000000 +0100 -+++ vim72/src/if_cscope.h 2009-07-22 22:54:23.000000000 +0100 -@@ -25,7 +25,6 @@ - - #define CSCOPE_SUCCESS 0 - #define CSCOPE_FAILURE -1 --#define CSCOPE_MAX_CONNECTIONS 8 /* you actually need more? */ - - #define CSCOPE_DBFILE "cscope.out" - #define CSCOPE_PROMPT ">> " -@@ -42,17 +41,6 @@ - * f 7name Find this file - * i 8name Find files #including this file - */ --#define FIND_USAGE "find c|d|e|f|g|i|s|t name" --#define FIND_HELP "\n\ -- c: Find functions calling this function\n\ -- d: Find functions called by this function\n\ -- e: Find this egrep pattern\n\ -- f: Find this file\n\ -- g: Find this definition\n\ -- i: Find files #including this file\n\ -- s: Find this C symbol\n\ -- t: Find assignments to\n" -- - - typedef struct { - char * name; -diff -Naur vim72.orig/src/if_mzsch.c vim72/src/if_mzsch.c ---- vim72.orig/src/if_mzsch.c 2007-07-01 17:44:49.000000000 +0100 -+++ vim72/src/if_mzsch.c 2009-07-22 22:54:23.000000000 +0100 -@@ -4,6 +4,8 @@ - * Original work by Brent Fulgham - * (Based on lots of help from Matthew Flatt) - * -+ * TODO Convert byte-strings to char strings? -+ * - * This consists of six parts: - * 1. MzScheme interpreter main program - * 2. Routines that handle the external interface between MzScheme and -@@ -18,7 +20,7 @@ - * garbage collector will do it self - * 2. Requires at least NORMAL features. I can't imagine why one may want - * to build with SMALL or TINY features but with MzScheme interface. -- * 3. I don't use K&R-style functions. Anyway, MzScheme headers are ANSI. -+ * 3. I don't use K&R-style functions. Anyways, MzScheme headers are ANSI. - */ - - #include "vim.h" -@@ -29,14 +31,15 @@ - * depend". */ - #if defined(FEAT_MZSCHEME) || defined(PROTO) - -+#include -+ - /* Base data structures */ - #define SCHEME_VIMBUFFERP(obj) SAME_TYPE(SCHEME_TYPE(obj), mz_buffer_type) - #define SCHEME_VIMWINDOWP(obj) SAME_TYPE(SCHEME_TYPE(obj), mz_window_type) - - typedef struct - { -- Scheme_Type tag; -- Scheme_Env *env; -+ Scheme_Object so; - buf_T *buf; - } vim_mz_buffer; - -@@ -44,7 +47,7 @@ - - typedef struct - { -- Scheme_Type tag; -+ Scheme_Object so; - win_T *win; - } vim_mz_window; - -@@ -67,19 +70,6 @@ - Scheme_Object *port; - } Port_Info; - --/* info for closed prim */ --/* -- * data have different means: -- * for do_eval it is char* -- * for do_apply is Apply_Onfo* -- * for do_load is Port_Info* -- */ --typedef struct --{ -- void *data; -- Scheme_Env *env; --} Cmd_Info; -- - /* info for do_apply */ - typedef struct - { -@@ -122,7 +112,6 @@ - static Scheme_Object *insert_buffer_line_list(void *, int, Scheme_Object **); - static Scheme_Object *get_range_start(void *, int, Scheme_Object **); - static Scheme_Object *get_range_end(void *, int, Scheme_Object **); --static Scheme_Object *get_buffer_namespace(void *, int, Scheme_Object **); - static vim_mz_buffer *get_vim_curr_buffer(void); - - /* Window-related commands */ -@@ -163,8 +152,6 @@ - static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what); - static void startup_mzscheme(void); - static char *string_to_line(Scheme_Object *obj); --static int mzscheme_io_init(void); --static void mzscheme_interface_init(vim_mz_buffer *self); - static void do_output(char *mesg, long len); - static void do_printf(char *format, ...); - static void do_flush(void); -@@ -174,19 +161,52 @@ - static Scheme_Object *do_eval(void *, int noargc, Scheme_Object **noargv); - static Scheme_Object *do_load(void *, int noargc, Scheme_Object **noargv); - static Scheme_Object *do_apply(void *, int noargc, Scheme_Object **noargv); --static void register_vim_exn(Scheme_Env *env); -+static void register_vim_exn(void); - static vim_mz_buffer *get_buffer_arg(const char *fname, int argnum, - int argc, Scheme_Object **argv); - static vim_mz_window *get_window_arg(const char *fname, int argnum, - int argc, Scheme_Object **argv); --static void add_vim_exn(Scheme_Env *env); - static int line_in_range(linenr_T, buf_T *); - static void check_line_range(linenr_T, buf_T *); - static void mz_fix_cursor(int lo, int hi, int extra); - --static int eval_in_namespace(void *, Scheme_Closed_Prim *, Scheme_Env *, -- Scheme_Object **ret); --static void make_modules(Scheme_Env *); -+static int eval_with_exn_handling(void *, Scheme_Closed_Prim *, -+ Scheme_Object **ret); -+static void make_modules(void); -+static void init_exn_catching_apply(void); -+static int mzscheme_env_main(Scheme_Env *env, int argc, char **argv); -+static int mzscheme_init(void); -+#ifdef FEAT_EVAL -+static Scheme_Object *vim_to_mzscheme(typval_T *vim_value, int depth, -+ Scheme_Hash_Table *visited); -+#endif -+ -+#ifdef MZ_PRECISE_GC -+static int buffer_size_proc(void *obj) -+{ -+ return gcBYTES_TO_WORDS(sizeof(vim_mz_buffer)); -+} -+static int buffer_mark_proc(void *obj) -+{ -+ return buffer_size_proc(obj); -+} -+static int buffer_fixup_proc(void *obj) -+{ -+ return buffer_size_proc(obj); -+} -+static int window_size_proc(void *obj) -+{ -+ return gcBYTES_TO_WORDS(sizeof(vim_mz_window)); -+} -+static int window_mark_proc(void *obj) -+{ -+ return window_size_proc(obj); -+} -+static int window_fixup_proc(void *obj) -+{ -+ return window_size_proc(obj); -+} -+#endif - - #ifdef DYNAMIC_MZSCHEME - -@@ -260,8 +280,6 @@ - (Scheme_Closed_Prim *prim, void *data, const char *name, mzshort mina, - mzshort maxa); - static Scheme_Object *(*dll_scheme_make_integer_value)(long i); --static Scheme_Object *(*dll_scheme_make_namespace)(int argc, -- Scheme_Object *argv[]); - static Scheme_Object *(*dll_scheme_make_pair)(Scheme_Object *car, - Scheme_Object *cdr); - static Scheme_Object *(*dll_scheme_make_prim_w_arity)(Scheme_Prim *prim, -@@ -311,6 +329,17 @@ - static Scheme_Object *(*dll_scheme_char_string_to_path) - (Scheme_Object *s); - # endif -+static Scheme_Hash_Table *(*dll_scheme_make_hash_table)(int type); -+static void (*dll_scheme_hash_set)(Scheme_Hash_Table *table, -+ Scheme_Object *key, Scheme_Object *value); -+static Scheme_Object *(*dll_scheme_hash_get)(Scheme_Hash_Table *table, -+ Scheme_Object *key); -+static Scheme_Object *(*dll_scheme_make_double)(double d); -+# ifdef INCLUDE_MZSCHEME_BASE -+static Scheme_Object *(*dll_scheme_make_sized_byte_string)(char *chars, -+ long len, int copy); -+static Scheme_Object *(*dll_scheme_namespace_require)(Scheme_Object *req); -+# endif - - /* arrays are imported directly */ - # define scheme_eof dll_scheme_eof -@@ -368,7 +397,6 @@ - # define scheme_lookup_global dll_scheme_lookup_global - # define scheme_make_closed_prim_w_arity dll_scheme_make_closed_prim_w_arity - # define scheme_make_integer_value dll_scheme_make_integer_value --# define scheme_make_namespace dll_scheme_make_namespace - # define scheme_make_pair dll_scheme_make_pair - # define scheme_make_prim_w_arity dll_scheme_make_prim_w_arity - # if MZSCHEME_VERSION_MAJOR < 299 -@@ -403,6 +431,14 @@ - # define scheme_char_string_to_path \ - dll_scheme_char_string_to_path - # endif -+# define scheme_make_hash_table dll_scheme_make_hash_table -+# define scheme_hash_set dll_scheme_hash_set -+# define scheme_hash_get dll_scheme_hash_get -+# define scheme_make_double dll_scheme_make_double -+# ifdef INCLUDE_MZSCHEME_BASE -+# define scheme_make_sized_byte_string dll_scheme_make_sized_byte_string -+# define scheme_namespace_require dll_scheme_namespace_require -+# endif - - typedef struct - { -@@ -468,7 +504,6 @@ - {"scheme_make_closed_prim_w_arity", - (void **)&dll_scheme_make_closed_prim_w_arity}, - {"scheme_make_integer_value", (void **)&dll_scheme_make_integer_value}, -- {"scheme_make_namespace", (void **)&dll_scheme_make_namespace}, - {"scheme_make_pair", (void **)&dll_scheme_make_pair}, - {"scheme_make_prim_w_arity", (void **)&dll_scheme_make_prim_w_arity}, - # if MZSCHEME_VERSION_MAJOR < 299 -@@ -502,9 +537,16 @@ - {"scheme_current_config", (void **)&dll_scheme_current_config}, - {"scheme_char_string_to_byte_string", - (void **)&dll_scheme_char_string_to_byte_string}, -- {"scheme_char_string_to_path", -- (void **)&dll_scheme_char_string_to_path}, -+ {"scheme_char_string_to_path", (void **)&dll_scheme_char_string_to_path}, - # endif -+ {"scheme_make_hash_table", (void **)&dll_scheme_make_hash_table}, -+ {"scheme_hash_set", (void **)&dll_scheme_hash_set}, -+ {"scheme_hash_get", (void **)&dll_scheme_hash_get}, -+ {"scheme_make_double", (void **)&dll_scheme_make_double}, -+# ifdef INCLUDE_MZSCHEME_BASE -+ {"scheme_make_sized_byte_string", (void **)&dll_scheme_make_sized_byte_string}, -+ {"scheme_namespace_require", (void **)&dll_scheme_namespace_require}, -+#endif - {NULL, NULL}}; - - static HINSTANCE hMzGC = 0; -@@ -592,6 +634,11 @@ - } - #endif /* DYNAMIC_MZSCHEME */ - -+/* need to put it here for dynamic stuff to work */ -+#ifdef INCLUDE_MZSCHEME_BASE -+# include "mzscheme_base.c" -+#endif -+ - /* - *======================================================================== - * 1. MzScheme interpreter startup -@@ -601,21 +648,22 @@ - static Scheme_Type mz_buffer_type; - static Scheme_Type mz_window_type; - --static int initialized = 0; -+static int initialized = FALSE; - - /* global environment */ - static Scheme_Env *environment = NULL; - /* output/error handlers */ - static Scheme_Object *curout = NULL; - static Scheme_Object *curerr = NULL; --/* vim:exn exception */ -+/* exn:vim exception */ - static Scheme_Object *exn_catching_apply = NULL; - static Scheme_Object *exn_p = NULL; - static Scheme_Object *exn_message = NULL; - static Scheme_Object *vim_exn = NULL; /* Vim Error exception */ -- /* values for exn:vim - constructor, predicate, accessors etc */ --static Scheme_Object *vim_exn_names = NULL; --static Scheme_Object *vim_exn_values = NULL; -+ -+#if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400 -+static void *stack_base = NULL; -+#endif - - static long range_start; - static long range_end; -@@ -667,11 +715,9 @@ - static void CALLBACK - timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) - # elif defined(FEAT_GUI_GTK) --/*ARGSUSED*/ - static gint - timer_proc(gpointer data) - # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) --/* ARGSUSED */ - static void - timer_proc(XtPointer timed_out, XtIntervalId *interval_id) - # elif defined(FEAT_GUI_MAC) -@@ -753,12 +799,64 @@ - #endif - } - -+ void -+mzscheme_main(void) -+{ -+#if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR >= 400 -+ /* use trampoline for precise GC in MzScheme >= 4.x */ -+ scheme_main_setup(TRUE, mzscheme_env_main, 0, NULL); -+#else -+ mzscheme_env_main(NULL, 0, NULL); -+#endif -+} -+ -+ static int -+mzscheme_env_main(Scheme_Env *env, int argc, char **argv) -+{ -+ /* neither argument nor return values are used */ -+#ifdef MZ_PRECISE_GC -+# if MZSCHEME_VERSION_MAJOR < 400 -+ /* -+ * Starting from version 4.x, embedding applications must use -+ * scheme_main_setup/scheme_main_stack_setup trampolines -+ * rather than setting stack base directly with scheme_set_stack_base -+ */ -+ Scheme_Object *dummy = NULL; -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, dummy); -+ -+ stack_base = &__gc_var_stack__; -+# else -+ /* environment has been created by us by Scheme */ -+ environment = env; -+# endif -+ /* -+ * In 4.x, all activities must be performed inside trampoline -+ * so we are forced to initialise GC immediately -+ * This can be postponed in 3.x but I see no point in implementing -+ * a feature which will work in older versions only. -+ * One would better use conservative GC if he needs dynamic MzScheme -+ */ -+ mzscheme_init(); -+#else -+ int dummy = 0; -+ stack_base = (void *)&dummy; -+#endif -+ main_loop(FALSE, FALSE); -+#if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR < 400 -+ /* releasing dummy */ -+ MZ_GC_REG(); -+ MZ_GC_UNREG(); -+#endif -+ return 0; -+} -+ - static void - startup_mzscheme(void) - { -- Scheme_Object *proc_make_security_guard; -- -- scheme_set_stack_base(NULL, 1); -+#if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400 -+ scheme_set_stack_base(stack_base, 1); -+#endif - - MZ_REGISTER_STATIC(environment); - MZ_REGISTER_STATIC(curout); -@@ -767,10 +865,35 @@ - MZ_REGISTER_STATIC(exn_p); - MZ_REGISTER_STATIC(exn_message); - MZ_REGISTER_STATIC(vim_exn); -- MZ_REGISTER_STATIC(vim_exn_names); -- MZ_REGISTER_STATIC(vim_exn_values); - -+#if !defined(MZ_PRECISE_GC) || MZSCHEME_VERSION_MAJOR < 400 -+ /* in newer versions of precise GC the initial env has been created */ - environment = scheme_basic_env(); -+#endif -+ MZ_GC_CHECK(); -+ -+#ifdef INCLUDE_MZSCHEME_BASE -+ { -+ /* -+ * versions 4.x do not provide Scheme bindings by defaults -+ * we need to add them explicitly -+ */ -+ Scheme_Object *scheme_base_symbol = NULL; -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, scheme_base_symbol); -+ MZ_GC_REG(); -+ /* invoke function from generated and included base.c */ -+ declare_modules(environment); -+ scheme_base_symbol = scheme_intern_symbol("scheme/base"); -+ MZ_GC_CHECK(); -+ scheme_namespace_require(scheme_base_symbol); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); -+ } -+#endif -+ register_vim_exn(); -+ /* use new environment to initialise exception handling */ -+ init_exn_catching_apply(); - - /* redirect output */ - scheme_console_output = do_output; -@@ -778,48 +901,131 @@ - - #ifdef MZSCHEME_COLLECTS - /* setup 'current-library-collection-paths' parameter */ -- scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS, -- scheme_make_pair( - # if MZSCHEME_VERSION_MAJOR >= 299 -- scheme_char_string_to_path( -- scheme_byte_string_to_char_string( -- scheme_make_byte_string(MZSCHEME_COLLECTS))), -+ { -+ Scheme_Object *coll_byte_string = NULL; -+ Scheme_Object *coll_char_string = NULL; -+ Scheme_Object *coll_path = NULL; -+ Scheme_Object *coll_pair = NULL; -+ Scheme_Config *config = NULL; -+ -+ MZ_GC_DECL_REG(5); -+ MZ_GC_VAR_IN_REG(0, coll_byte_string); -+ MZ_GC_VAR_IN_REG(1, coll_char_string); -+ MZ_GC_VAR_IN_REG(2, coll_path); -+ MZ_GC_VAR_IN_REG(3, coll_pair); -+ MZ_GC_VAR_IN_REG(4, config); -+ MZ_GC_REG(); -+ coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS); -+ MZ_GC_CHECK(); -+ coll_char_string = scheme_byte_string_to_char_string(coll_byte_string); -+ MZ_GC_CHECK(); -+ coll_path = scheme_char_string_to_path(coll_char_string); -+ MZ_GC_CHECK(); -+ coll_pair = scheme_make_pair(coll_path, scheme_null); -+ MZ_GC_CHECK(); -+ config = scheme_config; -+ MZ_GC_CHECK(); -+ scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); -+ } - # else -- scheme_make_string(MZSCHEME_COLLECTS), -+ { -+ Scheme_Object *coll_string = NULL; -+ Scheme_Object *coll_pair = NULL; -+ Scheme_Config *config = NULL; -+ -+ MZ_GC_DECL_REG(3); -+ MZ_GC_VAR_IN_REG(0, coll_string); -+ MZ_GC_VAR_IN_REG(1, coll_pair); -+ MZ_GC_VAR_IN_REG(2, config); -+ MZ_GC_REG(); -+ coll_string = scheme_make_string(MZSCHEME_COLLECTS); -+ MZ_GC_CHECK(); -+ coll_pair = scheme_make_pair(coll_string, scheme_null); -+ MZ_GC_CHECK(); -+ config = scheme_config; -+ MZ_GC_CHECK(); -+ scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); -+ } - # endif -- scheme_null)); - #endif - #ifdef HAVE_SANDBOX -- /* setup sandbox guards */ -- proc_make_security_guard = scheme_lookup_global( -- scheme_intern_symbol("make-security-guard"), -- environment); -- if (proc_make_security_guard != NULL) -- { -- Scheme_Object *args[3]; -- Scheme_Object *guard; -- args[0] = scheme_get_param(scheme_config, MZCONFIG_SECURITY_GUARD); -- args[1] = scheme_make_prim_w_arity(sandbox_file_guard, -- "sandbox-file-guard", 3, 3); -- args[2] = scheme_make_prim_w_arity(sandbox_network_guard, -- "sandbox-network-guard", 4, 4); -- guard = scheme_apply(proc_make_security_guard, 3, args); -- scheme_set_param(scheme_config, MZCONFIG_SECURITY_GUARD, guard); -+ { -+ Scheme_Object *make_security_guard = NULL; -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, make_security_guard); -+ MZ_GC_REG(); -+ -+#if MZSCHEME_VERSION_MAJOR < 400 -+ { -+ Scheme_Object *make_security_guard_symbol = NULL; -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, make_security_guard_symbol); -+ MZ_GC_REG(); -+ make_security_guard_symbol = scheme_intern_symbol("make-security-guard"); -+ MZ_GC_CHECK(); -+ make_security_guard = scheme_lookup_global( -+ make_security_guard_symbol, environment); -+ MZ_GC_UNREG(); -+ } -+#else -+ make_security_guard = scheme_builtin_value("make-security-guard"); -+ MZ_GC_CHECK(); -+#endif -+ -+ /* setup sandbox guards */ -+ if (make_security_guard != NULL) -+ { -+ Scheme_Object *args[3] = {NULL, NULL, NULL}; -+ Scheme_Object *guard = NULL; -+ Scheme_Config *config = NULL; -+ MZ_GC_DECL_REG(5); -+ MZ_GC_ARRAY_VAR_IN_REG(0, args, 3); -+ MZ_GC_VAR_IN_REG(3, guard); -+ MZ_GC_VAR_IN_REG(4, config); -+ MZ_GC_REG(); -+ config = scheme_config; -+ MZ_GC_CHECK(); -+ args[0] = scheme_get_param(config, MZCONFIG_SECURITY_GUARD); -+ MZ_GC_CHECK(); -+ args[1] = scheme_make_prim_w_arity(sandbox_file_guard, -+ "sandbox-file-guard", 3, 3); -+ args[2] = scheme_make_prim_w_arity(sandbox_network_guard, -+ "sandbox-network-guard", 4, 4); -+ guard = scheme_apply(make_security_guard, 3, args); -+ MZ_GC_CHECK(); -+ scheme_set_param(config, MZCONFIG_SECURITY_GUARD, guard); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); -+ } -+ MZ_GC_UNREG(); - } - #endif - /* Create buffer and window types for use in Scheme code */ - mz_buffer_type = scheme_make_type(""); -+ MZ_GC_CHECK(); - mz_window_type = scheme_make_type(""); -+ MZ_GC_CHECK(); -+#ifdef MZ_PRECISE_GC -+ GC_register_traversers(mz_buffer_type, -+ buffer_size_proc, buffer_mark_proc, buffer_fixup_proc, -+ TRUE, TRUE); -+ GC_register_traversers(mz_window_type, -+ window_size_proc, window_mark_proc, window_fixup_proc, -+ TRUE, TRUE); -+#endif - -- register_vim_exn(environment); -- make_modules(environment); -+ make_modules(); - - /* - * setup callback to receive notifications - * whether thread scheduling is (or not) required - */ - scheme_notify_multithread = notify_multithread; -- initialized = 1; - } - - /* -@@ -829,71 +1035,38 @@ - static int - mzscheme_init(void) - { -- int do_require = FALSE; -- - if (!initialized) - { -- do_require = TRUE; - #ifdef DYNAMIC_MZSCHEME - if (!mzscheme_enabled(TRUE)) - { -- EMSG(_("???: Sorry, this command is disabled, the MzScheme library could not be loaded.")); -+ EMSG(_("E815: Sorry, this command is disabled, the MzScheme libraries could not be loaded.")); - return -1; - } - #endif - startup_mzscheme(); -- -- if (mzscheme_io_init()) -- return -1; -- -+ initialized = TRUE; - } -- /* recreate ports each call effectivelly clearing these ones */ -- curout = scheme_make_string_output_port(); -- curerr = scheme_make_string_output_port(); -- scheme_set_param(scheme_config, MZCONFIG_OUTPUT_PORT, curout); -- scheme_set_param(scheme_config, MZCONFIG_ERROR_PORT, curerr); -- -- if (do_require) -- { -- /* auto-instantiate in basic env */ -- eval_in_namespace("(require (prefix vimext: vimext))", do_eval, -- environment, NULL); -- } -- -- return 0; --} -- --/* -- * This routine fills the namespace with various important routines that can -- * be used within MzScheme. -- */ -- static void --mzscheme_interface_init(vim_mz_buffer *mzbuff) --{ -- Scheme_Object *attach; -- -- mzbuff->env = (Scheme_Env *)scheme_make_namespace(0, NULL); -- -- /* -- * attach instantiated modules from global namespace -- * so they can be easily instantiated in the buffer namespace -- */ -- attach = scheme_lookup_global( -- scheme_intern_symbol("namespace-attach-module"), -- environment); -- -- if (attach != NULL) - { -- Scheme_Object *ret; -- Scheme_Object *args[2]; -- -- args[0] = (Scheme_Object *)environment; -- args[1] = scheme_intern_symbol("vimext"); -- -- ret = (Scheme_Object *)mzvim_apply(attach, 2, args); -+ Scheme_Config *config = NULL; -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, config); -+ MZ_GC_REG(); -+ config = scheme_config; -+ MZ_GC_CHECK(); -+ /* recreate ports each call effectivelly clearing these ones */ -+ curout = scheme_make_string_output_port(); -+ MZ_GC_CHECK(); -+ curerr = scheme_make_string_output_port(); -+ MZ_GC_CHECK(); -+ scheme_set_param(config, MZCONFIG_OUTPUT_PORT, curout); -+ MZ_GC_CHECK(); -+ scheme_set_param(config, MZCONFIG_ERROR_PORT, curerr); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); - } - -- add_vim_exn(mzbuff->env); -+ return 0; - } - - /* -@@ -903,28 +1076,25 @@ - */ - - /* -- * Evaluate command in namespace with exception handling -+ * Evaluate command with exception handling - */ - static int --eval_in_namespace(void *data, Scheme_Closed_Prim *what, Scheme_Env *env, -- Scheme_Object **ret) -+eval_with_exn_handling(void *data, Scheme_Closed_Prim *what, Scheme_Object **ret) - { -- Scheme_Object *value; -- Scheme_Object *exn; -- Cmd_Info info; /* closure info */ -- -- info.data = data; -- info.env = env; -- -- scheme_set_param(scheme_config, MZCONFIG_ENV, -- (Scheme_Object *) env); -- /* -- * ensure all evaluations will be in current buffer namespace, -- * the second argument to scheme_eval_string isn't enough! -- */ -- value = _apply_thunk_catch_exceptions( -- scheme_make_closed_prim_w_arity(what, &info, "mzvim", 0, 0), -- &exn); -+ Scheme_Object *value = NULL; -+ Scheme_Object *exn = NULL; -+ Scheme_Object *prim = NULL; -+ -+ MZ_GC_DECL_REG(3); -+ MZ_GC_VAR_IN_REG(0, value); -+ MZ_GC_VAR_IN_REG(1, exn); -+ MZ_GC_VAR_IN_REG(2, prim); -+ MZ_GC_REG(); -+ -+ prim = scheme_make_closed_prim_w_arity(what, data, "mzvim", 0, 0); -+ MZ_GC_CHECK(); -+ value = _apply_thunk_catch_exceptions(prim, &exn); -+ MZ_GC_CHECK(); - - if (!value) - { -@@ -932,9 +1102,11 @@ - /* Got an exn? */ - if (value) - { -- scheme_display(value, curerr); /* Send to stderr-vim */ -+ scheme_display(value, curerr); /* Send to stderr-vim */ -+ MZ_GC_CHECK(); - do_flush(); - } -+ MZ_GC_UNREG(); - /* `raise' was called on some arbitrary value */ - return FAIL; - } -@@ -943,9 +1115,13 @@ - *ret = value; - /* Print any result, as long as it's not a void */ - else if (!SCHEME_VOIDP(value)) -+ { - scheme_display(value, curout); /* Send to stdout-vim */ -+ MZ_GC_CHECK(); -+ } - - do_flush(); -+ MZ_GC_UNREG(); - return OK; - } - -@@ -959,7 +1135,7 @@ - range_start = eap->line1; - range_end = eap->line2; - -- return eval_in_namespace(data, what, get_vim_curr_buffer()->env, NULL); -+ return eval_with_exn_handling(data, what, NULL); - } - - /* -@@ -976,6 +1152,7 @@ - bp->buf = INVALID_BUFFER_VALUE; - buf->b_mzscheme_ref = NULL; - scheme_gc_ptr_ok(bp); -+ MZ_GC_CHECK(); - } - } - -@@ -992,6 +1169,7 @@ - wp->win = INVALID_WINDOW_VALUE; - win->w_mzscheme_ref = NULL; - scheme_gc_ptr_ok(wp); -+ MZ_GC_CHECK(); - } - } - -@@ -1016,18 +1194,6 @@ - } - } - --/* eval MzScheme string */ -- void * --mzvim_eval_string(char_u *str) --{ -- Scheme_Object *ret = NULL; -- if (mzscheme_init()) -- return FAIL; -- -- eval_in_namespace(str, do_eval, get_vim_curr_buffer()->env, &ret); -- return ret; --} -- - /* - * apply MzScheme procedure with arguments, - * handling errors -@@ -1035,43 +1201,65 @@ - Scheme_Object * - mzvim_apply(Scheme_Object *proc, int argc, Scheme_Object **argv) - { -- Apply_Info data; -- Scheme_Object *ret = NULL; -- - if (mzscheme_init()) - return FAIL; -+ else -+ { -+ Apply_Info data = {NULL, 0, NULL}; -+ Scheme_Object *ret = NULL; - -- data.proc = proc; -- data.argc = argc; -- data.argv = argv; -- -- eval_in_namespace(&data, do_apply, get_vim_curr_buffer()->env, &ret); -- return ret; -+ MZ_GC_DECL_REG(5); -+ MZ_GC_VAR_IN_REG(0, ret); -+ MZ_GC_VAR_IN_REG(1, data.proc); -+ MZ_GC_ARRAY_VAR_IN_REG(2, data.argv, argc); -+ MZ_GC_REG(); -+ -+ data.proc = proc; -+ data.argc = argc; -+ data.argv = argv; -+ -+ eval_with_exn_handling(&data, do_apply, &ret); -+ MZ_GC_UNREG(); -+ return ret; -+ } - } - - static Scheme_Object * - do_load(void *data, int noargc, Scheme_Object **noargv) - { -- Cmd_Info *info = (Cmd_Info *)data; -- Scheme_Object *result = scheme_void; -- Scheme_Object *expr; -- char_u *file = scheme_malloc_fail_ok( -- scheme_malloc_atomic, MAXPATHL + 1); -- Port_Info *pinfo = (Port_Info *)(info->data); -+ Scheme_Object *expr = NULL; -+ Scheme_Object *result = NULL; -+ char *file = NULL; -+ Port_Info *pinfo = (Port_Info *)data; -+ -+ MZ_GC_DECL_REG(3); -+ MZ_GC_VAR_IN_REG(0, expr); -+ MZ_GC_VAR_IN_REG(1, result); -+ MZ_GC_VAR_IN_REG(2, file); -+ MZ_GC_REG(); -+ -+ file = (char *)scheme_malloc_fail_ok(scheme_malloc_atomic, MAXPATHL + 1); -+ MZ_GC_CHECK(); - - /* make Vim expansion */ -- expand_env((char_u *)pinfo->name, file, MAXPATHL); -- /* scheme_load looks strange working with namespaces and error handling*/ -+ expand_env((char_u *)pinfo->name, (char_u *)file, MAXPATHL); - pinfo->port = scheme_open_input_file(file, "mzfile"); -- scheme_count_lines(pinfo->port); /* to get accurate read error location*/ -+ MZ_GC_CHECK(); -+ scheme_count_lines(pinfo->port); /* to get accurate read error location*/ -+ MZ_GC_CHECK(); - - /* Like REPL but print only last result */ - while (!SCHEME_EOFP(expr = scheme_read(pinfo->port))) -- result = scheme_eval(expr, info->env); -+ { -+ result = scheme_eval(expr, environment); -+ MZ_GC_CHECK(); -+ } - - /* errors will be caught in do_mzscheme_comamnd and ex_mzfile */ - scheme_close_input_port(pinfo->port); -+ MZ_GC_CHECK(); - pinfo->port = NULL; -+ MZ_GC_UNREG(); - return result; - } - -@@ -1079,13 +1267,20 @@ - void - ex_mzfile(exarg_T *eap) - { -- Port_Info pinfo; -+ Port_Info pinfo = {NULL, NULL}; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, pinfo.port); -+ MZ_GC_REG(); - - pinfo.name = (char *)eap->arg; -- pinfo.port = NULL; - if (do_mzscheme_command(eap, &pinfo, do_load) != OK - && pinfo.port != NULL) /* looks like port was not closed */ -+ { - scheme_close_input_port(pinfo.port); -+ MZ_GC_CHECK(); -+ } -+ MZ_GC_UNREG(); - } - - -@@ -1105,14 +1300,12 @@ - "(with-handlers ([void (lambda (exn) (cons #f exn))]) " - "(cons #t (thunk))))"; - -- /* make sure we have a namespace with the standard syntax: */ -- Scheme_Env *env = (Scheme_Env *)scheme_make_namespace(0, NULL); -- add_vim_exn(env); -- -- exn_catching_apply = scheme_eval_string(e, env); -- exn_p = scheme_lookup_global(scheme_intern_symbol("exn?"), env); -- exn_message = scheme_lookup_global( -- scheme_intern_symbol("exn-message"), env); -+ exn_catching_apply = scheme_eval_string(e, environment); -+ MZ_GC_CHECK(); -+ exn_p = scheme_builtin_value("exn?"); -+ MZ_GC_CHECK(); -+ exn_message = scheme_builtin_value("exn-message"); -+ MZ_GC_CHECK(); - } - } - -@@ -1126,8 +1319,6 @@ - { - Scheme_Object *v; - -- init_exn_catching_apply(); -- - v = _scheme_apply(exn_catching_apply, 1, &f); - /* v is a pair: (cons #t value) or (cons #f exn) */ - -@@ -1143,8 +1334,6 @@ - static Scheme_Object * - extract_exn_message(Scheme_Object *v) - { -- init_exn_catching_apply(); -- - if (SCHEME_TRUEP(_scheme_apply(exn_p, 1, &v))) - return _scheme_apply(exn_message, 1, &v); - else -@@ -1154,16 +1343,13 @@ - static Scheme_Object * - do_eval(void *s, int noargc, Scheme_Object **noargv) - { -- Cmd_Info *info = (Cmd_Info *)s; -- -- return scheme_eval_string_all((char *)(info->data), info->env, TRUE); -+ return scheme_eval_string_all((char *)s, environment, TRUE); - } - - static Scheme_Object * - do_apply(void *a, int noargc, Scheme_Object **noargv) - { -- Apply_Info *info = (Apply_Info *)(((Cmd_Info *)a)->data); -- -+ Apply_Info *info = (Apply_Info *)a; - return scheme_apply(info->proc, info->argc, info->argv); - } - -@@ -1221,6 +1407,7 @@ - long length; - - buff = scheme_get_sized_string_output(curerr, &length); -+ MZ_GC_CHECK(); - if (length) - { - do_err_output(buff, length); -@@ -1228,17 +1415,11 @@ - } - - buff = scheme_get_sized_string_output(curout, &length); -+ MZ_GC_CHECK(); - if (length) - do_output(buff, length); - } - -- static int --mzscheme_io_init(void) --{ -- /* Nothing needed so far... */ -- return 0; --} -- - /* - *======================================================================== - * 4. Implementation of the Vim Features for MzScheme -@@ -1265,22 +1446,30 @@ - vim_eval(void *data, int argc, Scheme_Object **argv) - { - #ifdef FEAT_EVAL -- Vim_Prim *prim = (Vim_Prim *)data; -- char *expr; -- char *str; -- Scheme_Object *result; -+ Vim_Prim *prim = (Vim_Prim *)data; -+ char *expr; -+ Scheme_Object *result; -+ /* hash table to store visited values to avoid infinite loops */ -+ Scheme_Hash_Table *visited = NULL; -+ typval_T *vim_result; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, visited); -+ MZ_GC_REG(); - -- expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); -+ visited = scheme_make_hash_table(SCHEME_hash_ptr); -+ MZ_GC_CHECK(); - -- str = (char *)eval_to_string((char_u *)expr, NULL, TRUE); -+ expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); -+ vim_result = eval_expr((char_u *)expr, NULL); - -- if (str == NULL) -+ if (vim_result == NULL) - raise_vim_exn(_("invalid expression")); - -- result = scheme_make_string(str); -- -- vim_free(str); -+ result = vim_to_mzscheme(vim_result, 1, visited); -+ free_tv(vim_result); - -+ MZ_GC_UNREG(); - return result; - #else - raise_vim_exn(_("expressions disabled at compile time")); -@@ -1320,7 +1509,7 @@ - Vim_Prim *prim = (Vim_Prim *)data; - char_u *name; - long value; -- char_u *strval; -+ char *strval; - int rc; - Scheme_Object *rval; - int opt_flags = 0; -@@ -1335,6 +1524,7 @@ - { - MZ_REGISTER_STATIC(M_global); - M_global = scheme_intern_symbol("global"); -+ MZ_GC_CHECK(); - } - - if (argv[1] == M_global) -@@ -1356,7 +1546,7 @@ - scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv); - } - -- rc = get_option_value(name, &value, &strval, opt_flags); -+ rc = get_option_value(name, &value, (char_u **)&strval, opt_flags); - curbuf = save_curb; - curwin = save_curw; - -@@ -1366,6 +1556,7 @@ - return scheme_make_integer_value(value); - case 0: - rval = scheme_make_string(strval); -+ MZ_GC_CHECK(); - vim_free(strval); - return rval; - case -1: -@@ -1395,6 +1586,7 @@ - { - MZ_REGISTER_STATIC(M_global); - M_global = scheme_intern_symbol("global"); -+ MZ_GC_CHECK(); - } - - if (argv[1] == M_global) -@@ -1465,7 +1657,10 @@ - - for (w = firstwin; w != NULL; w = w->w_next) - if (w->w_buffer == buf->buf) -+ { - list = scheme_make_pair(window_new(w), list); -+ MZ_GC_CHECK(); -+ } - - return list; - } -@@ -1473,7 +1668,11 @@ - static Scheme_Object * - window_new(win_T *win) - { -- vim_mz_window *self; -+ vim_mz_window *self = NULL; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, self); -+ MZ_GC_REG(); - - /* We need to handle deletion of windows underneath us. - * If we add a "w_mzscheme_ref" field to the win_T structure, -@@ -1487,13 +1686,14 @@ - return win->w_mzscheme_ref; - - self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_window)); -- - vim_memset(self, 0, sizeof(vim_mz_window)); - scheme_dont_gc_ptr(self); /* because win isn't visible to GC */ -+ MZ_GC_CHECK(); - win->w_mzscheme_ref = self; - self->win = win; -- self->tag = mz_window_type; -+ self->so.type = mz_window_type; - -+ MZ_GC_UNREG(); - return (Scheme_Object *)(self); - } - -@@ -1662,7 +1862,6 @@ - /* - *=========================================================================== - * 6. Vim Buffer-related Manipulation Functions -- * Note that each buffer should have its own private namespace. - *=========================================================================== - */ - -@@ -1671,14 +1870,14 @@ - mzscheme_open_buffer(void *data, int argc, Scheme_Object **argv) - { - Vim_Prim *prim = (Vim_Prim *)data; -- char *fname; -+ char_u *fname; - int num = 0; - Scheme_Object *onum; - - #ifdef HAVE_SANDBOX - sandbox_check(); - #endif -- fname = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); -+ fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); - /* TODO make open existing file */ - num = buflist_add(fname, BLN_LISTED | BLN_CURBUF); - -@@ -1714,7 +1913,7 @@ - buf_T *buf; - char_u *fname; - -- fname = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); -+ fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0)); - - for (buf = firstbuf; buf; buf = buf->b_next) - if (buf->b_ffname == NULL || buf->b_sfname == NULL) -@@ -1785,7 +1984,7 @@ - Vim_Prim *prim = (Vim_Prim *)data; - vim_mz_buffer *buf = get_buffer_arg(prim->name, 0, argc, argv); - -- return scheme_make_string(buf->buf->b_ffname); -+ return scheme_make_string((char *)buf->buf->b_ffname); - } - - /* (curr-buff) */ -@@ -1798,7 +1997,11 @@ - static Scheme_Object * - buffer_new(buf_T *buf) - { -- vim_mz_buffer *self; -+ vim_mz_buffer *self = NULL; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, self); -+ MZ_GC_REG(); - - /* We need to handle deletion of buffers underneath us. - * If we add a "b_mzscheme_ref" field to the buf_T structure, -@@ -1808,15 +2011,14 @@ - return buf->b_mzscheme_ref; - - self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_buffer)); -- - vim_memset(self, 0, sizeof(vim_mz_buffer)); -- scheme_dont_gc_ptr(self); /* because buf isn't visible to GC */ -+ scheme_dont_gc_ptr(self); /* because buf isn't visible to GC */ -+ MZ_GC_CHECK(); - buf->b_mzscheme_ref = self; - self->buf = buf; -- self->tag = mz_buffer_type; -- -- mzscheme_interface_init(self); /* Set up namespace */ -+ self->so.type = mz_buffer_type; - -+ MZ_GC_UNREG(); - return (Scheme_Object *)(self); - } - -@@ -1847,14 +2049,14 @@ - Vim_Prim *prim = (Vim_Prim *)data; - vim_mz_buffer *buf; - int linenr; -- char *line; -+ char_u *line; - - buf = get_buffer_arg(prim->name, 1, argc, argv); - linenr = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0)); - line = ml_get_buf(buf->buf, (linenr_T)linenr, FALSE); - - raise_if_error(); -- return scheme_make_string(line); -+ return scheme_make_string((char *)line); - } - - -@@ -1871,7 +2073,11 @@ - Vim_Prim *prim = (Vim_Prim *)data; - vim_mz_buffer *buf; - int i, hi, lo, n; -- Scheme_Object *list; -+ Scheme_Object *list = NULL; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, list); -+ MZ_GC_REG(); - - buf = get_buffer_arg(prim->name, 2, argc, argv); - list = scheme_null; -@@ -1899,8 +2105,9 @@ - - /* Set the list item */ - list = scheme_make_pair(str, list); -+ MZ_GC_CHECK(); - } -- -+ MZ_GC_UNREG(); - return list; - } - -@@ -1927,11 +2134,14 @@ - */ - Vim_Prim *prim = (Vim_Prim *)data; - vim_mz_buffer *buf; -- Scheme_Object *line; -+ Scheme_Object *line = NULL; - char *save; -- buf_T *savebuf; - int n; - -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, line); -+ MZ_GC_REG(); -+ - #ifdef HAVE_SANDBOX - sandbox_check(); - #endif -@@ -1945,7 +2155,8 @@ - - if (SCHEME_FALSEP(line)) - { -- savebuf = curbuf; -+ buf_T *savebuf = curbuf; -+ - curbuf = buf->buf; - - if (u_savedel((linenr_T)n, 1L) == FAIL) -@@ -1958,39 +2169,62 @@ - curbuf = savebuf; - raise_vim_exn(_("cannot delete line")); - } -- deleted_lines_mark((linenr_T)n, 1L); - if (buf->buf == curwin->w_buffer) - mz_fix_cursor(n, n + 1, -1); -+ deleted_lines_mark((linenr_T)n, 1L); - - curbuf = savebuf; - -+ MZ_GC_UNREG(); - raise_if_error(); - return scheme_void; - } -+ else -+ { -+ /* Otherwise it's a line */ -+ buf_T *savebuf = curbuf; - -- /* Otherwise it's a line */ -- save = string_to_line(line); -- savebuf = curbuf; -+ save = string_to_line(line); - -- curbuf = buf->buf; -+ curbuf = buf->buf; -+ -+ if (u_savesub((linenr_T)n) == FAIL) -+ { -+ curbuf = savebuf; -+ vim_free(save); -+ raise_vim_exn(_("cannot save undo information")); -+ } -+ else if (ml_replace((linenr_T)n, (char_u *)save, TRUE) == FAIL) -+ { -+ curbuf = savebuf; -+ vim_free(save); -+ raise_vim_exn(_("cannot replace line")); -+ } -+ else -+ { -+ vim_free(save); -+ changed_bytes((linenr_T)n, 0); -+ } - -- if (u_savesub((linenr_T)n) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot save undo information")); -- } -- else if (ml_replace((linenr_T)n, (char_u *)save, TRUE) == FAIL) -- { - curbuf = savebuf; -- raise_vim_exn(_("cannot replace line")); -- } -- else -- changed_bytes((linenr_T)n, 0); - -- curbuf = savebuf; -+ /* Check that the cursor is not beyond the end of the line now. */ -+ if (buf->buf == curwin->w_buffer) -+ check_cursor_col(); - -- raise_if_error(); -- return scheme_void; -+ MZ_GC_UNREG(); -+ raise_if_error(); -+ return scheme_void; -+ } -+} -+ -+ static void -+free_array(char **array) -+{ -+ char **curr = array; -+ while (*curr != NULL) -+ vim_free(*curr++); -+ vim_free(array); - } - - /* -@@ -2015,15 +2249,15 @@ - * 3. Anything else - this is an error. - */ - Vim_Prim *prim = (Vim_Prim *)data; -- vim_mz_buffer *buf; -- Scheme_Object *line_list; -- Scheme_Object *line; -- Scheme_Object *rest; -- char **array; -- buf_T *savebuf; -+ vim_mz_buffer *buf = NULL; -+ Scheme_Object *line_list = NULL; - int i, old_len, new_len, hi, lo; - long extra; - -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, line_list); -+ MZ_GC_REG(); -+ - #ifdef HAVE_SANDBOX - sandbox_check(); - #endif -@@ -2049,7 +2283,7 @@ - - if (SCHEME_FALSEP(line_list) || SCHEME_NULLP(line_list)) - { -- savebuf = curbuf; -+ buf_T *savebuf = curbuf; - curbuf = buf->buf; - - if (u_savedel((linenr_T)lo, (long)old_len) == FAIL) -@@ -2065,105 +2299,128 @@ - curbuf = savebuf; - raise_vim_exn(_("cannot delete line")); - } -- deleted_lines_mark((linenr_T)lo, (long)old_len); - if (buf->buf == curwin->w_buffer) - mz_fix_cursor(lo, hi, -old_len); -+ deleted_lines_mark((linenr_T)lo, (long)old_len); - } - - curbuf = savebuf; - -+ MZ_GC_UNREG(); - raise_if_error(); - return scheme_void; - } -+ else -+ { -+ buf_T *savebuf = curbuf; - -- /* List */ -- new_len = scheme_proper_list_length(line_list); -- if (new_len < 0) /* improper or cyclic list */ -- scheme_wrong_type(prim->name, "proper list", -- 2, argc, argv); -+ /* List */ -+ new_len = scheme_proper_list_length(line_list); -+ MZ_GC_CHECK(); -+ if (new_len < 0) /* improper or cyclic list */ -+ scheme_wrong_type(prim->name, "proper list", -+ 2, argc, argv); -+ else -+ { -+ char **array = NULL; -+ Scheme_Object *line = NULL; -+ Scheme_Object *rest = NULL; -+ -+ MZ_GC_DECL_REG(2); -+ MZ_GC_VAR_IN_REG(0, line); -+ MZ_GC_VAR_IN_REG(1, rest); -+ MZ_GC_REG(); - -- /* Using MzScheme allocator, so we don't need to free this and -- * can safely keep pointers to GC collected strings -- */ -- array = (char **)scheme_malloc_fail_ok(scheme_malloc, -- (unsigned)(new_len * sizeof(char *))); -+ array = (char **)alloc(new_len * sizeof(char *)); -+ vim_memset(array, 0, new_len * sizeof(char *)); - -- rest = line_list; -- for (i = 0; i < new_len; ++i) -- { -- line = SCHEME_CAR(rest); -- rest = SCHEME_CDR(rest); -- if (!SCHEME_STRINGP(line)) -- scheme_wrong_type(prim->name, "string-list", 2, argc, argv); -- array[i] = string_to_line(line); -- } -+ rest = line_list; -+ for (i = 0; i < new_len; ++i) -+ { -+ line = SCHEME_CAR(rest); -+ rest = SCHEME_CDR(rest); -+ if (!SCHEME_STRINGP(line)) -+ { -+ free_array(array); -+ scheme_wrong_type(prim->name, "string-list", 2, argc, argv); -+ } -+ array[i] = string_to_line(line); -+ } - -- savebuf = curbuf; -- curbuf = buf->buf; -+ curbuf = buf->buf; - -- if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot save undo information")); -- } -+ if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot save undo information")); -+ } - -- /* -- * If the size of the range is reducing (ie, new_len < old_len) we -- * need to delete some old_len. We do this at the start, by -- * repeatedly deleting line "lo". -- */ -- for (i = 0; i < old_len - new_len; ++i) -- { -- if (ml_delete((linenr_T)lo, FALSE) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot delete line")); -- } -- extra--; -- } -+ /* -+ * If the size of the range is reducing (ie, new_len < old_len) we -+ * need to delete some old_len. We do this at the start, by -+ * repeatedly deleting line "lo". -+ */ -+ for (i = 0; i < old_len - new_len; ++i) -+ { -+ if (ml_delete((linenr_T)lo, FALSE) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot delete line")); -+ } -+ extra--; -+ } - -- /* -- * For as long as possible, replace the existing old_len with the -- * new old_len. This is a more efficient operation, as it requires -- * less memory allocation and freeing. -- */ -- for (i = 0; i < old_len && i < new_len; i++) -- if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], TRUE) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot replace line")); -- } -+ /* -+ * For as long as possible, replace the existing old_len with the -+ * new old_len. This is a more efficient operation, as it requires -+ * less memory allocation and freeing. -+ */ -+ for (i = 0; i < old_len && i < new_len; i++) -+ if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], TRUE) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot replace line")); -+ } - -- /* -- * Now we may need to insert the remaining new_len. We don't need to -- * free the string passed back because MzScheme has control of that -- * memory. -- */ -- while (i < new_len) -- { -- if (ml_append((linenr_T)(lo + i - 1), -- (char_u *)array[i], 0, FALSE) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot insert line")); -+ /* -+ * Now we may need to insert the remaining new_len. We don't need to -+ * free the string passed back because MzScheme has control of that -+ * memory. -+ */ -+ while (i < new_len) -+ { -+ if (ml_append((linenr_T)(lo + i - 1), -+ (char_u *)array[i], 0, FALSE) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot insert line")); -+ } -+ ++i; -+ ++extra; -+ } -+ MZ_GC_UNREG(); -+ free_array(array); - } -- ++i; -- ++extra; -- } - -- /* -- * Adjust marks. Invalidate any which lie in the -- * changed range, and move any in the remainder of the buffer. -- */ -- mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra); -- changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); -+ /* -+ * Adjust marks. Invalidate any which lie in the -+ * changed range, and move any in the remainder of the buffer. -+ */ -+ mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), (long)MAXLNUM, (long)extra); -+ changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); - -- if (buf->buf == curwin->w_buffer) -- mz_fix_cursor(lo, hi, extra); -- curbuf = savebuf; -+ if (buf->buf == curwin->w_buffer) -+ mz_fix_cursor(lo, hi, extra); -+ curbuf = savebuf; - -- raise_if_error(); -- return scheme_void; -+ MZ_GC_UNREG(); -+ raise_if_error(); -+ return scheme_void; -+ } - } - - /* -@@ -2181,15 +2438,15 @@ - insert_buffer_line_list(void *data, int argc, Scheme_Object **argv) - { - Vim_Prim *prim = (Vim_Prim *)data; -- vim_mz_buffer *buf; -- Scheme_Object *list; -- Scheme_Object *line; -- Scheme_Object *rest; -- char **array; -- char *str; -- buf_T *savebuf; -+ vim_mz_buffer *buf = NULL; -+ Scheme_Object *list = NULL; -+ char *str = NULL; - int i, n, size; - -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, list); -+ MZ_GC_REG(); -+ - #ifdef HAVE_SANDBOX - sandbox_check(); - #endif -@@ -2208,89 +2465,99 @@ - check_line_range(n, buf->buf); - if (SCHEME_STRINGP(list)) - { -- str = string_to_line(list); -+ buf_T *savebuf = curbuf; - -- savebuf = curbuf; -+ str = string_to_line(list); - curbuf = buf->buf; - - if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL) - { - curbuf = savebuf; -+ vim_free(str); - raise_vim_exn(_("cannot save undo information")); - } - else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL) - { - curbuf = savebuf; -+ vim_free(str); - raise_vim_exn(_("cannot insert line")); - } - else -+ { -+ vim_free(str); - appended_lines_mark((linenr_T)n, 1L); -+ } - - curbuf = savebuf; - update_screen(VALID); - -+ MZ_GC_UNREG(); - raise_if_error(); - return scheme_void; - } - - /* List */ - size = scheme_proper_list_length(list); -+ MZ_GC_CHECK(); - if (size < 0) /* improper or cyclic list */ - scheme_wrong_type(prim->name, "proper list", - 2, argc, argv); -- -- /* Using MzScheme allocator, so we don't need to free this and -- * can safely keep pointers to GC collected strings -- */ -- array = (char **)scheme_malloc_fail_ok( -- scheme_malloc, (unsigned)(size * sizeof(char *))); -- -- rest = list; -- for (i = 0; i < size; ++i) -+ else - { -- line = SCHEME_CAR(rest); -- rest = SCHEME_CDR(rest); -- array[i] = string_to_line(line); -- } -+ Scheme_Object *line = NULL; -+ Scheme_Object *rest = NULL; -+ char **array; -+ buf_T *savebuf = curbuf; -+ -+ MZ_GC_DECL_REG(2); -+ MZ_GC_VAR_IN_REG(0, line); -+ MZ_GC_VAR_IN_REG(1, rest); -+ MZ_GC_REG(); - -- savebuf = curbuf; -- curbuf = buf->buf; -+ array = (char **)alloc(size * sizeof(char *)); -+ vim_memset(array, 0, size * sizeof(char *)); - -- if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot save undo information")); -- } -- else -- { -+ rest = list; - for (i = 0; i < size; ++i) -- if (ml_append((linenr_T)(n + i), (char_u *)array[i], -- 0, FALSE) == FAIL) -- { -- curbuf = savebuf; -- raise_vim_exn(_("cannot insert line")); -- } -+ { -+ line = SCHEME_CAR(rest); -+ rest = SCHEME_CDR(rest); -+ array[i] = string_to_line(line); -+ } - -- if (i > 0) -- appended_lines_mark((linenr_T)n, (long)i); -- } -+ curbuf = buf->buf; - -- curbuf = savebuf; -- update_screen(VALID); -+ if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot save undo information")); -+ } -+ else -+ { -+ for (i = 0; i < size; ++i) -+ if (ml_append((linenr_T)(n + i), (char_u *)array[i], -+ 0, FALSE) == FAIL) -+ { -+ curbuf = savebuf; -+ free_array(array); -+ raise_vim_exn(_("cannot insert line")); -+ } - -+ if (i > 0) -+ appended_lines_mark((linenr_T)n, (long)i); -+ } -+ free_array(array); -+ MZ_GC_UNREG(); -+ curbuf = savebuf; -+ update_screen(VALID); -+ } -+ -+ MZ_GC_UNREG(); - raise_if_error(); - return scheme_void; - } - --/* (get-buff-namespace [buffer]) */ -- static Scheme_Object * --get_buffer_namespace(void *data, int argc, Scheme_Object **argv) --{ -- Vim_Prim *prim = (Vim_Prim *)data; -- -- return (Scheme_Object *)get_buffer_arg(prim->name, 0, argc, argv)->env; --} -- - /* - * Predicates - */ -@@ -2345,40 +2612,172 @@ - /* - * Convert an MzScheme string into a Vim line. - * -- * The result is in allocated memory. All internal nulls are replaced by -- * newline characters. It is an error for the string to contain newline -- * characters. -+ * All internal nulls are replaced by newline characters. -+ * It is an error for the string to contain newline characters. - * -+ * Returns pointer to Vim allocated memory - */ - static char * - string_to_line(Scheme_Object *obj) - { -- char *str; -+ char *scheme_str = NULL; -+ char *vim_str = NULL; - long len; - int i; - -- str = scheme_display_to_string(obj, &len); -+ scheme_str = scheme_display_to_string(obj, &len); - - /* Error checking: String must not contain newlines, as we - * are replacing a single line, and we must replace it with - * a single line. - */ -- if (memchr(str, '\n', len)) -+ if (memchr(scheme_str, '\n', len)) - scheme_signal_error(_("string cannot contain newlines")); - -+ vim_str = (char *)alloc(len + 1); -+ - /* Create a copy of the string, with internal nulls replaced by - * newline characters, as is the vim convention. - */ - for (i = 0; i < len; ++i) - { -- if (str[i] == '\0') -- str[i] = '\n'; -+ if (scheme_str[i] == '\0') -+ vim_str[i] = '\n'; -+ else -+ vim_str[i] = scheme_str[i]; -+ } -+ -+ vim_str[i] = '\0'; -+ -+ MZ_GC_CHECK(); -+ return vim_str; -+} -+ -+#ifdef FEAT_EVAL -+/* -+ * Convert Vim value into MzScheme, adopted from if_python.c -+ */ -+ static Scheme_Object * -+vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited) -+{ -+ Scheme_Object *result = NULL; -+ int new_value = TRUE; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, result); -+ MZ_GC_REG(); -+ -+ /* Avoid infinite recursion */ -+ if (depth > 100) -+ { -+ MZ_GC_UNREG(); -+ return scheme_void; -+ } -+ -+ /* Check if we run into a recursive loop. The item must be in visited -+ * then and we can use it again. -+ */ -+ result = scheme_hash_get(visited, (Scheme_Object *)vim_value); -+ MZ_GC_CHECK(); -+ if (result != NULL) /* found, do nothing */ -+ new_value = FALSE; -+ else if (vim_value->v_type == VAR_STRING) -+ { -+ result = scheme_make_string((char *)vim_value->vval.v_string); -+ MZ_GC_CHECK(); -+ } -+ else if (vim_value->v_type == VAR_NUMBER) -+ { -+ result = scheme_make_integer((long)vim_value->vval.v_number); -+ MZ_GC_CHECK(); -+ } -+# ifdef FEAT_FLOAT -+ else if (vim_value->v_type == VAR_FLOAT) -+ { -+ result = scheme_make_double((double)vim_value->vval.v_float); -+ MZ_GC_CHECK(); -+ } -+# endif -+ else if (vim_value->v_type == VAR_LIST) -+ { -+ list_T *list = vim_value->vval.v_list; -+ listitem_T *curr; -+ -+ if (list == NULL || list->lv_first == NULL) -+ result = scheme_null; -+ else -+ { -+ Scheme_Object *obj = NULL; -+ -+ MZ_GC_DECL_REG(1); -+ MZ_GC_VAR_IN_REG(0, obj); -+ MZ_GC_REG(); -+ -+ curr = list->lv_last; -+ obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited); -+ result = scheme_make_pair(obj, scheme_null); -+ MZ_GC_CHECK(); -+ -+ while (curr != list->lv_first) -+ { -+ curr = curr->li_prev; -+ obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited); -+ result = scheme_make_pair(obj, result); -+ MZ_GC_CHECK(); -+ } -+ } -+ MZ_GC_UNREG(); - } -+ else if (vim_value->v_type == VAR_DICT) -+ { -+ Scheme_Object *key = NULL; -+ Scheme_Object *obj = NULL; -+ -+ MZ_GC_DECL_REG(2); -+ MZ_GC_VAR_IN_REG(0, key); -+ MZ_GC_VAR_IN_REG(1, obj); -+ MZ_GC_REG(); - -- str[i] = '\0'; -+ result = (Scheme_Object *)scheme_make_hash_table(SCHEME_hash_ptr); -+ MZ_GC_CHECK(); -+ if (vim_value->vval.v_dict != NULL) -+ { -+ hashtab_T *ht = &vim_value->vval.v_dict->dv_hashtab; -+ long_u todo = ht->ht_used; -+ hashitem_T *hi; -+ dictitem_T *di; - -- return str; -+ for (hi = ht->ht_array; todo > 0; ++hi) -+ { -+ if (!HASHITEM_EMPTY(hi)) -+ { -+ --todo; -+ -+ di = dict_lookup(hi); -+ obj = vim_to_mzscheme(&di->di_tv, depth + 1, visited); -+ key = scheme_make_string((char *)hi->hi_key); -+ MZ_GC_CHECK(); -+ scheme_hash_set((Scheme_Hash_Table *)result, key, obj); -+ MZ_GC_CHECK(); -+ } -+ } -+ } -+ MZ_GC_UNREG(); -+ } -+ else -+ { -+ result = scheme_void; -+ new_value = FALSE; -+ } -+ if (new_value) -+ { -+ scheme_hash_set(visited, (Scheme_Object *)vim_value, result); -+ MZ_GC_CHECK(); -+ } -+ MZ_GC_UNREG(); -+ return result; - } -+#endif - - /* - * Check to see whether a Vim error has been reported, or a keyboard -@@ -2394,50 +2793,59 @@ - * register Scheme exn:vim - */ - static void --register_vim_exn(Scheme_Env *env) -+register_vim_exn(void) - { -- Scheme_Object *exn_name = scheme_intern_symbol("exn:vim"); -+ int nc = 0; -+ int i; -+ Scheme_Object *struct_exn = NULL; -+ Scheme_Object *exn_name = NULL; -+ -+ MZ_GC_DECL_REG(2); -+ MZ_GC_VAR_IN_REG(0, struct_exn); -+ MZ_GC_VAR_IN_REG(1, exn_name); -+ MZ_GC_REG(); -+ -+ exn_name = scheme_intern_symbol("exn:vim"); -+ MZ_GC_CHECK(); -+ struct_exn = scheme_builtin_value("struct:exn"); -+ MZ_GC_CHECK(); - - if (vim_exn == NULL) - vim_exn = scheme_make_struct_type(exn_name, -- scheme_builtin_value("struct:exn"), NULL, 0, 0, NULL, NULL -+ struct_exn, NULL, 0, 0, NULL, NULL - #if MZSCHEME_VERSION_MAJOR >= 299 - , NULL - #endif - ); - -- if (vim_exn_values == NULL) -- { -- int nc = 0; - -- Scheme_Object **exn_names = scheme_make_struct_names( -- exn_name, scheme_null, 0, &nc); -- Scheme_Object **exn_values = scheme_make_struct_values( -- vim_exn, exn_names, nc, 0); -- -- vim_exn_names = scheme_make_vector(nc, scheme_false); -- vim_exn_values = scheme_make_vector(nc, scheme_false); -- /* remember names and values */ -- mch_memmove(SCHEME_VEC_ELS(vim_exn_names), exn_names, -- nc * sizeof(Scheme_Object *)); -- mch_memmove(SCHEME_VEC_ELS(vim_exn_values), exn_values, -- nc * sizeof(Scheme_Object *)); -+ { -+ Scheme_Object **tmp = NULL; -+ Scheme_Object *exn_names[5] = {NULL, NULL, NULL, NULL, NULL}; -+ Scheme_Object *exn_values[5] = {NULL, NULL, NULL, NULL, NULL}; -+ MZ_GC_DECL_REG(6); -+ MZ_GC_ARRAY_VAR_IN_REG(0, exn_names, 5); -+ MZ_GC_ARRAY_VAR_IN_REG(3, exn_values, 5); -+ MZ_GC_REG(); -+ -+ tmp = scheme_make_struct_names(exn_name, scheme_null, 0, &nc); -+ assert(nc <= 5); -+ mch_memmove(exn_names, tmp, nc * sizeof(Scheme_Object *)); -+ MZ_GC_CHECK(); -+ -+ tmp = scheme_make_struct_values(vim_exn, exn_names, nc, 0); -+ mch_memmove(exn_values, tmp, nc * sizeof(Scheme_Object *)); -+ MZ_GC_CHECK(); -+ -+ for (i = 0; i < nc; i++) -+ { -+ scheme_add_global_symbol(exn_names[i], -+ exn_values[i], environment); -+ MZ_GC_CHECK(); -+ } -+ MZ_GC_UNREG(); - } -- -- add_vim_exn(env); --} -- --/* -- * Add stuff of exn:vim to env -- */ -- static void --add_vim_exn(Scheme_Env *env) --{ -- int i; -- -- for (i = 0; i < SCHEME_VEC_SIZE(vim_exn_values); i++) -- scheme_add_global_symbol(SCHEME_VEC_ELS(vim_exn_names)[i], -- SCHEME_VEC_ELS(vim_exn_values)[i], env); -+ MZ_GC_UNREG(); - } - - /* -@@ -2446,26 +2854,54 @@ - void - raise_vim_exn(const char *add_info) - { -- Scheme_Object *argv[2]; -- char_u *fmt = _("Vim error: ~a"); -+ char *fmt = _("Vim error: ~a"); -+ Scheme_Object *argv[2] = {NULL, NULL}; -+ Scheme_Object *exn = NULL; -+ -+ MZ_GC_DECL_REG(4); -+ MZ_GC_ARRAY_VAR_IN_REG(0, argv, 2); -+ MZ_GC_VAR_IN_REG(3, exn); -+ MZ_GC_REG(); - - if (add_info != NULL) - { -- Scheme_Object *info = scheme_make_string(add_info); -- argv[0] = scheme_byte_string_to_char_string(scheme_make_string( -- scheme_format(fmt, strlen(fmt), 1, &info, NULL))); -+ char *c_string = NULL; -+ Scheme_Object *byte_string = NULL; -+ Scheme_Object *info = NULL; -+ -+ MZ_GC_DECL_REG(3); -+ MZ_GC_VAR_IN_REG(0, c_string); -+ MZ_GC_VAR_IN_REG(1, byte_string); -+ MZ_GC_VAR_IN_REG(2, info); -+ MZ_GC_REG(); -+ -+ info = scheme_make_string(add_info); -+ MZ_GC_CHECK(); -+ c_string = scheme_format(fmt, STRLEN(fmt), 1, &info, NULL); -+ MZ_GC_CHECK(); -+ byte_string = scheme_make_string(c_string); -+ MZ_GC_CHECK(); -+ argv[0] = scheme_byte_string_to_char_string(byte_string); -+ MZ_GC_CHECK(); - SCHEME_SET_IMMUTABLE(argv[0]); -+ MZ_GC_UNREG(); - } - else - argv[0] = scheme_make_string(_("Vim error")); -+ MZ_GC_CHECK(); - - #if MZSCHEME_VERSION_MAJOR < 360 - argv[1] = scheme_current_continuation_marks(); -+ MZ_GC_CHECK(); - #else - argv[1] = scheme_current_continuation_marks(NULL); -+ MZ_GC_CHECK(); - #endif - -- scheme_raise(scheme_make_struct_instance(vim_exn, 2, argv)); -+ exn = scheme_make_struct_instance(vim_exn, 2, argv); -+ MZ_GC_CHECK(); -+ scheme_raise(exn); -+ MZ_GC_UNREG(); - } - - void -@@ -2572,6 +3008,8 @@ - curwin->w_cursor.lnum = lo; - check_cursor(); - } -+ else -+ check_cursor_col(); - changed_cline_bef_curs(); - } - invalidate_botline(); -@@ -2597,7 +3035,6 @@ - {mzscheme_open_buffer, "open-buff", 1, 1}, - {get_buffer_by_name, "get-buff-by-name", 1, 1}, - {get_buffer_by_num, "get-buff-by-num", 1, 1}, -- {get_buffer_namespace, "get-buff-namespace", 0, 1}, - /* - * Window-related commands - */ -@@ -2655,23 +3092,35 @@ - } - - static void --make_modules(Scheme_Env *env) -+make_modules() - { -- int i; -- Scheme_Env *mod; -- -- mod = scheme_primitive_module(scheme_intern_symbol("vimext"), env); -+ int i; -+ Scheme_Env *mod = NULL; -+ Scheme_Object *vimext_symbol = NULL; -+ Scheme_Object *closed_prim = NULL; -+ -+ MZ_GC_DECL_REG(3); -+ MZ_GC_VAR_IN_REG(0, mod); -+ MZ_GC_VAR_IN_REG(1, vimext_symbol); -+ MZ_GC_VAR_IN_REG(2, closed_prim); -+ MZ_GC_REG(); -+ -+ vimext_symbol = scheme_intern_symbol("vimext"); -+ MZ_GC_CHECK(); -+ mod = scheme_primitive_module(vimext_symbol, environment); -+ MZ_GC_CHECK(); - /* all prims made closed so they can access their own names */ -- for (i = 0; i < sizeof(prims)/sizeof(prims[0]); i++) -+ for (i = 0; i < (int)(sizeof(prims)/sizeof(prims[0])); i++) - { - Vim_Prim *prim = prims + i; -- scheme_add_global(prim->name, -- scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name, -- prim->mina, prim->maxa), -- mod); -+ closed_prim = scheme_make_closed_prim_w_arity(prim->prim, prim, prim->name, -+ prim->mina, prim->maxa); -+ scheme_add_global(prim->name, closed_prim, mod); -+ MZ_GC_CHECK(); - } -- scheme_add_global("global-namespace", (Scheme_Object *)environment, mod); - scheme_finish_primitive_module(mod); -+ MZ_GC_CHECK(); -+ MZ_GC_UNREG(); - } - - #ifdef HAVE_SANDBOX -@@ -2699,21 +3148,25 @@ - { - MZ_REGISTER_STATIC(M_write); - M_write = scheme_intern_symbol("write"); -+ MZ_GC_CHECK(); - } - if (M_read == NULL) - { - MZ_REGISTER_STATIC(M_read); - M_read = scheme_intern_symbol("read"); -+ MZ_GC_CHECK(); - } - if (M_execute == NULL) - { - MZ_REGISTER_STATIC(M_execute); - M_execute = scheme_intern_symbol("execute"); -+ MZ_GC_CHECK(); - } - if (M_delete == NULL) - { - MZ_REGISTER_STATIC(M_delete); - M_delete = scheme_intern_symbol("delete"); -+ MZ_GC_CHECK(); - } - - while (!SCHEME_NULLP(requested_access)) -diff -Naur vim72.orig/src/if_mzsch.h vim72/src/if_mzsch.h ---- vim72.orig/src/if_mzsch.h 2006-03-24 16:09:53.000000000 +0000 -+++ vim72/src/if_mzsch.h 2009-07-22 22:54:22.000000000 +0100 -@@ -11,6 +11,7 @@ - - /* #ifdef needed for "make depend" */ - #ifdef FEAT_MZSCHEME -+# include - # include - #endif - -@@ -46,4 +47,31 @@ - # define scheme_byte_string_to_char_string(obj) (obj) - #endif - -+/* Precise GC macros */ -+#ifndef MZ_GC_DECL_REG -+# define MZ_GC_DECL_REG(size) /* empty */ -+#endif -+#ifndef MZ_GC_VAR_IN_REG -+# define MZ_GC_VAR_IN_REG(x, v) /* empty */ -+#endif -+#ifndef MZ_GC_ARRAY_VAR_IN_REG -+# define MZ_GC_ARRAY_VAR_IN_REG(x, v, l) /* empty */ -+#endif -+#ifndef MZ_GC_REG -+# define MZ_GC_REG() /* empty */ -+#endif -+#ifndef MZ_GC_UNREG -+# define MZ_GC_UNREG() /* empty */ -+#endif -+ -+#ifdef MZSCHEME_FORCE_GC -+/* -+ * force garbage collection to check all references are registered -+ * seg faults will indicate not registered refs -+ */ -+# define MZ_GC_CHECK() scheme_collect_garbage(); -+#else -+# define MZ_GC_CHECK() /* empty */ -+#endif -+ - #endif /* _IF_MZSCH_H_ */ -diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs ---- vim72.orig/src/if_perl.xs 2008-07-17 21:55:09.000000000 +0100 -+++ vim72/src/if_perl.xs 2009-07-22 22:54:23.000000000 +0100 -@@ -136,6 +136,9 @@ - # define Perl_newXS_flags dll_Perl_newXS_flags - #endif - # define Perl_sv_free dll_Perl_sv_free -+# if (PERL_REVISION == 5) && (PERL_VERSION >= 10) -+# define Perl_sv_free2 dll_Perl_sv_free2 -+# endif - # define Perl_sv_isa dll_Perl_sv_isa - # define Perl_sv_magic dll_Perl_sv_magic - # define Perl_sv_setiv dll_Perl_sv_setiv -@@ -163,7 +166,7 @@ - # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr - # define boot_DynaLoader dll_boot_DynaLoader - --# define Perl_sys_init3 dll_Perl_sys_init3 -+# define Perl_sys_init dll_Perl_sys_init - # define Perl_sys_term dll_Perl_sys_term - # define Perl_ISv_ptr dll_Perl_ISv_ptr - # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr -@@ -268,7 +271,8 @@ - static void (*boot_DynaLoader)_((pTHX_ CV*)); - - #if (PERL_REVISION == 5) && (PERL_VERSION >= 10) --static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env); -+static void (*Perl_sv_free2)(pTHX_ SV*); -+static void (*Perl_sys_init)(int* argc, char*** argv); - static void (*Perl_sys_term)(void); - static SV** (*Perl_ISv_ptr)(register PerlInterpreter*); - static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*); -@@ -367,7 +371,8 @@ - {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr}, - {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr}, - #else -- {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3}, -+ {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2}, -+ {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init}, - {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term}, - {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr}, - {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr}, -@@ -455,7 +460,7 @@ - static char *argv[] = { "", "-e", "" }; - - #if (PERL_REVISION == 5) && (PERL_VERSION >= 10) -- Perl_sys_init3(&argc, (char***)&argv, NULL); -+ Perl_sys_init(&argc, (char***)&argv); - #endif - perl_interp = perl_alloc(); - perl_construct(perl_interp); -@@ -715,9 +720,11 @@ - #ifdef HAVE_SANDBOX - if (sandbox) - { -+# ifndef MAKE_TEST /* avoid a warning for unreachable code */ - if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe)) - EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module")); - else -+# endif - { - PUSHMARK(SP); - XPUSHs(safe); -@@ -1228,9 +1235,8 @@ - if (u_savedel(lnum, 1) == OK) - { - ml_delete(lnum, 0); -+ check_cursor(); - deleted_lines_mark(lnum, 1L); -- if (aco.save_buf == curbuf) -- check_cursor(); - } - - /* restore curwin/curbuf and a few other things */ -diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c ---- vim72.orig/src/if_python.c 2008-07-17 22:09:32.000000000 +0100 -+++ vim72/src/if_python.c 2009-07-22 22:54:23.000000000 +0100 -@@ -531,6 +531,12 @@ - if (PythonMod_Init()) - goto fail; - -+ /* Remove the element from sys.path that was added because of our -+ * argv[0] value in PythonMod_Init(). Previously we used an empty -+ * string, but dependinding on the OS we then get an empty entry or -+ * the current directory in sys.path. */ -+ PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)"); -+ - /* the first python thread is vim's, release the lock */ - Python_SaveThread(); - -@@ -1090,9 +1096,8 @@ - - /* Vim module - Implementation - */ --/*ARGSUSED*/ - static PyObject * --VimCommand(PyObject *self, PyObject *args) -+VimCommand(PyObject *self UNUSED, PyObject *args) - { - char *cmd; - PyObject *result; -@@ -1145,14 +1150,23 @@ - - /* Check if we run into a recursive loop. The item must be in lookupDict - * then and we can use it again. */ -- sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv); -- result = PyDict_GetItemString(lookupDict, ptrBuf); -- if (result != NULL) -- Py_INCREF(result); -- else if (our_tv->v_type == VAR_STRING) -+ if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL) -+ || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL)) -+ { -+ sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, -+ our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list -+ : (long_u)our_tv->vval.v_dict); -+ result = PyDict_GetItemString(lookupDict, ptrBuf); -+ if (result != NULL) -+ { -+ Py_INCREF(result); -+ return result; -+ } -+ } -+ -+ if (our_tv->v_type == VAR_STRING) - { - result = Py_BuildValue("s", our_tv->vval.v_string); -- PyDict_SetItemString(lookupDict, ptrBuf, result); - } - else if (our_tv->v_type == VAR_NUMBER) - { -@@ -1161,7 +1175,6 @@ - /* For backwards compatibility numbers are stored as strings. */ - sprintf(buf, "%ld", (long)our_tv->vval.v_number); - result = Py_BuildValue("s", buf); -- PyDict_SetItemString(lookupDict, ptrBuf, result); - } - # ifdef FEAT_FLOAT - else if (our_tv->v_type == VAR_FLOAT) -@@ -1170,7 +1183,6 @@ - - sprintf(buf, "%f", our_tv->vval.v_float); - result = Py_BuildValue("s", buf); -- PyDict_SetItemString(lookupDict, ptrBuf, result); - } - # endif - else if (our_tv->v_type == VAR_LIST) -@@ -1179,10 +1191,11 @@ - listitem_T *curr; - - result = PyList_New(0); -- PyDict_SetItemString(lookupDict, ptrBuf, result); - - if (list != NULL) - { -+ PyDict_SetItemString(lookupDict, ptrBuf, result); -+ - for (curr = list->lv_first; curr != NULL; curr = curr->li_next) - { - newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict); -@@ -1194,7 +1207,6 @@ - else if (our_tv->v_type == VAR_DICT) - { - result = PyDict_New(); -- PyDict_SetItemString(lookupDict, ptrBuf, result); - - if (our_tv->vval.v_dict != NULL) - { -@@ -1203,6 +1215,8 @@ - hashitem_T *hi; - dictitem_T *di; - -+ PyDict_SetItemString(lookupDict, ptrBuf, result); -+ - for (hi = ht->ht_array; todo > 0; ++hi) - { - if (!HASHITEM_EMPTY(hi)) -@@ -1227,9 +1241,8 @@ - } - #endif - --/*ARGSUSED*/ - static PyObject * --VimEval(PyObject *self, PyObject *args) -+VimEval(PyObject *self UNUSED, PyObject *args) - { - #ifdef FEAT_EVAL - char *expr; -@@ -1879,9 +1892,8 @@ - /* Buffer list object - Implementation - */ - --/*ARGSUSED*/ - static PyInt --BufListLength(PyObject *self) -+BufListLength(PyObject *self UNUSED) - { - buf_T *b = firstbuf; - PyInt n = 0; -@@ -1895,9 +1907,8 @@ - return n; - } - --/*ARGSUSED*/ - static PyObject * --BufListItem(PyObject *self, PyInt n) -+BufListItem(PyObject *self UNUSED, PyInt n) - { - buf_T *b; - -@@ -2195,9 +2206,8 @@ - - /* Window list object - Implementation - */ --/*ARGSUSED*/ - static PyInt --WinListLength(PyObject *self) -+WinListLength(PyObject *self UNUSED) - { - win_T *w = firstwin; - PyInt n = 0; -@@ -2211,9 +2221,8 @@ - return n; - } - --/*ARGSUSED*/ - static PyObject * --WinListItem(PyObject *self, PyInt n) -+WinListItem(PyObject *self UNUSED, PyInt n) - { - win_T *w; - -@@ -2259,9 +2268,8 @@ - - /* Current items object - Implementation - */ --/*ARGSUSED*/ - static PyObject * --CurrentGetattr(PyObject *self, char *name) -+CurrentGetattr(PyObject *self UNUSED, char *name) - { - if (strcmp(name, "buffer") == 0) - return (PyObject *)BufferNew(curbuf); -@@ -2280,9 +2288,8 @@ - } - } - --/*ARGSUSED*/ - static int --CurrentSetattr(PyObject *self, char *name, PyObject *value) -+CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *value) - { - if (strcmp(name, "line") == 0) - { -@@ -2345,7 +2352,8 @@ - { - PyObject *mod; - PyObject *dict; -- static char *(argv[2]) = {"", NULL}; -+ /* The special value is removed from sys.path in Python_Init(). */ -+ static char *(argv[2]) = {"/must>not&exist/foo", NULL}; - - /* Fixups... */ - BufferType.ob_type = &PyType_Type; -@@ -2489,9 +2497,9 @@ - PyErr_SetVim(_("cannot delete line")); - else - { -- deleted_lines_mark((linenr_T)n, 1L); - if (buf == curwin->w_buffer) - py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1); -+ deleted_lines_mark((linenr_T)n, 1L); - } - - curbuf = savebuf; -@@ -2588,10 +2596,9 @@ - break; - } - } -- deleted_lines_mark((linenr_T)lo, (long)i); -- - if (buf == curwin->w_buffer) - py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); -+ deleted_lines_mark((linenr_T)lo, (long)i); - } - - curbuf = savebuf; -diff -Naur vim72.orig/src/if_ruby.c vim72/src/if_ruby.c ---- vim72.orig/src/if_ruby.c 2007-09-10 09:40:38.000000000 +0100 -+++ vim72/src/if_ruby.c 2009-07-22 22:54:22.000000000 +0100 -@@ -492,7 +492,7 @@ - } - } - --static VALUE vim_message(VALUE self, VALUE str) -+static VALUE vim_message(VALUE self UNUSED, VALUE str) - { - char *buff, *p; - -@@ -505,20 +505,20 @@ - return Qnil; - } - --static VALUE vim_set_option(VALUE self, VALUE str) -+static VALUE vim_set_option(VALUE self UNUSED, VALUE str) - { - do_set((char_u *)STR2CSTR(str), 0); - update_screen(NOT_VALID); - return Qnil; - } - --static VALUE vim_command(VALUE self, VALUE str) -+static VALUE vim_command(VALUE self UNUSED, VALUE str) - { - do_cmdline_cmd((char_u *)STR2CSTR(str)); - return Qnil; - } - --static VALUE vim_evaluate(VALUE self, VALUE str) -+static VALUE vim_evaluate(VALUE self UNUSED, VALUE str) - { - #ifdef FEAT_EVAL - char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE); -@@ -580,7 +580,7 @@ - return INT2NUM(n); - } - --static VALUE buffer_s_aref(VALUE self, VALUE num) -+static VALUE buffer_s_aref(VALUE self UNUSED, VALUE num) - { - buf_T *b; - int n = NUM2INT(num); -@@ -629,7 +629,9 @@ - return line ? rb_str_new2(line) : Qnil; - } - rb_raise(rb_eIndexError, "index %d out of buffer", n); -+#ifndef __GNUC__ - return Qnil; /* For stop warning */ -+#endif - } - - static VALUE buffer_aref(VALUE self, VALUE num) -@@ -668,7 +670,9 @@ - else - { - rb_raise(rb_eIndexError, "index %d out of buffer", n); -+#ifndef __GNUC__ - return Qnil; /* For stop warning */ -+#endif - } - return str; - } -@@ -789,7 +793,7 @@ - return get_buffer_line(curbuf, curwin->w_cursor.lnum); - } - --static VALUE set_current_line(VALUE self, VALUE str) -+static VALUE set_current_line(VALUE self UNUSED, VALUE str) - { - return set_buffer_line(curbuf, curwin->w_cursor.lnum, str); - } -@@ -815,7 +819,7 @@ - #endif - } - --static VALUE window_s_aref(VALUE self, VALUE num) -+static VALUE window_s_aref(VALUE self UNUSED, VALUE num) - { - win_T *w; - int n = NUM2INT(num); -@@ -897,7 +901,7 @@ - return Qnil; - } - --static VALUE f_p(int argc, VALUE *argv, VALUE self) -+static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED) - { - int i; - VALUE str = rb_str_new("", 0); -diff -Naur vim72.orig/src/if_tcl.c vim72/src/if_tcl.c ---- vim72.orig/src/if_tcl.c 2007-05-07 20:50:14.000000000 +0100 -+++ vim72/src/if_tcl.c 2009-07-22 22:54:22.000000000 +0100 -@@ -161,7 +161,7 @@ - # endif - - /* -- * Declare HANDLE for perl.dll and function pointers. -+ * Declare HANDLE for tcl.dll and function pointers. - */ - static HANDLE hTclLib = NULL; - Tcl_Interp* (*dll_Tcl_CreateInterp)(); -@@ -182,7 +182,7 @@ - * Make all runtime-links of tcl. - * - * 1. Get module handle using LoadLibraryEx. -- * 2. Get pointer to perl function by GetProcAddress. -+ * 2. Get pointer to tcl function by GetProcAddress. - * 3. Repeat 2, until get all functions will be used. - * - * Parameter 'libname' provides name of DLL. -@@ -290,10 +290,9 @@ - */ - #define TCL_EXIT 5 - --/* ARGSUSED */ - static int - exitcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -315,10 +314,9 @@ - return TCL_ERROR; - } - --/* ARGSUSED */ - static int - catchcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -356,10 +354,9 @@ - /* - * "::vim::beep" - what Vi[m] does best :-) - */ --/* ARGSUSED */ - static int - beepcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -378,10 +375,9 @@ - * "::vim::buffer {N}" - create buffer command for buffer N. - * "::vim::buffer new" - create a new buffer (not implemented) - */ --/* ARGSUSED */ - static int - buffercmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -475,10 +471,9 @@ - /* - * "::vim::window list" - create list of window commands. - */ --/* ARGSUSED */ - static int - windowcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -1130,10 +1125,9 @@ - } - - --/* ARGSUSED */ - static int - commandcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -1145,10 +1139,9 @@ - return err; - } - --/* ARGSUSED */ - static int - optioncmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -1160,10 +1153,9 @@ - return err; - } - --/* ARGSUSED */ - static int - exprcmd(dummy, interp, objc, objv) -- ClientData dummy; -+ ClientData dummy UNUSED; - Tcl_Interp *interp; - int objc; - Tcl_Obj *CONST objv[]; -@@ -1584,11 +1576,10 @@ - I/O Channel - ********************************************/ - --/* ARGSUSED */ - static int - channel_close(instance, interp) - ClientData instance; -- Tcl_Interp *interp; -+ Tcl_Interp *interp UNUSED; - { - int err = 0; - -@@ -1602,12 +1593,11 @@ - return err; - } - --/* ARGSUSED */ - static int - channel_input(instance, buf, bufsiz, errptr) -- ClientData instance; -- char *buf; -- int bufsiz; -+ ClientData instance UNUSED; -+ char *buf UNUSED; -+ int bufsiz UNUSED; - int *errptr; - { - -@@ -1659,21 +1649,19 @@ - return result; - } - --/* ARGSUSED */ - static void - channel_watch(instance, mask) -- ClientData instance; -- int mask; -+ ClientData instance UNUSED; -+ int mask UNUSED; - { - Tcl_SetErrno(EINVAL); - } - --/* ARGSUSED */ - static int - channel_gethandle(instance, direction, handleptr) -- ClientData instance; -- int direction; -- ClientData *handleptr; -+ ClientData instance UNUSED; -+ int direction UNUSED; -+ ClientData *handleptr UNUSED; - { - Tcl_SetErrno(EINVAL); - return EINVAL; -@@ -1682,16 +1670,31 @@ - - static Tcl_ChannelType channel_type = - { -- "vimmessage", -- NULL, /* blockmode */ -- channel_close, -- channel_input, -- channel_output, -- NULL, /* seek */ -- NULL, /* set option */ -- NULL, /* get option */ -- channel_watch, -- channel_gethandle -+ "vimmessage", /* typeName */ -+ NULL, /* version */ -+ channel_close, /* closeProc */ -+ channel_input, /* inputProc */ -+ channel_output, /* outputProc */ -+ NULL, /* seekProc */ -+ NULL, /* setOptionProc */ -+ NULL, /* getOptionProc */ -+ channel_watch, /* watchProc */ -+ channel_gethandle, /* getHandleProc */ -+ NULL, /* close2Proc */ -+ NULL, /* blockModeProc */ -+#ifdef TCL_CHANNEL_VERSION_2 -+ NULL, /* flushProc */ -+ NULL, /* handlerProc */ -+#endif -+#ifdef TCL_CHANNEL_VERSION_3 -+ NULL, /* wideSeekProc */ -+#endif -+#ifdef TCL_CHANNEL_VERSION_4 -+ NULL, /* threadActionProc */ -+#endif -+#ifdef TCL_CHANNEL_VERSION_5 -+ NULL /* truncateProc */ -+#endif - }; - - /********************************** -diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c ---- vim72.orig/src/if_xcmdsrv.c 2008-07-18 14:05:03.000000000 +0100 -+++ vim72/src/if_xcmdsrv.c 2009-07-22 22:54:22.000000000 +0100 -@@ -682,7 +682,7 @@ - * Scan all of the names out of the property. - */ - ga_init2(&ga, 1, 100); -- for (p = regProp; (p - regProp) < numItems; p++) -+ for (p = regProp; (long_u)(p - regProp) < numItems; p++) - { - entry = p; - while (*p != 0 && !isspace(*p)) -@@ -736,7 +736,7 @@ - + serverReply.ga_len; - e.id = w; - ga_init2(&e.strings, 1, 100); -- memcpy(p, &e, sizeof(e)); -+ mch_memmove(p, &e, sizeof(e)); - serverReply.ga_len++; - } - } -@@ -969,7 +969,7 @@ - */ - returnValue = (int_u)None; - entry = NULL; /* Not needed, but eliminates compiler warning. */ -- for (p = regProp; (p - regProp) < numItems; ) -+ for (p = regProp; (long_u)(p - regProp) < numItems; ) - { - entry = p; - while (*p != 0 && !isspace(*p)) -@@ -986,7 +986,7 @@ - - if (loose != NULL && returnValue == (int_u)None && !IsSerialName(name)) - { -- for (p = regProp; (p - regProp) < numItems; ) -+ for (p = regProp; (long_u)(p - regProp) < numItems; ) - { - entry = p; - while (*p != 0 && !isspace(*p)) -@@ -1018,7 +1018,7 @@ - p++; - count = numItems - (p - regProp); - if (count > 0) -- memcpy(entry, p, count); -+ mch_memmove(entry, p, count); - XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING, - 8, PropModeReplace, regProp, - (int)(numItems - (p - entry))); -@@ -1056,7 +1056,7 @@ - return; - - /* Scan the property for the window id. */ -- for (p = regProp; (p - regProp) < numItems; ) -+ for (p = regProp; (long_u)(p - regProp) < numItems; ) - { - if (*p != 0) - { -@@ -1072,7 +1072,7 @@ - p++; - lastHalf = numItems - (p - regProp); - if (lastHalf > 0) -- memcpy(entry, p, lastHalf); -+ mch_memmove(entry, p, lastHalf); - numItems = (entry - regProp) + lastHalf; - p = entry; - continue; -@@ -1196,7 +1196,7 @@ - * one time; each iteration through the outer loop handles a - * single command or result. - */ -- for (p = propInfo; (p - propInfo) < numItems; ) -+ for (p = propInfo; (long_u)(p - propInfo) < numItems; ) - { - /* - * Ignore leading NULs; each command or result starts with a -@@ -1230,7 +1230,7 @@ - serial = (char_u *)""; - script = NULL; - enc = NULL; -- while (p - propInfo < numItems && *p == '-') -+ while ((long_u)(p - propInfo) < numItems && *p == '-') - { - switch (p[1]) - { -@@ -1333,7 +1333,7 @@ - res = (char_u *)""; - code = 0; - enc = NULL; -- while ((p-propInfo) < numItems && *p == '-') -+ while ((long_u)(p - propInfo) < numItems && *p == '-') - { - switch (p[1]) - { -@@ -1401,7 +1401,7 @@ - gotWindow = 0; - str = (char_u *)""; - enc = NULL; -- while ((p-propInfo) < numItems && *p == '-') -+ while ((long_u)(p - propInfo) < numItems && *p == '-') - { - switch (p[1]) - { -@@ -1489,11 +1489,10 @@ - /* - * Another X Error handler, just used to check for errors. - */ --/* ARGSUSED */ - static int - x_error_check(dpy, error_event) -- Display *dpy; -- XErrorEvent *error_event; -+ Display *dpy UNUSED; -+ XErrorEvent *error_event UNUSED; - { - got_x_error = TRUE; - return 0; -diff -Naur vim72.orig/src/macros.h vim72/src/macros.h ---- vim72.orig/src/macros.h 2007-08-04 12:44:18.000000000 +0100 -+++ vim72/src/macros.h 2009-07-22 22:54:22.000000000 +0100 -@@ -127,15 +127,31 @@ - #ifdef FEAT_LANGMAP - /* - * Adjust chars in a language according to 'langmap' option. -- * NOTE that there is NO overhead if 'langmap' is not set; but even -- * when set we only have to do 2 ifs and an array lookup. -+ * NOTE that there is no noticeable overhead if 'langmap' is not set. -+ * When set the overhead for characters < 256 is small. - * Don't apply 'langmap' if the character comes from the Stuff buffer. - * The do-while is just to ignore a ';' after the macro. - */ --# define LANGMAP_ADJUST(c, condition) do { \ -- if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \ -- c = langmap_mapchar[c]; \ -+# ifdef FEAT_MBYTE -+# define LANGMAP_ADJUST(c, condition) \ -+ do { \ -+ if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0) \ -+ { \ -+ if ((c) < 256) \ -+ c = langmap_mapchar[c]; \ -+ else \ -+ c = langmap_adjust_mb(c); \ -+ } \ - } while (0) -+# else -+# define LANGMAP_ADJUST(c, condition) \ -+ do { \ -+ if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \ -+ c = langmap_mapchar[c]; \ -+ } while (0) -+# endif -+#else -+# define LANGMAP_ADJUST(c, condition) /* nop */ - #endif - - /* -@@ -268,7 +284,7 @@ - # define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p)) - - # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++ --# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : STRLEN(p)) -+# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : (int)STRLEN(p)) - # define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : (int)*(p)) - #else - # define mb_ptr_adv(p) ++p -diff -Naur vim72.orig/src/main.c vim72/src/main.c ---- vim72.orig/src/main.c 2008-07-24 09:40:56.000000000 +0100 -+++ vim72/src/main.c 2009-07-22 22:54:22.000000000 +0100 -@@ -645,11 +645,12 @@ - - #ifdef FEAT_VIMINFO - /* -- * Read in registers, history etc, but not marks, from the viminfo file -+ * Read in registers, history etc, but not marks, from the viminfo file. -+ * This is where v:oldfiles gets filled. - */ - if (*p_viminfo != NUL) - { -- read_viminfo(NULL, TRUE, FALSE, FALSE); -+ read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES); - TIME_MSG("reading viminfo"); - } - #endif -@@ -934,8 +935,14 @@ - - /* - * Call the main command loop. This never returns. -+ * For embedded MzScheme the main_loop will be called by Scheme -+ * for proper stack tracking - */ -+#ifndef FEAT_MZSCHEME - main_loop(FALSE, FALSE); -+#else -+ mzscheme_main(); -+#endif - - return 0; - } -@@ -1457,7 +1464,8 @@ - ++initstr; - } - -- if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k') -+ /* "gvim" starts the GUI. Also accept "Gvim" for MS-Windows. */ -+ if (TOLOWER_ASC(initstr[0]) == 'g') - { - main_start_gui(); - #ifdef FEAT_GUI -@@ -1503,12 +1511,12 @@ - * - * Also find the --server... arguments and --socketid and --windowid - */ --/*ARGSUSED*/ - static void - early_arg_scan(parmp) -- mparm_T *parmp; -+ mparm_T *parmp UNUSED; - { --#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) -+#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \ -+ || !defined(FEAT_NETBEANS_INTG) - int argc = parmp->argc; - char **argv = parmp->argv; - int i; -@@ -1580,6 +1588,14 @@ - else if (STRICMP(argv[i], "--echo-wid") == 0) - echo_wid_arg = TRUE; - # endif -+# ifndef FEAT_NETBEANS_INTG -+ else if (strncmp(argv[i], "-nb", (size_t)3) == 0) -+ { -+ mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n")); -+ mch_exit(2); -+ } -+# endif -+ - } - #endif - } -@@ -2361,7 +2377,7 @@ - * Is there any other system that cannot do this? - */ - close(0); -- dup(2); -+ ignored = dup(2); - #endif - } - -@@ -2369,10 +2385,9 @@ - * Create the requested number of windows and edit buffers in them. - * Also does recovery if "recoverymode" set. - */ --/*ARGSUSED*/ - static void - create_windows(parmp) -- mparm_T *parmp; -+ mparm_T *parmp UNUSED; - { - #ifdef FEAT_WINDOWS - int dorewind; -@@ -2586,7 +2601,7 @@ - # endif - (void)do_ecmd(0, arg_idx < GARGCOUNT - ? alist_name(&GARGLIST[arg_idx]) : NULL, -- NULL, NULL, ECMD_LASTL, ECMD_HIDE); -+ NULL, NULL, ECMD_LASTL, ECMD_HIDE, curwin); - # ifdef HAS_SWAP_EXISTS_ACTION - if (swap_exists_did_quit) - { -@@ -3840,10 +3855,9 @@ - * return an allocated string. Otherwise return "data". - * "*tofree" is set to the result when it needs to be freed later. - */ --/*ARGSUSED*/ - char_u * - serverConvert(client_enc, data, tofree) -- char_u *client_enc; -+ char_u *client_enc UNUSED; - char_u *data; - char_u **tofree; - { -diff -Naur vim72.orig/src/Makefile vim72/src/Makefile ---- vim72.orig/src/Makefile 2008-08-09 15:50:04.000000000 +0100 -+++ vim72/src/Makefile 2009-07-22 22:54:22.000000000 +0100 -@@ -105,8 +105,8 @@ - # 4. "make test" {{{1 - # This is optional. This will run Vim scripts on a number of test - # files, and compare the produced output with the expected output. --# If all is well, you will get the "ALL DONE" message in the end. See --# below (search for "/^test"). -+# If all is well, you will get the "ALL DONE" message in the end. If a -+# test fails you get "TEST FAILURE". See below (search for "/^test"). - # - # 5. "make install" {{{1 - # If the new Vim seems to be working OK you can install it and the -@@ -533,6 +533,11 @@ - #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes - #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes - -+# Use this with GCC to check for mistakes, unused arguments, etc. -+#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -+#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers -+#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter -+ - # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond - # allocated memory (and makes every malloc()/free() very slow). - # Electric Fence is free (search ftp sites). -@@ -551,7 +556,13 @@ - # }}} - - # LINT - for running lint -+# For standard Unix lint -+LINT = lint - LINT_OPTIONS = -beprxzF -+# For splint -+# It doesn't work well, crashes on include files and non-ascii characters. -+#LINT = splint -+#LINT_OPTIONS = +unixlib -weak -macrovarprefixexclude -showfunc -linelen 9999 - - # PROFILING - Uncomment the next two lines to do profiling with gcc and gprof. - # Might not work with GUI or Perl. -@@ -1259,16 +1270,16 @@ - # This is for cproto 3 patchlevel 8 or below - # __inline, __attribute__ and __extension__ are not recognized by cproto - # G_IMPLEMENT_INLINES is to avoid functions defined in glib/gutils.h. --NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \ -- -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \ -- -D__extension__= -D__restrict="" \ -- -D__gnuc_va_list=char -D__builtin_va_list=char -+#NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \ -+# -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \ -+# -D__extension__= -D__restrict="" \ -+# -D__gnuc_va_list=char -D__builtin_va_list=char - - # --# This is for cproto 3 patchlevel 9 or above (currently 4.6) -+# This is for cproto 3 patchlevel 9 or above (currently 4.6, 4.7g) - # __inline and __attribute__ are now recognized by cproto - # -D"foo()=" is not supported by all compilers so do not use it --# NO_ATTR= -+NO_ATTR= - # - # maybe the "/usr/bin/cc -E" has to be adjusted for some systems - # This is for cproto 3.5 patchlevel 3: -@@ -1432,6 +1443,7 @@ - $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC) - #LINT_SRC = $(SRC) - #LINT_SRC = $(ALL_SRC) -+#LINT_SRC = $(BASIC_SRC) - - OBJ = \ - objects/buffer.o \ -@@ -1737,7 +1749,8 @@ - # messages. Don't worry about that. - # If there is a real error, there will be a difference between "test.out" and - # a "test99.ok" file. --# If everything is alright, the final message will be "ALL DONE". -+# If everything is alright, the final message will be "ALL DONE". If not you -+# get "TEST FAILURE". - # - test check: - $(MAKE) -f Makefile $(VIMTARGET) -@@ -2187,6 +2200,7 @@ - -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c - -rm -f conftest* *~ auto/link.sed - -rm -rf $(APPDIR) -+ -rm -rf mzscheme_base.c - if test -d $(PODIR); then \ - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ - fi -@@ -2272,12 +2286,12 @@ - - # Run lint. Clean up the *.ln files that are sometimes left behind. - lint: -- lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC) -+ $(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC) - -rm -f *.ln - - # Check dosinst.c with lint. - lintinstall: -- lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c -+ $(LINT) $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c - -rm -f dosinst.ln - - ########################################################################### -@@ -2420,8 +2434,11 @@ - objects/if_xcmdsrv.o: if_xcmdsrv.c - $(CCC) -o $@ if_xcmdsrv.c - --objects/if_mzsch.o: if_mzsch.c -- $(CCC) -o $@ if_mzsch.c -+objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA) -+ $(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c -+ -+mzscheme_base.c: -+ $(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base - - objects/if_perl.o: auto/if_perl.c - $(CCC) -o $@ auto/if_perl.c -@@ -2430,7 +2447,7 @@ - $(CCC) -o $@ if_perlsfio.c - - objects/if_python.o: if_python.c -- $(CCC) -o $@ if_python.c -+ $(CCC) -o $@ $(PYTHON_CFLAGS_EXTRA) if_python.c - - objects/if_ruby.o: if_ruby.c - $(CCC) -o $@ if_ruby.c -diff -Naur vim72.orig/src/mark.c vim72/src/mark.c ---- vim72.orig/src/mark.c 2008-08-08 23:06:49.000000000 +0100 -+++ vim72/src/mark.c 2009-07-22 22:54:22.000000000 +0100 -@@ -884,10 +884,9 @@ - /* - * print the jumplist - */ --/*ARGSUSED*/ - void - ex_jumps(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int i; - char_u *name; -@@ -933,10 +932,9 @@ - /* - * print the changelist - */ --/*ARGSUSED*/ - void - ex_changes(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int i; - char_u *name; -@@ -1023,6 +1021,9 @@ - int fnum = curbuf->b_fnum; - linenr_T *lp; - win_T *win; -+#ifdef FEAT_WINDOWS -+ tabpage_T *tab; -+#endif - - if (line2 < line1 && amount_after == 0L) /* nothing to do */ - return; -@@ -1064,7 +1065,7 @@ - /* quickfix marks */ - qf_mark_adjust(NULL, line1, line2, amount, amount_after); - /* location lists */ -- FOR_ALL_WINDOWS(win) -+ FOR_ALL_TAB_WINDOWS(tab, win) - qf_mark_adjust(win, line1, line2, amount, amount_after); - #endif - -@@ -1086,7 +1087,7 @@ - /* - * Adjust items in all windows related to the current buffer. - */ -- FOR_ALL_WINDOWS(win) -+ FOR_ALL_TAB_WINDOWS(tab, win) - { - #ifdef FEAT_JUMPLIST - if (!cmdmod.lockmarks) -@@ -1627,15 +1628,17 @@ - - /* - * Handle marks in the viminfo file: -- * fp_out == NULL read marks for current buffer only -- * fp_out != NULL copy marks for buffers not in buffer list -+ * fp_out != NULL: copy marks for buffers not in buffer list -+ * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only -+ * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles - */ - void --copy_viminfo_marks(virp, fp_out, count, eof) -+copy_viminfo_marks(virp, fp_out, count, eof, flags) - vir_T *virp; - FILE *fp_out; - int count; - int eof; -+ int flags; - { - char_u *line = virp->vir_line; - buf_T *buf; -@@ -1647,10 +1650,23 @@ - char_u *p; - char_u *name_buf; - pos_T pos; -+#ifdef FEAT_EVAL -+ list_T *list = NULL; -+#endif - - if ((name_buf = alloc(LSIZE)) == NULL) - return; - *name_buf = NUL; -+ -+#ifdef FEAT_EVAL -+ if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT))) -+ { -+ list = list_alloc(); -+ if (list != NULL) -+ set_vim_var_list(VV_OLDFILES, list); -+ } -+#endif -+ - num_marked_files = get_viminfo_parameter('\''); - while (!eof && (count < num_marked_files || fp_out == NULL)) - { -@@ -1681,6 +1697,11 @@ - p++; - *p = NUL; - -+#ifdef FEAT_EVAL -+ if (list != NULL) -+ list_append_string(list, str, -1); -+#endif -+ - /* - * If fp_out == NULL, load marks for current buffer. - * If fp_out != NULL, copy marks for buffers not in buflist. -@@ -1688,7 +1709,7 @@ - load_marks = copy_marks_out = FALSE; - if (fp_out == NULL) - { -- if (curbuf->b_ffname != NULL) -+ if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL) - { - if (*name_buf == NUL) /* only need to do this once */ - home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE); -diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c ---- vim72.orig/src/mbyte.c 2008-07-14 13:38:05.000000000 +0100 -+++ vim72/src/mbyte.c 2009-07-22 22:54:23.000000000 +0100 -@@ -127,7 +127,10 @@ - static int dbcs_char2len __ARGS((int c)); - static int dbcs_char2bytes __ARGS((int c, char_u *buf)); - static int dbcs_ptr2len __ARGS((char_u *p)); -+static int dbcs_ptr2len_len __ARGS((char_u *p, int size)); -+static int utf_ptr2cells_len __ARGS((char_u *p, int size)); - static int dbcs_char2cells __ARGS((int c)); -+static int dbcs_ptr2cells_len __ARGS((char_u *p, int size)); - static int dbcs_ptr2char __ARGS((char_u *p)); - - /* Lookup table to quickly get the length in bytes of a UTF-8 character from -@@ -606,9 +609,11 @@ - if (enc_utf8) - { - mb_ptr2len = utfc_ptr2len; -+ mb_ptr2len_len = utfc_ptr2len_len; - mb_char2len = utf_char2len; - mb_char2bytes = utf_char2bytes; - mb_ptr2cells = utf_ptr2cells; -+ mb_ptr2cells_len = utf_ptr2cells_len; - mb_char2cells = utf_char2cells; - mb_off2cells = utf_off2cells; - mb_ptr2char = utf_ptr2char; -@@ -617,9 +622,11 @@ - else if (enc_dbcs != 0) - { - mb_ptr2len = dbcs_ptr2len; -+ mb_ptr2len_len = dbcs_ptr2len_len; - mb_char2len = dbcs_char2len; - mb_char2bytes = dbcs_char2bytes; - mb_ptr2cells = dbcs_ptr2cells; -+ mb_ptr2cells_len = dbcs_ptr2cells_len; - mb_char2cells = dbcs_char2cells; - mb_off2cells = dbcs_off2cells; - mb_ptr2char = dbcs_ptr2char; -@@ -628,9 +635,11 @@ - else - { - mb_ptr2len = latin_ptr2len; -+ mb_ptr2len_len = latin_ptr2len_len; - mb_char2len = latin_char2len; - mb_char2bytes = latin_char2bytes; - mb_ptr2cells = latin_ptr2cells; -+ mb_ptr2cells_len = latin_ptr2cells_len; - mb_char2cells = latin_char2cells; - mb_off2cells = latin_off2cells; - mb_ptr2char = latin_ptr2char; -@@ -717,7 +726,7 @@ - * where mblen() returns 0 for invalid character. - * Therefore, following condition includes 0. - */ -- (void)mblen(NULL, 0); /* First reset the state. */ -+ ignored = mblen(NULL, 0); /* First reset the state. */ - if (mblen(buf, (size_t)1) <= 0) - n = 2; - else -@@ -1015,10 +1024,9 @@ - * Return length in bytes of character "c". - * Returns 1 for a single-byte character. - */ --/* ARGSUSED */ - int - latin_char2len(c) -- int c; -+ int c UNUSED; - { - return 1; - } -@@ -1070,7 +1078,6 @@ - * Get byte length of character at "*p" but stop at a NUL. - * For UTF-8 this includes following composing characters. - * Returns 0 when *p is NUL. -- * - */ - int - latin_ptr2len(p) -@@ -1092,6 +1099,40 @@ - return len; - } - -+/* -+ * mb_ptr2len_len() function pointer. -+ * Like mb_ptr2len(), but limit to read "size" bytes. -+ * Returns 0 for an empty string. -+ * Returns 1 for an illegal char or an incomplete byte sequence. -+ */ -+ int -+latin_ptr2len_len(p, size) -+ char_u *p; -+ int size; -+{ -+ if (size < 1 || *p == NUL) -+ return 0; -+ return 1; -+} -+ -+ static int -+dbcs_ptr2len_len(p, size) -+ char_u *p; -+ int size; -+{ -+ int len; -+ -+ if (size < 1 || *p == NUL) -+ return 0; -+ if (size == 1) -+ return 1; -+ /* Check that second byte is not missing. */ -+ len = MB_BYTE2LEN(*p); -+ if (len == 2 && p[1] == NUL) -+ len = 1; -+ return len; -+} -+ - struct interval - { - unsigned short first; -@@ -1248,10 +1289,9 @@ - * Return the number of display cells character at "*p" occupies. - * This doesn't take care of unprintable characters, use ptr2cells() for that. - */ --/*ARGSUSED*/ - int - latin_ptr2cells(p) -- char_u *p; -+ char_u *p UNUSED; - { - return 1; - } -@@ -1289,14 +1329,62 @@ - } - - /* -+ * mb_ptr2cells_len() function pointer. -+ * Like mb_ptr2cells(), but limit string length to "size". -+ * For an empty string or truncated character returns 1. -+ */ -+ int -+latin_ptr2cells_len(p, size) -+ char_u *p UNUSED; -+ int size UNUSED; -+{ -+ return 1; -+} -+ -+ static int -+utf_ptr2cells_len(p, size) -+ char_u *p; -+ int size; -+{ -+ int c; -+ -+ /* Need to convert to a wide character. */ -+ if (size > 0 && *p >= 0x80) -+ { -+ if (utf_ptr2len_len(p, size) < utf8len_tab[*p]) -+ return 1; -+ c = utf_ptr2char(p); -+ /* An illegal byte is displayed as . */ -+ if (utf_ptr2len(p) == 1 || c == NUL) -+ return 4; -+ /* If the char is ASCII it must be an overlong sequence. */ -+ if (c < 0x80) -+ return char2cells(c); -+ return utf_char2cells(c); -+ } -+ return 1; -+} -+ -+ static int -+dbcs_ptr2cells_len(p, size) -+ char_u *p; -+ int size; -+{ -+ /* Number of cells is equal to number of bytes, except for euc-jp when -+ * the first byte is 0x8e. */ -+ if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e)) -+ return 1; -+ return MB_BYTE2LEN(*p); -+} -+ -+/* - * mb_char2cells() function pointer. - * Return the number of display cells character "c" occupies. - * Only takes care of multi-byte chars, not "^C" and such. - */ --/*ARGSUSED*/ - int - latin_char2cells(c) -- int c; -+ int c UNUSED; - { - return 1; - } -@@ -1318,11 +1406,10 @@ - * Return number of display cells for char at ScreenLines[off]. - * We make sure that the offset used is less than "max_off". - */ --/*ARGSUSED*/ - int - latin_off2cells(off, max_off) -- unsigned off; -- unsigned max_off; -+ unsigned off UNUSED; -+ unsigned max_off UNUSED; - { - return 1; - } -@@ -1720,6 +1807,7 @@ - /* - * Return the number of bytes the UTF-8 encoding of the character at "p[size]" - * takes. This includes following composing characters. -+ * Returns 0 for an empty string. - * Returns 1 for an illegal char or an incomplete byte sequence. - */ - int -@@ -1732,7 +1820,7 @@ - int prevlen; - #endif - -- if (*p == NUL) -+ if (size < 1 || *p == NUL) - return 0; - if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */ - return 1; -@@ -2419,11 +2507,10 @@ - * Return offset from "p" to the first byte of the character it points into. - * Returns 0 when already at the first byte of a character. - */ --/*ARGSUSED*/ - int - latin_head_off(base, p) -- char_u *base; -- char_u *p; -+ char_u *base UNUSED; -+ char_u *p UNUSED; - { - return 0; - } -@@ -2540,7 +2627,6 @@ - return (int)(p - q); - } - --#if defined(FEAT_EVAL) || defined(PROTO) - /* - * Copy a character from "*fp" to "*tp" and advance the pointers. - */ -@@ -2555,7 +2641,6 @@ - *tp += l; - *fp += l; - } --#endif - - /* - * Return the offset from "p" to the first byte of a character. When "p" is -@@ -3133,7 +3218,7 @@ - else - s = p + 1; - } -- for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i) -+ for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) - { - if (s[i] == '_' || s[i] == '-') - buf[i] = '-'; -@@ -3180,7 +3265,7 @@ - - # if defined(USE_ICONV) || defined(PROTO) - --static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp)); -+static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp)); - - /* - * Call iconv_open() with a check if iconv() works properly (there are broken -@@ -3241,13 +3326,15 @@ - * If "unconvlenp" is not NULL handle the string ending in an incomplete - * sequence and set "*unconvlenp" to the length of it. - * Returns the converted string in allocated memory. NULL for an error. -+ * If resultlenp is not NULL, sets it to the result length in bytes. - */ - static char_u * --iconv_string(vcp, str, slen, unconvlenp) -+iconv_string(vcp, str, slen, unconvlenp, resultlenp) - vimconv_T *vcp; - char_u *str; - int slen; - int *unconvlenp; -+ int *resultlenp; - { - const char *from; - size_t fromlen; -@@ -3333,6 +3420,9 @@ - /* Not enough room or skipping illegal sequence. */ - done = to - (char *)result; - } -+ -+ if (resultlenp != NULL) -+ *resultlenp = (int)(to - (char *)result); - return result; - } - -@@ -3584,9 +3674,10 @@ - * Callback invoked when the user finished preediting. - * Put the final string into the input buffer. - */ --/*ARGSUSED0*/ - static void --im_commit_cb(GtkIMContext *context, const gchar *str, gpointer data) -+im_commit_cb(GtkIMContext *context UNUSED, -+ const gchar *str, -+ gpointer data UNUSED) - { - int slen = (int)STRLEN(str); - int add_to_input = TRUE; -@@ -3672,9 +3763,8 @@ - /* - * Callback invoked after start to the preedit. - */ --/*ARGSUSED*/ - static void --im_preedit_start_cb(GtkIMContext *context, gpointer data) -+im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) - { - #ifdef XIM_DEBUG - xim_log("im_preedit_start_cb()\n"); -@@ -3689,9 +3779,8 @@ - /* - * Callback invoked after end to the preedit. - */ --/*ARGSUSED*/ - static void --im_preedit_end_cb(GtkIMContext *context, gpointer data) -+im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED) - { - #ifdef XIM_DEBUG - xim_log("im_preedit_end_cb()\n"); -@@ -3750,9 +3839,8 @@ - * remaining input from within the "retrieve_surrounding" signal handler, this - * might not be necessary. Gotta ask on vim-dev for opinions. - */ --/*ARGSUSED1*/ - static void --im_preedit_changed_cb(GtkIMContext *context, gpointer data) -+im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED) - { - char *preedit_string = NULL; - int cursor_index = 0; -@@ -4618,11 +4706,10 @@ - } - } - --/*ARGSUSED*/ - void - im_set_position(row, col) -- int row; -- int col; -+ int row UNUSED; -+ int col UNUSED; - { - xim_set_preedit(); - } -@@ -4929,12 +5016,11 @@ - static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer call_data)); - static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data)); - --/*ARGSUSED*/ - static void - xim_instantiate_cb(display, client_data, call_data) - Display *display; -- XPointer client_data; -- XPointer call_data; -+ XPointer client_data UNUSED; -+ XPointer call_data UNUSED; - { - Window x11_window; - Display *x11_display; -@@ -4954,12 +5040,11 @@ - xim_instantiate_cb, NULL); - } - --/*ARGSUSED*/ - static void - xim_destroy_cb(im, client_data, call_data) -- XIM im; -- XPointer client_data; -- XPointer call_data; -+ XIM im UNUSED; -+ XPointer client_data UNUSED; -+ XPointer call_data UNUSED; - { - Window x11_window; - Display *x11_display; -@@ -5278,9 +5363,10 @@ - } - } - --/*ARGSUSED*/ - static void --preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data) -+preedit_start_cbproc(XIC thexic UNUSED, -+ XPointer client_data UNUSED, -+ XPointer call_data UNUSED) - { - #ifdef XIM_DEBUG - xim_log("xim_decide_input_style()\n"); -@@ -5312,9 +5398,10 @@ - static GSList *key_press_event_queue = NULL; - static gboolean processing_queued_event = FALSE; - --/*ARGSUSED*/ - static void --preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data) -+preedit_draw_cbproc(XIC thexic UNUSED, -+ XPointer client_data UNUSED, -+ XPointer call_data) - { - XIMPreeditDrawCallbackStruct *draw_data; - XIMText *text; -@@ -5386,7 +5473,7 @@ - draw_feedback = (char *)alloc(draw_data->chg_first - + text->length); - else -- draw_feedback = realloc(draw_feedback, -+ draw_feedback = vim_realloc(draw_feedback, - draw_data->chg_first + text->length); - if (draw_feedback != NULL) - { -@@ -5453,18 +5540,20 @@ - return -1; - } - --/*ARGSUSED*/ - static void --preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data) -+preedit_caret_cbproc(XIC thexic UNUSED, -+ XPointer client_data UNUSED, -+ XPointer call_data UNUSED) - { - #ifdef XIM_DEBUG - xim_log("preedit_caret_cbproc()\n"); - #endif - } - --/*ARGSUSED*/ - static void --preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data) -+preedit_done_cbproc(XIC thexic UNUSED, -+ XPointer client_data UNUSED, -+ XPointer call_data UNUSED) - { - #ifdef XIM_DEBUG - xim_log("preedit_done_cbproc()\n"); -@@ -5503,9 +5592,8 @@ - } - } - --/*ARGSUSED*/ - int --xim_queue_key_press_event(GdkEventKey *event, int down) -+xim_queue_key_press_event(GdkEventKey *event, int down UNUSED) - { - #ifdef XIM_DEBUG - xim_log("xim_queue_key_press_event()\n"); -@@ -5521,9 +5609,8 @@ - return TRUE; - } - --/*ARGSUSED*/ - static void --preedit_callback_setup(GdkIC *ic) -+preedit_callback_setup(GdkIC *ic UNUSED) - { - XIC xxic; - XVaNestedList preedit_attr; -@@ -5548,9 +5635,8 @@ - XFree(preedit_attr); - } - --/*ARGSUSED*/ - static void --reset_state_setup(GdkIC *ic) -+reset_state_setup(GdkIC *ic UNUSED) - { - #ifdef USE_X11R6_XIM - /* don't change the input context when we call reset */ -@@ -5756,8 +5842,25 @@ - char_u *from; - char_u *to; - { -+ return convert_setup_ext(vcp, from, TRUE, to, TRUE); -+} -+ -+/* -+ * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all -+ * "from" unicode charsets be considered utf-8. Same for "to". -+ */ -+ int -+convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8) -+ vimconv_T *vcp; -+ char_u *from; -+ int from_unicode_is_utf8; -+ char_u *to; -+ int to_unicode_is_utf8; -+{ - int from_prop; - int to_prop; -+ int from_is_utf8; -+ int to_is_utf8; - - /* Reset to no conversion. */ - # ifdef USE_ICONV -@@ -5775,37 +5878,46 @@ - - from_prop = enc_canon_props(from); - to_prop = enc_canon_props(to); -- if ((from_prop & ENC_LATIN1) && (to_prop & ENC_UNICODE)) -+ if (from_unicode_is_utf8) -+ from_is_utf8 = from_prop & ENC_UNICODE; -+ else -+ from_is_utf8 = from_prop == ENC_UNICODE; -+ if (to_unicode_is_utf8) -+ to_is_utf8 = to_prop & ENC_UNICODE; -+ else -+ to_is_utf8 = to_prop == ENC_UNICODE; -+ -+ if ((from_prop & ENC_LATIN1) && to_is_utf8) - { - /* Internal latin1 -> utf-8 conversion. */ - vcp->vc_type = CONV_TO_UTF8; - vcp->vc_factor = 2; /* up to twice as long */ - } -- else if ((from_prop & ENC_LATIN9) && (to_prop & ENC_UNICODE)) -+ else if ((from_prop & ENC_LATIN9) && to_is_utf8) - { - /* Internal latin9 -> utf-8 conversion. */ - vcp->vc_type = CONV_9_TO_UTF8; - vcp->vc_factor = 3; /* up to three as long (euro sign) */ - } -- else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN1)) -+ else if (from_is_utf8 && (to_prop & ENC_LATIN1)) - { - /* Internal utf-8 -> latin1 conversion. */ - vcp->vc_type = CONV_TO_LATIN1; - } -- else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN9)) -+ else if (from_is_utf8 && (to_prop & ENC_LATIN9)) - { - /* Internal utf-8 -> latin9 conversion. */ - vcp->vc_type = CONV_TO_LATIN9; - } - #ifdef WIN3264 - /* Win32-specific codepage <-> codepage conversion without iconv. */ -- else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0) -- && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0)) -+ else if ((from_is_utf8 || encname2codepage(from) > 0) -+ && (to_is_utf8 || encname2codepage(to) > 0)) - { - vcp->vc_type = CONV_CODEPAGE; - vcp->vc_factor = 2; /* up to twice as long */ -- vcp->vc_cpfrom = (from_prop & ENC_UNICODE) ? 0 : encname2codepage(from); -- vcp->vc_cpto = (to_prop & ENC_UNICODE) ? 0 : encname2codepage(to); -+ vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from); -+ vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to); - } - #endif - #ifdef MACOS_X -@@ -5813,7 +5925,7 @@ - { - vcp->vc_type = CONV_MAC_LATIN1; - } -- else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_UNICODE)) -+ else if ((from_prop & ENC_MACROMAN) && to_is_utf8) - { - vcp->vc_type = CONV_MAC_UTF8; - vcp->vc_factor = 2; /* up to twice as long */ -@@ -5822,7 +5934,7 @@ - { - vcp->vc_type = CONV_LATIN1_MAC; - } -- else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_MACROMAN)) -+ else if (from_is_utf8 && (to_prop & ENC_MACROMAN)) - { - vcp->vc_type = CONV_UTF8_MAC; - } -@@ -5832,8 +5944,8 @@ - { - /* Use iconv() for conversion. */ - vcp->vc_fd = (iconv_t)my_iconv_open( -- (to_prop & ENC_UNICODE) ? (char_u *)"utf-8" : to, -- (from_prop & ENC_UNICODE) ? (char_u *)"utf-8" : from); -+ to_is_utf8 ? (char_u *)"utf-8" : to, -+ from_is_utf8 ? (char_u *)"utf-8" : from); - if (vcp->vc_fd != (iconv_t)-1) - { - vcp->vc_type = CONV_ICONV; -@@ -6089,9 +6201,7 @@ - - # ifdef USE_ICONV - case CONV_ICONV: /* conversion with output_conv.vc_fd */ -- retval = iconv_string(vcp, ptr, len, unconvlenp); -- if (retval != NULL && lenp != NULL) -- *lenp = (int)STRLEN(retval); -+ retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); - break; - # endif - # ifdef WIN3264 -@@ -6103,7 +6213,7 @@ - - /* 1. codepage/UTF-8 -> ucs-2. */ - if (vcp->vc_cpfrom == 0) -- tmp_len = utf8_to_ucs2(ptr, len, NULL, NULL); -+ tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); - else - tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0, - ptr, len, 0, 0); -@@ -6111,13 +6221,13 @@ - if (tmp == NULL) - break; - if (vcp->vc_cpfrom == 0) -- utf8_to_ucs2(ptr, len, tmp, unconvlenp); -+ utf8_to_utf16(ptr, len, tmp, unconvlenp); - else - MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len); - - /* 2. ucs-2 -> codepage/UTF-8. */ - if (vcp->vc_cpto == 0) -- retlen = ucs2_to_utf8(tmp, tmp_len, NULL); -+ retlen = utf16_to_utf8(tmp, tmp_len, NULL); - else - retlen = WideCharToMultiByte(vcp->vc_cpto, 0, - tmp, tmp_len, 0, 0, 0, 0); -@@ -6125,7 +6235,7 @@ - if (retval != NULL) - { - if (vcp->vc_cpto == 0) -- ucs2_to_utf8(tmp, tmp_len, retval); -+ utf16_to_utf8(tmp, tmp_len, retval); - else - WideCharToMultiByte(vcp->vc_cpto, 0, - tmp, tmp_len, retval, retlen, 0, 0); -diff -Naur vim72.orig/src/memline.c vim72/src/memline.c ---- vim72.orig/src/memline.c 2008-07-13 17:19:22.000000000 +0100 -+++ vim72/src/memline.c 2009-07-22 22:54:21.000000000 +0100 -@@ -1554,10 +1554,15 @@ - for (i = 0; i < num_files; ++i) - if (fullpathcmp(p, files[i], TRUE) & FPC_SAME) - { -+ /* Remove the name from files[i]. Move further entries -+ * down. When the array becomes empty free it here, since -+ * FreeWild() won't be called below. */ - vim_free(files[i]); -- --num_files; -- for ( ; i < num_files; ++i) -- files[i] = files[i + 1]; -+ if (--num_files == 0) -+ vim_free(files); -+ else -+ for ( ; i < num_files; ++i) -+ files[i] = files[i + 1]; - } - } - if (nr > 0) -@@ -3522,7 +3527,7 @@ - if (errno == EINVAL || errno == ENOENT) - { - /* Found non-symlink or not existing file, stop here. -- * When at the first level use the unmodifed name, skip the -+ * When at the first level use the unmodified name, skip the - * call to vim_FullName(). */ - if (depth == 1) - return FAIL; -@@ -3766,8 +3771,10 @@ - set_vim_var_string(VV_SWAPCHOICE, NULL, -1); - - /* Trigger SwapExists autocommands with set to the file being -- * edited. */ -+ * edited. Disallow changing directory here. */ -+ ++allbuf_lock; - apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); -+ --allbuf_lock; - - set_vim_var_string(VV_SWAPNAME, NULL, -1); - -@@ -3793,6 +3800,7 @@ - * - * Note: If BASENAMELEN is not correct, you will get error messages for - * not being able to open the swapfile -+ * Note: May trigger SwapExists autocmd, pointers may change! - */ - static char_u * - findswapname(buf, dirp, old_fname) -@@ -4560,7 +4568,7 @@ - buf->b_ml.ml_chunksize + curix, - (buf->b_ml.ml_usedchunks - curix) * - sizeof(chunksize_T)); -- /* Compute length of first half of lines in the splitted chunk */ -+ /* Compute length of first half of lines in the split chunk */ - size = 0; - linecnt = 0; - while (curline < buf->b_ml.ml_line_count -diff -Naur vim72.orig/src/menu.c vim72/src/menu.c ---- vim72.orig/src/menu.c 2008-06-21 20:53:43.000000000 +0100 -+++ vim72/src/menu.c 2009-07-22 22:54:22.000000000 +0100 -@@ -231,7 +231,7 @@ - if (skipdigits(menu_path + 7) == p) - { - menuarg.iconidx = atoi((char *)menu_path + 7); -- if (menuarg.iconidx >= TOOLBAR_NAME_COUNT) -+ if (menuarg.iconidx >= (int)TOOLBAR_NAME_COUNT) - menuarg.iconidx = -1; - else - menuarg.icon_builtin = TRUE; -@@ -239,7 +239,7 @@ - } - else - { -- for (i = 0; i < TOOLBAR_NAME_COUNT; ++i) -+ for (i = 0; i < (int)TOOLBAR_NAME_COUNT; ++i) - if (STRNCMP(toolbar_names[i], menu_path, p - menu_path) - == 0) - { -@@ -1120,6 +1120,7 @@ - parent = menu; - menu = menu->children; - } -+ vim_free(path_name); - - /* Now we have found the matching menu, and we list the mappings */ - /* Highlight title */ -@@ -1340,10 +1341,9 @@ - * Function given to ExpandGeneric() to obtain the list of (sub)menus (not - * entries). - */ --/*ARGSUSED*/ - char_u * - get_menu_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - static vimmenu_T *menu = NULL; -@@ -1377,10 +1377,9 @@ - * Function given to ExpandGeneric() to obtain the list of menus and menu - * entries. - */ --/*ARGSUSED*/ - char_u * - get_menu_names(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - static vimmenu_T *menu = NULL; -@@ -1738,10 +1737,9 @@ - /* - * Return TRUE if the menu is the tearoff menu. - */ --/*ARGSUSED*/ - static int - menu_is_tearoff(name) -- char_u *name; -+ char_u *name UNUSED; - { - #ifdef FEAT_GUI - return (STRCMP(name, TEAR_STRING) == 0); -@@ -2342,10 +2340,9 @@ - * This function is also defined without the +multi_lang feature, in which - * case the commands are ignored. - */ --/*ARGSUSED*/ - void - ex_menutranslate(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - #ifdef FEAT_MULTI_LANG - char_u *arg = eap->arg; -diff -Naur vim72.orig/src/message.c vim72/src/message.c ---- vim72.orig/src/message.c 2008-07-09 19:24:55.000000000 +0100 -+++ vim72/src/message.c 2009-07-22 22:54:23.000000000 +0100 -@@ -107,7 +107,7 @@ - } - - #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \ -- || defined(PROTO) -+ || defined(FEAT_GUI_GTK) || defined(PROTO) - /* - * Like msg() but keep it silent when 'verbosefile' is set. - */ -@@ -818,10 +818,9 @@ - /* - * ":messages" command. - */ --/*ARGSUSED*/ - void - ex_messages(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - struct msg_hist *p; - char_u *s; -@@ -976,7 +975,7 @@ - } - } - else if (msg_scrolled > Rows - 2 -- && (c == 'j' || c == K_DOWN || c == 'd')) -+ && (c == 'j' || c == K_DOWN || c == 'd' || c == 'f')) - c = K_IGNORE; - } - } while ((had_got_int && c == Ctrl_C) -@@ -2504,7 +2503,6 @@ - break; - - case 'u': /* Up half a page */ -- case K_PAGEUP: - scroll = -(Rows / 2); - break; - -@@ -2513,10 +2511,12 @@ - break; - - case 'b': /* one page back */ -+ case K_PAGEUP: - scroll = -(Rows - 1); - break; - - case ' ': /* one extra page */ -+ case 'f': - case K_PAGEDOWN: - case K_LEFTMOUSE: - scroll = Rows - 1; -@@ -2552,7 +2552,6 @@ - { - /* Jump to the choices of the dialog. */ - retval = TRUE; -- lines_left = Rows - 1; - } - else - #endif -@@ -2560,6 +2559,9 @@ - got_int = TRUE; - quit_more = TRUE; - } -+ /* When there is some more output (wrapping line) display that -+ * without another prompt. */ -+ lines_left = Rows - 1; - break; - - #ifdef FEAT_CLIPBOARD -@@ -3020,11 +3022,7 @@ - if (*p_vfile != NUL) - verbose_write(s, maxlen); - -- if (redir_fd != NULL --#ifdef FEAT_EVAL -- || redir_reg || redir_vname --#endif -- ) -+ if (redirecting()) - { - /* If the string doesn't start with CR or NL, go to msg_col */ - if (*s != '\n' && *s != '\r') -@@ -3071,6 +3069,16 @@ - } - } - -+ int -+redirecting() -+{ -+ return redir_fd != NULL -+#ifdef FEAT_EVAL -+ || redir_reg || redir_vname -+#endif -+ ; -+} -+ - /* - * Before giving verbose message. - * Must always be called paired with verbose_leave()! -@@ -3281,15 +3289,15 @@ - * A '&' in a button name becomes a shortcut, so each '&' should be before a - * different letter. - */ --/* ARGSUSED */ - int - do_dialog(type, title, message, buttons, dfltbutton, textfield) -- int type; -- char_u *title; -+ int type UNUSED; -+ char_u *title UNUSED; - char_u *message; - char_u *buttons; - int dfltbutton; -- char_u *textfield; /* IObuff for inputdialog(), NULL otherwise */ -+ char_u *textfield UNUSED; /* IObuff for inputdialog(), NULL -+ otherwise */ - { - int oldState; - int retval = 0; -@@ -3309,7 +3317,10 @@ - { - c = gui_mch_dialog(type, title, message, buttons, dfltbutton, - textfield); -- msg_end_prompt(); -+ /* avoid a hit-enter prompt without clearing the cmdline */ -+ need_wait_return = FALSE; -+ emsg_on_display = FALSE; -+ cmdline_row = msg_row; - - /* Flush output to avoid that further messages and redrawing is done - * in the wrong order. */ -@@ -4009,7 +4020,7 @@ - if (*p != '%') - { - char *q = strchr(p + 1, '%'); -- size_t n = (q == NULL) ? STRLEN(p) : (q - p); -+ size_t n = (q == NULL) ? STRLEN(p) : (size_t)(q - p); - - /* Copy up to the next '%' or NUL without any changes. */ - if (str_l < str_m) -@@ -4256,7 +4267,8 @@ - precision <= (size_t)0x7fffffffL ? precision - : (size_t)0x7fffffffL); - #endif -- str_arg_l = (q == NULL) ? precision : q - str_arg; -+ str_arg_l = (q == NULL) ? precision -+ : (size_t)(q - str_arg); - } - break; - -@@ -4356,7 +4368,8 @@ - get_a_arg(arg_idx); - #else - # if defined(FEAT_EVAL) -- tvs != NULL ? tv_nr(tvs, &arg_idx) : -+ tvs != NULL ? (unsigned) -+ tv_nr(tvs, &arg_idx) : - # endif - va_arg(ap, unsigned int); - #endif -@@ -4369,7 +4382,8 @@ - get_a_arg(arg_idx); - #else - # if defined(FEAT_EVAL) -- tvs != NULL ? tv_nr(tvs, &arg_idx) : -+ tvs != NULL ? (unsigned long) -+ tv_nr(tvs, &arg_idx) : - # endif - va_arg(ap, unsigned long int); - #endif -@@ -4556,7 +4570,13 @@ - remove_trailing_zeroes = TRUE; - } - -- if (fmt_spec == 'f' && abs_f > 1.0e307) -+ if (fmt_spec == 'f' && -+#ifdef VAX -+ abs_f > 1.0e38 -+#else -+ abs_f > 1.0e307 -+#endif -+ ) - { - /* Avoid a buffer overflow */ - strcpy(tmp, "inf"); -@@ -4585,61 +4605,62 @@ - if (remove_trailing_zeroes) - { - int i; -- char *p; -+ char *tp; - - /* Using %g or %G: remove superfluous zeroes. */ - if (fmt_spec == 'f') -- p = tmp + str_arg_l - 1; -+ tp = tmp + str_arg_l - 1; - else - { -- p = (char *)vim_strchr((char_u *)tmp, -+ tp = (char *)vim_strchr((char_u *)tmp, - fmt_spec == 'e' ? 'e' : 'E'); -- if (p != NULL) -+ if (tp != NULL) - { - /* Remove superfluous '+' and leading - * zeroes from the exponent. */ -- if (p[1] == '+') -+ if (tp[1] == '+') - { - /* Change "1.0e+07" to "1.0e07" */ -- STRMOVE(p + 1, p + 2); -+ STRMOVE(tp + 1, tp + 2); - --str_arg_l; - } -- i = (p[1] == '-') ? 2 : 1; -- while (p[i] == '0') -+ i = (tp[1] == '-') ? 2 : 1; -+ while (tp[i] == '0') - { - /* Change "1.0e07" to "1.0e7" */ -- STRMOVE(p + i, p + i + 1); -+ STRMOVE(tp + i, tp + i + 1); - --str_arg_l; - } -- --p; -+ --tp; - } - } - -- if (p != NULL && !precision_specified) -+ if (tp != NULL && !precision_specified) - /* Remove trailing zeroes, but keep the one - * just after a dot. */ -- while (p > tmp + 2 && *p == '0' && p[-1] != '.') -+ while (tp > tmp + 2 && *tp == '0' -+ && tp[-1] != '.') - { -- STRMOVE(p, p + 1); -- --p; -+ STRMOVE(tp, tp + 1); -+ --tp; - --str_arg_l; - } - } - else - { -- char *p; -+ char *tp; - - /* Be consistent: some printf("%e") use 1.0e+12 - * and some 1.0e+012. Remove one zero in the last - * case. */ -- p = (char *)vim_strchr((char_u *)tmp, -+ tp = (char *)vim_strchr((char_u *)tmp, - fmt_spec == 'e' ? 'e' : 'E'); -- if (p != NULL && (p[1] == '+' || p[1] == '-') -- && p[2] == '0' -- && vim_isdigit(p[3]) -- && vim_isdigit(p[4])) -+ if (tp != NULL && (tp[1] == '+' || tp[1] == '-') -+ && tp[2] == '0' -+ && vim_isdigit(tp[3]) -+ && vim_isdigit(tp[4])) - { -- STRMOVE(p + 2, p + 3); -+ STRMOVE(tp + 2, tp + 3); - --str_arg_l; - } - } -@@ -4685,7 +4706,8 @@ - size_t avail = str_m - str_l; - - vim_memset(str + str_l, zero_padding ? '0' : ' ', -- (size_t)pn > avail ? avail : pn); -+ (size_t)pn > avail ? avail -+ : (size_t)pn); - } - str_l += pn; - } -@@ -4712,7 +4734,8 @@ - size_t avail = str_m - str_l; - - mch_memmove(str + str_l, str_arg, -- (size_t)zn > avail ? avail : zn); -+ (size_t)zn > avail ? avail -+ : (size_t)zn); - } - str_l += zn; - } -@@ -4727,7 +4750,8 @@ - size_t avail = str_m-str_l; - - vim_memset(str + str_l, '0', -- (size_t)zn > avail ? avail : zn); -+ (size_t)zn > avail ? avail -+ : (size_t)zn); - } - str_l += zn; - } -@@ -4746,7 +4770,7 @@ - - mch_memmove(str + str_l, - str_arg + zero_padding_insertion_ind, -- (size_t)sn > avail ? avail : sn); -+ (size_t)sn > avail ? avail : (size_t)sn); - } - str_l += sn; - } -@@ -4766,7 +4790,8 @@ - size_t avail = str_m - str_l; - - vim_memset(str + str_l, ' ', -- (size_t)pn > avail ? avail : pn); -+ (size_t)pn > avail ? avail -+ : (size_t)pn); - } - str_l += pn; - } -diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c ---- vim72.orig/src/misc1.c 2008-07-12 20:20:53.000000000 +0100 -+++ vim72/src/misc1.c 2009-07-22 22:54:23.000000000 +0100 -@@ -2188,12 +2188,11 @@ - * - * return FAIL for failure, OK otherwise - */ --/*ARGSUSED*/ - int - del_bytes(count, fixpos_arg, use_delcombine) - long count; - int fixpos_arg; -- int use_delcombine; /* 'delcombine' option applies */ -+ int use_delcombine UNUSED; /* 'delcombine' option applies */ - { - char_u *oldp, *newp; - colnr_T oldlen; -@@ -2346,12 +2345,13 @@ - int undo; /* if TRUE, prepare for undo */ - { - long n; -+ linenr_T first = curwin->w_cursor.lnum; - - if (nlines <= 0) - return; - - /* save the deleted lines for undo */ -- if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL) -+ if (undo && u_savedel(first, nlines) == FAIL) - return; - - for (n = 0; n < nlines; ) -@@ -2359,18 +2359,21 @@ - if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to delete */ - break; - -- ml_delete(curwin->w_cursor.lnum, TRUE); -+ ml_delete(first, TRUE); - ++n; - - /* If we delete the last line in the file, stop */ -- if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) -+ if (first > curbuf->b_ml.ml_line_count) - break; - } -- /* adjust marks, mark the buffer as changed and prepare for displaying */ -- deleted_lines_mark(curwin->w_cursor.lnum, n); - -+ /* Correct the cursor position before calling deleted_lines_mark(), it may -+ * trigger a callback to display the cursor. */ - curwin->w_cursor.col = 0; - check_cursor_lnum(); -+ -+ /* adjust marks, mark the buffer as changed and prepare for displaying */ -+ deleted_lines_mark(first, n); - } - - int -@@ -2622,6 +2625,8 @@ - - /* - * Like deleted_lines(), but adjust marks first. -+ * Make sure the cursor is on a valid line before calling, a GUI callback may -+ * be triggered to display the cursor. - */ - void - deleted_lines_mark(lnum, count) -@@ -2717,6 +2722,9 @@ - long xtra; - { - win_T *wp; -+#ifdef FEAT_WINDOWS -+ tabpage_T *tp; -+#endif - int i; - #ifdef FEAT_JUMPLIST - int cols; -@@ -2769,7 +2777,7 @@ - curbuf->b_changelistlen = JUMPLISTSIZE - 1; - mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, - sizeof(pos_T) * (JUMPLISTSIZE - 1)); -- FOR_ALL_WINDOWS(wp) -+ FOR_ALL_TAB_WINDOWS(tp, wp) - { - /* Correct position in changelist for other windows on - * this buffer. */ -@@ -2777,7 +2785,7 @@ - --wp->w_changelistidx; - } - } -- FOR_ALL_WINDOWS(wp) -+ FOR_ALL_TAB_WINDOWS(tp, wp) - { - /* For other windows, if the position in the changelist is - * at the end it stays at the end. */ -@@ -2796,7 +2804,7 @@ - #endif - } - -- FOR_ALL_WINDOWS(wp) -+ FOR_ALL_TAB_WINDOWS(tp, wp) - { - if (wp->w_buffer == curbuf) - { -@@ -2955,6 +2963,8 @@ - int col; /* column for message; non-zero when in insert - mode and 'showmode' is on */ - { -+ static char *w_readonly = N_("W10: Warning: Changing a readonly file"); -+ - if (curbuf->b_did_warn == FALSE - && curbufIsChanged() == 0 - #ifdef FEAT_AUTOCMD -@@ -2977,8 +2987,10 @@ - if (msg_row == Rows - 1) - msg_col = col; - msg_source(hl_attr(HLF_W)); -- MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"), -- hl_attr(HLF_W) | MSG_HIST); -+ MSG_PUTS_ATTR(_(w_readonly), hl_attr(HLF_W) | MSG_HIST); -+#ifdef FEAT_EVAL -+ set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1); -+#endif - msg_clr_eos(); - (void)msg_end(); - if (msg_silent == 0 && !silent_mode) -@@ -3245,9 +3257,9 @@ - - /* When using ":silent" assume that was entered. */ - if (mouse_used != NULL) -- MSG_PUTS(_("Type number or click with mouse ( cancels): ")); -+ MSG_PUTS(_("Type number and or click with mouse (empty cancels): ")); - else -- MSG_PUTS(_("Choice number ( cancels): ")); -+ MSG_PUTS(_("Type number and (empty cancels): ")); - - /* Set the state such that text can be selected/copied/pasted and we still - * get mouse events. */ -@@ -3264,6 +3276,7 @@ - cmdline_row = msg_row - 1; - need_wait_return = FALSE; - msg_didany = FALSE; -+ msg_didout = FALSE; - } - else - cmdline_row = save_cmdline_row; -@@ -4141,10 +4154,9 @@ - /* - * Function given to ExpandGeneric() to obtain an environment variable name. - */ --/*ARGSUSED*/ - char_u * - get_env_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - # if defined(AMIGA) || defined(__MRC__) || defined(__SC__) -@@ -4736,9 +4748,9 @@ - * If it is then restrict the search to below this line and try again. - */ - line = ml_get(pos->lnum); -- for (p = line; *p && (unsigned)(p - line) < pos->col; ++p) -+ for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) - p = skip_string(p); -- if ((unsigned)(p - line) <= pos->col) -+ if ((colnr_T)(p - line) <= pos->col) - break; - cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1; - if (cur_maxcomment <= 0) -@@ -6269,7 +6281,7 @@ - * check for that. - */ - if ((State & INSERT) -- && curwin->w_cursor.col < STRLEN(linecopy) -+ && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy) - && linecopy[curwin->w_cursor.col] == ')') - linecopy[curwin->w_cursor.col] = NUL; - -@@ -8522,11 +8534,25 @@ - for (setsuf = p_su; *setsuf; ) - { - setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,"); -- if (fnamelen >= setsuflen -- && fnamencmp(suf_buf, fname + fnamelen - setsuflen, -- (size_t)setsuflen) == 0) -- break; -- setsuflen = 0; -+ if (setsuflen == 0) -+ { -+ char_u *tail = gettail(fname); -+ -+ /* empty entry: match name without a '.' */ -+ if (vim_strchr(tail, '.') == NULL) -+ { -+ setsuflen = 1; -+ break; -+ } -+ } -+ else -+ { -+ if (fnamelen >= setsuflen -+ && fnamencmp(suf_buf, fname + fnamelen - setsuflen, -+ (size_t)setsuflen) == 0) -+ break; -+ setsuflen = 0; -+ } - } - return (setsuflen != 0); - } -@@ -8728,7 +8754,7 @@ - /* The active codepage differs from 'encoding'. Attempt using the - * wide function. If it fails because it is not implemented fall back - * to the non-wide version (for Windows 98) */ -- wn = enc_to_ucs2(buf, NULL); -+ wn = enc_to_utf16(buf, NULL); - if (wn != NULL) - { - hFind = FindFirstFileW(wn, &wfb); -@@ -8756,7 +8782,7 @@ - #ifdef WIN3264 - # ifdef FEAT_MBYTE - if (wn != NULL) -- p = ucs2_to_enc(wfb.cFileName, NULL); /* p is allocated here */ -+ p = utf16_to_enc(wfb.cFileName, NULL); /* p is allocated here */ - else - # endif - p = (char_u *)fb.cFileName; -@@ -8830,7 +8856,7 @@ - if (wn != NULL) - { - vim_free(wn); -- wn = enc_to_ucs2(buf, NULL); -+ wn = enc_to_utf16(buf, NULL); - if (wn != NULL) - hFind = FindFirstFileW(wn, &wfb); - } -@@ -9188,7 +9214,7 @@ - else if (vim_strpbrk(p, (char_u *)"$~") != NULL) - { - vim_free(p); -- ga_clear(&ga); -+ ga_clear_strings(&ga); - i = mch_expand_wildcards(num_pat, pat, num_file, file, - flags); - recursive = FALSE; -diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c ---- vim72.orig/src/misc2.c 2008-07-23 20:12:56.000000000 +0100 -+++ vim72/src/misc2.c 2009-07-22 22:54:22.000000000 +0100 -@@ -496,7 +496,8 @@ - { - colnr_T len; - #ifdef FEAT_VIRTUALEDIT -- colnr_T oldcol = curwin->w_cursor.col + curwin->w_cursor.coladd; -+ colnr_T oldcol = curwin->w_cursor.col; -+ colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd; - #endif - - len = (colnr_T)STRLEN(ml_get_curline()); -@@ -535,7 +536,13 @@ - if (oldcol == MAXCOL) - curwin->w_cursor.coladd = 0; - else if (ve_flags == VE_ALL) -- curwin->w_cursor.coladd = oldcol - curwin->w_cursor.col; -+ { -+ if (oldcoladd > curwin->w_cursor.col) -+ curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col; -+ else -+ /* avoid weird number when there is a miscalculation or overflow */ -+ curwin->w_cursor.coladd = 0; -+ } - #endif - } - -@@ -873,7 +880,7 @@ - /* 3. check for available memory: call mch_avail_mem() */ - if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing) - { -- vim_free((char *)p); /* System is low... no go! */ -+ free((char *)p); /* System is low... no go! */ - p = NULL; - } - else -@@ -1010,6 +1017,9 @@ - # if defined(FEAT_PROFILE) - do_cmdline_cmd((char_u *)"profdel *"); - # endif -+# if defined(FEAT_KEYMAP) -+ do_cmdline_cmd((char_u *)"set keymap="); -+#endif - - # ifdef FEAT_TITLE - free_titles(); -@@ -1034,6 +1044,9 @@ - free_regexp_stuff(); - free_tag_stuff(); - free_cd_dir(); -+# ifdef FEAT_SIGNS -+ free_signs(); -+# endif - # ifdef FEAT_EVAL - set_expr_line(NULL); - # endif -@@ -1062,11 +1075,12 @@ - - #ifdef FEAT_QUICKFIX - { -- win_T *win; -+ win_T *win; -+ tabpage_T *tab; - - qf_free_all(NULL); - /* Free all location lists */ -- FOR_ALL_WINDOWS(win) -+ FOR_ALL_TAB_WINDOWS(tab, win) - qf_free_all(win); - } - #endif -@@ -1257,7 +1271,6 @@ - return escaped_string; - } - --#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO) - /* - * Return TRUE when 'shell' has "csh" in the tail. - */ -@@ -1266,9 +1279,7 @@ - { - return (strstr((char *)gettail(p_sh), "csh") != NULL); - } --#endif - --#if defined(FEAT_EVAL) || defined(PROTO) - /* - * Escape "string" for use as a shell argument with system(). - * This uses single quotes, except when we know we need to use double qoutes -@@ -1391,7 +1402,6 @@ - - return escaped_string; - } --#endif - - /* - * Like vim_strsave(), but make all characters uppercase. -@@ -2565,7 +2575,7 @@ - int key; - int dlen = 0; - -- key = find_special_key(srcp, &modifiers, keycode); -+ key = find_special_key(srcp, &modifiers, keycode, FALSE); - if (key == 0) - return 0; - -@@ -2601,10 +2611,11 @@ - * returns 0 if there is no match. - */ - int --find_special_key(srcp, modp, keycode) -+find_special_key(srcp, modp, keycode, keep_x_key) - char_u **srcp; - int *modp; -- int keycode; /* prefer key code, e.g. K_DEL instead of DEL */ -+ int keycode; /* prefer key code, e.g. K_DEL instead of DEL */ -+ int keep_x_key; /* don't translate xHome to Home key */ - { - char_u *last_dash; - char_u *end_of_name; -@@ -2672,7 +2683,8 @@ - else - { - key = get_special_key_code(last_dash + 1); -- key = handle_x_keys(key); -+ if (!keep_x_key) -+ key = handle_x_keys(key); - } - - /* -@@ -2829,7 +2841,7 @@ - get_key_name(i) - int i; - { -- if (i >= KEY_NAMES_TABLE_LEN) -+ if (i >= (int)KEY_NAMES_TABLE_LEN) - return NULL; - return key_names_table[i].name; - } -@@ -3857,7 +3869,8 @@ - * use filename. - */ - #ifdef UNIX -- int ffv_dev; /* device number (-1 if not set) */ -+ int ffv_dev_valid; /* ffv_dev and ffv_ino were set */ -+ dev_t ffv_dev; /* device number */ - ino_t ffv_ino; /* inode number */ - #endif - /* The memory for this struct is allocated according to the length of -@@ -4047,13 +4060,12 @@ - * This function silently ignores a few errors, vim_findfile() will have - * limited functionality then. - */ --/*ARGSUSED*/ - void * - vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, - search_ctx_arg, tagfile, rel_fname) - char_u *path; - char_u *filename; -- char_u *stopdirs; -+ char_u *stopdirs UNUSED; - int level; - int free_visited; - int find_what; -@@ -4698,7 +4710,8 @@ - stackp->ffs_filearray_cur = i + 1; - ff_push(search_ctx, stackp); - -- simplify_filename(file_path); -+ if (!path_with_url(file_path)) -+ simplify_filename(file_path); - if (mch_dirname(ff_expand_buffer, MAXPATHL) - == OK) - { -@@ -5050,10 +5063,9 @@ - { - if ( - #ifdef UNIX -- !url -- ? (vp->ffv_dev == st.st_dev -- && vp->ffv_ino == st.st_ino) -- : -+ !url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev -+ && vp->ffv_ino == st.st_ino) -+ : - #endif - fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0 - ) -@@ -5078,14 +5090,14 @@ - #ifdef UNIX - if (!url) - { -+ vp->ffv_dev_valid = TRUE; - vp->ffv_ino = st.st_ino; - vp->ffv_dev = st.st_dev; - vp->ffv_fname[0] = NUL; - } - else - { -- vp->ffv_ino = 0; -- vp->ffv_dev = -1; -+ vp->ffv_dev_valid = FALSE; - #endif - STRCPY(vp->ffv_fname, ff_expand_buffer); - #ifdef UNIX -diff -Naur vim72.orig/src/move.c vim72/src/move.c ---- vim72.orig/src/move.c 2008-07-12 17:26:47.000000000 +0100 -+++ vim72/src/move.c 2009-07-22 22:54:21.000000000 +0100 -@@ -280,18 +280,20 @@ - - if (curwin->w_botline <= curbuf->b_ml.ml_line_count) - { -- if (curwin->w_cursor.lnum < curwin->w_botline -- && ((long)curwin->w_cursor.lnum -+ if (curwin->w_cursor.lnum < curwin->w_botline) -+ { -+ if (((long)curwin->w_cursor.lnum - >= (long)curwin->w_botline - p_so - #ifdef FEAT_FOLDING - || hasAnyFolding(curwin) - #endif - )) -- { -+ { - lineoff_T loff; - -- /* Cursor is above botline, check if there are 'scrolloff' -- * window lines below the cursor. If not, need to scroll. */ -+ /* Cursor is (a few lines) above botline, check if there are -+ * 'scrolloff' window lines below the cursor. If not, need to -+ * scroll. */ - n = curwin->w_empty_rows; - loff.lnum = curwin->w_cursor.lnum; - #ifdef FEAT_FOLDING -@@ -317,6 +319,10 @@ - if (n >= p_so) - /* sufficient context, no need to scroll */ - check_botline = FALSE; -+ } -+ else -+ /* sufficient context, no need to scroll */ -+ check_botline = FALSE; - } - if (check_botline) - { -@@ -509,6 +515,9 @@ - /* Approximate the value of w_botline */ - wp->w_botline += lnum - wp->w_topline; - wp->w_topline = lnum; -+#ifdef FEAT_AUTOCMD -+ wp->w_topline_was_set = TRUE; -+#endif - #ifdef FEAT_DIFF - wp->w_topfill = 0; - #endif -@@ -1229,11 +1238,10 @@ - /* - * Scroll the current window down by "line_count" logical lines. "CTRL-Y" - */ --/*ARGSUSED*/ - void - scrolldown(line_count, byfold) - long line_count; -- int byfold; /* TRUE: count a closed fold as one line */ -+ int byfold UNUSED; /* TRUE: count a closed fold as one line */ - { - long done = 0; /* total # of physical lines done */ - int wrow; -@@ -1340,11 +1348,10 @@ - /* - * Scroll the current window up by "line_count" logical lines. "CTRL-E" - */ --/*ARGSUSED*/ - void - scrollup(line_count, byfold) - long line_count; -- int byfold; /* TRUE: count a closed fold as one line */ -+ int byfold UNUSED; /* TRUE: count a closed fold as one line */ - { - #if defined(FEAT_FOLDING) || defined(FEAT_DIFF) - linenr_T lnum; -diff -Naur vim72.orig/src/nbdebug.c vim72/src/nbdebug.c ---- vim72.orig/src/nbdebug.c 2008-06-22 16:38:58.000000000 +0100 -+++ vim72/src/nbdebug.c 2009-07-22 22:54:20.000000000 +0100 -@@ -33,7 +33,6 @@ - u_int nb_dlevel = 0; /* nb_debug verbosity level */ - - void nbdb(char *, ...); --void nbtrace(char *, ...); - - static int lookup(char *); - #ifdef USE_NB_ERRORHANDLER -@@ -100,25 +99,6 @@ - } /* end nbdebug_log_init */ - - -- -- --void --nbtrace( -- char *fmt, -- ...) --{ -- va_list ap; -- -- if (nb_debug!= NULL && (nb_dlevel & (NB_TRACE | NB_TRACE_VERBOSE))) { -- va_start(ap, fmt); -- vfprintf(nb_debug, fmt, ap); -- va_end(ap); -- fflush(nb_debug); -- } -- --} /* end nbtrace */ -- -- - void - nbdbg( - char *fmt, -@@ -136,23 +116,6 @@ - } /* end nbdbg */ - - --void --nbprt( -- char *fmt, -- ...) --{ -- va_list ap; -- -- if (nb_debug != NULL && nb_dlevel & NB_PRINT) { -- va_start(ap, fmt); -- vfprintf(nb_debug, fmt, ap); -- va_end(ap); -- fflush(nb_debug); -- } -- --} /* end nbprt */ -- -- - static int - lookup( - char *file) -diff -Naur vim72.orig/src/nbdebug.h vim72/src/nbdebug.h ---- vim72.orig/src/nbdebug.h 2008-06-22 15:31:50.000000000 +0100 -+++ vim72/src/nbdebug.h 2009-07-22 22:54:20.000000000 +0100 -@@ -43,8 +43,6 @@ - - - void nbdbg(char *, ...); --void nbprt(char *, ...); --void nbtrace(char *, ...); - - void nbdebug_wait __ARGS((u_int wait_flags, char *wait_var, u_int wait_secs)); - void nbdebug_log_init __ARGS((char *log_var, char *level_var)); -@@ -70,19 +68,5 @@ - { - } - --void --nbprt( -- char *fmt, -- ...) --{ --} -- --void --nbtrace( -- char *fmt, -- ...) --{ --} -- - #endif /* NBDEBUG */ - #endif /* NBDEBUG_H */ -diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c ---- vim72.orig/src/netbeans.c 2008-07-13 17:19:54.000000000 +0100 -+++ vim72/src/netbeans.c 2009-07-22 22:54:23.000000000 +0100 -@@ -32,6 +32,7 @@ - /* WinSock API is separated from C API, thus we can't use read(), write(), - * errno... */ - # define sock_errno WSAGetLastError() -+# undef ECONNREFUSED - # define ECONNREFUSED WSAECONNREFUSED - # ifdef EINTR - # undef EINTR -@@ -700,7 +701,6 @@ - /* - * Read and process a command from netbeans. - */ --/*ARGSUSED*/ - #if defined(FEAT_GUI_W32) || defined(PROTO) - /* Use this one when generating prototypes, the others are static. */ - void -@@ -708,12 +708,15 @@ - #else - # ifdef FEAT_GUI_MOTIF - static void --messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2) -+messageFromNetbeans(XtPointer clientData UNUSED, -+ int *unused1 UNUSED, -+ XtInputId *unused2 UNUSED) - # endif - # ifdef FEAT_GUI_GTK - static void --messageFromNetbeans(gpointer clientData, gint unused1, -- GdkInputCondition unused2) -+messageFromNetbeans(gpointer clientData UNUSED, -+ gint unused1 UNUSED, -+ GdkInputCondition unused2 UNUSED) - # endif - #endif - { -@@ -769,11 +772,14 @@ - return; /* don't try to parse it */ - } - --#ifdef FEAT_GUI_GTK -+#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) -+ /* Let the main loop handle messages. */ -+# ifdef FEAT_GUI_GTK - if (gtk_main_level() > 0) - gtk_main_quit(); -+# endif - #else -- /* Parse the messages, but avoid recursion. */ -+ /* Parse the messages now, but avoid recursion. */ - if (level == 1) - netbeans_parse_messages(); - -@@ -1043,7 +1049,7 @@ - nbdebug(("EVT: %s", buf)); - /* nb_send(buf, "netbeans_end"); avoid "write failed" messages */ - if (sd >= 0) -- sock_write(sd, buf, (int)STRLEN(buf)); /* ignore errors */ -+ ignored = sock_write(sd, buf, (int)STRLEN(buf)); - } - } - -@@ -1582,7 +1588,9 @@ - buf_delsign(buf->bufp, id); - } - else -+ { - nbdebug((" No sign on line %d\n", i)); -+ } - } - - nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum)); -@@ -1795,7 +1803,7 @@ - buf->displayname = NULL; - - netbeansReadFile = 0; /* don't try to open disk file */ -- do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF); -+ do_ecmd(0, NULL, 0, 0, ECMD_ONE, ECMD_HIDE + ECMD_OLDBUF, curwin); - netbeansReadFile = 1; - buf->bufp = curbuf; - maketitle(); -@@ -1921,7 +1929,7 @@ - vim_free(path); - if (bufp == NULL) - { -- nbdebug((" File %s not found in setBufferNumber\n", args)); -+ nbdebug((" File %s not found in setBufferNumber\n", args)); - EMSG2("E642: File %s not found in setBufferNumber", args); - return FAIL; - } -@@ -1960,7 +1968,7 @@ - - netbeansReadFile = 0; /* don't try to open disk file */ - do_ecmd(0, (char_u *)buf->displayname, 0, 0, ECMD_ONE, -- ECMD_HIDE + ECMD_OLDBUF); -+ ECMD_HIDE + ECMD_OLDBUF, curwin); - netbeansReadFile = 1; - buf->bufp = curbuf; - maketitle(); -@@ -1979,7 +1987,7 @@ - vim_free(buf->displayname); - buf->displayname = nb_unquote(args, NULL); - do_ecmd(0, (char_u *)buf->displayname, NULL, NULL, ECMD_ONE, -- ECMD_HIDE + ECMD_OLDBUF); -+ ECMD_HIDE + ECMD_OLDBUF, curwin); - buf->bufp = curbuf; - buf->initDone = TRUE; - doupdate = 1; -@@ -2141,7 +2149,9 @@ - #endif - } - else -+ { - nbdebug((" BAD POSITION in setDot: %s\n", s)); -+ } - - /* gui_update_cursor(TRUE, FALSE); */ - /* update_curbuf(NOT_VALID); */ -@@ -2277,9 +2287,6 @@ - int serNum; - int localTypeNum; - int typeNum; --# ifdef NBDEBUG -- int len; --# endif - pos_T *pos; - - if (buf == NULL || buf->bufp == NULL) -@@ -2303,13 +2310,10 @@ - pos = get_off_or_lnum(buf->bufp, &args); - - cp = (char *)args; --# ifdef NBDEBUG -- len = --# endif -- strtol(cp, &cp, 10); -+ ignored = (int)strtol(cp, &cp, 10); - args = (char_u *)cp; - # ifdef NBDEBUG -- if (len != -1) -+ if (ignored != -1) - { - nbdebug((" partial line annotation -- Not Yet Implemented!\n")); - } -@@ -2321,7 +2325,7 @@ - } - if (pos) - { -- coloncmd(":sign place %d line=%d name=%d buffer=%d", -+ coloncmd(":sign place %d line=%ld name=%d buffer=%d", - serNum, pos->lnum, typeNum, buf->bufp->b_fnum); - if (typeNum == curPCtype) - coloncmd(":sign jump %d buffer=%d", serNum, -@@ -2425,7 +2429,7 @@ - GUARDED) == 0) - { - coloncmd( -- ":sign place %d line=%d name=%d buffer=%d", -+ ":sign place %d line=%ld name=%d buffer=%d", - guardId++, lnum, GUARDED, - buf->bufp->b_fnum); - } -@@ -2582,7 +2586,7 @@ - va_list ap; - - va_start(ap, cmd); -- vsprintf(buf, cmd, ap); -+ vim_vsnprintf(buf, sizeof(buf), cmd, ap, NULL); - va_end(ap); - - nbdebug((" COLONCMD %s\n", buf)); -@@ -2747,11 +2751,10 @@ - * cursor and sends it to the debugger for evaluation. The debugger should - * respond with a showBalloon command when there is a useful result. - */ --/*ARGSUSED*/ - void - netbeans_beval_cb( - BalloonEval *beval, -- int state) -+ int state UNUSED) - { - win_T *wp; - char_u *text; -@@ -2924,44 +2927,26 @@ - } - - /* -- * Tell netbeans a file was closed. -+ * Tell netbeans that a file was deleted or wiped out. - */ - void --netbeans_file_closed(buf_T *bufp) -+netbeans_file_killed(buf_T *bufp) - { - int bufno = nb_getbufno(bufp); - nbbuf_T *nbbuf = nb_get_buf(bufno); - char buffer[2*MAXPATHL]; - -- if (!haveConnection || bufno < 0) -+ if (!haveConnection || bufno == -1) - return; - -- if (!netbeansCloseFile) -- { -- nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n", -- bufp->b_ffname)); -- return; -- } -- -- nbdebug(("netbeans_file_closed:\n")); -- nbdebug((" Closing bufno: %d", bufno)); -- if (curbuf != NULL && curbuf != bufp) -- { -- nbdebug((" Curbuf bufno: %d\n", nb_getbufno(curbuf))); -- } -- else if (curbuf == bufp) -- { -- nbdebug((" curbuf == bufp\n")); -- } -- -- if (bufno <= 0) -- return; -+ nbdebug(("netbeans_file_killed:\n")); -+ nbdebug((" Killing bufno: %d", bufno)); - - sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno); - - nbdebug(("EVT: %s", buffer)); - -- nb_send(buffer, "netbeans_file_closed"); -+ nb_send(buffer, "netbeans_file_killed"); - - if (nbbuf != NULL) - nbbuf->bufp = NULL; -@@ -3082,9 +3067,8 @@ - /* - * Send netbeans an unmodufied command. - */ --/*ARGSUSED*/ - void --netbeans_unmodified(buf_T *bufp) -+netbeans_unmodified(buf_T *bufp UNUSED) - { - #if 0 - char_u buf[128]; -@@ -3391,13 +3375,12 @@ - * buf->signmapused[] maps buffer-local annotation IDs to an index in - * globalsignmap[]. - */ --/*ARGSUSED*/ - static void - addsigntype( - nbbuf_T *buf, - int typeNum, - char_u *typeName, -- char_u *tooltip, -+ char_u *tooltip UNUSED, - char_u *glyphFile, - int use_fg, - int fg, -diff -Naur vim72.orig/src/normal.c vim72/src/normal.c ---- vim72.orig/src/normal.c 2008-07-31 21:03:08.000000000 +0100 -+++ vim72/src/normal.c 2009-07-22 22:54:22.000000000 +0100 -@@ -183,6 +183,8 @@ - static void nv_cursorhold __ARGS((cmdarg_T *cap)); - #endif - -+static char *e_noident = N_("E349: No identifier under cursor"); -+ - /* - * Function to be called for a Normal or Visual mode command. - * The argument is a cmdarg_T. -@@ -491,14 +493,14 @@ - int i; - - /* Fill the index table with a one to one relation. */ -- for (i = 0; i < NV_CMDS_SIZE; ++i) -+ for (i = 0; i < (int)NV_CMDS_SIZE; ++i) - nv_cmd_idx[i] = i; - - /* Sort the commands by the command character. */ - qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare); - - /* Find the first entry that can't be indexed by the command character. */ -- for (i = 0; i < NV_CMDS_SIZE; ++i) -+ for (i = 0; i < (int)NV_CMDS_SIZE; ++i) - if (i != nv_cmds[nv_cmd_idx[i]].cmd_char) - break; - nv_max_linear = i - 1; -@@ -559,11 +561,10 @@ - /* - * Execute a command in Normal mode. - */ --/*ARGSUSED*/ - void - normal_cmd(oap, toplevel) - oparg_T *oap; -- int toplevel; /* TRUE when called from main() */ -+ int toplevel UNUSED; /* TRUE when called from main() */ - { - cmdarg_T ca; /* command arguments */ - int c; -@@ -578,6 +579,9 @@ - static int old_mapped_len = 0; - #endif - int idx; -+#ifdef FEAT_EVAL -+ int set_prevcount = FALSE; -+#endif - - vim_memset(&ca, 0, sizeof(ca)); /* also resets ca.retval */ - ca.oap = oap; -@@ -613,7 +617,12 @@ - /* When not finishing an operator and no register name typed, reset the - * count. */ - if (!finish_op && !oap->regname) -+ { - ca.opcount = 0; -+#ifdef FEAT_EVAL -+ set_prevcount = TRUE; -+#endif -+ } - - #ifdef FEAT_AUTOCMD - /* Restore counts from before receiving K_CURSORHOLD. This means after -@@ -641,10 +650,7 @@ - * Get the command character from the user. - */ - c = safe_vgetc(); -- --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(c, TRUE); --#endif - - #ifdef FEAT_VISUAL - /* -@@ -717,7 +723,15 @@ - * command, so that v:count can be used in an expression mapping - * right after the count. */ - if (toplevel && stuff_empty()) -- set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0); -+ { -+ long count = ca.count0; -+ -+ /* multiply with ca.opcount the same way as below */ -+ if (ca.opcount != 0) -+ count = ca.opcount * (count == 0 ? 1 : count); -+ set_vcount(count, count == 0 ? 1 : count, set_prevcount); -+ set_prevcount = FALSE; /* only set v:prevcount once */ -+ } - #endif - if (ctrl_w) - { -@@ -726,9 +740,7 @@ - } - ++no_zero_mapping; /* don't map zero here */ - c = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(c, TRUE); --#endif - --no_zero_mapping; - if (ctrl_w) - { -@@ -751,9 +763,7 @@ - ++no_mapping; - ++allow_keys; /* no mapping for nchar, but keys */ - c = plain_vgetc(); /* get next character */ --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(c, TRUE); --#endif - --no_mapping; - --allow_keys; - #ifdef FEAT_CMDL_INFO -@@ -804,7 +814,7 @@ - * Only set v:count when called from main() and not a stuffed command. - */ - if (toplevel && stuff_empty()) -- set_vcount(ca.count0, ca.count1); -+ set_vcount(ca.count0, ca.count1, set_prevcount); - #endif - - /* -@@ -941,9 +951,7 @@ - * "gr", "g'" and "g`". - */ - ca.nchar = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(ca.nchar, TRUE); --#endif - #ifdef FEAT_CMDL_INFO - need_flushbuf |= add_to_showcmd(ca.nchar); - #endif -@@ -1044,10 +1052,8 @@ - } - #endif - --#ifdef FEAT_LANGMAP - /* adjust chars > 127, except after "tTfFr" commands */ - LANGMAP_ADJUST(*cp, !lang); --#endif - #ifdef FEAT_RIGHTLEFT - /* adjust Hebrew mapped char */ - if (p_hkmap && lang && KeyTyped) -@@ -1132,7 +1138,8 @@ - out_flush(); - #endif - #ifdef FEAT_AUTOCMD -- did_cursorhold = FALSE; -+ if (ca.cmdchar != K_IGNORE) -+ did_cursorhold = FALSE; - #endif - - State = NORMAL; -@@ -2180,10 +2187,9 @@ - /* - * Handle the "g@" operator: call 'operatorfunc'. - */ --/*ARGSUSED*/ - static void - op_function(oap) -- oparg_T *oap; -+ oparg_T *oap UNUSED; - { - #ifdef FEAT_EVAL - char_u *(argv[1]); -@@ -3509,7 +3515,7 @@ - if (find_type & FIND_STRING) - EMSG(_("E348: No string under cursor")); - else -- EMSG(_("E349: No identifier under cursor")); -+ EMSG(_(e_noident)); - return 0; - } - ptr += col; -@@ -3701,13 +3707,13 @@ - #ifdef FEAT_VISUAL - if (VIsual_active && !char_avail()) - { -- int i = lt(VIsual, curwin->w_cursor); -+ int cursor_bot = lt(VIsual, curwin->w_cursor); - long lines; - colnr_T leftcol, rightcol; - linenr_T top, bot; - - /* Show the size of the Visual area. */ -- if (i) -+ if (cursor_bot) - { - top = VIsual.lnum; - bot = curwin->w_cursor.lnum; -@@ -3726,14 +3732,23 @@ - - if (VIsual_mode == Ctrl_V) - { -+#ifdef FEAT_LINEBREAK -+ char_u *saved_sbr = p_sbr; -+ -+ /* Make 'sbr' empty for a moment to get the correct size. */ -+ p_sbr = empty_option; -+#endif - getvcols(curwin, &curwin->w_cursor, &VIsual, &leftcol, &rightcol); -+#ifdef FEAT_LINEBREAK -+ p_sbr = saved_sbr; -+#endif - sprintf((char *)showcmd_buf, "%ldx%ld", lines, - (long)(rightcol - leftcol + 1)); - } - else if (VIsual_mode == 'V' || VIsual.lnum != curwin->w_cursor.lnum) - sprintf((char *)showcmd_buf, "%ld", lines); - else -- sprintf((char *)showcmd_buf, "%ld", (long)(i -+ sprintf((char *)showcmd_buf, "%ld", (long)(cursor_bot - ? curwin->w_cursor.col - VIsual.col - : VIsual.col - curwin->w_cursor.col) + (*p_sel != 'e')); - showcmd_buf[SHOWCMD_COLS] = NUL; /* truncate */ -@@ -4083,10 +4098,9 @@ - * Command character that doesn't do anything, but unlike nv_ignore() does - * start edit(). Used for "startinsert" executed while starting up. - */ --/*ARGSUSED */ - static void - nv_nop(cap) -- cmdarg_T *cap; -+ cmdarg_T *cap UNUSED; - { - } - -@@ -4611,9 +4625,7 @@ - ++no_mapping; - ++allow_keys; /* no mapping for nchar, but allow key codes */ - nchar = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(nchar, TRUE); --#endif - --no_mapping; - --allow_keys; - #ifdef FEAT_CMDL_INFO -@@ -4969,9 +4981,7 @@ - ++no_mapping; - ++allow_keys; /* no mapping for nchar, but allow key codes */ - nchar = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(nchar, TRUE); --#endif - --no_mapping; - --allow_keys; - #ifdef FEAT_CMDL_INFO -@@ -5228,7 +5238,7 @@ - if (cap->oap->op_type != OP_NOP - && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count - || cap->oap->start.col > -- STRLEN(ml_get(cap->oap->start.lnum)))) -+ (colnr_T)STRLEN(ml_get(cap->oap->start.lnum)))) - clearopbeep(cap->oap); - } - } -@@ -5469,6 +5479,20 @@ - STRCPY(buf, "he! "); - else - { -+ /* An external command will probably use an argument starting -+ * with "-" as an option. To avoid trouble we skip the "-". */ -+ while (*ptr == '-' && n > 0) -+ { -+ ++ptr; -+ --n; -+ } -+ if (n == 0) -+ { -+ EMSG(_(e_noident)); /* found dashes only */ -+ vim_free(buf); -+ return; -+ } -+ - /* When a count is given, turn it into a range. Is this - * really what we want? */ - isman = (STRCMP(kp, "man") == 0); -@@ -5511,37 +5535,59 @@ - /* - * Now grab the chars in the identifier - */ -- if (cmdchar == '*') -- aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); -- else if (cmdchar == '#') -- aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); -- else if (cmdchar == 'K' && !kp_help) -- aux_ptr = (char_u *)" \t\\\"|!"; -- else -- /* Don't escape spaces and Tabs in a tag with a backslash */ -- aux_ptr = (char_u *)"\\|\""; -- -- p = buf + STRLEN(buf); -- while (n-- > 0) -- { -- /* put a backslash before \ and some others */ -- if (vim_strchr(aux_ptr, *ptr) != NULL) -- *p++ = '\\'; --#ifdef FEAT_MBYTE -- /* When current byte is a part of multibyte character, copy all bytes -- * of that character. */ -- if (has_mbyte) -+ if (cmdchar == 'K' && !kp_help) -+ { -+ /* Escape the argument properly for a shell command */ -+ ptr = vim_strnsave(ptr, n); -+ p = vim_strsave_shellescape(ptr, TRUE); -+ vim_free(ptr); -+ if (p == NULL) - { -- int i; -- int len = (*mb_ptr2len)(ptr) - 1; -- -- for (i = 0; i < len && n >= 1; ++i, --n) -- *p++ = *ptr++; -+ vim_free(buf); -+ return; - } -+ buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1); -+ if (buf == NULL) -+ { -+ vim_free(buf); -+ vim_free(p); -+ return; -+ } -+ STRCAT(buf, p); -+ vim_free(p); -+ } -+ else -+ { -+ if (cmdchar == '*') -+ aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); -+ else if (cmdchar == '#') -+ aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); -+ else -+ /* Don't escape spaces and Tabs in a tag with a backslash */ -+ aux_ptr = (char_u *)"\\|\"\n*?["; -+ -+ p = buf + STRLEN(buf); -+ while (n-- > 0) -+ { -+ /* put a backslash before \ and some others */ -+ if (vim_strchr(aux_ptr, *ptr) != NULL) -+ *p++ = '\\'; -+#ifdef FEAT_MBYTE -+ /* When current byte is a part of multibyte character, copy all -+ * bytes of that character. */ -+ if (has_mbyte) -+ { -+ int i; -+ int len = (*mb_ptr2len)(ptr) - 1; -+ -+ for (i = 0; i < len && n >= 1; ++i, --n) -+ *p++ = *ptr++; -+ } - #endif -- *p++ = *ptr++; -+ *p++ = *ptr++; -+ } -+ *p = NUL; - } -- *p = NUL; - - /* - * Execute the command. -@@ -5767,7 +5813,10 @@ - for (n = cap->count1; n > 0; --n) - { - if ((!PAST_LINE && oneright() == FAIL) -- || (PAST_LINE && *ml_get_cursor() == NUL)) -+#ifdef FEAT_VISUAL -+ || (PAST_LINE && *ml_get_cursor() == NUL) -+#endif -+ ) - { - /* - * wraps to next line if 'whichwrap' has 's'. -@@ -6011,7 +6060,7 @@ - autowrite(curbuf, FALSE); - setpcmark(); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, -- P_HID(curbuf) ? ECMD_HIDE : 0); -+ P_HID(curbuf) ? ECMD_HIDE : 0, curwin); - if (cap->nchar == 'F' && lnum >= 0) - { - curwin->w_cursor.lnum = lnum; -@@ -6728,6 +6777,8 @@ - /* Visual mode "r" */ - if (VIsual_active) - { -+ if (got_int) -+ reset_VIsual(); - nv_operator(cap); - return; - } -@@ -7784,7 +7835,7 @@ - else - i = curwin->w_leftcol; - /* Go to the middle of the screen line. When 'number' is on and lines -- * are wrapping the middle can be more to the left.*/ -+ * are wrapping the middle can be more to the left. */ - if (cap->nchar == 'm') - i += (W_WIDTH(curwin) - curwin_col_off() - + ((curwin->w_p_wrap && i > 0) -@@ -9192,10 +9243,9 @@ - } - - #ifdef FEAT_SNIFF --/*ARGSUSED*/ - static void - nv_sniff(cap) -- cmdarg_T *cap; -+ cmdarg_T *cap UNUSED; - { - ProcessSniffRequests(); - } -@@ -9211,10 +9261,9 @@ - #endif - - #ifdef FEAT_DND --/*ARGSUSED*/ - static void - nv_drop(cap) -- cmdarg_T *cap; -+ cmdarg_T *cap UNUSED; - { - do_put('~', BACKWARD, 1L, PUT_CURSEND); - } -@@ -9226,7 +9275,6 @@ - * When waiting for a character for 'updatetime' K_CURSORHOLD is put in the - * input buffer. "did_cursorhold" is set to avoid retriggering. - */ --/*ARGSUSED*/ - static void - nv_cursorhold(cap) - cmdarg_T *cap; -diff -Naur vim72.orig/src/ops.c vim72/src/ops.c ---- vim72.orig/src/ops.c 2008-06-21 21:08:59.000000000 +0100 -+++ vim72/src/ops.c 2009-07-22 22:54:23.000000000 +0100 -@@ -72,11 +72,11 @@ - */ - struct block_def - { -- int startspaces; /* 'extra' cols of first char */ -- int endspaces; /* 'extra' cols of first char */ -+ int startspaces; /* 'extra' cols before first char */ -+ int endspaces; /* 'extra' cols after last char */ - int textlen; /* chars in block */ -- char_u *textstart; /* pointer to 1st char in block */ -- colnr_T textcol; /* cols of chars (at least part.) in block */ -+ char_u *textstart; /* pointer to 1st char (partially) in block */ -+ colnr_T textcol; /* index of chars (partially) in block */ - colnr_T start_vcol; /* start col of 1st char wholly inside block */ - colnr_T end_vcol; /* start col of 1st char wholly after block */ - #ifdef FEAT_VISUALEXTRA -@@ -382,18 +382,16 @@ - { - int left = (oap->op_type == OP_LSHIFT); - int oldstate = State; -- int total, split; -- char_u *newp, *oldp, *midp, *ptr; -+ int total; -+ char_u *newp, *oldp; - int oldcol = curwin->w_cursor.col; - int p_sw = (int)curbuf->b_p_sw; - int p_ts = (int)curbuf->b_p_ts; - struct block_def bd; -- int internal = 0; - int incr; -- colnr_T vcol, col = 0, ws_vcol; -+ colnr_T ws_vcol; - int i = 0, j = 0; - int len; -- - #ifdef FEAT_RIGHTLEFT - int old_p_ri = p_ri; - -@@ -456,67 +454,90 @@ - } - else /* left */ - { -- vcol = oap->start_vcol; -- /* walk vcol past ws to be removed */ -- for (midp = oldp + bd.textcol; -- vcol < (oap->start_vcol + total) && vim_iswhite(*midp); ) -- { -- incr = lbr_chartabsize_adv(&midp, (colnr_T)vcol); -- vcol += incr; -- } -- /* internal is the block-internal ws replacing a split TAB */ -- if (vcol > (oap->start_vcol + total)) -- { -- /* we have to split the TAB *(midp-1) */ -- internal = vcol - (oap->start_vcol + total); -- } -- /* if 'expandtab' is not set, use TABs */ -+ colnr_T destination_col; /* column to which text in block will -+ be shifted */ -+ char_u *verbatim_copy_end; /* end of the part of the line which is -+ copied verbatim */ -+ colnr_T verbatim_copy_width;/* the (displayed) width of this part -+ of line */ -+ unsigned fill; /* nr of spaces that replace a TAB */ -+ unsigned new_line_len; /* the length of the line after the -+ block shift */ -+ size_t block_space_width; -+ size_t shift_amount; -+ char_u *non_white = bd.textstart; -+ colnr_T non_white_col; - -- split = bd.startspaces + internal; -- if (split > 0) -- { -- if (!curbuf->b_p_et) -- { -- for (ptr = oldp, col = 0; ptr < oldp+bd.textcol; ) -- col += lbr_chartabsize_adv(&ptr, (colnr_T)col); -+ /* -+ * Firstly, let's find the first non-whitespace character that is -+ * displayed after the block's start column and the character's column -+ * number. Also, let's calculate the width of all the whitespace -+ * characters that are displayed in the block and precede the searched -+ * non-whitespace character. -+ */ - -- /* col+1 now equals the start col of the first char of the -- * block (may be < oap.start_vcol if we're splitting a TAB) */ -- i = ((col % p_ts) + split) / p_ts; /* number of tabs */ -- } -- if (i) -- j = ((col % p_ts) + split) % p_ts; /* number of spp */ -- else -- j = split; -- } -+ /* If "bd.startspaces" is set, "bd.textstart" points to the character, -+ * the part of which is displayed at the block's beginning. Let's start -+ * searching from the next character. */ -+ if (bd.startspaces) -+ mb_ptr_adv(non_white); - -- newp = alloc_check(bd.textcol + i + j + (unsigned)STRLEN(midp) + 1); -- if (newp == NULL) -- return; -- vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + STRLEN(midp) + 1)); -+ /* The character's column is in "bd.start_vcol". */ -+ non_white_col = bd.start_vcol; - -- /* copy first part we want to keep */ -- mch_memmove(newp, oldp, (size_t)bd.textcol); -- /* Now copy any TABS and spp to ensure correct alignment! */ -- while (vim_iswhite(*midp)) -+ while (vim_iswhite(*non_white)) - { -- if (*midp == TAB) -- i++; -- else /*space */ -- j++; -- midp++; -+ incr = lbr_chartabsize_adv(&non_white, non_white_col); -+ non_white_col += incr; - } -- /* We might have an extra TAB worth of spp now! */ -- if (j / p_ts && !curbuf->b_p_et) -+ -+ block_space_width = non_white_col - oap->start_vcol; -+ /* We will shift by "total" or "block_space_width", whichever is less. -+ */ -+ shift_amount = (block_space_width < (size_t)total -+ ? block_space_width : (size_t)total); -+ -+ /* The column to which we will shift the text. */ -+ destination_col = (colnr_T)(non_white_col - shift_amount); -+ -+ /* Now let's find out how much of the beginning of the line we can -+ * reuse without modification. */ -+ verbatim_copy_end = bd.textstart; -+ verbatim_copy_width = bd.start_vcol; -+ -+ /* If "bd.startspaces" is set, "bd.textstart" points to the character -+ * preceding the block. We have to subtract its width to obtain its -+ * column number. */ -+ if (bd.startspaces) -+ verbatim_copy_width -= bd.start_char_vcols; -+ while (verbatim_copy_width < destination_col) - { -- i++; -- j -= p_ts; -+ incr = lbr_chartabsize(verbatim_copy_end, verbatim_copy_width); -+ if (verbatim_copy_width + incr > destination_col) -+ break; -+ verbatim_copy_width += incr; -+ mb_ptr_adv(verbatim_copy_end); - } -- copy_chars(newp + bd.textcol, (size_t)i, TAB); -- copy_spaces(newp + bd.textcol + i, (size_t)j); - -- /* the end */ -- STRMOVE(newp + STRLEN(newp), midp); -+ /* If "destination_col" is different from the width of the initial -+ * part of the line that will be copied, it means we encountered a tab -+ * character, which we will have to partly replace with spaces. */ -+ fill = destination_col - verbatim_copy_width; -+ -+ /* The replacement line will consist of: -+ * - the beginning of the original line up to "verbatim_copy_end", -+ * - "fill" number of spaces, -+ * - the rest of the line, pointed to by non_white. */ -+ new_line_len = (unsigned)(verbatim_copy_end - oldp) -+ + fill -+ + (unsigned)STRLEN(non_white) + 1; -+ -+ newp = alloc_check(new_line_len); -+ if (newp == NULL) -+ return; -+ mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); -+ copy_spaces(newp + (verbatim_copy_end - oldp), (size_t)fill); -+ STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); - } - /* replace the line */ - ml_replace(curwin->w_cursor.lnum, newp, FALSE); -@@ -1122,6 +1143,8 @@ - return OK; - } - -+static int execreg_lastc = NUL; -+ - /* - * execute a yank register: copy it into the stuff buffer - * -@@ -1134,7 +1157,6 @@ - int addcr; /* always add '\n' to end of line */ - int silent; /* set "silent" flag in typeahead buffer */ - { -- static int lastc = NUL; - long i; - char_u *p; - int retval = OK; -@@ -1142,12 +1164,12 @@ - - if (regname == '@') /* repeat previous one */ - { -- if (lastc == NUL) -+ if (execreg_lastc == NUL) - { - EMSG(_("E748: No previously used register")); - return FAIL; - } -- regname = lastc; -+ regname = execreg_lastc; - } - /* check for valid regname */ - if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) -@@ -1155,7 +1177,7 @@ - emsg_invreg(regname); - return FAIL; - } -- lastc = regname; -+ execreg_lastc = regname; - - #ifdef FEAT_CLIPBOARD - regname = may_get_selection(regname); -@@ -2209,12 +2231,15 @@ - { - for (; pos.lnum <= oap->end.lnum; ++pos.lnum) - { -+ int one_change; -+ - block_prep(oap, &bd, pos.lnum, FALSE); - pos.col = bd.textcol; -- did_change = swapchars(oap->op_type, &pos, bd.textlen); -+ one_change = swapchars(oap->op_type, &pos, bd.textlen); -+ did_change |= one_change; - - # ifdef FEAT_NETBEANS_INTG -- if (usingNetbeans && did_change) -+ if (usingNetbeans && one_change) - { - char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); - -@@ -4848,7 +4873,8 @@ - * - textlen includes the first/last char to be (partly) deleted - * - start/endspaces is the number of columns that are taken by the - * first/last deleted char minus the number of columns that have to be -- * deleted. for yank and tilde: -+ * deleted. -+ * for yank and tilde: - * - textlen includes the first/last char to be wholly yanked - * - start/endspaces is the number of columns of the first/last yanked char - * that are to be yanked. -@@ -5312,11 +5338,14 @@ - - /* We only get here (hopefully) if line[0] == '"' */ - str = virp->vir_line + 1; -+ -+ /* If the line starts with "" this is the y_previous register. */ - if (*str == '"') - { - set_prev = TRUE; - str++; - } -+ - if (!ASCII_ISALNUM(*str) && *str != '-') - { - if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) -@@ -5326,6 +5355,14 @@ - get_yank_register(*str++, FALSE); - if (!force && y_current->y_array != NULL) - do_it = FALSE; -+ -+ if (*str == '@') -+ { -+ /* "x@: register x used for @@ */ -+ if (force || execreg_lastc == NUL) -+ execreg_lastc = str[-1]; -+ } -+ - size = 0; - limit = 100; /* Optimized for registers containing <= 100 lines */ - if (do_it) -@@ -5335,7 +5372,7 @@ - vim_free(y_current->y_array); - array = y_current->y_array = - (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); -- str = skipwhite(str); -+ str = skipwhite(skiptowhite(str)); - if (STRNCMP(str, "CHAR", 4) == 0) - y_current->y_type = MCHAR; - #ifdef FEAT_VISUAL -@@ -5418,6 +5455,7 @@ - max_kbyte = get_viminfo_parameter('s'); - if (max_kbyte == 0) - return; -+ - for (i = 0; i < NUM_REGISTERS; i++) - { - if (y_regs[i].y_array == NULL) -@@ -5472,7 +5510,10 @@ - if (y_previous == &y_regs[i]) - fprintf(fp, "\""); - c = get_register_name(i); -- fprintf(fp, "\"%c\t%s\t%d\n", c, type, -+ fprintf(fp, "\"%c", c); -+ if (c == execreg_lastc) -+ fprintf(fp, "@"); -+ fprintf(fp, "\t%s\t%d\n", type, - #ifdef FEAT_VISUAL - (int)y_regs[i].y_width - #else -@@ -5550,6 +5591,29 @@ - if (dpy != NULL && str != NULL && motion_type >= 0 - && len < 1024*1024 && len > 0) - { -+#ifdef FEAT_MBYTE -+ /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from -+ * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit -+ * encoding conversion usually doesn't work, so keep the text as-is. -+ */ -+ if (has_mbyte) -+ { -+ char_u *conv_str = str; -+ vimconv_T vc; -+ -+ vc.vc_type = CONV_NONE; -+ if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) -+ { -+ conv_str = string_convert(&vc, str, (int*)&len); -+ if (conv_str != NULL) -+ { -+ vim_free(str); -+ str = conv_str; -+ } -+ convert_setup(&vc, NULL, NULL); -+ } -+ } -+#endif - XStoreBuffer(dpy, (char *)str, (int)len, 0); - XFlush(dpy); - } -@@ -6258,11 +6322,20 @@ - - if (VIsual_mode == Ctrl_V) - { -+#ifdef FEAT_LINEBREAK -+ char_u * saved_sbr = p_sbr; -+ -+ /* Make 'sbr' empty for a moment to get the correct size. */ -+ p_sbr = empty_option; -+#endif - oparg.is_VIsual = 1; - oparg.block_mode = TRUE; - oparg.op_type = OP_NOP; - getvcols(curwin, &min_pos, &max_pos, - &oparg.start_vcol, &oparg.end_vcol); -+#ifdef FEAT_LINEBREAK -+ p_sbr = saved_sbr; -+#endif - if (curwin->w_curswant == MAXCOL) - oparg.end_vcol = MAXCOL; - /* Swap the start, end vcol if needed */ -@@ -6366,7 +6439,7 @@ - { - getvcols(curwin, &min_pos, &max_pos, &min_pos.col, - &max_pos.col); -- sprintf((char *)buf1, _("%ld Cols; "), -+ vim_snprintf((char *)buf1, sizeof(buf1), _("%ld Cols; "), - (long)(oparg.end_vcol - oparg.start_vcol + 1)); - } - else -@@ -6374,13 +6447,15 @@ - - if (char_count_cursor == byte_count_cursor - && char_count == byte_count) -- sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"), -+ vim_snprintf((char *)IObuff, IOSIZE, -+ _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"), - buf1, line_count_selected, - (long)curbuf->b_ml.ml_line_count, - word_count_cursor, word_count, - byte_count_cursor, byte_count); - else -- sprintf((char *)IObuff, _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"), -+ vim_snprintf((char *)IObuff, IOSIZE, -+ _("Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"), - buf1, line_count_selected, - (long)curbuf->b_ml.ml_line_count, - word_count_cursor, word_count, -@@ -6392,20 +6467,22 @@ - { - p = ml_get_curline(); - validate_virtcol(); -- col_print(buf1, (int)curwin->w_cursor.col + 1, -+ col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1, - (int)curwin->w_virtcol + 1); -- col_print(buf2, (int)STRLEN(p), linetabsize(p)); -+ col_print(buf2, sizeof(buf2), (int)STRLEN(p), linetabsize(p)); - - if (char_count_cursor == byte_count_cursor - && char_count == byte_count) -- sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"), -+ vim_snprintf((char *)IObuff, IOSIZE, -+ _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"), - (char *)buf1, (char *)buf2, - (long)curwin->w_cursor.lnum, - (long)curbuf->b_ml.ml_line_count, - word_count_cursor, word_count, - byte_count_cursor, byte_count); - else -- sprintf((char *)IObuff, _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"), -+ vim_snprintf((char *)IObuff, IOSIZE, -+ _("Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"), - (char *)buf1, (char *)buf2, - (long)curwin->w_cursor.lnum, - (long)curbuf->b_ml.ml_line_count, -diff -Naur vim72.orig/src/option.c vim72/src/option.c ---- vim72.orig/src/option.c 2008-07-18 14:05:33.000000000 +0100 -+++ vim72/src/option.c 2009-07-22 22:54:24.000000000 +0100 -@@ -387,6 +387,9 @@ - char_u *def_val[2]; /* default values for variable (vi and vim) */ - #ifdef FEAT_EVAL - scid_T scriptID; /* script in which the option was last set */ -+# define SCRIPTID_INIT , 0 -+#else -+# define SCRIPTID_INIT - #endif - }; - -@@ -400,8 +403,9 @@ - #define P_NUM 0x02 /* the option is numeric */ - #define P_STRING 0x04 /* the option is a string */ - #define P_ALLOCED 0x08 /* the string option is in allocated memory, -- must use vim_free() when assigning new -- value. Not set if default is the same. */ -+ must use free_string_option() when -+ assigning new value. Not set if default is -+ the same. */ - #define P_EXPAND 0x10 /* environment expansion. NOTE: P_EXPAND can - never be used for local or hidden options! */ - #define P_NODEFAULT 0x40 /* don't set to default value */ -@@ -477,7 +481,7 @@ - #else - (char_u *)224L, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"antialias", "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #if defined(FEAT_GUI) && defined(MACOS_X) - (char_u *)&p_antialias, PV_NONE, -@@ -486,35 +490,35 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)FALSE} - #endif -- }, -+ SCRIPTID_INIT}, - {"arabic", "arab", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_ARABIC - (char_u *)VAR_WIN, PV_ARAB, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR, - #ifdef FEAT_ARABIC - (char_u *)&p_arshape, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"allowrevins", "ari", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ari, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"altkeymap", "akm", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_altkeymap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, - #if defined(FEAT_MBYTE) - (char_u *)&p_ambw, PV_NONE, -@@ -523,27 +527,27 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - #ifdef FEAT_AUTOCHDIR - {"autochdir", "acd", P_BOOL|P_VI_DEF, - (char_u *)&p_acd, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - #endif - {"autoindent", "ai", P_BOOL|P_VI_DEF, - (char_u *)&p_ai, PV_AI, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autoprint", "ap", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autoread", "ar", P_BOOL|P_VI_DEF, - (char_u *)&p_ar, PV_AR, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autowrite", "aw", P_BOOL|P_VI_DEF, - (char_u *)&p_aw, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autowriteall","awa", P_BOOL|P_VI_DEF, - (char_u *)&p_awa, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_bg, PV_NONE, - { -@@ -552,13 +556,13 @@ - #else - (char_u *)"light", - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_bs, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_bk, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"backupcopy", "bkc", P_STRING|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_bkc, PV_NONE, - #ifdef UNIX -@@ -566,10 +570,10 @@ - #else - {(char_u *)"auto", (char_u *)"auto"} - #endif -- }, -+ SCRIPTID_INIT}, - {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, - (char_u *)&p_bdir, PV_NONE, -- {(char_u *)DFLT_BDIR, (char_u *)0L}}, -+ {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT}, - {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_bex, PV_NONE, - { -@@ -578,7 +582,7 @@ - #else - (char_u *)"~", - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"backupskip", "bsk", P_STRING|P_VI_DEF|P_COMMA, - #ifdef FEAT_WILDIGN - (char_u *)&p_bsk, PV_NONE, -@@ -587,40 +591,40 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - #ifdef FEAT_BEVAL - {"balloondelay","bdlay",P_NUM|P_VI_DEF, - (char_u *)&p_bdlay, PV_NONE, -- {(char_u *)600L, (char_u *)0L}}, -+ {(char_u *)600L, (char_u *)0L} SCRIPTID_INIT}, - {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC, - (char_u *)&p_beval, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - # ifdef FEAT_EVAL - {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - (char_u *)&p_bexpr, PV_BEXPR, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - # endif - #endif - {"beautify", "bf", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"binary", "bin", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_bin, PV_BIN, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"bioskey", "biosk",P_BOOL|P_VI_DEF, - #ifdef MSDOS - (char_u *)&p_biosk, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - #ifdef FEAT_MBYTE - (char_u *)&p_bomb, PV_BOMB, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"breakat", "brk", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, - #ifdef FEAT_LINEBREAK - (char_u *)&p_breakat, PV_NONE, -@@ -629,7 +633,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"browsedir", "bsdir",P_STRING|P_VI_DEF, - #ifdef FEAT_BROWSE - (char_u *)&p_bsdir, PV_NONE, -@@ -638,7 +642,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"bufhidden", "bh", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - #if defined(FEAT_QUICKFIX) - (char_u *)&p_bh, PV_BH, -@@ -647,11 +651,11 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"buflisted", "bl", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_bl, PV_BL, - {(char_u *)1L, (char_u *)0L} -- }, -+ SCRIPTID_INIT}, - {"buftype", "bt", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, - #if defined(FEAT_QUICKFIX) - (char_u *)&p_bt, PV_BT, -@@ -660,7 +664,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"casemap", "cmp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_MBYTE - (char_u *)&p_cmp, PV_NONE, -@@ -669,7 +673,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cdpath", "cd", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_cdpath, PV_NONE, -@@ -678,7 +682,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cedit", NULL, P_STRING, - #ifdef FEAT_CMDWIN - (char_u *)&p_cedit, PV_NONE, -@@ -687,7 +691,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"charconvert", "ccv", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_MBYTE) && defined(FEAT_EVAL) - (char_u *)&p_ccv, PV_NONE, -@@ -696,14 +700,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cindent", "cin", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CINDENT - (char_u *)&p_cin, PV_CIN, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cink, PV_CINK, -@@ -712,14 +716,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_CINDENT - (char_u *)&p_cino, PV_CINO, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) - (char_u *)&p_cinw, PV_CINW, -@@ -729,7 +733,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"clipboard", "cb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_CLIPBOARD - (char_u *)&p_cb, PV_NONE, -@@ -743,20 +747,20 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cmdheight", "ch", P_NUM|P_VI_DEF|P_RALL, - (char_u *)&p_ch, PV_NONE, -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, - #ifdef FEAT_CMDWIN - (char_u *)&p_cwh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)7L, (char_u *)0L}}, -+ {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT}, - {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Columns, PV_NONE, -- {(char_u *)80L, (char_u *)0L}}, -+ {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT}, - {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_COMMENTS - (char_u *)&p_com, PV_COM, -@@ -766,7 +770,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_FOLDING - (char_u *)&p_cms, PV_CMS, -@@ -775,12 +779,12 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - /* P_PRI_MKRC isn't needed here, optval_default() - * always returns TRUE for 'compatible' */ - {"compatible", "cp", P_BOOL|P_RALL, - (char_u *)&p_cp, PV_NONE, -- {(char_u *)TRUE, (char_u *)FALSE}}, -+ {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT}, - {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cpt, PV_CPT, -@@ -789,7 +793,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_cfu, PV_CFU, -@@ -798,7 +802,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"completeopt", "cot", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_cot, PV_NONE, -@@ -807,34 +811,35 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"confirm", "cf", P_BOOL|P_VI_DEF, - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - (char_u *)&p_confirm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"conskey", "consk",P_BOOL|P_VI_DEF, - #ifdef MSDOS - (char_u *)&p_consk, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"copyindent", "ci", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ci, PV_CI, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cpoptions", "cpo", P_STRING|P_VIM|P_RALL|P_FLAGLIST, - (char_u *)&p_cpo, PV_NONE, -- {(char_u *)CPO_VI, (char_u *)CPO_VIM}}, -+ {(char_u *)CPO_VI, (char_u *)CPO_VIM} -+ SCRIPTID_INIT}, - {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_cspc, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopeprg", "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_CSCOPE - (char_u *)&p_csprg, PV_NONE, -@@ -843,7 +848,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) - (char_u *)&p_csqf, PV_NONE, -@@ -852,45 +857,45 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_cst, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_csto, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_CSCOPE - (char_u *)&p_csverbose, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUC, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SYN_HL - (char_u *)VAR_WIN, PV_CUL, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"debug", NULL, P_STRING|P_VI_DEF, - (char_u *)&p_debug, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_FIND_ID - (char_u *)&p_def, PV_DEF, -@@ -899,28 +904,28 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"delcombine", "deco", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_MBYTE - (char_u *)&p_deco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_dict, PV_DICT, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"diff", NULL, P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB, - #ifdef FEAT_DIFF - (char_u *)VAR_WIN, PV_DIFF, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"diffexpr", "dex", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_DIFF) && defined(FEAT_EVAL) - (char_u *)&p_dex, PV_NONE, -@@ -929,7 +934,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP, - #ifdef FEAT_DIFF - (char_u *)&p_dip, PV_NONE, -@@ -938,20 +943,20 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)NULL} - #endif -- }, -+ SCRIPTID_INIT}, - {"digraph", "dg", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_DIGRAPHS - (char_u *)&p_dg, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, - (char_u *)&p_dir, PV_NONE, -- {(char_u *)DFLT_DIR, (char_u *)0L}}, -+ {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT}, - {"display", "dy", P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP, - (char_u *)&p_dy, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"eadirection", "ead", P_STRING|P_VI_DEF, - #ifdef FEAT_VERTSPLIT - (char_u *)&p_ead, PV_NONE, -@@ -960,10 +965,10 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"edcompatible","ed", P_BOOL|P_VI_DEF, - (char_u *)&p_ed, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"encoding", "enc", P_STRING|P_VI_DEF|P_RCLR, - #ifdef FEAT_MBYTE - (char_u *)&p_enc, PV_NONE, -@@ -972,19 +977,19 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"endofline", "eol", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_eol, PV_EOL, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"equalalways", "ea", P_BOOL|P_VI_DEF|P_RALL, - (char_u *)&p_ea, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"equalprg", "ep", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_ep, PV_EP, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"errorbells", "eb", P_BOOL|P_VI_DEF, - (char_u *)&p_eb, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"errorfile", "ef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_ef, PV_NONE, -@@ -993,32 +998,32 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"errorformat", "efm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_QUICKFIX - (char_u *)&p_efm, PV_EFM, -- {(char_u *)DFLT_EFM, (char_u *)0L}, -+ {(char_u *)DFLT_EFM, (char_u *)0L} - #else - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"esckeys", "ek", P_BOOL|P_VIM, - (char_u *)&p_ek, PV_NONE, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"eventignore", "ei", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_AUTOCMD - (char_u *)&p_ei, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"expandtab", "et", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_et, PV_ET, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_exrc, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC, - #ifdef FEAT_MBYTE - (char_u *)&p_fenc, PV_FENC, -@@ -1027,7 +1032,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA, - #ifdef FEAT_MBYTE - (char_u *)&p_fencs, PV_NONE, -@@ -1036,13 +1041,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC, - (char_u *)&p_ff, PV_FF, -- {(char_u *)DFLT_FF, (char_u *)0L}}, -+ {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT}, - {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_ffs, PV_NONE, -- {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}}, -+ {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM} -+ SCRIPTID_INIT}, - {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - #ifdef FEAT_AUTOCMD - (char_u *)&p_ft, PV_FT, -@@ -1051,7 +1057,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, - #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING) - (char_u *)&p_fcs, PV_NONE, -@@ -1060,27 +1066,27 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"fkmap", "fk", P_BOOL|P_VI_DEF, - #ifdef FEAT_FKMAP - (char_u *)&p_fkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"flash", "fl", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - #ifdef FEAT_FOLDING - {"foldclose", "fcl", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN, - (char_u *)&p_fcl, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FDC, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"foldenable", "fen", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FEN, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"foldexpr", "fde", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - # ifdef FEAT_EVAL - (char_u *)VAR_WIN, PV_FDE, -@@ -1089,33 +1095,34 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - # endif -- }, -+ SCRIPTID_INIT}, - {"foldignore", "fdi", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FDI, -- {(char_u *)"#", (char_u *)NULL}}, -+ {(char_u *)"#", (char_u *)NULL} SCRIPTID_INIT}, - {"foldlevel", "fdl", P_NUM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FDL, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"foldlevelstart","fdls", P_NUM|P_VI_DEF, - (char_u *)&p_fdls, PV_NONE, -- {(char_u *)-1L, (char_u *)0L}}, -+ {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, - {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF| - P_RWIN|P_COMMA|P_NODUP, - (char_u *)VAR_WIN, PV_FMR, -- {(char_u *)"{{{,}}}", (char_u *)NULL}}, -+ {(char_u *)"{{{,}}}", (char_u *)NULL} -+ SCRIPTID_INIT}, - {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FDM, -- {(char_u *)"manual", (char_u *)NULL}}, -+ {(char_u *)"manual", (char_u *)NULL} SCRIPTID_INIT}, - {"foldminlines","fml", P_NUM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FML, -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_FDN, -- {(char_u *)20L, (char_u *)0L}}, -+ {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, - {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_fdo, PV_NONE, - {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo", -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, - # ifdef FEAT_EVAL - (char_u *)VAR_WIN, PV_FDT, -@@ -1124,7 +1131,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - # endif -- }, -+ SCRIPTID_INIT}, - #endif - {"formatexpr", "fex", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #ifdef FEAT_EVAL -@@ -1134,16 +1141,18 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"formatoptions","fo", P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST, - (char_u *)&p_fo, PV_FO, -- {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}}, -+ {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM} -+ SCRIPTID_INIT}, - {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF, - (char_u *)&p_flp, PV_FLP, -- {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", (char_u *)0L}}, -+ {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", -+ (char_u *)0L} SCRIPTID_INIT}, - {"formatprg", "fp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_fp, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"fsync", "fs", P_BOOL|P_SECURE|P_VI_DEF, - #ifdef HAVE_FSYNC - (char_u *)&p_fs, PV_NONE, -@@ -1152,22 +1161,22 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)FALSE, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"gdefault", "gd", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_gd, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"graphic", "gr", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"grepformat", "gfm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gefm, PV_NONE, -- {(char_u *)DFLT_GREPFORMAT, (char_u *)0L}, -+ {(char_u *)DFLT_GREPFORMAT, (char_u *)0L} - #else - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"grepprg", "gp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_gp, PV_GP, -@@ -1185,15 +1194,15 @@ - (char_u *)"SEARCH/NUMBERS ", - # else - (char_u *)"grep -n ", --#endif --#endif -+# endif -+# endif - # endif -- (char_u *)0L}, -+ (char_u *)0L} - #else - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guicursor", "gcr", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef CURSOR_SHAPE - (char_u *)&p_guicursor, PV_NONE, -@@ -1208,7 +1217,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, - #ifdef FEAT_GUI - (char_u *)&p_guifont, PV_NONE, -@@ -1217,7 +1226,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_COMMA, - #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) - (char_u *)&p_guifontset, PV_NONE, -@@ -1226,7 +1235,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, - #if defined(FEAT_GUI) && defined(FEAT_MBYTE) - (char_u *)&p_guifontwide, PV_NONE, -@@ -1235,14 +1244,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guiheadroom", "ghr", P_NUM|P_VI_DEF, - #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) - (char_u *)&p_ghr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)50L, (char_u *)0L}}, -+ {(char_u *)50L, (char_u *)0L} SCRIPTID_INIT}, - {"guioptions", "go", P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST, - #if defined(FEAT_GUI) - (char_u *)&p_go, PV_NONE, -@@ -1255,14 +1264,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guipty", NULL, P_BOOL|P_VI_DEF, - #if defined(FEAT_GUI) - (char_u *)&p_guipty, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"guitablabel", "gtl", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtl, PV_NONE, -@@ -1271,7 +1280,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"guitabtooltip", "gtt", P_STRING|P_VI_DEF|P_RWIN, - #if defined(FEAT_GUI_TABLINE) - (char_u *)&p_gtt, PV_NONE, -@@ -1280,20 +1289,21 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"hardtabs", "ht", P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"helpfile", "hf", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_hf, PV_NONE, -- {(char_u *)DFLT_HELPFILE, (char_u *)0L}}, -+ {(char_u *)DFLT_HELPFILE, (char_u *)0L} -+ SCRIPTID_INIT}, - {"helpheight", "hh", P_NUM|P_VI_DEF, - #ifdef FEAT_WINDOWS - (char_u *)&p_hh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)20L, (char_u *)0L}}, -+ {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, - {"helplang", "hlg", P_STRING|P_VI_DEF|P_COMMA, - #ifdef FEAT_MULTI_LANG - (char_u *)&p_hlg, PV_NONE, -@@ -1302,64 +1312,65 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"hidden", "hid", P_BOOL|P_VI_DEF, - (char_u *)&p_hid, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, - (char_u *)&p_hl, PV_NONE, -- {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}}, -+ {(char_u *)HIGHLIGHT_INIT, (char_u *)0L} -+ SCRIPTID_INIT}, - {"history", "hi", P_NUM|P_VIM, - (char_u *)&p_hi, PV_NONE, -- {(char_u *)0L, (char_u *)20L}}, -+ {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT}, - {"hkmap", "hk", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmap, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"hkmapp", "hkp", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_hkmapp, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_hls, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"icon", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_icon, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"iconstring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_iconstring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"ignorecase", "ic", P_BOOL|P_VI_DEF, - (char_u *)&p_ic, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"imactivatekey","imak",P_STRING|P_VI_DEF, - #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) - (char_u *)&p_imak, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"imcmdline", "imc", P_BOOL|P_VI_DEF, - #ifdef USE_IM_CONTROL - (char_u *)&p_imcmdline, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"imdisable", "imd", P_BOOL|P_VI_DEF, - #ifdef USE_IM_CONTROL - (char_u *)&p_imdisable, PV_NONE, -@@ -1371,7 +1382,7 @@ - #else - {(char_u *)FALSE, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"iminsert", "imi", P_NUM|P_VI_DEF, - (char_u *)&p_iminsert, PV_IMI, - #ifdef B_IMODE_IM -@@ -1379,7 +1390,7 @@ - #else - {(char_u *)B_IMODE_NONE, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"imsearch", "ims", P_NUM|P_VI_DEF, - (char_u *)&p_imsearch, PV_IMS, - #ifdef B_IMODE_IM -@@ -1387,7 +1398,7 @@ - #else - {(char_u *)B_IMODE_NONE, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_FIND_ID - (char_u *)&p_inc, PV_INC, -@@ -1396,7 +1407,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF, - #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) - (char_u *)&p_inex, PV_INEX, -@@ -1405,10 +1416,10 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"incsearch", "is", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_is, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"indentexpr", "inde", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_inde, PV_INDE, -@@ -1417,7 +1428,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) - (char_u *)&p_indk, PV_INDK, -@@ -1426,13 +1437,13 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"infercase", "inf", P_BOOL|P_VI_DEF, - (char_u *)&p_inf, PV_INF, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"insertmode", "im", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_im, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"isfname", "isf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isf, PV_NONE, - { -@@ -1455,7 +1466,7 @@ - # endif - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"isident", "isi", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_isi, PV_NONE, - { -@@ -1472,7 +1483,7 @@ - (char_u *)"@,48-57,_,192-255", - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"iskeyword", "isk", P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP, - (char_u *)&p_isk, PV_ISK, - { -@@ -1491,7 +1502,7 @@ - ISK_LATIN1 - # endif - #endif -- }}, -+ } SCRIPTID_INIT}, - {"isprint", "isp", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, - (char_u *)&p_isp, PV_NONE, - { -@@ -1507,10 +1518,10 @@ - ISP_LATIN1, - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"joinspaces", "js", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_js, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"key", NULL, P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC, - #ifdef FEAT_CRYPT - (char_u *)&p_key, PV_KEY, -@@ -1519,7 +1530,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC, - #ifdef FEAT_KEYMAP - (char_u *)&p_keymap, PV_KMAP, -@@ -1528,14 +1539,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_VISUAL - (char_u *)&p_km, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_kp, PV_KP, - { -@@ -1556,7 +1567,7 @@ - # endif - #endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_LANGMAP - (char_u *)&p_langmap, PV_NONE, -@@ -1565,31 +1576,31 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, - #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) - (char_u *)&p_lm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL, - #ifdef FEAT_WINDOWS - (char_u *)&p_ls, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"lazyredraw", "lz", P_BOOL|P_VI_DEF, - (char_u *)&p_lz, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"linebreak", "lbr", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_LBR, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, - (char_u *)&Rows, PV_NONE, - { -@@ -1598,7 +1609,7 @@ - #else - (char_u *)24L, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR, - #ifdef FEAT_GUI - (char_u *)&p_linespace, PV_NONE, -@@ -1610,14 +1621,14 @@ - #else - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"lisp", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_LISP - (char_u *)&p_lisp, PV_LISP, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"lispwords", "lw", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_LISP - (char_u *)&p_lispwords, PV_NONE, -@@ -1626,24 +1637,24 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)"", (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_LIST, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, - (char_u *)&p_lcs, PV_NONE, -- {(char_u *)"eol:$", (char_u *)0L}}, -+ {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT}, - {"loadplugins", "lpl", P_BOOL|P_VI_DEF, - (char_u *)&p_lpl, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - #ifdef FEAT_GUI_MAC - {"macatsui", NULL, P_BOOL|P_VI_DEF|P_RCLR, - (char_u *)&p_macatsui, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - #endif - {"magic", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_magic, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"makeef", "mef", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mef, PV_NONE, -@@ -1652,7 +1663,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"makeprg", "mp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_mp, PV_MP, -@@ -1665,49 +1676,52 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_mps, PV_MPS, -- {(char_u *)"(:),{:},[:]", (char_u *)0L}}, -+ {(char_u *)"(:),{:},[:]", (char_u *)0L} -+ SCRIPTID_INIT}, - {"matchtime", "mat", P_NUM|P_VI_DEF, - (char_u *)&p_mat, PV_NONE, -- {(char_u *)5L, (char_u *)0L}}, -+ {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, - {"maxcombine", "mco", P_NUM|P_VI_DEF, - #ifdef FEAT_MBYTE - (char_u *)&p_mco, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)2, (char_u *)0L}}, -+ {(char_u *)2, (char_u *)0L} SCRIPTID_INIT}, - {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF, - #ifdef FEAT_EVAL - (char_u *)&p_mfd, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)100L, (char_u *)0L}}, -+ {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmapdepth", "mmd", P_NUM|P_VI_DEF, - (char_u *)&p_mmd, PV_NONE, -- {(char_u *)1000L, (char_u *)0L}}, -+ {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmem", "mm", P_NUM|P_VI_DEF, - (char_u *)&p_mm, PV_NONE, -- {(char_u *)DFLT_MAXMEM, (char_u *)0L}}, -+ {(char_u *)DFLT_MAXMEM, (char_u *)0L} -+ SCRIPTID_INIT}, - {"maxmempattern","mmp", P_NUM|P_VI_DEF, - (char_u *)&p_mmp, PV_NONE, -- {(char_u *)1000L, (char_u *)0L}}, -+ {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"maxmemtot", "mmt", P_NUM|P_VI_DEF, - (char_u *)&p_mmt, PV_NONE, -- {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}}, -+ {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L} -+ SCRIPTID_INIT}, - {"menuitems", "mis", P_NUM|P_VI_DEF, - #ifdef FEAT_MENU - (char_u *)&p_mis, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)25L, (char_u *)0L}}, -+ {(char_u *)25L, (char_u *)0L} SCRIPTID_INIT}, - {"mesg", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"mkspellmem", "msm", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE, - #ifdef FEAT_SPELL - (char_u *)&p_msm, PV_NONE, -@@ -1716,22 +1730,22 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"modeline", "ml", P_BOOL|P_VIM, - (char_u *)&p_ml, PV_ML, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"modelines", "mls", P_NUM|P_VI_DEF, - (char_u *)&p_mls, PV_NONE, -- {(char_u *)5L, (char_u *)0L}}, -+ {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT}, - {"modifiable", "ma", P_BOOL|P_VI_DEF|P_NOGLOB, - (char_u *)&p_ma, PV_MA, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"modified", "mod", P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, - (char_u *)&p_mod, PV_MOD, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"more", NULL, P_BOOL|P_VIM, - (char_u *)&p_more, PV_NONE, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"mouse", NULL, P_STRING|P_VI_DEF|P_FLAGLIST, - (char_u *)&p_mouse, PV_NONE, - { -@@ -1740,21 +1754,21 @@ - #else - (char_u *)"", - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"mousefocus", "mousef", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mousef, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"mousehide", "mh", P_BOOL|P_VI_DEF, - #ifdef FEAT_GUI - (char_u *)&p_mh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"mousemodel", "mousem", P_STRING|P_VI_DEF, - (char_u *)&p_mousem, PV_NONE, - { -@@ -1767,7 +1781,7 @@ - (char_u *)"extend", - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_MOUSESHAPE - (char_u *)&p_mouseshape, PV_NONE, -@@ -1776,33 +1790,34 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"mousetime", "mouset", P_NUM|P_VI_DEF, - (char_u *)&p_mouset, PV_NONE, -- {(char_u *)500L, (char_u *)0L}}, -+ {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT}, - {"mzquantum", "mzq", P_NUM, - #ifdef FEAT_MZSCHEME - (char_u *)&p_mzq, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)100L, (char_u *)100L}}, -+ {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT}, - {"novice", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_nf, PV_NF, -- {(char_u *)"octal,hex", (char_u *)0L}}, -+ {(char_u *)"octal,hex", (char_u *)0L} -+ SCRIPTID_INIT}, - {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_NU, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"numberwidth", "nuw", P_NUM|P_RWIN|P_VIM, - #ifdef FEAT_LINEBREAK - (char_u *)VAR_WIN, PV_NUW, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)8L, (char_u *)4L}}, -+ {(char_u *)8L, (char_u *)4L} SCRIPTID_INIT}, - {"omnifunc", "ofu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE, - #ifdef FEAT_COMPL_FUNC - (char_u *)&p_ofu, PV_OFU, -@@ -1811,10 +1826,10 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"open", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"opendevice", "odev", P_BOOL|P_VI_DEF, - #if defined(MSDOS) || defined(MSWIN) || defined(OS2) - (char_u *)&p_odev, PV_NONE, -@@ -1822,13 +1837,13 @@ - (char_u *)NULL, PV_NONE, - #endif - {(char_u *)FALSE, (char_u *)FALSE} -- }, -+ SCRIPTID_INIT}, - {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_opfunc, PV_NONE, -- {(char_u *)"", (char_u *)0L} }, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"optimize", "opt", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_OSFILETYPE - (char_u *)&p_oft, PV_OFT, -@@ -1837,17 +1852,17 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"paragraphs", "para", P_STRING|P_VI_DEF, - (char_u *)&p_para, PV_NONE, - {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"paste", NULL, P_BOOL|P_VI_DEF|P_PRI_MKRC, - (char_u *)&p_paste, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"pastetoggle", "pt", P_STRING|P_VI_DEF, - (char_u *)&p_pt, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"patchexpr", "pex", P_STRING|P_VI_DEF|P_SECURE, - #if defined(FEAT_DIFF) && defined(FEAT_EVAL) - (char_u *)&p_pex, PV_NONE, -@@ -1856,10 +1871,10 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, - (char_u *)&p_pm, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_path, PV_PATH, - { -@@ -1872,24 +1887,24 @@ - (char_u *)".,/usr/include,,", - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_pi, PV_PI, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"previewheight", "pvh", P_NUM|P_VI_DEF, - #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) - (char_u *)&p_pvh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)12L, (char_u *)0L}}, -+ {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT}, - {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) - (char_u *)VAR_WIN, PV_PVW, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_PRINTER - (char_u *)&p_pdev, PV_NONE, -@@ -1898,7 +1913,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printencoding", "penc", P_STRING|P_VI_DEF, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_penc, PV_NONE, -@@ -1907,7 +1922,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printexpr", "pexpr", P_STRING|P_VI_DEF, - #ifdef FEAT_POSTSCRIPT - (char_u *)&p_pexpr, PV_NONE, -@@ -1916,7 +1931,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printfont", "pfn", P_STRING|P_VI_DEF, - #ifdef FEAT_PRINTER - (char_u *)&p_pfn, PV_NONE, -@@ -1931,7 +1946,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printheader", "pheader", P_STRING|P_VI_DEF|P_GETTEXT, - #ifdef FEAT_PRINTER - (char_u *)&p_header, PV_NONE, -@@ -1940,7 +1955,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printmbcharset", "pmbcs", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmcs, PV_NONE, -@@ -1949,7 +1964,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printmbfont", "pmbfn", P_STRING|P_VI_DEF, - #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE) - (char_u *)&p_pmfn, PV_NONE, -@@ -1958,7 +1973,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_PRINTER - (char_u *)&p_popt, PV_NONE, -@@ -1967,17 +1982,17 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"prompt", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_prompt, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"pumheight", "ph", P_NUM|P_VI_DEF, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_ph, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, - #ifdef FEAT_TEXTOBJ - (char_u *)&p_qe, PV_QE, -@@ -1986,47 +2001,47 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"readonly", "ro", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB, - (char_u *)&p_ro, PV_RO, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"redraw", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"redrawtime", "rdt", P_NUM|P_VI_DEF, - #ifdef FEAT_RELTIME - (char_u *)&p_rdt, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)2000L, (char_u *)0L}}, -+ {(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT}, - {"remap", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_remap, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"report", NULL, P_NUM|P_VI_DEF, - (char_u *)&p_report, PV_NONE, -- {(char_u *)2L, (char_u *)0L}}, -+ {(char_u *)2L, (char_u *)0L} SCRIPTID_INIT}, - {"restorescreen", "rs", P_BOOL|P_VI_DEF, - #ifdef WIN3264 - (char_u *)&p_rs, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"revins", "ri", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_RIGHTLEFT - (char_u *)&p_ri, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rightleft", "rl", P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RL, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN, - #ifdef FEAT_RIGHTLEFT - (char_u *)VAR_WIN, PV_RLC, -@@ -2035,40 +2050,41 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"ruler", "ru", P_BOOL|P_VI_DEF|P_VIM|P_RSTAT, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_ru, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"rulerformat", "ruf", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_ruf, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE, - (char_u *)&p_rtp, PV_NONE, -- {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}}, -+ {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} -+ SCRIPTID_INIT}, - {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF, - (char_u *)VAR_WIN, PV_SCROLL, -- {(char_u *)12L, (char_u *)0L}}, -+ {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT}, - {"scrollbind", "scb", P_BOOL|P_VI_DEF, - #ifdef FEAT_SCROLLBIND - (char_u *)VAR_WIN, PV_SCBIND, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"scrolljump", "sj", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sj, PV_NONE, -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL, - (char_u *)&p_so, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SCROLLBIND - (char_u *)&p_sbo, PV_NONE, -@@ -2077,27 +2093,29 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"sections", "sect", P_STRING|P_VI_DEF, - (char_u *)&p_sections, PV_NONE, -- {(char_u *)"SHNHH HUnhsh", (char_u *)0L}}, -+ {(char_u *)"SHNHH HUnhsh", (char_u *)0L} -+ SCRIPTID_INIT}, - {"secure", NULL, P_BOOL|P_VI_DEF|P_SECURE, - (char_u *)&p_secure, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"selection", "sel", P_STRING|P_VI_DEF, - #ifdef FEAT_VISUAL - (char_u *)&p_sel, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"inclusive", (char_u *)0L}}, -+ {(char_u *)"inclusive", (char_u *)0L} -+ SCRIPTID_INIT}, - {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_VISUAL - (char_u *)&p_slm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_ssop, PV_NONE, -@@ -2107,7 +2125,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"shell", "sh", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_sh, PV_NONE, - { -@@ -2136,7 +2154,7 @@ - # endif - # endif - #endif /* VMS */ -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shcf, PV_NONE, - { -@@ -2149,7 +2167,7 @@ - (char_u *)"-c", - # endif - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"shellpipe", "sp", P_STRING|P_VI_DEF|P_SECURE, - #ifdef FEAT_QUICKFIX - (char_u *)&p_sp, PV_NONE, -@@ -2168,30 +2186,30 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"shellquote", "shq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_shq, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"shellredir", "srr", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_srr, PV_NONE, -- {(char_u *)">", (char_u *)0L}}, -+ {(char_u *)">", (char_u *)0L} SCRIPTID_INIT}, - {"shellslash", "ssl", P_BOOL|P_VI_DEF, - #ifdef BACKSLASH_IN_FILENAME - (char_u *)&p_ssl, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"shelltemp", "stmp", P_BOOL, - (char_u *)&p_stmp, PV_NONE, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"shelltype", "st", P_NUM|P_VI_DEF, - #ifdef AMIGA - (char_u *)&p_st, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE, - (char_u *)&p_sxq, PV_NONE, - { -@@ -2200,30 +2218,31 @@ - #else - (char_u *)"", - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"shiftround", "sr", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sr, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"shiftwidth", "sw", P_NUM|P_VI_DEF, - (char_u *)&p_sw, PV_SW, -- {(char_u *)8L, (char_u *)0L}}, -+ {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, - {"shortmess", "shm", P_STRING|P_VIM|P_FLAGLIST, - (char_u *)&p_shm, PV_NONE, -- {(char_u *)"", (char_u *)"filnxtToO"}}, -+ {(char_u *)"", (char_u *)"filnxtToO"} -+ SCRIPTID_INIT}, - {"shortname", "sn", P_BOOL|P_VI_DEF, - #ifdef SHORT_FNAME - (char_u *)NULL, PV_NONE, - #else - (char_u *)&p_sn, PV_SN, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showbreak", "sbr", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_LINEBREAK - (char_u *)&p_sbr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"showcmd", "sc", P_BOOL|P_VIM, - #ifdef FEAT_CMDL_INFO - (char_u *)&p_sc, PV_NONE, -@@ -2236,58 +2255,58 @@ - #else - (char_u *)TRUE - #endif -- }}, -+ } SCRIPTID_INIT}, - {"showfulltag", "sft", P_BOOL|P_VI_DEF, - (char_u *)&p_sft, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showmatch", "sm", P_BOOL|P_VI_DEF, - (char_u *)&p_sm, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"showmode", "smd", P_BOOL|P_VIM, - (char_u *)&p_smd, PV_NONE, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL, - #ifdef FEAT_WINDOWS - (char_u *)&p_stal, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"sidescroll", "ss", P_NUM|P_VI_DEF, - (char_u *)&p_ss, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF, - (char_u *)&p_siso, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"slowopen", "slow", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smartcase", "scs", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_scs, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smartindent", "si", P_BOOL|P_VI_DEF|P_VIM, - #ifdef FEAT_SMARTINDENT - (char_u *)&p_si, PV_SI, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"smarttab", "sta", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sta, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"softtabstop", "sts", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_sts, PV_STS, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"sourceany", NULL, P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN, - #ifdef FEAT_SPELL - (char_u *)VAR_WIN, PV_SPELL, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF, - #ifdef FEAT_SPELL - (char_u *)&p_spc, PV_SPC, -@@ -2296,7 +2315,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA, - #ifdef FEAT_SPELL - (char_u *)&p_spf, PV_SPF, -@@ -2305,7 +2324,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND, - #ifdef FEAT_SPELL - (char_u *)&p_spl, PV_SPL, -@@ -2314,7 +2333,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA, - #ifdef FEAT_SPELL - (char_u *)&p_sps, PV_NONE, -@@ -2323,35 +2342,35 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"splitbelow", "sb", P_BOOL|P_VI_DEF, - #ifdef FEAT_WINDOWS - (char_u *)&p_sb, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"splitright", "spr", P_BOOL|P_VI_DEF, - #ifdef FEAT_VERTSPLIT - (char_u *)&p_spr, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"startofline", "sol", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_sol, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"statusline" ,"stl", P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT, - #ifdef FEAT_STL_OPT - (char_u *)&p_stl, PV_STL, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"suffixes", "su", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_su, PV_NONE, - {(char_u *)".bak,~,.o,.h,.info,.swp,.obj", -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP, - #ifdef FEAT_SEARCHPATH - (char_u *)&p_sua, PV_SUA, -@@ -2360,16 +2379,16 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"swapfile", "swf", P_BOOL|P_VI_DEF|P_RSTAT, - (char_u *)&p_swf, PV_SWF, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"swapsync", "sws", P_STRING|P_VI_DEF, - (char_u *)&p_sws, PV_NONE, -- {(char_u *)"fsync", (char_u *)0L}}, -+ {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT}, - {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_swb, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF, - #ifdef FEAT_SYN_HL - (char_u *)&p_smc, PV_SMC, -@@ -2378,7 +2397,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, - #ifdef FEAT_SYN_HL - (char_u *)&p_syn, PV_SYN, -@@ -2387,24 +2406,24 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"tabline", "tal", P_STRING|P_VI_DEF|P_RALL, - #ifdef FEAT_STL_OPT - (char_u *)&p_tal, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"tabpagemax", "tpm", P_NUM|P_VI_DEF, - #ifdef FEAT_WINDOWS - (char_u *)&p_tpm, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)10L, (char_u *)0L}}, -+ {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT}, - {"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF, - (char_u *)&p_ts, PV_TS, -- {(char_u *)8L, (char_u *)0L}}, -+ {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT}, - {"tagbsearch", "tbs", P_BOOL|P_VI_DEF, - (char_u *)&p_tbs, PV_NONE, - #ifdef VMS /* binary searching doesn't appear to work on VMS */ -@@ -2412,13 +2431,13 @@ - #else - {(char_u *)TRUE, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"taglength", "tl", P_NUM|P_VI_DEF, - (char_u *)&p_tl, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"tagrelative", "tr", P_BOOL|P_VIM, - (char_u *)&p_tr, PV_NONE, -- {(char_u *)FALSE, (char_u *)TRUE}}, -+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, - {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_tags, PV_TAGS, - { -@@ -2427,20 +2446,20 @@ - #else - (char_u *)"./tags,tags", - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"tagstack", "tgst", P_BOOL|P_VI_DEF, - (char_u *)&p_tgst, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"term", NULL, P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"termbidi", "tbidi", P_BOOL|P_VI_DEF, - #ifdef FEAT_ARABIC - (char_u *)&p_tbidi, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, - #ifdef FEAT_MBYTE - (char_u *)&p_tenc, PV_NONE, -@@ -2449,13 +2468,14 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"terse", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_terse, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"textauto", "ta", P_BOOL|P_VIM, - (char_u *)&p_ta, PV_NONE, -- {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}}, -+ {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE} -+ SCRIPTID_INIT}, - {"textmode", "tx", P_BOOL|P_VI_DEF|P_NO_MKRC, - (char_u *)&p_tx, PV_TX, - { -@@ -2464,40 +2484,40 @@ - #else - (char_u *)FALSE, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM, - (char_u *)&p_tw, PV_TW, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_INS_EXPAND - (char_u *)&p_tsr, PV_TSR, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"tildeop", "top", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_to, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"timeout", "to", P_BOOL|P_VI_DEF, - (char_u *)&p_timeout, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"timeoutlen", "tm", P_NUM|P_VI_DEF, - (char_u *)&p_tm, PV_NONE, -- {(char_u *)1000L, (char_u *)0L}}, -+ {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT}, - {"title", NULL, P_BOOL|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_title, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"titlelen", NULL, P_NUM|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlelen, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)85L, (char_u *)0L}}, -+ {(char_u *)85L, (char_u *)0L} SCRIPTID_INIT}, - {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC, - #ifdef FEAT_TITLE - (char_u *)&p_titleold, PV_NONE, -@@ -2507,49 +2527,50 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"titlestring", NULL, P_STRING|P_VI_DEF, - #ifdef FEAT_TITLE - (char_u *)&p_titlestring, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) - {"toolbar", "tb", P_STRING|P_COMMA|P_VI_DEF|P_NODUP, - (char_u *)&p_toolbar, PV_NONE, -- {(char_u *)"icons,tooltips", (char_u *)0L}}, -+ {(char_u *)"icons,tooltips", (char_u *)0L} -+ SCRIPTID_INIT}, - #endif - #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2) - {"toolbariconsize", "tbis", P_STRING|P_VI_DEF, - (char_u *)&p_tbis, PV_NONE, -- {(char_u *)"small", (char_u *)0L}}, -+ {(char_u *)"small", (char_u *)0L} SCRIPTID_INIT}, - #endif - {"ttimeout", NULL, P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_ttimeout, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ttimeoutlen", "ttm", P_NUM|P_VI_DEF, - (char_u *)&p_ttm, PV_NONE, -- {(char_u *)-1L, (char_u *)0L}}, -+ {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, - {"ttybuiltin", "tbi", P_BOOL|P_VI_DEF, - (char_u *)&p_tbi, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, - (char_u *)&p_tf, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, - #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) - (char_u *)&p_ttym, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"ttyscroll", "tsl", P_NUM|P_VI_DEF, - (char_u *)&p_ttyscroll, PV_NONE, -- {(char_u *)999L, (char_u *)0L}}, -+ {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT}, - {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, - (char_u *)&T_NAME, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"undolevels", "ul", P_NUM|P_VI_DEF, - (char_u *)&p_ul, PV_NONE, - { -@@ -2558,19 +2579,19 @@ - #else - (char_u *)100L, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"updatecount", "uc", P_NUM|P_VI_DEF, - (char_u *)&p_uc, PV_NONE, -- {(char_u *)200L, (char_u *)0L}}, -+ {(char_u *)200L, (char_u *)0L} SCRIPTID_INIT}, - {"updatetime", "ut", P_NUM|P_VI_DEF, - (char_u *)&p_ut, PV_NONE, -- {(char_u *)4000L, (char_u *)0L}}, -+ {(char_u *)4000L, (char_u *)0L} SCRIPTID_INIT}, - {"verbose", "vbs", P_NUM|P_VI_DEF, - (char_u *)&p_verbose, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - (char_u *)&p_vfile, PV_NONE, -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"viewdir", "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, - #ifdef FEAT_SESSION - (char_u *)&p_vdir, PV_NONE, -@@ -2579,7 +2600,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"viewoptions", "vop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_SESSION - (char_u *)&p_vop, PV_NONE, -@@ -2588,25 +2609,25 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"viminfo", "vi", P_STRING|P_COMMA|P_NODUP|P_SECURE, - #ifdef FEAT_VIMINFO - (char_u *)&p_viminfo, PV_NONE, - #if defined(MSDOS) || defined(MSWIN) || defined(OS2) -- {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"} -+ {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"} - #else - # ifdef AMIGA - {(char_u *)"", -- (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"} -+ (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"} - # else -- {(char_u *)"", (char_u *)"'20,<50,s10,h"} -+ {(char_u *)"", (char_u *)"'100,<50,s10,h"} - # endif - #endif - #else - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM, - #ifdef FEAT_VIRTUALEDIT - (char_u *)&p_ve, PV_NONE, -@@ -2615,51 +2636,52 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)0L, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"visualbell", "vb", P_BOOL|P_VI_DEF, - (char_u *)&p_vb, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"w300", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"w1200", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"w9600", NULL, P_NUM|P_VI_DEF, - (char_u *)NULL, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"warn", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_warn, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR, - (char_u *)&p_wiv, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"whichwrap", "ww", P_STRING|P_VIM|P_COMMA|P_FLAGLIST, - (char_u *)&p_ww, PV_NONE, -- {(char_u *)"", (char_u *)"b,s"}}, -+ {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT}, - {"wildchar", "wc", P_NUM|P_VIM, - (char_u *)&p_wc, PV_NONE, -- {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}}, -+ {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB} -+ SCRIPTID_INIT}, - {"wildcharm", "wcm", P_NUM|P_VI_DEF, - (char_u *)&p_wcm, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"wildignore", "wig", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - #ifdef FEAT_WILDIGN - (char_u *)&p_wig, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - {"wildmenu", "wmnu", P_BOOL|P_VI_DEF, - #ifdef FEAT_WILDMENU - (char_u *)&p_wmnu, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"wildmode", "wim", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, - (char_u *)&p_wim, PV_NONE, -- {(char_u *)"full", (char_u *)0L}}, -+ {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT}, - {"wildoptions", "wop", P_STRING|P_VI_DEF, - #ifdef FEAT_CMDL_COMPL - (char_u *)&p_wop, PV_NONE, -@@ -2668,7 +2690,7 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"winaltkeys", "wak", P_STRING|P_VI_DEF, - #ifdef FEAT_WAK - (char_u *)&p_wak, PV_NONE, -@@ -2677,67 +2699,67 @@ - (char_u *)NULL, PV_NONE, - {(char_u *)NULL, (char_u *)0L} - #endif -- }, -+ SCRIPTID_INIT}, - {"window", "wi", P_NUM|P_VI_DEF, - (char_u *)&p_window, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"winheight", "wh", P_NUM|P_VI_DEF, - #ifdef FEAT_WINDOWS - (char_u *)&p_wh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT, - #ifdef FEAT_WINDOWS - (char_u *)VAR_WIN, PV_WFH, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT, - #ifdef FEAT_VERTSPLIT - (char_u *)VAR_WIN, PV_WFW, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"winminheight", "wmh", P_NUM|P_VI_DEF, - #ifdef FEAT_WINDOWS - (char_u *)&p_wmh, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winminwidth", "wmw", P_NUM|P_VI_DEF, - #ifdef FEAT_VERTSPLIT - (char_u *)&p_wmw, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)1L, (char_u *)0L}}, -+ {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, - {"winwidth", "wiw", P_NUM|P_VI_DEF, - #ifdef FEAT_VERTSPLIT - (char_u *)&p_wiw, PV_NONE, - #else - (char_u *)NULL, PV_NONE, - #endif -- {(char_u *)20L, (char_u *)0L}}, -+ {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, - {"wrap", NULL, P_BOOL|P_VI_DEF|P_RWIN, - (char_u *)VAR_WIN, PV_WRAP, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"wrapmargin", "wm", P_NUM|P_VI_DEF, - (char_u *)&p_wm, PV_WM, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - {"wrapscan", "ws", P_BOOL|P_VI_DEF, - (char_u *)&p_ws, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"write", NULL, P_BOOL|P_VI_DEF, - (char_u *)&p_write, PV_NONE, -- {(char_u *)TRUE, (char_u *)0L}}, -+ {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"writeany", "wa", P_BOOL|P_VI_DEF, - (char_u *)&p_wa, PV_NONE, -- {(char_u *)FALSE, (char_u *)0L}}, -+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"writebackup", "wb", P_BOOL|P_VI_DEF|P_VIM, - (char_u *)&p_wb, PV_NONE, - { -@@ -2746,15 +2768,15 @@ - #else - (char_u *)FALSE, - #endif -- (char_u *)0L}}, -+ (char_u *)0L} SCRIPTID_INIT}, - {"writedelay", "wd", P_NUM|P_VI_DEF, - (char_u *)&p_wd, PV_NONE, -- {(char_u *)0L, (char_u *)0L}}, -+ {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, - - /* terminal output codes */ - #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ - (char_u *)&vvv, PV_NONE, \ -- {(char_u *)"", (char_u *)0L}}, -+ {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, - - p_term("t_AB", T_CAB) - p_term("t_AF", T_CAF) -@@ -2815,7 +2837,8 @@ - - /* terminal key codes are not in here */ - -- {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL}} /* end marker */ -+ /* end marker */ -+ {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT} - }; - - #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption)) -@@ -3984,7 +4007,7 @@ - else - { - prefix = 1; -- if (STRNCMP(arg, "no", 2) == 0) -+ if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0) - { - prefix = 0; - arg += 2; -@@ -4119,11 +4142,23 @@ - && options[opt_idx].var == VAR_WIN) - goto skip; - -- /* Disallow changing some options from modelines */ -- if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE)) -+ /* Disallow changing some options from modelines. */ -+ if (opt_flags & OPT_MODELINE) - { -- errmsg = (char_u *)_("E520: Not allowed in a modeline"); -- goto skip; -+ if (flags & P_SECURE) -+ { -+ errmsg = (char_u *)_("E520: Not allowed in a modeline"); -+ goto skip; -+ } -+#ifdef FEAT_DIFF -+ /* In diff mode some options are overruled. This avoids that -+ * 'foldmethod' becomes "marker" instead of "diff" and that -+ * "wrap" gets set. */ -+ if (curwin->w_p_diff -+ && (options[opt_idx].indir == PV_FDM -+ || options[opt_idx].indir == PV_WRAP)) -+ goto skip; -+#endif - } - - #ifdef HAVE_SANDBOX -@@ -5268,6 +5303,21 @@ - } - #endif - -+#ifdef FEAT_TITLE -+static void redraw_titles __ARGS((void)); -+ -+/* -+ * Redraw the window title and/or tab page text later. -+ */ -+static void redraw_titles() -+{ -+ need_maketitle = TRUE; -+# ifdef FEAT_WINDOWS -+ redraw_tabline = TRUE; -+# endif -+} -+#endif -+ - /* - * Set a string option to a new value (without checking the effect). - * The string is copied into allocated memory. -@@ -5275,14 +5325,13 @@ - * When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is - * SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid". - */ --/*ARGSUSED*/ - void - set_string_option_direct(name, opt_idx, val, opt_flags, set_sid) - char_u *name; - int opt_idx; - char_u *val; - int opt_flags; /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */ -- int set_sid; -+ int set_sid UNUSED; - { - char_u *s; - char_u **varp; -@@ -5407,6 +5456,10 @@ - int did_chartab = FALSE; - char_u **gvarp; - long_u free_oldval = (options[opt_idx].flags & P_ALLOCED); -+#ifdef FEAT_GUI -+ /* set when changing an option that only requires a redraw in the GUI */ -+ int redraw_gui_only = FALSE; -+#endif - - /* Get the global option to compare with, otherwise we would have to check - * two values for all local options. */ -@@ -5668,7 +5721,7 @@ - { - # ifdef FEAT_TITLE - /* May show a "+" in the title now. */ -- need_maketitle = TRUE; -+ redraw_titles(); - # endif - /* Add 'fileencoding' to the swap file. */ - ml_setflags(curbuf); -@@ -5687,7 +5740,7 @@ - { - errmsg = mb_init(); - # ifdef FEAT_TITLE -- need_maketitle = TRUE; -+ redraw_titles(); - # endif - } - } -@@ -5766,14 +5819,28 @@ - /* load or unload key mapping tables */ - errmsg = keymap_init(); - -- /* When successfully installed a new keymap switch on using it. */ -- if (*curbuf->b_p_keymap != NUL && errmsg == NULL) -+ if (errmsg == NULL) - { -- curbuf->b_p_iminsert = B_IMODE_LMAP; -- if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) -- curbuf->b_p_imsearch = B_IMODE_LMAP; -- set_iminsert_global(); -- set_imsearch_global(); -+ if (*curbuf->b_p_keymap != NUL) -+ { -+ /* Installed a new keymap, switch on using it. */ -+ curbuf->b_p_iminsert = B_IMODE_LMAP; -+ if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) -+ curbuf->b_p_imsearch = B_IMODE_LMAP; -+ } -+ else -+ { -+ /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */ -+ if (curbuf->b_p_iminsert == B_IMODE_LMAP) -+ curbuf->b_p_iminsert = B_IMODE_NONE; -+ if (curbuf->b_p_imsearch == B_IMODE_LMAP) -+ curbuf->b_p_imsearch = B_IMODE_USE_INSERT; -+ } -+ if ((opt_flags & OPT_LOCAL) == 0) -+ { -+ set_iminsert_global(); -+ set_imsearch_global(); -+ } - # ifdef FEAT_WINDOWS - status_redraw_curbuf(); - # endif -@@ -5796,7 +5863,7 @@ - else - curbuf->b_p_tx = FALSE; - #ifdef FEAT_TITLE -- need_maketitle = TRUE; -+ redraw_titles(); - #endif - /* update flag in swap file */ - ml_setflags(curbuf); -@@ -5977,15 +6044,23 @@ - /* ":set t_Co=0" and ":set t_Co=1" do ":set t_Co=" */ - if (varp == &T_CCO) - { -- t_colors = atoi((char *)T_CCO); -- if (t_colors <= 1) -+ int colors = atoi((char *)T_CCO); -+ -+ /* Only reinitialize colors if t_Co value has really changed to -+ * avoid expensive reload of colorscheme if t_Co is set to the -+ * same value multiple times. */ -+ if (colors != t_colors) - { -- if (new_value_alloced) -- vim_free(T_CCO); -- T_CCO = empty_option; -+ t_colors = colors; -+ if (t_colors <= 1) -+ { -+ if (new_value_alloced) -+ vim_free(T_CCO); -+ T_CCO = empty_option; -+ } -+ /* We now have a different color setup, initialize it again. */ -+ init_highlight(TRUE, FALSE); - } -- /* We now have a different color setup, initialize it again. */ -- init_highlight(TRUE, FALSE); - } - ttest(FALSE); - if (varp == &T_ME) -@@ -6055,6 +6130,7 @@ - errmsg = (char_u *)N_("E596: Invalid font(s)"); - } - } -+ redraw_gui_only = TRUE; - } - # ifdef FEAT_XFONTSET - else if (varp == &p_guifontset) -@@ -6063,6 +6139,7 @@ - errmsg = (char_u *)N_("E597: can't select fontset"); - else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK) - errmsg = (char_u *)N_("E598: Invalid fontset"); -+ redraw_gui_only = TRUE; - } - # endif - # ifdef FEAT_MBYTE -@@ -6072,6 +6149,7 @@ - errmsg = (char_u *)N_("E533: can't select wide font"); - else if (gui_get_wide_font() == FAIL) - errmsg = (char_u *)N_("E534: Invalid wide font"); -+ redraw_gui_only = TRUE; - } - # endif - #endif -@@ -6133,13 +6211,24 @@ - #ifdef FEAT_GUI - /* 'guioptions' */ - else if (varp == &p_go) -+ { - gui_init_which_components(oldval); -+ redraw_gui_only = TRUE; -+ } - #endif - - #if defined(FEAT_GUI_TABLINE) - /* 'guitablabel' */ - else if (varp == &p_gtl) -+ { - redraw_tabline = TRUE; -+ redraw_gui_only = TRUE; -+ } -+ /* 'guitabtooltip' */ -+ else if (varp == &p_gtt) -+ { -+ redraw_gui_only = TRUE; -+ } - #endif - - #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS)) -@@ -6717,7 +6806,11 @@ - - if (curwin->w_curswant != MAXCOL) - curwin->w_set_curswant = TRUE; /* in case 'showbreak' changed */ -- check_redraw(options[opt_idx].flags); -+#ifdef FEAT_GUI -+ /* check redraw when it's not a GUI option or the GUI is active. */ -+ if (!redraw_gui_only || gui.in_use) -+#endif -+ check_redraw(options[opt_idx].flags); - - return errmsg; - } -@@ -6932,6 +7025,7 @@ - int new_unnamed = FALSE; - int new_autoselect = FALSE; - int new_autoselectml = FALSE; -+ int new_html = FALSE; - regprog_T *new_exclude_prog = NULL; - char_u *errmsg = NULL; - char_u *p; -@@ -6955,6 +7049,11 @@ - new_autoselectml = TRUE; - p += 12; - } -+ else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL)) -+ { -+ new_html = TRUE; -+ p += 4; -+ } - else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL) - { - p += 8; -@@ -6976,6 +7075,7 @@ - clip_unnamed = new_unnamed; - clip_autoselect = new_autoselect; - clip_autoselectml = new_autoselectml; -+ clip_html = new_html; - vim_free(clip_exclude_prog); - clip_exclude_prog = new_exclude_prog; - } -@@ -7105,22 +7205,28 @@ - curbuf->b_did_warn = FALSE; - - #ifdef FEAT_TITLE -- need_maketitle = TRUE; -+ redraw_titles(); - #endif - } - - #ifdef FEAT_TITLE - /* when 'modifiable' is changed, redraw the window title */ - else if ((int *)varp == &curbuf->b_p_ma) -- need_maketitle = TRUE; -+ { -+ redraw_titles(); -+ } - /* when 'endofline' is changed, redraw the window title */ - else if ((int *)varp == &curbuf->b_p_eol) -- need_maketitle = TRUE; --#ifdef FEAT_MBYTE -- /* when 'bomb' is changed, redraw the window title */ -+ { -+ redraw_titles(); -+ } -+# ifdef FEAT_MBYTE -+ /* when 'bomb' is changed, redraw the window title and tab page text */ - else if ((int *)varp == &curbuf->b_p_bomb) -- need_maketitle = TRUE; --#endif -+ { -+ redraw_titles(); -+ } -+# endif - #endif - - /* when 'bin' is set also set some other options */ -@@ -7128,7 +7234,7 @@ - { - set_options_bin(old_value, curbuf->b_p_bin, opt_flags); - #ifdef FEAT_TITLE -- need_maketitle = TRUE; -+ redraw_titles(); - #endif - } - -@@ -7279,7 +7385,7 @@ - if (!value) - save_file_ff(curbuf); /* Buffer is unchanged */ - #ifdef FEAT_TITLE -- need_maketitle = TRUE; -+ redraw_titles(); - #endif - #ifdef FEAT_AUTOCMD - modified_was_set = value; -@@ -7486,9 +7592,13 @@ - * set. */ - if (STRCMP(p_enc, "utf-8") != 0) - { -+ static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"); -+ - msg_source(hl_attr(HLF_W)); -- MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"), -- hl_attr(HLF_W)); -+ MSG_ATTR(_(w_arabic), hl_attr(HLF_W)); -+#ifdef FEAT_EVAL -+ set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1); -+#endif - } - - # ifdef FEAT_MBYTE -@@ -7714,7 +7824,7 @@ - newFoldLevel(); - } - -- /* 'foldminlevel' */ -+ /* 'foldminlines' */ - else if (pp == &curwin->w_p_fml) - { - foldUpdateAll(curwin); -@@ -7974,6 +8084,11 @@ - else /* curwin->w_p_scr > curwin->w_height */ - curwin->w_p_scr = curwin->w_height; - } -+ if (p_hi < 0) -+ { -+ errmsg = e_positive; -+ p_hi = 0; -+ } - if (p_report < 0) - { - errmsg = e_positive; -@@ -8227,13 +8342,13 @@ - { - if (number == 0 && string != NULL) - { -- int index; -+ int idx; - - /* Either we are given a string or we are setting option - * to zero. */ -- for (index = 0; string[index] == '0'; ++index) -+ for (idx = 0; string[idx] == '0'; ++idx) - ; -- if (string[index] != NUL || index == 0) -+ if (string[idx] != NUL || idx == 0) - { - /* There's another character after zeros or the string - * is empty. In both cases, we are trying to set a -@@ -8323,7 +8438,7 @@ - { - --arg; /* put arg at the '<' */ - modifiers = 0; -- key = find_special_key(&arg, &modifiers, TRUE); -+ key = find_special_key(&arg, &modifiers, TRUE, TRUE); - if (modifiers) /* can't handle modifiers here */ - key = 0; - } -@@ -8813,6 +8928,28 @@ - } - - /* -+ * Free the string for one term option, if it was allocated. -+ * Set the string to empty_option and clear allocated flag. -+ * "var" points to the option value. -+ */ -+ void -+free_one_termoption(var) -+ char_u *var; -+{ -+ struct vimoption *p; -+ -+ for (p = &options[0]; p->fullname != NULL; p++) -+ if (p->var == var) -+ { -+ if (p->flags & P_ALLOCED) -+ free_string_option(*(char_u **)(p->var)); -+ *(char_u **)(p->var) = empty_option; -+ p->flags &= ~P_ALLOCED; -+ break; -+ } -+} -+ -+/* - * Set the terminal option defaults to the current value. - * Used after setting the terminal name. - */ -@@ -9271,10 +9408,9 @@ - /* - * Check for NULL pointers in a winopt_T and replace them with empty_option. - */ --/*ARGSUSED*/ - void - check_winopt(wop) -- winopt_T *wop; -+ winopt_T *wop UNUSED; - { - #ifdef FEAT_FOLDING - check_string_option(&wop->wo_fdi); -@@ -9296,10 +9432,9 @@ - /* - * Free the allocated memory inside a winopt_T. - */ --/*ARGSUSED*/ - void - clear_winopt(wop) -- winopt_T *wop; -+ winopt_T *wop UNUSED; - { - #ifdef FEAT_FOLDING - clear_string_option(&wop->wo_fdi); -@@ -9645,7 +9780,7 @@ - } - --p; - } -- if (STRNCMP(p, "no", 2) == 0) -+ if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0) - { - xp->xp_context = EXPAND_BOOL_SETTINGS; - p += 2; -@@ -9834,7 +9969,8 @@ - regmatch->rm_ic = ic; - if (xp->xp_context != EXPAND_BOOL_SETTINGS) - { -- for (match = 0; match < sizeof(names) / sizeof(char *); ++match) -+ for (match = 0; match < (int)(sizeof(names) / sizeof(char *)); -+ ++match) - if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0)) - { - if (loop == 0) -@@ -10093,25 +10229,110 @@ - - #ifdef FEAT_LANGMAP - /* -- * Any character has an equivalent character. This is used for keyboards that -- * have a special language mode that sends characters above 128 (although -- * other characters can be translated too). -+ * Any character has an equivalent 'langmap' character. This is used for -+ * keyboards that have a special language mode that sends characters above -+ * 128 (although other characters can be translated too). The "to" field is a -+ * Vim command character. This avoids having to switch the keyboard back to -+ * ASCII mode when leaving Insert mode. -+ * -+ * langmap_mapchar[] maps any of 256 chars to an ASCII char used for Vim -+ * commands. -+ * When FEAT_MBYTE is defined langmap_mapga.ga_data is a sorted table of -+ * langmap_entry_T. This does the same as langmap_mapchar[] for characters >= -+ * 256. -+ */ -+# ifdef FEAT_MBYTE -+/* -+ * With multi-byte support use growarray for 'langmap' chars >= 256 -+ */ -+typedef struct -+{ -+ int from; -+ int to; -+} langmap_entry_T; -+ -+static garray_T langmap_mapga; -+static void langmap_set_entry __ARGS((int from, int to)); -+ -+/* -+ * Search for an entry in "langmap_mapga" for "from". If found set the "to" -+ * field. If not found insert a new entry at the appropriate location. - */ -+ static void -+langmap_set_entry(from, to) -+ int from; -+ int to; -+{ -+ langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data); -+ int a = 0; -+ int b = langmap_mapga.ga_len; -+ -+ /* Do a binary search for an existing entry. */ -+ while (a != b) -+ { -+ int i = (a + b) / 2; -+ int d = entries[i].from - from; -+ -+ if (d == 0) -+ { -+ entries[i].to = to; -+ return; -+ } -+ if (d < 0) -+ a = i + 1; -+ else -+ b = i; -+ } -+ -+ if (ga_grow(&langmap_mapga, 1) != OK) -+ return; /* out of memory */ -+ -+ /* insert new entry at position "a" */ -+ entries = (langmap_entry_T *)(langmap_mapga.ga_data) + a; -+ mch_memmove(entries + 1, entries, -+ (langmap_mapga.ga_len - a) * sizeof(langmap_entry_T)); -+ ++langmap_mapga.ga_len; -+ entries[0].from = from; -+ entries[0].to = to; -+} - - /* -- * char_u langmap_mapchar[256]; -- * Normally maps each of the 128 upper chars to an <128 ascii char; used to -- * "translate" native lang chars in normal mode or some cases of -- * insert mode without having to tediously switch lang mode back&forth. -+ * Apply 'langmap' to multi-byte character "c" and return the result. - */ -+ int -+langmap_adjust_mb(c) -+ int c; -+{ -+ langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data); -+ int a = 0; -+ int b = langmap_mapga.ga_len; -+ -+ while (a != b) -+ { -+ int i = (a + b) / 2; -+ int d = entries[i].from - c; -+ -+ if (d == 0) -+ return entries[i].to; /* found matching entry */ -+ if (d < 0) -+ a = i + 1; -+ else -+ b = i; -+ } -+ return c; /* no entry found, return "c" unmodified */ -+} -+# endif - - static void - langmap_init() - { - int i; - -- for (i = 0; i < 256; i++) /* we init with a-one-to one map */ -- langmap_mapchar[i] = i; -+ for (i = 0; i < 256; i++) -+ langmap_mapchar[i] = i; /* we init with a one-to-one map */ -+# ifdef FEAT_MBYTE -+ ga_init2(&langmap_mapga, sizeof(langmap_entry_T), 8); -+# endif - } - - /* -@@ -10125,7 +10346,10 @@ - char_u *p2; - int from, to; - -- langmap_init(); /* back to one-to-one map first */ -+#ifdef FEAT_MBYTE -+ ga_clear(&langmap_mapga); /* clear the previous map first */ -+#endif -+ langmap_init(); /* back to one-to-one map */ - - for (p = p_langmap; p[0] != NUL; ) - { -@@ -10175,7 +10399,13 @@ - transchar(from)); - return; - } -- langmap_mapchar[from & 255] = to; -+ -+#ifdef FEAT_MBYTE -+ if (from >= 256) -+ langmap_set_entry(from, to); -+ else -+#endif -+ langmap_mapchar[from & 255] = to; - - /* Advance to next pair */ - mb_ptr_adv(p); -diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c ---- vim72.orig/src/os_unix.c 2008-08-06 12:01:40.000000000 +0100 -+++ vim72/src/os_unix.c 2009-07-22 22:54:24.000000000 +0100 -@@ -181,7 +181,8 @@ - && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK) - # define SET_SIG_ALARM - static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG); --static int sig_alarm_called; -+/* volatile because it is used in signal handler sig_alarm(). */ -+static volatile int sig_alarm_called; - #endif - static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG); - -@@ -201,13 +202,16 @@ - # define SIG_ERR ((RETSIGTYPE (*)())-1) - #endif - --static int do_resize = FALSE; -+/* volatile because it is used in signal handler sig_winch(). */ -+static volatile int do_resize = FALSE; - #ifndef __EMX__ - static char_u *extra_shell_arg = NULL; - static int show_shell_mess = TRUE; - #endif --static int deadly_signal = 0; /* The signal we caught */ --static int in_mch_delay = FALSE; /* sleeping in mch_delay() */ -+/* volatile because it is used in signal handler deathtrap(). */ -+static volatile int deadly_signal = 0; /* The signal we caught */ -+/* volatile because it is used in signal handler deathtrap(). */ -+static volatile int in_mch_delay = FALSE; /* sleeping in mch_delay() */ - - static int curr_tmode = TMODE_COOK; /* contains current terminal mode */ - -@@ -315,12 +319,32 @@ - {-1, "Unknown!", FALSE} - }; - -+ int -+mch_chdir(path) -+ char *path; -+{ -+ if (p_verbose >= 5) -+ { -+ verbose_enter(); -+ smsg((char_u *)"chdir(%s)", path); -+ verbose_leave(); -+ } -+# ifdef VMS -+ return chdir(vms_fixfilename(path)); -+# else -+ return chdir(path); -+# endif -+} -+ -+/* -+ * Write s[len] to the screen. -+ */ - void - mch_write(s, len) - char_u *s; - int len; - { -- write(1, (char *)s, len); -+ ignored = (int)write(1, (char *)s, len); - if (p_wd) /* Unix is too fast, slow down a bit more */ - RealWaitForChar(read_cmd_fd, p_wd, NULL); - } -@@ -447,10 +471,9 @@ - * Return total amount of memory available in Kbyte. - * Doesn't change when memory has been allocated. - */ --/* ARGSUSED */ - long_u - mch_total_mem(special) -- int special; -+ int special UNUSED; - { - # ifdef __EMX__ - return ulimit(3, 0L) >> 10; /* always 32MB? */ -@@ -799,12 +822,11 @@ - #endif - - /* -- * We need correct potatotypes for a signal function, otherwise mean compilers -+ * We need correct prototypes for a signal function, otherwise mean compilers - * will barf when the second argument to signal() is ``wrong''. - * Let me try it with a few tricky defines from my own osdef.h (jw). - */ - #if defined(SIGWINCH) --/* ARGSUSED */ - static RETSIGTYPE - sig_winch SIGDEFARG(sigarg) - { -@@ -816,7 +838,6 @@ - #endif - - #if defined(SIGINT) --/* ARGSUSED */ - static RETSIGTYPE - catch_sigint SIGDEFARG(sigarg) - { -@@ -828,7 +849,6 @@ - #endif - - #if defined(SIGPWR) --/* ARGSUSED */ - static RETSIGTYPE - catch_sigpwr SIGDEFARG(sigarg) - { -@@ -848,7 +868,6 @@ - /* - * signal function for alarm(). - */ --/* ARGSUSED */ - static RETSIGTYPE - sig_alarm SIGDEFARG(sigarg) - { -@@ -1065,19 +1084,23 @@ - SIGRETURN; - } - --#ifdef _REENTRANT -+#if defined(_REENTRANT) && defined(SIGCONT) - /* - * On Solaris with multi-threading, suspending might not work immediately. - * Catch the SIGCONT signal, which will be used as an indication whether the - * suspending has been done or not. -+ * -+ * On Linux, signal is not always handled immediately either. -+ * See https://bugs.launchpad.net/bugs/291373 -+ * -+ * volatile because it is used in in signal handler sigcont_handler(). - */ --static int sigcont_received; -+static volatile int sigcont_received; - static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); - - /* - * signal handler for SIGCONT - */ --/* ARGSUSED */ - static RETSIGTYPE - sigcont_handler SIGDEFARG(sigarg) - { -@@ -1115,15 +1138,28 @@ - } - # endif - --# ifdef _REENTRANT -+# if defined(_REENTRANT) && defined(SIGCONT) - sigcont_received = FALSE; - # endif - kill(0, SIGTSTP); /* send ourselves a STOP signal */ --# ifdef _REENTRANT -- /* When we didn't suspend immediately in the kill(), do it now. Happens -- * on multi-threaded Solaris. */ -- if (!sigcont_received) -- pause(); -+# if defined(_REENTRANT) && defined(SIGCONT) -+ /* -+ * Wait for the SIGCONT signal to be handled. It generally happens -+ * immediately, but somehow not all the time. Do not call pause() -+ * because there would be race condition which would hang Vim if -+ * signal happened in between the test of sigcont_received and the -+ * call to pause(). If signal is not yet received, call sleep(0) -+ * to just yield CPU. Signal should then be received. If somehow -+ * it's still not received, sleep 1, 2, 3 ms. Don't bother waiting -+ * further if signal is not received after 1+2+3+4 ms (not expected -+ * to happen). -+ */ -+ { -+ long wait_time; -+ for (wait_time = 0; !sigcont_received && wait_time <= 3L; wait_time++) -+ /* Loop is not entered most of the time */ -+ mch_delay(wait_time, FALSE); -+ } - # endif - - # ifdef FEAT_TITLE -@@ -1172,7 +1208,7 @@ - #ifdef SIGTSTP - signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); - #endif --#ifdef _REENTRANT -+#if defined(_REENTRANT) && defined(SIGCONT) - signal(SIGCONT, sigcont_handler); - #endif - -@@ -1231,7 +1267,7 @@ - reset_signals() - { - catch_signals(SIG_DFL, SIG_DFL); --#ifdef _REENTRANT -+#if defined(_REENTRANT) && defined(SIGCONT) - /* SIGCONT isn't in the list, because its default action is ignore */ - signal(SIGCONT, SIG_DFL); - #endif -@@ -1326,11 +1362,10 @@ - /* - * Check_win checks whether we have an interactive stdout. - */ --/* ARGSUSED */ - int - mch_check_win(argc, argv) -- int argc; -- char **argv; -+ int argc UNUSED; -+ char **argv UNUSED; - { - #ifdef OS2 - /* -@@ -1414,11 +1449,10 @@ - /* - * Another X Error handler, just used to check for errors. - */ --/* ARGSUSED */ - static int - x_error_check(dpy, error_event) -- Display *dpy; -- XErrorEvent *error_event; -+ Display *dpy UNUSED; -+ XErrorEvent *error_event UNUSED; - { - got_x_error = TRUE; - return 0; -@@ -1431,15 +1465,12 @@ - */ - static int x_IOerror_check __ARGS((Display *dpy)); - --/* ARGSUSED */ - static int - x_IOerror_check(dpy) -- Display *dpy; -+ Display *dpy UNUSED; - { - /* This function should not return, it causes exit(). Longjump instead. */ - LONGJMP(lc_jump_env, 1); -- /*NOTREACHED*/ -- return 0; - } - # endif - -@@ -1448,10 +1479,9 @@ - */ - static int x_IOerror_handler __ARGS((Display *dpy)); - --/* ARGSUSED */ - static int - x_IOerror_handler(dpy) -- Display *dpy; -+ Display *dpy UNUSED; - { - xterm_dpy = NULL; - x11_window = 0; -@@ -1460,8 +1490,6 @@ - - /* This function should not return, it causes exit(). Longjump instead. */ - LONGJMP(x_jump_env, 1); -- /*NOTREACHED*/ -- return 0; - } - #endif - -@@ -1706,9 +1734,9 @@ - if (oldicon == NULL && !test_only) - { - if (STRNCMP(T_NAME, "builtin_", 8) == 0) -- oldicon = T_NAME + 8; -+ oldicon = vim_strsave(T_NAME + 8); - else -- oldicon = T_NAME; -+ oldicon = vim_strsave(T_NAME); - } - - return retval; -@@ -1897,10 +1925,9 @@ - - #else /* FEAT_X11 */ - --/*ARGSUSED*/ - static int - get_x11_title(test_only) -- int test_only; -+ int test_only UNUSED; - { - return FALSE; - } -@@ -1912,9 +1939,9 @@ - if (!test_only) - { - if (STRNCMP(T_NAME, "builtin_", 8) == 0) -- oldicon = T_NAME + 8; -+ oldicon = vim_strsave(T_NAME + 8); - else -- oldicon = T_NAME; -+ oldicon = vim_strsave(T_NAME); - } - return FALSE; - } -@@ -2414,6 +2441,12 @@ - #ifdef HAVE_FCHDIR - if (fd >= 0) - { -+ if (p_verbose >= 5) -+ { -+ verbose_enter(); -+ MSG("fchdir() to previous dir"); -+ verbose_leave(); -+ } - l = fchdir(fd); - close(fd); - } -@@ -2438,7 +2471,7 @@ - } - - /* Catch file names which are too long. */ -- if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len) -+ if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len) - return FAIL; - - /* Do not append ".", "/dir/." is equal to "/dir". */ -@@ -2475,11 +2508,10 @@ - * file name to remain exactly the same. - * Only required for file systems where case is ignored and preserved. - */ --/*ARGSUSED*/ - void - fname_case(name, len) - char_u *name; -- int len; /* buffer size, only used when name gets longer */ -+ int len UNUSED; /* buffer size, only used when name gets longer */ - { - struct stat st; - char_u *slash, *tail; -@@ -2657,7 +2689,7 @@ - */ - vim_acl_T - mch_get_acl(fname) -- char_u *fname; -+ char_u *fname UNUSED; - { - vim_acl_T ret = NULL; - #ifdef HAVE_POSIX_ACL -@@ -2717,7 +2749,7 @@ - */ - void - mch_set_acl(fname, aclent) -- char_u *fname; -+ char_u *fname UNUSED; - vim_acl_T aclent; - { - if (aclent == NULL) -@@ -2760,10 +2792,9 @@ - /* - * Set hidden flag for "name". - */ --/* ARGSUSED */ - void - mch_hide(name) -- char_u *name; -+ char_u *name UNUSED; - { - /* can't hide a file */ - } -@@ -2905,7 +2936,7 @@ - * Ignore any errors. - */ - #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK) -- signal_stack = malloc(SIGSTKSZ); -+ signal_stack = (char *)alloc(SIGSTKSZ); - init_signal_stack(); - #endif - } -@@ -2936,7 +2967,8 @@ - } - # endif - # endif --# ifdef FEAT_X11 -+ /* Don't close the display for GTK 1, it is done in exit(). */ -+# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2)) - if (x11_display != NULL - # ifdef FEAT_XCLIPBOARD - && x11_display != xterm_dpy -@@ -3451,10 +3483,9 @@ - /* - * set screen mode, always fails. - */ --/* ARGSUSED */ - int - mch_screenmode(arg) -- char_u *arg; -+ char_u *arg UNUSED; - { - EMSG(_(e_screenmode)); - return FAIL; -@@ -3926,9 +3957,9 @@ - */ - if (fd >= 0) - { -- dup(fd); /* To replace stdin (file descriptor 0) */ -- dup(fd); /* To replace stdout (file descriptor 1) */ -- dup(fd); /* To replace stderr (file descriptor 2) */ -+ ignored = dup(fd); /* To replace stdin (fd 0) */ -+ ignored = dup(fd); /* To replace stdout (fd 1) */ -+ ignored = dup(fd); /* To replace stderr (fd 2) */ - - /* Don't need this now that we've duplicated it */ - close(fd); -@@ -3946,7 +3977,17 @@ - * children can be kill()ed. Don't do this when using pipes, - * because stdin is not a tty, we would lose /dev/tty. */ - if (p_stmp) -+ { - (void)setsid(); -+# if defined(SIGHUP) -+ /* When doing "!xterm&" and 'shell' is bash: the shell -+ * will exit and send SIGHUP to all processes in its -+ * group, killing the just started process. Ignore SIGHUP -+ * to avoid that. (suggested by Simon Schubert) -+ */ -+ signal(SIGHUP, SIG_IGN); -+# endif -+ } - # endif - # ifdef FEAT_GUI - if (pty_slave_fd >= 0) -@@ -3996,13 +4037,13 @@ - - /* set up stdin/stdout/stderr for the child */ - close(0); -- dup(pty_slave_fd); -+ ignored = dup(pty_slave_fd); - close(1); -- dup(pty_slave_fd); -+ ignored = dup(pty_slave_fd); - if (gui.in_use) - { - close(2); -- dup(pty_slave_fd); -+ ignored = dup(pty_slave_fd); - } - - close(pty_slave_fd); /* has been dupped, close it now */ -@@ -4013,13 +4054,13 @@ - /* set up stdin for the child */ - close(fd_toshell[1]); - close(0); -- dup(fd_toshell[0]); -+ ignored = dup(fd_toshell[0]); - close(fd_toshell[0]); - - /* set up stdout for the child */ - close(fd_fromshell[0]); - close(1); -- dup(fd_fromshell[1]); -+ ignored = dup(fd_fromshell[1]); - close(fd_fromshell[1]); - - # ifdef FEAT_GUI -@@ -4027,7 +4068,7 @@ - { - /* set up stderr for the child */ - close(2); -- dup(1); -+ ignored = dup(1); - } - # endif - } -@@ -4078,6 +4119,9 @@ - int fromshell_fd; - garray_T ga; - int noread_cnt; -+# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) -+ struct timeval start_tv; -+# endif - - # ifdef FEAT_GUI - if (pty_master_fd >= 0) -@@ -4146,9 +4190,10 @@ - { - s = vim_strchr(lp + written, NL); - len = write(toshell_fd, (char *)lp + written, -- s == NULL ? l : s - (lp + written)); -+ s == NULL ? l -+ : (size_t)(s - (lp + written))); - } -- if (len == l) -+ if (len == (int)l) - { - /* Finished a line, add a NL, unless this line - * should not have one. */ -@@ -4158,7 +4203,8 @@ - && (lnum != - curbuf->b_ml.ml_line_count - || curbuf->b_p_eol))) -- write(toshell_fd, "\n", (size_t)1); -+ ignored = write(toshell_fd, "\n", -+ (size_t)1); - ++lnum; - if (lnum > curbuf->b_op_end.lnum) - { -@@ -4186,7 +4232,9 @@ - ga_init2(&ga, 1, BUFLEN); - - noread_cnt = 0; -- -+# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) -+ gettimeofday(&start_tv, NULL); -+# endif - for (;;) - { - /* -@@ -4199,25 +4247,34 @@ - * that a typed password is echoed for ssh or gpg command. - * Don't get characters when the child has already - * finished (wait_pid == 0). -- * Don't get extra characters when we already have one. - * Don't read characters unless we didn't get output for a -- * while, avoids that ":r !ls" eats typeahead. -+ * while (noread_cnt > 4), avoids that ":r !ls" eats -+ * typeahead. - */ - len = 0; - if (!(options & SHELL_EXPAND) - && ((options & - (SHELL_READ|SHELL_WRITE|SHELL_COOKED)) - != (SHELL_READ|SHELL_WRITE|SHELL_COOKED) --#ifdef FEAT_GUI -+# ifdef FEAT_GUI - || gui.in_use --#endif -+# endif - ) - && wait_pid == 0 -- && (ta_len > 0 -- || (noread_cnt > 4 -- && (len = ui_inchar(ta_buf, -- BUFLEN, 10L, 0)) > 0))) -+ && (ta_len > 0 || noread_cnt > 4)) - { -+ if (ta_len == 0) -+ { -+ /* Get extra characters when we don't have any. -+ * Reset the counter and timer. */ -+ noread_cnt = 0; -+# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) -+ gettimeofday(&start_tv, NULL); -+# endif -+ len = ui_inchar(ta_buf, BUFLEN, 10L, 0); -+ } -+ if (ta_len > 0 || len > 0) -+ { - /* - * For pipes: - * Check for CTRL-C: send interrupt signal to child. -@@ -4271,7 +4328,8 @@ - ta_buf[i] = '\n'; - # ifdef FEAT_MBYTE - if (has_mbyte) -- i += (*mb_ptr2len)(ta_buf + i) - 1; -+ i += (*mb_ptr2len_len)(ta_buf + i, -+ ta_len + len - i) - 1; - # endif - } - -@@ -4319,9 +4377,9 @@ - { - ta_len -= len; - mch_memmove(ta_buf, ta_buf + len, ta_len); -- noread_cnt = 0; - } - } -+ } - } - - if (got_int) -@@ -4429,6 +4487,25 @@ - out_flush(); - if (got_int) - break; -+ -+# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) -+ { -+ struct timeval now_tv; -+ long msec; -+ -+ /* Avoid that we keep looping here without -+ * checking for a CTRL-C for a long time. Don't -+ * break out too often to avoid losing typeahead. */ -+ gettimeofday(&now_tv, NULL); -+ msec = (now_tv.tv_sec - start_tv.tv_sec) * 1000L -+ + (now_tv.tv_usec - start_tv.tv_usec) / 1000L; -+ if (msec > 2000) -+ { -+ noread_cnt = 5; -+ break; -+ } -+ } -+# endif - } - - /* If we already detected the child has finished break the -@@ -4672,7 +4749,6 @@ - * Returns also, when a request from Sniff is waiting -- toni. - * Or when a Linux GPM mouse event is waiting. - */ --/* ARGSUSED */ - #if defined(__BEOS__) - int - #else -@@ -4681,7 +4757,7 @@ - RealWaitForChar(fd, msec, check_for_gpm) - int fd; - long msec; -- int *check_for_gpm; -+ int *check_for_gpm UNUSED; - { - int ret; - #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME) -@@ -5076,7 +5152,6 @@ - - #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|" - --/* ARGSUSED */ - int - mch_expand_wildcards(num_pat, pat, num_file, file, flags) - int num_pat; -@@ -5498,7 +5573,7 @@ - i = fread((char *)buffer, 1, len, fd); - fclose(fd); - mch_remove(tempname); -- if (i != len) -+ if (i != (int)len) - { - /* unexpected read error */ - EMSG2(_(e_notread), tempname); -@@ -5559,7 +5634,7 @@ - if (shell_style == STYLE_PRINT && !did_find_nul) - { - /* If there is a NUL, set did_find_nul, else set check_spaces */ -- if (len && (int)STRLEN(buffer) < len - 1) -+ if (len && (int)STRLEN(buffer) < (int)len - 1) - did_find_nul = TRUE; - else - check_spaces = TRUE; -@@ -5851,7 +5926,9 @@ - * we are going to suspend or starting an external process - * so we shouldn't have problem with this - */ -+# ifdef SIGTSTP - signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); -+# endif - return 1; /* succeed */ - } - if (gpm_fd == -2) -@@ -6001,7 +6078,6 @@ - /* - * Gets info from sysmouse and adds special keys to input buf. - */ --/* ARGSUSED */ - static RETSIGTYPE - sig_sysmouse SIGDEFARG(sigarg) - { -@@ -6565,11 +6641,10 @@ - * This is our chance to ask the user if they want to save, - * or abort the logout - */ --/*ARGSUSED*/ - static void - xsmp_handle_interaction(smc_conn, client_data) - SmcConn smc_conn; -- SmPointer client_data; -+ SmPointer client_data UNUSED; - { - cmdmod_T save_cmdmod; - int cancel_shutdown = False; -@@ -6602,16 +6677,15 @@ - /* - * Callback that starts save-yourself. - */ --/*ARGSUSED*/ - static void - xsmp_handle_save_yourself(smc_conn, client_data, save_type, - shutdown, interact_style, fast) - SmcConn smc_conn; -- SmPointer client_data; -- int save_type; -+ SmPointer client_data UNUSED; -+ int save_type UNUSED; - Bool shutdown; -- int interact_style; -- Bool fast; -+ int interact_style UNUSED; -+ Bool fast UNUSED; - { - /* Handle already being in saveyourself */ - if (xsmp.save_yourself) -@@ -6645,11 +6719,10 @@ - /* - * Callback to warn us of imminent death. - */ --/*ARGSUSED*/ - static void - xsmp_die(smc_conn, client_data) -- SmcConn smc_conn; -- SmPointer client_data; -+ SmcConn smc_conn UNUSED; -+ SmPointer client_data UNUSED; - { - xsmp_close(); - -@@ -6661,11 +6734,10 @@ - /* - * Callback to tell us that save-yourself has completed. - */ --/*ARGSUSED*/ - static void - xsmp_save_complete(smc_conn, client_data) -- SmcConn smc_conn; -- SmPointer client_data; -+ SmcConn smc_conn UNUSED; -+ SmPointer client_data UNUSED; - { - xsmp.save_yourself = False; - } -@@ -6675,11 +6747,10 @@ - * Callback to tell us that an instigated shutdown was cancelled - * (maybe even by us) - */ --/*ARGSUSED*/ - static void - xsmp_shutdown_cancelled(smc_conn, client_data) - SmcConn smc_conn; -- SmPointer client_data; -+ SmPointer client_data UNUSED; - { - if (xsmp.save_yourself) - SmcSaveYourselfDone(smc_conn, True); -@@ -6691,13 +6762,12 @@ - /* - * Callback to tell us that a new ICE connection has been established. - */ --/*ARGSUSED*/ - static void - xsmp_ice_connection(iceConn, clientData, opening, watchData) - IceConn iceConn; -- IcePointer clientData; -+ IcePointer clientData UNUSED; - Bool opening; -- IcePointer *watchData; -+ IcePointer *watchData UNUSED; - { - /* Intercept creation of ICE connection fd */ - if (opening) -@@ -6814,7 +6884,8 @@ - if (xsmp_icefd != -1) - { - SmcCloseConnection(xsmp.smcconn, 0, NULL); -- vim_free(xsmp.clientid); -+ if (xsmp.clientid != NULL) -+ free(xsmp.clientid); - xsmp.clientid = NULL; - xsmp_icefd = -1; - } -diff -Naur vim72.orig/src/os_unix.h vim72/src/os_unix.h ---- vim72.orig/src/os_unix.h 2008-06-17 19:01:17.000000000 +0100 -+++ vim72/src/os_unix.h 2009-07-22 22:54:23.000000000 +0100 -@@ -124,7 +124,7 @@ - # define SIGDUMMYARG 0, 0, (struct sigcontext *)0 - # else - # define SIGPROTOARG (int) --# define SIGDEFARG(s) (s) int s; -+# define SIGDEFARG(s) (s) int s UNUSED; - # define SIGDUMMYARG 0 - # endif - #else -@@ -482,11 +482,6 @@ - # else - int mch_rename __ARGS((const char *src, const char *dest)); - # endif --# ifdef VMS --# define mch_chdir(s) chdir(vms_fixfilename(s)) --# else --# define mch_chdir(s) chdir(s) --# endif - # ifndef VMS - # ifdef __MVS__ - /* on OS390 Unix getenv() doesn't return a pointer to persistent -diff -Naur vim72.orig/src/popupmnu.c vim72/src/popupmnu.c ---- vim72.orig/src/popupmnu.c 2008-07-12 17:28:18.000000000 +0100 -+++ vim72/src/popupmnu.c 2009-07-22 22:54:17.000000000 +0100 -@@ -573,7 +573,7 @@ - { - /* Don't want to sync undo in the current buffer. */ - ++no_u_sync; -- res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0); -+ res = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, 0, NULL); - --no_u_sync; - if (res == OK) - { -diff -Naur vim72.orig/src/proto/buffer.pro vim72/src/proto/buffer.pro ---- vim72.orig/src/proto/buffer.pro 2008-08-09 15:31:21.000000000 +0100 -+++ vim72/src/proto/buffer.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -33,17 +33,16 @@ - char_u *getaltfname __ARGS((int errmsg)); - int buflist_add __ARGS((char_u *fname, int flags)); - void buflist_slash_adjust __ARGS((void)); --void buflist_altfpos __ARGS((void)); -+void buflist_altfpos __ARGS((win_T *win)); - int otherfile __ARGS((char_u *ffname)); - void buf_setino __ARGS((buf_T *buf)); - void fileinfo __ARGS((int fullname, int shorthelp, int dont_truncate)); --void col_print __ARGS((char_u *buf, int col, int vcol)); -+void col_print __ARGS((char_u *buf, size_t buflen, int col, int vcol)); - void maketitle __ARGS((void)); - void resettitle __ARGS((void)); - void free_titles __ARGS((void)); - int build_stl_str_hl __ARGS((win_T *wp, char_u *out, size_t outlen, char_u *fmt, int use_sandbox, int fillchar, int maxwidth, struct stl_hlrec *hltab, struct stl_hlrec *tabtab)); --void get_rel_pos __ARGS((win_T *wp, char_u *str)); --int append_arg_number __ARGS((win_T *wp, char_u *buf, int add_file, int maxlen)); -+void get_rel_pos __ARGS((win_T *wp, char_u *buf, int buflen)); - char_u *fix_fname __ARGS((char_u *fname)); - void fname_expand __ARGS((buf_T *buf, char_u **ffname, char_u **sfname)); - char_u *alist_name __ARGS((aentry_T *aep)); -@@ -54,8 +53,8 @@ - void write_viminfo_bufferlist __ARGS((FILE *fp)); - char *buf_spname __ARGS((buf_T *buf)); - void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr)); --int buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr)); --int_u buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type)); -+linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr)); -+int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type)); - linenr_T buf_delsign __ARGS((buf_T *buf, int id)); - int buf_findsign __ARGS((buf_T *buf, int id)); - int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum)); -diff -Naur vim72.orig/src/proto/edit.pro vim72/src/proto/edit.pro ---- vim72.orig/src/proto/edit.pro 2008-08-09 15:31:24.000000000 +0100 -+++ vim72/src/proto/edit.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -8,7 +8,7 @@ - void backspace_until_column __ARGS((int col)); - int vim_is_ctrl_x_key __ARGS((int c)); - int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags)); --void set_completion __ARGS((int startcol, list_T *list)); -+void set_completion __ARGS((colnr_T startcol, list_T *list)); - void ins_compl_show_pum __ARGS((void)); - char_u *find_word_start __ARGS((char_u *ptr)); - char_u *find_word_end __ARGS((char_u *ptr)); -diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro ---- vim72.orig/src/proto/eval.pro 2008-08-09 15:31:25.000000000 +0100 -+++ vim72/src/proto/eval.pro 2009-07-22 22:54:18.000000000 +0100 -@@ -17,7 +17,7 @@ - int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); - char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip)); - int skip_expr __ARGS((char_u **pp)); --char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist)); -+char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert)); - char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox)); - int eval_to_number __ARGS((char_u *expr)); - list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr)); -@@ -46,7 +46,9 @@ - void list_unref __ARGS((list_T *l)); - void list_free __ARGS((list_T *l, int recurse)); - dictitem_T *dict_lookup __ARGS((hashitem_T *hi)); -+char_u *list_find_str __ARGS((list_T *l, long idx)); - int list_append_dict __ARGS((list_T *list, dict_T *dict)); -+int list_append_string __ARGS((list_T *l, char_u *str, int len)); - int garbage_collect __ARGS((void)); - dict_T *dict_alloc __ARGS((void)); - int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str)); -@@ -58,8 +60,10 @@ - void set_vim_var_nr __ARGS((int idx, long val)); - long get_vim_var_nr __ARGS((int idx)); - char_u *get_vim_var_str __ARGS((int idx)); --void set_vcount __ARGS((long count, long count1)); -+list_T *get_vim_var_list __ARGS((int idx)); -+void set_vcount __ARGS((long count, long count1, int set_prevcount)); - void set_vim_var_string __ARGS((int idx, char_u *val, int len)); -+void set_vim_var_list __ARGS((int idx, list_T *val)); - void set_reg_var __ARGS((int c)); - char_u *v_exception __ARGS((char_u *oldval)); - char_u *v_throwpoint __ARGS((char_u *oldval)); -@@ -94,6 +98,7 @@ - void write_viminfo_varlist __ARGS((FILE *fp)); - int store_session_globals __ARGS((FILE *fd)); - void last_set_msg __ARGS((scid_T scriptID)); -+void ex_oldfiles __ARGS((exarg_T *eap)); - int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen)); - char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags)); - /* vim: set ft=c : */ -diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro ---- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 15:31:25.000000000 +0100 -+++ vim72/src/proto/ex_cmds.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -9,9 +9,9 @@ - void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out)); - void do_shell __ARGS((char_u *cmd, int flags)); - char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp)); --void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname)); -+void append_redir __ARGS((char_u *buf, int buflen, char_u *opt, char_u *fname)); - int viminfo_error __ARGS((char *errnum, char *message, char_u *line)); --int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit)); -+int read_viminfo __ARGS((char_u *file, int flags)); - void write_viminfo __ARGS((char_u *file, int forceit)); - int viminfo_readline __ARGS((vir_T *virp)); - char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert)); -@@ -27,7 +27,7 @@ - void do_wqall __ARGS((exarg_T *eap)); - int not_writing __ARGS((void)); - int getfile __ARGS((int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit)); --int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags)); -+int do_ecmd __ARGS((int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags, win_T *oldwin)); - void ex_append __ARGS((exarg_T *eap)); - void ex_change __ARGS((exarg_T *eap)); - void ex_z __ARGS((exarg_T *eap)); -@@ -55,5 +55,8 @@ - char_u *sign_get_text __ARGS((int typenr)); - void *sign_get_image __ARGS((int typenr)); - char_u *sign_typenr2name __ARGS((int typenr)); -+void free_signs __ARGS((void)); -+char_u *get_sign_name __ARGS((expand_T *xp, int idx)); -+void set_context_in_sign_cmd __ARGS((expand_T *xp, char_u *arg)); - void ex_drop __ARGS((exarg_T *eap)); - /* vim: set ft=c : */ -diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro ---- vim72.orig/src/proto/ex_getln.pro 2008-08-09 15:31:28.000000000 +0100 -+++ vim72/src/proto/ex_getln.pro 2009-07-22 22:54:20.000000000 +0100 -@@ -4,6 +4,7 @@ - int text_locked __ARGS((void)); - void text_locked_msg __ARGS((void)); - int curbuf_locked __ARGS((void)); -+int allbuf_locked __ARGS((void)); - char_u *getexline __ARGS((int c, void *dummy, int indent)); - char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent)); - int cmdline_overstrike __ARGS((void)); -@@ -31,7 +32,7 @@ - void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); - int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches)); - int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)))); --char_u *globpath __ARGS((char_u *path, char_u *file)); -+char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options)); - void init_history __ARGS((void)); - int get_histtype __ARGS((char_u *name)); - void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep)); -diff -Naur vim72.orig/src/proto/gui.pro vim72/src/proto/gui.pro ---- vim72.orig/src/proto/gui.pro 2008-08-09 15:31:56.000000000 +0100 -+++ vim72/src/proto/gui.pro 2009-07-22 22:54:23.000000000 +0100 -@@ -43,6 +43,7 @@ - void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp)); - scrollbar_T *gui_find_scrollbar __ARGS((long ident)); - void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)); -+void gui_may_update_scrollbars __ARGS((void)); - void gui_update_scrollbars __ARGS((int force)); - int gui_do_scroll __ARGS((void)); - int gui_do_horiz_scroll __ARGS((void)); -diff -Naur vim72.orig/src/proto/if_cscope.pro vim72/src/proto/if_cscope.pro ---- vim72.orig/src/proto/if_cscope.pro 2008-08-09 15:31:33.000000000 +0100 -+++ vim72/src/proto/if_cscope.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -1,4 +1,6 @@ - /* if_cscope.c */ -+char_u *get_cscope_name __ARGS((expand_T *xp, int idx)); -+void set_context_in_cscope_cmd __ARGS((expand_T *xp, char_u *arg, cmdidx_T cmdidx)); - void do_cscope __ARGS((exarg_T *eap)); - void do_scscope __ARGS((exarg_T *eap)); - void do_cstag __ARGS((exarg_T *eap)); -diff -Naur vim72.orig/src/proto/if_mzsch.pro vim72/src/proto/if_mzsch.pro ---- vim72.orig/src/proto/if_mzsch.pro 2004-07-12 09:27:00.000000000 +0100 -+++ vim72/src/proto/if_mzsch.pro 2009-07-22 22:54:22.000000000 +0100 -@@ -15,10 +15,6 @@ - void *mzvim_eval_string __ARGS((char_u *str)); - struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc, - struct Scheme_Object **)); --int mzthreads_allowed (void); --#ifdef FEAT_GUI_KDE --void timer_proc (void); --void mzscheme_kde_start_timer (void); --void mzscheme_kde_stop_timer (void); --#endif -+int mzthreads_allowed __ARGS((void)); -+void mzscheme_main __ARGS((void)); - /* vim: set ft=c : */ -diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro ---- vim72.orig/src/proto/mark.pro 2008-08-09 15:31:36.000000000 +0100 -+++ vim72/src/proto/mark.pro 2009-07-22 22:54:17.000000000 +0100 -@@ -26,5 +26,5 @@ - void write_viminfo_filemarks __ARGS((FILE *fp)); - int removable __ARGS((char_u *name)); - int write_viminfo_marks __ARGS((FILE *fp_out)); --void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof)); -+void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags)); - /* vim: set ft=c : */ -diff -Naur vim72.orig/src/proto/mbyte.pro vim72/src/proto/mbyte.pro ---- vim72.orig/src/proto/mbyte.pro 2008-08-09 15:31:41.000000000 +0100 -+++ vim72/src/proto/mbyte.pro 2009-07-22 22:54:22.000000000 +0100 -@@ -7,10 +7,12 @@ - int latin_char2len __ARGS((int c)); - int latin_char2bytes __ARGS((int c, char_u *buf)); - int latin_ptr2len __ARGS((char_u *p)); -+int latin_ptr2len_len __ARGS((char_u *p, int size)); - int utf_char2cells __ARGS((int c)); - int latin_ptr2cells __ARGS((char_u *p)); - int utf_ptr2cells __ARGS((char_u *p)); - int dbcs_ptr2cells __ARGS((char_u *p)); -+int latin_ptr2cells_len __ARGS((char_u *p, int size)); - int latin_char2cells __ARGS((int c)); - int latin_off2cells __ARGS((unsigned off, unsigned max_off)); - int dbcs_off2cells __ARGS((unsigned off, unsigned max_off)); -@@ -85,6 +87,7 @@ - int preedit_get_status __ARGS((void)); - int im_is_preediting __ARGS((void)); - int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to)); -+int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8)); - int convert_input __ARGS((char_u *ptr, int len, int maxlen)); - int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp)); - char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp)); -diff -Naur vim72.orig/src/proto/message.pro vim72/src/proto/message.pro ---- vim72.orig/src/proto/message.pro 2008-08-09 15:31:39.000000000 +0100 -+++ vim72/src/proto/message.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -54,6 +54,7 @@ - void msg_clr_cmdline __ARGS((void)); - int msg_end __ARGS((void)); - void msg_check __ARGS((void)); -+int redirecting __ARGS((void)); - void verbose_enter __ARGS((void)); - void verbose_leave __ARGS((void)); - void verbose_enter_scroll __ARGS((void)); -diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro ---- vim72.orig/src/proto/misc2.pro 2008-08-09 15:31:40.000000000 +0100 -+++ vim72/src/proto/misc2.pro 2009-07-22 22:54:18.000000000 +0100 -@@ -59,7 +59,7 @@ - int handle_x_keys __ARGS((int key)); - char_u *get_special_key_name __ARGS((int c, int modifiers)); - int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode)); --int find_special_key __ARGS((char_u **srcp, int *modp, int keycode)); -+int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key)); - int extract_modifiers __ARGS((int key, int *modp)); - int find_special_key_in_table __ARGS((int c)); - int get_special_key_code __ARGS((char_u *name)); -diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro ---- vim72.orig/src/proto/netbeans.pro 2008-08-09 15:31:56.000000000 +0100 -+++ vim72/src/proto/netbeans.pro 2009-07-22 22:54:19.000000000 +0100 -@@ -11,7 +11,7 @@ - void netbeans_frame_moved __ARGS((int new_x, int new_y)); - void netbeans_file_activated __ARGS((buf_T *bufp)); - void netbeans_file_opened __ARGS((buf_T *bufp)); --void netbeans_file_closed __ARGS((buf_T *bufp)); -+void netbeans_file_killed __ARGS((buf_T *bufp)); - void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen)); - void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len)); - void netbeans_unmodified __ARGS((buf_T *bufp)); -diff -Naur vim72.orig/src/proto/option.pro vim72/src/proto/option.pro ---- vim72.orig/src/proto/option.pro 2008-08-09 15:31:43.000000000 +0100 -+++ vim72/src/proto/option.pro 2009-07-22 22:54:24.000000000 +0100 -@@ -29,6 +29,7 @@ - int makefoldset __ARGS((FILE *fd)); - void clear_termoptions __ARGS((void)); - void free_termoptions __ARGS((void)); -+void free_one_termoption __ARGS((char_u *var)); - void set_term_defaults __ARGS((void)); - void comp_col __ARGS((void)); - char_u *get_equalprg __ARGS((void)); -@@ -44,6 +45,7 @@ - void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags)); - int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file)); - int ExpandOldSetting __ARGS((int *num_file, char_u ***file)); -+int langmap_adjust_mb __ARGS((int c)); - int has_format_option __ARGS((int x)); - int shortmess __ARGS((int x)); - void vimrc_found __ARGS((char_u *fname, char_u *envname)); -diff -Naur vim72.orig/src/proto/os_unix.pro vim72/src/proto/os_unix.pro ---- vim72.orig/src/proto/os_unix.pro 2008-08-09 15:31:44.000000000 +0100 -+++ vim72/src/proto/os_unix.pro 2009-07-22 22:54:23.000000000 +0100 -@@ -1,4 +1,5 @@ - /* os_unix.c */ -+int mch_chdir __ARGS((char *path)); - void mch_write __ARGS((char_u *s, int len)); - int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); - int mch_char_avail __ARGS((void)); -diff -Naur vim72.orig/src/proto/spell.pro vim72/src/proto/spell.pro ---- vim72.orig/src/proto/spell.pro 2008-08-09 15:31:48.000000000 +0100 -+++ vim72/src/proto/spell.pro 2009-07-22 22:54:21.000000000 +0100 -@@ -22,5 +22,5 @@ - char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf)); - int spell_word_start __ARGS((int startcol)); - void spell_expand_check_cap __ARGS((colnr_T col)); --int expand_spelling __ARGS((linenr_T lnum, int col, char_u *pat, char_u ***matchp)); -+int expand_spelling __ARGS((linenr_T lnum, char_u *pat, char_u ***matchp)); - /* vim: set ft=c : */ -diff -Naur vim72.orig/src/proto/ui.pro vim72/src/proto/ui.pro ---- vim72.orig/src/proto/ui.pro 2008-08-09 15:31:52.000000000 +0100 -+++ vim72/src/proto/ui.pro 2009-07-22 22:54:23.000000000 +0100 -@@ -48,6 +48,7 @@ - void open_app_context __ARGS((void)); - void x11_setup_atoms __ARGS((Display *dpy)); - void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd)); -+void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd)); - void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd)); - int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd)); - void clip_x11_set_selection __ARGS((VimClipboard *cbd)); -diff -Naur vim72.orig/src/proto/window.pro vim72/src/proto/window.pro ---- vim72.orig/src/proto/window.pro 2008-08-09 15:31:54.000000000 +0100 -+++ vim72/src/proto/window.pro 2009-07-22 22:54:23.000000000 +0100 -@@ -1,6 +1,7 @@ - /* window.c */ - void do_window __ARGS((int nchar, long Prenum, int xchar)); - int win_split __ARGS((int size, int flags)); -+int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir)); - int win_valid __ARGS((win_T *win)); - int win_count __ARGS((void)); - int make_windows __ARGS((int count, int vertical)); -@@ -10,9 +11,12 @@ - void win_close __ARGS((win_T *win, int free_buf)); - void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); - void win_free_all __ARGS((void)); -+win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp)); - void close_others __ARGS((int message, int forceit)); - void curwin_init __ARGS((void)); -+void win_init_empty __ARGS((win_T *wp)); - int win_alloc_first __ARGS((void)); -+void win_alloc_aucmd_win __ARGS((void)); - void win_init_size __ARGS((void)); - void free_tabpage __ARGS((tabpage_T *tp)); - int win_new_tabpage __ARGS((int after)); -@@ -30,6 +34,8 @@ - void win_enter __ARGS((win_T *wp, int undo_sync)); - win_T *buf_jump_open_win __ARGS((buf_T *buf)); - win_T *buf_jump_open_tab __ARGS((buf_T *buf)); -+void win_append __ARGS((win_T *after, win_T *wp)); -+void win_remove __ARGS((win_T *wp, tabpage_T *tp)); - int win_alloc_lines __ARGS((win_T *wp)); - void win_free_lsize __ARGS((win_T *wp)); - void shell_new_rows __ARGS((void)); -@@ -58,6 +64,8 @@ - int min_rows __ARGS((void)); - int only_one_window __ARGS((void)); - void check_lnums __ARGS((int do_curwin)); -+void make_snapshot __ARGS((int idx)); -+void restore_snapshot __ARGS((int idx, int close_curwin)); - int win_hasvertsplit __ARGS((void)); - int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id)); - int match_delete __ARGS((win_T *wp, int id, int perr)); -diff -Naur vim72.orig/src/pty.c vim72/src/pty.c ---- vim72.orig/src/pty.c 2008-06-21 19:52:58.000000000 +0100 -+++ vim72/src/pty.c 2009-07-22 22:54:16.000000000 +0100 -@@ -270,9 +270,10 @@ - } - #endif - --#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) -+#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X) - --/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */ -+/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! -+ * Same for Mac OS X Leopard. */ - #define PTY_DONE - int - OpenPTY(ttyn) -diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c ---- vim72.orig/src/quickfix.c 2008-07-18 13:53:02.000000000 +0100 -+++ vim72/src/quickfix.c 2009-07-22 22:54:23.000000000 +0100 -@@ -1419,7 +1419,9 @@ - int opened_window = FALSE; - win_T *win; - win_T *altwin; -+ int flags; - #endif -+ win_T *oldwin = curwin; - int print_message = TRUE; - int len; - #ifdef FEAT_FOLDING -@@ -1530,7 +1532,6 @@ - if (qf_ptr->qf_type == 1 && (!curwin->w_buffer->b_help || cmdmod.tab != 0)) - { - win_T *wp; -- int n; - - if (cmdmod.tab != 0) - wp = NULL; -@@ -1546,13 +1547,16 @@ - * Split off help window; put it at far top if no position - * specified, the current window is vertically split and narrow. - */ -- n = WSP_HELP; -+ flags = WSP_HELP; - # ifdef FEAT_VERTSPLIT - if (cmdmod.split == 0 && curwin->w_width != Columns - && curwin->w_width < 80) -- n |= WSP_TOP; -+ flags |= WSP_TOP; - # endif -- if (win_split(0, n) == FAIL) -+ if (qi != &ql_info) -+ flags |= WSP_NEWLOC; /* don't copy the location list */ -+ -+ if (win_split(0, flags) == FAIL) - goto theend; - opened_window = TRUE; /* close it when fail */ - -@@ -1562,7 +1566,6 @@ - if (qi != &ql_info) /* not a quickfix list */ - { - /* The new window should use the supplied location list */ -- qf_free_all(curwin); - curwin->w_llist = qi; - qi->qf_refcount++; - } -@@ -1609,10 +1612,11 @@ - { - goto_tabpage_win(tp, wp); - usable_win = 1; -- break; -+ goto win_found; - } - } - } -+win_found: - - /* - * If there is only one window and it is the quickfix window, create a -@@ -1622,7 +1626,10 @@ - { - ll_ref = curwin->w_llist_ref; - -- if (win_split(0, WSP_ABOVE) == FAIL) -+ flags = WSP_ABOVE; -+ if (ll_ref != NULL) -+ flags |= WSP_NEWLOC; -+ if (win_split(0, flags) == FAIL) - goto failed; /* not enough room for window */ - opened_window = TRUE; /* close it when fail */ - p_swb = empty_option; /* don't split again */ -@@ -1634,7 +1641,6 @@ - { - /* The new window should use the location list from the - * location list window */ -- qf_free_all(curwin); - curwin->w_llist = ll_ref; - ll_ref->qf_refcount++; - } -@@ -1744,7 +1750,8 @@ - } - else - ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, -- ECMD_HIDE + ECMD_SET_HELP); -+ ECMD_HIDE + ECMD_SET_HELP, -+ oldwin == curwin ? curwin : NULL); - } - else - ok = buflist_getfile(qf_ptr->qf_fnum, -@@ -2233,7 +2240,6 @@ - * ":cclose": close the window showing the list of errors. - * ":lclose": close the window showing the location list - */ --/*ARGSUSED*/ - void - ex_cclose(eap) - exarg_T *eap; -@@ -2267,6 +2273,7 @@ - win_T *win; - tabpage_T *prevtab = curtab; - buf_T *qf_buf; -+ win_T *oldwin = curwin; - - if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow) - { -@@ -2307,15 +2314,12 @@ - if (eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow) - /* Create the new window at the very bottom. */ - win_goto(lastwin); -- if (win_split(height, WSP_BELOW) == FAIL) -+ if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL) - return; /* not enough room for window */ - #ifdef FEAT_SCROLLBIND - curwin->w_p_scb = FALSE; - #endif - -- /* Remove the location list for the quickfix window */ -- qf_free_all(curwin); -- - if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow) - { - /* -@@ -2326,20 +2330,28 @@ - win->w_llist->qf_refcount++; - } - -+ if (oldwin != curwin) -+ oldwin = NULL; /* don't store info when in another window */ - if (qf_buf != NULL) - /* Use the existing quickfix buffer */ - (void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE, -- ECMD_HIDE + ECMD_OLDBUF); -+ ECMD_HIDE + ECMD_OLDBUF, oldwin); - else - { - /* Create a new quickfix buffer */ -- (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE); -+ (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin); - /* switch off 'swapfile' */ - set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL); - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); -- set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL); -+#ifdef FEAT_DIFF -+ curwin->w_p_diff = FALSE; -+#endif -+#ifdef FEAT_FOLDING -+ set_option_value((char_u *)"fdm", 0L, (char_u *)"manual", -+ OPT_LOCAL); -+#endif - } - - /* Only set the height when still in the same tab page and there is no -@@ -2600,10 +2612,12 @@ - curbuf->b_p_ma = FALSE; - - #ifdef FEAT_AUTOCMD -+ keep_filetype = TRUE; /* don't detect 'filetype' */ - apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL, - FALSE, curbuf); - apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL, - FALSE, curbuf); -+ keep_filetype = FALSE; - #endif - - /* make sure it will be redrawn */ -@@ -2759,7 +2773,7 @@ - sprintf((char *)cmd, "%s%s%s", (char *)p_shq, (char *)eap->arg, - (char *)p_shq); - if (*p_sp != NUL) -- append_redir(cmd, p_sp, fname); -+ append_redir(cmd, len, p_sp, fname); - /* - * Output a newline if there's something else than the :make command that - * was typed (in which case the cursor is in column 0). -@@ -3196,7 +3210,7 @@ - break; - col = regmatch.endpos[0].col - + (col == regmatch.endpos[0].col); -- if (col > STRLEN(ml_get_buf(buf, lnum, FALSE))) -+ if (col > (colnr_T)STRLEN(ml_get_buf(buf, lnum, FALSE))) - break; - } - line_breakcheck(); -@@ -3397,14 +3411,15 @@ - /* Init the options. */ - buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP); - -- /* set curwin/curbuf to buf and save a few things */ -- aucmd_prepbuf(&aco, newbuf); -+ /* need to open the memfile before putting the buffer in a window */ -+ if (ml_open(newbuf) == OK) -+ { -+ /* set curwin/curbuf to buf and save a few things */ -+ aucmd_prepbuf(&aco, newbuf); - -- /* Need to set the filename for autocommands. */ -- (void)setfname(curbuf, fname, NULL, FALSE); -+ /* Need to set the filename for autocommands. */ -+ (void)setfname(curbuf, fname, NULL, FALSE); - -- if (ml_open(curbuf) == OK) -- { - /* Create swap file now to avoid the ATTENTION message. */ - check_need_swap(TRUE); - -@@ -3427,10 +3442,10 @@ - newbuf = curbuf; - } - } -- } - -- /* restore curwin/curbuf and a few other things */ -- aucmd_restbuf(&aco); -+ /* restore curwin/curbuf and a few other things */ -+ aucmd_restbuf(&aco); -+ } - - if (!buf_valid(newbuf)) - return NULL; -diff -Naur vim72.orig/src/regexp.c vim72/src/regexp.c ---- vim72.orig/src/regexp.c 2008-08-07 20:58:50.000000000 +0100 -+++ vim72/src/regexp.c 2009-07-22 22:54:21.000000000 +0100 -@@ -471,7 +471,7 @@ - - if ((*pp)[1] == ':') - { -- for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i) -+ for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i) - if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0) - { - *pp += STRLEN(class_names[i]) + 2; -@@ -3362,12 +3362,11 @@ - * Match a regexp against a string ("line" points to the string) or multiple - * lines ("line" is NULL, use reg_getline()). - */ --/*ARGSUSED*/ - static long - vim_regexec_both(line, col, tm) - char_u *line; - colnr_T col; /* column to start looking for match */ -- proftime_T *tm; /* timeout limit or NULL */ -+ proftime_T *tm UNUSED; /* timeout limit or NULL */ - { - regprog_T *prog; - char_u *s; -@@ -4532,7 +4531,7 @@ - cleanup_subexpr(); - if (!REG_MULTI) /* Single-line regexp */ - { -- if (reg_endp[no] == NULL) -+ if (reg_startp[no] == NULL || reg_endp[no] == NULL) - { - /* Backref was not set: Match an empty string. */ - len = 0; -@@ -4548,7 +4547,7 @@ - } - else /* Multi-line regexp */ - { -- if (reg_endpos[no].lnum < 0) -+ if (reg_startpos[no].lnum < 0 || reg_endpos[no].lnum < 0) - { - /* Backref was not set: Match an empty string. */ - len = 0; -@@ -7279,13 +7278,11 @@ - } - else - { -- if (submatch_match->endp[no] == NULL) -+ s = submatch_match->startp[no]; -+ if (s == NULL || submatch_match->endp[no] == NULL) - retval = NULL; - else -- { -- s = submatch_match->startp[no]; - retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s)); -- } - } - - return retval; -diff -Naur vim72.orig/src/screen.c vim72/src/screen.c ---- vim72.orig/src/screen.c 2008-07-24 15:45:07.000000000 +0100 -+++ vim72/src/screen.c 2009-07-22 22:54:23.000000000 +0100 -@@ -270,11 +270,10 @@ - * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot - * may become invalid and the whole window will have to be redrawn. - */ --/*ARGSUSED*/ - void - redrawWinline(lnum, invalid) - linenr_T lnum; -- int invalid; /* window line height is invalid now */ -+ int invalid UNUSED; /* window line height is invalid now */ - { - #ifdef FEAT_FOLDING - int i; -@@ -2413,7 +2412,7 @@ - && (lnume < bot->lnum - || (lnume == bot->lnum - && (bot->col - (*p_sel == 'e')) -- >= STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) -+ >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) - { - if (VIsual_mode == Ctrl_V) - { -@@ -2439,9 +2438,17 @@ - - #ifdef FEAT_SYN_HL - /* Show 'cursorcolumn' in the fold line. */ -- if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp)) -- ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr( -- ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC)); -+ if (wp->w_p_cuc) -+ { -+ txtcol += wp->w_virtcol; -+ if (wp->w_p_wrap) -+ txtcol -= wp->w_skipcol; -+ else -+ txtcol -= wp->w_leftcol; -+ if (txtcol >= 0 && txtcol < W_WIDTH(wp)) -+ ScreenAttrs[off + txtcol] = hl_combine_attr( -+ ScreenAttrs[off + txtcol], hl_attr(HLF_CUC)); -+ } - #endif - - SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), -@@ -2541,14 +2548,13 @@ - * - * Return the number of last row the line occupies. - */ --/* ARGSUSED */ - static int - win_line(wp, lnum, startrow, endrow, nochange) - win_T *wp; - linenr_T lnum; - int startrow; - int endrow; -- int nochange; /* not updating for changed text */ -+ int nochange UNUSED; /* not updating for changed text */ - { - int col; /* visual column on screen */ - unsigned off; /* offset in ScreenLines/ScreenAttrs */ -@@ -2588,6 +2594,7 @@ - int noinvcur = FALSE; /* don't invert the cursor */ - #ifdef FEAT_VISUAL - pos_T *top, *bot; -+ int lnum_in_visual_area = FALSE; - #endif - pos_T pos; - long v; -@@ -2784,9 +2791,10 @@ - top = &VIsual; - bot = &curwin->w_cursor; - } -+ lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); - if (VIsual_mode == Ctrl_V) /* block mode */ - { -- if (lnum >= top->lnum && lnum <= bot->lnum) -+ if (lnum_in_visual_area) - { - fromcol = wp->w_old_cursor_fcol; - tocol = wp->w_old_cursor_lcol; -@@ -2879,8 +2887,9 @@ - } - else - tocol = MAXCOL; -- if (fromcol == tocol) /* do at least one character */ -- tocol = fromcol + 1; /* happens when past end of line */ -+ /* do at least one character; happens when past end of line */ -+ if (fromcol == tocol) -+ tocol = fromcol + 1; - area_highlighting = TRUE; - attr = hl_attr(HLF_I); - } -@@ -3412,6 +3421,7 @@ - && (*mb_ptr2cells)(ptr) > 1) - #endif - || ((int)vcol_prev == fromcol_prev -+ && vcol_prev < vcol /* not at margin */ - && vcol < tocol)) - area_attr = attr; /* start highlighting */ - else if (area_attr != 0 -@@ -3544,7 +3554,8 @@ - /* Use line_attr when not in the Visual or 'incsearch' area - * (area_attr may be 0 when "noinvcur" is set). */ - else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) -- || (vcol < fromcol || vcol >= tocol))) -+ || vcol < fromcol || vcol_prev < fromcol_prev -+ || vcol >= tocol)) - char_attr = line_attr; - #endif - else -@@ -4106,6 +4117,7 @@ - # endif - (col < W_WIDTH(wp))) - && !(noinvcur -+ && lnum == wp->w_cursor.lnum - && (colnr_T)vcol == wp->w_virtcol))) - && lcs_eol_one >= 0) - { -@@ -4247,7 +4259,7 @@ - * preedit_changed and commit. Thus Vim can't set "im_is_active", use - * im_is_preediting() here. */ - if (xic != NULL -- && lnum == curwin->w_cursor.lnum -+ && lnum == wp->w_cursor.lnum - && (State & INSERT) - && !p_imdisable - && im_is_preediting() -@@ -4256,7 +4268,7 @@ - colnr_T tcol; - - if (preedit_end_col == MAXCOL) -- getvcol(curwin, &(curwin->w_cursor), &tcol, NULL, NULL); -+ getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); - else - tcol = preedit_end_col; - if ((long)preedit_start_col <= vcol && vcol < (long)tcol) -@@ -4353,7 +4365,13 @@ - } - #endif - if (lcs_eol == lcs_eol_one -- && ((area_attr != 0 && vcol == fromcol && c == NUL) -+ && ((area_attr != 0 && vcol == fromcol -+#ifdef FEAT_VISUAL -+ && (VIsual_mode != Ctrl_V -+ || lnum == VIsual.lnum -+ || lnum == curwin->w_cursor.lnum) -+#endif -+ && c == NUL) - #ifdef FEAT_SEARCH_EXTRA - /* highlight 'hlsearch' match at end of line */ - || (prevcol_hl_flag == TRUE -@@ -4447,7 +4465,8 @@ - if (c == NUL) - { - #ifdef FEAT_SYN_HL -- if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol) -+ if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol -+ && lnum == wp->w_cursor.lnum) - { - /* highlight last char after line */ - --col; -@@ -4549,7 +4568,8 @@ - * highlight the cursor position itself. */ - if (wp->w_p_cuc && vcol == (long)wp->w_virtcol - && lnum != wp->w_cursor.lnum -- && draw_state == WL_LINE) -+ && draw_state == WL_LINE -+ && !lnum_in_visual_area) - { - vcol_save_attr = char_attr; - char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); -@@ -4652,7 +4672,7 @@ - --n_skip; - - /* Only advance the "vcol" when after the 'number' column. */ -- if (draw_state >= WL_SBR -+ if (draw_state > WL_NR - #ifdef FEAT_DIFF - && filler_todo <= 0 - #endif -@@ -5119,8 +5139,8 @@ - #endif - - #if defined(FEAT_GUI) || defined(UNIX) -- /* The bold trick makes a single row of pixels appear in the next -- * character. When a bold character is removed, the next -+ /* The bold trick makes a single column of pixels appear in the -+ * next character. When a bold character is removed, the next - * character should be redrawn too. This happens for our own GUI - * and for some xterms. */ - if ( -@@ -5723,6 +5743,13 @@ - int fillchar; - int attr; - int this_ru_col; -+ static int busy = FALSE; -+ -+ /* It's possible to get here recursively when 'statusline' (indirectly) -+ * invokes ":redrawstatus". Simply ignore the call then. */ -+ if (busy) -+ return; -+ busy = TRUE; - - wp->w_redr_status = FALSE; - if (wp->w_status_height == 0) -@@ -5861,6 +5888,7 @@ - attr); - } - #endif -+ busy = FALSE; - } - - #ifdef FEAT_STL_OPT -@@ -6076,7 +6104,7 @@ - fillchar, maxwidth, hltab, tabtab); - len = (int)STRLEN(buf); - -- while (width < maxwidth && len < sizeof(buf) - 1) -+ while (width < maxwidth && len < (int)sizeof(buf) - 1) - { - #ifdef FEAT_MBYTE - len += (*mb_char2bytes)(fillchar, buf + len); -@@ -6263,9 +6291,15 @@ - int pcc[MAX_MCO]; - # endif - #endif -+#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) -+ int force_redraw_this; -+ int force_redraw_next = FALSE; -+#endif -+ int need_redraw; - - if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ - return; -+ off = LineOffset[row] + col; - - #ifdef FEAT_MBYTE - /* When drawing over the right halve of a double-wide char clear out the -@@ -6275,10 +6309,21 @@ - && !gui.in_use - # endif - && mb_fix_col(col, row) != col) -- screen_puts_len((char_u *)" ", 1, row, col - 1, 0); -+ { -+ ScreenLines[off - 1] = ' '; -+ ScreenAttrs[off - 1] = 0; -+ if (enc_utf8) -+ { -+ ScreenLinesUC[off - 1] = 0; -+ ScreenLinesC[0][off - 1] = 0; -+ } -+ /* redraw the previous cell, make it empty */ -+ screen_char(off - 1, row, col - 1); -+ /* force the cell at "col" to be redrawn */ -+ force_redraw_next = TRUE; -+ } - #endif - -- off = LineOffset[row] + col; - #ifdef FEAT_MBYTE - max_off = LineOffset[row] + screen_Columns; - #endif -@@ -6342,7 +6387,12 @@ - } - #endif - -- if (ScreenLines[off] != c -+#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) -+ force_redraw_this = force_redraw_next; -+ force_redraw_next = FALSE; -+#endif -+ -+ need_redraw = ScreenLines[off] != c - #ifdef FEAT_MBYTE - || (mbyte_cells == 2 - && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) -@@ -6350,24 +6400,24 @@ - && c == 0x8e - && ScreenLines2[off] != ptr[1]) - || (enc_utf8 -- && (ScreenLinesUC[off] != (u8char_T)u8c -+ && (ScreenLinesUC[off] != (u8char_T)(c >= 0x80 ? u8c : 0) - || screen_comp_differs(off, u8cc))) - #endif - || ScreenAttrs[off] != attr -- || exmode_active -+ || exmode_active; -+ -+ if (need_redraw -+#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) -+ || force_redraw_this -+#endif - ) - { - #if defined(FEAT_GUI) || defined(UNIX) - /* The bold trick makes a single row of pixels appear in the next - * character. When a bold character is removed, the next - * character should be redrawn too. This happens for our own GUI -- * and for some xterms. -- * Force the redraw by setting the attribute to a different value -- * than "attr", the contents of ScreenLines[] may be needed by -- * mb_off2cells() further on. -- * Don't do this for the last drawn character, because the next -- * character may not be redrawn. */ -- if ( -+ * and for some xterms. */ -+ if (need_redraw && ScreenLines[off] != ' ' && ( - # ifdef FEAT_GUI - gui.in_use - # endif -@@ -6377,23 +6427,14 @@ - # ifdef UNIX - term_is_xterm - # endif -- ) -+ )) - { -- int n; -+ int n = ScreenAttrs[off]; - -- n = ScreenAttrs[off]; --# ifdef FEAT_MBYTE -- if (col + mbyte_cells < screen_Columns -- && (n > HL_ALL || (n & HL_BOLD)) -- && (len < 0 ? ptr[mbyte_blen] != NUL -- : ptr + mbyte_blen < text + len)) -- ScreenAttrs[off + mbyte_cells] = attr + 1; --# else -- if (col + 1 < screen_Columns -- && (n > HL_ALL || (n & HL_BOLD)) -- && (len < 0 ? ptr[1] != NUL : ptr + 1 < text + len)) -- ScreenLines[off + 1] = 0; --# endif -+ if (n > HL_ALL) -+ n = syn_attr2attr(n); -+ if (n & HL_BOLD) -+ force_redraw_next = TRUE; - } - #endif - #ifdef FEAT_MBYTE -@@ -6480,6 +6521,20 @@ - ++ptr; - } - } -+ -+#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) -+ /* If we detected the next character needs to be redrawn, but the text -+ * doesn't extend up to there, update the character here. */ -+ if (force_redraw_next && col < screen_Columns) -+ { -+# ifdef FEAT_MBYTE -+ if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) -+ screen_char_2(off, row, col); -+ else -+# endif -+ screen_char(off, row, col); -+ } -+#endif - } - - #ifdef FEAT_SEARCH_EXTRA -@@ -7356,7 +7411,11 @@ - #endif - static int entered = FALSE; /* avoid recursiveness */ - static int done_outofmem_msg = FALSE; /* did outofmem message */ -+#ifdef FEAT_AUTOCMD -+ int retry_count = 0; - -+retry: -+#endif - /* - * Allocation of the screen buffers is done only when the size changes and - * when Rows and Columns have been set and we have started doing full -@@ -7440,10 +7499,17 @@ - { - outofmem = TRUE; - #ifdef FEAT_WINDOWS -- break; -+ goto give_up; - #endif - } - } -+#ifdef FEAT_AUTOCMD -+ if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL) -+ outofmem = TRUE; -+#endif -+#ifdef FEAT_WINDOWS -+give_up: -+#endif - - #ifdef FEAT_MBYTE - for (i = 0; i < p_mco; ++i) -@@ -7628,8 +7694,17 @@ - --RedrawingDisabled; - - #ifdef FEAT_AUTOCMD -- if (starting == 0) -+ /* -+ * Do not apply autocommands more than 3 times to avoid an endless loop -+ * in case applying autocommands always changes Rows or Columns. -+ */ -+ if (starting == 0 && ++retry_count <= 3) -+ { - apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); -+ /* In rare cases, autocommands may have altered Rows or Columns, -+ * jump back to check if we need to allocate the screen again. */ -+ goto retry; -+ } - #endif - } - -@@ -8590,7 +8665,6 @@ - * - * Return OK for success, FAIL if the lines are not deleted. - */ --/*ARGSUSED*/ - int - screen_del_lines(off, row, line_count, end, force, wp) - int off; -@@ -8598,7 +8672,7 @@ - int line_count; - int end; - int force; /* even when line_count > p_ttyscroll */ -- win_T *wp; /* NULL or window to use width from */ -+ win_T *wp UNUSED; /* NULL or window to use width from */ - { - int j; - int i; -@@ -9416,13 +9490,15 @@ - win_T *wp; - int always; - { -- char_u buffer[70]; -+#define RULER_BUF_LEN 70 -+ char_u buffer[RULER_BUF_LEN]; - int row; - int fillchar; - int attr; - int empty_line = FALSE; - colnr_T virtcol; - int i; -+ size_t len; - int o; - #ifdef FEAT_VERTSPLIT - int this_ru_col; -@@ -9537,11 +9613,12 @@ - * Some sprintfs return the length, some return a pointer. - * To avoid portability problems we use strlen() here. - */ -- sprintf((char *)buffer, "%ld,", -+ vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", - (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) - ? 0L - : (long)(wp->w_cursor.lnum)); -- col_print(buffer + STRLEN(buffer), -+ len = STRLEN(buffer); -+ col_print(buffer + len, RULER_BUF_LEN - len, - empty_line ? 0 : (int)wp->w_cursor.col + 1, - (int)virtcol + 1); - -@@ -9551,7 +9628,7 @@ - * screen up on some terminals). - */ - i = (int)STRLEN(buffer); -- get_rel_pos(wp, buffer + i + 1); -+ get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); - o = i + vim_strsize(buffer + i + 1); - #ifdef FEAT_WINDOWS - if (wp->w_status_height == 0) /* can't use last char of screen */ -@@ -9578,7 +9655,7 @@ - buffer[i++] = fillchar; - ++o; - } -- get_rel_pos(wp, buffer + i); -+ get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); - } - /* Truncate at window boundary. */ - #ifdef FEAT_MBYTE -diff -Naur vim72.orig/src/search.c vim72/src/search.c ---- vim72.orig/src/search.c 2008-07-13 19:18:27.000000000 +0100 -+++ vim72/src/search.c 2009-07-22 22:54:22.000000000 +0100 -@@ -345,6 +345,15 @@ - { - vim_free(spats[0].pat); - vim_free(spats[1].pat); -+ -+# ifdef FEAT_RIGHTLEFT -+ if (mr_pattern_alloced) -+ { -+ vim_free(mr_pattern); -+ mr_pattern_alloced = FALSE; -+ mr_pattern = NULL; -+ } -+# endif - } - #endif - -@@ -513,7 +522,6 @@ - * When FEAT_EVAL is defined, returns the index of the first matching - * subpattern plus one; one if there was none. - */ --/*ARGSUSED*/ - int - searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm) - win_T *win; /* window to search in; can be NULL for a -@@ -526,7 +534,7 @@ - int options; - int pat_use; /* which pattern to use when "pat" is empty */ - linenr_T stop_lnum; /* stop after this line number when != 0 */ -- proftime_T *tm; /* timeout limit or NULL */ -+ proftime_T *tm UNUSED; /* timeout limit or NULL */ - { - int found; - linenr_T lnum; /* no init to shut up Apollo cc */ -@@ -545,8 +553,6 @@ - int save_called_emsg = called_emsg; - #ifdef FEAT_SEARCH_EXTRA - int break_loop = FALSE; --#else --# define break_loop FALSE - #endif - - if (search_regcomp(pat, RE_SEARCH, pat_use, -@@ -931,7 +937,10 @@ - * twice. - */ - if (!p_ws || stop_lnum != 0 || got_int || called_emsg -- || break_loop || found || loop) -+#ifdef FEAT_SEARCH_EXTRA -+ || break_loop -+#endif -+ || found || loop) - break; - - /* -@@ -949,7 +958,11 @@ - give_warning((char_u *)_(dir == BACKWARD - ? top_bot_msg : bot_top_msg), TRUE); - } -- if (got_int || called_emsg || break_loop) -+ if (got_int || called_emsg -+#ifdef FEAT_SEARCH_EXTRA -+ || break_loop -+#endif -+ ) - break; - } - while (--count > 0 && found); /* stop after count matches or no match */ -@@ -2327,8 +2340,8 @@ - for (col = pos.col; check_prevcol(linep, col, '\\', &col);) - bslcnt++; - } -- /* Only accept a match when 'M' is in 'cpo' or when ecaping is -- * what we expect. */ -+ /* Only accept a match when 'M' is in 'cpo' or when escaping -+ * is what we expect. */ - if (cpo_bsl || (bslcnt & 1) == match_escaped) - { - if (c == initc) -@@ -4514,12 +4527,11 @@ - * Find identifiers or defines in included files. - * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. - */ --/*ARGSUSED*/ - void - find_pattern_in_path(ptr, dir, len, whole, skip_comments, - type, count, action, start_lnum, end_lnum) - char_u *ptr; /* pointer to search pattern */ -- int dir; /* direction of expansion */ -+ int dir UNUSED; /* direction of expansion */ - int len; /* length of search pattern */ - int whole; /* match whole words only */ - int skip_comments; /* don't match inside comments */ -@@ -4663,7 +4675,7 @@ - msg_putchar('\n'); /* cursor below last one */ - if (!got_int) /* don't display if 'q' - typed at "--more--" -- mesage */ -+ message */ - { - msg_home_replace_hl(new_fname); - MSG_PUTS(_(" (includes previously listed match)")); -@@ -4975,7 +4987,7 @@ - || IObuff[i-2] == '!')))) - IObuff[i++] = ' '; - } -- /* copy as much as posible of the new word */ -+ /* copy as much as possible of the new word */ - if (p - aux >= IOSIZE - i) - p = aux + IOSIZE - i - 1; - STRNCPY(IObuff + i, aux, p - aux); -@@ -5010,7 +5022,7 @@ - if (did_show) - msg_putchar('\n'); /* cursor below last one */ - if (!got_int) /* don't display if 'q' typed -- at "--more--" mesage */ -+ at "--more--" message */ - msg_home_replace_hl(curr_fname); - prev_fname = curr_fname; - } -@@ -5092,7 +5104,7 @@ - } - if (action != ACTION_SHOW) - { -- curwin->w_cursor.col = (colnr_T) (startp - line); -+ curwin->w_cursor.col = (colnr_T)(startp - line); - curwin->w_set_curswant = TRUE; - } - -@@ -5119,7 +5131,8 @@ - && action == ACTION_EXPAND - && !(compl_cont_status & CONT_SOL) - #endif -- && *(p = startp + 1)) -+ && *startp != NUL -+ && *(p = startp + 1) != NUL) - goto search_line; - } - line_breakcheck(); -diff -Naur vim72.orig/src/spell.c vim72/src/spell.c ---- vim72.orig/src/spell.c 2008-07-12 20:20:55.000000000 +0100 -+++ vim72/src/spell.c 2009-07-22 22:54:23.000000000 +0100 -@@ -77,7 +77,7 @@ - - /* - * Do the opposite: based on a maximum end score and a known sound score, -- * compute the the maximum word score that can be used. -+ * compute the maximum word score that can be used. - */ - #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3) - -@@ -469,6 +469,7 @@ - garray_T sl_comppat; /* CHECKCOMPOUNDPATTERN items */ - regprog_T *sl_compprog; /* COMPOUNDRULE turned into a regexp progrm - * (NULL when no compounding) */ -+ char_u *sl_comprules; /* all COMPOUNDRULE concatenated (or NULL) */ - char_u *sl_compstartflags; /* flags for first compound word */ - char_u *sl_compallflags; /* all flags for compound words */ - char_u sl_nobreak; /* When TRUE: no spaces between words */ -@@ -625,7 +626,7 @@ - /* TRUE if a word appears in the list of banned words. */ - #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word))) - --/* Number of suggestions kept when cleaning up. we need to keep more than -+/* Number of suggestions kept when cleaning up. We need to keep more than - * what is displayed, because when rescore_suggestions() is called the score - * may change and wrong suggestions may be removed later. */ - #define SUG_CLEAN_COUNT(su) ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20) -@@ -839,7 +840,10 @@ - static void slang_clear __ARGS((slang_T *lp)); - static void slang_clear_sug __ARGS((slang_T *lp)); - static void find_word __ARGS((matchinf_T *mip, int mode)); -+static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap)); - static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags)); -+static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag)); -+static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags)); - static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req)); - static void find_prefix __ARGS((matchinf_T *mip, int mode)); - static int fold_more __ARGS((matchinf_T *mip)); -@@ -946,8 +950,8 @@ - */ - #ifndef FEAT_MBYTE - /* Non-multi-byte implementation. */ --# define SPELL_TOFOLD(c) ((c) < 256 ? spelltab.st_fold[c] : (c)) --# define SPELL_TOUPPER(c) ((c) < 256 ? spelltab.st_upper[c] : (c)) -+# define SPELL_TOFOLD(c) ((c) < 256 ? (int)spelltab.st_fold[c] : (c)) -+# define SPELL_TOUPPER(c) ((c) < 256 ? (int)spelltab.st_upper[c] : (c)) - # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE) - #else - # if defined(HAVE_WCHAR_H) -@@ -958,18 +962,18 @@ - * the "w" library function for characters above 255 if available. */ - # ifdef HAVE_TOWLOWER - # define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \ -- : (c) < 256 ? spelltab.st_fold[c] : towlower(c)) -+ : (c) < 256 ? (int)spelltab.st_fold[c] : (int)towlower(c)) - # else - # define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \ -- : (c) < 256 ? spelltab.st_fold[c] : (c)) -+ : (c) < 256 ? (int)spelltab.st_fold[c] : (c)) - # endif - - # ifdef HAVE_TOWUPPER - # define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \ -- : (c) < 256 ? spelltab.st_upper[c] : towupper(c)) -+ : (c) < 256 ? (int)spelltab.st_upper[c] : (int)towupper(c)) - # else - # define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \ -- : (c) < 256 ? spelltab.st_upper[c] : (c)) -+ : (c) < 256 ? (int)spelltab.st_upper[c] : (c)) - # endif - - # ifdef HAVE_ISWUPPER -@@ -1519,6 +1523,11 @@ - ((unsigned)flags >> 24))) - continue; - -+ /* If there is a match with a CHECKCOMPOUNDPATTERN rule -+ * discard the compound word. */ -+ if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat)) -+ continue; -+ - if (mode == FIND_COMPOUND) - { - int capflags; -@@ -1577,6 +1586,11 @@ - if (!can_compound(slang, fword, mip->mi_compflags)) - continue; - } -+ else if (slang->sl_comprules != NULL -+ && !match_compoundrule(slang, mip->mi_compflags)) -+ /* The compound flags collected so far do not match any -+ * COMPOUNDRULE, discard the compounded word. */ -+ continue; - } - - /* Check NEEDCOMPOUND: can't use word without compounding. */ -@@ -1727,6 +1741,39 @@ - } - - /* -+ * Return TRUE if there is a match between the word ptr[wlen] and -+ * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another -+ * word. -+ * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the -+ * end of ptr[wlen] and the second part matches after it. -+ */ -+ static int -+match_checkcompoundpattern(ptr, wlen, gap) -+ char_u *ptr; -+ int wlen; -+ garray_T *gap; /* &sl_comppat */ -+{ -+ int i; -+ char_u *p; -+ int len; -+ -+ for (i = 0; i + 1 < gap->ga_len; i += 2) -+ { -+ p = ((char_u **)gap->ga_data)[i + 1]; -+ if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0) -+ { -+ /* Second part matches at start of following compound word, now -+ * check if first part matches at end of previous word. */ -+ p = ((char_u **)gap->ga_data)[i]; -+ len = (int)STRLEN(p); -+ if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0) -+ return TRUE; -+ } -+ } -+ return FALSE; -+} -+ -+/* - * Return TRUE if "flags" is a valid sequence of compound flags and "word" - * does not have too many syllables. - */ -@@ -1773,6 +1820,98 @@ - } - - /* -+ * Return TRUE when the sequence of flags in "compflags" plus "flag" can -+ * possibly form a valid compounded word. This also checks the COMPOUNDRULE -+ * lines if they don't contain wildcards. -+ */ -+ static int -+can_be_compound(sp, slang, compflags, flag) -+ trystate_T *sp; -+ slang_T *slang; -+ char_u *compflags; -+ int flag; -+{ -+ /* If the flag doesn't appear in sl_compstartflags or sl_compallflags -+ * then it can't possibly compound. */ -+ if (!byte_in_str(sp->ts_complen == sp->ts_compsplit -+ ? slang->sl_compstartflags : slang->sl_compallflags, flag)) -+ return FALSE; -+ -+ /* If there are no wildcards, we can check if the flags collected so far -+ * possibly can form a match with COMPOUNDRULE patterns. This only -+ * makes sense when we have two or more words. */ -+ if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit) -+ { -+ int v; -+ -+ compflags[sp->ts_complen] = flag; -+ compflags[sp->ts_complen + 1] = NUL; -+ v = match_compoundrule(slang, compflags + sp->ts_compsplit); -+ compflags[sp->ts_complen] = NUL; -+ return v; -+ } -+ -+ return TRUE; -+} -+ -+ -+/* -+ * Return TRUE if the compound flags in compflags[] match the start of any -+ * compound rule. This is used to stop trying a compound if the flags -+ * collected so far can't possibly match any compound rule. -+ * Caller must check that slang->sl_comprules is not NULL. -+ */ -+ static int -+match_compoundrule(slang, compflags) -+ slang_T *slang; -+ char_u *compflags; -+{ -+ char_u *p; -+ int i; -+ int c; -+ -+ /* loop over all the COMPOUNDRULE entries */ -+ for (p = slang->sl_comprules; *p != NUL; ++p) -+ { -+ /* loop over the flags in the compound word we have made, match -+ * them against the current rule entry */ -+ for (i = 0; ; ++i) -+ { -+ c = compflags[i]; -+ if (c == NUL) -+ /* found a rule that matches for the flags we have so far */ -+ return TRUE; -+ if (*p == '/' || *p == NUL) -+ break; /* end of rule, it's too short */ -+ if (*p == '[') -+ { -+ int match = FALSE; -+ -+ /* compare against all the flags in [] */ -+ ++p; -+ while (*p != ']' && *p != NUL) -+ if (*p++ == c) -+ match = TRUE; -+ if (!match) -+ break; /* none matches */ -+ } -+ else if (*p != c) -+ break; /* flag of word doesn't match flag in pattern */ -+ ++p; -+ } -+ -+ /* Skip to the next "/", where the next pattern starts. */ -+ p = vim_strchr(p, '/'); -+ if (p == NULL) -+ break; -+ } -+ -+ /* Checked all the rules and none of them match the flags, so there -+ * can't possibly be a compound starting with these flags. */ -+ return FALSE; -+} -+ -+/* - * Return non-zero if the prefix indicated by "arridx" matches with the prefix - * ID in "flags" for the word "word". - * The WF_RAREPFX flag is included in the return value for a rare prefix. -@@ -2237,7 +2376,7 @@ - - /* If we are back at the starting line and there is no match then - * give up. */ -- if (lnum == wp->w_cursor.lnum && !found_one) -+ if (lnum == wp->w_cursor.lnum && (!found_one || wrapped)) - break; - - /* Skip the characters at the start of the next line that were -@@ -2513,9 +2652,11 @@ - lp->sl_midword = NULL; - - vim_free(lp->sl_compprog); -+ vim_free(lp->sl_comprules); - vim_free(lp->sl_compstartflags); - vim_free(lp->sl_compallflags); - lp->sl_compprog = NULL; -+ lp->sl_comprules = NULL; - lp->sl_compstartflags = NULL; - lp->sl_compallflags = NULL; - -@@ -3460,6 +3601,7 @@ - char_u *pp; - char_u *cp; - char_u *ap; -+ char_u *crp; - int cnt; - garray_T *gap; - -@@ -3545,6 +3687,12 @@ - slang->sl_compallflags = ap; - *ap = NUL; - -+ /* And a list of all patterns in their original form, for checking whether -+ * compounding may work in match_compoundrule(). This is freed when we -+ * encounter a wildcard, the check doesn't work then. */ -+ crp = alloc(todo + 1); -+ slang->sl_comprules = crp; -+ - pp = pat; - *pp++ = '^'; - *pp++ = '\\'; -@@ -3587,6 +3735,20 @@ - atstart = 0; - } - } -+ -+ /* Copy flag to "sl_comprules", unless we run into a wildcard. */ -+ if (crp != NULL) -+ { -+ if (c == '+' || c == '*') -+ { -+ vim_free(slang->sl_comprules); -+ slang->sl_comprules = NULL; -+ crp = NULL; -+ } -+ else -+ *crp++ = c; -+ } -+ - if (c == '/') /* slash separates two items */ - { - *pp++ = '\\'; -@@ -3611,6 +3773,9 @@ - *pp++ = '$'; - *pp = NUL; - -+ if (crp != NULL) -+ *crp = NUL; -+ - slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT); - vim_free(pat); - if (slang->sl_compprog == NULL) -@@ -4791,13 +4956,16 @@ - * Structure that is used to store the items in the word tree. This avoids - * the need to keep track of each allocated thing, everything is freed all at - * once after ":mkspell" is done. -+ * Note: "sb_next" must be just before "sb_data" to make sure the alignment of -+ * "sb_data" is correct for systems where pointers must be aligned on -+ * pointer-size boundaries and sizeof(pointer) > sizeof(int) (e.g., Sparc). - */ - #define SBLOCKSIZE 16000 /* size of sb_data */ - typedef struct sblock_S sblock_T; - struct sblock_S - { -- sblock_T *sb_next; /* next block in list */ - int sb_used; /* nr of bytes already in use */ -+ sblock_T *sb_next; /* next block in list */ - char_u sb_data[1]; /* data, actually longer */ - }; - -@@ -4915,6 +5083,7 @@ - } spellinfo_T; - - static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname)); -+static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int mincount)); - static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry)); - static int spell_info_item __ARGS((char_u *s)); - static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u *fname, int lnum)); -@@ -4950,7 +5119,7 @@ - static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd)); - static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname)); - static void clear_node __ARGS((wordnode_T *node)); --static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree)); -+static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree)); - static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname)); - static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang)); - static int sug_maketable __ARGS((spellinfo_T *spin)); -@@ -5223,8 +5392,7 @@ - /* Handle non-empty lines. */ - if (itemcnt > 0) - { -- if (STRCMP(items[0], "SET") == 0 && itemcnt == 2 -- && aff->af_enc == NULL) -+ if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL) - { - #ifdef FEAT_MBYTE - /* Setup for conversion from "ENC" to 'encoding'. */ -@@ -5239,7 +5407,7 @@ - smsg((char_u *)_("Conversion in %s not supported"), fname); - #endif - } -- else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "FLAG", 2) - && aff->af_flagtype == AFT_CHAR) - { - if (STRCMP(items[1], "long") == 0) -@@ -5284,69 +5452,71 @@ - spin->si_info = p; - } - } -- else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "MIDWORD", 2) - && midword == NULL) - { - midword = getroom_save(spin, items[1]); - } -- else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2) -+ else if (is_aff_rule(items, itemcnt, "TRY", 2)) - { - /* ignored, we look in the tree for what chars may appear */ - } - /* TODO: remove "RAR" later */ -- else if ((STRCMP(items[0], "RAR") == 0 -- || STRCMP(items[0], "RARE") == 0) && itemcnt == 2 -- && aff->af_rare == 0) -+ else if ((is_aff_rule(items, itemcnt, "RAR", 2) -+ || is_aff_rule(items, itemcnt, "RARE", 2)) -+ && aff->af_rare == 0) - { - aff->af_rare = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } - /* TODO: remove "KEP" later */ -- else if ((STRCMP(items[0], "KEP") == 0 -- || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2 -+ else if ((is_aff_rule(items, itemcnt, "KEP", 2) -+ || is_aff_rule(items, itemcnt, "KEEPCASE", 2)) - && aff->af_keepcase == 0) - { - aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2 -- && aff->af_bad == 0) -+ else if ((is_aff_rule(items, itemcnt, "BAD", 2) -+ || is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2)) -+ && aff->af_bad == 0) - { - aff->af_bad = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2) - && aff->af_needaffix == 0) - { - aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2) - && aff->af_circumfix == 0) - { - aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2) - && aff->af_nosuggest == 0) - { - aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2 -+ else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2) -+ || is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2)) - && aff->af_needcomp == 0) - { - aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2) - && aff->af_comproot == 0) - { - aff->af_comproot = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); - } -- else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0 -- && itemcnt == 2 && aff->af_compforbid == 0) -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2) -+ && aff->af_compforbid == 0) - { - aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); -@@ -5354,8 +5524,8 @@ - smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"), - fname, lnum); - } -- else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0 -- && itemcnt == 2 && aff->af_comppermit == 0) -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2) -+ && aff->af_comppermit == 0) - { - aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1], - fname, lnum); -@@ -5363,7 +5533,7 @@ - smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"), - fname, lnum); - } -- else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2) - && compflags == NULL) - { - /* Turn flag "c" into COMPOUNDRULE compatible string "c+", -@@ -5376,7 +5546,15 @@ - compflags = p; - } - } -- else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2) -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2)) -+ { -+ /* We don't use the count, but do check that it's a number and -+ * not COMPOUNDRULE mistyped. */ -+ if (atoi((char *)items[1]) == 0) -+ smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"), -+ fname, lnum, items[1]); -+ } -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2)) - { - /* Concatenate this string to previously defined ones, using a - * slash to separate them. */ -@@ -5395,7 +5573,7 @@ - compflags = p; - } - } -- else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2) - && compmax == 0) - { - compmax = atoi((char *)items[1]); -@@ -5403,7 +5581,7 @@ - smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"), - fname, lnum, items[1]); - } -- else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2) - && compminlen == 0) - { - compminlen = atoi((char *)items[1]); -@@ -5411,7 +5589,7 @@ - smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"), - fname, lnum, items[1]); - } -- else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2) - && compsylmax == 0) - { - compsylmax = atoi((char *)items[1]); -@@ -5419,32 +5597,29 @@ - smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"), - fname, lnum, items[1]); - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1)) - { - compoptions |= COMP_CHECKDUP; - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1)) - { - compoptions |= COMP_CHECKREP; - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1)) - { - compoptions |= COMP_CHECKCASE; - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0 -- && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1)) - { - compoptions |= COMP_CHECKTRIPLE; - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0 -- && itemcnt == 2) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2)) - { - if (atoi((char *)items[1]) == 0) - smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"), - fname, lnum, items[1]); - } -- else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0 -- && itemcnt == 3) -+ else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3)) - { - garray_T *gap = &spin->si_comppat; - int i; -@@ -5463,24 +5638,24 @@ - = getroom_save(spin, items[2]); - } - } -- else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2) - && syllable == NULL) - { - syllable = getroom_save(spin, items[1]); - } -- else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "NOBREAK", 1)) - { - spin->si_nobreak = TRUE; - } -- else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1)) - { - spin->si_nosplitsugs = TRUE; - } -- else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1)) - { - spin->si_nosugfile = TRUE; - } -- else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1) -+ else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1)) - { - aff->af_pfxpostpone = TRUE; - } -@@ -5771,24 +5946,20 @@ - } - } - } -- else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2 -- && fol == NULL) -+ else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL) - { - fol = vim_strsave(items[1]); - } -- else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2 -- && low == NULL) -+ else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL) - { - low = vim_strsave(items[1]); - } -- else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2 -- && upp == NULL) -+ else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL) - { - upp = vim_strsave(items[1]); - } -- else if ((STRCMP(items[0], "REP") == 0 -- || STRCMP(items[0], "REPSAL") == 0) -- && itemcnt == 2) -+ else if (is_aff_rule(items, itemcnt, "REP", 2) -+ || is_aff_rule(items, itemcnt, "REPSAL", 2)) - { - /* Ignore REP/REPSAL count */; - if (!isdigit(*items[1])) -@@ -5819,7 +5990,7 @@ - : &spin->si_rep, items[1], items[2]); - } - } -- else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2) -+ else if (is_aff_rule(items, itemcnt, "MAP", 2)) - { - /* MAP item or count */ - if (!found_map) -@@ -5856,9 +6027,8 @@ - ga_append(&spin->si_map, '/'); - } - } -- /* Accept "SAL from to" and "SAL from to # comment". */ -- else if (STRCMP(items[0], "SAL") == 0 -- && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#'))) -+ /* Accept "SAL from to" and "SAL from to #comment". */ -+ else if (is_aff_rule(items, itemcnt, "SAL", 3)) - { - if (do_sal) - { -@@ -5877,12 +6047,12 @@ - : items[2]); - } - } -- else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2) - && sofofrom == NULL) - { - sofofrom = getroom_save(spin, items[1]); - } -- else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2 -+ else if (is_aff_rule(items, itemcnt, "SOFOTO", 2) - && sofoto == NULL) - { - sofoto = getroom_save(spin, items[1]); -@@ -5980,7 +6150,7 @@ - else if (spin->si_newprefID == 0 || spin->si_newprefID == 127) - MSG(_("Too many compound flags")); - else -- MSG(_("Too many posponed prefixes and/or compound flags")); -+ MSG(_("Too many postponed prefixes and/or compound flags")); - } - - if (syllable != NULL) -@@ -6017,6 +6187,22 @@ - } - - /* -+ * Return TRUE when items[0] equals "rulename", there are "mincount" items or -+ * a comment is following after item "mincount". -+ */ -+ static int -+is_aff_rule(items, itemcnt, rulename, mincount) -+ char_u **items; -+ int itemcnt; -+ char *rulename; -+ int mincount; -+{ -+ return (STRCMP(items[0], rulename) == 0 -+ && (itemcnt == mincount -+ || (itemcnt > mincount && items[mincount][0] == '#'))); -+} -+ -+/* - * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from - * ae_flags to ae_comppermit and ae_compforbid. - */ -@@ -7866,7 +8052,7 @@ - /* time_t can be up to 8 bytes in size, more than long_u, thus we - * can't use put_bytes() here. */ - for (i = 7; i >= 0; --i) -- if (i + 1 > sizeof(time_t)) -+ if (i + 1 > (int)sizeof(time_t)) - /* ">>" doesn't work well when shifting more bits than avail */ - putc(0, fd); - else -@@ -7926,6 +8112,8 @@ - char_u *p; - int rr; - int retval = OK; -+ size_t fwv = 1; /* collect return value of fwrite() to avoid -+ warnings from picky compiler */ - - fd = mch_fopen((char *)fname, "w"); - if (fd == NULL) -@@ -7936,11 +8124,11 @@ - - /*
: */ - /* */ -- if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1) -- { -- EMSG(_(e_write)); -- retval = FAIL; -- } -+ fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd); -+ if (fwv != (size_t)1) -+ /* Catch first write error, don't try writing more. */ -+ goto theend; -+ - putc(VIMSPELLVERSION, fd); /* */ - - /* -@@ -7955,7 +8143,7 @@ - - i = (int)STRLEN(spin->si_info); - put_bytes(fd, (long_u)i, 4); /* */ -- fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* */ -+ fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* */ - } - - /* SN_REGION: ... -@@ -7966,7 +8154,7 @@ - putc(SNF_REQUIRED, fd); /* */ - l = spin->si_region_count * 2; - put_bytes(fd, (long_u)l, 4); /* */ -- fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd); -+ fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd); - /* ... */ - regionmask = (1 << spin->si_region_count) - 1; - } -@@ -8016,7 +8204,7 @@ - } - - put_bytes(fd, (long_u)l, 2); /* */ -- fwrite(folchars, (size_t)l, (size_t)1, fd); /* */ -+ fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* */ - } - - /* SN_MIDWORD: */ -@@ -8027,7 +8215,8 @@ - - i = (int)STRLEN(spin->si_midword); - put_bytes(fd, (long_u)i, 4); /* */ -- fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* */ -+ fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); -+ /* */ - } - - /* SN_PREFCOND: ... */ -@@ -8113,7 +8302,8 @@ - p = rr == 1 ? ftp->ft_from : ftp->ft_to; - l = (int)STRLEN(p); - putc(l, fd); -- fwrite(p, l, (size_t)1, fd); -+ if (l > 0) -+ fwv &= fwrite(p, l, (size_t)1, fd); - } - } - -@@ -8131,11 +8321,11 @@ - /* */ - - put_bytes(fd, (long_u)l, 2); /* */ -- fwrite(spin->si_sofofr, l, (size_t)1, fd); /* */ -+ fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* */ - - l = (int)STRLEN(spin->si_sofoto); - put_bytes(fd, (long_u)l, 2); /* */ -- fwrite(spin->si_sofoto, l, (size_t)1, fd); /* */ -+ fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* */ - } - - /* SN_WORDS: ... -@@ -8160,7 +8350,7 @@ - l = (int)STRLEN(hi->hi_key) + 1; - len += l; - if (round == 2) /* */ -- fwrite(hi->hi_key, (size_t)l, (size_t)1, fd); -+ fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd); - --todo; - } - if (round == 1) -@@ -8176,7 +8366,7 @@ - putc(0, fd); /* */ - l = spin->si_map.ga_len; - put_bytes(fd, (long_u)l, 4); /* */ -- fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd); -+ fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd); - /* */ - } - -@@ -8232,10 +8422,11 @@ - { - p = ((char_u **)(spin->si_comppat.ga_data))[i]; - putc((int)STRLEN(p), fd); /* */ -- fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* */ -+ fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd); -+ /* */ - } - /* */ -- fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags), -+ fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags), - (size_t)1, fd); - } - -@@ -8259,7 +8450,8 @@ - - l = (int)STRLEN(spin->si_syllable); - put_bytes(fd, (long_u)l, 4); /* */ -- fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* */ -+ fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); -+ /* */ - } - - /* end of */ -@@ -8295,13 +8487,18 @@ - (void)put_node(fd, tree, 0, regionmask, round == 3); - } - -- /* Write another byte to check for errors. */ -+ /* Write another byte to check for errors (file system full). */ - if (putc(0, fd) == EOF) - retval = FAIL; -- -+theend: - if (fclose(fd) == EOF) - retval = FAIL; - -+ if (fwv != (size_t)1) -+ retval = FAIL; -+ if (retval == FAIL) -+ EMSG(_(e_write)); -+ - return retval; - } - -@@ -9890,6 +10087,7 @@ - char_u *p; - int len; - int totlen; -+ size_t x = 1; /* collect return value of fwrite() */ - - if (fd != NULL) - put_bytes(fd, (long_u)gap->ga_len, 2); /* */ -@@ -9906,7 +10104,7 @@ - if (fd != NULL) - { - fputc(len, fd); -- fwrite(p, (size_t)len, (size_t)1, fd); -+ x &= fwrite(p, (size_t)len, (size_t)1, fd); - } - totlen += len; - } -@@ -10054,6 +10252,7 @@ - int limit; - int selected = count; - int badlen = 0; -+ int msg_scroll_save = msg_scroll; - - if (no_spell_checking(curwin)) - return; -@@ -10218,7 +10417,9 @@ - selected = prompt_for_number(&mouse_used); - if (mouse_used) - selected -= lines_left; -- lines_left = Rows; /* avoid more prompt */ -+ lines_left = Rows; /* avoid more prompt */ -+ /* don't delay for 'smd' in normal_cmd() */ -+ msg_scroll = msg_scroll_save; - } - - if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK) -@@ -10243,7 +10444,8 @@ - } - - /* Replace the word. */ -- p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1); -+ p = alloc((unsigned)STRLEN(line) - stp->st_orglen -+ + stp->st_wordlen + 1); - if (p != NULL) - { - c = (int)(sug.su_badptr - line); -@@ -10343,10 +10545,9 @@ - /* - * ":spellrepall" - */ --/*ARGSUSED*/ - void - ex_spellrepall(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - pos_T pos = curwin->w_cursor; - char_u *frompat; -@@ -11480,15 +11681,24 @@ - vim_strncpy(preword + sp->ts_prewordlen, - tword + sp->ts_splitoff, - sp->ts_twordlen - sp->ts_splitoff); -- p = preword; -- while (*skiptowhite(p) != NUL) -- p = skipwhite(skiptowhite(p)); -- if (fword_ends && !can_compound(slang, p, -- compflags + sp->ts_compsplit)) -- /* Compound is not allowed. But it may still be -- * possible if we add another (short) word. */ -+ -+ /* Verify CHECKCOMPOUNDPATTERN rules. */ -+ if (match_checkcompoundpattern(preword, sp->ts_prewordlen, -+ &slang->sl_comppat)) - compound_ok = FALSE; - -+ if (compound_ok) -+ { -+ p = preword; -+ while (*skiptowhite(p) != NUL) -+ p = skipwhite(skiptowhite(p)); -+ if (fword_ends && !can_compound(slang, p, -+ compflags + sp->ts_compsplit)) -+ /* Compound is not allowed. But it may still be -+ * possible if we add another (short) word. */ -+ compound_ok = FALSE; -+ } -+ - /* Get pointer to last char of previous word. */ - p = preword + sp->ts_prewordlen; - mb_ptr_back(preword, p); -@@ -11685,10 +11895,9 @@ - && (slang->sl_compsylmax < MAXWLEN - || sp->ts_complen + 1 - sp->ts_compsplit - < slang->sl_compmax) -- && (byte_in_str(sp->ts_complen == sp->ts_compsplit -- ? slang->sl_compstartflags -- : slang->sl_compallflags, -- ((unsigned)flags >> 24)))) -+ && (can_be_compound(sp, slang, -+ compflags, ((unsigned)flags >> 24)))) -+ - { - try_compound = TRUE; - compflags[sp->ts_complen] = ((unsigned)flags >> 24); -@@ -14808,7 +15017,7 @@ - - case 0: - /* -- * Lenghts are equal, thus changes must result in same length: An -+ * Lengths are equal, thus changes must result in same length: An - * insert is only possible in combination with a delete. - * 1: check if for identical strings - */ -@@ -15398,10 +15607,9 @@ - /* - * ":spellinfo" - */ --/*ARGSUSED*/ - void - ex_spellinfo(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int lpi; - langp_T *lp; -@@ -15945,11 +16153,9 @@ - * Returns the number of matches. The matches are in "matchp[]", array of - * allocated strings. - */ --/*ARGSUSED*/ - int --expand_spelling(lnum, col, pat, matchp) -- linenr_T lnum; -- int col; -+expand_spelling(lnum, pat, matchp) -+ linenr_T lnum UNUSED; - char_u *pat; - char_u ***matchp; - { -diff -Naur vim72.orig/src/structs.h vim72/src/structs.h ---- vim72.orig/src/structs.h 2008-07-30 21:02:50.000000000 +0100 -+++ vim72/src/structs.h 2009-07-22 22:54:23.000000000 +0100 -@@ -16,7 +16,7 @@ - */ - #if defined(SASC) && SASC < 658 - typedef long linenr_T; --typedef unsigned colnr_T; -+typedef int colnr_T; - typedef unsigned short short_u; - #endif - -@@ -33,9 +33,9 @@ - } pos_T; - - #ifdef FEAT_VIRTUALEDIT --# define INIT_POS_T {0, 0, 0} -+# define INIT_POS_T(l, c, ca) {l, c, ca} - #else --# define INIT_POS_T {0, 0} -+# define INIT_POS_T(l, c, ca) {l, c} - #endif - - /* -@@ -459,7 +459,7 @@ - typedef struct - { - int hide; /* TRUE when ":hide" was used */ --# ifdef FEAT_BROWSE -+# ifdef FEAT_BROWSE_CMD - int browse; /* TRUE to invoke file dialog */ - # endif - # ifdef FEAT_WINDOWS -@@ -882,6 +882,8 @@ - { - typebuf_T save_typebuf; - int typebuf_valid; /* TRUE when save_typebuf valid */ -+ int old_char; -+ int old_mod_mask; - struct buffheader save_stuffbuff; - #ifdef USE_INPUT_BUF - char_u *save_inputbuf; -@@ -1166,7 +1168,8 @@ - char_u *b_fname; /* current file name */ - - #ifdef UNIX -- int b_dev; /* device number (-1 if not set) */ -+ int b_dev_valid; /* TRUE when b_dev has a valid number */ -+ dev_t b_dev; /* device number */ - ino_t b_ino; /* inode number */ - #endif - #ifdef FEAT_CW_EDITOR -@@ -1620,6 +1623,14 @@ - }; - #endif - -+#define SNAP_HELP_IDX 0 -+#ifdef FEAT_AUTOCMD -+# define SNAP_AUCMD_IDX 1 -+# define SNAP_COUNT 2 -+#else -+# define SNAP_COUNT 1 -+#endif -+ - /* - * Tab pages point to the top frame of each tab page. - * Note: Most values are NOT valid for the current tab page! Use "curwin", -@@ -1648,7 +1659,7 @@ - buf_T *(tp_diffbuf[DB_COUNT]); - int tp_diff_invalid; /* list of diffs is outdated */ - #endif -- frame_T *tp_snapshot; /* window layout snapshot */ -+ frame_T *(tp_snapshot[SNAP_COUNT]); /* window layout snapshots */ - #ifdef FEAT_EVAL - dictitem_T tp_winvar; /* variable for "t:" Dictionary */ - dict_T tp_vars; /* internal variables, local to tab page */ -@@ -1784,10 +1795,15 @@ - #endif - - /* -- * The next three specify the offsets for displaying the buffer: -+ * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for -+ * displaying the buffer. - */ - linenr_T w_topline; /* buffer line number of the line at the - top of the window */ -+#ifdef FEAT_AUTOCMD -+ char w_topline_was_set; /* flag set to TRUE when topline is set, -+ e.g. by winrestview() */ -+#endif - #ifdef FEAT_DIFF - int w_topfill; /* number of filler lines above w_topline */ - int w_old_topfill; /* w_topfill at last redraw */ -@@ -2270,16 +2286,11 @@ - */ - typedef struct - { -- buf_T *save_buf; /* saved curbuf */ -+ buf_T *save_curbuf; /* saved curbuf */ - #ifdef FEAT_AUTOCMD -- buf_T *new_curbuf; /* buffer to be used */ -- win_T *save_curwin; /* saved curwin, NULL if it didn't change */ -- win_T *new_curwin; /* new curwin if save_curwin != NULL */ -- pos_T save_cursor; /* saved cursor pos of save_curwin */ -- linenr_T save_topline; /* saved topline of save_curwin */ --# ifdef FEAT_DIFF -- int save_topfill; /* saved topfill of save_curwin */ --# endif -+ win_T *save_curwin; /* saved curwin */ -+ win_T *new_curwin; /* new curwin */ -+ buf_T *new_curbuf; /* new curbuf */ - #endif - } aco_save_T; - -diff -Naur vim72.orig/src/syntax.c vim72/src/syntax.c ---- vim72.orig/src/syntax.c 2008-08-08 22:47:48.000000000 +0100 -+++ vim72/src/syntax.c 2009-07-22 22:54:22.000000000 +0100 -@@ -3224,11 +3224,10 @@ - /* - * Handle ":syntax case" command. - */ --/* ARGSUSED */ - static void - syn_cmd_case(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg = eap->arg; - char_u *next; -@@ -3249,11 +3248,10 @@ - /* - * Handle ":syntax spell" command. - */ --/* ARGSUSED */ - static void - syn_cmd_spell(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg = eap->arg; - char_u *next; -@@ -3517,11 +3515,10 @@ - /* - * Handle ":syntax on" command. - */ --/* ARGSUSED */ - static void - syn_cmd_on(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - syn_cmd_onoff(eap, "syntax"); - } -@@ -3529,11 +3526,10 @@ - /* - * Handle ":syntax enable" command. - */ --/* ARGSUSED */ - static void - syn_cmd_enable(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable"); - syn_cmd_onoff(eap, "syntax"); -@@ -3543,11 +3539,10 @@ - /* - * Handle ":syntax reset" command. - */ --/* ARGSUSED */ - static void - syn_cmd_reset(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - eap->nextcmd = check_nextcmd(eap->arg); - if (!eap->skip) -@@ -3561,11 +3556,10 @@ - /* - * Handle ":syntax manual" command. - */ --/* ARGSUSED */ - static void - syn_cmd_manual(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - syn_cmd_onoff(eap, "manual"); - } -@@ -3573,11 +3567,10 @@ - /* - * Handle ":syntax off" command. - */ --/* ARGSUSED */ - static void - syn_cmd_off(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - syn_cmd_onoff(eap, "nosyntax"); - } -@@ -4461,11 +4454,10 @@ - /* - * Handle ":syntax include [@{group-name}] filename" command. - */ --/* ARGSUSED */ - static void - syn_cmd_include(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg = eap->arg; - int sgl_id = 1; -@@ -4532,11 +4524,10 @@ - /* - * Handle ":syntax keyword {group-name} [{option}] keyword .." command. - */ --/* ARGSUSED */ - static void - syn_cmd_keyword(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg = eap->arg; - char_u *group_name_end; -@@ -5275,11 +5266,10 @@ - * Handle ":syntax cluster {cluster-name} [contains={groupname},..] - * [add={groupname},..] [remove={groupname},..]". - */ --/* ARGSUSED */ - static void - syn_cmd_cluster(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg = eap->arg; - char_u *group_name_end; -@@ -5464,11 +5454,10 @@ - /* - * Handle ":syntax sync .." command. - */ --/* ARGSUSED */ - static void - syn_cmd_sync(eap, syncing) - exarg_T *eap; -- int syncing; /* not used */ -+ int syncing UNUSED; - { - char_u *arg_start = eap->arg; - char_u *arg_end; -@@ -6099,10 +6088,9 @@ - * Function given to ExpandGeneric() to obtain the list syntax names for - * expansion. - */ --/*ARGSUSED*/ - char_u * - get_syntax_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - if (expand_what == EXP_SUBCMD) -@@ -7744,14 +7732,13 @@ - /* - * Get the font or fontset for one highlight group. - */ --/*ARGSUSED*/ - static void - hl_do_font(idx, arg, do_normal, do_menu, do_tooltip) - int idx; - char_u *arg; -- int do_normal; /* set normal font */ -- int do_menu; /* set menu font */ -- int do_tooltip; /* set tooltip font */ -+ int do_normal; /* set normal font */ -+ int do_menu UNUSED; /* set menu font */ -+ int do_tooltip UNUSED; /* set tooltip font */ - { - # ifdef FEAT_XFONTSET - /* If 'guifontset' is not empty, first try using the name as a -@@ -9150,10 +9137,9 @@ - * Function given to ExpandGeneric() to obtain the list of group names. - * Also used for synIDattr() function. - */ --/*ARGSUSED*/ - char_u * - get_highlight_name(xp, idx) -- expand_T *xp; -+ expand_T *xp UNUSED; - int idx; - { - #ifdef FEAT_CMDL_COMPL -diff -Naur vim72.orig/src/tag.c vim72/src/tag.c ---- vim72.orig/src/tag.c 2008-07-16 22:31:30.000000000 +0100 -+++ vim72/src/tag.c 2009-07-22 22:54:22.000000000 +0100 -@@ -100,7 +100,7 @@ - * Tag for preview window is remembered separately, to avoid messing up the - * normal tagstack. - */ --static taggy_T ptag_entry = {NULL}; -+static taggy_T ptag_entry = {NULL, {INIT_POS_T(0, 0, 0), 0}, 0, 0}; - #endif - - /* -@@ -515,7 +515,7 @@ - * If a count is supplied to the ":tag " command, then - * jump to count'th matching tag. - */ -- if (type == DT_TAG && count > 0) -+ if (type == DT_TAG && *tag != NUL && count > 0) - cur_match = count - 1; - - if (type == DT_SELECT || type == DT_JUMP -@@ -618,7 +618,7 @@ - taglen_advance(taglen); - MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T)); - -- for (i = 0; i < num_matches; ++i) -+ for (i = 0; i < num_matches && !got_int; ++i) - { - parse_match(matches[i], &tagp); - if (!new_tag && ( -@@ -655,6 +655,8 @@ - } - if (msg_col > 0) - msg_putchar('\n'); -+ if (got_int) -+ break; - msg_advance(15); - - /* print any extra fields */ -@@ -689,6 +691,8 @@ - if (msg_col + ptr2cells(p) >= Columns) - { - msg_putchar('\n'); -+ if (got_int) -+ break; - msg_advance(15); - } - p = msg_outtrans_one(p, attr); -@@ -704,6 +708,8 @@ - if (msg_col > 15) - { - msg_putchar('\n'); -+ if (got_int) -+ break; - msg_advance(15); - } - } -@@ -734,6 +740,8 @@ - { - if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns) - msg_putchar('\n'); -+ if (got_int) -+ break; - msg_advance(15); - - /* skip backslash used for escaping command char */ -@@ -760,12 +768,9 @@ - if (msg_col) - msg_putchar('\n'); - ui_breakcheck(); -- if (got_int) -- { -- got_int = FALSE; /* only stop the listing */ -- break; -- } - } -+ if (got_int) -+ got_int = FALSE; /* only stop the listing */ - ask_for_selection = TRUE; - } - #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL) -@@ -1100,10 +1105,9 @@ - /* - * Print the tag stack - */ --/*ARGSUSED*/ - void - do_tags(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - int i; - char_u *name; -@@ -2525,11 +2529,10 @@ - * Callback function for finding all "tags" and "tags-??" files in - * 'runtimepath' doc directories. - */ --/*ARGSUSED*/ - static void - found_tagfile_cb(fname, cookie) - char_u *fname; -- void *cookie; -+ void *cookie UNUSED; - { - if (ga_grow(&tag_fnames, 1) == OK) - ((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] = -@@ -2542,6 +2545,15 @@ - { - ga_clear_strings(&tag_fnames); - do_tag(NULL, DT_FREE, 0, 0, 0); -+ tag_freematch(); -+ -+# if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) -+ if (ptag_entry.tagname) -+ { -+ vim_free(ptag_entry.tagname); -+ ptag_entry.tagname = NULL; -+ } -+# endif - } - #endif - -@@ -2725,7 +2737,24 @@ - */ - p_7f = vim_strchr(lbuf, 0x7f); - if (p_7f == NULL) -+ { -+etag_fail: -+ if (vim_strchr(lbuf, '\n') == NULL) -+ { -+ /* Truncated line. Ignore it. */ -+ if (p_verbose >= 5) -+ { -+ verbose_enter(); -+ MSG(_("Ignoring long line in tags file")); -+ verbose_leave(); -+ } -+ tagp->command = lbuf; -+ tagp->tagname = lbuf; -+ tagp->tagname_end = lbuf; -+ return OK; -+ } - return FAIL; -+ } - - /* Find ^A. If not found the line number is after the 0x7f */ - p = vim_strchr(p_7f, Ctrl_A); -@@ -2735,7 +2764,7 @@ - ++p; - - if (!VIM_ISDIGIT(*p)) /* check for start of line number */ -- return FAIL; -+ goto etag_fail; - tagp->command = p; - - -@@ -2749,7 +2778,7 @@ - /* find end of tagname */ - for (p = p_7f - 1; !vim_iswordc(*p); --p) - if (p == lbuf) -- return FAIL; -+ goto etag_fail; - tagp->tagname_end = p + 1; - while (p >= lbuf && vim_iswordc(*p)) - --p; -@@ -3762,7 +3791,7 @@ - --end; - } - len = (int)(end - start); -- if (len > sizeof(buf) - 1) -+ if (len > (int)sizeof(buf) - 1) - len = sizeof(buf) - 1; - vim_strncpy(buf, start, len); - } -diff -Naur vim72.orig/src/term.c vim72/src/term.c ---- vim72.orig/src/term.c 2008-07-27 12:48:06.000000000 +0100 -+++ vim72/src/term.c 2009-07-22 22:54:24.000000000 +0100 -@@ -2881,7 +2881,7 @@ - - /* if 'Sb' and 'AB' are not defined, reset "Co" */ - if (*T_CSB == NUL && *T_CAB == NUL) -- T_CCO = empty_option; -+ free_one_termoption(T_CCO); - - /* Set 'weirdinvert' according to value of 't_xs' */ - p_wiv = (*T_XS != NUL); -@@ -2906,7 +2906,7 @@ - int i; - int shift; - -- for (i = 1; i <= sizeof(long_u); i++) -+ for (i = 1; i <= (int)sizeof(long_u); i++) - { - shift = 8 * (sizeof(long_u) - i); - dst[i - 1] = (char_u) ((val >> shift) & 0xff); -@@ -2937,7 +2937,7 @@ - len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u)); - if (len != -1) - { -- for (i = 0; i < sizeof(long_u); i++) -+ for (i = 0; i < (int)sizeof(long_u); i++) - { - shift = 8 * (sizeof(long_u) - 1 - i); - *val += (long_u)bytes[i] << shift; -@@ -4920,7 +4920,15 @@ - key_name[0] = KEY2TERMCAP0(key); - key_name[1] = KEY2TERMCAP1(key); - if (key_name[0] == KS_KEY) -- string[new_slen++] = key_name[1]; /* from ":set =xx" */ -+ { -+ /* from ":set =xx" */ -+#ifdef FEAT_MBYTE -+ if (has_mbyte) -+ new_slen += (*mb_char2bytes)(key_name[1], string + new_slen); -+ else -+#endif -+ string[new_slen++] = key_name[1]; -+ } - else - { - string[new_slen++] = K_SPECIAL; -@@ -5547,7 +5555,7 @@ - * respects the current B/k/< settings of 'cpoption'. - * - * This function is called when expanding mappings/abbreviations on the -- * command-line, and for building the "Ambiguous mapping..." error messge. -+ * command-line, and for building the "Ambiguous mapping..." error message. - * - * It uses a growarray to build the translation string since the - * latter can be wider than the original description. The caller has to -diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile ---- vim72.orig/src/testdir/Makefile 2008-06-19 21:29:46.000000000 +0100 -+++ vim72/src/testdir/Makefile 2009-07-22 22:54:23.000000000 +0100 -@@ -4,9 +4,11 @@ - - VIMPROG = ../vim - --# Uncomment this line for using valgrind. --# The output goes into a file "valgrind.$PID" (sorry, no test number). --# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind -+# Uncomment this line to use valgrind for memory leaks and extra warnings. -+# The output goes into a file "valgrind.testN" -+# Vim should be compiled with EXITFREE to avoid false warnings. -+# This will make testing about 10 times as slow. -+# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$* - - SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \ - test7.out test8.out test9.out test10.out test11.out \ -@@ -20,21 +22,23 @@ - test48.out test49.out test51.out test52.out test53.out \ - test54.out test55.out test56.out test57.out test58.out \ - test59.out test60.out test61.out test62.out test63.out \ -- test64.out test65.out -+ test64.out test65.out test66.out - - SCRIPTS_GUI = test16.out - - .SUFFIXES: .in .out - --nongui: nolog $(SCRIPTS) -- @echo -- @cat test.log -- @echo ALL DONE -+nongui: nolog $(SCRIPTS) report -+ -+gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) report - --gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) -+report: - @echo -- @cat test.log -- @echo ALL DONE -+ @echo 'Test results:' -+ @/bin/sh -c "if test -f test.log; \ -+ then cat test.log; echo TEST FAILURE; exit 1; \ -+ else echo ALL DONE; \ -+ fi" - - $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) - -@@ -71,4 +75,4 @@ - test60.out: test60.vim - - nolog: -- -echo Test results: >test.log -+ -rm -f test.log -diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak ---- vim72.orig/src/testdir/Make_ming.mak 1970-01-01 01:00:00.000000000 +0100 -+++ vim72/src/testdir/Make_ming.mak 2009-07-22 22:54:20.000000000 +0100 -@@ -0,0 +1,91 @@ -+# Makefile to run tests for Vim, on Dos-like machines -+# with sh.exe or zsh.exe in the path or not. -+# -+# Author: Bill McCarthy -+# -+# Note that test54 has been removed until it is fixed. -+# -+# Requires a set of Unix tools: echo, diff, etc. -+ -+ifneq (sh.exe, $(SHELL)) -+DEL = rm -f -+MV = mv -+CP = cp -+DIRSLASH = / -+else -+DEL = del -+MV = rename -+CP = copy -+DIRSLASH = \\ -+endif -+ -+VIMPROG = ..$(DIRSLASH)vim -+ -+# Omitted: -+# test2 "\\tmp" doesn't work. -+# test10 'errorformat' is different -+# test12 can't unlink a swap file -+# test25 uses symbolic link -+# test27 can't edit file with "*" in file name -+# test31 16 bit version runs out of memory... -+ -+SCRIPTS16 = test1.out test19.out test20.out test22.out \ -+ test23.out test24.out test28.out test29.out \ -+ test35.out test36.out test43.out \ -+ test44.out test45.out test46.out test47.out \ -+ test48.out test51.out test53.out \ -+ test55.out test56.out test57.out test58.out test59.out \ -+ test60.out test61.out test62.out test63.out test64.out -+ -+# Had to remove test54 which doesn't work yet. -+# test54.out -+ -+SCRIPTS = test3.out test4.out test5.out test6.out test7.out \ -+ test8.out test9.out test11.out test13.out test14.out \ -+ test15.out test17.out test18.out test21.out test26.out \ -+ test30.out test31.out test32.out test33.out test34.out \ -+ test37.out test38.out test39.out test40.out test41.out \ -+ test42.out test52.out test65.out test66.out -+ -+SCRIPTS32 = test50.out -+ -+SCRIPTS_GUI = test16.out -+ -+.SUFFIXES: .in .out -+ -+vimall: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32) -+ echo ALL DONE -+ -+nongui: fixff $(SCRIPTS16) $(SCRIPTS) -+ echo ALL DONE -+ -+small: -+ echo ALL DONE -+ -+gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) -+ echo ALL DONE -+ -+win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) -+ echo ALL DONE -+ -+fixff: -+ -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -+ -+clean: -+ -$(DEL) *.out -+ -$(DEL) test.ok -+ -$(DEL) small.vim -+ -$(DEL) tiny.vim -+ -$(DEL) mbyte.vim -+ -$(DEL) X* -+ -$(DEL) viminfo -+ -+.in.out: -+ $(CP) $*.ok test.ok -+ $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in -+ diff test.out $*.ok -+ -$(DEL) $*.out -+ $(MV) test.out $*.out -+ -$(DEL) X* -+ -$(DEL) test.ok -+ -$(DEL) viminfo -diff -Naur vim72.orig/src/testdir/test30.in vim72/src/testdir/test30.in ---- vim72.orig/src/testdir/test30.in 2008-06-25 22:33:01.000000000 +0100 -+++ vim72/src/testdir/test30.in 2009-07-22 22:54:16.000000000 +0100 -@@ -24,10 +24,17 @@ - :set nobin eol - :bwipe XXUnix XXDos XXMac - :" create mixed format files --:!cat XXUnix XXDos >XXUxDs --:!cat XXUnix XXMac >XXUxMac --:!cat XXDos XXMac >XXDosMac --:!cat XXUnix XXDos XXMac >XXUxDsMc -+:if has("vms") -+: !copy XXUnix,XXDos XXUxDs. -+: !copy XXUnix,XXMac XXUxMac. -+: !copy XXDos,XXMac XXDosMac. -+: !copy XXUnix,XXDos,XXMac XXUxDsMc. -+:else -+: !cat XXUnix XXDos >XXUxDs -+: !cat XXUnix XXMac >XXUxMac -+: !cat XXDos XXMac >XXDosMac -+: !cat XXUnix XXDos XXMac >XXUxDsMc -+:endif - :" - :" try reading and writing with 'fileformats' empty - :set fileformat=unix -diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok ---- vim72.orig/src/testdir/test42.ok 2008-02-20 12:27:37.000000000 +0000 -+++ vim72/src/testdir/test42.ok 2009-07-22 22:54:17.000000000 +0100 -@@ -20,7 +20,7 @@ - ucs-2 - - -- fileencoding=ucs-2le -+ fileencoding=utf-16le - bomb - ucs-2le - -diff -Naur vim72.orig/src/testdir/test54.in vim72/src/testdir/test54.in ---- vim72.orig/src/testdir/test54.in 2005-01-01 11:21:16.000000000 +0000 -+++ vim72/src/testdir/test54.in 2009-07-22 22:54:16.000000000 +0100 -@@ -3,8 +3,13 @@ - STARTTEST - :so small.vim - :e xx --:!rm -f test.out --:au BufLeave :!echo buffer-local autommand in %>> test.out -+:if has("vms") -+: !del test.out.* -+: au BufLeave :!write sys$output "buffer-local autommand in %" > test.out -+:else -+: !rm -f test.out -+: au BufLeave :!echo buffer-local autommand in %>> test.out -+:endif - :e somefile " here, autocommand for xx shall write test.out - : " but autocommand shall not apply to buffer named - :bwipe xx " here, autocommand shall be auto-deleted -diff -Naur vim72.orig/src/testdir/test66.in vim72/src/testdir/test66.in ---- vim72.orig/src/testdir/test66.in 1970-01-01 01:00:00.000000000 +0100 -+++ vim72/src/testdir/test66.in 2009-07-22 22:54:20.000000000 +0100 -@@ -0,0 +1,25 @@ -+ -+Test for visual block shift and tab characters. -+ -+STARTTEST -+:so small.vim -+/^abcdefgh -+4jI j<<11|D -+7|a  -+7|a  -+7|a 4k13|4j< -+:$-4,$w! test.out -+:$-4,$s/\s\+//g -+4kI j<< -+7|a  -+7|a  -+7|a 4k13|4j3< -+:$-4,$w >> test.out -+:qa! -+ENDTEST -+ -+abcdefghijklmnopqrstuvwxyz -+abcdefghijklmnopqrstuvwxyz -+abcdefghijklmnopqrstuvwxyz -+abcdefghijklmnopqrstuvwxyz -+abcdefghijklmnopqrstuvwxyz -diff -Naur vim72.orig/src/testdir/test66.ok vim72/src/testdir/test66.ok ---- vim72.orig/src/testdir/test66.ok 1970-01-01 01:00:00.000000000 +0100 -+++ vim72/src/testdir/test66.ok 2009-07-22 22:54:20.000000000 +0100 -@@ -0,0 +1,10 @@ -+ abcdefghijklmnopqrstuvwxyz -+abcdefghij -+ abc defghijklmnopqrstuvwxyz -+ abc defghijklmnopqrstuvwxyz -+ abc defghijklmnopqrstuvwxyz -+ abcdefghijklmnopqrstuvwxyz -+abcdefghij -+ abc defghijklmnopqrstuvwxyz -+ abc defghijklmnopqrstuvwxyz -+ abc defghijklmnopqrstuvwxyz -diff -Naur vim72.orig/src/ui.c vim72/src/ui.c ---- vim72.orig/src/ui.c 2008-07-14 19:14:56.000000000 +0100 -+++ vim72/src/ui.c 2009-07-22 22:54:23.000000000 +0100 -@@ -320,10 +320,9 @@ - * The gui_set_shellsize() or mch_set_shellsize() function will try to set the - * new size. If this is not possible, it will adjust Rows and Columns. - */ --/*ARGSUSED*/ - void - ui_set_shellsize(mustset) -- int mustset; /* set by the user */ -+ int mustset UNUSED; /* set by the user */ - { - #ifdef FEAT_GUI - if (gui.in_use) -@@ -1127,10 +1126,9 @@ - * available for pasting. - * When "both" is TRUE also copy to the '+' register. - */ --/*ARGSUSED*/ - void - clip_copy_modeless_selection(both) -- int both; -+ int both UNUSED; - { - char_u *buffer; - char_u *bufp; -@@ -1701,10 +1699,9 @@ - return (int)maxlen; - } - --/*ARGSUSED*/ - void - fill_input_buf(exit_on_error) -- int exit_on_error; -+ int exit_on_error UNUSED; - { - #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX) - int len; -@@ -1820,7 +1817,7 @@ - #ifdef HAVE_DUP - /* Use stderr for stdin, also works for shell commands. */ - close(0); -- dup(2); -+ ignored = dup(2); - #else - read_cmd_fd = 2; /* read from stderr instead of stdin */ - #endif -@@ -1992,11 +1989,10 @@ - - static void clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *)); - --/* ARGSUSED */ - static void - clip_x11_request_selection_cb(w, success, sel_atom, type, value, length, - format) -- Widget w; -+ Widget w UNUSED; - XtPointer success; - Atom *sel_atom; - Atom *type; -@@ -2020,7 +2016,7 @@ - - if (value == NULL || *length == 0) - { -- clip_free_selection(cbd); /* ??? [what's the query?] */ -+ clip_free_selection(cbd); /* nothing received, clear register */ - *(int *)success = FALSE; - return; - } -@@ -2076,7 +2072,7 @@ - text_prop.value = (unsigned char *)value; - text_prop.encoding = *type; - text_prop.format = *format; -- text_prop.nitems = STRLEN(value); -+ text_prop.nitems = len; - status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop, - &text_list, &n_text); - if (status != Success || n_text < 1) -@@ -2108,8 +2104,8 @@ - Atom type; - static int success; - int i; -- int nbytes = 0; -- char_u *buffer; -+ time_t start_time; -+ int timed_out = FALSE; - - for (i = - #ifdef FEAT_MBYTE -@@ -2129,6 +2125,7 @@ - case 3: type = text_atom; break; - default: type = XA_STRING; - } -+ success = MAYBE; - XtGetSelectionValue(myShell, cbd->sel_atom, type, - clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime); - -@@ -2141,47 +2138,59 @@ - * characters, then they will appear before the one that requested the - * paste! Don't worry, we will catch up with any other events later. - */ -- for (;;) -+ start_time = time(NULL); -+ while (success == MAYBE) - { -- if (XCheckTypedEvent(dpy, SelectionNotify, &event)) -- break; -- if (XCheckTypedEvent(dpy, SelectionRequest, &event)) -- /* We may get a SelectionRequest here and if we don't handle -- * it we hang. KDE klipper does this, for example. */ -+ if (XCheckTypedEvent(dpy, SelectionNotify, &event) -+ || XCheckTypedEvent(dpy, SelectionRequest, &event) -+ || XCheckTypedEvent(dpy, PropertyNotify, &event)) -+ { -+ /* This is where clip_x11_request_selection_cb() should be -+ * called. It may actually happen a bit later, so we loop -+ * until "success" changes. -+ * We may get a SelectionRequest here and if we don't handle -+ * it we hang. KDE klipper does this, for example. -+ * We need to handle a PropertyNotify for large selections. */ - XtDispatchEvent(&event); -+ continue; -+ } -+ -+ /* Time out after 2 to 3 seconds to avoid that we hang when the -+ * other process doesn't respond. Note that the SelectionNotify -+ * event may still come later when the selection owner comes back -+ * to life and the text gets inserted unexpectedly. Don't know -+ * why that happens or how to avoid that :-(. */ -+ if (time(NULL) > start_time + 2) -+ { -+ timed_out = TRUE; -+ break; -+ } - - /* Do we need this? Probably not. */ - XSync(dpy, False); - -- /* Bernhard Walle solved a slow paste response in an X terminal by -- * adding: usleep(10000); here. */ -+ /* Wait for 1 msec to avoid that we eat up all CPU time. */ -+ ui_delay(1L, TRUE); - } - -- /* this is where clip_x11_request_selection_cb() is actually called */ -- XtDispatchEvent(&event); -- -- if (success) -+ if (success == TRUE) - return; -+ -+ /* don't do a retry with another type after timing out, otherwise we -+ * hang for 15 seconds. */ -+ if (timed_out) -+ break; - } - - /* Final fallback position - use the X CUT_BUFFER0 store */ -- buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0); -- if (nbytes > 0) -- { -- /* Got something */ -- clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); -- XFree((void *)buffer); -- if (p_verbose > 0) -- verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); -- } -+ yank_cut_buffer0(dpy, cbd); - } - - static Boolean clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *)); - --/* ARGSUSED */ - static Boolean - clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format) -- Widget w; -+ Widget w UNUSED; - Atom *sel_atom; - Atom *target; - Atom *type; -@@ -2308,10 +2317,9 @@ - - static void clip_x11_lose_ownership_cb __ARGS((Widget, Atom *)); - --/* ARGSUSED */ - static void - clip_x11_lose_ownership_cb(w, sel_atom) -- Widget w; -+ Widget w UNUSED; - Atom *sel_atom; - { - if (*sel_atom == clip_plus.sel_atom) -@@ -2344,14 +2352,67 @@ - * Send the current selection to the clipboard. Do nothing for X because we - * will fill in the selection only when requested by another app. - */ --/*ARGSUSED*/ - void - clip_x11_set_selection(cbd) -- VimClipboard *cbd; -+ VimClipboard *cbd UNUSED; - { - } - #endif - -+#if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \ -+ || defined(FEAT_GUI_GTK) || defined(PROTO) -+/* -+ * Get the contents of the X CUT_BUFFER0 and put it in "cbd". -+ */ -+ void -+yank_cut_buffer0(dpy, cbd) -+ Display *dpy; -+ VimClipboard *cbd; -+{ -+ int nbytes = 0; -+ char_u *buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0); -+ -+ if (nbytes > 0) -+ { -+#ifdef FEAT_MBYTE -+ int done = FALSE; -+ -+ /* CUT_BUFFER0 is supposed to be always latin1. Convert to 'enc' when -+ * using a multi-byte encoding. Conversion between two 8-bit -+ * character sets usually fails and the text might actually be in -+ * 'enc' anyway. */ -+ if (has_mbyte) -+ { -+ char_u *conv_buf = buffer; -+ vimconv_T vc; -+ -+ vc.vc_type = CONV_NONE; -+ if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK) -+ { -+ conv_buf = string_convert(&vc, buffer, &nbytes); -+ if (conv_buf != NULL) -+ { -+ clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd); -+ vim_free(conv_buf); -+ done = TRUE; -+ } -+ convert_setup(&vc, NULL, NULL); -+ } -+ } -+ if (!done) /* use the text without conversion */ -+#endif -+ clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); -+ XFree((void *)buffer); -+ if (p_verbose > 0) -+ { -+ verbose_enter(); -+ verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); -+ verbose_leave(); -+ } -+ } -+} -+#endif -+ - #if defined(FEAT_MOUSE) || defined(PROTO) - - /* -@@ -2898,11 +2959,10 @@ - * Find the window at screen position "*rowp" and "*colp". The positions are - * updated to become relative to the top-left of the window. - */ --/*ARGSUSED*/ - win_T * - mouse_find_win(rowp, colp) - int *rowp; -- int *colp; -+ int *colp UNUSED; - { - frame_T *fp; - -diff -Naur vim72.orig/src/version.c vim72/src/version.c ---- vim72.orig/src/version.c 2008-08-09 15:24:52.000000000 +0100 -+++ vim72/src/version.c 2009-07-22 22:54:24.000000000 +0100 -@@ -677,9 +677,500 @@ - static int included_patches[] = - { /* Add new patch number below this line */ - /**/ -+ 239, -+/**/ -+ 238, -+/**/ -+ 237, -+/**/ -+ 236, -+/**/ -+ 235, -+/**/ -+ 234, -+/**/ -+ 233, -+/**/ -+ 232, -+/**/ -+ 231, -+/**/ -+ 230, -+/**/ -+ 229, -+/**/ -+ 228, -+/**/ -+ 227, -+/**/ -+ 226, -+/**/ -+ 225, -+/**/ -+ 224, -+/**/ -+ 223, -+/**/ -+ 222, -+/**/ -+ 221, -+/**/ -+ 220, -+/**/ -+ 219, -+/**/ -+ 218, -+/**/ -+ 217, -+/**/ -+ 216, -+/**/ -+ 215, -+/**/ -+ 214, -+/**/ -+ 213, -+/**/ -+ 212, -+/**/ -+ 211, -+/**/ -+ 210, -+/**/ -+ 209, -+/**/ -+ 208, -+/**/ -+ 207, -+/**/ -+ 206, -+/**/ -+ 205, -+/**/ -+ 204, -+/**/ -+ 203, -+/**/ -+ 202, -+/**/ -+ 201, -+/**/ -+ 200, -+/**/ -+ 199, -+/**/ -+ 198, -+/**/ -+ 197, -+/**/ -+ 196, -+/**/ -+ 195, -+/**/ -+ 194, -+/**/ -+ 193, -+/**/ -+ 192, -+/**/ -+ 191, -+/**/ -+ 190, -+/**/ -+ 189, -+/**/ -+ 188, -+/**/ -+ 187, -+/**/ -+ 186, -+/**/ -+ 185, -+/**/ -+ 184, -+/**/ -+ 183, -+/**/ -+ 182, -+/**/ -+ 181, -+/**/ -+ 180, -+/**/ -+ 179, -+/**/ -+ 178, -+/**/ -+ 177, -+/**/ -+ 176, -+/**/ -+ 175, -+/**/ -+ 174, -+/**/ -+ 173, -+/**/ -+ 172, -+/**/ -+ 171, -+/**/ -+ 170, -+/**/ -+ 169, -+/**/ -+ 168, -+/**/ -+ 167, -+/**/ -+ 166, -+/**/ -+ 165, -+/**/ -+ 164, -+/**/ -+ 163, -+/**/ -+ 162, -+/**/ -+ 161, -+/**/ -+ 160, -+/**/ -+ 159, -+/**/ -+ 158, -+/**/ -+ 157, -+/**/ -+ 156, -+/**/ -+ 155, -+/**/ -+ 154, -+/**/ -+ 153, -+/**/ -+ 152, -+/**/ -+ 151, -+/**/ -+ 150, -+/**/ -+ 149, -+/**/ -+ 148, -+/**/ -+ 147, -+/**/ -+ 146, -+/**/ -+ 145, -+/**/ -+ 144, -+/**/ -+ 143, -+/**/ -+ 142, -+/**/ -+ 141, -+/**/ -+ 140, -+/**/ -+ 139, -+/**/ -+ 138, -+/**/ -+ 137, -+/**/ -+ 136, -+/**/ -+ 135, -+/**/ -+ 134, -+/**/ -+ 133, -+/**/ -+ 132, -+/**/ -+ 131, -+/**/ -+ 130, -+/**/ -+ 129, -+/**/ -+ 128, -+/**/ -+ 127, -+/**/ -+ 126, -+/**/ -+ 125, -+/**/ -+ 124, -+/**/ -+ 123, -+/**/ -+ 122, -+/**/ -+ 121, -+/**/ -+ 120, -+/**/ -+ 119, -+/**/ -+ 118, -+/**/ -+ 117, -+/**/ -+ 116, -+/**/ -+ 115, -+/**/ -+ 114, -+/**/ -+ 113, -+/**/ -+ 112, -+/**/ -+ 111, -+/**/ -+ 110, -+/**/ -+ 109, -+/**/ -+ 108, -+/**/ -+ 107, -+/**/ -+ 106, -+/**/ -+ 105, -+/**/ -+ 104, -+/**/ -+ 103, -+/**/ -+ 102, -+/**/ -+ 101, -+/**/ -+ 100, -+/**/ -+ 99, -+/**/ -+ 98, -+/**/ -+ 97, -+/**/ -+ 96, -+/**/ -+ 95, -+/**/ -+ 94, -+/**/ -+ 93, -+/**/ -+ 92, -+/**/ -+ 91, -+/**/ -+ 90, -+/**/ -+ 89, -+/**/ -+ 88, -+/**/ -+ 87, -+/**/ -+ 86, -+/**/ -+ 85, -+/**/ -+ 84, -+/**/ -+ 83, -+/**/ -+ 82, -+/**/ -+ 81, -+/**/ -+ 80, -+/**/ -+ 79, -+/**/ -+ 78, -+/**/ -+ 77, -+/**/ -+ 76, -+/**/ -+ 75, -+/**/ -+ 74, -+/**/ -+ 73, -+/**/ -+ 72, -+/**/ -+ 71, -+/**/ -+ 70, -+/**/ -+ 69, -+/**/ -+ 68, -+/**/ -+ 67, -+/**/ -+ 66, -+/**/ -+ 65, -+/**/ -+ 64, -+/**/ -+ 63, -+/**/ -+ 62, -+/**/ -+ 61, -+/**/ -+ 60, -+/**/ -+ 59, -+/**/ -+ 58, -+/**/ -+ 57, -+/**/ -+ 56, -+/**/ -+ 55, -+/**/ -+ 54, -+/**/ -+ 53, -+/**/ -+ 52, -+/**/ -+ 51, -+/**/ -+ 50, -+/**/ -+ 49, -+/**/ -+ 48, -+/**/ -+ 47, -+/**/ -+ 46, -+/**/ -+ 45, -+/**/ -+ 44, -+/**/ -+ 43, -+/**/ -+ 42, -+/**/ -+ 41, -+/**/ -+ 40, -+/**/ -+ 39, -+/**/ -+ 38, -+/**/ -+ 37, -+/**/ -+ 36, -+/**/ -+ 35, -+/**/ -+ 34, -+/**/ -+ 33, -+/**/ -+ 32, -+/**/ -+ 31, -+/**/ -+ 30, -+/**/ -+ 29, -+/**/ -+ 28, -+/**/ -+ 27, -+/**/ -+ 26, -+/**/ -+ 25, -+/**/ -+ 24, -+/**/ -+ 23, -+/**/ -+ 22, -+/**/ -+ 21, -+/**/ -+ 20, -+/**/ -+ 19, -+/**/ -+ 18, -+/**/ -+ 17, -+/**/ -+ 16, -+/**/ -+ 15, -+/**/ -+ 14, -+/**/ -+ 13, -+/**/ -+ 12, -+/**/ -+ 11, -+/**/ -+ 10, -+/**/ -+ 9, -+/**/ -+ 8, -+/**/ -+ 7, -+/**/ -+ 6, -+/**/ -+ 5, -+/**/ -+ 4, -+/**/ -+ 3, -+/**/ -+ 2, -+/**/ -+ 1, -+/**/ - 0 - }; - -+/* -+ * Place to put a short description when adding a feature with a patch. -+ * Keep it short, e.g.,: "relative numbers", "persistent undo". -+ * Also add a comment marker to separate the lines. -+ * See the official Vim patches for the diff format: It must use a context of -+ * one line only. Create it by hand or use "diff -C2" and edit the patch. -+ */ -+static char *(extra_patches[]) = -+{ /* Add your patch description below this line */ -+/**/ -+ NULL -+}; -+ - int - highest_patch() - { -@@ -786,7 +1277,7 @@ - MSG_PUTS(_("\nRISC OS version")); - #endif - #ifdef VMS -- MSG_PUTS("\nOpenVMS version"); -+ MSG_PUTS(_("\nOpenVMS version")); - # ifdef HAVE_PATHDEF - if (*compiled_arch != NUL) - { -@@ -825,6 +1316,19 @@ - } - } - -+ /* Print the list of extra patch descriptions if there is at least one. */ -+ if (extra_patches[0] != NULL) -+ { -+ MSG_PUTS(_("\nExtra patches: ")); -+ s = ""; -+ for (i = 0; extra_patches[i] != NULL; ++i) -+ { -+ MSG_PUTS(s); -+ s = ", "; -+ MSG_PUTS(extra_patches[i]); -+ } -+ } -+ - #ifdef MODIFIED_BY - MSG_PUTS("\n"); - MSG_PUTS(_("Modified by ")); -@@ -1253,10 +1757,9 @@ - /* - * ":intro": clear screen, display intro screen and wait for return. - */ --/*ARGSUSED*/ - void - ex_intro(eap) -- exarg_T *eap; -+ exarg_T *eap UNUSED; - { - screenclear(); - intro_message(TRUE); -diff -Naur vim72.orig/src/vim.h vim72/src/vim.h ---- vim72.orig/src/vim.h 2008-08-09 17:03:38.000000000 +0100 -+++ vim72/src/vim.h 2009-07-22 22:54:22.000000000 +0100 -@@ -262,6 +262,14 @@ - # define __PARMS(x) __ARGS(x) - #endif - -+/* Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter -+ * can be used to check for mistakes. */ -+#ifdef HAVE_ATTRIBUTE_UNUSED -+# define UNUSED __attribute__((unused)) -+#else -+# define UNUSED -+#endif -+ - /* if we're compiling in C++ (currently only KVim), the system - * headers must have the correct prototypes or nothing will build. - * conversely, our prototypes might clash due to throw() specifiers and -@@ -341,8 +349,14 @@ - #ifdef BACKSLASH_IN_FILENAME - # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<") - #else --# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<") --# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&") -+# ifdef VMS -+ /* VMS allows a lot of characters in the file name */ -+# define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!") -+# define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&") -+# else -+# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<") -+# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&") -+# endif - #endif - - #define NUMBUFLEN 30 /* length of a buffer to store a number in ASCII */ -@@ -370,7 +384,7 @@ - * Define __w64 as an empty token for everything but MSVC 7.x or later. - */ - # if !defined(_MSC_VER) || (_MSC_VER < 1300) --# define __w64 -+# define __w64 - # endif - typedef unsigned long __w64 long_u; - typedef long __w64 long_i; -@@ -702,6 +716,8 @@ - #define EXPAND_USER_DEFINED 30 - #define EXPAND_USER_LIST 31 - #define EXPAND_SHELLCMD 32 -+#define EXPAND_CSCOPE 33 -+#define EXPAND_SIGN 34 - - /* Values for exmode_active (0 is no exmode) */ - #define EXMODE_NORMAL 1 -@@ -1051,6 +1067,7 @@ - #define WSP_HELP 16 /* creating the help window */ - #define WSP_BELOW 32 /* put new window below/right */ - #define WSP_ABOVE 64 /* put new window above/left */ -+#define WSP_NEWLOC 128 /* don't copy location list */ - - /* - * arguments for gui_set_shellsize() -@@ -1328,11 +1345,11 @@ - # define MSG_BUF_CLEN MSG_BUF_LEN /* cell length */ - #endif - --#if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX) --# define TBUFSZ 2048 /* buffer size for termcap entry */ --#else --# define TBUFSZ 1024 /* buffer size for termcap entry */ --#endif -+/* Size of the buffer used for tgetent(). Unfortunately this is largely -+ * undocumented, some systems use 1024. Using a buffer that is too small -+ * causes a buffer overrun and a crash. Use the maximum known value to stay -+ * on the safe side. */ -+#define TBUFSZ 2048 /* buffer size for termcap entry */ - - /* - * Maximum length of key sequence to be mapped. -@@ -1451,8 +1468,8 @@ - # define PERROR(msg) perror(msg) - #endif - --typedef long linenr_T; /* line number type */ --typedef unsigned colnr_T; /* column number type */ -+typedef long linenr_T; /* line number type */ -+typedef int colnr_T; /* column number type */ - typedef unsigned short disptick_T; /* display tick type */ - - #define MAXLNUM (0x7fffffffL) /* maximum (invalid) line number */ -@@ -1728,7 +1745,8 @@ - #define VV_MOUSE_COL 51 - #define VV_OP 52 - #define VV_SEARCHFORWARD 53 --#define VV_LEN 54 /* number of v: vars */ -+#define VV_OLDFILES 54 -+#define VV_LEN 55 /* number of v: vars */ - - #ifdef FEAT_CLIPBOARD - -@@ -1979,6 +1997,9 @@ - # endif - #endif - -+#ifndef FEAT_NETBEANS_INTG -+# undef NBDEBUG -+#endif - #ifdef NBDEBUG /* Netbeans debugging. */ - # include "nbdebug.h" - #else -@@ -2054,4 +2075,10 @@ - #define DOSO_VIMRC 1 /* loading vimrc file */ - #define DOSO_GVIMRC 2 /* loading gvimrc file */ - -+/* flags for read_viminfo() and children */ -+#define VIF_WANT_INFO 1 /* load non-mark info */ -+#define VIF_WANT_MARKS 2 /* load file marks */ -+#define VIF_FORCEIT 4 /* overwrite info already read */ -+#define VIF_GET_OLDFILES 8 /* load v:oldfiles */ -+ - #endif /* VIM__H */ -diff -Naur vim72.orig/src/window.c vim72/src/window.c ---- vim72.orig/src/window.c 2008-08-06 12:00:30.000000000 +0100 -+++ vim72/src/window.c 2009-07-22 22:54:23.000000000 +0100 -@@ -11,8 +11,8 @@ - - static int path_is_url __ARGS((char_u *p)); - #if defined(FEAT_WINDOWS) || defined(PROTO) --static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir)); --static void win_init __ARGS((win_T *newp, win_T *oldp)); -+static void win_init __ARGS((win_T *newp, win_T *oldp, int flags)); -+static void win_init_some __ARGS((win_T *newp, win_T *oldp)); - static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col)); - static void frame_setheight __ARGS((frame_T *curfrp, int height)); - #ifdef FEAT_VERTSPLIT -@@ -23,8 +23,8 @@ - static void win_totop __ARGS((int size, int flags)); - static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height)); - static int last_window __ARGS((void)); -+static int one_window __ARGS((void)); - static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp)); --static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp)); - static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp)); - static tabpage_T *alt_tabpage __ARGS((void)); - static win_T *frame2win __ARGS((frame_T *frp)); -@@ -41,6 +41,7 @@ - #endif - #endif - static int win_alloc_firstwin __ARGS((win_T *oldwin)); -+static void new_frame __ARGS((win_T *wp)); - #if defined(FEAT_WINDOWS) || defined(PROTO) - static tabpage_T *alloc_tabpage __ARGS((void)); - static int leave_tabpage __ARGS((buf_T *new_curbuf)); -@@ -49,8 +50,6 @@ - static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin)); - static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin)); - static void win_free __ARGS((win_T *wp, tabpage_T *tp)); --static void win_append __ARGS((win_T *, win_T *)); --static void win_remove __ARGS((win_T *, tabpage_T *tp)); - static void frame_append __ARGS((frame_T *after, frame_T *frp)); - static void frame_insert __ARGS((frame_T *before, frame_T *frp)); - static void frame_remove __ARGS((frame_T *frp)); -@@ -62,17 +61,15 @@ - static void frame_add_height __ARGS((frame_T *frp, int n)); - static void last_status_rec __ARGS((frame_T *fr, int statusline)); - --static void make_snapshot __ARGS((void)); - static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp)); --static void clear_snapshot __ARGS((tabpage_T *tp)); -+static void clear_snapshot __ARGS((tabpage_T *tp, int idx)); - static void clear_snapshot_rec __ARGS((frame_T *fr)); --static void restore_snapshot __ARGS((int close_curwin)); - static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); - static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); - - #endif /* FEAT_WINDOWS */ - --static win_T *win_alloc __ARGS((win_T *after)); -+static win_T *win_alloc __ARGS((win_T *after, int hidden)); - static void win_new_height __ARGS((win_T *, int)); - - #define URL_SLASH 1 /* path_is_url() has found "://" */ -@@ -259,7 +256,7 @@ - /* cursor to previous window with wrap around */ - case 'W': - CHECK_CMDWIN -- if (lastwin == firstwin && Prenum != 1) /* just one window */ -+ if (firstwin == lastwin && Prenum != 1) /* just one window */ - beep_flush(); - else - { -@@ -343,7 +340,7 @@ - - /* move window to new tab page */ - case 'T': -- if (firstwin == lastwin) -+ if (one_window()) - MSG(_(m_onlyone)); - else - { -@@ -531,7 +528,8 @@ - # ifdef FEAT_SCROLLBIND - curwin->w_p_scb = FALSE; - # endif -- (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE); -+ (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, -+ ECMD_HIDE, NULL); - if (nchar == 'F' && lnum >= 0) - { - curwin->w_cursor.lnum = lnum; -@@ -593,9 +591,7 @@ - ++allow_keys; /* no mapping for xchar, but allow key codes */ - if (xchar == NUL) - xchar = plain_vgetc(); --#ifdef FEAT_LANGMAP - LANGMAP_ADJUST(xchar, TRUE); --#endif - --no_mapping; - --allow_keys; - #ifdef FEAT_CMDL_INFO -@@ -680,9 +676,9 @@ - /* When creating the help window make a snapshot of the window layout. - * Otherwise clear the snapshot, it's now invalid. */ - if (flags & WSP_HELP) -- make_snapshot(); -+ make_snapshot(SNAP_HELP_IDX); - else -- clear_snapshot(curtab); -+ clear_snapshot(curtab, SNAP_HELP_IDX); - - return win_split_ins(size, flags, NULL, 0); - } -@@ -693,7 +689,7 @@ - * top/left/right/bottom. - * return FAIL for failure, OK otherwise - */ -- static int -+ int - win_split_ins(size, flags, newwin, dir) - int size; - int flags; -@@ -894,14 +890,14 @@ - { - /* new window below/right of current one */ - if (newwin == NULL) -- wp = win_alloc(oldwin); -+ wp = win_alloc(oldwin, FALSE); - else - win_append(oldwin, wp); - } - else - { - if (newwin == NULL) -- wp = win_alloc(oldwin->w_prev); -+ wp = win_alloc(oldwin->w_prev, FALSE); - else - win_append(oldwin->w_prev, wp); - } -@@ -911,8 +907,15 @@ - if (wp == NULL) - return FAIL; - -+ new_frame(wp); -+ if (wp->w_frame == NULL) -+ { -+ win_free(wp, NULL); -+ return FAIL; -+ } -+ - /* make the contents of the new window the same as the current one */ -- win_init(wp, curwin); -+ win_init(wp, curwin, flags); - } - - /* -@@ -971,13 +974,7 @@ - } - - if (newwin == NULL) -- { -- /* Create a frame for the new window. */ -- frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T)); -- frp->fr_layout = FR_LEAF; -- frp->fr_win = wp; -- wp->w_frame = frp; -- } -+ frp = wp->w_frame; - else - frp = newwin->w_frame; - frp->fr_parent = curfrp->fr_parent; -@@ -1157,15 +1154,19 @@ - return OK; - } - -+ - /* - * Initialize window "newp" from window "oldp". - * Used when splitting a window and when creating a new tab page. - * The windows will both edit the same buffer. -+ * WSP_NEWLOC may be specified in flags to prevent the location list from -+ * being copied. - */ - static void --win_init(newp, oldp) -+win_init(newp, oldp, flags) - win_T *newp; - win_T *oldp; -+ int flags UNUSED; - { - int i; - -@@ -1190,19 +1191,19 @@ - copy_jumplist(oldp, newp); - #endif - #ifdef FEAT_QUICKFIX -- copy_loclist(oldp, newp); -+ if (flags & WSP_NEWLOC) -+ { -+ /* Don't copy the location list. */ -+ newp->w_llist = NULL; -+ newp->w_llist_ref = NULL; -+ } -+ else -+ copy_loclist(oldp, newp); - #endif - if (oldp->w_localdir != NULL) - newp->w_localdir = vim_strsave(oldp->w_localdir); - -- /* Use the same argument list. */ -- newp->w_alist = oldp->w_alist; -- ++newp->w_alist->al_refcount; -- newp->w_arg_idx = oldp->w_arg_idx; -- -- /* -- * copy tagstack and options from existing window -- */ -+ /* copy tagstack and folds */ - for (i = 0; i < oldp->w_tagstacklen; i++) - { - newp->w_tagstack[i] = oldp->w_tagstack[i]; -@@ -1212,10 +1213,29 @@ - } - newp->w_tagstackidx = oldp->w_tagstackidx; - newp->w_tagstacklen = oldp->w_tagstacklen; -- win_copy_options(oldp, newp); - # ifdef FEAT_FOLDING - copyFoldingState(oldp, newp); - # endif -+ -+ win_init_some(newp, oldp); -+} -+ -+/* -+ * Initialize window "newp" from window"old". -+ * Only the essential things are copied. -+ */ -+ static void -+win_init_some(newp, oldp) -+ win_T *newp; -+ win_T *oldp; -+{ -+ /* Use the same argument list. */ -+ newp->w_alist = oldp->w_alist; -+ ++newp->w_alist->al_refcount; -+ newp->w_arg_idx = oldp->w_arg_idx; -+ -+ /* copy options from existing window */ -+ win_copy_options(oldp, newp); - } - - #endif /* FEAT_WINDOWS */ -@@ -1258,11 +1278,10 @@ - * Must be called when there is just one window, filling the whole screen - * (excluding the command line). - */ --/*ARGSUSED*/ - int - make_windows(count, vertical) - int count; -- int vertical; /* split windows vertically if TRUE */ -+ int vertical UNUSED; /* split windows vertically if TRUE */ - { - int maxcount; - int todo; -@@ -1557,15 +1576,8 @@ - #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) - /* When 'guioptions' includes 'L' or 'R' may have to remove or add - * scrollbars. Have to update them anyway. */ -- if (gui.in_use) -- { -- out_flush(); -- gui_init_which_components(NULL); -- gui_update_scrollbars(TRUE); -- } -- need_mouse_correct = TRUE; -+ gui_may_update_scrollbars(); - #endif -- - } - - /* -@@ -2040,13 +2052,40 @@ - } - - /* -- * Return TRUE if the current window is the only window that exists. -+ * Return TRUE if the current window is the only window that exists (ignoring -+ * "aucmd_win"). - * Returns FALSE if there is a window, possibly in another tab page. - */ - static int - last_window() - { -- return (lastwin == firstwin && first_tabpage->tp_next == NULL); -+ return (one_window() && first_tabpage->tp_next == NULL); -+} -+ -+/* -+ * Return TRUE if there is only one window other than "aucmd_win" in the -+ * current tab page. -+ */ -+ static int -+one_window() -+{ -+#ifdef FEAT_AUTOCMD -+ win_T *wp; -+ int seen_one = FALSE; -+ -+ FOR_ALL_WINDOWS(wp) -+ { -+ if (wp != aucmd_win) -+ { -+ if (seen_one) -+ return FALSE; -+ seen_one = TRUE; -+ } -+ } -+ return TRUE; -+#else -+ return firstwin == lastwin; -+#endif - } - - /* -@@ -2075,6 +2114,19 @@ - return; - } - -+#ifdef FEAT_AUTOCMD -+ if (win == aucmd_win) -+ { -+ EMSG(_("E813: Cannot close autocmd window")); -+ return; -+ } -+ if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window()) -+ { -+ EMSG(_("E814: Cannot close window, only autocmd window would remain")); -+ return; -+ } -+#endif -+ - /* - * When closing the last window in a tab page first go to another tab - * page and then close the window and the tab page. This avoids that -@@ -2104,7 +2156,7 @@ - if (win->w_buffer->b_help) - help_window = TRUE; - else -- clear_snapshot(curtab); -+ clear_snapshot(curtab, SNAP_HELP_IDX); - - #ifdef FEAT_AUTOCMD - if (win == curwin) -@@ -2221,7 +2273,7 @@ - /* After closing the help window, try restoring the window layout from - * before it was opened. */ - if (help_window) -- restore_snapshot(close_curwin); -+ restore_snapshot(SNAP_HELP_IDX, close_curwin); - - #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) - /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */ -@@ -2302,13 +2354,6 @@ - frame_T *frp; - win_T *wp; - --#ifdef FEAT_FOLDING -- clearFolding(win); --#endif -- -- /* reduce the reference count to the argument list. */ -- alist_unlink(win->w_alist); -- - /* Remove the window and its frame from the tree of frames. */ - frp = win->w_frame; - wp = winframe_remove(win, dirp, tp); -@@ -2334,6 +2379,14 @@ - tabpage_close(TRUE); - # endif - -+# ifdef FEAT_AUTOCMD -+ if (aucmd_win != NULL) -+ { -+ (void)win_free_mem(aucmd_win, &dummy, NULL); -+ aucmd_win = NULL; -+ } -+# endif -+ - while (firstwin != NULL) - (void)win_free_mem(firstwin, &dummy, NULL); - } -@@ -2343,11 +2396,10 @@ - * Remove a window and its frame from the tree of frames. - * Returns a pointer to the window that got the freed up space. - */ --/*ARGSUSED*/ -- static win_T * -+ win_T * - winframe_remove(win, dirp, tp) - win_T *win; -- int *dirp; /* set to 'v' or 'h' for direction if 'ea' */ -+ int *dirp UNUSED; /* set to 'v' or 'h' for direction if 'ea' */ - tabpage_T *tp; /* tab page "win" is in, NULL for current */ - { - frame_T *frp, *frp2, *frp3; -@@ -3083,7 +3135,7 @@ - win_T *nextwp; - int r; - -- if (lastwin == firstwin) -+ if (one_window()) - { - if (message - #ifdef FEAT_AUTOCMD -@@ -3145,27 +3197,34 @@ - void - curwin_init() - { -- redraw_win_later(curwin, NOT_VALID); -- curwin->w_lines_valid = 0; -- curwin->w_cursor.lnum = 1; -- curwin->w_curswant = curwin->w_cursor.col = 0; -+ win_init_empty(curwin); -+} -+ -+ void -+win_init_empty(wp) -+ win_T *wp; -+{ -+ redraw_win_later(wp, NOT_VALID); -+ wp->w_lines_valid = 0; -+ wp->w_cursor.lnum = 1; -+ wp->w_curswant = wp->w_cursor.col = 0; - #ifdef FEAT_VIRTUALEDIT -- curwin->w_cursor.coladd = 0; -+ wp->w_cursor.coladd = 0; - #endif -- curwin->w_pcmark.lnum = 1; /* pcmark not cleared but set to line 1 */ -- curwin->w_pcmark.col = 0; -- curwin->w_prev_pcmark.lnum = 0; -- curwin->w_prev_pcmark.col = 0; -- curwin->w_topline = 1; -+ wp->w_pcmark.lnum = 1; /* pcmark not cleared but set to line 1 */ -+ wp->w_pcmark.col = 0; -+ wp->w_prev_pcmark.lnum = 0; -+ wp->w_prev_pcmark.col = 0; -+ wp->w_topline = 1; - #ifdef FEAT_DIFF -- curwin->w_topfill = 0; -+ wp->w_topfill = 0; - #endif -- curwin->w_botline = 2; -+ wp->w_botline = 2; - #ifdef FEAT_FKMAP -- if (curwin->w_p_rl) -- curwin->w_farsi = W_CONV + W_R_L; -+ if (wp->w_p_rl) -+ wp->w_farsi = W_CONV + W_R_L; - else -- curwin->w_farsi = W_CONV; -+ wp->w_farsi = W_CONV; - #endif - } - -@@ -3187,9 +3246,30 @@ - first_tabpage->tp_topframe = topframe; - curtab = first_tabpage; - #endif -+ - return OK; - } - -+#if defined(FEAT_AUTOCMD) || defined(PROTO) -+/* -+ * Init "aucmd_win". This can only be done after the first -+ * window is fully initialized, thus it can't be in win_alloc_first(). -+ */ -+ void -+win_alloc_aucmd_win() -+{ -+ aucmd_win = win_alloc(NULL, TRUE); -+ if (aucmd_win != NULL) -+ { -+ win_init_some(aucmd_win, curwin); -+# ifdef FEAT_SCROLLBIND -+ aucmd_win->w_p_scb = FALSE; -+# endif -+ new_frame(aucmd_win); -+ } -+} -+#endif -+ - /* - * Allocate the first window or the first window in a new tab page. - * When "oldwin" is NULL create an empty buffer for it. -@@ -3201,7 +3281,7 @@ - win_alloc_firstwin(oldwin) - win_T *oldwin; - { -- curwin = win_alloc(NULL); -+ curwin = win_alloc(NULL, FALSE); - if (oldwin == NULL) - { - /* Very first window, need to create an empty buffer for it and -@@ -3220,7 +3300,7 @@ - else - { - /* First window in new tab page, initialize it from "oldwin". */ -- win_init(curwin, oldwin); -+ win_init(curwin, oldwin, 0); - - # ifdef FEAT_SCROLLBIND - /* We don't want scroll-binding in the first window. */ -@@ -3229,21 +3309,36 @@ - } - #endif - -- topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T)); -- if (topframe == NULL) -+ new_frame(curwin); -+ if (curwin->w_frame == NULL) - return FAIL; -- topframe->fr_layout = FR_LEAF; -+ topframe = curwin->w_frame; - #ifdef FEAT_VERTSPLIT - topframe->fr_width = Columns; - #endif - topframe->fr_height = Rows - p_ch; - topframe->fr_win = curwin; -- curwin->w_frame = topframe; - - return OK; - } - - /* -+ * Create a frame for window "wp". -+ */ -+ static void -+new_frame(win_T *wp) -+{ -+ frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T)); -+ -+ wp->w_frame = frp; -+ if (frp != NULL) -+ { -+ frp->fr_layout = FR_LEAF; -+ frp->fr_win = wp; -+ } -+} -+ -+/* - * Initialize the window and frame size to the maximum. - */ - void -@@ -3293,10 +3388,13 @@ - free_tabpage(tp) - tabpage_T *tp; - { -+ int idx; -+ - # ifdef FEAT_DIFF - diff_clear(tp); - # endif -- clear_snapshot(tp); -+ for (idx = 0; idx < SNAP_COUNT; ++idx) -+ clear_snapshot(tp, idx); - #ifdef FEAT_EVAL - vars_clear(&tp->tp_vars.dv_hashtab); /* free all t: variables */ - #endif -@@ -3363,12 +3461,7 @@ - #if defined(FEAT_GUI) - /* When 'guioptions' includes 'L' or 'R' may have to remove or add - * scrollbars. Have to update them anyway. */ -- if (gui.in_use && starting == 0) -- { -- gui_init_which_components(NULL); -- gui_update_scrollbars(TRUE); -- } -- need_mouse_correct = TRUE; -+ gui_may_update_scrollbars(); - #endif - - redraw_all_later(CLEAR); -@@ -3490,10 +3583,9 @@ - * FAIL. - * Careful: When OK is returned need to get a new tab page very very soon! - */ --/*ARGSUSED*/ - static int - leave_tabpage(new_curbuf) -- buf_T *new_curbuf; /* what is going to be the new curbuf, -+ buf_T *new_curbuf UNUSED; /* what is going to be the new curbuf, - NULL if unknown */ - { - tabpage_T *tp = curtab; -@@ -3535,11 +3627,10 @@ - * Start using tab page "tp". - * Only to be used after leave_tabpage() or freeing the current tab page. - */ --/*ARGSUSED*/ - static void - enter_tabpage(tp, old_curbuf) - tabpage_T *tp; -- buf_T *old_curbuf; -+ buf_T *old_curbuf UNUSED; - { - int old_off = tp->tp_firstwin->w_winrow; - win_T *next_prevwin = tp->tp_prevwin; -@@ -3588,12 +3679,7 @@ - #if defined(FEAT_GUI) - /* When 'guioptions' includes 'L' or 'R' may have to remove or add - * scrollbars. Have to update them anyway. */ -- if (gui.in_use && starting == 0) -- { -- gui_init_which_components(NULL); -- gui_update_scrollbars(TRUE); -- } -- need_mouse_correct = TRUE; -+ gui_may_update_scrollbars(); - #endif - - redraw_all_later(CLEAR); -@@ -4028,14 +4114,14 @@ - if (mch_dirname(cwd, MAXPATHL) == OK) - globaldir = vim_strsave(cwd); - } -- mch_chdir((char *)curwin->w_localdir); -- shorten_fnames(TRUE); -+ if (mch_chdir((char *)curwin->w_localdir) == 0) -+ shorten_fnames(TRUE); - } - else if (globaldir != NULL) - { - /* Window doesn't have a local directory and we are not in the global - * directory: Change to the global directory. */ -- mch_chdir((char *)globaldir); -+ ignored = mch_chdir((char *)globaldir); - vim_free(globaldir); - globaldir = NULL; - shorten_fnames(TRUE); -@@ -4145,12 +4231,13 @@ - #endif - - /* -- * allocate a window structure and link it in the window list -+ * Allocate a window structure and link it in the window list when "hidden" is -+ * FALSE. - */ --/*ARGSUSED*/ - static win_T * --win_alloc(after) -- win_T *after; -+win_alloc(after, hidden) -+ win_T *after UNUSED; -+ int hidden UNUSED; - { - win_T *newwin; - -@@ -4176,7 +4263,8 @@ - * link the window in the window list - */ - #ifdef FEAT_WINDOWS -- win_append(after, newwin); -+ if (!hidden) -+ win_append(after, newwin); - #endif - #ifdef FEAT_VERTSPLIT - newwin->w_wincol = 0; -@@ -4237,6 +4325,13 @@ - { - int i; - -+#ifdef FEAT_FOLDING -+ clearFolding(wp); -+#endif -+ -+ /* reduce the reference count to the argument list. */ -+ alist_unlink(wp->w_alist); -+ - #ifdef FEAT_AUTOCMD - /* Don't execute autocommands while the window is halfway being deleted. - * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */ -@@ -4299,7 +4394,10 @@ - } - #endif /* FEAT_GUI */ - -- win_remove(wp, tp); -+#ifdef FEAT_AUTOCMD -+ if (wp != aucmd_win) -+#endif -+ win_remove(wp, tp); - vim_free(wp); - - #ifdef FEAT_AUTOCMD -@@ -4310,7 +4408,7 @@ - /* - * Append window "wp" in the window list after window "after". - */ -- static void -+ void - win_append(after, wp) - win_T *after, *wp; - { -@@ -4336,7 +4434,7 @@ - /* - * Remove a window from the window list. - */ -- static void -+ void - win_remove(wp, tp) - win_T *wp; - tabpage_T *tp; /* tab page "win" is in, NULL for current */ -@@ -6036,6 +6134,7 @@ - /* - * Return TRUE if there is only one window (in the current tab page), not - * counting a help or preview window, unless it is the current window. -+ * Does not count "aucmd_win". - */ - int - only_one_window() -@@ -6049,11 +6148,15 @@ - return FALSE; - - for (wp = firstwin; wp != NULL; wp = wp->w_next) -- if (!((wp->w_buffer->b_help && !curbuf->b_help) -+ if ((!((wp->w_buffer->b_help && !curbuf->b_help) - # ifdef FEAT_QUICKFIX - || wp->w_p_pvw - # endif - ) || wp == curwin) -+# ifdef FEAT_AUTOCMD -+ && wp != aucmd_win -+# endif -+ ) - ++count; - return (count <= 1); - #else -@@ -6108,11 +6211,12 @@ - /* - * Create a snapshot of the current frame sizes. - */ -- static void --make_snapshot() -+ void -+make_snapshot(idx) -+ int idx; - { -- clear_snapshot(curtab); -- make_snapshot_rec(topframe, &curtab->tp_snapshot); -+ clear_snapshot(curtab, idx); -+ make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]); - } - - static void -@@ -6140,11 +6244,12 @@ - * Remove any existing snapshot. - */ - static void --clear_snapshot(tp) -+clear_snapshot(tp, idx) - tabpage_T *tp; -+ int idx; - { -- clear_snapshot_rec(tp->tp_snapshot); -- tp->tp_snapshot = NULL; -+ clear_snapshot_rec(tp->tp_snapshot[idx]); -+ tp->tp_snapshot[idx] = NULL; - } - - static void -@@ -6164,26 +6269,27 @@ - * This is only done if the screen size didn't change and the window layout is - * still the same. - */ -- static void --restore_snapshot(close_curwin) -+ void -+restore_snapshot(idx, close_curwin) -+ int idx; - int close_curwin; /* closing current window */ - { - win_T *wp; - -- if (curtab->tp_snapshot != NULL -+ if (curtab->tp_snapshot[idx] != NULL - # ifdef FEAT_VERTSPLIT -- && curtab->tp_snapshot->fr_width == topframe->fr_width -+ && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width - # endif -- && curtab->tp_snapshot->fr_height == topframe->fr_height -- && check_snapshot_rec(curtab->tp_snapshot, topframe) == OK) -+ && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height -+ && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK) - { -- wp = restore_snapshot_rec(curtab->tp_snapshot, topframe); -+ wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe); - win_comp_pos(); - if (wp != NULL && close_curwin) - win_goto(wp); - redraw_all_later(CLEAR); - } -- clear_snapshot(curtab); -+ clear_snapshot(curtab, idx); - } - - /* -diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c ---- vim72.orig/src/workshop.c 2008-06-21 19:53:26.000000000 +0100 -+++ vim72/src/workshop.c 2009-07-22 22:54:22.000000000 +0100 -@@ -204,12 +204,11 @@ - * Function: - * Load a given file into the WorkShop buffer. - */ --/*ARGSUSED*/ - void - workshop_load_file( - char *filename, /* the file to load */ - int line, /* an optional line number (or 0) */ -- char *frameid) /* used for multi-frame support */ -+ char *frameid UNUSED) /* used for multi-frame support */ - { - #ifdef WSDEBUG_TRACE - if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) -@@ -263,10 +262,9 @@ - load_window(filename, lineno); - } - --/*ARGSUSED*/ - void - workshop_front_file( -- char *filename) -+ char *filename UNUSED) - { - #ifdef WSDEBUG_TRACE - if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) -@@ -538,9 +536,8 @@ - * breakpoints have moved when a program has been recompiled and - * reloaded into dbx. - */ --/*ARGSUSED*/ - void --workshop_moved_marks(char *filename) -+workshop_moved_marks(char *filename UNUSED) - { - #ifdef WSDEBUG_TRACE - if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) -@@ -575,11 +572,10 @@ - return (int)h; - } - --/*ARGSUSED*/ - void - workshop_footer_message( -- char *message, -- int severity) /* severity is currently unused */ -+ char *message, -+ int severity UNUSED) /* severity is currently unused */ - { - #ifdef WSDEBUG_TRACE - if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE)) -@@ -687,15 +683,14 @@ - * command. The globals curMenuName and curMenuPriority contain the name and - * priority of the parent menu tree. - */ --/*ARGSUSED*/ - void - workshop_menu_item( - char *label, - char *verb, -- char *accelerator, -+ char *accelerator UNUSED, - char *acceleratorText, -- char *name, -- char *filepos, -+ char *name UNUSED, -+ char *filepos UNUSED, - char *sensitive) - { - char cbuf[BUFSIZ]; -@@ -810,13 +805,12 @@ - workshopInitDone = True; - } - --/*ARGSUSED*/ - void - workshop_toolbar_button( - char *label, - char *verb, -- char *senseVerb, -- char *filepos, -+ char *senseVerb UNUSED, -+ char *filepos UNUSED, - char *help, - char *sense, - char *file, -@@ -968,7 +962,9 @@ - if (strcmp(option, "syntax") == 0) - vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value); - else if (strcmp(option, "savefiles") == 0) -- ; /* XXX - Not yet implemented */ -+ { -+ /* XXX - Not yet implemented */ -+ } - break; - - case 'l': -@@ -1098,10 +1094,9 @@ - /* - * A button in the toolbar has been pushed. - */ --/*ARGSUSED*/ - int - workshop_get_positions( -- void *clientData, /* unused */ -+ void *clientData UNUSED, - char **filename, /* output data */ - int *curLine, /* output data */ - int *curCol, /* output data */ -@@ -1121,8 +1116,12 @@ - ? (char *)curbuf->b_sfname : ""); - #endif - -- strcpy(ffname, (char *) curbuf->b_ffname); -- *filename = ffname; /* copy so nobody can change b_ffname */ -+ if (curbuf->b_ffname == NULL) -+ ffname[0] = NUL; -+ else -+ /* copy so nobody can change b_ffname */ -+ strcpy(ffname, (char *) curbuf->b_ffname); -+ *filename = ffname; - *curLine = curwin->w_cursor.lnum; - *curCol = curwin->w_cursor.col; - -@@ -1522,9 +1521,8 @@ - return NULL; - } - --/*ARGSUSED*/ - void --workshop_save_sensitivity(char *filename) -+workshop_save_sensitivity(char *filename UNUSED) - { - } - -diff -Naur vim72.orig/src/xxd/xxd.c vim72/src/xxd/xxd.c ---- vim72.orig/src/xxd/xxd.c 2007-11-29 20:05:16.000000000 +0000 -+++ vim72/src/xxd/xxd.c 2009-07-22 22:54:23.000000000 +0100 -@@ -64,6 +64,9 @@ - # define _CRT_SECURE_NO_DEPRECATE - # define _CRT_NONSTDC_NO_DEPRECATE - #endif -+#if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)) -+# define CYGWIN -+#endif - - #include - #ifdef VAXC -@@ -77,7 +80,8 @@ - #if !defined(OS2) && defined(__EMX__) - # define OS2 - #endif --#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) -+#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \ -+ || defined(CYGWIN) - # include /* for setmode() */ - #else - # ifdef UNIX -@@ -150,9 +154,6 @@ - # endif - #endif - --#if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)) --# define CYGWIN --#endif - #if defined(MSDOS) || defined(WIN32) || defined(OS2) - # define BIN_READ(yes) ((yes) ? "rb" : "rt") - # define BIN_WRITE(yes) ((yes) ? "wb" : "wt") diff --git a/srcpkgs/vim/patches/vim-7.2-fixes-5.patch.gz b/srcpkgs/vim/patches/vim-7.2-fixes-5.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..9aacff6019f061eb2b1da69fc77a5617e36584c8 GIT binary patch literal 226431 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 z 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%0Dou_& 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%0Asog_Z5}TUj<1gLG_KIV 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