Snapshot 50

Ideally all org.vim.*-file UTIs should be replaced with proper UTIs, but
they can be hard to find so they will be replaced as new UTIs are found.

.gitignore

@@ -3,11 +3,25 @@
 src/MacVim/MacVim.xcodeproj/*.mode1
 src/MacVim/MacVim.xcodeproj/*.mode1v3
 src/MacVim/MacVim.xcodeproj/*.pbxuser
+src/MacVim/icons/*.pyc
+src/MacVim/icons/*.ttf
+src/MacVim/icons/*.reg
+src/MacVim/icons/*.zip
+src/MacVim/icons/*.txt
+src/MacVim/icons/*.so
+src/MacVim/icons/*.egg-info
+src/MacVim/icons/build
 src/MacVim/icons/makeicns/*.o
 src/MacVim/icons/makeicns/makeicns
 src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.mode1
+src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.mode1v3
 src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.pbxuser
 src/MacVim/PSMTabBarControl/build
+src/MacVim/edit-in-odb/Edit in ODBEditor.xcodeproj/*.mode1
+src/MacVim/edit-in-odb/Edit in ODBEditor.xcodeproj/*.mode1v3
+src/MacVim/edit-in-odb/Edit in ODBEditor.xcodeproj/*.pbxuser
+src/MacVim/edit-in-odb/build
+src/MacVim/PSMTabBarControl/build
 src/MacVim/build
 src/TAGS
 src/Vim

Filelist

@@ -683,9 +683,7 @@ LANG_GEN = \
 		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 = \

runtime/doc/autocmd.txt

@@ -335,6 +335,8 @@ BufDelete			Before deleting a buffer from the buffer list.
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer being deleted "<afile>" and "<abuf>".
+				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 @@ BufUnload			Before unloading a buffer.  This is when the
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer being unloaded "<afile>".
+				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 @@ BufWipeout			Before completely deleting a buffer.  The
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer being deleted "<afile>".
+				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 @@ SwapExists			Detected an existing swap file when starting
 					'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.

runtime/doc/cmdline.txt

@@ -441,13 +441,20 @@ between files with almost the same name.  If there are multiple matches,
 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

runtime/doc/eval.txt

@@ -2414,6 +2414,7 @@ cursor({list})
 		When 'virtualedit' is used {off} specifies the offset in
 		screen columns from the start of the character.  E.g., a
 		position within a <Tab> or after the last character.
+		Returns 0 when the position could be set, -1 otherwise.
 
 
 deepcopy({expr}[, {noref}])				*deepcopy()* *E698*
@@ -4516,6 +4517,7 @@ rename({from}, {to})					*rename()*
 		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()*

runtime/doc/gui_mac.txt

@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 7.2.  Last change: 2008 Oct 25
+*gui_mac.txt*	For Vim version 7.2.  Last change: 2009 Sep 23
 
 
 		  VIM REFERENCE MANUAL    by Bjorn Winckler
@@ -17,8 +17,9 @@ The MacVim Graphical User Interface			*macvim* *gui-macvim*
  8. System services		|macvim-services|
  9. mvim:// URL handler		|macvim-url-handler|
 10. Keyboard shortcuts		|macvim-shortcuts|
-11. Known bugs/missing features	|macvim-todo|
-12. Hints			|macvim-hints|
+11. International		|macvim-international|
+12. Known bugs/missing features	|macvim-todo|
+13. Hints			|macvim-hints|
 
 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
@@ -117,6 +118,11 @@ really bad once you start using tabs.  For example, dropping two files, then
 dropping two more, and switching back to the first tab would cause weird
 strings like "((3) of 2)" to appear in the window title.
 
+							*macvim-tablabel*
+Tab labels only show the tail of the file name to make the tabs more readable
+when editing files in deeply nested folders.  Add the line "set guitablabel="
+to your .gvimrc file to revert back to the default Vim tab label.
+
 							*macvim-options*
 These are the non-standard options that MacVim supports:
 	'antialias'	'fullscreen'		'fuoptions'
@@ -260,9 +266,11 @@ Here is a list of relevant dictionary entries:
 KEY				VALUE ~
 MMCellWidthMultiplier		width of a normal glyph in em units [float]
 MMDialogsTrackPwd		open/save dialogs track the Vim pwd [bool]
+MMLoadDefaultFont		load font (disable for faster startup) [bool]
 MMLoginShellArgument		login shell parameter [string]
 MMLoginShellCommand		which shell to use to launch Vim [string]
 MMNoFontSubstitution		disable automatic font substitution [bool]
+MMShowAddTabButton		enable "add tab" button on tabline [bool]
 MMTabMaxWidth			maximum width of a tab [int]
 MMTabMinWidth			minimum width of a tab [int]
 MMTabOptimumWidth		default width of a tab [int]
@@ -343,7 +351,7 @@ The color scheme uses the the system "Highlight Color", which can be changed in
 the "Appearance" pane of the System Preferences.  It also changes the
 highlight color when a window becomes inactive.
 
-If you have any comments regarding this colors cheme (is it better or worse
+If you have any comments regarding this color scheme (is it better or worse
 than the default?) then post them to |vim_mac|.
 
 ==============================================================================
@@ -504,8 +512,8 @@ some experimentation might be required in order to figure out which key to
 press.
 
 The second way of controlling dialogs with the keyboard is to enable "Full
-keyboard access" in the "Keyboard & Mouse" pane of the System Preferences (you
-can also toggle this on or off by pressing Ctrl-F7).  Once keyboard access is
+keyboard access" in the "Keyboard" pane of the System Preferences (you can
+also toggle this on or off by pressing Ctrl-F7).  Once keyboard access is
 enabled it is possible to move between buttons with Tab and pressing Space to
 select the current button.  The current button is indicated with a blue
 outline.
@@ -561,15 +569,20 @@ discovered by looking through the menus (see |macvim-menus| on how to create
 your own menu shortcuts).  The remaining shortcuts are listed here:
 
 							*Cmd-.* *<D-.>*
-Cmd-.			Interrupt Vim.  This is synonymous with CTRL-C and can
-			hence be used instead of Esc to exit insert mode (in
-			case you find Esc a bit hard to reach).
+Cmd-.			Interrupt Vim.  Unlike Ctrl-C which is sent as normal
+			keyboard input (and hence has to be received and then
+			interpreted) this sends a SIGINT signal to the Vim
+			process.  Use this shortcut if the Vim process appears
+			to have locked up and is not responding to key presses.
+			This Cmd-key combination cannot be unmapped.
 
 							*Cmd-`* *<D-`>*
 Cmd-`			Cycle to the next window.  On an American keyboard the
 			`-key is located under the Esc-key.  On European
 			keyboards this key is often adjacent to the left
 			Shift-key and it may be not even be marked with "`".
+			This Cmd-key combination can only be unmapped via the
+			"Keyboard" System Preferences.
 
 							*Cmd-Left*  *<D-Left>*
 Cmd-Left		Move cursor to the beginning of the line
@@ -613,7 +626,28 @@ See |macvim-shift-movement| if you want Shift to select text when used in
 conjunction with the above Cmd/Alt movement shortcuts.
 
 ==============================================================================
-11. Known bugs/missing features				*macvim-todo*
+11. International					*macvim-international*
+
+When editing non-English text it may be convenient to keep separate keyboard
+layouts for normal and insert mode.  This is supported via the 'imd' option on
+Mac OS X 10.5 or later (on 10.4 the 'imd' option support is not as useful as
+it only switches between Roman and non-Roman input sources and it has been
+known not to work very reliably).
+
+For example: When 'noimd' is enabled (i.e. IM is enabled) the input source is
+saved when toggling between normal and insert mode, so you can use a US layout
+in normal mode then switch to insert mode and choose a Swedish layout.  When
+you go back to normal mode the US layout will be selected and when you enter
+insert mode the Swedish layout is selected.  This also works when searching
+for text etc. see 'imc', 'imi', 'ims'.
+
+Note that the layout used in normal mode is the layout used when 'noimd' is
+set (i.e when IM is enabled).  If you find that MacVim switches to the
+wrong layout when going back to normal mode, then select the layout you want
+to use in normal mode and type ":set imd" followed by ":set noimd".
+
+==============================================================================
+12. Known bugs/missing features				*macvim-todo*
 
 This list is by no means exhaustive, it only enumerates some of the more
 prominent bugs/missing features.
@@ -636,7 +670,7 @@ might be simple to implement, but unless somebody asks for a particular
 feature then there is little incentive to add it.
 
 ==============================================================================
-12. Hints						*macvim-hints*
+13. Hints						*macvim-hints*
 
 In this section some general (not necessarily MacVim specific) hints are
 given.
@@ -680,11 +714,11 @@ This is a known problem, see |macvim-todo|.
 Scenario: ~
 You dislike the default font (DejaVu Sans Mono).
 Solution: ~
-The standard fixed width font on other Mac OS X applications is Monaco.  If
-you prefer this font then add the following line to your "~/.gvimrc" (note
-that Monaco does not come in italic and bold variants): >
-	set guifont=Monaco:h10
-The suffix ":h10" specifies the point size of the font should be "10" (see
+The standard fixed width font on Mac OS X is Menlo (it used to be Monaco prior
+to OS X 10.6).  If you prefer this font then add the following line to your
+"~/.gvimrc": >
+	set guifont=Menlo:h11
+The suffix ":h11" specifies the point size of the font should be "11" (see
 'guifont' for more information on how to set the font).
 
 Scenario: ~
@@ -733,13 +767,24 @@ bring up an editor, you would set that option to something like: >
 Scenario: ~
 You would like to remap Caps Lock to Esc.
 Solution: ~
-The free app "PCKeyboardHack" can be used to remap Caps Lock.  It is available
-as a free download from:
+The app "PCKeyboardHack" can be used to remap Caps Lock.  It is available as a
+free download from:
 	http://www.pqrs.org/tekezo/macosx/keyremap4macbook/extra.html
 On some Apple keyboards the Caps Lock key doesn't immediately register and
 this makes Caps Lock "drop" key presses.  To work around this problem go into
-the "Keyboard & Mouse" System Preference and remap Caps Lock to Ctrl first
-(click the "Modifier Keys..." button).
+the "Keyboard" System Preference and remap Caps Lock to Ctrl first (click the
+"Modifier Keys..." button).  This trick may also be necessary if the Caps Lock
+light turns on/off despite having remapped to Esc.
+
+Scenario: ~
+You have problems creating custom mappings involving the Cmd key.
+Solution: ~
+To bind to a key involving Cmd you use the "<D-..>" syntax.  Many Cmd-key
+mappings are already used by the menus so if your mapping doesn't work then
+the solution is usually to first unmap the menu binding (see |macvim-menus|,
+in particular read the end of that section).  Also see the section on
+|macvim-shortcuts| for some Cmd-key combinations which are not used by the
+menus but still need to be freed up before they can be used in custom bindings.
 
 Scenario: ~
 You can't find the information on MacVim you thought should be in this manual

runtime/doc/gui_x11.txt

@@ -63,7 +63,8 @@ already running vim will never fork in MacVim.
 "gvim --nofork" does the same as "gvim -f".
 
 If you want the GUI to run in the foreground always, include the 'f'
-flag in 'guioptions'.  |-f|.
+flag in 'guioptions'.  |-f|.  MacVim does not support this flag in
+'guioptions'.
 
 ==============================================================================
 2. GUI Resources			*gui-resources* *.Xdefaults*

runtime/doc/if_cscop.txt

@@ -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 @@ The available subcommands are:
 		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. >
+	    These two examples perform the same query: functions calling
+	    "vim_free". >
+
+	    :cscope find t initOnce
+	    :cscope find t  initOnce
+<
+	    The first one searches for the text "initOnce", the second one for
+	    " initOnce". >
 
 	    :cscope find 0 DEFAULT_TERM
 <
@@ -344,13 +355,8 @@ cscope version for Win32 see:
 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*
@@ -475,7 +481,8 @@ bit of code) was adapted from the cscope interface in nvi.  Please report
 any problems, suggestions, patches, et al., you have for the usage of
 cscope within Vim to him.
 							*cscope-win32*
-For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
+For a cscope version for Win32 see:
+	http://code.google.com/p/cscope-win32/
 
 Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
 him if you have Win32-specific issues.

runtime/doc/if_mzsch.txt

@@ -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 @@ Note: On FreeBSD you should use the "drscheme" port.
 
 							*: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 @@ range.
 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 @@ To avoid clashes with MzScheme, consider using prefix when requiring module,
 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(\"<afile>\")"))))
-	      (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 @@ procedures is restricted.
 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! <SID>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 <F9> :call <SID>SetFirstLine() <CR>
@@ -137,17 +104,33 @@ Inline script usage: >
 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 @@ interface.
 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 @@ Common
 				    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 @@ Buffers							 *mzscheme-buffer*
 					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 @@ Windows							    *mzscheme-window*
     (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|.

runtime/doc/map.txt

@@ -224,6 +224,10 @@ expression is evaluated to obtain the {rhs} that is used.  Example: >
 The result of the InsertDot() function will be inserted.  It could check the
 text before the cursor and start omni completion when some condition is met.
 
+For abbreviations |v:char| is set to the character that was typed to trigger
+the abbreviation.  You can use this to decide how to expand the {lhs}.  You
+can't change v:char and you should not insert it.
+
 Be very careful about side effects!  The expression is evaluated while
 obtaining characters, you may very well make the command dysfunctional.
 For this reason the following is blocked:

runtime/doc/netbeans.txt

@@ -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 @@ keyAtPos keyName lnum/col
 		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

runtime/doc/options.txt

@@ -1448,6 +1448,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	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
@@ -3490,6 +3498,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		foreground.  |gui-fork|
 		Note: Set this option in the vimrc file.  The forking may have
 		happened already when the |gvimrc| file is read.
+		MacVim does not support this flag due to limitations with
+		forking on Mac OS X.
 								*'go-i'*
 	  'i'	Use a Vim icon.  For GTK with KDE it is used in the left-upper
 		corner of the window.  It's black&white on non-GTK, because of
@@ -3871,11 +3881,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 			{only available when compiled with the |+xim|
-			|+multi_byte_ime| or |global-ime| feature}
+			|+multi_byte_ime| or |global-ime| feature, always
+			available in MacVim}
 	When set the Input Method is never used.  This is useful to disable
 	the IM when it doesn't work properly.
-	Currently this option is on by default for SGI/IRIX and MacVim.  This
-	may change in later releases.
+	Currently this option is on by default for SGI/IRIX.  This may change
+	in later releases.
 
 						*'iminsert'* *'imi'*
 'iminsert' 'imi'	number (default 0, 2 when an input method is supported)
@@ -4273,9 +4284,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	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

runtime/doc/remote.txt

@@ -208,7 +208,7 @@ When using gvim, the --remote-wait only works properly this way: >
 MacVim uses distributed objects for interprocess communication.  A server
 listens to a named port for new connections, and clients connect to this port
 to send messages.  Server listings are made possible by the frontend (MacVim)
-keeping a list of all currently running servers.  Thus, server are not aware
+keeping a list of all currently running servers.  Thus, servers are not aware
 of each other directly; only MacVim knows which servers are running.
 
 A client is any object which implements the MMVimClientProtocol (see

runtime/doc/various.txt

@@ -511,6 +511,17 @@ N  *+X11*		Unix only: can restore window title |X11|
 			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

runtime/menu.vim

@@ -17,8 +17,7 @@ if !exists("did_install_default_menus")
 let did_install_default_menus = 1
 
 
-" Localized menus currently not supported in MacVim
-if !has("gui_macvim") && (exists("v:lang") || &langmenu != "")
+if (exists("v:lang") || &langmenu != "")
   " Try to find a menu translation file for the current language.
   if &langmenu != ""
     if &langmenu =~ "none"
@@ -68,7 +67,27 @@ if !has("gui_macvim") && (exists("v:lang") || &langmenu != "")
 endif
 
 
+" MacVim Window menu (should be next to Help so give it a high priority)
+if has("gui_macvim")
+  an <silent> 9998.300 Window.Minimize		    <Nop>
+  an <silent> 9998.301 Window.Minimize\ All	    <Nop>
+  an <silent> 9998.310 Window.Zoom		    <Nop>
+  an <silent> 9998.311 Window.Zoom\ All		    <Nop>
+  an <silent> 9998.320 Window.Toggle\ Full\ Screen\ Mode :set invfullscreen<CR>
+  an 9998.330 Window.-SEP1-			    <Nop>
+  " TODO! Grey out if no tabs are visible.
+  an <silent> 9998.340 Window.Select\ Next\ Tab	    :tabnext<CR>
+  an <silent> 9998.350 Window.Select\ Previous\ Tab :tabprevious<CR>
+  an 9998.360 Window.-SEP2-			    <Nop>
+  an <silent> 9998.370 Window.Bring\ All\ To\ Front <Nop>
+endif
+
 " Help menu
+if has("gui_macvim")
+  an 9999.1 &Help.MacVim\ Help		    :h gui_mac<CR>
+  an <silent> 9999.2 Help.MacVim\ Website   <Nop>
+  an 9999.3 &Help.-sep0-		    <Nop>
+endif
 an 9999.10 &Help.&Overview<Tab><F1>	:help<CR>
 an 9999.20 &Help.&User\ Manual		:help usr_toc<CR>
 an 9999.30 &Help.&How-to\ links		:help how-to<CR>
@@ -97,16 +116,32 @@ fun! s:Helpfind()
 endfun
 
 " File menu
-an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
+if has("gui_macvim")
+  an <silent> 10.290 &File.New\ Window		    <Nop>
+  an  10.295 &File.New\ Tab			    :tabnew<CR>
+  an <silent> 10.310 &File.Open\.\.\.		    <Nop>
+  an <silent> 10.325 &File.Open\ Recent		    <Nop>
+  an 10.328 &File.-SEP0-			    <Nop>
+  an <silent> 10.330 &File.Close\ Window<Tab>:qa    :conf qa<CR>
+  an <silent> 10.332 &File.Close		    :conf q<CR>
+  an <silent> 10.341 &File.Save\ All		    :browse conf wa<CR>
+  an 10.350 &File.Save\ As\.\.\.<Tab>:sav	    :browse confirm saveas<CR>
+else
+endif
+if !has("gui_macvim")
+  an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
+endif
 an 10.320 &File.Sp&lit-Open\.\.\.<Tab>:sp	:browse sp<CR>
 an 10.320 &File.Open\ Tab\.\.\.<Tab>:tabnew	:browse tabnew<CR>
-an 10.325 &File.&New<Tab>:enew			:confirm enew<CR>
-an <silent> 10.330 &File.&Close<Tab>:close
+if !has("gui_macvim")
+  an 10.325 &File.&New<Tab>:enew		:confirm enew<CR>
+  an <silent> 10.330 &File.&Close<Tab>:close
 	\ :if winheight(2) < 0 <Bar>
 	\   confirm enew <Bar>
 	\ else <Bar>
 	\   confirm close <Bar>
 	\ endif<CR>
+endif
 an 10.335 &File.-SEP1-				<Nop>
 an <silent> 10.340 &File.&Save<Tab>:w		:if expand("%") == ""<Bar>browse confirm w<Bar>else<Bar>confirm w<Bar>endif<CR>
 an 10.350 &File.Save\ &As\.\.\.<Tab>:sav	:browse confirm saveas<CR>
@@ -128,9 +163,11 @@ elseif has("unix")
   vunmenu   &File.&Print
   vnoremenu &File.&Print			:w !lpr<CR>
 endif
-an 10.600 &File.-SEP4-				<Nop>
-an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
-an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
+if !has("gui_macvim")
+  an 10.600 &File.-SEP4-				<Nop>
+  an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
+  an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
+endif
 
 func! <SID>SelectAll()
   exe "norm gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
@@ -167,13 +204,20 @@ inoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG	<C-O>:call <SID>S
 cnoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG	<C-U>call <SID>SelectAll()<CR>
 
 an 20.405	 &Edit.-SEP2-				<Nop>
-if has("win32")  || has("win16") || has("gui_gtk") || has("gui_kde") || has("gui_motif")
+if has("win32") || has("win16") || has("gui_gtk") || has("gui_kde") || has("gui_motif")
   an 20.410	 &Edit.&Find\.\.\.			:promptfind<CR>
   vunmenu	 &Edit.&Find\.\.\.
   vnoremenu <silent>	 &Edit.&Find\.\.\.		y:promptfind <C-R>=<SID>FixFText()<CR><CR>
   an 20.420	 &Edit.Find\ and\ Rep&lace\.\.\.	:promptrepl<CR>
   vunmenu	 &Edit.Find\ and\ Rep&lace\.\.\.
   vnoremenu <silent>	 &Edit.Find\ and\ Rep&lace\.\.\. y:promptrepl <C-R>=<SID>FixFText()<CR><CR>
+elseif has("gui_macvim")
+  an <silent> 20.410.10 &Edit.Find.Find\.\.\.	:promptfind<CR>
+  vunmenu &Edit.Find.Find\.\.\.
+  vnoremenu <silent> &Edit.Find.Find\.\.\.	y:promptfind <C-R>=<SID>FixFText()<CR><CR>
+  an 20.410.20 &Edit.Find.Find\ Next			<Nop>
+  an 20.410.30 &Edit.Find.Find\ Previous		<Nop>
+  vmenu 20.410.35 &Edit.Find.Use\ Selection\ for\ Find	y:let @/=@"<CR>:<BS>
 else
   an 20.410	 &Edit.&Find<Tab>/			/
   an 20.420	 &Edit.Find\ and\ Rep&lace<Tab>:%s	:%s/
@@ -386,6 +430,13 @@ if has("keymap")
 endif
 if has("win32") || has("win16") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac")
   an 20.470 &Edit.Select\ Fo&nt\.\.\.	:set guifont=*<CR>
+elseif has("gui_macvim")
+  an 20.470 &Edit.-SEP4-                       <Nop>
+  an 20.475.10 &Edit.Font.Show\ Fonts          <Nop>
+  an 20.475.20 &Edit.Font.-SEP5-               <Nop>
+  an 20.475.30 &Edit.Font.Bigger               <Nop>
+  an 20.475.40 &Edit.Font.Smaller              <Nop>
+  an 20.480 &Edit.Special\ Characters\.\.\.    <Nop>
 endif
 
 " Programming menu
@@ -803,6 +854,7 @@ endif
 endif " !exists("no_buffers_menu")
 
 " Window menu
+if !has("gui_macvim")
 an 70.300 &Window.&New<Tab>^Wn			<C-W>n
 an 70.310 &Window.S&plit<Tab>^Ws		<C-W>s
 an 70.320 &Window.Sp&lit\ To\ #<Tab>^W^^	<C-W><C-^>
@@ -835,6 +887,7 @@ an 70.380 &Window.&Max\ Height<Tab>^W_			<C-W>_
 an 70.390 &Window.M&in\ Height<Tab>^W1_			<C-W>1_
 an 70.400 &Window.Max\ &Width<Tab>^W\|			<C-W>\|
 an 70.410 &Window.Min\ Widt&h<Tab>^W1\|			<C-W>1\|
+endif " !has("gui_macvim")
 
 " The popup menu
 an 1.10 PopUp.&Undo			u
@@ -980,7 +1033,7 @@ if has("toolbar")
   exe 'vnoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['v']
   exe 'inoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['i']
 
-  if !has("gui_athena")
+  if !has("gui_athena") && !has("gui_macvim")
     an 1.95   ToolBar.-sep3-		<Nop>
     an 1.100  ToolBar.Replace		:promptrepl<CR>
     vunmenu   ToolBar.Replace
@@ -989,19 +1042,27 @@ if has("toolbar")
     an 1.120  ToolBar.FindPrev		N
   endif
 
-  an 1.215 ToolBar.-sep5-		<Nop>
+  if !has("gui_macvim")
+    an 1.215 ToolBar.-sep5-		<Nop>
+  endif
   an <silent> 1.220 ToolBar.LoadSesn	:call <SID>LoadVimSesn()<CR>
   an <silent> 1.230 ToolBar.SaveSesn	:call <SID>SaveVimSesn()<CR>
   an 1.240 ToolBar.RunScript		:browse so<CR>
 
-  an 1.245 ToolBar.-sep6-		<Nop>
+  if !has("gui_macvim")
+    an 1.245 ToolBar.-sep6-		<Nop>
+  endif
   an 1.250 ToolBar.Make			:make<CR>
-  an 1.270 ToolBar.RunCtags		:exe "!" . g:ctags_command<CR>
-  an 1.280 ToolBar.TagJump		g<C-]>
+  if !has("gui_macvim")
+    an 1.270 ToolBar.RunCtags		:exe "!" . g:ctags_command<CR>
+    an 1.280 ToolBar.TagJump		g<C-]>
+  endif
 
   an 1.295 ToolBar.-sep7-		<Nop>
   an 1.300 ToolBar.Help			:help<CR>
-  an <silent> 1.310 ToolBar.FindHelp	:call <SID>Helpfind()<CR>
+  if !has("gui_macvim")
+    an <silent> 1.310 ToolBar.FindHelp	:call <SID>Helpfind()<CR>
+  endif
 
 " Only set the tooltips here if not done in a language menu file
 if exists("*Do_toolbar_tmenu")
@@ -1104,4 +1165,62 @@ endif " !exists("did_install_syntax_menu")
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
+
+if has("gui_macvim")
+  "
+  " Set up menu key equivalents (these should always have the 'D' modifier
+  " set), action bindings, and alternate items.
+  "
+  " Note: menu items which should execute an action are bound to <Nop>; the
+  " action message is specified here via the :macmenu command.
+  "
+  macm File.New\ Window				key=<D-n> action=newWindow:
+  macm File.New\ Tab				key=<D-t>
+  macm File.Open\.\.\.				key=<D-o> action=fileOpen:
+  macm File.Open\ Tab\.\.\.<Tab>:tabnew		key=<D-T>
+  macm File.Open\ Recent			action=recentFilesDummy:
+  macm File.Close\ Window<Tab>:qa		key=<D-W>
+  macm File.Close				key=<D-w> action=performClose:
+  macm File.Save<Tab>:w				key=<D-s>
+  macm File.Save\ All				key=<D-M-s> alt=YES
+  macm File.Save\ As\.\.\.<Tab>:sav		key=<D-S>
+  macm File.Print				key=<D-p>
+
+  macm Edit.Undo<Tab>u				key=<D-z> action=undo:
+  macm Edit.Redo<Tab>^R				key=<D-Z> action=redo:
+  macm Edit.Cut<Tab>"+x				key=<D-x> action=cut:
+  macm Edit.Copy<Tab>"+y			key=<D-c> action=copy:
+  macm Edit.Paste<Tab>"+gP			key=<D-v> action=paste:
+  macm Edit.Select\ All<Tab>ggVG		key=<D-a> action=selectAll:
+  macm Edit.Find.Find\.\.\.			key=<D-f>
+  macm Edit.Find.Find\ Next			key=<D-g> action=findNext:
+  macm Edit.Find.Find\ Previous			key=<D-G> action=findPrevious:
+  macm Edit.Find.Use\ Selection\ for\ Find	key=<D-e>
+  macm Edit.Font.Show\ Fonts			action=orderFrontFontPanel:
+  macm Edit.Font.Bigger				key=<D-=> action=fontSizeUp:
+  macm Edit.Font.Smaller			key=<D--> action=fontSizeDown:
+  macm Edit.Special\ Characters\.\.\.		key=<D-M-t> action=orderFrontCharacterPalette:
+
+  macm Tools.Spelling.To\ Next\ error<Tab>]s	key=<D-;>
+  macm Tools.Spelling.Suggest\ Corrections<Tab>z=   key=<D-:>
+  macm Tools.Make<Tab>:make			key=<D-b>
+  macm Tools.List\ Errors<Tab>:cl		key=<D-l>
+  macm Tools.Next\ Error<Tab>:cn		key=<D-C-Right>
+  macm Tools.Previous\ Error<Tab>:cp		key=<D-C-Left>
+  macm Tools.Older\ List<Tab>:cold		key=<D-C-Up>
+  macm Tools.Newer\ List<Tab>:cnew		key=<D-C-Down>
+
+  macm Window.Minimize		key=<D-m>	action=performMiniaturize:
+  macm Window.Minimize\ All	key=<D-M-m>	action=miniaturizeAll:	alt=YES
+  macm Window.Zoom		key=<D-C-z>	action=performZoom:
+  macm Window.Zoom\ All		key=<D-M-C-z>	action=zoomAll:		alt=YES
+  macm Window.Toggle\ Full\ Screen\ Mode	key=<D-F>
+  macm Window.Select\ Next\ Tab			key=<D-}>
+  macm Window.Select\ Previous\ Tab		key=<D-{>
+  macm Window.Bring\ All\ To\ Front		action=arrangeInFront:
+
+  macm Help.MacVim\ Help			key=<D-?>
+  macm Help.MacVim\ Website			action=openWebsite:
+endif
+
 " vim: set sw=2 :

runtime/spell/fixdup

@@ -1,27 +0,0 @@
-" Vim script to fix duplicate words in a .dic file  vim: set ft=vim:
-"
-" Usage: Edit the .dic file and source this script.
-
-let deleted = 0
-
-" Start below the word count.
-let lnum = 2
-while lnum <= line('$')
-  let word = getline(lnum)
-  if word !~ '/'
-    if search('^' . word . '/', 'w') != 0
-      let deleted += 1
-      exe lnum . "d"
-      continue		" don't increment lnum, it's already at the next word
-    endif
-  endif
-  let lnum += 1
-endwhile
-
-if deleted == 0
-  echomsg "No duplicate words found"
-elseif deleted == 1
-  echomsg "Deleted 1 duplicate word"
-else
-  echomsg printf("Deleted %d duplicate words", deleted)
-endif

src/GvimExt/gvimext.cpp

@@ -635,7 +635,9 @@ STDMETHODIMP CShellExt::QueryContextMenu(HMENU hMenu,
 	}
 	// Now concatenate
 	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
-	strncat(temp, title, BUFSIZE - 1);
+	temp[BUFSIZE - 1] = '\0';
+	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
+	temp[BUFSIZE - 1] = '\0';
 	InsertMenu(hMenu,
 		indexMenu++,
 		MF_STRING|MF_BYPOSITION,

src/MacVim/AuthorizedShellCommand.m

@@ -54,8 +54,7 @@
     NSEnumerator* myIterator = [commands objectEnumerator];
     NSDictionary* currCommand;
 
-    while (currCommand = [myIterator nextObject])
-    {
+    while ((currCommand = [myIterator nextObject])) {
         /* do something useful with currCommand */
         FILE *ioPipe = NULL;
         char junk[256];

src/MacVim/CTGradient.m

@@ -7,6 +7,7 @@
 //  Released into public domain on 4/10/08.
 //
 //  Version: 1.8
+#ifdef MM_ENABLE_PLUGINS
 
 #import "CTGradient.h"
 
@@ -1266,3 +1267,5 @@ void resolveHSV(float *color1, float *color2)	//H value may be undefined (i.e. g
 	}
 
 @end
+
+#endif // MM_ENABLE_PLUGINS

src/MacVim/Credits.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \vieww9000\viewh8400\viewkind0
@@ -31,6 +31,7 @@ Matt Tolton\
 Kaoru Yoshida\
 Ron Olson\
 Jonathon Mah\
+Kazuki Sakamoto\
 
 \i0 \
 ...and many others who have helped by reporting bugs etc.\
@@ -40,8 +41,6 @@ Thank you to {\field{\*\fldinst{HYPERLINK "http://www.positivespinmedia.com"}}{\
 \
 Toolbar icons by {\field{\*\fldinst{HYPERLINK "http://www.mattballdesign.com/"}}{\fldrslt Matt Ball}} (free Developer Icons), {\field{\*\fldinst{HYPERLINK "http://www.jonasraskdesign.com/"}}{\fldrslt Jonas Rask}} (Danish Royalty Free icon set), and {\field{\*\fldinst{HYPERLINK "http://www.everaldo.com"}}{\fldrslt Everaldo Coelho}} (Crystal Project Icons, released under LGPL license).\
 \
-Vim icons made by {\field{\*\fldinst{HYPERLINK "http://www.cs.princeton.edu/~mtwebb/vim_icon/vim_icons.html"}}{\fldrslt Matthew Webb}}.\
-\
 The default font in MacVim, DejaVu Sans Mono, is based on the Bitstream Vera\'99 and Arev fonts.  Bitstream Vera\'99 is \'a9 2003 by Bitstream, Inc.  Arev is \'a9 2006 by Tavmjong Bah.  The DejaVu changes to these fonts are in the public domain.\
 \
 Thanks to Andy Matuschak for {\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt Sparkle}}.\
@@ -52,4 +51,6 @@ Thanks to Allan Odgaard for making the "Edit in TextMate" input manager source c
 \
 Thanks to Rainer Brockerhoff for RBSplitView.\
 \
-Thanks to Chad Weider for CTGradient.}
+Thanks to Chad Weider for CTGradient.\
+\
+Thanks to Damien Guard for {\field{\*\fldinst{HYPERLINK "http://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released"}}{\fldrslt Envy Code R}} (used in MacVim's 16x16 document icons).}

src/MacVim/DBPrefsWindowController.h

@@ -42,7 +42,12 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController {
+@interface DBPrefsWindowController : NSWindowController
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
+    // 10.6 has turned delegate messages into formal protocols
+    <NSAnimationDelegate, NSToolbarDelegate>
+#endif
+{
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;

src/MacVim/KeyBinding.plist

@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!-- These keys are needed to prevent Cocoa from inserting them as
+             normal text (missing from StandardKeyBinding.dict below).
+          -->
+	<key>$</key>
+	<string>deleteBackward:</string>
+	<key>$
+</key>
+	<string>insertNewline:</string>
+	<key>^~
+</key>
+	<string>insertNewline:</string>
+	<key>$</key>
+	<string>insertNewline:</string>
+	<key>^~</key>
+	<string>insertNewline:</string>
+	<key>^</key>
+	<string>cancelOperation:</string>
+	<key>$</key>
+	<string>cancelOperation:</string>
+	<key>^~</key>
+	<string>cancelOperation:</string>
+	<key>^~	</key>
+	<string>insertTab:</string>
+	<key>~</key>
+	<string>insertBackTab:</string>
+	<key>^~</key>
+	<string>insertBackTab:</string>
+	<key>^ </key>
+	<string>keySpace:</string>
+	<key>~ </key>
+	<string>keySpace:</string>
+	<key>$ </key>
+	<string>keySpace:</string>
+	<key>^~ </key>
+	<string>keySpace:</string>
+
+        <!-- The following keys involving Command (@) are here to make sure
+             interpretKeyEvents: does not block Command+Alt+.. and
+             Command+Ctrl+.. key events. -->
+	<key>@~</key>
+	<string>noop:</string>
+	<key>@^</key>
+	<string>noop:</string>
+	<key>@^~</key>
+	<string>noop:</string>
+
+
+	<!-- These keys are used to convert certain keys so that we don't have
+             to do it manually.
+          -->
+	<!-- Turn Ctrl-2 into Ctrl-@ -->
+	<key>^2</key>
+	<string>keyCtrlAt:</string>
+	<!-- Turn Ctrl-6 into Ctrl-^ -->
+	<key>^6</key>
+	<string>keyCtrlHat:</string>
+
+
+        <!-- These are copied from AppKit.framework/StandardKeyBinding.dict
+          -->
+	<key></key>
+	<string>insertNewline:</string>
+	<key></key>
+	<string>deleteBackward:</string>
+	<key>	</key>
+	<string>insertTab:</string>
+	<key>
+</key>
+	<string>insertNewline:</string>
+	<key>
+</key>
+	<string>insertNewline:</string>
+	<key></key>
+	<string>insertBacktab:</string>
+	<key></key>
+	<string>cancelOperation:</string>
+	<key>$</key>
+	<string>moveUpAndModifySelection:</string>
+	<key>$</key>
+	<string>moveDownAndModifySelection:</string>
+	<key>$</key>
+	<string>moveLeftAndModifySelection:</string>
+	<key>$</key>
+	<string>moveRightAndModifySelection:</string>
+	<key>$</key>
+	<string>moveToBeginningOfDocumentAndModifySelection:</string>
+	<key>$</key>
+	<string>moveToEndOfDocumentAndModifySelection:</string>
+	<key>$</key>
+	<string>pageUpAndModifySelection:</string>
+	<key>$</key>
+	<string>pageDownAndModifySelection:</string>
+	<key>@</key>
+	<string>noop:</string>
+	<key>@ </key>
+	<string>cycleToNextInputScript:</string>
+	<key>@.</key>
+	<string>cancelOperation:</string>
+	<key>@^ </key>
+	<string>togglePlatformInputSystem:</string>
+	<key>@~ </key>
+	<string>cycleToNextInputKeyboardLayout:</string>
+	<key>^</key>
+	<string>noop:</string>
+	<key>^</key>
+	<string>insertLineBreak:</string>
+	<key>^	</key>
+	<string>selectNextKeyView:</string>
+	<key>^
+</key>
+	<string>insertLineBreak:</string>
+	<key>^
+</key>
+	<string>insertLineBreak:</string>
+	<key>^</key>
+	<string>selectPreviousKeyView:</string>
+	<key>^"</key>
+	<string>insertDoubleQuoteIgnoringSubstitution:</string>
+	<key>^'</key>
+	<string>insertSingleQuoteIgnoringSubstitution:</string>
+	<key>^A</key>
+	<string>moveToBeginningOfParagraphAndModifySelection:</string>
+	<key>^B</key>
+	<string>moveBackwardAndModifySelection:</string>
+	<key>^E</key>
+	<string>moveToEndOfParagraphAndModifySelection:</string>
+	<key>^F</key>
+	<string>moveForwardAndModifySelection:</string>
+	<key>^N</key>
+	<string>moveDownAndModifySelection:</string>
+	<key>^P</key>
+	<string>moveUpAndModifySelection:</string>
+	<key>^V</key>
+	<string>pageDownAndModifySelection:</string>
+	<key>^a</key>
+	<string>moveToBeginningOfParagraph:</string>
+	<key>^b</key>
+	<string>moveBackward:</string>
+	<key>^d</key>
+	<string>deleteForward:</string>
+	<key>^e</key>
+	<string>moveToEndOfParagraph:</string>
+	<key>^f</key>
+	<string>moveForward:</string>
+	<key>^h</key>
+	<string>deleteBackward:</string>
+	<key>^k</key>
+	<string>deleteToEndOfParagraph:</string>
+	<key>^l</key>
+	<string>centerSelectionInVisibleArea:</string>
+	<key>^n</key>
+	<string>moveDown:</string>
+        <!-- <key>^o</key>
+	<array>
+		<string>insertNewlineIgnoringFieldEditor:</string>
+		<string>moveBackward:</string>
+        </array> -->
+	<key>^p</key>
+	<string>moveUp:</string>
+	<key>^t</key>
+	<string>transpose:</string>
+	<key>^v</key>
+	<string>pageDown:</string>
+	<key>^y</key>
+	<string>yank:</string>
+	<key>^~</key>
+	<string>deleteWordBackward:</string>
+	<key>^</key>
+	<string>deleteBackwardByDecomposingPreviousCharacter:</string>
+	<key>~</key>
+	<string>insertNewlineIgnoringFieldEditor:</string>
+	<key>~</key>
+	<string>deleteWordBackward:</string>
+	<key>~	</key>
+	<string>insertTabIgnoringFieldEditor:</string>
+	<key>~
+</key>
+	<string>insertNewlineIgnoringFieldEditor:</string>
+	<key>~
+</key>
+	<string>insertNewlineIgnoringFieldEditor:</string>
+	<key>~</key>
+	<string>complete:</string>
+	<key>~^B</key>
+	<string>moveWordBackwardAndModifySelection:</string>
+	<key>~^F</key>
+	<string>moveWordForwardAndModifySelection:</string>
+	<key>~^b</key>
+	<string>moveWordBackward:</string>
+	<key>~^f</key>
+	<string>moveWordForward:</string>
+	<key>~</key>
+	<string>deleteWordBackward:</string>
+	<key></key>
+	<string>deleteBackward:</string>
+	<key></key>
+	<string>moveUp:</string>
+	<key></key>
+	<string>moveDown:</string>
+	<key></key>
+	<string>moveLeft:</string>
+	<key></key>
+	<string>moveRight:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>complete:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>deleteForward:</string>
+	<key></key>
+	<string>scrollToBeginningOfDocument:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>scrollToEndOfDocument:</string>
+	<key></key>
+	<string>scrollPageUp:</string>
+	<key></key>
+	<string>scrollPageDown:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key>@</key>
+	<string>moveToBeginningOfDocument:</string>
+	<key>@</key>
+	<string>moveToEndOfDocument:</string>
+	<key>@</key>
+	<string>moveToBeginningOfLine:</string>
+	<key>@</key>
+	<string>moveToEndOfLine:</string>
+	<key>@$</key>
+	<string>moveToBeginningOfDocumentAndModifySelection:</string>
+	<key>@$</key>
+	<string>moveToEndOfDocumentAndModifySelection:</string>
+	<key>@$</key>
+	<string>moveToBeginningOfLineAndModifySelection:</string>
+	<key>@$</key>
+	<string>moveToEndOfLineAndModifySelection:</string>
+	<key>@^</key>
+	<string>changeBaseWritingDirectionToRTL:</string>
+	<key>@^</key>
+	<string>changeBaseWritingDirectionToLTR:</string>
+	<key>@</key>
+	<string>deleteToBeginningOfLine:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key></key>
+	<string>noop:</string>
+	<key>^</key>
+	<string>scrollPageUp:</string>
+	<key>^</key>
+	<string>scrollPageDown:</string>
+	<key>^</key>
+	<string>moveToBeginningOfLine:</string>
+	<key>^</key>
+	<string>moveToEndOfLine:</string>
+	<key>^$</key>
+	<string>moveToBeginningOfLineAndModifySelection:</string>
+	<key>^$</key>
+	<string>moveToEndOfLineAndModifySelection:</string>
+        <!-- <key>~</key>
+	<array>
+		<string>moveBackward:</string>
+		<string>moveToBeginningOfParagraph:</string>
+	</array>
+	<key>~</key>
+	<array>
+		<string>moveForward:</string>
+		<string>moveToEndOfParagraph:</string>
+        </array> -->
+	<key>~</key>
+	<string>moveWordLeft:</string>
+	<key>~</key>
+	<string>moveWordRight:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~$</key>
+	<string>moveParagraphBackwardAndModifySelection:</string>
+	<key>~$</key>
+	<string>moveParagraphForwardAndModifySelection:</string>
+	<key>~$</key>
+	<string>moveWordLeftAndModifySelection:</string>
+	<key>~$</key>
+	<string>moveWordRightAndModifySelection:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>deleteWordForward:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>pageUp:</string>
+	<key>~</key>
+	<string>pageDown:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>
+	<string>noop:</string>
+	<key>~</key>

src/MacVim/MMAppController.h

@@ -28,6 +28,9 @@
     NSMutableArray      *cachedVimControllers;
     int                 preloadPid;
     BOOL                shouldActivateWhenNextWindowOpens;
+    int                 numChildProcesses;
+    NSMutableDictionary *inputQueues;
+    int                 processingFlag;
 
 #if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
     FSEventStreamRef    fsEventStream;

src/MacVim/MMApplication.m

@@ -16,7 +16,7 @@
 #import "MMApplication.h"
 
 // Ctrl-Tab is broken on pre 10.5, so we add a hack to make it work.
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 # import "MMTextView.h"
 # define MM_CTRL_TAB_HACK 1
 #endif

src/MacVim/MMAtsuiTextView.h

@@ -8,6 +8,8 @@
  * See README.txt for an overview of the Vim source code.
  */
 
+#if ENABLE_ATSUI
+
 #import <Cocoa/Cocoa.h>
 #import "MMTextView.h"
 
@@ -68,6 +70,8 @@ enum { MMMaxCellsPerChar = 2 };
 - (void)setPreEditRow:(int)row column:(int)col;
 - (void)setMouseShape:(int)shape;
 - (void)setAntialias:(BOOL)state;
+- (void)setImControl:(BOOL)enable;
+- (void)activateIm:(BOOL)enable;
 - (BOOL)convertPoint:(NSPoint)point toRow:(int *)row column:(int *)column;
 - (NSPoint)pointForRow:(int)row column:(int)col;
 - (NSRect)rectForRow:(int)row column:(int)col numRows:(int)nr
@@ -95,3 +99,5 @@ enum { MMMaxCellsPerChar = 2 };
 - (NSSize)constrainRows:(int *)rows columns:(int *)cols toSize:(NSSize)size;
 
 @end
+
+#endif // ENABLE_ATSUI

src/MacVim/MMAtsuiTextView.m

@@ -25,6 +25,8 @@
  * resized.
  */
 
+#if ENABLE_ATSUI
+
 #import "MMAppController.h"
 #import "MMAtsuiTextView.h"
 #import "MMTextViewHelper.h"
@@ -139,7 +141,7 @@ defaultLineHeightForFont(NSFont *font)
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
     [self disposeAtsuStyles];
     [font release];  font = nil;
@@ -324,6 +326,16 @@ defaultLineHeightForFont(NSFont *font)
     antialias = state;
 }
 
+- (void)setImControl:(BOOL)enable
+{
+    [helper setImControl:enable];
+}
+
+- (void)activateIm:(BOOL)enable
+{
+    [helper activateIm:enable];
+}
+
 - (void)keyDown:(NSEvent *)event
 {
     [helper keyDown:event];
@@ -508,7 +520,8 @@ defaultLineHeightForFont(NSFont *font)
     NSPoint pt = { insetSize.width, insetSize.height };
     [contentImage compositeToPoint:pt operation:NSCompositeCopy];
 
-    if ([self hasMarkedText]) {
+#ifdef INCLUDE_OLD_IM_CODE
+    if ([self hasMarkedText] && ![helper useInlineIm]) {
         int len = [[helper markedText] length];
         int rows = 0;
         int cols = maxColumns - [helper preEditColumn];
@@ -564,6 +577,7 @@ defaultLineHeightForFont(NSFont *font)
                                 shape:MMInsertionPointVertical
                              fraction:25];
     }
+#endif // INCLUDE_OLD_IM_CODE
 }
 
 - (BOOL) wantsDefaultClipping
@@ -583,7 +597,7 @@ defaultLineHeightForFont(NSFont *font)
         [self resizeContentImage];
 
 #if MM_DEBUG_DRAWING
-    NSLog(@"====> BEGIN %s", _cmd);
+    ASLogDebug(@"====> BEGIN %s", _cmd);
 #endif
     [self beginDrawing];
 
@@ -594,7 +608,7 @@ defaultLineHeightForFont(NSFont *font)
 
         if (ClearAllDrawType == type) {
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Clear all");
+            ASLogDebug(@"   Clear all");
 #endif
             [self clearAll];
         } else if (ClearBlockDrawType == type) {
@@ -605,8 +619,8 @@ defaultLineHeightForFont(NSFont *font)
             int col2 = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Clear block (%d,%d) -> (%d,%d)", row1, col1,
-                    row2,col2);
+            ASLogDebug(@"   Clear block (%d,%d) -> (%d,%d)", row1, col1,
+                       row2,col2);
 #endif
             [self clearBlockFromRow:row1 column:col1
                     toRow:row2 column:col2
@@ -620,7 +634,7 @@ defaultLineHeightForFont(NSFont *font)
             int right = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Delete %d line(s) from %d", count, row);
+            ASLogDebug(@"   Delete %d line(s) from %d", count, row);
 #endif
             [self deleteLinesFromRow:row lineCount:count
                     scrollBottom:bot left:left right:right
@@ -642,8 +656,8 @@ defaultLineHeightForFont(NSFont *font)
                            freeWhenDone:NO];
             bytes += len;
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw string at (%d,%d) length=%d flags=%d fg=0x%x "
-                    "bg=0x%x sp=0x%x", row, col, len, flags, fg, bg, sp);
+            ASLogDebug(@"   Draw string at (%d,%d) length=%d flags=%d fg=0x%x "
+                       "bg=0x%x sp=0x%x", row, col, len, flags, fg, bg, sp);
 #endif
             unichar *characters = malloc(sizeof(unichar) * [string length]);
             [string getCharacters:characters];
@@ -667,7 +681,7 @@ defaultLineHeightForFont(NSFont *font)
             int right = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Insert %d line(s) at row %d", count, row);
+            ASLogDebug(@"   Insert %d line(s) at row %d", count, row);
 #endif
             [self insertLinesAtRow:row lineCount:count
                              scrollBottom:bot left:left right:right
@@ -680,7 +694,7 @@ defaultLineHeightForFont(NSFont *font)
             int percent = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw cursor at (%d,%d)", row, col);
+            ASLogDebug(@"   Draw cursor at (%d,%d)", row, col);
 #endif
             [helper setInsertionPointColor:[NSColor colorWithRgbInt:color]];
             [self drawInsertionPointAtRow:row column:col shape:shape
@@ -693,8 +707,8 @@ defaultLineHeightForFont(NSFont *font)
             /*int invert = *((int*)bytes);*/  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw inverted rect: row=%d col=%d nrows=%d ncols=%d",
-                    row, col, nr, nc);
+            ASLogDebug(@"   Draw inverted rect: row=%d col=%d nrows=%d "
+                       "ncols=%d", row, col, nr, nc);
 #endif
             [self drawInvertedRectAtRow:row column:col numRows:nr
                              numColumns:nc];
@@ -704,7 +718,7 @@ defaultLineHeightForFont(NSFont *font)
             /*cursorRow = *((int*)bytes);*/  bytes += sizeof(int);
             /*cursorCol = *((int*)bytes);*/  bytes += sizeof(int);
         } else {
-            NSLog(@"WARNING: Unknown draw type (type=%d)", type);
+            ASLogWarn(@"Unknown draw type (type=%d)", type);
         }
     }
 
@@ -718,7 +732,7 @@ defaultLineHeightForFont(NSFont *font)
         [self display];
 
 #if MM_DEBUG_DRAWING
-    NSLog(@"<==== END   %s", _cmd);
+    ASLogDebug(@"<==== END   %s", _cmd);
 #endif
 }
 
@@ -775,24 +789,7 @@ defaultLineHeightForFont(NSFont *font)
 
 - (void)changeFont:(id)sender
 {
-    NSFont *newFont = [sender convertFont:font];
-
-    if (newFont) {
-        NSString *name = [newFont displayName];
-        unsigned len = [name lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-        if (len > 0) {
-            NSMutableData *data = [NSMutableData data];
-            float pointSize = [newFont pointSize];
-
-            [data appendBytes:&pointSize length:sizeof(float)];
-
-            ++len;  // include NUL byte
-            [data appendBytes:&len length:sizeof(unsigned)];
-            [data appendBytes:[name UTF8String] length:len];
-
-            [[self vimController] sendMessage:SetFontMsgID data:data];
-        }
-    }
+    [helper changeFont:sender];
 }
 
 
@@ -892,10 +889,19 @@ defaultLineHeightForFont(NSFont *font)
     return NSNotFound;
 }
 
+// The return type of this message changed with OS X 10.5 so we need this
+// kludge in order to avoid compiler warnings on OS X 10.4.
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 - (NSInteger)conversationIdentifier
 {
     return (NSInteger)self;
 }
+#else
+- (long)conversationIdentifier
+{
+    return (long)self;
+}
+#endif
 
 - (NSRange)selectedRange
 {
@@ -1035,7 +1041,6 @@ defaultLineHeightForFont(NSFont *font)
 
 - (void)resizeContentImage
 {
-    //NSLog(@"resizeContentImage");
     [contentImage release];
     contentImage = [[NSImage alloc] initWithSize:[self textAreaSize]];
     [contentImage setFlipped:YES];
@@ -1093,8 +1098,6 @@ defaultLineHeightForFont(NSFont *font)
     ATSUSetAttributes(style, sizeof(attribValues) / sizeof(attribValues[0]),
                       attribTags, attribSizes, attribValues);
 
-    // NSLog(@"drawString: %d", length);
-
     ATSUCreateTextLayout(&layout);
     ATSUSetTextPointerLocation(layout, string,
                                kATSUFromTextBeginning, kATSUToTextEnd,
@@ -1107,6 +1110,11 @@ defaultLineHeightForFont(NSFont *font)
         rect.size.width = rect.size.width * 2;
     CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
 
+    // Clip drawing to avoid text bleeding into adjacent display cells when
+    // antialiasing is enabled.
+    CGContextSaveGState(context);
+    CGContextClipToRect(context, *(CGRect*)&rect);
+
     ATSUAttributeTag tags[] = { kATSUCGContextTag };
     ByteCount sizes[] = { sizeof(CGContextRef) };
     ATSUAttributeValuePtr values[] = { &context };
@@ -1130,7 +1138,7 @@ defaultLineHeightForFont(NSFont *font)
 
     if (flags & DRAW_UNDERL)
     {
-        [fg set];
+        [sp set];
         NSRectFill(NSMakeRect(rect.origin.x,
                               (row + 1) * cellSize.height + kUnderlineOffset,
                               rect.size.width, kUnderlineHeight));
@@ -1156,6 +1164,8 @@ defaultLineHeightForFont(NSFont *font)
             i++;
         }
     }
+
+    CGContextRestoreGState(context);
 }
 
 - (void)scrollRect:(NSRect)rect lineCount:(int)count
@@ -1222,8 +1232,6 @@ defaultLineHeightForFont(NSFont *font)
     NSRect rect = NSMakeRect(origin.x, origin.y,
                              cellSize.width, cellSize.height);
 
-    // NSLog(@"shape = %d, fraction: %d", shape, percent);
-
     if (MMInsertionPointHorizontal == shape) {
         int frac = (cellSize.height * percent + 99)/100;
         rect.origin.y += rect.size.height - frac;
@@ -1262,3 +1270,5 @@ defaultLineHeightForFont(NSFont *font)
 }
 
 @end // MMAtsuiTextView (Drawing)
+
+#endif // ENABLE_ATSUI

src/MacVim/MMBackend.h

@@ -21,7 +21,9 @@
     NSMutableArray      *inputQueue;
     NSMutableData       *drawData;
     NSConnection        *connection;
-    id                  frontendProxy;
+    NSConnection        *vimServerConnection;
+    id                  appProxy;
+    unsigned            identifier;
     NSDictionary        *colorDict;
     NSDictionary        *sysColorDict;
     NSDictionary        *actionDict;
@@ -41,12 +43,16 @@
     NSMutableDictionary *clientProxyDict;
     NSMutableDictionary *serverReplyDict;
     NSString            *alternateServerName;
-    ATSFontContainerRef fontContainerRef;
-    NSFont              *oldWideFont;
+    GuiFont             oldWideFont;
     BOOL                isTerminating;
     BOOL                waitForAck;
     int                 initialWindowLayout;
     BOOL                flushDisabled;
+    unsigned            numWholeLineChanges;
+    unsigned            offsetForDrawDataPrune;
+    BOOL                imState;
+    CFSocketRef         netbeansSocket;
+    CFRunLoopSourceRef  netbeansRunLoopSource;
 }
 
 + (MMBackend *)sharedInstance;
@@ -89,14 +95,13 @@
 - (char *)browseForFileWithAttributes:(NSDictionary *)attr;
 - (int)showDialogWithAttributes:(NSDictionary *)attr textField:(char *)txtfield;
 - (void)showToolbar:(int)enable flags:(int)flags;
-- (void)createScrollbarWithIdentifier:(long)ident type:(int)type;
-- (void)destroyScrollbarWithIdentifier:(long)ident;
-- (void)showScrollbarWithIdentifier:(long)ident state:(int)visible;
-- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(long)ident;
+- (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type;
+- (void)destroyScrollbarWithIdentifier:(int32_t)ident;
+- (void)showScrollbarWithIdentifier:(int32_t)ident state:(int)visible;
+- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(int32_t)ident;
 - (void)setScrollbarThumbValue:(long)val size:(long)size max:(long)max
-                    identifier:(long)ident;
-- (void)setFont:(NSFont *)font;
-- (void)setWideFont:(NSFont *)font;
+                    identifier:(int32_t)ident;
+- (void)setFont:(GuiFont)font wide:(BOOL)wide;
 - (void)executeActionWithName:(NSString *)name;
 - (void)setMouseShape:(int)shape;
 - (void)setBlinkWait:(int)wait on:(int)on off:(int)off;
@@ -107,7 +112,7 @@
 - (void)setPreEditRow:(int)row column:(int)col;
 
 - (int)lookupColorWithKey:(NSString *)key;
-- (BOOL)hasSpecialKeyWithValue:(NSString *)value;
+- (BOOL)hasSpecialKeyWithValue:(char_u *)value;
 
 - (void)enterFullscreen:(int)fuoptions background:(int)bg;
 - (void)leaveFullscreen;
@@ -130,6 +135,12 @@
 - (void)setWaitForAck:(BOOL)yn;
 - (void)waitForConnectionAcknowledgement;
 
+- (BOOL)imState;
+- (void)setImState:(BOOL)activated;
+
+- (void)messageFromNetbeans;
+- (void)setNetbeansSocket:(int)socket;
+
 @end
 
 

src/MacVim/MMFullscreenWindow.m

@@ -30,7 +30,7 @@
 #import "MMWindowController.h"
 #import "Miscellaneous.h"
 #import <Carbon/Carbon.h>
-#import <PSMTabBarControl.h>
+#import <PSMTabBarControl/PSMTabBarControl.h>
 
 // These have to be the same as in option.h
 #define FUOPT_MAXVERT         0x001
@@ -38,12 +38,10 @@
 #define FUOPT_BGCOLOR_HLGROUP 0x004
 
 
-static int numFullscreenWindows = 0;
-
 @interface MMFullscreenWindow (Private)
 - (BOOL)isOnPrimaryScreen;
-- (void)hideDockIfAppropriate;
-- (void)revealDockIfAppropriate;
+- (void)handleWindowDidBecomeMainNotification:(NSNotification *)notification;
+- (void)handleWindowDidResignMainNotification:(NSNotification *)notification;
 @end
 
 @implementation MMFullscreenWindow
@@ -79,12 +77,26 @@ static int numFullscreenWindows = 0;
     [self setBackgroundColor:back];
     [self setReleasedWhenClosed:NO];
 
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(handleWindowDidBecomeMainNotification:)
+               name:NSWindowDidBecomeMainNotification
+             object:self];
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(handleWindowDidResignMainNotification:)
+               name:NSWindowDidResignMainNotification
+             object:self];
+
     return self;
 }
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     [target release];  target = nil;
     [view release];  view = nil;
@@ -94,8 +106,6 @@ static int numFullscreenWindows = 0;
 
 - (void)enterFullscreen:(int)fuoptions
 {
-    [self hideDockIfAppropriate];
-
     // fade to black
     Boolean didBlend = NO;
     CGDisplayFadeReservationToken token;
@@ -139,8 +149,10 @@ static int numFullscreenWindows = 0;
 
     int fuRows = currRows, fuColumns = currColumns;
 
+    // NOTE: Do not use [NSScreen visibleFrame] when determining the screen
+    // size since it compensates for menu and dock.
     int maxRows, maxColumns;
-    NSSize size = [[self screen] visibleFrame].size;
+    NSSize size = [[self screen] frame].size;
     [view constrainRows:&maxRows columns:&maxColumns toSize:size];
 
     // Store current pre-fu vim size
@@ -277,8 +289,6 @@ static int numFullscreenWindows = 0;
         CGReleaseDisplayFadeReservation(token);
     }
     
-    [self revealDockIfAppropriate];
-
     [self autorelease]; // Balance the above retain
 }
 
@@ -298,7 +308,6 @@ static int numFullscreenWindows = 0;
 - (void)centerView
 {
     NSRect outer = [self frame], inner = [view frame];
-    //NSLog(@"%s %@%@", _cmd, NSStringFromRect(outer), NSStringFromRect(inner));
  
     NSPoint origin = NSMakePoint((outer.size.width - inner.size.width)/2,
                                  (outer.size.height - inner.size.height)/2);
@@ -347,38 +356,29 @@ static int numFullscreenWindows = 0;
     return [self screen] == [screens objectAtIndex:0];
 }
 
-- (void)hideDockIfAppropriate
+- (void)handleWindowDidBecomeMainNotification:(NSNotification *)notification
 {
     // Hide menu and dock, both appear on demand.
     //
-    // Don't hide the dock if going fullscreen on a non-primary screen. Also,
-    // if there are several fullscreen windows on the primary screen, only
-    // hide dock and friends for the first fullscreen window (and display
-    // them again after the last fullscreen window has been closed).
-    //
     // Another way to deal with several fullscreen windows would be to hide/
-    // reveal the dock each time a fullscreen window gets/loses focus, but
-    // this way it's less distracting.
+    // reveal the dock only when the first fullscreen window is created and
+    // show it again after the last one has been closed, but toggling on each
+    // focus gain/loss works better with Spaces. The downside is that the
+    // menu bar flashes shortly when switching between two fullscreen windows.
 
     // XXX: If you have a fullscreen window on a secondary monitor and unplug
     // the monitor, this will probably not work right.
 
     if ([self isOnPrimaryScreen]) {
-        if (numFullscreenWindows == 0) {
-            SetSystemUIMode(kUIModeAllSuppressed, 0); //requires 10.3
-        }
-        ++numFullscreenWindows;
+        SetSystemUIMode(kUIModeAllSuppressed, 0); //requires 10.3
     }
 }
 
-- (void)revealDockIfAppropriate
+- (void)handleWindowDidResignMainNotification:(NSNotification *)notification
 {
-     // order menu and dock back in
+    // order menu and dock back in
     if ([self isOnPrimaryScreen]) {
-        --numFullscreenWindows;
-        if (numFullscreenWindows == 0) {
-            SetSystemUIMode(kUIModeNormal, 0);
-        }
+        SetSystemUIMode(kUIModeNormal, 0);
     }
 }
 

src/MacVim/MMPlugInManager.m

@@ -50,6 +50,8 @@ static MMPlugInManager *plugInManager = nil;
 
 - (void)dealloc
 {
+    ASLogDebug(@"");
+
     [plugInClasses release]; plugInClasses = nil;
     [super dealloc];
 }
@@ -123,13 +125,13 @@ static MMPlugInManager *plugInManager = nil;
             if(currPrincipalClass && [self plugInClassIsValid:currPrincipalClass]) {
                 if ([currPrincipalClass initializePlugIn:
                     [MMPlugInAppMediator sharedAppMediator]]) {
-                    //NSLog(@"Plug-in initialized: %@", currPath);
+                    ASLogInfo(@"Plug-in initialized: %@", currPath);
                     [plugInClasses addObject:currPrincipalClass];
                 } else {
-                    NSLog(@"Plug-in failed to initialize: %@", currPath);
+                    ASLogErr(@"Plug-in failed to initialize: %@", currPath);
                 }
             } else {
-                NSLog(@"Plug-in did not conform to protocol: %@", currPath);
+                ASLogErr(@"Plug-in did not conform to protocol: %@", currPath);
             }
         }
     }

src/MacVim/MMPreferenceController.m

@@ -40,9 +40,12 @@ static void loadSymbols()
 }
 
 
-static CFStringRef ODBEDITOR = CFSTR("org.slashpunt.edit_in_odbeditor");
-static CFStringRef ODB_BUNDLE_IDENTIFIER = CFSTR("ODBEditorBundleIdentifier");
-static CFStringRef ODB_EDITOR_NAME = CFSTR("ODBEditorName");
+// The compiler on OS X 10.4 balks at using CFSTR() for globals so we get
+// around with this some ugly type casting.
+static CFStringRef ODBEDITOR = (CFStringRef)@"org.slashpunt.edit_in_odbeditor";
+static CFStringRef ODB_BUNDLE_IDENTIFIER =
+                                    (CFStringRef)@"ODBEditorBundleIdentifier";
+static CFStringRef ODB_EDITOR_NAME = (CFStringRef)@"ODBEditorName";
 static NSString *ODBEDITOR_DIR = 
     @"/Library/InputManagers/Edit in ODBEditor";
 static NSString *ODBEDITOR_PATH =
@@ -112,6 +115,8 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
 
 - (void)dealloc
 {
+    ASLogDebug(@"");
+
     [supportedOdbEditors release]; supportedOdbEditors = nil;
     [super dealloc];
 }
@@ -222,7 +227,7 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
     // user changes settings in terminal, the changes are reflected in the
     // dialog)
 
-    NSString *versionString;
+    NSString *versionString = @"";
 
     // Check if ODB path exists before calling isFilePackageAtPath: otherwise
     // an error is output to stderr on Tiger.
@@ -380,7 +385,7 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
             [self setOdbEditorByName:kOdbEditorNameMacVim];
         }
     } else {
-        NSLog(@"Failed to install input manager, error is %d", err);
+        ASLogErr(@"Failed to install input manager, error is %d", err);
     }
     [au release];
 
@@ -399,7 +404,7 @@ NSString *kOdbEditorIdentifierWriteRoom = @"com.hogbaysoftware.WriteRoom";
         initWithCommands:cmd];
     OSStatus err = [au run];
     if (err != errAuthorizationSuccess)
-        NSLog(@"Failed to uninstall input manager, error is %d", err);
+        ASLogErr(@"Failed to uninstall input manager, error is %d", err);
     [au release];
 
     [self updateIntegrationPane];

src/MacVim/MMTextStorage.h

@@ -8,7 +8,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "MacVim.h"
 
 
 #define MM_USE_ROW_CACHE 1
@@ -48,10 +48,8 @@ typedef struct {
 }
 
 - (NSString *)string;
-- (NSDictionary *)attributesAtIndex:(unsigned)index
+- (NSDictionary *)attributesAtIndex:(NSUInteger)index
                      effectiveRange:(NSRangePointer)aRange;
-- (id)attribute:(NSString *)attrib atIndex:(unsigned)index
-        effectiveRange:(NSRangePointer)range;
 - (void)replaceCharactersInRange:(NSRange)aRange
                       withString:(NSString *)aString;
 - (void)setAttributes:(NSDictionary *)attributes range:(NSRange)aRange;
@@ -89,7 +87,7 @@ typedef struct {
 - (NSSize)cellSize;
 - (NSRect)rectForRowsInRange:(NSRange)range;
 - (NSRect)rectForColumnsInRange:(NSRange)range;
-- (unsigned)characterIndexForRow:(int)row column:(int)col;
+- (NSUInteger)characterIndexForRow:(int)row column:(int)col;
 - (BOOL)resizeToFitSize:(NSSize)size;
 - (NSSize)fitToSize:(NSSize)size;
 - (NSSize)fitToSize:(NSSize)size rows:(int *)rows columns:(int *)columns;

src/MacVim/MMTextStorage.m

@@ -84,7 +84,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
 #if MM_USE_ROW_CACHE
     if (rowCache) {
@@ -112,38 +112,23 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     return [attribString string];
 }
 
-- (NSDictionary *)attributesAtIndex:(unsigned)index
+- (NSDictionary *)attributesAtIndex:(NSUInteger)index
                      effectiveRange:(NSRangePointer)range
 {
-    if (index >= [attribString length]) {
-        if (range)
-            *range = NSMakeRange(NSNotFound, 0);
-
-        return [NSDictionary dictionary];
-    }
-
     return [attribString attributesAtIndex:index effectiveRange:range];
 }
 
-- (id)attribute:(NSString *)attrib atIndex:(unsigned)index
-        effectiveRange:(NSRangePointer)range
-{
-    return [attribString attribute:attrib atIndex:index effectiveRange:range];
-}
-
 - (void)replaceCharactersInRange:(NSRange)range
                       withString:(NSString *)string
 {
 #if MM_TS_PARANOIA_LOG
-    NSLog(@"WARNING: calling %s on MMTextStorage is unsupported", _cmd);
+    ASLogWarn(@"Calling %s on MMTextStorage is unsupported", _cmd);
 #endif
     //[attribString replaceCharactersInRange:range withString:string];
 }
 
 - (void)setAttributes:(NSDictionary *)attributes range:(NSRange)range
 {
-    //NSLog(@"%s%@", _cmd, NSStringFromRange(range));
-
     // NOTE!  This method must be implemented since the text system calls it
     // constantly to 'fix attributes', apply font substitution, etc.
 #if 0
@@ -185,7 +170,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
         [attribString setAttributes:newAttr range:range];
     } else {
-        //NSLog(@"NOT fixing font attribute!");
         [attribString setAttributes:attributes range:range];
     }
 #endif
@@ -220,7 +204,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 {
     NSLayoutManager *lm = [[self layoutManagers] objectAtIndex:0];
     if (!lm) {
-        NSLog(@"WARNING: No layout manager available in call to %s", _cmd);
+        ASLogWarn(@"No layout manager available");
         return;
     }
 
@@ -253,9 +237,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
    foregroundColor:(NSColor *)fg backgroundColor:(NSColor *)bg
       specialColor:(NSColor *)sp
 {
-    //NSLog(@"replaceString:atRow:%d column:%d withFlags:%d "
-    //          "foreground:%@ background:%@ special:%@",
-    //          row, col, flags, fg, bg, sp);
     [self lazyResize:NO];
 
     if (row < 0 || row >= maxRows || col < 0 || col >= maxColumns
@@ -278,7 +259,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     NSRange range = [self charRangeForRow:row column:&acol cells:&acells];
     if (NSNotFound == range.location) {
 #if MM_TS_PARANOIA_LOG
-        NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+        ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
         return;
     }
@@ -332,7 +313,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     [attribString replaceCharactersInRange:range withString:string];
     [attribString setAttributes:attributes range:r];
 
-    unsigned changeInLength = [string length] - range.length;
+    NSInteger changeInLength = [string length] - range.length;
     if (acells != cells || acol != col) {
         if (acells == cells + 1) {
             // NOTE: A normal width character replaced a double width
@@ -344,13 +325,11 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
             ++changeInLength;
 #if 0
         } else if (acol == col - 1) {
-            NSLog(@"acol == col - 1");
             [attribString replaceCharactersInRange:NSMakeRange(r.location,0)
                 withAttributedString:[emptyRowString
                     attributedSubstringFromRange:NSMakeRange(0,1)]];
             ++changeInLength;
         } else if (acol == col + 1) {
-            NSLog(@"acol == col + 1");
             [attribString replaceCharactersInRange:NSMakeRange(r.location-1,1)
                 withAttributedString:[emptyRowString
                     attributedSubstringFromRange:NSMakeRange(0,2)]];
@@ -360,8 +339,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
             // NOTE: It seems that this never gets called.  If it ever does,
             // then there is another case to treat.
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"row=%d col=%d acol=%d cells=%d acells=%d", row, col, acol,
-                    cells, acells);
+            ASLogWarn(@"row=%d col=%d acol=%d cells=%d acells=%d", row, col,
+                      acol, cells, acells);
 #endif
         }
     }
@@ -371,6 +350,11 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
     [self fixInvalidCharactersInRange:r];
 
+#if 0
+    ASLogDebug(@"length=%d row=%d col=%d cells=%d replaceRange=%@ change=%d",
+            [string length], row, col, cells,
+            NSStringFromRange(r), changeInLength);
+#endif
     [self edited:(NSTextStorageEditedCharacters|NSTextStorageEditedAttributes)
            range:range changeInLength:changeInLength];
 
@@ -387,7 +371,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
               scrollBottom:(int)bottom left:(int)left right:(int)right
                      color:(NSColor *)color
 {
-    //NSLog(@"deleteLinesFromRow:%d lineCount:%d color:%@", row, count, color);
     [self lazyResize:NO];
 
     if (row < 0 || row+count > maxRows || bottom > maxRows || left < 0
@@ -407,7 +390,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         destRange = [self charRangeForRow:destRow column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
 
         acol = left; acells = width;
@@ -415,13 +398,13 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
                                    cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
 
         if (NSNotFound == destRange.location || NSNotFound == srcRange.location)
         {
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+            ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
             return;
         }
@@ -453,11 +436,11 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         destRange = [self charRangeForRow:destRow column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
         if (NSNotFound == destRange.location) {
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+            ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
             return;
         }
@@ -485,7 +468,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
             scrollBottom:(int)bottom left:(int)left right:(int)right
                    color:(NSColor *)color
 {
-    //NSLog(@"insertLinesAtRow:%d lineCount:%d color:%@", row, count, color);
     [self lazyResize:NO];
 
     if (row < 0 || row+count > maxRows || bottom > maxRows || left < 0
@@ -506,19 +488,19 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         destRange = [self charRangeForRow:destRow column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
 
         acol = left; acells = width;
         srcRange = [self charRangeForRow:srcRow column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
         if (NSNotFound == destRange.location || NSNotFound == srcRange.location)
         {
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+            ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
             return;
         }
@@ -549,11 +531,11 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         destRange = [self charRangeForRow:destRow column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != width || acol != left)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
         if (NSNotFound == destRange.location) {
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+            ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
             return;
         }
@@ -576,8 +558,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 - (void)clearBlockFromRow:(int)row1 column:(int)col1 toRow:(int)row2
                    column:(int)col2 color:(NSColor *)color
 {
-    //NSLog(@"clearBlockFromRow:%d column:%d toRow:%d column:%d color:%@",
-    //        row1, col1, row2, col2, color);
     [self lazyResize:NO];
 
     if (row1 < 0 || row2 >= maxRows || col1 < 0 || col2 > maxColumns)
@@ -598,11 +578,11 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         range = [self charRangeForRow:r column:&acol cells:&acells];
 #if MM_TS_PARANOIA_LOG
         if (acells != cells || acol != col1)
-            NSLog(@"INTERNAL ERROR [%s]", _cmd);
+            ASLogErr(@"INTERNAL ERROR");
 #endif
         if (NSNotFound == range.location) {
 #if MM_TS_PARANOIA_LOG
-            NSLog(@"INTERNAL ERROR [%s] Out of bounds", _cmd);
+            ASLogErr(@"INTERNAL ERROR: Out of bounds");
 #endif
             return;
         }
@@ -624,7 +604,6 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
 - (void)clearAll
 {
-    //NSLog(@"%s", _cmd);
     [self lazyResize:YES];
 }
 
@@ -683,7 +662,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
             cellSize.height = linespace + [lm defaultLineHeightForFont:font];
         } else {
             // Should never happen, set some bogus value for cell height.
-            NSLog(@"WARNING: No layout manager available in call to %s", _cmd);
+            ASLogWarn(@"No layout manager available");
             cellSize.height = linespace + 16.0;
         }
 
@@ -790,7 +769,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
 - (NSRect)rectForRowsInRange:(NSRange)range
 {
-    NSRect rect = { 0, 0, 0, 0 };
+    NSRect rect = { {0, 0}, {0, 0} };
     unsigned start = range.location > maxRows ? maxRows : range.location;
     unsigned length = range.length;
 
@@ -805,7 +784,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
 - (NSRect)rectForColumnsInRange:(NSRange)range
 {
-    NSRect rect = { 0, 0, 0, 0 };
+    NSRect rect = { {0, 0}, {0, 0} };
     unsigned start = range.location > maxColumns ? maxColumns : range.location;
     unsigned length = range.length;
 
@@ -818,7 +797,7 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     return rect;
 }
 
-- (unsigned)characterIndexForRow:(int)row column:(int)col
+- (NSUInteger)characterIndexForRow:(int)row column:(int)col
 {
     int cells = 1;
     NSRange range = [self charRangeForRow:row column:&col cells:&cells];
@@ -1009,15 +988,16 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         return NSMakeRange(row*(actualColumns+1) + col, cells);
 
     NSString *string = [attribString string];
+    unsigned stringLen = [string length];
     NSRange r, range = { NSNotFound, 0 };
-    unsigned idx, rowEnd;
+    unsigned idx;
     int i;
 
     if (row < 0 || row >= actualRows || col < 0 || col >= actualColumns
             || col+cells > actualColumns) {
 #if MM_TS_PARANOIA_LOG
-        NSLog(@"%s row=%d col=%d cells=%d is out of range (length=%d)",
-                _cmd, row, col, cells, [string length]);
+        ASLogErr(@"row=%d col=%d cells=%d is out of range (length=%d)",
+                 row, col, cells, stringLen);
 #endif
         return range;
     }
@@ -1029,12 +1009,12 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     for (i = 0; i < row; ++i, ++cache)
         idx += cache->length;
 
-    rowEnd = idx + cache->length;
+    int rowEnd = idx + cache->length;
 #else
     // Locate the beginning of the row by scanning for EOL characters.
     r.location = 0;
     for (i = 0; i < row; ++i) {
-        r.length = [string length] - r.location;
+        r.length = stringLen - r.location;
         r = [string rangeOfString:@"\n" options:NSLiteralSearch range:r];
         if (NSNotFound == r.location)
             return range;
@@ -1070,6 +1050,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         if (col > i) {
             // Forward search
             while (col > i) {
+                if (idx >= stringLen)
+                    return NSMakeRange(NSNotFound, 0);
                 r = [string rangeOfComposedCharacterSequenceAtIndex:idx];
 
                 // Wide chars take up two display cells.
@@ -1084,6 +1066,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
         } else if (col < i) {
             // Backward search
             while (col < i) {
+                if (idx-1 >= stringLen)
+                    return NSMakeRange(NSNotFound, 0);
                 r = [string rangeOfComposedCharacterSequenceAtIndex:idx-1];
                 idx -= r.length;
                 --i;
@@ -1111,6 +1095,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 
         // Forward search
         while (col > i) {
+            if (idx >= stringLen)
+                return NSMakeRange(NSNotFound, 0);
             r = [string rangeOfComposedCharacterSequenceAtIndex:idx];
 
             // Wide chars take up two display cells.
@@ -1131,6 +1117,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 #else
     idx = r.location;
     for (i = 0; i < col; ++i) {
+        if (idx >= stringLen)
+            return NSMakeRange(NSNotFound, 0);
         r = [string rangeOfComposedCharacterSequenceAtIndex:idx];
 
         // Wide chars take up two display cells.
@@ -1146,6 +1134,8 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
     // Count the number of characters that cover the cells.
     range.location = idx;
     for (i = 0; i < cells; ++i) {
+        if (idx >= stringLen)
+            return NSMakeRange(NSNotFound, 0);
         r = [string rangeOfComposedCharacterSequenceAtIndex:idx];
 
         // Wide chars take up two display cells.
@@ -1163,20 +1153,20 @@ static NSString *MMWideCharacterAttributeName = @"MMWideChar";
 #if MM_TS_PARANOIA_LOG
 #if MM_USE_ROW_CACHE
     if (range.location >= rowEnd-1) {
-        NSLog(@"INTERNAL ERROR [%s] : row=%d col=%d cells=%d --> range=%@",
-                _cmd, row, col, cells, NSStringFromRange(range));
+        ASLogErr(@"INTERNAL ERROR: row=%d col=%d cells=%d --> range=%@",
+                 row, col, cells, NSStringFromRange(range));
         range.location = rowEnd - 2;
         range.length = 1;
     } else if (NSMaxRange(range) >= rowEnd) {
-        NSLog(@"INTERNAL ERROR [%s] : row=%d col=%d cells=%d --> range=%@",
-                _cmd, row, col, cells, NSStringFromRange(range));
+        ASLogErr(@"INTERNAL ERROR: row=%d col=%d cells=%d --> range=%@",
+                 row, col, cells, NSStringFromRange(range));
         range.length = rowEnd - range.location - 1;
     }
 #endif
 
-    if (NSMaxRange(range) > [string length]) {
-        NSLog(@"INTERNAL ERROR [%s] : row=%d col=%d cells=%d --> range=%@",
-                _cmd, row, col, cells, NSStringFromRange(range));
+    if (NSMaxRange(range) > stringLen) {
+        ASLogErr(@"INTERNAL ERROR: row=%d col=%d cells=%d --> range=%@",
+                 row, col, cells, NSStringFromRange(range));
         range.location = NSNotFound;
         range.length = 0;
     }

src/MacVim/MMTextView.h

@@ -32,6 +32,8 @@
 - (void)performBatchDrawWithData:(NSData *)data;
 - (void)setMouseShape:(int)shape;
 - (void)setAntialias:(BOOL)antialias;
+- (void)setImControl:(BOOL)enable;
+- (void)activateIm:(BOOL)enable;
 
 //
 // MMTextStorage methods

src/MacVim/MMTextView.m

@@ -63,10 +63,12 @@
         NSTypesetter *typesetter = [[MMTypesetter alloc] init];
         [lm setTypesetter:typesetter];
         [typesetter release];
+#if MM_USE_ROW_CACHE
     } else if ([typesetterString isEqual:@"MMTypesetter2"]) {
         NSTypesetter *typesetter = [[MMTypesetter2 alloc] init];
         [lm setTypesetter:typesetter];
         [typesetter release];
+#endif // MM_USE_ROW_CACHE
     } else {
         // Only MMTypesetter supports different cell width multipliers.
         [[NSUserDefaults standardUserDefaults]
@@ -110,7 +112,7 @@
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
     if (invertRects) {
         free(invertRects);
@@ -151,7 +153,7 @@
     int cursorRow = -1, cursorCol = 0;
 
 #if MM_DEBUG_DRAWING
-    NSLog(@"====> BEGIN %s", _cmd);
+    ASLogDebug(@"====> BEGIN %s", _cmd);
 #endif
     [textStorage beginEditing];
 
@@ -162,7 +164,7 @@
 
         if (ClearAllDrawType == type) {
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Clear all");
+            ASLogDebug(@"   Clear all");
 #endif
             [textStorage clearAll];
         } else if (ClearBlockDrawType == type) {
@@ -173,8 +175,8 @@
             int col2 = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Clear block (%d,%d) -> (%d,%d)", row1, col1,
-                    row2,col2);
+            ASLogDebug(@"   Clear block (%d,%d) -> (%d,%d)", row1, col1,
+                       row2,col2);
 #endif
             [textStorage clearBlockFromRow:row1 column:col1
                     toRow:row2 column:col2
@@ -188,7 +190,7 @@
             int right = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Delete %d line(s) from %d", count, row);
+            ASLogDebug(@"   Delete %d line(s) from %d", count, row);
 #endif
             [textStorage deleteLinesFromRow:row lineCount:count
                     scrollBottom:bot left:left right:right
@@ -208,9 +210,9 @@
             bytes += len;
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw string at (%d,%d) length=%d flags=%d fg=0x%x "
-                    "bg=0x%x sp=0x%x (%@)", row, col, len, flags, fg, bg, sp,
-                    len > 0 ? [string substringToIndex:1] : @"");
+            ASLogDebug(@"   Draw string at (%d,%d) length=%d flags=%d fg=0x%x "
+                       "bg=0x%x sp=0x%x (%@)", row, col, len, flags, fg, bg, sp,
+                       len > 0 ? [string substringToIndex:1] : @"");
 #endif
             // NOTE: If this is a call to draw the (block) cursor, then cancel
             // any previous request to draw the insertion point, or it might
@@ -235,7 +237,7 @@
             int right = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Insert %d line(s) at row %d", count, row);
+            ASLogDebug(@"   Insert %d line(s) at row %d", count, row);
 #endif
             [textStorage insertLinesAtRow:row lineCount:count
                              scrollBottom:bot left:left right:right
@@ -248,7 +250,7 @@
             int percent = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw cursor at (%d,%d)", row, col);
+            ASLogDebug(@"   Draw cursor at (%d,%d)", row, col);
 #endif
             [helper setInsertionPointColor:[NSColor colorWithRgbInt:color]];
             [self drawInsertionPointAtRow:row column:col shape:shape
@@ -261,8 +263,8 @@
             int invert = *((int*)bytes);  bytes += sizeof(int);
 
 #if MM_DEBUG_DRAWING
-            NSLog(@"   Draw inverted rect: row=%d col=%d nrows=%d ncols=%d",
-                    row, col, nr, nc);
+            ASLogDebug(@"   Draw inverted rect: row=%d col=%d nrows=%d "
+                       "ncols=%d", row, col, nr, nc);
 #endif
             [self drawInvertedRectAtRow:row column:col numRows:nr numColumns:nc
                                  invert:invert];
@@ -270,7 +272,7 @@
             cursorRow = *((int*)bytes);  bytes += sizeof(int);
             cursorCol = *((int*)bytes);  bytes += sizeof(int);
         } else {
-            NSLog(@"WARNING: Unknown draw type (type=%d)", type);
+            ASLogWarn(@"Unknown draw type (type=%d)", type);
         }
     }
 
@@ -291,7 +293,7 @@
         [self display];
 
 #if MM_DEBUG_DRAWING
-    NSLog(@"<==== END   %s", _cmd);
+    ASLogDebug(@"<==== END   %s", _cmd);
 #endif
 }
 
@@ -305,6 +307,16 @@
     antialias = state;
 }
 
+- (void)setImControl:(BOOL)enable
+{
+    [helper setImControl:enable];
+}
+
+- (void)activateIm:(BOOL)enable
+{
+    [helper activateIm:enable];
+}
+
 - (NSFont *)font
 {
     return [(MMTextStorage*)[self textStorage] font];
@@ -444,9 +456,6 @@
     if (row) *row = floor((point.y-origin.y-1) / cellSize.height);
     if (column) *column = floor((point.x-origin.x-1) / cellSize.width);
 
-    //NSLog(@"convertPoint:%@ toRow:%d column:%d", NSStringFromPoint(point),
-    //        *row, *column);
-
     return YES;
 }
 
@@ -513,7 +522,8 @@
         numInvertRects = 0;
     }
 
-    if ([self hasMarkedText]) {
+#ifdef INCLUDE_OLD_IM_CODE
+    if ([self hasMarkedText] && ![helper useInlineIm]) {
         shouldDrawInsertionPoint = YES;
         MMTextStorage *ts = (MMTextStorage*)[self textStorage];
         NSSize inset = [self textContainerInset];
@@ -571,6 +581,7 @@
             }
         }
     }
+#endif // INCLUDE_OLD_IM_CODE
 
     if (shouldDrawInsertionPoint) {
         MMTextStorage *ts = (MMTextStorage*)[self textStorage];
@@ -580,8 +591,9 @@
         ipRect.origin.x += [self textContainerOrigin].x;
         ipRect.origin.y += [self textContainerOrigin].y;
 
+#ifdef INCLUDE_OLD_IM_CODE
         // Draw insertion point inside marked text.
-        if ([self hasMarkedText]) {
+        if ([self hasMarkedText] && ![helper useInlineIm]) {
             NSFont *theFont = [[self markedTextAttributes]
                     valueForKey:NSFontAttributeName];
             if (theFont == [ts font])
@@ -593,6 +605,7 @@
                                    ([helper imRange].location +
                                    [helper imRange].length);
         }
+#endif // INCLUDE_OLD_IM_CODE
 
         if (MMInsertionPointHorizontal == insertionPointShape) {
             int frac = ([ts cellSize].height * insertionPointFraction + 99)/100;
@@ -617,10 +630,6 @@
         // NOTE: We only draw the cursor once and rely on Vim to say when it
         // should be drawn again.
         shouldDrawInsertionPoint = NO;
-
-        //NSLog(@"%s draw insertion point %@ shape=%d color=%@", _cmd,
-        //        NSStringFromRect(ipRect), insertionPointShape,
-        //        [helper insertionPointColor]);
     }
 
 #if 0
@@ -808,28 +817,7 @@
 
 - (void)changeFont:(id)sender
 {
-    MMTextStorage *ts = (MMTextStorage*)[self textStorage];
-    if (!ts) return;
-
-    NSFont *oldFont = [ts font];
-    NSFont *newFont = [sender convertFont:oldFont];
-
-    if (newFont) {
-        NSString *name = [newFont displayName];
-        unsigned len = [name lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-        if (len > 0) {
-            NSMutableData *data = [NSMutableData data];
-            float pointSize = [newFont pointSize];
-
-            [data appendBytes:&pointSize length:sizeof(float)];
-
-            ++len;  // include NUL byte
-            [data appendBytes:&len length:sizeof(unsigned)];
-            [data appendBytes:[name UTF8String] length:len];
-
-            [[self vimController] sendMessage:SetFontMsgID data:data];
-        }
-    }
+    [helper changeFont:sender];
 }
 
 - (void)resetCursorRects
@@ -878,6 +866,14 @@
     [[self windowController] vimMenuItemAction:sender];
 }
 
+- (IBAction)cancelOperation:(id)sender
+{
+    // NSTextView overrides this method to send complete:, whereas NSResponder
+    // sends cancel: by default.  So override it yet again to revert to the
+    // default behavior (we resond to cancel: in MMTextViewHelper).
+    [self doCommandBySelector:@selector(cancel:)];
+}
+
 - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
     if ([item action] == @selector(cut:)
@@ -941,7 +937,7 @@
                                    numColumns:ncols];
             [self setNeedsDisplayInRect:invertRects[n]];
         } else {
-            n = numInvertRects = 0;
+            numInvertRects = 0;
         }
     } else {
         // The result should look normal; all we need to do is to mark

src/MacVim/MMTextViewHelper.h

@@ -10,6 +10,11 @@
 
 #import <Cocoa/Cocoa.h>
 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+// Need Carbon for TIS...() functions
+#import <Carbon/Carbon.h>
+#endif
+
 
 enum {
     // These values are chosen so that the min text view size is not too small
@@ -31,6 +36,8 @@ enum {
     int                 mouseShape;
     NSTrackingRectTag   trackingRectTag;
     NSColor             *insertionPointColor;
+    BOOL                interpretKeyEventsSwallowedKey;
+    NSEvent             *currentEvent;
 
     // Input Manager
     NSRange             imRange;
@@ -39,6 +46,12 @@ enum {
     NSMutableAttributedString  *markedText;
     int                 preEditRow;
     int                 preEditColumn;
+    BOOL                imControl;
+    BOOL                imState;
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+    TISInputSourceRef   lastImSource;
+    TISInputSourceRef   asciiImSource;
+#endif
 }
 
 - (void)setTextView:(id)view;
@@ -63,6 +76,7 @@ enum {
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 - (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
 - (void)setMouseShape:(int)shape;
+- (void)changeFont:(id)sender;
 
 // Input Manager
 - (BOOL)hasMarkedText;
@@ -79,5 +93,8 @@ enum {
 - (NSRange)imRange;
 - (void)setMarkedRange:(NSRange)range;
 - (NSRect)firstRectForCharacterRange:(NSRange)range;
+- (void)setImControl:(BOOL)enable;
+- (void)activateIm:(BOOL)enable;
+- (BOOL)useInlineIm;
 
 @end

src/MacVim/MMTextViewHelper.m

@@ -23,9 +23,6 @@
 #import "Miscellaneous.h"
 
 
-static char MMKeypadEnter[2] = { 'K', 'A' };
-static NSString *MMKeypadEnterString = @"KA";
-
 // The max/min drag timer interval in seconds
 static NSTimeInterval MMDragTimerMaxInterval = 0.3;
 static NSTimeInterval MMDragTimerMinInterval = 0.01;
@@ -37,22 +34,59 @@ static float MMDragAreaSize = 73.0f;
 @interface MMTextViewHelper (Private)
 - (MMWindowController *)windowController;
 - (MMVimController *)vimController;
-- (void)dispatchKeyEvent:(NSEvent *)event;
-- (void)sendKeyDown:(const char *)chars length:(int)len modifiers:(int)flags
-          isARepeat:(BOOL)isARepeat;
+- (void)doKeyDown:(NSString *)key;
+- (void)doInsertText:(NSString *)text;
+- (void)checkImState;
 - (void)hideMouseCursor;
 - (void)startDragTimerWithInterval:(NSTimeInterval)t;
 - (void)dragTimerFired:(NSTimer *)timer;
 - (void)setCursor;
 - (NSRect)trackingRect;
+- (BOOL)inputManagerHandleMouseEvent:(NSEvent *)event;
+- (void)sendMarkedText:(NSString *)text position:(unsigned)pos;
 @end
 
 
+
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    static BOOL
+KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
+{
+    // Define two sources to be equal iff both are non-NULL and they have
+    // identical source ID strings.
+
+    if (!(a && b))
+        return NO;
+
+    NSString *as = TISGetInputSourceProperty(a, kTISPropertyInputSourceID);
+    NSString *bs = TISGetInputSourceProperty(b, kTISPropertyInputSourceID);
+
+    return [as isEqualToString:bs];
+}
+#endif
+
+
 @implementation MMTextViewHelper
 
 - (void)dealloc
 {
+    ASLogDebug(@"");
+
+    [insertionPointColor release];  insertionPointColor = nil;
     [markedText release];  markedText = nil;
+    [markedTextAttributes release];  markedTextAttributes = nil;
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    if (asciiImSource) {
+        CFRelease(asciiImSource);
+        asciiImSource = NULL;
+    }
+    if (lastImSource) {
+        CFRelease(lastImSource);
+        lastImSource = NULL;
+    }
+#endif
 
     [super dealloc];
 }
@@ -78,236 +112,214 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)keyDown:(NSEvent *)event
 {
-    //NSLog(@"%s %@", _cmd, event);
-    // HACK! If control modifier is held, don't pass the event along to
-    // interpretKeyEvents: since some keys are bound to multiple commands which
-    // means doCommandBySelector: is called several times.  Do the same for
-    // Alt+Function key presses (Alt+Up and Alt+Down are bound to two
-    // commands).  This hack may break input management, but unless we can
-    // figure out a way to disable key bindings there seems little else to do.
-    //
-    // TODO: Figure out a way to disable Cocoa key bindings entirely, without
-    // affecting input management.
+    ASLogDebug(@"%@", event);
 
-    // When the Input Method is activated, some special key inputs
-    // should be treated as key inputs for Input Method.
-    if ([textView hasMarkedText]) {
-        [textView interpretKeyEvents:[NSArray arrayWithObject:event]];
+    // NOTE: Check IM state _before_ key has been interpreted or we'll pick up
+    // the old IM state when it has been switched via a keyboard shortcut that
+    // MacVim cannot handle.
+    if (imControl)
+        [self checkImState];
+
+    // NOTE: Keyboard handling is complicated by the fact that we must call
+    // interpretKeyEvents: otherwise key equivalents set up by input methods do
+    // not work (e.g. Ctrl-Shift-; would not work under Kotoeri).
+
+    // NOTE: insertText: and doCommandBySelector: may need to extract data from
+    // the key down event so keep a local reference to the event.  This is
+    // released and set to nil at the end of this method.  Don't make any early
+    // returns from this method without releasing and resetting this reference!
+    currentEvent = [event retain];
+
+    if ([self hasMarkedText]) {
+        // HACK! Need to redisplay manually otherwise the marked text may not
+        // be correctly displayed (e.g. it is still visible after pressing Esc
+        // even though the text has been unmarked).
         [textView setNeedsDisplay:YES];
-        return;
     }
 
-    int flags = [event modifierFlags];
-    if ((flags & NSControlKeyMask) ||
-            ((flags & NSAlternateKeyMask) && (flags & NSFunctionKeyMask))) {
-        NSString *unmod = [event charactersIgnoringModifiers];
-        if ([unmod length] == 1 && [unmod characterAtIndex:0] <= 0x7f
-                                && [unmod characterAtIndex:0] >= 0x60) {
-            // HACK! Send Ctrl-letter keys (and C-@, C-[, C-\, C-], C-^, C-_)
-            // as normal text to be added to the Vim input buffer.  This must
-            // be done in order for the backend to be able to separate e.g.
-            // Ctrl-i and Ctrl-tab.
-            [self insertText:[event characters]];
-        } else {
-            [self dispatchKeyEvent:event];
-        }
-    } else if ((flags & NSAlternateKeyMask) &&
-            [[[[self vimController] vimState] objectForKey:@"p_mmta"]
-                                                                boolValue]) {
-        // If the 'macmeta' option is set, then send Alt+key presses directly
-        // to Vim without interpreting the key press.
-        NSString *unmod = [event charactersIgnoringModifiers];
-        int len = [unmod lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-        const char *bytes = [unmod UTF8String];
+    [self hideMouseCursor];
 
-        [self sendKeyDown:bytes length:len modifiers:flags
-                isARepeat:[event isARepeat]];
+    unsigned flags = [event modifierFlags];
+    id mmta = [[[self vimController] vimState] objectForKey:@"p_mmta"];
+    NSString *string = [event characters];
+    NSString *unmod  = [event charactersIgnoringModifiers];
+
+    // Alt key presses should not be interpreted if the 'macmeta' option is
+    // set.  We still have to call interpretKeyEvents: for keys
+    // like Enter, Esc, etc. to work as usual so only skip interpretation for
+    // ASCII chars in the range after space (0x20) and before backspace (0x7f).
+    // Note that this implies that 'mmta' (if enabled) breaks input methods
+    // when the Alt key is held.
+    if ((flags & NSAlternateKeyMask) && [mmta boolValue] && [unmod length] == 1
+            && [unmod characterAtIndex:0] > 0x20
+            && [unmod characterAtIndex:0] < 0x7f) {
+        ASLogDebug(@"MACMETA key, don't interpret it");
+        string = unmod;
+    } else if (imState && (flags & NSControlKeyMask)
+            && !(flags & (NSAlternateKeyMask|NSCommandKeyMask))
+            && [unmod length] == 1
+            && ([unmod characterAtIndex:0] == '6' ||
+                [unmod characterAtIndex:0] == '^')) {
+        // HACK!  interpretKeyEvents: does not call doCommandBySelector:
+        // with Ctrl-6 or Ctrl-^ when IM is active.
+        [self doKeyDown:@"\x1e"];
+        string = nil;
     } else {
+        // HACK!  interpretKeyEvents: may call insertText: or
+        // doCommandBySelector:, or it may swallow the key (most likely the
+        // current input method used it).  In the first two cases we have to
+        // manually set the below flag to NO if the key wasn't handled.
+        interpretKeyEventsSwallowedKey = YES;
         [textView interpretKeyEvents:[NSArray arrayWithObject:event]];
+        if (interpretKeyEventsSwallowedKey)
+            string = nil;
+        else if (flags & NSCommandKeyMask) {
+            // HACK! When Command is held we have to more or less guess whether
+            // we should use characters or charactersIgnoringModifiers.  The
+            // following heuristic seems to work but it may have to change.
+            // Note that the Shift and Alt flags may also need to be cleared
+            // (see doKeyDown:keyCode:modifiers: in MMBackend).
+            if ((flags & NSShiftKeyMask && !(flags & NSAlternateKeyMask))
+                    || flags & NSControlKeyMask)
+                string = unmod;
+        }
     }
+
+    if (string)
+        [self doKeyDown:string];
+
+    [currentEvent release];
+    currentEvent = nil;
 }
 
 - (void)insertText:(id)string
 {
-    //NSLog(@"%s %@", _cmd, string);
-    // NOTE!  This method is called for normal key presses but also for
-    // Option-key presses --- even when Ctrl is held as well as Option.  When
-    // Ctrl is held, the AppKit translates the character to a Ctrl+key stroke,
-    // so 'string' need not be a printable character!  In this case it still
-    // works to pass 'string' on to Vim as a printable character (since
-    // modifiers are already included and should not be added to the input
-    // buffer using CSI, K_MODIFIER).
+    if ([self hasMarkedText]) {
+        [self sendMarkedText:nil position:0];
 
-    if ([textView hasMarkedText]) {
-        [textView unmarkText];
+        // NOTE: If this call is left out then the marked text isn't properly
+        // erased when Return is used to accept the text.
+        // The input manager only ever sets new marked text, it never actually
+        // calls to have it unmarked.  It seems that whenever insertText: is
+        // called the input manager expects the marked text to be unmarked
+        // automatically, hence the explicit unmarkText: call here.
+        [self unmarkText];
     }
 
-    NSEvent *event = [NSApp currentEvent];
-
-    // HACK!  In order to be able to bind to <S-Space>, <S-M-Tab>, etc. we have
-    // to watch for them here.
-    if ([event type] == NSKeyDown
-            && [[event charactersIgnoringModifiers] length] > 0
-            && [event modifierFlags]
-                & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask)) {
-        unichar c = [[event charactersIgnoringModifiers] characterAtIndex:0];
-
-        // <S-M-Tab> translates to 0x19 
-        if (' ' == c || 0x19 == c) {
-            [self dispatchKeyEvent:event];
-            return;
-        }
-    }
-
-    [self hideMouseCursor];
-
     // NOTE: 'string' is either an NSString or an NSAttributedString.  Since we
     // do not support attributes, simply pass the corresponding NSString in the
     // latter case.
     if ([string isKindOfClass:[NSAttributedString class]])
         string = [string string];
 
-    //NSLog(@"send InsertTextMsgID: %@", string);
+    //int len = [string length];
+    //ASLogDebug(@"len=%d char[0]=%#x char[1]=%#x string='%@'", [string length],
+    //        [string characterAtIndex:0],
+    //        len > 1 ? [string characterAtIndex:1] : 0, string);
 
-    NSMutableData *data = [NSMutableData data];
-    int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-    int flags = [event modifierFlags] & 0xffff0000U;
-    if ([event type] == NSKeyDown && [event isARepeat])
-        flags |= 1;
-
-    [data appendBytes:&flags length:sizeof(int)];
-    [data appendBytes:&len length:sizeof(int)];
-    [data appendBytes:[string UTF8String] length:len];
-
-    [[self vimController] sendMessage:InsertTextMsgID data:data];
+    [self doInsertText:string];
 }
 
-- (void)doCommandBySelector:(SEL)selector
+- (void)doCommandBySelector:(SEL)sel
 {
-    //NSLog(@"%s %@", _cmd, NSStringFromSelector(selector));
-    // By ignoring the selector we effectively disable the key binding
-    // mechanism of Cocoa.  Hopefully this is what the user will expect
-    // (pressing Ctrl+P would otherwise result in moveUp: instead of previous
-    // match, etc.).
+    ASLogDebug(@"%@", NSStringFromSelector(sel));
+
+    // Translate Ctrl-2 -> Ctrl-@ (see also Resources/KeyBinding.plist)
+    if (@selector(keyCtrlAt:) == sel)
+        [self doKeyDown:@"\x00"];
+    // Translate Ctrl-6 -> Ctrl-^ (see also Resources/KeyBinding.plist)
+    else if (@selector(keyCtrlHat:) == sel)
+        [self doKeyDown:@"\x1e"];
     //
-    // We usually end up here if the user pressed Ctrl+key (but not
-    // Ctrl+Option+key).
-
-    NSEvent *event = [NSApp currentEvent];
-
-    if (selector == @selector(cancelOperation:)
-            || selector == @selector(insertNewline:)) {
-        // HACK! If there was marked text which got abandoned as a result of
-        // hitting escape or enter, then 'insertText:' is called with the
-        // abandoned text but '[event characters]' includes the abandoned text
-        // as well.  Since 'dispatchKeyEvent:' looks at '[event characters]' we
-        // must intercept these keys here or the abandonded text gets inserted
-        // twice.
-        NSString *key = [event charactersIgnoringModifiers];
-        const char *chars = [key UTF8String];
-        int len = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-
-        if (0x3 == chars[0]) {
-            // HACK! AppKit turns enter (not return) into Ctrl-C, so we need to
-            // handle it separately (else Ctrl-C doesn't work).
-            len = sizeof(MMKeypadEnter)/sizeof(MMKeypadEnter[0]);
-            chars = MMKeypadEnter;
-        }
-
-        [self sendKeyDown:chars length:len modifiers:[event modifierFlags]
-                isARepeat:[event isARepeat]];
-    } else {
-        [self dispatchKeyEvent:event];
-    }
+    // Check for selectors from AppKit.framework/StandardKeyBinding.dict and
+    // send the corresponding key directly on to the backend.  The reason for
+    // not just letting all of these fall through is that -[NSEvent characters]
+    // sometimes includes marked text as well as the actual key, but the marked
+    // text is also passed to insertText:.  For example, pressing Ctrl-i Return
+    // on a US keyboard would call insertText:@"^" but the key event for the
+    // Return press will contain "^\x0d" -- if we fell through the result would
+    // be that "^^\x0d" got sent to the backend (i.e. one extra "^" would
+    // appear).
+    // For this reason we also have to make sure that there are key bindings to
+    // all combinations of modifier with certain keys (these are set up in
+    // KeyBinding.plist in the Resources folder).
+    else if (@selector(insertTab:) == sel ||
+             @selector(selectNextKeyView:) == sel ||
+             @selector(insertTabIgnoringFieldEditor:) == sel)
+        [self doKeyDown:@"\x09"];
+    else if (@selector(insertNewline:) == sel ||
+             @selector(insertLineBreak:) == sel ||
+             @selector(insertNewlineIgnoringFieldEditor:) == sel)
+        [self doKeyDown:@"\x0d"];
+    else if (@selector(cancelOperation:) == sel ||
+             @selector(complete:) == sel)
+        [self doKeyDown:@"\x1b"];
+    else if (@selector(insertBackTab:) == sel ||
+             @selector(selectPreviousKeyView:) == sel)
+        [self doKeyDown:@"\x19"];
+    else if (@selector(deleteBackward:) == sel ||
+             @selector(deleteWordBackward:) == sel ||
+             @selector(deleteBackwardByDecomposingPreviousCharacter:) == sel ||
+             @selector(deleteToBeginningOfLine:) == sel)
+        [self doKeyDown:@"\x08"];
+    else if (@selector(keySpace:) == sel)
+        [self doKeyDown:@" "];
+    else if (@selector(cancel:) == sel)
+        kill([[self vimController] pid], SIGINT);
+    else interpretKeyEventsSwallowedKey = NO;
 }
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event
 {
-    //NSLog(@"%s %@", _cmd, event);
-    // Called for Cmd+key keystrokes, function keys, arrow keys, page
-    // up/down, home, end.
-    //
-    // NOTE: This message cannot be ignored since Cmd+letter keys never are
-    // passed to keyDown:.  It seems as if the main menu consumes Cmd-key
-    // strokes, unless the key is a function key.
-
-    // NOTE: If the event that triggered this method represents a function key
-    // down then we do nothing, otherwise the input method never gets the key
-    // stroke (some input methods use e.g. arrow keys).  The function key down
-    // event will still reach Vim though (via keyDown:).  The exceptions to
-    // this rule are: PageUp/PageDown (keycode 116/121).
-    int flags = [event modifierFlags] & 0xffff0000U;
-    if ([event type] != NSKeyDown || flags & NSFunctionKeyMask
-            && !(116 == [event keyCode] || 121 == [event keyCode]))
+    ASLogDebug(@"");
+    if ([event type] != NSKeyDown)
         return NO;
 
-    // HACK!  KeyCode 50 represent the key which switches between windows
+    // NOTE: Key equivalent handling was fixed in Leopard.  That is, an
+    // unhandled key equivalent is passed to keyDown: -- contrast this with
+    // pre-Leopard where unhandled key equivalents would simply disappear
+    // (hence the ugly hack below for Tiger).
+    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4)
+        return NO;
+
+    // HACK! KeyCode 50 represent the key which switches between windows
     // within an application (like Cmd+Tab is used to switch between
     // applications).  Return NO here, else the window switching does not work.
     if ([event keyCode] == 50)
         return NO;
 
-    // HACK!  Let the main menu try to handle any key down event, before
+    // HACK! The -[NSRespoder cancelOperation:] indicates that Cmd-. is handled
+    // in a special way by the key window.  Indeed, if we pass this event on to
+    // keyDown: it will result in doCommandBySelector: being called with
+    // cancelOperation: as selector, otherwise it is called with cancel: as the
+    // selector (and we respond to cancel: there).
+    int flags = [event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
+    NSString *unmod = [event charactersIgnoringModifiers];
+    if (flags == NSCommandKeyMask && [unmod isEqual:@"."])
+        return NO;
+
+    // HACK! Let the main menu try to handle any key down event, before
     // passing it on to vim, otherwise key equivalents for menus will
     // effectively be disabled.
     if ([[NSApp mainMenu] performKeyEquivalent:event])
         return YES;
 
-    // HACK!  On Leopard Ctrl-key events end up here instead of keyDown:.
-    if (flags & NSControlKeyMask) {
-        [self keyDown:event];
-        return YES;
-    }
-
-    // HACK!  Don't handle Cmd-? or the "Help" menu does not work on Leopard.
-    NSString *unmodchars = [event charactersIgnoringModifiers];
-    if ([unmodchars isEqual:@"?"])
-        return NO;
-
-    // Cmd-. is hard-wired to send an interrupt (like Ctrl-C).
-    if ((flags & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask &&
-            [unmodchars isEqual:@"."]) {
-        [[self vimController] sendMessage:InterruptMsgID data:nil];
-        return YES;
-    }
-
-    //NSLog(@"%s%@", _cmd, event);
-
-    NSString *chars = [event characters];
-    int len = [unmodchars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-    NSMutableData *data = [NSMutableData data];
-
-    if (len <= 0)
-        return NO;
-
-    // If 'chars' and 'unmodchars' differs when shift flag is present, then we
-    // can clear the shift flag as it is already included in 'unmodchars'.
-    // Failing to clear the shift flag means <D-Bar> turns into <S-D-Bar> (on
-    // an English keyboard).
-    if (flags & NSShiftKeyMask && ![chars isEqual:unmodchars])
-        flags &= ~NSShiftKeyMask;
-
-    if (0x3 == [unmodchars characterAtIndex:0]) {
-        // HACK! AppKit turns enter (not return) into Ctrl-C, so we need to
-        // handle it separately (else Cmd-enter turns into Ctrl-C).
-        unmodchars = MMKeypadEnterString;
-        len = [unmodchars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-    }
-
-    if ([event isARepeat])
-        flags |= 1;
-
-    [data appendBytes:&flags length:sizeof(int)];
-    [data appendBytes:&len length:sizeof(int)];
-    [data appendBytes:[unmodchars UTF8String] length:len];
-
-    [[self vimController] sendMessage:CmdKeyMsgID data:data];
-
+    // HACK! Pass the event on or it may disappear (Tiger does not pass Cmd-key
+    // events to keyDown:).
+    [self keyDown:event];
     return YES;
 }
 
 - (void)scrollWheel:(NSEvent *)event
 {
+    if ([self hasMarkedText]) {
+        // We must clear the marked text since the cursor may move if the
+        // marked text moves outside the view as a result of scrolling.
+        [self sendMarkedText:nil position:0];
+        [self unmarkText];
+        [[NSInputManager currentInputManager] markedTextAbandoned:self];
+    }
+
     if ([event deltaY] == 0)
         return;
 
@@ -329,6 +341,9 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)mouseDown:(NSEvent *)event
 {
+    if ([self inputManagerHandleMouseEvent:event])
+        return;
+
     int row, col;
     NSPoint pt = [textView convertPoint:[event locationInWindow] fromView:nil];
     if (![textView convertPoint:pt toRow:&row column:&col])
@@ -361,6 +376,9 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)mouseUp:(NSEvent *)event
 {
+    if ([self inputManagerHandleMouseEvent:event])
+        return;
+
     int row, col;
     NSPoint pt = [textView convertPoint:[event locationInWindow] fromView:nil];
     if (![textView convertPoint:pt toRow:&row column:&col])
@@ -380,6 +398,9 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)mouseDragged:(NSEvent *)event
 {
+    if ([self inputManagerHandleMouseEvent:event])
+        return;
+
     int flags = [event modifierFlags];
     int row, col;
     NSPoint pt = [textView convertPoint:[event locationInWindow] fromView:nil];
@@ -410,6 +431,9 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)mouseMoved:(NSEvent *)event
 {
+    if ([self inputManagerHandleMouseEvent:event])
+        return;
+
     // HACK! NSTextView has a nasty habit of resetting the cursor to the
     // default I-beam cursor at random moments.  The only reliable way we know
     // of to work around this is to set the cursor each time the mouse moves.
@@ -433,15 +457,11 @@ static float MMDragAreaSize = 73.0f;
         [data appendBytes:&col length:sizeof(int)];
 
         [[self vimController] sendMessage:MouseMovedMsgID data:data];
-
-        //NSLog(@"Moved %d %d\n", col, row);
     }
 }
 
 - (void)mouseEntered:(NSEvent *)event
 {
-    //NSLog(@"%s", _cmd);
-
     // NOTE: This event is received even when the window is not key; thus we
     // have to take care not to enable mouse moved events unless our window is
     // key.
@@ -452,8 +472,6 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)mouseExited:(NSEvent *)event
 {
-    //NSLog(@"%s", _cmd);
-
     [[textView window] setAcceptsMouseMovedEvents:NO];
 
     // NOTE: This event is received even when the window is not key; if the
@@ -469,8 +487,6 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)setFrame:(NSRect)frame
 {
-    //NSLog(@"%s", _cmd);
-
     // When the frame changes we also need to update the tracking rect.
     [textView removeTrackingRect:trackingRectTag];
     trackingRectTag = [textView addTrackingRect:[self trackingRect]
@@ -481,8 +497,6 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)viewDidMoveToWindow
 {
-    //NSLog(@"%s (window=%@)", _cmd, [self window]);
-
     // Set a tracking rect which covers the text.
     // NOTE: While the mouse cursor is in this rect the view will receive
     // 'mouseMoved:' events so that Vim can take care of updating the mouse
@@ -498,8 +512,6 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
-    //NSLog(@"%s%@", _cmd, newWindow);
-
     // Remove tracking rect if view moves or is removed.
     if ([textView window] && trackingRectTag) {
         [textView removeTrackingRect:trackingRectTag];
@@ -560,6 +572,40 @@ static float MMDragAreaSize = 73.0f;
     [self setCursor];
 }
 
+- (void)changeFont:(id)sender
+{
+    NSFont *newFont = [sender convertFont:[textView font]];
+    NSFont *newFontWide = [sender convertFont:[textView fontWide]];
+
+    if (newFont) {
+        NSString *name = [newFont displayName];
+        NSString *wideName = [newFontWide displayName];
+        unsigned len = [name lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+        unsigned wideLen = [wideName lengthOfBytesUsingEncoding:
+                                                        NSUTF8StringEncoding];
+        if (len > 0) {
+            NSMutableData *data = [NSMutableData data];
+            float pointSize = [newFont pointSize];
+
+            [data appendBytes:&pointSize length:sizeof(float)];
+
+            ++len;  // include NUL byte
+            [data appendBytes:&len length:sizeof(unsigned)];
+            [data appendBytes:[name UTF8String] length:len];
+
+            if (wideLen > 0) {
+                ++wideLen;  // include NUL byte
+                [data appendBytes:&wideLen length:sizeof(unsigned)];
+                [data appendBytes:[wideName UTF8String] length:wideLen];
+            } else {
+                [data appendBytes:&wideLen length:sizeof(unsigned)];
+            }
+
+            [[self vimController] sendMessage:SetFontMsgID data:data];
+        }
+    }
+}
+
 - (BOOL)hasMarkedText
 {
     return markedRange.length > 0 ? YES : NO;
@@ -580,6 +626,7 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)setMarkedTextAttributes:(NSDictionary *)attr
 {
+    ASLogDebug(@"%@", attr);
     if (attr != markedTextAttributes) {
         [markedTextAttributes release];
         markedTextAttributes = [attr retain];
@@ -588,8 +635,23 @@ static float MMDragAreaSize = 73.0f;
 
 - (void)setMarkedText:(id)text selectedRange:(NSRange)range
 {
+    ASLogDebug(@"text='%@' range=%@", text, NSStringFromRange(range));
     [self unmarkText];
 
+    if ([self useInlineIm]) {
+        if ([text isKindOfClass:[NSAttributedString class]])
+            text = [text string];
+
+        if ([text length] > 0) {
+            markedRange = NSMakeRange(0, [text length]);
+            imRange = range;
+        }
+
+        [self sendMarkedText:text position:range.location];
+        return;
+    }
+
+#ifdef INCLUDE_OLD_IM_CODE
     if (!(text && [text length] > 0))
         return;
 
@@ -629,10 +691,12 @@ static float MMDragAreaSize = 73.0f;
     }
 
     [textView setNeedsDisplay:YES];
+#endif // INCLUDE_OLD_IM_CODE
 }
 
 - (void)unmarkText
 {
+    ASLogDebug(@"");
     imRange = NSMakeRange(0, 0);
     markedRange = NSMakeRange(NSNotFound, 0);
     [markedText release];
@@ -712,6 +776,82 @@ static float MMDragAreaSize = 73.0f;
     return rect;
 }
 
+- (void)setImControl:(BOOL)enable
+{
+    // This flag corresponds to the (negation of the) 'imd' option.  When
+    // enabled changes to the input method are detected and forwarded to the
+    // backend.  On >=10.5 and later we do not forward changes to the input
+    // method, instead we let Vim be in complete control.
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    // The TIS symbols are weakly linked.
+    if (NULL != TISCopyCurrentKeyboardInputSource) {
+        // We get here when compiled on >=10.5 and running on >=10.5.
+
+        if (asciiImSource) {
+            CFRelease(asciiImSource);
+            asciiImSource = NULL;
+        }
+        if (lastImSource) {
+            CFRelease(lastImSource);
+            lastImSource = NULL;
+        }
+        if (enable) {
+            // Save current locale input source for use when IM is active and
+            // get an ASCII source for use when IM is deactivated (by Vim).
+            asciiImSource = TISCopyCurrentASCIICapableKeyboardInputSource();
+            NSString *locale = [[NSLocale currentLocale] localeIdentifier];
+            lastImSource = TISCopyInputSourceForLanguage((CFStringRef)locale);
+        }
+    }
+#endif
+
+    imControl = enable;
+    ASLogInfo(@"IM control %sabled", enable ? "en" : "dis");
+}
+
+- (void)activateIm:(BOOL)enable
+{
+    ASLogInfo(@"Activate IM=%d", enable);
+    imState = enable;
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    // The TIS symbols are weakly linked.
+    if (NULL != TISCopyCurrentKeyboardInputSource) {
+        // We get here when compiled on >=10.5 and running on >=10.5.
+
+        // Enable IM: switch back to input source used when IM was last on
+        // Disable IM: switch back to ASCII input source (set in setImControl:)
+        TISInputSourceRef ref = enable ? lastImSource : asciiImSource;
+        if (ref) {
+            ASLogDebug(@"Change input source: %@",
+                    TISGetInputSourceProperty(ref, kTISPropertyInputSourceID));
+            TISSelectInputSource(ref);
+        }
+
+        return;
+    }
+
+    // We get here when compiled on >=10.5 but running on 10.4 -- fall through
+    // and use old IM code...
+#endif
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
+    // NOTE: The IM code is delegated to the frontend since calling it in
+    // the backend caused weird bugs (second dock icon appearing etc.).
+    KeyScript(enable ? smKeySysScript : smKeyRoman);
+#endif
+}
+
+- (BOOL)useInlineIm
+{
+#ifdef INCLUDE_OLD_IM_CODE
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    return [ud boolForKey:MMUseInlineImKey];
+#else
+    return YES;
+#endif // INCLUDE_OLD_IM_CODE
+}
+
 @end // MMTextViewHelper
 
 
@@ -732,72 +872,115 @@ static float MMDragAreaSize = 73.0f;
     return [[self windowController] vimController];
 }
 
-- (void)dispatchKeyEvent:(NSEvent *)event
+- (void)doKeyDown:(NSString *)key
 {
-    // Only handle the command if it came from a keyDown event
-    if ([event type] != NSKeyDown)
+    if (!currentEvent) {
+        ASLogDebug(@"No current event; ignore key");
         return;
-
-    NSString *chars = [event characters];
-    NSString *unmodchars = [event charactersIgnoringModifiers];
-    unichar c = [chars characterAtIndex:0];
-    unichar imc = [unmodchars characterAtIndex:0];
-    int len = 0;
-    const char *bytes = 0;
-    int mods = [event modifierFlags];
-
-    //NSLog(@"%s chars[0]=0x%x unmodchars[0]=0x%x (chars=%@ unmodchars=%@)",
-    //        _cmd, c, imc, chars, unmodchars);
-
-    if (' ' == imc && 0xa0 != c) {
-        // HACK!  The AppKit turns <C-Space> into <C-@> which is not standard
-        // Vim behaviour, so bypass this problem.  (0xa0 is <M-Space>, which
-        // should be passed on as is.)
-        len = [unmodchars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-        bytes = [unmodchars UTF8String];
-    } else if (imc == c && '2' == c) {
-        // HACK!  Translate Ctrl+2 to <C-@>.
-        static char ctrl_at = 0;
-        len = 1;  bytes = &ctrl_at;
-    } else if (imc == c && '6' == c) {
-        // HACK!  Translate Ctrl+6 to <C-^>.
-        static char ctrl_hat = 0x1e;
-        len = 1;  bytes = &ctrl_hat;
-    } else if (c == 0x19 && imc == 0x19) {
-        // HACK! AppKit turns back tab into Ctrl-Y, so we need to handle it
-        // separately (else Ctrl-Y doesn't work).
-        static char tab = 0x9;
-        len = 1;  bytes = &tab;  mods |= NSShiftKeyMask;
-    } else {
-        len = [chars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-        bytes = [chars UTF8String];
     }
 
-    [self sendKeyDown:bytes length:len modifiers:mods
-            isARepeat:[event isARepeat]];
+    const char *chars = [key UTF8String];
+    unsigned length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    unsigned keyCode = [currentEvent keyCode];
+    unsigned flags = [currentEvent modifierFlags];
+
+    // The low 16 bits are not used for modifier flags by NSEvent.  Use
+    // these bits for custom flags.
+    flags &= NSDeviceIndependentModifierFlagsMask;
+    if ([currentEvent isARepeat])
+        flags |= 1;
+
+    NSMutableData *data = [NSMutableData data];
+    [data appendBytes:&flags length:sizeof(unsigned)];
+    [data appendBytes:&keyCode length:sizeof(unsigned)];
+    [data appendBytes:&length length:sizeof(unsigned)];
+    if (length > 0)
+        [data appendBytes:chars length:length];
+
+    [[self vimController] sendMessage:KeyDownMsgID data:data];
 }
 
-- (void)sendKeyDown:(const char *)chars length:(int)len modifiers:(int)flags
-          isARepeat:(BOOL)isARepeat
+- (void)doInsertText:(NSString *)text
 {
-    if (chars && len > 0) {
-        NSMutableData *data = [NSMutableData data];
+    unsigned length = [text lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    if (0 == length)
+        return;
 
-        // The low 16 bits are not used for modifier flags by NSEvent.  Use
-        // these bits for custom flags.
-        flags &= 0xffff0000;
-        if (isARepeat)
+    const char *chars = [text UTF8String];
+    unsigned keyCode = 0;
+    unsigned flags = 0;
+
+    // HACK! insertText: can be called from outside a keyDown: event in which
+    // case currentEvent is nil.  This happens e.g. when the "Special
+    // Characters" palette is used to insert text.  In this situation we assume
+    // that the key is not a repeat (if there was a palette that did auto
+    // repeat of input we might have to rethink this).
+    if (currentEvent) {
+        // HACK! Keys on the numeric key pad are treated as special keys by Vim
+        // so we need to pass on key code and modifier flags in this situation.
+        unsigned mods = [currentEvent modifierFlags];
+        if (mods & NSNumericPadKeyMask) {
+            flags = mods & NSDeviceIndependentModifierFlagsMask;
+            keyCode = [currentEvent keyCode];
+        }
+
+        if ([currentEvent isARepeat])
             flags |= 1;
-
-        [data appendBytes:&flags length:sizeof(int)];
-        [data appendBytes:&len length:sizeof(int)];
-        [data appendBytes:chars length:len];
-
-        [self hideMouseCursor];
-
-        //NSLog(@"%s len=%d chars=0x%x", _cmd, len, chars[0]);
-        [[self vimController] sendMessage:KeyDownMsgID data:data];
     }
+
+    NSMutableData *data = [NSMutableData data];
+    [data appendBytes:&flags length:sizeof(unsigned)];
+    [data appendBytes:&keyCode length:sizeof(unsigned)];
+    [data appendBytes:&length length:sizeof(unsigned)];
+    [data appendBytes:chars length:length];
+
+    [[self vimController] sendMessage:KeyDownMsgID data:data];
+}
+
+- (void)checkImState
+{
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    if (NULL != TISCopyCurrentKeyboardInputSource) {
+        // We get here when compiled on >=10.5 and running on >=10.5.
+        TISInputSourceRef cur = TISCopyCurrentKeyboardInputSource();
+        BOOL state = !KeyboardInputSourcesEqual(asciiImSource, cur);
+        BOOL isChanged = !KeyboardInputSourcesEqual(lastImSource, cur);
+        if (state && isChanged) {
+            // Remember current input source so we can switch back to it
+            // when IM is once more enabled.
+            ASLogDebug(@"Remember last input source: %@",
+                TISGetInputSourceProperty(cur, kTISPropertyInputSourceID));
+            if (lastImSource) CFRelease(lastImSource);
+            lastImSource = cur;
+        } else {
+            CFRelease(cur);
+        }
+        if (imState != state) {
+            imState = state;
+            int msgid = state ? ActivatedImMsgID : DeactivatedImMsgID;
+            [[self vimController] sendMessage:msgid data:nil];
+        }
+        return;
+    }
+#endif
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
+    // Compiled for <=10.4, running on 10.4
+
+    // IM is active whenever the current script is the system script and the
+    // system script isn't roman.  (Hence IM can only be active when using
+    // non-roman scripts.)
+
+    // NOTE: The IM code is delegated to the frontend since calling it in the
+    // backend caused weird bugs (second dock icon appearing etc.).
+    SInt32 currentScript = GetScriptManagerVariable(smKeyScript);
+    SInt32 systemScript = GetScriptManagerVariable(smSysScript);
+    BOOL state = currentScript != smRoman && currentScript == systemScript;
+    if (imState != state) {
+        imState = state;
+        int msgid = state ? ActivatedImMsgID : DeactivatedImMsgID;
+        [[self vimController] sendMessage:msgid data:nil];
+    }
+#endif
 }
 
 - (void)hideMouseCursor
@@ -876,7 +1059,7 @@ static float MMDragAreaSize = 73.0f;
                     initWithImage:ibeamImage hotSpot:hotSpot];
         }
         if (!customIbeamCursor) {
-            NSLog(@"WARNING: Failed to load custom Ibeam cursor");
+            ASLogWarn(@"Failed to load custom Ibeam cursor");
             customIbeamCursor = [NSCursor IBeamCursor];
         }
     }
@@ -917,4 +1100,37 @@ static float MMDragAreaSize = 73.0f;
     return rect;
 }
 
+- (BOOL)inputManagerHandleMouseEvent:(NSEvent *)event
+{
+    // NOTE: The input manager usually handles events like mouse clicks (e.g.
+    // the Kotoeri manager "commits" the text on left clicks).
+
+    if (event) {
+        NSInputManager *imgr = [NSInputManager currentInputManager];
+        if ([imgr wantsToHandleMouseEvents])
+            return [imgr handleMouseEvent:event];
+    }
+
+    return NO;
+}
+
+- (void)sendMarkedText:(NSString *)text position:(unsigned)pos
+{
+    if (![self useInlineIm])
+        return;
+
+    NSMutableData *data = [NSMutableData data];
+    unsigned len = text == nil ? 0
+                    : [text lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+
+    [data appendBytes:&pos length:sizeof(unsigned)];
+    [data appendBytes:&len length:sizeof(unsigned)];
+    if (len > 0) {
+        [data appendBytes:[text UTF8String] length:len];
+        [data appendBytes:"\x00" length:1];
+    }
+
+    [[self vimController] sendMessage:SetMarkedTextMsgID data:data];
+}
+
 @end // MMTextViewHelper (Private)

src/MacVim/MMTypesetter.m

@@ -26,7 +26,7 @@
 - (void)willSetLineFragmentRect:(NSRectPointer)lineRect
                   forGlyphRange:(NSRange)glyphRange
                        usedRect:(NSRectPointer)usedRect
-                 baselineOffset:(float *)baselineOffset
+                 baselineOffset:(CGFloat *)baselineOffset
 {
     MMTextStorage *ts = (MMTextStorage*)[[self layoutManager] textStorage];
     float h = [ts cellSize].height;
@@ -60,7 +60,6 @@
 - (NSTypesetterControlCharacterAction)
     actionForControlCharacterAtIndex:(unsigned)charIndex
 {
-    //NSLog(@"%s%d", _cmd, charIndex);
     /*NSTextStorage *ts = [[self layoutManager] textStorage];
 
     if ('\n' == [[ts string] characterAtIndex:charIndex])
@@ -75,9 +74,9 @@
         withAdvancements:(const float *)advancements
     forStartOfGlyphRange:(NSRange)glyphRange
 {
-    NSLog(@"setLocation:%@ withAdvancements:%f forStartOfGlyphRange:%@",
-            NSStringFromPoint(location), advancements ? *advancements : 0,
-            NSStringFromRange(glyphRange));
+    ASLogDebug(@"setLocation:%@ withAdvancements:%f forStartOfGlyphRange:%@",
+               NSStringFromPoint(location), advancements ? *advancements : 0,
+               NSStringFromRange(glyphRange));
     [super setLocation:location withAdvancements:advancements
             forStartOfGlyphRange:glyphRange];
 }
@@ -89,6 +88,8 @@
 
 
 
+#if MM_USE_ROW_CACHE
+
 @implementation MMTypesetter2
 
 //
@@ -102,9 +103,9 @@
 // height and that EOL glyphs are hidden.
 //
 - (void)layoutGlyphsInLayoutManager:(NSLayoutManager *)lm
-               startingAtGlyphIndex:(unsigned)startGlyphIdx
-           maxNumberOfLineFragments:(unsigned)maxNumLines
-                     nextGlyphIndex:(unsigned *)nextGlyph
+               startingAtGlyphIndex:(NSUInteger)startGlyphIdx
+           maxNumberOfLineFragments:(NSUInteger)maxNumLines
+                     nextGlyphIndex:(NSUInteger *)nextGlyph
 {
     // TODO: Check that it really is an MMTextStorage?
     MMTextStorage *ts = (MMTextStorage*)[lm textStorage];
@@ -159,8 +160,8 @@
 
     NSRange lineRange = { lineIdx, 0 };
     NSRange glyphRange = { startGlyphIdx, 0 };
-    NSRect lineRect = { 0, line*cellSize.height,
-            [ts actualColumns]*cellSize.width, cellSize.height };
+    NSRect lineRect = { {0, line*cellSize.height},
+                        {[ts actualColumns]*cellSize.width, cellSize.height} };
     int endLine = line + maxNumLines;
     if (endLine > actualRows)
         endLine = actualRows;
@@ -188,3 +189,5 @@
 
 @end // MMTypesetter2
 
+#endif // MM_USE_ROW_CACHE
+

src/MacVim/MMVimController.h

@@ -8,7 +8,6 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
 #import "MacVim.h"
 
 #ifdef MM_ENABLE_PLUGINS
@@ -20,14 +19,16 @@
 
 
 
-@interface MMVimController : NSObject <MMFrontendProtocol>
+@interface MMVimController : NSObject
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+    // 10.6 has turned delegate messages into formal protocols
+    <NSToolbarDelegate, NSOpenSavePanelDelegate>
+#endif
 {
+    unsigned            identifier;
     BOOL                isInitialized;
     MMWindowController  *windowController;
     id                  backendProxy;
-    BOOL                inProcessCommandQueue;
-    NSMutableArray      *sendQueue;
-    NSMutableArray      *receiveQueue;
     NSMenu              *mainMenu;
     NSMutableArray      *popupMenuItems;
     NSToolbar           *toolbar;
@@ -43,12 +44,14 @@
 }
 
 - (id)initWithBackend:(id)backend pid:(int)processIdentifier;
+- (unsigned)vimControllerId;
 - (id)backendProxy;
 - (int)pid;
 - (void)setServerName:(NSString *)name;
 - (NSString *)serverName;
 - (MMWindowController *)windowController;
 - (NSDictionary *)vimState;
+- (id)objectForVimStateKey:(NSString *)key;
 - (NSMenu *)mainMenu;
 - (BOOL)isPreloading;
 - (void)setIsPreloading:(BOOL)yn;
@@ -64,7 +67,9 @@
                timeout:(NSTimeInterval)timeout;
 - (void)addVimInput:(NSString *)string;
 - (NSString *)evaluateVimExpression:(NSString *)expr;
-- (id)evaluateVimExpressionCocoa:(NSString *)expr errorString:(NSString **)errstr;
+- (id)evaluateVimExpressionCocoa:(NSString *)expr
+                     errorString:(NSString **)errstr;
+- (void)processInputQueue:(NSArray *)queue;
 #ifdef MM_ENABLE_PLUGINS
 - (MMPlugInInstanceMediator *)instanceMediator;
 #endif

src/MacVim/MMVimView.h

@@ -43,12 +43,12 @@
 - (void)selectTabWithIndex:(int)idx;
 - (NSTabViewItem *)addNewTabViewItem;
 
-- (void)createScrollbarWithIdentifier:(long)ident type:(int)type;
-- (BOOL)destroyScrollbarWithIdentifier:(long)ident;
-- (BOOL)showScrollbarWithIdentifier:(long)ident state:(BOOL)visible;
+- (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type;
+- (BOOL)destroyScrollbarWithIdentifier:(int32_t)ident;
+- (BOOL)showScrollbarWithIdentifier:(int32_t)ident state:(BOOL)visible;
 - (void)setScrollbarThumbValue:(float)val proportion:(float)prop
-                    identifier:(long)ident;
-- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(long)ident;
+                    identifier:(int32_t)ident;
+- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(int32_t)ident;
 
 - (void)setDefaultColorsBackground:(NSColor *)back foreground:(NSColor *)fore;
 

src/MacVim/MMVimView.m

@@ -24,7 +24,7 @@
 #import "MMVimView.h"
 #import "MMWindowController.h"
 #import "Miscellaneous.h"
-#import <PSMTabBarControl.h>
+#import <PSMTabBarControl/PSMTabBarControl.h>
 
 
 
@@ -38,12 +38,12 @@ enum {
 
 // TODO:  Move!
 @interface MMScroller : NSScroller {
-    long identifier;
+    int32_t identifier;
     int type;
     NSRange range;
 }
-- (id)initWithIdentifier:(long)ident type:(int)type;
-- (long)identifier;
+- (id)initWithIdentifier:(int32_t)ident type:(int)type;
+- (int32_t)scrollerId;
 - (int)type;
 - (NSRange)range;
 - (void)setRange:(NSRange)newRange;
@@ -55,8 +55,8 @@ enum {
 - (BOOL)leftScrollbarVisible;
 - (BOOL)rightScrollbarVisible;
 - (void)placeScrollbars;
-- (int)representedIndexOfTabViewItem:(NSTabViewItem *)tvi;
-- (MMScroller *)scrollbarForIdentifier:(long)ident index:(unsigned *)idx;
+- (NSUInteger)representedIndexOfTabViewItem:(NSTabViewItem *)tvi;
+- (MMScroller *)scrollbarForIdentifier:(int32_t)ident index:(unsigned *)idx;
 - (NSSize)vimViewSizeForTextViewSize:(NSSize)textViewSize;
 - (NSRect)textViewRectForVimViewSize:(NSSize)contentSize;
 - (NSTabView *)tabView;
@@ -88,19 +88,22 @@ enum {
     // frameSizeMayHaveChanged.
     [self setAutoresizesSubviews:YES];
 
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:MMAtsuiRendererKey]) {
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+#if ENABLE_ATSUI
+    if ([ud boolForKey:MMAtsuiRendererKey]) {
         // Use ATSUI for text rendering.
         //
         // HACK! 'textView' has type MMTextView, but MMAtsuiTextView is not
         // derived from MMTextView.
         textView = [[MMAtsuiTextView alloc] initWithFrame:frame];
-    } else {
+    } else
+#endif // ENABLE_ATSUI
+    {
         // Use Cocoa text system for text rendering.
         textView = [[MMTextView alloc] initWithFrame:frame];
     }
 
     // Allow control of text view inset via MMTextInset* user defaults.
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     int left = [ud integerForKey:MMTextInsetLeftKey];
     int top = [ud integerForKey:MMTextInsetTopKey];
     [textView setTextContainerInset:NSMakeSize(left, top)];
@@ -129,7 +132,7 @@ enum {
     [tabBarControl setCellOptimumWidth:
                                      [ud integerForKey:MMTabOptimumWidthKey]];
 
-    [tabBarControl setShowAddTabButton:YES];
+    [tabBarControl setShowAddTabButton:[ud boolForKey:MMShowAddTabButtonKey]];
     [[tabBarControl addTabButton] setTarget:self];
     [[tabBarControl addTabButton] setAction:@selector(addNewTab:)];
     [tabBarControl setAllowsDragBetweenWindows:NO];
@@ -152,7 +155,7 @@ enum {
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
     [tabBarControl release];  tabBarControl = nil;
     [tabView release];  tabView = nil;
@@ -311,7 +314,7 @@ enum {
                                           forTabViewItem:tvi];
                     break;
                 default:
-                    NSLog(@"WARNING: Unknown tab info for index: %d", i);
+                    ASLogWarn(@"Unknown tab info for index: %d", i);
             }
 
             [val release];
@@ -326,7 +329,6 @@ enum {
     int i, count = [[self tabView] numberOfTabViewItems];
     for (i = count-1; i >= tabIdx; --i) {
         id tvi = [tabViewItems objectAtIndex:i];
-        //NSLog(@"Removing tab with index %d", i);
         [[self tabView] removeTabViewItem:tvi];
     }
     vimTaskSelectedTab = NO;
@@ -336,11 +338,9 @@ enum {
 
 - (void)selectTabWithIndex:(int)idx
 {
-    //NSLog(@"%s%d", _cmd, idx);
-
     NSArray *tabViewItems = [[self tabBarControl] representedTabViewItems];
     if (idx < 0 || idx >= [tabViewItems count]) {
-        NSLog(@"WARNING: No tab with index %d exists.", idx);
+        ASLogWarn(@"No tab with index %d exists.", idx);
         return;
     }
 
@@ -374,10 +374,8 @@ enum {
     return tvi;
 }
 
-- (void)createScrollbarWithIdentifier:(long)ident type:(int)type
+- (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type
 {
-    //NSLog(@"Create scroller %d of type %d", ident, type);
-
     MMScroller *scroller = [[MMScroller alloc] initWithIdentifier:ident
                                                              type:type];
     [scroller setTarget:self];
@@ -388,10 +386,8 @@ enum {
     [scroller release];
 }
 
-- (BOOL)destroyScrollbarWithIdentifier:(long)ident
+- (BOOL)destroyScrollbarWithIdentifier:(int32_t)ident
 {
-    //NSLog(@"Destroy scroller %d", ident);
-
     unsigned idx = 0;
     MMScroller *scroller = [self scrollbarForIdentifier:ident index:&idx];
     if (!scroller) return NO;
@@ -404,14 +400,12 @@ enum {
     return ![scroller isHidden];
 }
 
-- (BOOL)showScrollbarWithIdentifier:(long)ident state:(BOOL)visible
+- (BOOL)showScrollbarWithIdentifier:(int32_t)ident state:(BOOL)visible
 {
     MMScroller *scroller = [self scrollbarForIdentifier:ident index:NULL];
     if (!scroller) return NO;
 
     BOOL wasVisible = ![scroller isHidden];
-    //NSLog(@"%s scroller %d (was %svisible)", visible ? "Show" : "Hide",
-    //      ident, wasVisible ? "" : "in");
     [scroller setHidden:!visible];
 
     // If a scroller was hidden or shown then the vim view must resize.  This
@@ -420,12 +414,15 @@ enum {
 }
 
 - (void)setScrollbarThumbValue:(float)val proportion:(float)prop
-                    identifier:(long)ident
+                    identifier:(int32_t)ident
 {
     MMScroller *scroller = [self scrollbarForIdentifier:ident index:NULL];
-    //NSLog(@"Set thumb value %.2f proportion %.2f for scroller %d",
-    //        val, prop, ident);
+#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
+    [scroller setDoubleValue:val];
+    [scroller setKnobProportion:prop];
+#else
     [scroller setFloatValue:val knobProportion:prop];
+#endif
     [scroller setEnabled:prop != 1.f];
 }
 
@@ -433,24 +430,22 @@ enum {
 - (void)scroll:(id)sender
 {
     NSMutableData *data = [NSMutableData data];
-    long ident = [(MMScroller*)sender identifier];
+    int32_t ident = [(MMScroller*)sender scrollerId];
     int hitPart = [sender hitPart];
     float value = [sender floatValue];
 
-    [data appendBytes:&ident length:sizeof(long)];
+    [data appendBytes:&ident length:sizeof(int32_t)];
     [data appendBytes:&hitPart length:sizeof(int)];
     [data appendBytes:&value length:sizeof(float)];
 
     [vimController sendMessage:ScrollbarEventMsgID data:data];
 }
 
-- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(long)ident
+- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(int32_t)ident
 {
     MMScroller *scroller = [self scrollbarForIdentifier:ident index:NULL];
     NSRange range = NSMakeRange(pos, len);
     if (!NSEqualRanges(range, [scroller range])) {
-        //NSLog(@"Set range %@ for scroller %d",
-        //        NSStringFromRange(range), ident);
         [scroller setRange:range];
         // TODO!  Should only do this once per update.
 
@@ -483,9 +478,10 @@ enum {
     // flag is set when Vim initiated the selection.
     if (!vimTaskSelectedTab) {
         // Propagate the selection message to Vim.
-        int idx = [self representedIndexOfTabViewItem:tabViewItem];
+        NSUInteger idx = [self representedIndexOfTabViewItem:tabViewItem];
         if (NSNotFound != idx) {
-            NSData *data = [NSData dataWithBytes:&idx length:sizeof(int)];
+            int i = (int)idx;   // HACK! Never more than MAXINT tabs?!
+            NSData *data = [NSData dataWithBytes:&i length:sizeof(int)];
             [vimController sendMessage:SelectTabMsgID data:data];
         }
     }
@@ -501,9 +497,9 @@ enum {
     // HACK!  This method is only called when the user clicks the close button
     // on the tab.  Instead of letting the tab bar close the tab, we return NO
     // and pass a message on to Vim to let it handle the closing.
-    int idx = [self representedIndexOfTabViewItem:tabViewItem];
-    //NSLog(@"Closing tab with index %d", idx);
-    NSData *data = [NSData dataWithBytes:&idx length:sizeof(int)];
+    NSUInteger idx = [self representedIndexOfTabViewItem:tabViewItem];
+    int i = (int)idx;   // HACK! Never more than MAXINT tabs?!
+    NSData *data = [NSData dataWithBytes:&i length:sizeof(int)];
     [vimController sendMessage:CloseTabMsgID data:data];
 
     return NO;
@@ -520,7 +516,7 @@ enum {
 
 - (NSDragOperation)tabBarControl:(PSMTabBarControl *)theTabBarControl
         draggingEntered:(id <NSDraggingInfo>)sender
-        forTabAtIndex:(unsigned)tabIndex
+        forTabAtIndex:(NSUInteger)tabIndex
 {
     NSPasteboard *pb = [sender draggingPasteboard];
     return [[pb types] containsObject:NSFilenamesPboardType]
@@ -530,7 +526,7 @@ enum {
 
 - (BOOL)tabBarControl:(PSMTabBarControl *)theTabBarControl
         performDragOperation:(id <NSDraggingInfo>)sender
-        forTabAtIndex:(unsigned)tabIndex
+        forTabAtIndex:(NSUInteger)tabIndex
 {
     NSPasteboard *pb = [sender draggingPasteboard];
     if ([[pb types] containsObject:NSFilenamesPboardType]) {
@@ -743,7 +739,6 @@ enum {
                 rect.size.height = 0;
         }
 
-        //NSLog(@"set scroller #%d frame = %@", i, NSStringFromRect(rect));
         NSRect oldRect = [scroller frame];
         if (!NSEqualRects(oldRect, rect)) {
             [scroller setFrame:rect];
@@ -755,18 +750,18 @@ enum {
     }
 }
 
-- (int)representedIndexOfTabViewItem:(NSTabViewItem *)tvi
+- (NSUInteger)representedIndexOfTabViewItem:(NSTabViewItem *)tvi
 {
     NSArray *tabViewItems = [[self tabBarControl] representedTabViewItems];
     return [tabViewItems indexOfObject:tvi];
 }
 
-- (MMScroller *)scrollbarForIdentifier:(long)ident index:(unsigned *)idx
+- (MMScroller *)scrollbarForIdentifier:(int32_t)ident index:(unsigned *)idx
 {
     unsigned i, count = [scrollbars count];
     for (i = 0; i < count; ++i) {
         MMScroller *scroller = [scrollbars objectAtIndex:i];
-        if ([scroller identifier] == ident) {
+        if ([scroller scrollerId] == ident) {
             if (idx) *idx = i;
             return scroller;
         }
@@ -794,7 +789,7 @@ enum {
 
 - (NSRect)textViewRectForVimViewSize:(NSSize)contentSize
 {
-    NSRect rect = { 0, 0, contentSize.width, contentSize.height };
+    NSRect rect = { {0, 0}, {contentSize.width, contentSize.height} };
 
     if (![[self tabBarControl] isHidden])
         rect.size.height -= [[self tabBarControl] frame].size.height;
@@ -856,9 +851,9 @@ enum {
         int msgid = [self inLiveResize] ? LiveResizeMsgID
                                         : SetTextDimensionsMsgID;
 
-        //NSLog(@"Notify Vim that text dimensions changed from %dx%d to %dx%d"
-        //       " (%s)", cols, rows, constrained[1], constrained[0],
-        //       MessageStrings[msgid]);
+        ASLogDebug(@"Notify Vim that text dimensions changed from %dx%d to "
+                   "%dx%d (%s)", cols, rows, constrained[1], constrained[0],
+                   MessageStrings[msgid]);
 
         [vimController sendMessage:msgid data:data];
 
@@ -878,7 +873,7 @@ enum {
 
 @implementation MMScroller
 
-- (id)initWithIdentifier:(long)ident type:(int)theType
+- (id)initWithIdentifier:(int32_t)ident type:(int)theType
 {
     // HACK! NSScroller creates a horizontal scroller if it is init'ed with a
     // frame whose with exceeds its height; so create a bogus rect and pass it
@@ -899,7 +894,7 @@ enum {
     return self;
 }
 
-- (long)identifier
+- (int32_t)scrollerId
 {
     return identifier;
 }

src/MacVim/MMWindow.h

@@ -8,7 +8,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "MacVim.h"
 
 
 
@@ -18,7 +18,7 @@
 }
 
 - (id)initWithContentRect:(NSRect)rect
-                styleMask:(unsigned int)style
+                styleMask:(NSUInteger)style
                   backing:(NSBackingStoreType)bufferingType
                     defer:(BOOL)flag;
 

src/MacVim/MMWindow.m

@@ -35,7 +35,7 @@
 @implementation MMWindow
 
 - (id)initWithContentRect:(NSRect)rect
-                styleMask:(unsigned int)style
+                styleMask:(NSUInteger)style
                   backing:(NSBackingStoreType)bufferingType
                     defer:(BOOL)flag
 {
@@ -47,7 +47,7 @@
 
     [self setReleasedWhenClosed:NO];
 
-    NSRect tabSepRect = { 0, rect.size.height - 1, rect.size.width, 1 };
+    NSRect tabSepRect = { {0, rect.size.height - 1}, {rect.size.width, 1} };
     tablineSeparator = [[NSBox alloc] initWithFrame:tabSepRect];
     
     [tablineSeparator setBoxType:NSBoxSeparator];
@@ -63,7 +63,7 @@
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
     // TODO: Is there any reason why we would want the following call?
     //[tablineSeparator removeFromSuperviewWithoutNeedingDisplay];
@@ -142,8 +142,18 @@
 
 - (IBAction)zoom:(id)sender
 {
+    NSScreen *screen = [self screen];
+    if (!screen) {
+        ASLogNotice(@"Window not on screen, zoom to main screen");
+        screen = [NSScreen mainScreen];
+        if (!screen) {
+            ASLogNotice(@"No main screen, abort zoom");
+            return;
+        }
+    }
+
     NSRect frame = [self frame];
-    NSRect defaultFrame = [[self screen] visibleFrame];
+    NSRect defaultFrame = [screen visibleFrame];
     defaultFrame = [[self delegate] windowWillUseStandardFrame:self
                                                   defaultFrame:defaultFrame];
 

src/MacVim/MMWindowController.h

@@ -8,7 +8,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "MacVim.h"
 
 
 
@@ -17,11 +17,17 @@
 @class MMVimController;
 @class MMVimView;
 
-@interface MMWindowController : NSWindowController {
+@interface MMWindowController : NSWindowController
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+    // 10.6 has turned delegate messages into formal protocols
+    <NSWindowDelegate>
+#endif
+{
     MMVimController     *vimController;
     MMVimView           *vimView;
     BOOL                setupDone;
     BOOL                shouldResizeVimView;
+    int                 updateToolbarFlag;
     BOOL                keepOnScreen;
     BOOL                fullscreenEnabled;
     NSString            *windowAutosaveKey;
@@ -45,16 +51,16 @@
 - (void)setTitle:(NSString *)title;
 - (void)setDocumentFilename:(NSString *)filename;
 - (void)setToolbar:(NSToolbar *)toolbar;
-- (void)createScrollbarWithIdentifier:(long)ident type:(int)type;
-- (BOOL)destroyScrollbarWithIdentifier:(long)ident;
-- (BOOL)showScrollbarWithIdentifier:(long)ident state:(BOOL)visible;
-- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(long)ident;
+- (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type;
+- (BOOL)destroyScrollbarWithIdentifier:(int32_t)ident;
+- (BOOL)showScrollbarWithIdentifier:(int32_t)ident state:(BOOL)visible;
+- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(int32_t)ident;
 - (void)setScrollbarThumbValue:(float)val proportion:(float)prop
-                    identifier:(long)ident;
+                    identifier:(int32_t)ident;
 - (void)setDefaultColorsBackground:(NSColor *)back foreground:(NSColor *)fore;
 - (void)setFont:(NSFont *)font;
 - (void)setWideFont:(NSFont *)font;
-- (void)processCommandQueueDidFinish;
+- (void)processInputQueueDidFinish;
 - (void)showTabBar:(BOOL)on;
 - (void)showToolbar:(BOOL)on size:(int)size mode:(int)mode;
 - (void)setMouseShape:(int)shape;

src/MacVim/MMWindowController.m

@@ -66,7 +66,7 @@
 #import "MMWindow.h"
 #import "MMWindowController.h"
 #import "Miscellaneous.h"
-#import <PSMTabBarControl.h>
+#import <PSMTabBarControl/PSMTabBarControl.h>
 
 
 
@@ -81,6 +81,7 @@
 - (BOOL)askBackendForStarRegister:(NSPasteboard *)pb;
 - (void)hideTablineSeparator:(BOOL)hide;
 - (void)doFindNext:(BOOL)next;
+- (void)updateToolbar;
 @end
 
 
@@ -98,18 +99,6 @@
 @interface NSWindow (NSLeopardOnly)
 // Note: These functions are Leopard-only, use -[NSObject respondsToSelector:]
 // before calling them to make sure everything works on Tiger too.
-
-#ifndef CGFLOAT_DEFINED
-    // On Leopard, CGFloat is float on 32bit and double on 64bit. On Tiger,
-    // we can't use this anyways, so it's just here to keep the compiler happy.
-    // However, when we're compiling for Tiger and running on Leopard, we
-    // might need the correct typedef, so this piece is copied from ATSTypes.h
-# ifdef __LP64__
-    typedef double CGFloat;
-# else
-    typedef float CGFloat;
-# endif
-#endif
 - (void)setAutorecalculatesContentBorderThickness:(BOOL)b forEdge:(NSRectEdge)e;
 - (void)setContentBorderThickness:(CGFloat)b forEdge:(NSRectEdge)e;
 @end
@@ -121,9 +110,6 @@
 
 - (id)initWithVimController:(MMVimController *)controller
 {
-#ifndef NSAppKitVersionNumber10_4  // needed for non-10.5 sdk
-# define NSAppKitVersionNumber10_4 824
-#endif
     unsigned styleMask = NSTitledWindowMask | NSClosableWindowMask
             | NSMiniaturizableWindowMask | NSResizableWindowMask
             | NSUnifiedTitleAndToolbarWindowMask;
@@ -200,7 +186,7 @@
 
 - (void)dealloc
 {
-    LOG_DEALLOC
+    ASLogDebug(@"");
 
     [decoratedWindow release];  decoratedWindow = nil;
     [windowAutosaveKey release];  windowAutosaveKey = nil;
@@ -240,7 +226,7 @@
 
 - (void)cleanup
 {
-    //NSLog(@"%@ %s", [self className], _cmd);
+    ASLogDebug(@"%@ %s", [self className], _cmd);
 
     if (fullscreenEnabled) {
         // If we are closed while still in fullscreen, end fullscreen mode,
@@ -301,13 +287,13 @@
 - (void)setTextDimensionsWithRows:(int)rows columns:(int)cols isLive:(BOOL)live
                           isReply:(BOOL)reply
 {
-    //NSLog(@"setTextDimensionsWithRows:%d columns:%d isLive:%d isReply:%d",
-    //        rows, cols, live, reply);
+    ASLogDebug(@"setTextDimensionsWithRows:%d columns:%d isLive:%d isReply:%d",
+               rows, cols, live, reply);
 
     // NOTE: The only place where the (rows,columns) of the vim view are
     // modified is here and when entering/leaving full-screen.  Setting these
     // values have no immediate effect, the actual resizing of the view is done
-    // in processCommandQueueDidFinish.
+    // in processInputQueueDidFinish.
     //
     // The 'live' flag indicates that this resize originated from a live
     // resize; it may very well happen that the view is no longer in live
@@ -325,6 +311,18 @@
         shouldResizeVimView = YES;
         keepOnScreen = !reply;
     }
+
+    if (windowAutosaveKey) {
+        // Autosave rows and columns (only done for window which also autosaves
+        // window position).
+        id tv = [vimView textView];
+        int rows = [tv maxRows];
+        int cols = [tv maxColumns];
+        NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+        [ud setInteger:rows forKey:MMAutosaveRowsKey];
+        [ud setInteger:cols forKey:MMAutosaveColumnsKey];
+        [ud synchronize];
+    }
 }
 
 - (void)setTitle:(NSString *)title
@@ -361,12 +359,12 @@
     }
 }
 
-- (void)createScrollbarWithIdentifier:(long)ident type:(int)type
+- (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type
 {
     [vimView createScrollbarWithIdentifier:ident type:type];
 }
 
-- (BOOL)destroyScrollbarWithIdentifier:(long)ident
+- (BOOL)destroyScrollbarWithIdentifier:(int32_t)ident
 {
     BOOL scrollbarHidden = [vimView destroyScrollbarWithIdentifier:ident];   
     shouldResizeVimView = shouldResizeVimView || scrollbarHidden;
@@ -374,7 +372,7 @@
     return scrollbarHidden;
 }
 
-- (BOOL)showScrollbarWithIdentifier:(long)ident state:(BOOL)visible
+- (BOOL)showScrollbarWithIdentifier:(int32_t)ident state:(BOOL)visible
 {
     BOOL scrollbarToggled = [vimView showScrollbarWithIdentifier:ident
                                                            state:visible];
@@ -383,13 +381,13 @@
     return scrollbarToggled;
 }
 
-- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(long)ident
+- (void)setScrollbarPosition:(int)pos length:(int)len identifier:(int32_t)ident
 {
     [vimView setScrollbarPosition:pos length:len identifier:ident];
 }
 
 - (void)setScrollbarThumbValue:(float)val proportion:(float)prop
-                    identifier:(long)ident
+                    identifier:(int32_t)ident
 {
     [vimView setScrollbarThumbValue:val proportion:prop identifier:ident];
 }
@@ -418,16 +416,16 @@
     [[vimView textView] setWideFont:font];
 }
 
-- (void)processCommandQueueDidFinish
+- (void)processInputQueueDidFinish
 {
-    // IMPORTANT!  No synchronous DO calls are allowed in this method.  They
-    // may cause the command queue to get processed out of order.
-
     // NOTE: Resizing is delayed until after all commands have been processed
     // since it often happens that more than one command will cause a resize.
     // If we were to immediately resize then the vim view size would jitter
     // (e.g.  hiding/showing scrollbars often happens several time in one
     // update).
+    // Also delay toggling the toolbar until after scrollbars otherwise
+    // problems arise when showing toolbar and scrollbar at the same time, i.e.
+    // on "set go+=rT".
 
     if (shouldResizeVimView) {
         shouldResizeVimView = NO;
@@ -448,6 +446,9 @@
 
         keepOnScreen = NO;
     }
+
+    if (updateToolbarFlag != 0)
+        [self updateToolbar];
 }
 
 - (void)showTabBar:(BOOL)on
@@ -481,21 +482,17 @@
 
     [toolbar setSizeMode:size];
     [toolbar setDisplayMode:mode];
-    [toolbar setVisible:on];
 
-    if (([decoratedWindow styleMask] & NSTexturedBackgroundWindowMask) == 0) {
-        if (!on) {
-            [self hideTablineSeparator:YES];
-        } else {
-            [self hideTablineSeparator:![[vimView tabBarControl] isHidden]];
-        }
-    } else {
-        // Textured windows don't have a line below there title bar, so we
-        // need the separator in this case as well. In fact, the only case
-        // where we don't need the separator is when the tab bar control
-        // is visible (because it brings its own separator).
-        [self hideTablineSeparator:![[vimView tabBarControl] isHidden]];
-    }
+    // Positive flag shows toolbar, negative hides it.
+    updateToolbarFlag = on ? 1 : -1;
+
+    // NOTE: If the window is not visible we must toggle the toolbar
+    // immediately, otherwise "set go-=T" in .gvimrc will lead to the toolbar
+    // showing its hide animation every time a new window is opened.  (See
+    // processInputQueueDidFinish for the reason why we need to delay toggling
+    // the toolbar when the window is visible.)
+    if (![decoratedWindow isVisible])
+        [self updateToolbar];
 }
 
 - (void)setMouseShape:(int)shape
@@ -551,8 +548,8 @@
     [[vimView textView] constrainRows:&constrained[0] columns:&constrained[1]
                                toSize:textViewSize];
 
-    //NSLog(@"End of live resize, notify Vim that text dimensions are %dx%d",
-    //       constrained[1], constrained[0]);
+    ASLogDebug(@"End of live resize, notify Vim that text dimensions are %dx%d",
+               constrained[1], constrained[0]);
 
     NSData *data = [NSData dataWithBytes:constrained length:2*sizeof(int)];
     BOOL sendOk = [vimController sendMessageNow:SetTextDimensionsMsgID
@@ -757,7 +754,19 @@
 
 - (void)windowDidMove:(NSNotification *)notification
 {
-    if (setupDone && windowAutosaveKey) {
+    if (!setupDone)
+        return;
+
+    if (fullscreenEnabled) {
+        // HACK! The full-screen is not supposed to be able to be moved.  If we
+        // do get here while in full-screen something unexpected happened (e.g.
+        // the full-screen window was on an external display that got
+        // unplugged) and we handle this situation by leaving full-screen.
+        [self leaveFullscreen];
+        return;
+    }
+
+    if (windowAutosaveKey) {
         NSRect frame = [decoratedWindow frame];
         NSPoint topLeft = { frame.origin.x, NSMaxY(frame) };
         NSString *topLeftString = NSStringFromPoint(topLeft);
@@ -774,7 +783,11 @@
     // size in updateResizeConstraints since the screen's visible frame may
     // change at any time (dock could move, resolution could change, window
     // could be moved to another screen, ...).
+    if (![win screen])
+        return proposedFrameSize;
 
+    // NOTE: Not called in full-screen mode so use "visibleFrame" instead of
+    // "frame".
     NSRect maxFrame = [self constrainFrame:[[win screen] visibleFrame]];
 
     if (proposedFrameSize.width > maxFrame.size.width)
@@ -891,24 +904,28 @@
 
     NSRect newFrame = [decoratedWindow frameRectForContentRect:contentRect];
 
-    // Ensure that the window fits inside the visible part of the screen.
-    NSRect maxFrame = [[decoratedWindow screen] visibleFrame];
-    maxFrame = [self constrainFrame:maxFrame];
+    if ([decoratedWindow screen]) {
+        // Ensure that the window fits inside the visible part of the screen.
+        // NOTE: Not called in full-screen mode so use "visibleFrame' instead
+        // of "frame".
+        NSRect maxFrame = [[decoratedWindow screen] visibleFrame];
+        maxFrame = [self constrainFrame:maxFrame];
 
-    if (newFrame.size.width > maxFrame.size.width) {
-        newFrame.size.width = maxFrame.size.width;
-        newFrame.origin.x = maxFrame.origin.x;
-    }
-    if (newFrame.size.height > maxFrame.size.height) {
-        newFrame.size.height = maxFrame.size.height;
-        newFrame.origin.y = maxFrame.origin.y;
-    }
-
-    if (onScreen) {
-        if (newFrame.origin.y < maxFrame.origin.y)
+        if (newFrame.size.width > maxFrame.size.width) {
+            newFrame.size.width = maxFrame.size.width;
+            newFrame.origin.x = maxFrame.origin.x;
+        }
+        if (newFrame.size.height > maxFrame.size.height) {
+            newFrame.size.height = maxFrame.size.height;
             newFrame.origin.y = maxFrame.origin.y;
-        if (NSMaxX(newFrame) > NSMaxX(maxFrame))
-            newFrame.origin.x = NSMaxX(maxFrame) - newFrame.size.width;
+        }
+
+        if (onScreen) {
+            if (newFrame.origin.y < maxFrame.origin.y)
+                newFrame.origin.y = maxFrame.origin.y;
+            if (NSMaxX(newFrame) > NSMaxX(maxFrame))
+                newFrame.origin.x = NSMaxX(maxFrame) - newFrame.size.width;
+        }
     }
 
     [decoratedWindow setFrame:newFrame display:YES];
@@ -917,7 +934,15 @@
 - (NSSize)constrainContentSizeToScreenSize:(NSSize)contentSize
 {
     NSWindow *win = [self window];
-    NSRect rect = [win contentRectForFrameRect:[[win screen] visibleFrame]];
+    if (![win screen])
+        return contentSize;
+
+    // NOTE: This may be called in both windowed and full-screen mode.  The
+    // "visibleFrame" method does not overlap menu and dock so should not be
+    // used in full-screen.
+    NSRect screenRect = fullscreenEnabled ? [[win screen] frame]
+                                          : [[win screen] visibleFrame];
+    NSRect rect = [win contentRectForFrameRect:screenRect];
 
     if (contentSize.height > rect.size.height)
         contentSize.height = rect.size.height;
@@ -970,8 +995,9 @@
         @try {
             reply = [backendProxy starRegisterToPasteboard:pb];
         }
-        @catch (NSException *e) {
-            NSLog(@"WARNING: Caught exception in %s: \"%@\"", _cmd, e);
+        @catch (NSException *ex) {
+            ASLogNotice(@"starRegisterToPasteboard: failed: pid=%d reason=%@",
+                    [vimController pid], ex);
         }
     }
 
@@ -1025,4 +1051,30 @@
     [vimController addVimInput:input];
 }
 
+- (void)updateToolbar
+{
+    NSToolbar *toolbar = [decoratedWindow toolbar];
+    if (nil == toolbar || 0 == updateToolbarFlag) return;
+
+    // Positive flag shows toolbar, negative hides it.
+    BOOL on = updateToolbarFlag > 0 ? YES : NO;
+    [toolbar setVisible:on];
+
+    if (([decoratedWindow styleMask] & NSTexturedBackgroundWindowMask) == 0) {
+        if (!on) {
+            [self hideTablineSeparator:YES];
+        } else {
+            [self hideTablineSeparator:![[vimView tabBarControl] isHidden]];
+        }
+    } else {
+        // Textured windows don't have a line below there title bar, so we
+        // need the separator in this case as well. In fact, the only case
+        // where we don't need the separator is when the tab bar control
+        // is visible (because it brings its own separator).
+        [self hideTablineSeparator:![[vimView tabBarControl] isHidden]];
+    }
+
+    updateToolbarFlag = 0;
+}
+
 @end // MMWindowController (Private)

src/MacVim/MacVim.h

@@ -9,14 +9,27 @@
  */
 
 #import <Cocoa/Cocoa.h>
+#import <asl.h>
 
 
 //
-// Enable support for MacVim plugins (not to be confused with Vim plugins!).
+// Uncomment to enable support for MacVim plugins (not to be confused with Vim
+// plugins!).
 //
-#define MM_ENABLE_PLUGINS
+//#define MM_ENABLE_PLUGINS
 
 
+// Taken from /usr/include/AvailabilityMacros.h
+#ifndef MAC_OS_X_VERSION_10_4
+# define MAC_OS_X_VERSION_10_4 1040
+#endif
+#ifndef MAC_OS_X_VERSION_10_5
+# define MAC_OS_X_VERSION_10_5 1050
+#endif
+#ifndef MAC_OS_X_VERSION_10_6
+# define MAC_OS_X_VERSION_10_6 1060
+#endif
+
 
 //
 // This is the protocol MMBackend implements.
@@ -33,7 +46,6 @@
 //
 @protocol MMBackendProtocol
 - (oneway void)processInput:(int)msgid data:(in bycopy NSData *)data;
-- (oneway void)processInputAndData:(in bycopy NSArray *)messages;
 - (oneway void)setDialogReturn:(in bycopy id)obj;
 - (NSString *)evaluateExpression:(in bycopy NSString *)expr;
 - (id)evaluateExpressionCocoa:(in bycopy NSString *)expr
@@ -42,30 +54,23 @@
 - (oneway void)acknowledgeConnection;
 @end
 
-//
-// This is the protocol MMVimController implements.
-//
-// Be very careful if you want to add methods to this protocol.  Since DO
-// messages may arrive while Cocoa is in the middle of processing some other
-// message be sure to consider reentrancy issues.  Look at processCommandQueue:
-// to see an example of how to deal with this.
-//
-@protocol MMFrontendProtocol
-- (oneway void)processCommandQueue:(in bycopy NSArray *)queue;
-- (oneway void)showSavePanelWithAttributes:(in bycopy NSDictionary *)attr;
-- (oneway void)presentDialogWithAttributes:(in bycopy NSDictionary *)attr;
-@end
-
 
 //
 // This is the protocol MMAppController implements.
 //
-// It handles connections between MacVim and Vim.
+// It handles connections between MacVim and Vim and communication from Vim to
+// MacVim.
+//
+// Do not add methods to this interface without a _very_ good reason (if
+// possible, instead add a new message to the *MsgID enum below and pass it via
+// processInput:forIdentifier).  Methods should not modify the state directly
+// but should instead delay any potential modifications (see
+// connectBackend:pid: and processInput:forIdentifier:).
 //
 @protocol MMAppProtocol
-- (byref id <MMFrontendProtocol>)
-    connectBackend:(byref in id <MMBackendProtocol>)backend
-               pid:(int)pid;
+- (unsigned)connectBackend:(byref in id <MMBackendProtocol>)proxy pid:(int)pid;
+- (oneway void)processInput:(in bycopy NSArray *)queue
+              forIdentifier:(unsigned)identifier;
 - (NSArray *)serverList;
 @end
 
@@ -109,10 +114,8 @@
 extern char *MessageStrings[];
 
 enum {
-    OpenWindowMsgID = 1,
-    InsertTextMsgID,
+    OpenWindowMsgID = 1,    // NOTE: FIRST IN ENUM MUST BE 1
     KeyDownMsgID,
-    CmdKeyMsgID,
     BatchDrawMsgID,
     SelectTabMsgID,
     CloseTabMsgID,
@@ -174,10 +177,20 @@ enum {
     SetDocumentFilenameMsgID,
     OpenWithArgumentsMsgID,
     CloseWindowMsgID,
-    InterruptMsgID,
     SetFullscreenColorMsgID,
     ShowFindReplaceDialogMsgID,
     FindReplaceMsgID,
+    ActivateKeyScriptMsgID,
+    DeactivateKeyScriptMsgID,
+    EnableImControlMsgID,
+    DisableImControlMsgID,
+    ActivatedImMsgID,
+    DeactivatedImMsgID,
+    BrowseForFileMsgID,
+    ShowDialogMsgID,
+    NetBeansMsgID,
+    SetMarkedTextMsgID,
+    LastMsgID   // NOTE: MUST BE LAST MESSAGE IN ENUM!
 };
 
 
@@ -216,20 +229,33 @@ enum {
     MMTabInfoCount
 };
 
+
+// Create a string holding the labels of all messages in message queue for
+// debugging purposes (condense some messages since there may typically be LOTS
+// of them on a queue).
+NSString *debugStringForMessageQueue(NSArray *queue);
+
+
+// Shared user defaults (most user defaults are in Miscellaneous.h).
+// Contrary to the user defaults in Miscellaneous.h these defaults are not
+// intitialized to any default values.  That is, unless the user sets them
+// these keys will not be present in the user default database.
+extern NSString *MMLogLevelKey;
+extern NSString *MMLogToStdErrKey;
+
 // Argument used to stop MacVim from opening an empty window on startup
 // (techincally this is a user default but should not be used as such).
 extern NSString *MMNoWindowKey;
 
+extern NSString *MMAutosaveRowsKey;
+extern NSString *MMAutosaveColumnsKey;
+
+
 // Vim pasteboard type (holds motion type + string)
 extern NSString *VimPBoardType;
 
 
 
-// Loads all fonts in the Resouces folder of the app bundle and returns a font
-// container reference (which should be used to deactivate the loaded fonts).
-ATSFontContainerRef loadFonts();
-
-
 
 @interface NSString (MMExtras)
 - (NSString *)stringByEscapingSpecialFilenameCharacters;
@@ -271,7 +297,7 @@ ATSFontContainerRef loadFonts();
 
 
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#ifndef NSINTEGER_DEFINED
 // NSInteger was introduced in 10.5
 # if __LP64__ || NS_BUILD_32_LIKE_64
 typedef long NSInteger;
@@ -280,4 +306,73 @@ typedef unsigned long NSUInteger;
 typedef int NSInteger;
 typedef unsigned int NSUInteger;
 # endif
+# define NSINTEGER_DEFINED 1
 #endif
+
+#ifndef NSAppKitVersionNumber10_4  // Needed for pre-10.5 SDK
+# define NSAppKitVersionNumber10_4 824
+#endif
+
+#ifndef CGFLOAT_DEFINED
+    // On Leopard, CGFloat is float on 32bit and double on 64bit. On Tiger,
+    // we can't use this anyways, so it's just here to keep the compiler happy.
+    // However, when we're compiling for Tiger and running on Leopard, we
+    // might need the correct typedef, so this piece is copied from ATSTypes.h
+# ifdef __LP64__
+    typedef double CGFloat;
+# else
+    typedef float CGFloat;
+# endif
+#endif
+
+
+// Logging related functions and macros.
+//
+// This is a very simplistic logging facility built on top of ASL.  Two user
+// defaults allow for changing the local log filter level (MMLogLevel) and
+// whether logs should be sent to stderr (MMLogToStdErr).  (These user defaults
+// are only checked during startup.)  The default is to block level 6 (info)
+// and 7 (debug) logs and _not_ to send logs to stderr.  Apart from this
+// "syslog" (see "man syslog") can be used to modify the ASL filters (it is
+// currently not possible to change the local filter at runtime).  For example:
+//   Enable all logs to reach the ASL database (by default 'debug' and 'info'
+//   are filtered out, see "man syslogd"):
+//     $ sudo syslog -c syslogd -d
+//   Reset the ASL database filter:
+//     $ sudo syslog -c syslogd off
+//   Change the master filter to block logs less severe than errors:
+//     $ sudo syslog -c 0 -e
+//   Change per-process filter for running MacVim process to block logs less
+//   severe than warnings:
+//     $ syslog -c MacVim -w
+//
+// Note that there are four ASL filters:
+//   1) The ASL database filter (syslog -c syslogd ...)
+//   2) The master filter (syslog -c 0 ...)
+//   3) The per-process filter (syslog -c PID ...)
+//   4) The local filter (MMLogLevel)
+//
+// To view the logs, either use "Console.app" or the "syslog" command:
+//   $ syslog -w | grep Vim
+// To get the logs to show up in Xcode enable the MMLogToStdErr user default.
+
+extern int ASLogLevel;
+
+void ASLInit();
+
+#define ASLog(level, fmt, ...) \
+    if (level <= ASLogLevel) { \
+        asl_log(NULL, NULL, level, "%s@%d: %s", \
+            __PRETTY_FUNCTION__, __LINE__, \
+            [[NSString stringWithFormat:fmt, ##__VA_ARGS__] UTF8String]); \
+    }
+
+// Note: These macros are used like ASLogErr(@"text num=%d", 42).  Objective-C
+// style specifiers (%@) are supported.
+#define ASLogCrit(fmt, ...)   ASLog(ASL_LEVEL_CRIT,    fmt, ##__VA_ARGS__)
+#define ASLogErr(fmt, ...)    ASLog(ASL_LEVEL_ERR,     fmt, ##__VA_ARGS__)
+#define ASLogWarn(fmt, ...)   ASLog(ASL_LEVEL_WARNING, fmt, ##__VA_ARGS__)
+#define ASLogNotice(fmt, ...) ASLog(ASL_LEVEL_NOTICE,  fmt, ##__VA_ARGS__)
+#define ASLogInfo(fmt, ...)   ASLog(ASL_LEVEL_INFO,    fmt, ##__VA_ARGS__)
+#define ASLogDebug(fmt, ...)  ASLog(ASL_LEVEL_DEBUG,   fmt, ##__VA_ARGS__)
+#define ASLogTmp(fmt, ...)    ASLog(ASL_LEVEL_NOTICE,  fmt, ##__VA_ARGS__)

src/MacVim/MacVim.m

@@ -13,13 +13,12 @@
 
 #import "MacVim.h"
 
+
 char *MessageStrings[] = 
 {
     "INVALID MESSAGE ID",
     "OpenWindowMsgID",
-    "InsertTextMsgID",
     "KeyDownMsgID",
-    "CmdKeyMsgID",
     "BatchDrawMsgID",
     "SelectTabMsgID",
     "CloseTabMsgID",
@@ -29,7 +28,7 @@ char *MessageStrings[] =
     "ShowTabBarMsgID",
     "HideTabBarMsgID",
     "SetTextRowsMsgID",
-    "SetTextColumsMsgID",
+    "SetTextColumnsMsgID",
     "SetTextDimensionsMsgID",
     "LiveResizeMsgID",
     "SetTextDimensionsReplyMsgID",
@@ -81,53 +80,79 @@ char *MessageStrings[] =
     "SetDocumentFilenameMsgID",
     "OpenWithArgumentsMsgID",
     "CloseWindowMsgID",
-    "InterruptMsgID",
     "SetFullscreenColorMsgID",
     "ShowFindReplaceDialogMsgID",
     "FindReplaceMsgID",
+    "ActivateKeyScriptMsgID",
+    "DeactivateKeyScriptMsgID",
+    "EnableImControlMsgID",
+    "DisableImControlMsgID",
+    "ActivatedImMsgID",
+    "DeactivatedImMsgID",
+    "BrowseForFileMsgID",
+    "ShowDialogMsgID",
+    "NetBeansMsgID",
+    "SetMarkedTextMsgID",
+    "END OF MESSAGE IDs"     // NOTE: Must be last!
 };
 
 
 
 
+NSString *MMLogLevelKey     = @"MMLogLevel";
+NSString *MMLogToStdErrKey  = @"MMLogToStdErr";
+
 // Argument used to stop MacVim from opening an empty window on startup
 // (techincally this is a user default but should not be used as such).
 NSString *MMNoWindowKey = @"MMNoWindow";
 
+NSString *MMAutosaveRowsKey    = @"MMAutosaveRows";
+NSString *MMAutosaveColumnsKey = @"MMAutosaveColumns";
+
 // Vim pasteboard type (holds motion type + string)
 NSString *VimPBoardType = @"VimPBoardType";
 
+int ASLogLevel = ASL_LEVEL_NOTICE;
 
 
 
-    ATSFontContainerRef
-loadFonts()
+// Create a string holding the labels of all messages in message queue for
+// debugging purposes (condense some messages since there may typically be LOTS
+// of them on a queue).
+    NSString *
+debugStringForMessageQueue(NSArray *queue)
 {
-    // This loads all fonts from the Resources folder.  The fonts are only
-    // available to the process which loaded them, so loading has to be done
-    // once for MacVim and an additional time for each Vim process.  The
-    // returned container ref should be used to deactiave the font.
-    //
-    // (Code taken from cocoadev.com)
-    ATSFontContainerRef fontContainerRef = 0;
-    NSString *fontsFolder = [[NSBundle mainBundle] resourcePath];    
-    if (fontsFolder) {
-        NSURL *fontsURL = [NSURL fileURLWithPath:fontsFolder];
-        if (fontsURL) {
-            FSRef fsRef;
-            FSSpec fsSpec;
-            CFURLGetFSRef((CFURLRef)fontsURL, &fsRef);
-
-            if (FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, &fsSpec,
-                        NULL) == noErr) {
-                ATSFontActivateFromFileSpecification(&fsSpec,
-                        kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
-                        kATSOptionFlagsDefault, &fontContainerRef);
-            }
-        }
+    NSMutableString *s = [NSMutableString new];
+    unsigned i, count = [queue count];
+    int item = 0, menu = 0, enable = 0, remove = 0;
+    int sets = 0, sett = 0, shows = 0, cres = 0, dess = 0;
+    for (i = 0; i < count; i += 2) {
+        NSData *value = [queue objectAtIndex:i];
+        int msgid = *((int*)[value bytes]);
+        if (msgid < 1 || msgid >= LastMsgID)
+            continue;
+        if (msgid == AddMenuItemMsgID) ++item;
+        else if (msgid == AddMenuMsgID) ++menu;
+        else if (msgid == EnableMenuItemMsgID) ++enable;
+        else if (msgid == RemoveMenuItemMsgID) ++remove;
+        else if (msgid == SetScrollbarPositionMsgID) ++sets;
+        else if (msgid == SetScrollbarThumbMsgID) ++sett;
+        else if (msgid == ShowScrollbarMsgID) ++shows;
+        else if (msgid == CreateScrollbarMsgID) ++cres;
+        else if (msgid == DestroyScrollbarMsgID) ++dess;
+        else [s appendFormat:@"%s ", MessageStrings[msgid]];
     }
+    if (item > 0) [s appendFormat:@"AddMenuItemMsgID(%d) ", item];
+    if (menu > 0) [s appendFormat:@"AddMenuMsgID(%d) ", menu];
+    if (enable > 0) [s appendFormat:@"EnableMenuItemMsgID(%d) ", enable];
+    if (remove > 0) [s appendFormat:@"RemoveMenuItemMsgID(%d) ", remove];
+    if (sets > 0) [s appendFormat:@"SetScrollbarPositionMsgID(%d) ", sets];
+    if (sett > 0) [s appendFormat:@"SetScrollbarThumbMsgID(%d) ", sett];
+    if (shows > 0) [s appendFormat:@"ShowScrollbarMsgID(%d) ", shows];
+    if (cres > 0) [s appendFormat:@"CreateScrollbarMsgID(%d) ", cres];
+    if (dess > 0) [s appendFormat:@"DestroyScrollbarMsgID(%d) ", dess];
 
-    return fontContainerRef;
+    return [s autorelease];
 }
 
 
@@ -240,3 +265,34 @@ loadFonts()
 }
 
 @end
+
+
+
+
+    void
+ASLInit()
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+
+    // Allow for changing the log level via user defaults.  If no key is found
+    // the default log level will be used (which for ASL is to log everything
+    // up to ASL_LEVEL_NOTICE).  This key is an integer which corresponds to
+    // the ASL_LEVEL_* macros (0 is most severe, 7 is debug level).
+    id logLevelObj = [ud objectForKey:MMLogLevelKey];
+    if (logLevelObj) {
+        int logLevel = [logLevelObj intValue];
+        if (logLevel < 0) logLevel = 0;
+        if (logLevel > ASL_LEVEL_DEBUG) logLevel = ASL_LEVEL_DEBUG;
+
+        ASLogLevel = logLevel;
+        asl_set_filter(NULL, ASL_FILTER_MASK_UPTO(logLevel));
+    }
+
+    // Allow for changing whether a copy of each log should be sent to stderr
+    // (this defaults to NO if this key is missing in the user defaults
+    // database).  The above filter mask is applied to logs going to stderr,
+    // contrary to how "vanilla" ASL works.
+    BOOL logToStdErr = [ud boolForKey:MMLogToStdErrKey];
+    if (logToStdErr)
+        asl_add_log_file(NULL, 2);  // The file descriptor for stderr is 2
+}

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -23,21 +23,22 @@
 		1D1474B00C5678370038FA2B /* MMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474AE0C5678370038FA2B /* MMTextView.m */; };
 		1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474B40C56796D0038FA2B /* MMVimController.m */; };
 		1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474BA0C567A910038FA2B /* MMWindowController.m */; };
+		1D22121E104B04530086DFF1 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A88104AFF2A002E59D5 /* Sparkle.framework */; };
 		1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; };
+		1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; };
 		1D3D19110CA690FF0004A0A5 /* DejaVuSansMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D3D190D0CA690FF0004A0A5 /* DejaVuSansMono-Bold.ttf */; };
 		1D3D19120CA690FF0004A0A5 /* DejaVuSansMono-BoldOblique.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D3D190E0CA690FF0004A0A5 /* DejaVuSansMono-BoldOblique.ttf */; };
 		1D3D19130CA690FF0004A0A5 /* DejaVuSansMono-Oblique.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D3D190F0CA690FF0004A0A5 /* DejaVuSansMono-Oblique.ttf */; };
 		1D3D19140CA690FF0004A0A5 /* DejaVuSansMono.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D3D19100CA690FF0004A0A5 /* DejaVuSansMono.ttf */; };
 		1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; };
 		1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
-		1D6008830E96886D003763F0 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D6008820E96886D003763F0 /* FindAndReplace.nib */; };
 		1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; };
-		1D7F74580E4CE1AE003225C6 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D7F74570E4CE1AE003225C6 /* Sparkle.framework */; };
-		1D7F745B0E4CE1CD003225C6 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D7F74570E4CE1AE003225C6 /* Sparkle.framework */; };
 		1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; };
 		1D80FBD40CBBD3B700102A1C /* MMFullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullscreenWindow.m */; };
 		1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; };
-		1D80FBE40CBBD6F200102A1C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D80FBE30CBBD6F200102A1C /* Carbon.framework */; };
+		1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; };
+		1D8B5A89104AFF2A002E59D5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A88104AFF2A002E59D5 /* Sparkle.framework */; };
+		1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; };
 		1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; };
 		1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; };
 		1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; };
@@ -65,7 +66,6 @@
 		1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; };
 		1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD3D51D0D82D4C9006E4320 /* ibeam.png */; };
 		1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */; };
-		1DD704310BA9F9C2008679E9 /* SpecialKeys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */; };
 		1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */; };
 		1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E50D50F80500052B9E /* Preferences.nib */; };
 		1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */; };
@@ -148,7 +148,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				1D7F745B0E4CE1CD003225C6 /* Sparkle.framework in Copy Frameworks */,
+				1D22121E104B04530086DFF1 /* Sparkle.framework in Copy Frameworks */,
 				1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
@@ -199,23 +199,24 @@
 		1D1474B90C567A910038FA2B /* MMWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindowController.h; sourceTree = "<group>"; };
 		1D1474BA0C567A910038FA2B /* MMWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindowController.m; sourceTree = "<group>"; };
 		1D22374A0E45DF4800E6FFFF /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Advanced.png; sourceTree = "<group>"; };
+		1D384A0D100D671700D3C22F /* KeyBinding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = KeyBinding.plist; sourceTree = "<group>"; };
 		1D3D190D0CA690FF0004A0A5 /* DejaVuSansMono-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "DejaVuSansMono-Bold.ttf"; path = "dejavu-ttf/DejaVuSansMono-Bold.ttf"; sourceTree = "<group>"; };
 		1D3D190E0CA690FF0004A0A5 /* DejaVuSansMono-BoldOblique.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "DejaVuSansMono-BoldOblique.ttf"; path = "dejavu-ttf/DejaVuSansMono-BoldOblique.ttf"; sourceTree = "<group>"; };
 		1D3D190F0CA690FF0004A0A5 /* DejaVuSansMono-Oblique.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "DejaVuSansMono-Oblique.ttf"; path = "dejavu-ttf/DejaVuSansMono-Oblique.ttf"; sourceTree = "<group>"; };
 		1D3D19100CA690FF0004A0A5 /* DejaVuSansMono.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = DejaVuSansMono.ttf; path = "dejavu-ttf/DejaVuSansMono.ttf"; sourceTree = "<group>"; };
 		1D493D570C5247BF00AB718C /* Vim */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = Vim; path = ../Vim; sourceTree = SOURCE_ROOT; };
 		1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PSMTabBarControl.xcodeproj; path = PSMTabBarControl/PSMTabBarControl.xcodeproj; sourceTree = "<group>"; };
-		1D6008820E96886D003763F0 /* FindAndReplace.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = FindAndReplace.nib; sourceTree = "<group>"; };
+		1D6008820E96886D003763F0 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/FindAndReplace.nib; sourceTree = "<group>"; };
 		1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMFindReplaceController.h; sourceTree = "<group>"; };
 		1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMFindReplaceController.m; sourceTree = "<group>"; };
-		1D7F74570E4CE1AE003225C6 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		1D80591D0E1185EA001699D1 /* Miscellaneous.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Miscellaneous.m; sourceTree = "<group>"; };
 		1D8059220E118663001699D1 /* Miscellaneous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Miscellaneous.h; sourceTree = "<group>"; };
 		1D80FBCF0CBBD3B700102A1C /* MMFullscreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMFullscreenWindow.h; sourceTree = "<group>"; };
 		1D80FBD00CBBD3B700102A1C /* MMFullscreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMFullscreenWindow.m; sourceTree = "<group>"; };
 		1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = "<group>"; };
 		1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = "<group>"; };
-		1D80FBE30CBBD6F200102A1C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		1D8B5A88104AFF2A002E59D5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = "<group>"; };
 		1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = "<group>"; };
 		1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = "<group>"; };
@@ -245,7 +246,6 @@
 		1DD3D51D0D82D4C9006E4320 /* ibeam.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ibeam.png; sourceTree = "<group>"; };
 		1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMApplication.h; sourceTree = "<group>"; };
 		1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMApplication.m; sourceTree = "<group>"; };
-		1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SpecialKeys.plist; sourceTree = "<group>"; };
 		1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SystemColors.plist; sourceTree = "<group>"; };
 		1DE3F8E60D50F80500052B9E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
 		1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMPreferenceController.h; sourceTree = "<group>"; };
@@ -286,9 +286,9 @@
 			files = (
 				1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-				1D80FBE40CBBD6F200102A1C /* Carbon.framework in Frameworks */,
 				0395A9C30D75D04D00881434 /* Security.framework in Frameworks */,
-				1D7F74580E4CE1AE003225C6 /* Sparkle.framework in Frameworks */,
+				1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */,
+				1D8B5A89104AFF2A002E59D5 /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -374,7 +374,6 @@
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				1D80FBE30CBBD6F200102A1C /* Carbon.framework */,
 				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
 			);
 			name = "Linked Frameworks";
@@ -478,8 +477,9 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				1D384A0D100D671700D3C22F /* KeyBinding.plist */,
 				1D9C602E0EF79C0C0034AD44 /* MacVim.icns */,
-				1D6008820E96886D003763F0 /* FindAndReplace.nib */,
+				1D8BEA73104992290069B072 /* FindAndReplace.nib */,
 				0395A8A90D72D88B00881434 /* General.png */,
 				0395A9590D74D47B00881434 /* Integration.png */,
 				1D22374A0E45DF4800E6FFFF /* Advanced.png */,
@@ -490,7 +490,6 @@
 				1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */,
 				1DE8CC610C5E2AAD003F56E3 /* Actions.plist */,
 				1DD04DEB0C529C5E006CDC2B /* Credits.rtf */,
-				1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */,
 				1D0E051B0BA5F83800B6049E /* Colors.plist */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
@@ -503,7 +502,8 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				1D7F74570E4CE1AE003225C6 /* Sparkle.framework */,
+				1D8B5A88104AFF2A002E59D5 /* Sparkle.framework */,
+				1D8B5A52104AF9FF002E59D5 /* Carbon.framework */,
 				0395AA980D76E86200881434 /* Edit in ODBEditor */,
 				0395A9C20D75D04D00881434 /* Security.framework */,
 				1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */,
@@ -549,6 +549,13 @@
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
 			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				Swedish,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* MacVim */;
 			projectDirPath = "";
 			projectReferences = (
@@ -593,7 +600,6 @@
 				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */,
-				1DD704310BA9F9C2008679E9 /* SpecialKeys.plist in Resources */,
 				1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */,
 				1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */,
 				1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */,
@@ -628,8 +634,9 @@
 				1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */,
 				1DCD00D20E50B2B700460166 /* TagJump.png in Resources */,
 				1DCD00D30E50B2B700460166 /* Undo.png in Resources */,
-				1D6008830E96886D003763F0 /* FindAndReplace.nib in Resources */,
+				1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */,
 				1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */,
+				1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -710,6 +717,14 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
+		1D8BEA73104992290069B072 /* FindAndReplace.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				1D6008820E96886D003763F0 /* English */,
+			);
+			name = FindAndReplace.nib;
+			sourceTree = "<group>";
+		};
 		1DE3F8E50D50F80500052B9E /* Preferences.nib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -729,63 +744,14 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		1D13D1610D560D9D0084F3AB /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 40;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = s;
-				HEADER_SEARCH_PATHS = PSMTabBarControl/source/;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PRODUCT_NAME = MacVim;
-				VERSIONING_SYSTEM = "apple-generic";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Universal;
-		};
-		1D13D1620D560D9D0084F3AB /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-			};
-			name = Universal;
-		};
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 50;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
@@ -794,12 +760,15 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = PSMTabBarControl/source/;
+				GCC_WARN_PEDANTIC = NO;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = "";
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = MacVim;
 				VERSIONING_SYSTEM = "apple-generic";
+				WARNING_CFLAGS = "-Wall";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -808,16 +777,11 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 50;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
@@ -826,10 +790,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = s;
-				HEADER_SEARCH_PATHS = PSMTabBarControl/source/;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = "";
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = MacVim;
 				VERSIONING_SYSTEM = "apple-generic";
 				WRAPPER_EXTENSION = app;
@@ -840,8 +805,10 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 			};
 			name = Debug;
@@ -849,8 +816,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 			};
 			name = Release;
@@ -863,7 +832,6 @@
 			buildConfigurations = (
 				C01FCF4B08A954540054247B /* Debug */,
 				C01FCF4C08A954540054247B /* Release */,
-				1D13D1610D560D9D0084F3AB /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -873,7 +841,6 @@
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
 				C01FCF5008A954540054247B /* Release */,
-				1D13D1620D560D9D0084F3AB /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

src/MacVim/Miscellaneous.h

@@ -12,20 +12,21 @@
 #import <Cocoa/Cocoa.h>
 #import "MacVim.h"
 
-#define MM_LOG_DEALLOCATIONS 0
 
+// TODO: Remove this when the inline IM code has been tested
+#define INCLUDE_OLD_IM_CODE
 
-#if MM_LOG_DEALLOCATIONS
-# define LOG_DEALLOC NSLog(@"%s %@", _cmd, [self className]);
-#else
-# define LOG_DEALLOC
-#endif
+// Disable ATSUI when compiling on 10.6.  This is because ATSUI is deprecated
+// on 10.6 and hence spews out masses of warning messages when building.  Also,
+// the ATSUI code currently does not work on 10.6.
+#define MM_ENABLE_ATSUI (MAC_OS_X_VERSION_MIN_REQUIRED<MAC_OS_X_VERSION_10_6)
 
 
 // NSUserDefaults keys
 extern NSString *MMTabMinWidthKey;
 extern NSString *MMTabMaxWidthKey;
 extern NSString *MMTabOptimumWidthKey;
+extern NSString *MMShowAddTabButtonKey;
 extern NSString *MMTextInsetLeftKey;
 extern NSString *MMTextInsetRightKey;
 extern NSString *MMTextInsetTopKey;
@@ -53,6 +54,10 @@ extern NSString *MMOpenLayoutKey;
 extern NSString *MMVerticalSplitKey;
 extern NSString *MMPreloadCacheSizeKey;
 extern NSString *MMLastWindowClosedBehaviorKey;
+extern NSString *MMLoadDefaultFontKey;
+#ifdef INCLUDE_OLD_IM_CODE
+extern NSString *MMUseInlineImKey;
+#endif // INCLUDE_OLD_IM_CODE
 
 
 // Enum for MMUntitledWindowKey
@@ -93,7 +98,7 @@ enum {
 @end
 
 
-@interface NSOpenPanel (MMExtras)
+@interface NSSavePanel (MMExtras)
 - (void)hiddenFilesButtonToggled:(id)sender;
 - (void)setShowsHiddenFiles:(BOOL)show;
 @end
@@ -111,8 +116,8 @@ enum {
 
 
 @interface NSToolbar (MMExtras)
-- (int)indexOfItemWithItemIdentifier:(NSString *)identifier;
-- (NSToolbarItem *)itemAtIndex:(int)idx;
+- (NSUInteger)indexOfItemWithItemIdentifier:(NSString *)identifier;
+- (NSToolbarItem *)itemAtIndex:(NSUInteger)idx;
 - (NSToolbarItem *)itemWithItemIdentifier:(NSString *)identifier;
 @end
 
@@ -123,12 +128,24 @@ enum {
 
 
 @interface NSNumber (MMExtras)
-- (int)tag;
+// HACK to allow font size to be changed via menu (bound to Cmd+/Cmd-)
+- (NSInteger)tag;
 @end
 
 
 
-// Create a view to be used as accessory for open panel.  This function assumes
-// ownership of the view so do not release it.
-NSView *openPanelAccessoryView();
+// Create a view with a "show hidden files" button to be used as accessory for
+// open/save panels.  This function assumes ownership of the view so do not
+// release it.
+NSView *showHiddenFilesView();
 
+
+// Convert filenames (which are in a variant of decomposed form, NFD, on HFS+)
+// to normalization form C (NFC).  (This is necessary because Vim does not
+// automatically compose NFD.)  For more information see:
+//     http://developer.apple.com/technotes/tn/tn1150.html
+//     http://developer.apple.com/technotes/tn/tn1150table.html
+//     http://developer.apple.com/qa/qa2001/qa1235.html
+//     http://www.unicode.org/reports/tr15/
+NSString *normalizeFilename(NSString *filename);
+NSArray *normalizeFilenames(NSArray *filenames);

src/MacVim/Miscellaneous.m

@@ -17,6 +17,7 @@
 NSString *MMTabMinWidthKey              = @"MMTabMinWidth";
 NSString *MMTabMaxWidthKey              = @"MMTabMaxWidth";
 NSString *MMTabOptimumWidthKey          = @"MMTabOptimumWidth";
+NSString *MMShowAddTabButtonKey         = @"MMShowAddTabButton";
 NSString *MMTextInsetLeftKey            = @"MMTextInsetLeft";
 NSString *MMTextInsetRightKey           = @"MMTextInsetRight";
 NSString *MMTextInsetTopKey             = @"MMTextInsetTop";
@@ -44,6 +45,10 @@ NSString *MMOpenLayoutKey               = @"MMOpenLayout";
 NSString *MMVerticalSplitKey            = @"MMVerticalSplit";
 NSString *MMPreloadCacheSizeKey         = @"MMPreloadCacheSize";
 NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
+NSString *MMLoadDefaultFontKey          = @"MMLoadDefaultFont";
+#ifdef INCLUDE_OLD_IM_CODE
+NSString *MMUseInlineImKey              = @"MMUseInlineIm";
+#endif // INCLUDE_OLD_IM_CODE
 
 
 
@@ -91,7 +96,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
 
 
 
-@implementation NSOpenPanel (MMExtras)
+@implementation NSSavePanel (MMExtras)
 
 - (void)hiddenFilesButtonToggled:(id)sender
 {
@@ -120,7 +125,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
     [invocation invoke];
 }
 
-@end // NSOpenPanel (MMExtras)
+@end // NSSavePanel (MMExtras)
 
 
 
@@ -198,10 +203,10 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
 
 @implementation NSToolbar (MMExtras)
 
-- (int)indexOfItemWithItemIdentifier:(NSString *)identifier
+- (NSUInteger)indexOfItemWithItemIdentifier:(NSString *)identifier
 {
     NSArray *items = [self items];
-    int i, count = [items count];
+    NSUInteger i, count = [items count];
     for (i = 0; i < count; ++i) {
         id item = [items objectAtIndex:i];
         if ([[item itemIdentifier] isEqual:identifier])
@@ -211,7 +216,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
     return NSNotFound;
 }
 
-- (NSToolbarItem *)itemAtIndex:(int)idx
+- (NSToolbarItem *)itemAtIndex:(NSUInteger)idx
 {
     NSArray *items = [self items];
     if (idx < 0 || idx >= [items count])
@@ -222,7 +227,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
 
 - (NSToolbarItem *)itemWithItemIdentifier:(NSString *)identifier
 {
-    int idx = [self indexOfItemWithItemIdentifier:identifier];
+    NSUInteger idx = [self indexOfItemWithItemIdentifier:identifier];
     return idx != NSNotFound ? [self itemAtIndex:idx] : nil;
 }
 
@@ -238,7 +243,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
     NSArray *existingItems = [self tabViewItems];
     NSEnumerator *e = [existingItems objectEnumerator];
     NSTabViewItem *item;
-    while (item = [e nextObject]){
+    while ((item = [e nextObject])) {
         [self removeTabViewItem:item];
     }
 }
@@ -250,7 +255,8 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
 
 @implementation NSNumber (MMExtras)
 
-- (int)tag
+// HACK to allow font size to be changed via menu (bound to Cmd+/Cmd-)
+- (NSInteger)tag
 {
     return [self intValue];
 }
@@ -261,7 +267,7 @@ NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior";
 
 
     NSView *
-openPanelAccessoryView()
+showHiddenFilesView()
 {
     // Return a new button object for each NSOpenPanel -- several of them
     // could be displayed at once.
@@ -270,13 +276,13 @@ openPanelAccessoryView()
     NSButton *button = [[[NSButton alloc]
         initWithFrame:NSMakeRect(0, 0, 140, 18)] autorelease];
     [button setTitle:
-        NSLocalizedString(@"Show Hidden Files", @"Open File Dialog")];
+        NSLocalizedString(@"Show Hidden Files", @"Show Hidden Files Checkbox")];
     [button setButtonType:NSSwitchButton];
 
     [button setTarget:nil];
     [button setAction:@selector(hiddenFilesButtonToggled:)];
 
-    // use the regular control size (checkbox is a bit smaller without this)
+    // Use the regular control size (checkbox is a bit smaller without this)
     NSControlSize buttonSize = NSRegularControlSize;
     float fontSize = [NSFont systemFontSizeForControlSize:buttonSize];
     NSCell *theCell = [button cell];
@@ -288,3 +294,28 @@ openPanelAccessoryView()
 
     return button;
 }
+
+
+
+
+    NSString *
+normalizeFilename(NSString *filename)
+{
+    return [filename precomposedStringWithCanonicalMapping];
+}
+
+    NSArray *
+normalizeFilenames(NSArray *filenames)
+{
+    NSMutableArray *outnames = [NSMutableArray array];
+    if (!filenames)
+        return outnames;
+
+    unsigned i, count = [filenames count];
+    for (i = 0; i < count; ++i) {
+        NSString *nfkc = normalizeFilename([filenames objectAtIndex:i]);
+        [outnames addObject:nfkc];
+    }
+
+    return outnames;
+}

src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj

@@ -93,7 +93,7 @@
 		13F8B88A07B434F6008AE28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl_Prefix.pch; path = source/PSMTabBarControl_Prefix.pch; sourceTree = "<group>"; };
 		53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PSMTabBarControl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "PSMTabBarControlFramework-Info.plist"; sourceTree = "<group>"; };
+		53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PSMTabBarControlFramework-Info.plist"; sourceTree = "<group>"; };
 		54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PSMTabBarControl.ibclassdescription; sourceTree = "<group>"; };
 		8D1AC9730486D14A00FE50C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D1AC97B0486D23100FE50C9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -123,7 +123,7 @@
 		A251BE930959A23A0058BC7F /* TabClose_Front_Rollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabClose_Front_Rollover.tif; path = images/TabClose_Front_Rollover.tif; sourceTree = "<group>"; };
 		A251BE940959A23A0058BC7F /* TabClose_Front.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabClose_Front.tif; path = images/TabClose_Front.tif; sourceTree = "<group>"; };
 		A251BE9B0959A2530058BC7F /* ReadMe.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = ReadMe.rtfd; sourceTree = "<group>"; };
-		A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = "<group>"; };
+		A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = "<group>"; };
 		A251BEC30959BC0E0058BC7F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		A268E7F809A9822900E082AA /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNew.png; path = images/AquaTabNew.png; sourceTree = "<group>"; };
 		A268E7F909A9822900E082AA /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewPressed.png; path = images/AquaTabNewPressed.png; sourceTree = "<group>"; };
@@ -533,63 +533,10 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		1D13D16D0D560DDA0084F3AB /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_LDFLAGS = (
-					"-seg1addr",
-					0xc0000000,
-				);
-				PRODUCT_NAME = PSMTabBarControl;
-				SYMROOT = ../build;
-			};
-			name = Universal;
-		};
-		1D13D16E0D560DDA0084F3AB /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				PRODUCT_NAME = All;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Universal;
-		};
-		1D13D16F0D560DDA0084F3AB /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-			};
-			name = Universal;
-		};
 		C056398008A954F8003078D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -602,10 +549,8 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_LDFLAGS = (
-					"-seg1addr",
-					0xc0000000,
-				);
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = PSMTabBarControl;
 				SYMROOT = ../build;
 				ZERO_LINK = NO;
@@ -615,7 +560,7 @@
 		C056398108A954F8003078D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH)";
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
@@ -625,10 +570,8 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_LDFLAGS = (
-					"-seg1addr",
-					0xc0000000,
-				);
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = PSMTabBarControl;
 				SYMROOT = ../build;
 			};
@@ -673,20 +616,24 @@
 		C056398C08A954F8003078D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SYMROOT = ../build;
 			};
 			name = Debug;
 		};
 		C056398D08A954F8003078D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SYMROOT = ../build;
 			};
 			name = Release;
 		};
@@ -698,7 +645,6 @@
 			buildConfigurations = (
 				C056398008A954F8003078D8 /* Debug */,
 				C056398108A954F8003078D8 /* Release */,
-				1D13D16D0D560DDA0084F3AB /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -708,7 +654,6 @@
 			buildConfigurations = (
 				C056398808A954F8003078D8 /* Debug */,
 				C056398908A954F8003078D8 /* Release */,
-				1D13D16E0D560DDA0084F3AB /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -718,7 +663,6 @@
 			buildConfigurations = (
 				C056398C08A954F8003078D8 /* Debug */,
 				C056398D08A954F8003078D8 /* Release */,
-				1D13D16F0D560DDA0084F3AB /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/winckler.pbxuser

@@ -1,178 +0,0 @@
-// !$*UTF8*$!
-{
-	0259C573FE90428111CA0C5A /* Project object */ = {
-		activeBuildConfigurationName = Debug;
-		activeTarget = 53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */;
-		codeSenseManager = 1D82C6110AC093AF00AAD418 /* Code sense */;
-		perUserDictionary = {
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					243,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					200,
-					63,
-					20,
-					48,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 223743414;
-			PBXWorkspaceStateSaveDate = 223743414;
-		};
-		sourceControlManager = 1D82C6100AC093AF00AAD418 /* Source Control */;
-		userBuildSettings = {
-		};
-	};
-	0259C576FE90428111CA0C5A /* PSMTabBarControl.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {4143, 22432}}";
-			sepNavSelRange = "{48941, 0}";
-			sepNavVisRect = "{{0, 1451}, {459, 186}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1077, 2000}}";
-			sepNavSelRange = "{3919, 0}";
-			sepNavVisRect = "{{0, 1387}, {711, 613}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	1D82C6100AC093AF00AAD418 /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-		};
-		scmType = "";
-	};
-	1D82C6110AC093AF00AAD418 /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */ = {
-		activeExec = 0;
-	};
-	53DF6901067E5B8E0090B5B0 /* All */ = {
-		activeExec = 0;
-	};
-	A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1420, 7040}}";
-			sepNavSelRange = "{14900, 0}";
-			sepNavVisRect = "{{0, 3817}, {978, 600}}";
-			sepNavWindowFrame = "{{6, 17}, {1017, 729}}";
-		};
-	};
-	A246FB040A2BD6F9005BDF7B /* PSMTabBarControlDoc.html */ = {
-		uiCtxt = {
-			sepNavWindowFrame = "{{15, 3}, {750, 742}}";
-		};
-	};
-	A251BE830959A1B90058BC7F /* PSMTabBarCell.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {804, 1648}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 744}, {619, 599}}";
-			sepNavWindowFrame = "{{15, 13}, {658, 728}}";
-		};
-	};
-	A251BE840959A1B90058BC7F /* PSMTabBarCell.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {972, 6368}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 5769}, {619, 599}}";
-			sepNavWindowFrame = "{{15, 13}, {658, 728}}";
-		};
-	};
-	A251BE8A0959A1EA0058BC7F /* AppController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {711, 613}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {711, 613}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	A251BE8B0959A1EA0058BC7F /* FakeModel.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {711, 613}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {711, 613}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	A251BE8C0959A1EA0058BC7F /* FakeModel.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {711, 1248}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 117}, {711, 613}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	A251BE9B0959A2530058BC7F /* ReadMe.rtfd */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {711, 3047}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 2419}, {711, 628}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	A2A711BD09E5BF0500D0089B /* WindowController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {958, 944}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 197}, {711, 613}}";
-			sepNavWindowFrame = "{{15, -1}, {750, 742}}";
-		};
-	};
-	A2A711BE09E5BF0500D0089B /* WindowController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1399, 4496}}";
-			sepNavSelRange = "{2008, 125}";
-			sepNavVisRect = "{{0, 824}, {784, 608}}";
-			sepNavWindowFrame = "{{15, 4}, {823, 737}}";
-		};
-	};
-	A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1728, 8400}}";
-			sepNavSelRange = "{683, 5}";
-			sepNavVisRect = "{{0, 0}, {781, 608}}";
-			sepNavWindowFrame = "{{15, 4}, {820, 737}}";
-		};
-	};
-}

src/MacVim/PSMTabBarControl/source/NSBezierPath_AMShading.m

@@ -8,22 +8,31 @@
 
 #import "NSBezierPath_AMShading.h"
 
+// CGFloat was introduced in OS X 10.5
+#ifndef CGFLOAT_DEFINED
+  typedef float CGFloat;
+# define CGFLOAT_MIN FLT_MIN
+# define CGFLOAT_MAX FLT_MAX
+# define CGFLOAT_IS_DOUBLE 0
+# define CGFLOAT_DEFINED 1
+#endif
+
 
 @implementation NSBezierPath (AMShading)
 
-static void linearShadedColor(void *info, const float *in, float *out)
+static void linearShadedColor(void *info, const CGFloat *in, CGFloat *out)
 {
-	float *colors = info;
+	CGFloat *colors = info;
 	*out++ = colors[0] + *in * colors[8];
 	*out++ = colors[1] + *in * colors[9];
 	*out++ = colors[2] + *in * colors[10];
 	*out++ = colors[3] + *in * colors[11];
 }
 
-static void bilinearShadedColor(void *info, const float *in, float *out)
+static void bilinearShadedColor(void *info, const CGFloat *in, CGFloat *out)
 {
-	float *colors = info;
-	float factor = (*in)*2.0;
+	CGFloat *colors = info;
+	CGFloat factor = (*in)*2.0;
 	if (*in > 0.5) {
 		factor = 2-factor;
 	}
@@ -41,7 +50,7 @@ static void bilinearShadedColor(void *info, const float *in, float *out)
 	CGPoint startPoint = {0, 0};
 	CGPoint endPoint = {0, 0};
 	CGFunctionRef function;
-	float colors[12]; // pointer to color values
+	CGFloat colors[12]; // pointer to color values
 	
 	// get my context
 	CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
@@ -70,8 +79,8 @@ static void bilinearShadedColor(void *info, const float *in, float *out)
 	colorspace = CGColorSpaceCreateDeviceRGB();
 	
 	size_t components = 1 + CGColorSpaceGetNumberOfComponents(colorspace);
-	static const float  domain[2] = {0.0, 1.0};
-	static const float  range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
+	static const CGFloat  domain[2] = {0.0, 1.0};
+	static const CGFloat  range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
 	static const CGFunctionCallbacks callbacks = {0, &shadedColor, NULL};
 
 	// Create a CGFunctionRef that describes a function taking 1 input and kChannelsPerColor outputs.
@@ -113,7 +122,7 @@ static void bilinearShadedColor(void *info, const float *in, float *out)
 	CGPoint startPoint = {0, 0};
 	CGPoint endPoint = {0, 0};
 	CGFunctionRef function;
-	float colors[12]; // pointer to color values
+	CGFloat colors[12]; // pointer to color values
 	
 	// get my context
 	CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
@@ -141,8 +150,8 @@ static void bilinearShadedColor(void *info, const float *in, float *out)
 	// draw gradient
 	colorspace = CGColorSpaceCreateDeviceRGB();
 	size_t components = 1 + CGColorSpaceGetNumberOfComponents(colorspace);
-	static const float  domain[2] = {0.0, 1.0};
-	static const float  range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
+	static const CGFloat  domain[2] = {0.0, 1.0};
+	static const CGFloat  range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1};
 	//static const CGFunctionCallbacks callbacks = {0, &bilinearShadedColor, NULL};
 	
 	// Create a CGFunctionRef that describes a function taking 1 input and kChannelsPerColor outputs.

src/MacVim/PSMTabBarControl/source/PSMTabBarControl.h

@@ -12,6 +12,18 @@
 
 #import <Cocoa/Cocoa.h>
 
+#ifndef NSINTEGER_DEFINED
+// NSInteger was introduced in 10.5
+# if __LP64__ || NS_BUILD_32_LIKE_64
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+# else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+# endif
+# define NSINTEGER_DEFINED 1
+#endif
+
 #define kPSMTabBarControlHeight 22
 // internal cell border
 #define MARGIN_X        6
@@ -39,7 +51,12 @@ enum {
     PSMTab_PositionSingleMask		= 1 << 7
 };
 
-@interface PSMTabBarControl : NSControl {
+@interface PSMTabBarControl : NSControl
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
+    // 10.6 has turned delegate messages into formal protocols
+    <NSTabViewDelegate>
+#endif
+{
     
     // control basics
     NSMutableArray              *_cells;                    // the cells that draw the tabs
@@ -127,10 +144,10 @@ enum {
 - (void)tabView:(NSTabView *)aTabView didCloseTabViewItem:(NSTabViewItem *)tabViewItem;
 - (void)tabView:(NSTabView *)aTabView didDragTabViewItem:(NSTabViewItem *)tabViewItem toIndex:(int)idx;
 
-- (NSDragOperation)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingEntered:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
-- (NSDragOperation)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingUpdated:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
-- (void)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingExited:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
-- (BOOL)tabBarControl:(PSMTabBarControl *)theTabBarControl prepareForDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
-- (BOOL)tabBarControl:(PSMTabBarControl *)theTabBarControl performDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
-- (void)tabBarControl:(PSMTabBarControl *)theTabBarControl concludeDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(unsigned)tabIndex;
+- (NSDragOperation)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingEntered:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
+- (NSDragOperation)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingUpdated:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
+- (void)tabBarControl:(PSMTabBarControl *)theTabBarControl draggingExited:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
+- (BOOL)tabBarControl:(PSMTabBarControl *)theTabBarControl prepareForDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
+- (BOOL)tabBarControl:(PSMTabBarControl *)theTabBarControl performDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
+- (void)tabBarControl:(PSMTabBarControl *)theTabBarControl concludeDragOperation:(id <NSDraggingInfo>)sender forTabAtIndex:(NSUInteger)tabIndex;
 @end

src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m

@@ -57,8 +57,8 @@
 
     // convenience
 - (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
-- (unsigned)indexOfCellAtPoint:(NSPoint)point;
-- (unsigned)indexOfCellAtPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
+- (NSUInteger)indexOfCellAtPoint:(NSPoint)point;
+- (NSUInteger)indexOfCellAtPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
 - (PSMTabBarCell *)lastVisibleTab;
 - (int)numberOfVisibleTabs;
 
@@ -412,7 +412,7 @@
                 [bindingOptions setObject:NSNegateBooleanTransformerName forKey:@"NSValueTransformerName"];
                 [[cell indicator] bind:@"animate" toObject:[item identifier] withKeyPath:@"selection.isProcessing" options:nil];
                 [[cell indicator] bind:@"hidden" toObject:[item identifier] withKeyPath:@"selection.isProcessing" options:bindingOptions];
-                [[item identifier] addObserver:self forKeyPath:@"selection.isProcessing" options:nil context:nil];
+                [[item identifier] addObserver:self forKeyPath:@"selection.isProcessing" options:0 context:nil];
             } 
         } 
     } 
@@ -425,7 +425,7 @@
                 NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary];
                 [bindingOptions setObject:NSIsNotNilTransformerName forKey:@"NSValueTransformerName"];
                 [cell bind:@"hasIcon" toObject:[item identifier] withKeyPath:@"selection.icon" options:bindingOptions];
-                [[item identifier] addObserver:self forKeyPath:@"selection.icon" options:nil context:nil];
+                [[item identifier] addObserver:self forKeyPath:@"selection.icon" options:0 context:nil];
             } 
         } 
     }
@@ -436,7 +436,7 @@
         if([[item identifier] respondsToSelector:@selector(content)]){
             if([[[[cell representedObject] identifier] content] respondsToSelector:@selector(objectCount)]){
                 [cell bind:@"count" toObject:[item identifier] withKeyPath:@"selection.objectCount" options:nil];
-                [[item identifier] addObserver:self forKeyPath:@"selection.objectCount" options:nil context:nil];
+                [[item identifier] addObserver:self forKeyPath:@"selection.objectCount" options:0 context:nil];
             } 
         } 
     }
@@ -993,7 +993,7 @@
 }
 
 // NSDraggingSource
-- (unsigned int)draggingSourceOperationMaskForLocal:(BOOL)isLocal
+- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
 {
     return (isLocal ? NSDragOperationMove : NSDragOperationNone);
 }
@@ -1083,7 +1083,7 @@
 #if 1
         // HACK!  Notify the delegate that a tab was dragged to a new position.
         if (delegate && [delegate respondsToSelector:@selector(tabView:didDragTabViewItem:toIndex:)]) {
-            int idx = [[self representedTabViewItems] indexOfObject:tvi];
+            NSUInteger idx = [[self representedTabViewItems] indexOfObject:tvi];
             if (NSNotFound != idx) {
                 [delegate tabView:[self tabView] didDragTabViewItem:tvi toIndex:idx];
             }
@@ -1252,7 +1252,9 @@
 {
     if([self delegate]){
         if([[self delegate] respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)]){
-            return (int)[[self delegate] performSelector:@selector(tabView:shouldSelectTabViewItem:) withObject:aTabView withObject:tabViewItem];
+            // This is an ugly hack.  tabView:shouldSelectTabViewItem: returns
+            // a BOOL and performSelector: assumes that it returns an id.
+            return nil != [[self delegate] performSelector:@selector(tabView:shouldSelectTabViewItem:) withObject:aTabView withObject:tabViewItem];
         } else {
             return YES;
         }
@@ -1414,19 +1416,19 @@
 
 - (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame
 {
-    unsigned i = [self indexOfCellAtPoint:point cellFrame:outFrame];
+    NSUInteger i = [self indexOfCellAtPoint:point cellFrame:outFrame];
     if (i == NSNotFound)
         return nil;
     PSMTabBarCell *cell = [_cells objectAtIndex:i];
     return cell;
 }
 
-- (unsigned)indexOfCellAtPoint:(NSPoint)point
+- (NSUInteger)indexOfCellAtPoint:(NSPoint)point
 {
     return [self indexOfCellAtPoint:point cellFrame:NULL];
 }
 
-- (unsigned)indexOfCellAtPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame
+- (NSUInteger)indexOfCellAtPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame
 {
     NSRect aRect = [self genericCellRect];
     
@@ -1434,7 +1436,7 @@
         return NSNotFound;
     }
     
-    int i, cnt = [_cells count];
+    NSUInteger i, cnt = [_cells count];
     for(i = 0; i < cnt; i++){
         PSMTabBarCell *cell = [_cells objectAtIndex:i];
         float width = [cell width];

src/MacVim/PlugInGUI.m

@@ -120,7 +120,7 @@ NSString *MMPlugInViewPboardType = @"MMPlugInViewPboardType";
     if ((self = [super init]) == nil) return nil;
 
     if (![NSBundle loadNibNamed:@"PlugInView" owner:self])
-        NSLog(@"Error loading PlugIn nib");
+        ASLogErr(@"Error loading PlugIn nib");
 
     [titleField setStringValue:title];
 
@@ -196,6 +196,8 @@ NSString *MMPlugInViewPboardType = @"MMPlugInViewPboardType";
 
 - (void)dealloc
 {
+    ASLogDebug(@"");
+
     [fillerView release]; fillerView = nil;
     [super dealloc];
 }

src/MacVim/PlugInImpl.m

@@ -98,7 +98,7 @@ static int MMPlugInArchMinorVersion = 0;
 
 - (void)dealloc
 {
-    //NSLog(@"%@ %s", [self className], _cmd);
+    ASLogDebug(@"");
 
     [plugInViews release]; plugInViews = nil;
     [instances release]; instances = nil;
@@ -113,8 +113,10 @@ static int MMPlugInArchMinorVersion = 0;
     NSString *errstr = nil;
     id res = [vimController evaluateVimExpressionCocoa:vimExpression
                                            errorString:&errstr];
-    if (!res)
-        [NSException raise:@"VimEvaluationException" format:errstr];
+    if (!res) {
+        // Setting format to %@ instead of just passing errstr avoids warning.
+        [NSException raise:@"VimEvaluationException" format:@"%@", errstr];
+    }
 
     return res;
 }
@@ -126,8 +128,6 @@ static int MMPlugInArchMinorVersion = 0;
 
 - (void)addPlugInView:(NSView *)view withTitle:(NSString *)title
 {
-    //NSLog(@"%@ %s", [self className], _cmd);
-
     // Do this here so that the drawer is never opened automatically when there
     // are no plugin views.
     if ([[NSUserDefaults standardUserDefaults]

src/MacVim/RBSplitSubview.m

@@ -6,6 +6,7 @@
 //  Copyright 2004-2006 Rainer Brockerhoff.
 //	Some Rights Reserved under the Creative Commons Attribution License, version 2.5, and/or the MIT License.
 //
+#ifdef MM_ENABLE_PLUGINS
 
 #import "RBSplitView.h"
 #import "RBSplitViewPrivateDefines.h"
@@ -925,3 +926,4 @@ static animationData* currentAnimation = NULL;
 
 @end
 
+#endif // MM_ENABLE_PLUGINS

src/MacVim/RBSplitView.m

@@ -6,6 +6,7 @@
 //  Copyright 2004-2006 Rainer Brockerhoff.
 //	Some Rights Reserved under the Creative Commons Attribution License, version 2.5, and/or the MIT License.
 //
+#ifdef MM_ENABLE_PLUGINS
 
 #import "RBSplitView.h"
 #import "RBSplitViewPrivateDefines.h"
@@ -1732,3 +1733,4 @@ static inline float fMAX(float a,float b) {
 
 @end
 
+#endif // MM_ENABLE_PLUGINS

src/MacVim/README

@@ -20,16 +20,16 @@ is very easy to pick up if you know C and some object oriented programming.)
 Each editor window in MacVim runs its own Vim process (but there is always
 only one MacVim process).  Communication between MacVim and a Vim process is
 done using Distributed Objects (DO).  Each Vim process is represented by a
-backend object (MMBackend) and it communicates with a frontend object in the
-Vim process (MMVimController).  The interface between the backend and frontend
+backend object (MMBackend) and it communicates with the frontend object in the
+Vim process (MMAppController).  The interface between the backend and frontend
 is defined in MacVim.h.
 
 The frontend sends input to the backend by calling 
 -[MMBackend processInput:data:].  The backend queues output on a command queue
 and sends it to the frontend at opportune times by calling
--[MMVimController processCommandQueue:].  These are both asynchronous calls so
-MacVim can keep drawing and receiving input while Vim is working away, thus
-always keeping the user interface responsive.
+-[MMAppController processInput:forIdentifier:].  These are both asynchronous
+calls so MacVim can keep drawing and receiving input while Vim is working away,
+thus always keeping the user interface responsive.
 
 The state of each editor window is kept entirely in the Vim process.  MacVim
 should remain "ignorant" in the sense that it knows nothing of the actual
@@ -46,7 +46,7 @@ to MacVim inside -[MMBackend queueVimStateMessage].
 
 Vim:
 
-Hooks from within Vim are implmented in gui_macvim.m, the name of such
+Hooks from within Vim are implemented in gui_macvim.m, the name of such
 functions usually start with "gui_mch_" and they should simply put a message
 on the output queue, by calling queueMessage:properties: on the singleton
 MMBackend object [MMBackend sharedInstance] (see e.g. gui_mch_destroy_menu()).
@@ -63,7 +63,7 @@ for some reason fails to update the run loop then incoming DO calls will not
 be processed and for this reason it is best to avoid making synchronous DO
 calls from MacVim.  (If synchronous calls must be made then it is important to
 set proper timeouts so that MacVim doesn't "hang", see
--[MMVimConroller sendMessageNow:::] to see how this can be done.)
+-[MMVimController sendMessageNow:::] to see how this can be done.)
 
 
 MacVim:
@@ -71,16 +71,15 @@ MacVim:
 The main nib of MacVim.app is MainMenu.nib which contains the default menu and
 an instance of MMAppController, which is connected as the delegate of
 NSApplication.  That means, when MacVim starts it will load this nib file and
-automatically create an instance of the MMAppController singleton.
+automatically create an instance of the MMAppController singleton.  All
+incoming distributed object calls go via MMAppController.
 
 A new editor window is opened by calling
 -[MMAppController launchVimProcessWithArguments:].  This functions starts a
 new Vim process (by executing the Vim binary).  The Vim process lets MacVim
 know when it has launched by calling -[MMAppController connectBackend:pid:]
-and MacVim responds to this message by creating a new frontend object
-(MMVimController) and returns a proxy to this object back to the Vim process.
-From this point onward the Vim process communicates directly with the
-MMVimController.
+and MacVim responds to this message by creating a new vim controller and
+returns an identifier for this object back to the Vim process.
 
 The MMVimController represents the frontend of a Vim process inside MacVim.
 It coordinates all communication with the Vim process and delegates output
@@ -88,7 +87,7 @@ that affects visual presentation to a MMWindowController object.  Read the
 Cocoa documentation on the responsibilities of a window controller.
 
 Input (keyboard & mouse) handling and drawing is handled by a helper object
-(MMTextViewHelper) to the current text view (MMTextView, MMAtsuiTextView).
+(MMTextViewHelper) to the current text view (MMTextView, MMAtsuiTextView, ...).
 
 
 Distributed Object dangers:
@@ -106,7 +105,7 @@ message may arrive.
 the menu flashes briefly.  During this "flash" a modal loop is entered.
 
 Item 1 can cause a problem if MacVim sends a synchronous message and before a
-reply reacheds MacVim another message is received.  From the source code it
+reply reaches MacVim another message is received.  From the source code it
 looks like the synchronous message blocks but in fact the other message is
 executed during this "block".  If the other message changes state radically
 something may go wrong after the synchronous DO message returns.
@@ -117,8 +116,8 @@ which may be even more puzzling.
 One way to alleviate these problems is to ensure a DO message isn't entered
 twice by setting a boolean at the beginning of the message and clearing it
 afterwards.  If the boolean is already set when entering the call must somehow
-be delayed.  See -[MMVimController processCommandQueue:] for a concrete
-example.
+be delayed.  See processInput:forIdentifier: and processInputQueues: inside
+MMAppController for a concrete example.
 
 Another danger is that we must take care when releasing objects that Cocoa may
 be using.  See -[MMVimController connectionDidDie:] how MacVim releases
@@ -133,7 +132,7 @@ what they contain:
     MMAppController.*       Everything related to running the application
     MMBackend.*             Object representing a Vim process in backend
     MMTextView.*            Handles input and drawing
-    MMVimController.*       Object representing a Vim Process in frontend
+    MMVimController.*       Object representing a Vim process in frontend
     MMVimView.*             Cocoa view object
     MMWindowController.*    Coordinates visual presentation
     MacVim.*                Code shared between MacVim and Vim
@@ -161,4 +160,4 @@ The application bundle can be found inside "src/MacVim/build/Release".
 
 
 Bjorn Winckler <bjorn.winckler@gmail.com>
-November 22, 2008
+April 5, 2009

src/MacVim/README-repo.txt

@@ -0,0 +1,23 @@
+MacVim is a port of the text editor Vim to Mac OS X.  More information can be
+found on the [project webpage][gcode].  The file `src/MacVim/README` gives an
+overview of the MacVim source code.
+
+
+### Branches ###
+
+`master`
+:   MacVim and core Vim sources
+`vim`
+:   Core Vim sources pulled from the SVN repository with the latest runtime
+:   files from the Vim FTP included
+`stable`
+:   Used to build the Stable binary distribution
+`feat/core-text`
+:   Core Text renderer (fast with improved Unicode rendering, but has some
+:   display issues)
+
+_Note:_ Branches starting with `feat/` are experimental and will be rebased
+against master occasionally (other branches will not be rebased).
+
+
+[gcode]:    http://code.google.com/p/macvim/

src/MacVim/SpecialKeys.plist

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>KA</key>
-	<string>KA</string>
-	<key></key>
-	<string>kb</string>
-	<key></key>
-	<string>ku</string>
-	<key></key>
-	<string>kd</string>
-	<key></key>
-	<string>kl</string>
-	<key></key>
-	<string>kr</string>
-	<key></key>
-	<string>k1</string>
-	<key></key>
-	<string>k2</string>
-	<key></key>
-	<string>k3</string>
-	<key></key>
-	<string>k4</string>
-	<key></key>
-	<string>k5</string>
-	<key></key>
-	<string>k6</string>
-	<key></key>
-	<string>k7</string>
-	<key></key>
-	<string>k8</string>
-	<key></key>
-	<string>k9</string>
-	<key></key>
-	<string>k;</string>
-	<key></key>
-	<string>F1</string>
-	<key></key>
-	<string>F2</string>
-	<key></key>
-	<string>F3</string>
-	<key></key>
-	<string>F4</string>
-	<key></key>
-	<string>F5</string>
-	<key></key>
-	<string>F6</string>
-	<key></key>
-	<string>kD</string>
-	<key></key>
-	<string>kh</string>
-	<key></key>
-	<string>@7</string>
-	<key></key>
-	<string>kP</string>
-	<key></key>
-	<string>kN</string>
-	<key></key>
-	<string>%1</string>
-</dict>
-</plist>

src/MacVim/edit-in-odb/Edit in ODBEditor.xcodeproj/project.pbxproj

@@ -28,7 +28,7 @@
 		17966369093A122C00138851 /* WebView: Edit in ODBEditor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "WebView: Edit in ODBEditor.mm"; path = "src/WebView: Edit in ODBEditor.mm"; sourceTree = "<group>"; };
 		32DBCF630370AF2F00C91783 /* Edit in ODBEditor_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Edit in ODBEditor_Prefix.pch"; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* Edit in ODBEditor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Edit in ODBEditor.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
-		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+		8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
@@ -196,42 +196,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		1DD3D5530D82D8D7006E4320 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Edit in ODBEditor_Prefix.pch";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "";
-				OTHER_LDFLAGS = (
-					"-undefined",
-					dynamic_lookup,
-				);
-				PRODUCT_NAME = "Edit in ODBEditor";
-				SYMROOT = ../build;
-				WRAPPER_EXTENSION = bundle;
-			};
-			name = Universal;
-		};
-		1DD3D5540D82D8D7006E4320 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_CPP_RTTI = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-			};
-			name = Universal;
-		};
 		1DEB913B08733D840010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -282,7 +246,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Debug;
 		};
@@ -295,7 +258,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Release;
 		};
@@ -307,7 +269,6 @@
 			buildConfigurations = (
 				1DEB913B08733D840010E9CD /* Debug */,
 				1DEB913C08733D840010E9CD /* Release */,
-				1DD3D5530D82D8D7006E4320 /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -317,7 +278,6 @@
 			buildConfigurations = (
 				1DEB913F08733D840010E9CD /* Debug */,
 				1DEB914008733D840010E9CD /* Release */,
-				1DD3D5540D82D8D7006E4320 /* Universal */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

src/MacVim/edit-in-odb/src/Edit in ODBEditor.mm

@@ -220,7 +220,11 @@ struct PBX_SelectionRange
 	}
 	else
 	{
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+		[[NSFileManager defaultManager] removeItemAtPath:fileName error:NULL];
+#else
 		[[NSFileManager defaultManager] removeFileAtPath:fileName handler:nil];
+#endif
 		[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
 	}
 
@@ -256,7 +260,7 @@ struct PBX_SelectionRange
 	{
 		[editMenu addItem:[NSMenuItem separatorItem]];
 		NSString* ellips = [NSString stringWithUTF8String:"\xe2\x80\xa6"]; // utf-8 for the '...' character (literal utf8 is not allowed in source code)
-		id <NSMenuItem> menuItem = [editMenu addItemWithTitle:[NSString stringWithFormat:@"Edit in %@%@", ODBEditorName, ellips] action:@selector(editInODBEditor:) keyEquivalent:@"E"];
+		NSMenuItem *menuItem = [editMenu addItemWithTitle:[NSString stringWithFormat:@"Edit in %@%@", ODBEditorName, ellips] action:@selector(editInODBEditor:) keyEquivalent:@"E"];
 		[menuItem setKeyEquivalentModifierMask:NSControlKeyMask | NSCommandKeyMask];
 	}
 }

src/MacVim/edit-in-odb/src/WebView: Edit in ODBEditor.mm

@@ -313,7 +313,11 @@ static DOMHTMLTextAreaElement* find_active_text_area (WebView* view)
 
 		if(selection)
 		{
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+			str = convert_dom_to_text([[[self mainFrame] DOMDocument] createTreeWalker:selection whatToShow:DOM_SHOW_ALL filter:nil expandEntityReferences:YES]);
+#else
 			str = convert_dom_to_text([[[self mainFrame] DOMDocument] createTreeWalker:selection :DOM_SHOW_ALL :nil :YES]);
+#endif
 			while([str hasSuffix:@"\n\n"])
 				str = [str substringToIndex:[str length]-1];
 

src/MacVim/gui_macvim.m

@@ -22,13 +22,12 @@
 
 // NOTE: The default font is bundled with the application.
 static NSString *MMDefaultFontName = @"DejaVu Sans Mono";
-static float MMDefaultFontSize = 12.0f;
-static float MMMinFontSize = 6.0f;
-static float MMMaxFontSize = 100.0f;
-static BOOL gui_mch_init_has_finished = NO;
+static int MMDefaultFontSize       = 12;
+static int MMMinFontSize           = 6;
+static int MMMaxFontSize           = 100;
 
 
-static NSFont *gui_macvim_font_with_name(char_u *name);
+static GuiFont gui_macvim_font_with_name(char_u *name);
 static int specialKeyToNSKey(int key);
 static int vimModMaskToEventModifierFlags(int mods);
 
@@ -39,32 +38,52 @@ vimmenu_T *menu_for_descriptor(NSArray *desc);
 
 // -- Initialization --------------------------------------------------------
 
+    void
+macvim_early_init()
+{
+    NSBundle *bundle = [NSBundle mainBundle];
+    if (bundle) {
+        // Set environment variables $VIM and $VIMRUNTIME
+        NSString *path = [[bundle resourcePath]
+                                        stringByAppendingPathComponent:@"vim"];
+        vim_setenv((char_u*)"VIM", (char_u*)[path UTF8String]);
+
+        path = [path stringByAppendingPathComponent:@"runtime"];
+        vim_setenv((char_u*)"VIMRUNTIME", (char_u*)[path UTF8String]);
+    }
+
+#if 0   // NOTE: setlocale(LC_ALL, "") seems to work after a restart so this is
+        // not necessary.  The locale used depends on what "Region" is set
+        // inside the "Formats" tab of the "International" System Preferences
+        // pane.
+    // Try to ensure that the locale is set to match that used by NSBundle to
+    // load localized resources.  If there is a mismatch e.g. between the
+    // MacVim menu and other menus, then this code needs to change (nb. the
+    // MacVim menu is set up inside a nib file so the locale used for it is
+    // chosen by NSBundle and the other menus are set up by Vim so their locale
+    // matches whatever we set here).
+    NSLocale *loc = [NSLocale currentLocale];
+    if (loc) {
+        NSString *s = [NSString stringWithFormat:@"%@_%@.UTF-8",
+                                    [loc objectForKey:NSLocaleLanguageCode],
+                                    [loc objectForKey:NSLocaleCountryCode]];
+        setlocale(LC_ALL, [s UTF8String]);
+        fprintf(stderr, "locale=%s\n", [s UTF8String]);
+        fflush(stderr);
+    }
+#endif
+}
+
+
 /*
  * Parse the GUI related command-line arguments.  Any arguments used are
  * deleted from argv, and *argc is decremented accordingly.  This is called
  * when vim is started, whether or not the GUI has been started.
+ * NOTE: This function will be called twice if the Vim process forks.
  */
     void
 gui_mch_prepare(int *argc, char **argv)
 {
-    //NSLog(@"gui_mch_prepare(argc=%d)", *argc);
-
-    // Set environment variables $VIM and $VIMRUNTIME
-    // NOTE!  If vim_getenv is called with one of these as parameters before
-    // they have been set here, they will most likely end up with the wrong
-    // values!
-    //
-    // TODO:
-    // - ensure this is called first to avoid above problem
-    // - encoding
-
-    NSString *path = [[[NSBundle mainBundle] resourcePath]
-        stringByAppendingPathComponent:@"vim"];
-    vim_setenv((char_u*)"VIM", (char_u*)[path UTF8String]);
-
-    path = [path stringByAppendingPathComponent:@"runtime"];
-    vim_setenv((char_u*)"VIMRUNTIME", (char_u*)[path UTF8String]);
-
     int i;
     for (i = 0; i < *argc; ++i) {
         if (strncmp(argv[i], "--mmwaitforack", 14) == 0) {
@@ -75,6 +94,19 @@ gui_mch_prepare(int *argc, char **argv)
             break;
         }
     }
+
+#ifdef FEAT_NETBEANS_INTG
+    for (i = 0; i < *argc; ++i) {
+        if (strncmp(argv[i], "-nb", 3) == 0) {
+            usingNetbeans++;
+            netbeansArg = argv[i];
+            --*argc;
+            if (*argc > i)
+                mch_memmove(&argv[i], &argv[i+1], (*argc-i) * sizeof(char*));
+            break;
+        }
+    }
+#endif
 }
 
 
@@ -85,7 +117,29 @@ gui_mch_prepare(int *argc, char **argv)
     int
 gui_mch_init_check(void)
 {
-    //NSLog(@"gui_mch_init_check()");
+    ASLInit();
+    ASLogDebug(@"");
+
+    // Restore autosaved rows & columns
+    CFNumberRef rowsRef, colsRef;
+    rowsRef = CFPreferencesCopyAppValue((CFStringRef)MMAutosaveRowsKey,
+                                        kCFPreferencesCurrentApplication);
+    colsRef = CFPreferencesCopyAppValue((CFStringRef)MMAutosaveColumnsKey,
+                                        kCFPreferencesCurrentApplication);
+    if (rowsRef && colsRef) {
+        int rows, cols;
+        if (CFNumberGetValue(rowsRef, kCFNumberIntType, &rows)
+                && CFNumberGetValue(colsRef, kCFNumberIntType, &cols)) {
+            if (rows > 4 && rows < 1000 && cols > 29 && cols < 4000) {
+                Rows = rows;
+                Columns = cols;
+            } else {
+                ASLogWarn(@"Autosaved window dimensions invalid: %dx%d",
+                        cols, rows);
+            }
+        }
+    }
+
     return OK;
 }
 
@@ -97,16 +151,7 @@ gui_mch_init_check(void)
     int
 gui_mch_init(void)
 {
-    //NSLog(@"gui_mch_init()");
-
-    // NOTE! Because OS X has to exec after fork we effectively end up doing
-    // the initialization twice (because this function is called before the
-    // fork).  To avoid all this extra work we check if Vim is about to fork,
-    // and if so do nothing for now.
-    //
-    // TODO: Is this check 100% foolproof?
-    if (gui.dofork && (vim_strchr(p_go, GO_FORG) == NULL))
-        return OK;
+    ASLogDebug(@"");
 
     if (![[MMBackend sharedInstance] checkin]) {
         // TODO: Kill the process if there is no terminal to fall back on,
@@ -140,8 +185,6 @@ gui_mch_init(void)
     // in [g]vimrc.
     gui_mch_adjust_charheight();
 
-    gui_mch_init_has_finished = YES;
-
     return OK;
 }
 
@@ -150,7 +193,7 @@ gui_mch_init(void)
     void
 gui_mch_exit(int rc)
 {
-    //NSLog(@"gui_mch_exit(rc=%d)", rc);
+    ASLogDebug(@"rc=%d", rc);
 
     [[MMBackend sharedInstance] exit];
 }
@@ -162,12 +205,6 @@ gui_mch_exit(int rc)
     int
 gui_mch_open(void)
 {
-    //NSLog(@"gui_mch_open()");
-
-    // This check is to avoid doing extra work when we're about to fork.
-    if (!gui_mch_init_has_finished)
-        return OK;
-
     return [[MMBackend sharedInstance] openGUIWindow];
 }
 
@@ -189,7 +226,8 @@ gui_mch_update(void)
     // interrupt Vim by presssing Ctrl-C during lengthy operations (e.g. after
     // entering "10gs" it would not be possible to bring Vim out of the 10 s
     // sleep prematurely).  As a compromise we check for Ctrl-C only once per
-    // second.
+    // second.  Note that Cmd-. sends SIGINT so it has higher success rate at
+    // interrupting Vim.
     static CFAbsoluteTime lastTime = 0;
 
     CFAbsoluteTime nowTime = CFAbsoluteTimeGetCurrent();
@@ -210,6 +248,48 @@ gui_mch_flush(void)
 }
 
 
+    void
+gui_macvim_flush(void)
+{
+    // This function counts how many times it is called and only flushes the
+    // draw queue if called sufficiently often.  The first few times it is
+    // called it will flush often, but the more it is called the less likely is
+    // it that anything will be flushed.  (The counter resets itself if the
+    // function isn't called for a second.)
+    //
+    // NOTE: Should only be used in loops where it is impossible to know how
+    // often Vim needs to flush.  It was written to handle output from external
+    // commands (see mch_call_shell() in os_unix.c).
+
+    static CFAbsoluteTime lastTime = 0;
+    static int delay = 1;
+    static int counter = 0;
+    static int scrolls = 0;
+
+    CFAbsoluteTime nowTime = CFAbsoluteTimeGetCurrent();
+    CFAbsoluteTime delta = nowTime - lastTime;
+    if (delta > 1.0)
+        delay = 1;
+
+    // We assume that each call corresponds roughly to one line of output.
+    // When one page has scrolled by we increase the delay before the next
+    // flush.
+    if (++scrolls > gui.num_rows) {
+        delay <<= 1;
+        if (delay > 2048)
+            delay = 2048;
+        scrolls = 0;
+    }
+
+    if (++counter > delay) {
+        gui_macvim_force_flush();
+        counter = 0;
+    }
+
+    lastTime = nowTime;
+}
+
+
 /* Force flush output to MacVim.  Do not call this method unless absolutely
  * necessary. */
     void
@@ -428,8 +508,7 @@ gui_mch_new_colors(void)
     gui.def_back_pixel = gui.back_pixel;
     gui.def_norm_pixel = gui.norm_pixel;
 
-    //NSLog(@"gui_mch_new_colors(back=%x, norm=%x)", gui.def_back_pixel,
-    //        gui.def_norm_pixel);
+    ASLogDebug(@"back=%x norm=%x", gui.def_back_pixel, gui.def_norm_pixel);
 
     [[MMBackend sharedInstance]
         setDefaultColorsBackground:gui.def_back_pixel
@@ -745,9 +824,10 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
                                     && lookup_menu_iconfile(menu->name, fname))
             icon = fname;
 
-        // Last resort, use display name (usually signals a builtin icon)
+        // Still no icon found, try using a builtin icon.  (If this also fails,
+        // then a warning icon will be displayed).
         if (!icon)
-            icon = menu->dname;
+            icon = lookup_toolbar_item(menu->iconidx);
     }
 
     [[MMBackend sharedInstance] queueMessage:AddMenuItemMsgID properties:
@@ -896,24 +976,30 @@ gui_mch_free_font(font)
     GuiFont	font;
 {
     if (font != NOFONT) {
-        //NSLog(@"gui_mch_free_font(font=0x%x)", font);
-        [(NSFont*)font release];
+        ASLogDebug(@"font=0x%x", font);
+        [(id)font release];
     }
 }
 
 
+    GuiFont
+gui_mch_retain_font(GuiFont font)
+{
+    return (GuiFont)[(id)font retain];
+}
+
+
 /*
  * Get a font structure for highlighting.
  */
     GuiFont
 gui_mch_get_font(char_u *name, int giveErrorIfMissing)
 {
-    //NSLog(@"gui_mch_get_font(name=%s, giveErrorIfMissing=%d)", name,
-    //        giveErrorIfMissing);
+    ASLogDebug(@"name='%s' giveErrorIfMissing=%d", name, giveErrorIfMissing);
 
-    NSFont *font = gui_macvim_font_with_name(name);
-    if (font)
-        return (GuiFont)[font retain];
+    GuiFont font = gui_macvim_font_with_name(name);
+    if (font != NOFONT)
+        return font;
 
     if (giveErrorIfMissing)
         EMSG2(_(e_font), name);
@@ -925,14 +1011,12 @@ gui_mch_get_font(char_u *name, int giveErrorIfMissing)
 #if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Return the name of font "font" in allocated memory.
- * Don't know how to get the actual name, thus use the provided name.
+ * TODO: use 'font' instead of 'name'?
  */
     char_u *
 gui_mch_get_fontname(GuiFont font, char_u *name)
 {
-    if (name == NULL)
-	return NULL;
-    return vim_strsave(name);
+    return name ? vim_strsave(name) : NULL;
 }
 #endif
 
@@ -944,7 +1028,7 @@ gui_mch_get_fontname(GuiFont font, char_u *name)
     int
 gui_mch_init_font(char_u *font_name, int fontset)
 {
-    //NSLog(@"gui_mch_init_font(font_name=%s, fontset=%d)", font_name, fontset);
+    ASLogDebug(@"font_name='%s' fontset=%d", font_name, fontset);
 
     if (font_name && STRCMP(font_name, "*") == 0) {
         // :set gfn=* shows the font panel.
@@ -952,24 +1036,24 @@ gui_mch_init_font(char_u *font_name, int fontset)
         return FAIL;
     }
 
-    NSFont *font = gui_macvim_font_with_name(font_name);
-    if (font) {
-        [(NSFont*)gui.norm_font release];
-        gui.norm_font = (GuiFont)[font retain];
+    GuiFont font = gui_macvim_font_with_name(font_name);
+    if (font == NOFONT)
+        return FAIL;
 
-        // NOTE: MacVim keeps separate track of the normal and wide fonts.
-        // Unless the user changes 'guifontwide' manually, they are based on
-        // the same (normal) font.  Also note that each time the normal font is
-        // set, the advancement may change so the wide font needs to be updated
-        // as well (so that it is always twice the width of the normal font).
-        [[MMBackend sharedInstance] setFont:font];
-        [[MMBackend sharedInstance] setWideFont:
-               (NOFONT == gui.wide_font ? font : (NSFont*)gui.wide_font)];
+    gui_mch_free_font(gui.norm_font);
+    gui.norm_font = font;
 
-        return OK;
-    }
+    // NOTE: MacVim keeps separate track of the normal and wide fonts.
+    // Unless the user changes 'guifontwide' manually, they are based on
+    // the same (normal) font.  Also note that each time the normal font is
+    // set, the advancement may change so the wide font needs to be updated
+    // as well (so that it is always twice the width of the normal font).
+    [[MMBackend sharedInstance] setFont:font wide:NO];
+    [[MMBackend sharedInstance] setFont:(NOFONT != gui.wide_font ? gui.wide_font
+                                                                 : font)
+                                   wide:YES];
 
-    return FAIL;
+    return OK;
 }
 
 
@@ -983,67 +1067,70 @@ gui_mch_set_font(GuiFont font)
 }
 
 
-    NSFont *
+/*
+ * Return GuiFont in allocated memory.  The caller must free it using
+ * gui_mch_free_font().
+ */
+    GuiFont
 gui_macvim_font_with_name(char_u *name)
 {
-    NSFont *font = nil;
-    NSString *fontName = MMDefaultFontName;
-    float size = MMDefaultFontSize;
+    if (!name)
+        return (GuiFont)[[NSString alloc] initWithFormat:@"%@:%d",
+                                        MMDefaultFontName, MMDefaultFontSize];
+
+    NSString *fontName = [NSString stringWithVimString:name];
+    int size = MMDefaultFontSize;
     BOOL parseFailed = NO;
 
-#ifdef FEAT_MBYTE
-    name = CONVERT_TO_UTF8(name);
-#endif
-
-    if (name) {
-        fontName = [NSString stringWithUTF8String:(char*)name];
-
-        NSArray *components = [fontName componentsSeparatedByString:@":"];
-        if ([components count] == 2) {
-            NSString *sizeString = [components lastObject];
-            if ([sizeString length] > 0
-                    && [sizeString characterAtIndex:0] == 'h') {
-                sizeString = [sizeString substringFromIndex:1];
-                if ([sizeString length] > 0) {
-                    size = [sizeString floatValue];
-                    fontName = [components objectAtIndex:0];
-                }
-            } else {
-                parseFailed = YES;
+    NSArray *components = [fontName componentsSeparatedByString:@":"];
+    if ([components count] == 2) {
+        NSString *sizeString = [components lastObject];
+        if ([sizeString length] > 0
+                && [sizeString characterAtIndex:0] == 'h') {
+            sizeString = [sizeString substringFromIndex:1];
+            if ([sizeString length] > 0) {
+                size = (int)round([sizeString floatValue]);
+                fontName = [components objectAtIndex:0];
             }
-        } else if ([components count] > 2) {
+        } else {
             parseFailed = YES;
         }
+    } else if ([components count] > 2) {
+        parseFailed = YES;
+    }
 
-        if (!parseFailed) {
-            // Replace underscores with spaces.
-            fontName = [[fontName componentsSeparatedByString:@"_"]
-                                     componentsJoinedByString:@" "];
-        }
+    if (!parseFailed) {
+        // Replace underscores with spaces.
+        fontName = [[fontName componentsSeparatedByString:@"_"]
+                                 componentsJoinedByString:@" "];
     }
 
     if (!parseFailed && [fontName length] > 0) {
         if (size < MMMinFontSize) size = MMMinFontSize;
         if (size > MMMaxFontSize) size = MMMaxFontSize;
 
-        font = [NSFont fontWithName:fontName size:size];
-
-        if (!font && MMDefaultFontName == fontName) {
-            // If for some reason the MacVim default font is not in the app
-            // bundle, then fall back on the system default font.
-            font = [NSFont userFixedPitchFontOfSize:0];
-        }
+        // If the default font is requested we don't check if NSFont can load
+        // it since the font most likely isn't loaded anyway (it may only be
+        // available to the MacVim binary).  If it is not the default font we
+        // ask NSFont if it can load it.
+        if ([fontName isEqualToString:MMDefaultFontName]
+                || [NSFont fontWithName:fontName size:size])
+            return [[NSString alloc] initWithFormat:@"%@:%d", fontName, size];
     }
 
-#ifdef FEAT_MBYTE
-    CONVERT_TO_UTF8_FREE(name);
-#endif
-
-    return font;
+    return NOFONT;
 }
 
 // -- Scrollbars ------------------------------------------------------------
 
+// NOTE: Even though scrollbar identifiers are 'long' we tacitly assume that
+// they only use 32 bits (in particular when compiling for 64 bit).  This is
+// justified since identifiers are generated from a 32 bit counter in
+// gui_create_scrollbar().  However if that code changes we may be in trouble
+// (if ever that many scrollbars are allocated...).  The reason behind this is
+// that we pass scrollbar identifers over process boundaries so the width of
+// the variable needs to be fixed (and why fix at 64 bit when only 32 are
+// really used?).
 
     void
 gui_mch_create_scrollbar(
@@ -1051,7 +1138,7 @@ gui_mch_create_scrollbar(
 	int orient)	/* SBAR_VERT or SBAR_HORIZ */
 {
     [[MMBackend sharedInstance] 
-            createScrollbarWithIdentifier:sb->ident type:sb->type];
+            createScrollbarWithIdentifier:(int32_t)sb->ident type:sb->type];
 }
 
 
@@ -1059,7 +1146,7 @@ gui_mch_create_scrollbar(
 gui_mch_destroy_scrollbar(scrollbar_T *sb)
 {
     [[MMBackend sharedInstance] 
-            destroyScrollbarWithIdentifier:sb->ident];
+            destroyScrollbarWithIdentifier:(int32_t)sb->ident];
 }
 
 
@@ -1069,7 +1156,7 @@ gui_mch_enable_scrollbar(
 	int		flag)
 {
     [[MMBackend sharedInstance] 
-            showScrollbarWithIdentifier:sb->ident state:flag];
+            showScrollbarWithIdentifier:(int32_t)sb->ident state:flag];
 }
 
 
@@ -1089,7 +1176,7 @@ gui_mch_set_scrollbar_pos(
     }
 
     [[MMBackend sharedInstance] 
-            setScrollbarPosition:pos length:len identifier:sb->ident];
+            setScrollbarPosition:pos length:len identifier:(int32_t)sb->ident];
 }
 
 
@@ -1101,7 +1188,10 @@ gui_mch_set_scrollbar_thumb(
 	long max)
 {
     [[MMBackend sharedInstance] 
-            setScrollbarThumbValue:val size:size max:max identifier:sb->ident];
+            setScrollbarThumbValue:val
+                              size:size
+                               max:max
+                        identifier:(int32_t)sb->ident];
 }
 
 
@@ -1201,14 +1291,14 @@ gui_mch_stop_blink(void)
     void
 gui_mch_getmouse(int *x, int *y)
 {
-    //NSLog(@"gui_mch_getmouse()");
+    ASLogInfo(@"Not implemented!");
 }
 
 
     void
 gui_mch_setmouse(int x, int y)
 {
-    //NSLog(@"gui_mch_setmouse(x=%d, y=%d)", x, y);
+    ASLogInfo(@"Not implemented!");
 }
 
 
@@ -1233,28 +1323,32 @@ im_set_position(int row, int col)
 }
 
 
+    void
+im_set_control(int enable)
+{
+    // Tell frontend whether it should notify us when the input method changes
+    // or not (called when 'imd' is toggled).
+    int msgid = enable ? EnableImControlMsgID : DisableImControlMsgID;
+    [[MMBackend sharedInstance] queueMessage:msgid properties:nil];
+}
+
+
     void
 im_set_active(int active)
 {
-    // Set roman or the system script if 'active' is TRUE or FALSE,
-    // respectively.
-    SInt32 systemScript = GetScriptManagerVariable(smSysScript);
-
-    if (!p_imdisable && smRoman != systemScript)
-        KeyScript(active ? smKeySysScript : smKeyRoman);
+    // Tell frontend to enable/disable IM (called e.g. when the mode changes).
+    if (!p_imdisable) {
+        int msgid = active ? ActivateKeyScriptMsgID : DeactivateKeyScriptMsgID;
+        [[MMBackend sharedInstance] setImState:active];
+        [[MMBackend sharedInstance] queueMessage:msgid properties:nil];
+    }
 }
 
 
     int
 im_get_status(void)
 {
-    // IM is active whenever the current script is the system script and the
-    // system script isn't roman.  (Hence IM can only be active when using
-    // non-roman scripts.)
-    SInt32 currentScript = GetScriptManagerVariable(smKeyScript);
-    SInt32 systemScript = GetScriptManagerVariable(smSysScript);
-
-    return currentScript != smRoman && currentScript == systemScript;
+    return [[MMBackend sharedInstance] imState];
 }
 
 #endif // defined(USE_IM_CONTROL)
@@ -1382,8 +1476,8 @@ gui_mch_browse(
     char_u *initdir,
     char_u *filter)
 {
-    //NSLog(@"gui_mch_browse(saving=%d, title=%s, dflt=%s, ext=%s, initdir=%s,"
-    //        " filter=%s", saving, title, dflt, ext, initdir, filter);
+    ASLogDebug(@"saving=%d title='%s' dflt='%s' ext='%s' initdir='%s' "
+               "filter='%s'", saving, title, dflt, ext, initdir, filter);
 
     // Ensure no data is on the output queue before presenting the dialog.
     gui_macvim_force_flush();
@@ -1412,9 +1506,9 @@ gui_mch_dialog(
     int		dfltbutton,
     char_u	*textfield)
 {
-    //NSLog(@"gui_mch_dialog(type=%d title=%s message=%s buttons=%s "
-    //        "dfltbutton=%d textfield=%s)", type, title, message, buttons,
-    //        dfltbutton, textfield);
+    ASLogDebug(@"type=%d title='%s' message='%s' buttons='%s' dfltbutton=%d "
+               "textfield='%s'", type, title, message, buttons, dfltbutton,
+               textfield);
 
     // Ensure no data is on the output queue before presenting the dialog.
     gui_macvim_force_flush();
@@ -1527,7 +1621,7 @@ gui_mch_get_rgb(guicolor_T pixel)
     void
 gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
 {
-    //NSLog(@"gui_mch_get_screen_dimensions()");
+    ASLogDebug(@"Columns=%d Rows=%d", Columns, Rows);
     *screen_w = Columns;
     *screen_h = Rows;
 }
@@ -1550,21 +1644,7 @@ gui_mch_get_winpos(int *x, int *y)
     int
 gui_mch_haskey(char_u *name)
 {
-    BOOL ok = NO;
-
-#ifdef FEAT_MBYTE
-    name = CONVERT_TO_UTF8(name);
-#endif
-
-    NSString *value = [NSString stringWithUTF8String:(char*)name];
-    if (value)
-        ok =  [[MMBackend sharedInstance] hasSpecialKeyWithValue:value];
-
-#ifdef FEAT_MBYTE
-    CONVERT_TO_UTF8_FREE(name);
-#endif
-
-    return ok;
+    return [[MMBackend sharedInstance] hasSpecialKeyWithValue:name];
 }
 
 
@@ -1600,10 +1680,9 @@ gui_mch_set_shellsize(
     int		base_height,
     int		direction)
 {
-    //NSLog(@"gui_mch_set_shellsize(width=%d, height=%d, min_width=%d,"
-    //        " min_height=%d, base_width=%d, base_height=%d, direction=%d)",
-    //        width, height, min_width, min_height, base_width, base_height,
-    //        direction);
+    ASLogDebug(@"width=%d height=%d min_width=%d min_height=%d base_width=%d "
+               "base_height=%d direction=%d", width, height, min_width,
+               min_height, base_width, base_height, direction);
     [[MMBackend sharedInstance] setRows:height columns:width];
 }
 
@@ -1631,7 +1710,7 @@ gui_mch_set_winpos(int x, int y)
     void
 gui_mch_settitle(char_u *title, char_u *icon)
 {
-    //NSLog(@"gui_mch_settitle(title=%s, icon=%s)", title, icon);
+    ASLogDebug(@"title='%s' icon='%s'", title, icon);
 
 #ifdef FEAT_MBYTE
     title = CONVERT_TO_UTF8(title);
@@ -1675,6 +1754,9 @@ gui_mch_leave_fullscreen()
     void
 gui_mch_fuopt_update()
 {
+    if (!gui.in_use)
+        return;
+
     guicolor_T fg, bg;
     if (fuoptions_flags & FUOPT_BGCOLOR_HLGROUP) {
         syn_id2colors(fuoptions_bgcolor, &fg, &bg);
@@ -1944,7 +2026,7 @@ serverSendReply(char_u *serverid, char_u *reply)
  * All communication between MacVim and the server goes via Apple Events.
  */
 
-    static OSErr
+    static int16_t
 odb_event(buf_T *buf, const AEEventID action)
 {
     if (!(buf->b_odb_server_id && buf->b_ffname))
@@ -1953,7 +2035,7 @@ odb_event(buf_T *buf, const AEEventID action)
     NSAppleEventDescriptor *targetDesc = [NSAppleEventDescriptor
             descriptorWithDescriptorType:typeApplSignature
                                    bytes:&buf->b_odb_server_id
-                                  length:sizeof(OSType)];
+                                  length:sizeof(uint32_t)];
 
     // TODO: Convert b_ffname to UTF-8?
     NSString *path = [NSString stringWithUTF8String:(char*)buf->b_ffname];
@@ -1978,10 +2060,10 @@ odb_event(buf_T *buf, const AEEventID action)
             kAEDefaultTimeout);
 }
 
-    OSErr
+    int16_t
 odb_buffer_close(buf_T *buf)
 {
-    OSErr err = noErr;
+    int16_t err = noErr;
     if (buf) {
         err = odb_event(buf, kAEClosedFile);
 
@@ -2001,7 +2083,7 @@ odb_buffer_close(buf_T *buf)
     return err;
 }
 
-    OSErr
+    int16_t
 odb_post_buffer_write(buf_T *buf)
 {
     return buf ? odb_event(buf, kAEModifiedFile) : noErr;
@@ -2148,3 +2230,18 @@ static int vimModMaskToEventModifierFlags(int mods)
 
     return flags;
 }
+
+
+
+// -- NetBeans Support ------------------------------------------------------
+
+#ifdef FEAT_NETBEANS_INTG
+
+/* Set NetBeans socket to CFRunLoop */
+    void
+gui_macvim_set_netbeans_socket(int socket)
+{
+    [[MMBackend sharedInstance] setNetbeansSocket:socket];
+}
+
+#endif // FEAT_NETBEANS_INTG

src/MacVim/gvimrc

@@ -1,7 +1,7 @@
 " System gvimrc file for MacVim
 "
 " Maintainer:	Bjorn Winckler <bjorn.winckler@gmail.com>
-" Last Change:	Sun Oct 04 2008
+" Last Change:	Sun Aug 29 2009
 "
 " This is a work in progress.  If you feel so inclined, please help me improve
 " this file.
@@ -26,116 +26,15 @@ if !exists("colors_name")
     colorscheme macvim
 endif
 
-
+" To make tabs more readable, the label only contains the tail of the file
+" name and the buffer modified flag.
+set guitablabel=%M%t
 
 " Send print jobs to Preview.app.  This does not delete the temporary ps file
 " that is generated by :hardcopy.
 set printexpr=system('open\ -a\ Preview\ '.v:fname_in)\ +\ v:shell_error
 
 
-"
-" Extra menus
-"
-
-
-" File menu
-
-aunmenu File.New
-aunmenu File.Open\.\.\.
-aunmenu File.Close
-aunmenu File.-SEP4-
-aunmenu File.Exit
-aunmenu File.Save-Exit
-
-an <silent> 10.290 File.New\ Window             <Nop>
-an  10.295 File.New\ Tab                        :tabnew<CR>
-an <silent> 10.310 File.Open\.\.\.              <Nop>
-an <silent> 10.325 File.Open\ Recent            <Nop>
-an 10.328 File.-SEP0-                           <Nop>
-an <silent> 10.330 File.Close\ Window<Tab>:qa   :conf qa<CR>
-an <silent> 10.332 File.Close                   :conf q<CR>
-an <silent> 10.341 File.Save\ All               :browse conf wa<CR>
-an 10.350 File.Save\ As\.\.\.<Tab>:sav	        :browse confirm saveas<CR>
-
-
-" Edit menu
-
-" The following function is aken from menu.vim
-fun! s:FixFText()
-  " Fix text in nameless register to be used with :promptfind.
-  return substitute(@", "[\r\n]", '\\n', 'g')
-endfun
-
-aunmenu Edit.Find
-aunmenu Edit.Find\ and\ Replace
-
-an <silent> 20.410.10 Edit.Find.Find\.\.\.  :promptfind<CR>
-vunmenu Edit.Find.Find\.\.\.
-vnoremenu <silent> Edit.Find.Find\.\.\.     y:promptfind <C-R>=<SID>FixFText()<CR><CR>
-an 20.410.20 Edit.Find.Find\ Next           <Nop>
-an 20.410.30 Edit.Find.Find\ Previous       <Nop>
-vmenu 20.410.35 Edit.Find.Use\ Selection\ for\ Find y:let @/=@"<CR>:<BS>
-
-an 20.460 Edit.-SEP4-                       <Nop>
-an 20.465.10 Edit.Font.Show\ Fonts          <Nop>
-an 20.465.20 Edit.Font.-SEP5-               <Nop>
-an 20.465.30 Edit.Font.Bigger               <Nop>
-an 20.465.40 Edit.Font.Smaller              <Nop>
-an 20.470 Edit.Special\ Characters\.\.\.    <Nop>
-
-
-" Window menu (should be next to Help so give it a high priority)
-aunmenu Window
-
-an <silent> 9900.300 Window.Minimize            <Nop>
-an <silent> 9900.301 Window.Minimize\ All       <Nop>
-an <silent> 9900.310 Window.Zoom                <Nop>
-an <silent> 9900.311 Window.Zoom\ All           <Nop>
-an <silent> 9900.320 Window.Toggle\ Full\ Screen\ Mode  :set invfullscreen<CR>
-an 9900.330 Window.-SEP1-                       <Nop>
-" TODO! Grey out if no tabs are visible.
-an <silent> 9900.340 Window.Previous\ Tab       :tabprevious<CR>
-an <silent> 9900.350 Window.Next\ Tab           :tabnext<CR>
-an 9900.360 Window.-SEP2-                       <Nop>
-an <silent> 9900.370 Window.Bring\ All\ To\ Front <Nop>
-
-
-" Help menu
-an 9999.1 Help.MacVim\ Help                 :h gui_mac<CR>
-an <silent> 9999.2 Help.MacVim\ Website     <Nop>
-an 9999.3 Help.-sep0-                       <Nop>
-
-
-"
-" Toolbar
-"
-" These items are special ('*' means zero or more arbitrary characters):
-"   -space*-        an empty space
-"   -flexspace*-    a flexible space
-"   -*-             a separator item
-
-" Remove some items so that all items are visible at the default window size.
-"aunmenu ToolBar.Undo
-"aunmenu ToolBar.Redo
-"aunmenu ToolBar.-sep2-
-"aunmenu ToolBar.Cut
-"aunmenu ToolBar.Copy
-"aunmenu ToolBar.Paste
-"aunmenu ToolBar.-sep3-
-aunmenu ToolBar.Replace
-aunmenu ToolBar.FindNext
-aunmenu ToolBar.FindPrev
-aunmenu ToolBar.-sep5-
-aunmenu ToolBar.-sep6-
-aunmenu ToolBar.RunCtags
-aunmenu ToolBar.TagJump
-"aunmenu ToolBar.-sep7-
-aunmenu ToolBar.FindHelp
-
-"an 1.295 ToolBar.-flexspace7-   <Nop>
-
-
-
 " This is so that HIG Cmd and Option movement mappings can be disabled by
 " adding the line
 "   let macvim_skip_cmd_opt_movement = 1
@@ -202,65 +101,6 @@ if exists("macvim_hig_shift_movement")
 endif " exists("macvim_hig_shift_movement")
 
 
-
-"
-" Set up menu key equivalents (these should always have the 'D' modifier set),
-" action bindings, and alternate items.
-"
-" Note: menu items which should execute an action are bound to <Nop>; the
-" action message is specified here via the :macmenu command.
-"
-
-macm File.New\ Window                       key=<D-n> action=newWindow:
-macm File.New\ Tab                          key=<D-t>
-macm File.Open\.\.\.                        key=<D-o> action=fileOpen:
-macm File.Open\ Tab\.\.\.                   key=<D-T>
-macm File.Open\ Recent                      action=recentFilesDummy:
-macm File.Close\ Window                     key=<D-W>
-macm File.Close                             key=<D-w> action=performClose:
-macm File.Save                              key=<D-s>
-macm File.Save\ All                         key=<D-M-s> alt=YES
-macm File.Save\ As\.\.\.                    key=<D-S>
-macm File.Print                             key=<D-p>
-
-macm Edit.Undo                              key=<D-z> action=undo:
-macm Edit.Redo                              key=<D-Z> action=redo:
-macm Edit.Cut                               key=<D-x> action=cut:
-macm Edit.Copy                              key=<D-c> action=copy:
-macm Edit.Paste                             key=<D-v> action=paste:
-macm Edit.Select\ All                       key=<D-a> action=selectAll:
-macm Edit.Find.Find\.\.\.                   key=<D-f>
-macm Edit.Find.Find\ Next                   key=<D-g> action=findNext:
-macm Edit.Find.Find\ Previous               key=<D-G> action=findPrevious:
-macm Edit.Find.Use\ Selection\ for\ Find    key=<D-e>
-macm Edit.Special\ Characters\.\.\.         key=<D-M-t>
-macm Edit.Font.Show\ Fonts                  action=orderFrontFontPanel:
-macm Edit.Font.Bigger                       key=<D-=> action=fontSizeUp:
-macm Edit.Font.Smaller                      key=<D--> action=fontSizeDown:
-macm Edit.Special\ Characters\.\.\.         action=orderFrontCharacterPalette:
-
-macm Tools.Spelling.To\ Next\ error         key=<D-;>
-macm Tools.Spelling.Suggest\ Corrections    key=<D-:>
-macm Tools.Make                             key=<D-b>
-macm Tools.List\ Errors                     key=<D-l>
-macm Tools.List\ Messages                   key=<D-L>
-macm Tools.Next\ Error                      key=<D-C-Right>
-macm Tools.Previous\ Error                  key=<D-C-Left>
-macm Tools.Older\ List                      key=<D-C-Up>
-macm Tools.Newer\ List                      key=<D-C-Down>
-
-macm Window.Minimize        key=<D-m>       action=performMiniaturize:
-macm Window.Minimize\ All   key=<D-M-m>     action=miniaturizeAll:  alt=YES
-macm Window.Zoom            key=<D-C-z>     action=performZoom:
-macm Window.Zoom\ All       key=<D-M-C-z>   action=zoomAll:         alt=YES
-macm Window.Toggle\ Full\ Screen\ Mode  key=<D-F>
-macm Window.Previous\ Tab               key=<D-{>
-macm Window.Next\ Tab                   key=<D-}>
-macm Window.Bring\ All\ To\ Front       action=arrangeInFront:
-
-macm Help.MacVim\ Help                  key=<D-?>
-macm Help.MacVim\ Website               action=openWebsite:
-
 " Restore the previous value of 'cpoptions'.
 let &cpo = s:cpo_save
 unlet s:cpo_save

src/MacVim/icons/Makefile

@@ -2,10 +2,25 @@
 
 OUTDIR ?= .
 
-$(OUTDIR)/MacVim-generic.icns: make_icons.py vim-noshadow-512.png
+$(OUTDIR)/MacVim-generic.icns: make_icons.py vim-noshadow-512.png loadfont.so Envy\ Code\ R\ Bold.ttf
 	$(MAKE) -C makeicns
 	/usr/bin/python make_icons.py $(OUTDIR)
 
+loadfont.so: loadfont.c
+	/usr/bin/python setup.py install --install-lib .
+
+Envy\ Code\ R\ Bold.ttf: EnvyCodeR.zip
+	unzip -jo EnvyCodeR.zip
+	# unzip uses the file date from the zip file. Change the file date to
+	# "now", so that the zip is not unzipped in every `make` run.`
+	touch Envy\ Code\ R\ Bold.ttf
+
+ENVYCODE_URL=http://download.damieng.com/latest/EnvyCodeR
+EnvyCodeR.zip:
+	curl ${ENVYCODE_URL} --location -o EnvyCodeR.zip
+
 clean:
 	$(MAKE) -C makeicns clean
-	rm -f $(OUTDIR)/MacVim-*.icns
+	rm -f $(OUTDIR)/MacVim-*.icns loadfont.so *.pyc \
+	  EnvyCodeR.zip *.ttf *.reg *.txt
+	rm -rf *.egginfo build  # Created by setup.py

src/MacVim/icons/docerator.py

@@ -0,0 +1,616 @@
+from Foundation import *
+from AppKit import *
+
+import itertools
+import math
+import operator
+import os
+
+from optparse import OptionParser
+
+
+# Resources
+DEFAULT_BACKGROUND = '/System/Library/CoreServices/CoreTypes.bundle/' + \
+    'Contents/Resources/GenericDocumentIcon.icns'  # might require leopard?
+
+
+# Cache both images and background renderers globally
+imageCache = {}
+bgCache = {}
+
+
+# Make us not crash
+# http://www.cocoabuilder.com/archive/message/cocoa/2008/8/6/214964
+NSApplicationLoad()
+
+
+class Surface(object):
+  """Represents a simple bitmapped image."""
+
+  def __init__(self, *p, **kw):
+    if not 'premultiplyAlpha' in kw:
+      kw['premultiplyAlpha'] = True
+    if len(p) == 1 and isinstance(p[0], NSBitmapImageRep):
+      self.bitmapRep = p[0]
+    elif len(p) == 2 and isinstance(p[0], int) and isinstance(p[1], int):
+      format = NSAlphaFirstBitmapFormat
+      if not kw['premultiplyAlpha']:
+        format += NSAlphaNonpremultipliedBitmapFormat
+      self.bitmapRep = NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
+          None, p[0], p[1], 8, 4, True, False, NSDeviceRGBColorSpace,
+          format, 0, 0)
+
+    if not hasattr(self, 'bitmapRep') or not self.bitmapRep:
+      raise Exception('Failed to create surface: ' + str(p))
+
+  def size(self):
+    return map(int, self.bitmapRep.size())  # cocoa returns floats. cocoa ftw
+
+  def data(self):
+    """Returns data in ARGB order (on intel, at least)."""
+    r = self.bitmapRep
+    if (r.bitmapFormat() & ~NSAlphaFirstBitmapFormat !=
+            NSAlphaNonpremultipliedBitmapFormat) or \
+        r.bitsPerPixel() != 32 or \
+        r.isPlanar() or \
+        r.samplesPerPixel() != 4:
+      raise Exception("Unsupported image format")
+    return self.bitmapRep.bitmapData()
+
+  def rgbaIndices(self):
+    r = self.bitmapRep
+    if r.bitmapFormat() & NSAlphaFirstBitmapFormat != 0:
+      return 1, 2, 3, 0
+    else:
+      return 0, 1, 2, 3
+
+  def save(self, filename):
+    """Saves image as png file."""
+    self.bitmapRep.representationUsingType_properties_(NSPNGFileType, None) \
+        .writeToFile_atomically_(filename, True)
+
+  def draw(self):
+    self.bitmapRep.draw()
+
+  def context(self):
+    # Note: Cocoa only supports contexts with premultiplied alpha
+    return NSGraphicsContext.graphicsContextWithBitmapImageRep_(self.bitmapRep)
+
+  def copy(self):
+    return Surface(self.bitmapRep.copy())
+
+
+class Image(object):
+  """Represents an image that can consist of several Surfaces."""
+
+  def __init__(self, param):
+    if isinstance(param, str):
+      self.image = NSImage.alloc().initWithContentsOfFile_(param)
+    elif isinstance(param, Surface):
+      self.image = NSImage.alloc().initWithSize_( param.size() )
+      self.image.addRepresentation_(param.bitmapRep)
+
+    if not self.image:
+      raise Exception('Failed to load image: ' + str(param))
+
+  def surfaceOfSize(self, w, h):
+    """Returns an ARGB, non-premultiplied surface of size w*h or throws."""
+    r = None
+    for rep in self.image.representations():
+      # Cocoa reports fraction widths for pngs (wtf?!), so use round()
+      if map(lambda x: int(round(x)), rep.size()) == [w, h]:
+        r = rep
+        break
+
+    # XXX: Resample in this case? That'd make the program easier to use, but
+    #      can silently create blurry backgrounds. Since this happens with
+    #      the app icon anyways, this might not be a huge deal?
+    if not r:
+      raise Exception('Unsupported size %dx%d', w, h)
+    return Surface(r)
+
+  def blend(self):
+    self.compositeInRect( ((0, 0), self.image.size()) )
+
+  def compositeInRect(self, r, mode=NSCompositeSourceOver):
+    self.image.drawInRect_fromRect_operation_fraction_(r, NSZeroRect,
+        mode, 1.0)
+
+  def sizes(self):
+    s = set()
+    for rep in self.image.representations():
+      s.add(tuple(map(lambda x: int(round(x)), rep.size())))
+    return s
+
+
+class Context(object):
+  # Tiger has only Python2.3, so we can't use __enter__ / __exit__ for this :-(
+
+  def __init__(self, surface):
+    NSGraphicsContext.saveGraphicsState()
+    c = surface.context()
+    c.setShouldAntialias_(True);
+    c.setImageInterpolation_(NSImageInterpolationHigh);
+    NSGraphicsContext.setCurrentContext_(c)
+
+  def done(self):
+    NSGraphicsContext.restoreGraphicsState()
+
+
+class SplittableBackground(object):
+
+  def __init__(self, unsplitted, shouldSplit=True):
+    self.unsplitted = unsplitted
+    self.shouldSplit = shouldSplit
+    self.ground = {}
+    self.shadow = {}
+
+  def rawGroundAtSize(self, s):
+    return self.unsplitted.surfaceOfSize(s, s)
+
+  def groundAtSize(self, s):
+    if not self.shouldSplit:
+      return self.rawGroundAtSize(s)
+    self._performSplit(s)
+    return self.ground[s]
+
+  def shadowAtSize(self, s):
+    if not self.shouldSplit:
+      return None
+    self._performSplit(s)
+    return self.shadow[s]
+
+  def _performSplit(self, s):
+    if s in self.ground:
+      assert s in self.shadow
+      return
+    assert s not in self.shadow
+    ground, shadow = splitGenericDocumentIcon(self.unsplitted, s)
+    self.ground[s] = ground
+    self.shadow[s] = shadow
+
+
+class BackgroundRenderer(object):
+
+  def __init__(self, bg, icon=None, r={}):
+    self.bgRenderer = bg
+    self.icon = icon
+    self.cache = {}
+    self.rect = r
+
+  def drawIcon(self, s):
+    if not self.icon:
+      return
+
+    assert s in [16, 32, 128, 256, 512]
+    a = list(self.rect[s])
+
+    # convert from `flow` coords to cocoa
+    a[2] = -a[2]  # mirror y
+
+    w, h = s*a[1], s*a[3]
+    self.icon.compositeInRect( (((s-w)/2 + a[0], (s-h)/2 + a[2]), (w, h)) )
+
+  def drawAtSize(self, s):
+    if not self.icon:
+      # No need to split the background if no icons is interleaved -- take
+      # the faster code path in that case.
+      self.bgRenderer.rawGroundAtSize(s).draw()
+      return
+
+    self.bgRenderer.groundAtSize(s).draw()
+    self.drawIcon(s)
+    if self.bgRenderer.shouldSplit:
+      # shadow needs to be composited, so it needs to be in an image
+      Image(self.bgRenderer.shadowAtSize(s)).blend()
+
+  def backgroundAtSize(self, s):
+    if not s in self.cache:
+      result = Surface(s, s)
+      context = Context(result)
+      self.drawAtSize(s)
+      context.done()
+      self.cache[s] = result
+    return self.cache[s]
+
+
+def splitGenericDocumentIcon(img, s):
+  """Takes the generic document icon and splits it into a background and a
+  shadow layer. For the 32x32 and 16x16 variants, the white pixels of the page
+  curl are hardcoded into the otherwise transparent shadow layer."""
+
+  w, h = s, s
+  r = img.surfaceOfSize(w, h)
+  bps = 4*w
+  data = r.data()
+  dr, dg, db, da = r.rgbaIndices()
+
+  ground = Surface(w, h, premultiplyAlpha=False)
+  shadow = Surface(w, h, premultiplyAlpha=False)
+
+  grounddata = ground.data()
+  shadowdata = shadow.data()
+
+  for y in xrange(h):
+    for x in xrange(w):
+      idx = y*bps + 4*x
+      ia = data[idx + da]
+      ir = data[idx + dr]
+      ig = data[idx + dg]
+      ib = data[idx + db]
+      if ia != chr(255):
+        # buffer objects don't support slice assignment :-(
+        grounddata[idx] = ia
+        grounddata[idx + 1] = ir
+        grounddata[idx + 2] = ig
+        grounddata[idx + 3] = ib
+        shadowdata[idx] = chr(0)
+        shadowdata[idx + 1] = chr(0)
+        shadowdata[idx + 2] = chr(0)
+        shadowdata[idx + 3] = chr(0)
+        continue
+
+      assert ir == ig == ib
+      grounddata[idx] = chr(255)
+      grounddata[idx + 1] = chr(255)
+      grounddata[idx + 2] = chr(255)
+      grounddata[idx + 3] = chr(255)
+      shadowdata[idx] = chr(255 - ord(ir))
+      shadowdata[idx + 1] = chr(0)
+      shadowdata[idx + 2] = chr(0)
+      shadowdata[idx + 3] = chr(0)
+
+  # Special-case 16x16 and 32x32 cases: Make some pixels on the fold white.
+  # Ideally, I could make the fold whiteish in all variants, but I can't.
+  whitePix = { 16: [(10, 2), (10, 3), (11, 3), (10, 4), (11, 4), (12, 4)],
+               32: [(21, 4), (21, 5), (22, 5), (21, 6), (22, 6), (23, 6)]}
+  if (w, h) in [(16, 16), (32, 32)]:
+    for x, y in whitePix[w]:
+      idx = y*bps + 4*x
+      shadowdata[idx] = chr(255)
+      shadowdata[idx + 1] = chr(255)
+      shadowdata[idx + 2] = chr(255)
+      shadowdata[idx + 3] = chr(255)
+
+  return ground, shadow
+
+
+class TextRenderer(object):
+
+  def __init__(self):
+    self.cache = {}
+
+  def attribsAtSize(self, s):
+    if s not in self.cache:
+      self.cache[s] = self._attribsAtSize(s)
+    return self.cache[s]
+
+  def centeredStyle(self):
+    style = NSMutableParagraphStyle.new()
+    style.setParagraphStyle_(NSParagraphStyle.defaultParagraphStyle())
+    style.setAlignment_(NSCenterTextAlignment)
+    return style
+
+  def _attribsAtSize(self, s):
+    # This looks not exactly like the font on Preview.app's document icons,
+    # but I believe that's because Preview's icons are drawn by Photoshop,
+    # and Adobe's font rendering is different from Apple's.
+    fontname = 'LucidaGrande-Bold'
+
+    # Prepare text format
+    fontsizes = { 512: 72.0,  256: 36.0,  128: 18.0,  32: 7.0,  16: 3.0 }
+    # http://developer.apple.com/documentation/Cocoa/Conceptual/AttributedStrings/Articles/standardAttributes.html#//apple_ref/doc/uid/TP40004903
+    attribs = {
+      NSParagraphStyleAttributeName: self.centeredStyle(),
+      NSForegroundColorAttributeName: NSColor.colorWithDeviceWhite_alpha_(
+          0.34, 1),
+      NSFontAttributeName: NSFont.fontWithName_size_(fontname, fontsizes[s])
+    }
+
+    # tighten font a bit for some sizes
+    if s in [256, 512]:
+      attribs[NSKernAttributeName] = -1.0
+    elif s == 32:
+      attribs[NSKernAttributeName] = -0.25
+
+    if not attribs[NSFontAttributeName]:
+      raise Exception('Failed to load font %s' % fontname)
+    return attribs
+
+  def drawTextAtSize(self, text, s):
+    """Draws text `s` into the current context of size `s`."""
+
+    textRects = {
+        512: ((0, 7), (512, 119)),
+        128: ((0, 6), (128, 26.5)),
+        256: ((0, 7), (256, 57)),
+         16: ((1, 1), (15, 5)),
+         #32: ((1, 1), (31, 9))
+        }
+
+    attribs = self.attribsAtSize(s)
+    text = NSString.stringWithString_(text)
+    if s in [16, 128, 256, 512]:
+      text.drawInRect_withAttributes_(textRects[s], attribs)
+    elif s == 32:
+      # Try to align text on pixel boundary:
+      attribs = attribs.copy()
+      attribs[NSParagraphStyleAttributeName] = \
+          NSParagraphStyle.defaultParagraphStyle()
+      ts = text.sizeWithAttributes_(attribs)
+      text.drawAtPoint_withAttributes_( (math.floor((32.0-ts[0])/2) + 0.5, 1.5),
+          attribs)
+
+
+class OfficeTextRenderer(TextRenderer):
+  """Uses Office's LucidaSans font for 32x32.
+
+  This font looks much better for certain strings (e.g. "PDF") but much worse
+  for most others (e.g. "VIM", "JAVA") -- and office fonts are usually not
+  installed. Hence, this class is better not used.
+  """
+
+  def _attribsAtSize(self, s):
+    self.useOfficeFont = False
+    attribs = TextRenderer._attribsAtSize(self, s)
+    if s == 32:
+      font = NSFont.fontWithName_size_('LucidaSans-Demi', 7.0)
+      if font:
+        attribs[NSFontAttributeName] = font
+        attribs[NSKernAttributeName] = 0
+        self.useOfficeFont = True
+    return attribs
+
+  def drawTextAtSize(self, text, s):
+    attribs = self.attribsAtSize(s)
+    if not self.useOfficeFont or s != 32:
+      TextRenderer.drawTextAtSize(self, text, s)
+      return
+    text = NSString.stringWithString_(text)
+    text.drawInRect_withAttributes_( ((0, 1), (31, 11)), attribs)
+
+
+def createIcon(s, bg, textRenderer, text):
+
+  # Fill in background
+  output = bg.backgroundAtSize(s).copy()
+
+  # Draw text on top of shadow
+  context = Context(output)
+  if s in text and text[s]:
+    textRenderer.drawTextAtSize(text[s], s)
+  context.done()
+
+  return output
+
+
+def textDictFromTextList(l):
+  assert 1 <= len(l) <= 3
+  if len(l) == 1:
+    return dict.fromkeys([16, 32, 128, 256, 512], l[0])
+  elif len(l) == 2:
+    return dict(zip([16, 32], 2*[l[1]]) + zip((128, 256, 512), 3*[l[0]]))
+  elif len(l) == 3:
+    return dict([(16, l[2]), (32, l[1])] + zip((128, 256, 512), 3*[l[0]]))
+
+
+def saveIcns(icons, icnsName, makeIcns='./makeicns'):
+  """Creates an icns file with several variants.
+
+  Params:
+    icons: A dict that contains icon size as key and Surface as value.
+           Valid keys are 512, 256, 128, 32, 16
+    icnsname: Name of the output file
+  """
+  # If IconFamily was less buggy, we could wrap it into a python module and
+  # call it directly, which is about a lot faster. However, IconFamily does not
+  # work with NSAlphaNonpremultipliedBitmapFormat correctly, so this has to
+  # wait.
+  #import IconFamily
+  #typeDict = {
+      #16: IconFamily.kSmall32BitData,
+      #32: IconFamily.kLarge32BitData,
+      #128: IconFamily.kThumbnail32BitData,
+      #256: IconFamily.kIconServices256PixelDataARGB,
+      #512: IconFamily.IconServices512PixelDataARGB,
+  #}
+  #maskDict = {
+      #16: IconFamily.kSmall8BitMask,
+      #32: IconFamily.kLarge8BitMask,
+      #128: IconFamily.kThumbnail8BitMask,
+  #}
+  #output = IconFamily.IconFamily.iconFamily()
+  #for s, icon in icons.items():
+    #output.setIconFamilyElement_fromBitmapImageRep_(typeDict[s], icon.bitmapRep)
+    #if s in maskDict:
+      #output.setIconFamilyElement_fromBitmapImageRep_(
+          #maskDict[s], icon.bitmapRep)
+  #output.writeToFile_(icnsName)
+  TMPFILE = 'docerator_tmp_%d.png'
+  try:
+    args = []
+    for s, icon in icons.items():
+      assert s in [512, 256, 128, 32, 16]
+      assert icon.size() == [s, s]
+      icon.save(TMPFILE % s)
+      args.append('-%d %s' % (s, TMPFILE % s))
+    return \
+        os.system('%s %s -out %s' % (makeIcns, ' '.join(args), icnsName)) == 0
+  finally:
+    for s in icons:
+      if os.access(TMPFILE % s, os.F_OK):
+        os.remove(TMPFILE % s)
+
+
+def getOutname(options):
+  def saneBasename(p):
+    """ '/my/path/to/file.txt' -> 'file' """
+    return os.path.splitext(os.path.basename(p))[0]
+  textPart = 'Generic'
+  if options.text:
+    textPart = options.text.split(',')[0]
+  if options.appicon:
+    base = saneBasename(options.appicon)
+  else:
+    base = saneBasename(getBgName(options))
+  return '%s-%s.icns' % (base, textPart)
+
+
+def cachedImage(filename):
+  absPath = os.path.abspath(filename)
+  if not absPath in imageCache:
+    imageCache[absPath] = Image(absPath)
+  return imageCache[absPath]
+
+
+def cachedBackground(img, split):
+  key = (img, split)
+  if not key in bgCache:
+    bgCache[key] = SplittableBackground(img, shouldSplit=split)
+  return bgCache[key]
+
+
+# taken from running flow on preview
+defaultRects = {
+    16: (-0.30890000000000001, 0.4919, -1.2968, 0.4743),
+    32: (-0.27810000000000001,
+      0.58930000000000005,
+      -2.2292999999999998,
+      0.57140000000000002),
+    128: (1.1774, 0.56820000000000004, -0.8246, 0.56799999999999995),
+    256: (0.5917, 0.56489999999999996, -1.8994, 0.56499999999999995),
+    512: (0.68700000000000006,
+      0.56530000000000002,
+      -4.2813999999999997,
+      0.56540000000000001)
+    }
+
+
+def getBgName(options):
+  if not hasattr(options, 'background') \
+      or options.background in ['default-split', 'default-unsplit']:
+    return DEFAULT_BACKGROUND
+  else:
+    return options.background
+
+
+class IconGenerator(object):
+  def __init__(self, options):
+    if hasattr(options, 'textrenderer') and options.textrenderer:
+      self.textRenderer = options.textrenderer()
+    else:
+      self.textRenderer = TextRenderer()
+    
+    # Prepare input images
+    splitBackground = options.background == 'default-split'
+    self.bgIcon = cachedImage(getBgName(options))
+
+    self.testIcon = None
+    if options.appicon:
+      self.testIcon = cachedImage(options.appicon)
+
+    rects = defaultRects.copy()
+    rects[16] = [ 0.0000, 0.5000, -1.0000, 0.5000]  # manually, better
+    if hasattr(options, 'rects'):
+      rects.update(options.rects)
+
+    bg = cachedBackground(self.bgIcon, splitBackground)
+
+    if hasattr(options, 'backgroundrenderer') and options.backgroundrenderer:
+      self.bgRenderer = options.backgroundrenderer(bg, self.testIcon, rects)
+    else:
+      self.bgRenderer = BackgroundRenderer(bg, self.testIcon, rects)
+
+    self.testtext = textDictFromTextList(options.text.split(','))
+
+  def createIconAtSize(self, s):
+    return createIcon(s, self.bgRenderer, self.textRenderer, self.testtext)
+
+
+def iconGenerator(**kwargs):
+  return IconGenerator(optsFromDict(**kwargs))
+
+
+def makedocicon_opts(options):
+  renderer = IconGenerator(options)
+
+  if hasattr(options, 'sizes') and options.sizes:
+    if isinstance(options.sizes, list):
+      sizes = options.sizes
+    else:
+      sizes = map(int, options.sizes.split(','))
+  else:
+    sizes = renderer.bgIcon.sizes()
+    if renderer.testIcon:
+      sizes = sizes.intersection(renderer.testIcon.sizes())
+    sizes = sorted(map(operator.itemgetter(0), sizes))
+
+  icons = dict([(s, renderer.createIconAtSize(s)) for s in sizes])
+
+  if options.debug:
+    for s, icon in icons.iteritems():
+      icon.save(options.debug % s)
+
+  if hasattr(options, 'outname') and options.outname:
+    outname = options.outname
+  else:
+    outname = getOutname(options)
+  if saveIcns(icons, outname, options.makeicns):
+    print 'Wrote', outname
+  else:
+    print 'Failed to write %s. Make sure makeicns is in your path.' % outname
+
+
+def optsFromDict(**kwargs):
+  options, _ = getopts().parse_args([])  # get default options
+  for k in kwargs:
+    setattr(options, k, kwargs[k])
+  return options
+
+
+def makedocicon(**kwargs):
+  makedocicon_opts(optsFromDict(**kwargs))
+
+
+def makedocicons_opts(options):
+  if not hasattr(options, 'text') or not options.text:
+    options.text = ['']
+  texts = options.text
+  for text in texts:
+    options.text = text
+    makedocicon_opts(options)
+
+
+def makedocicons(**kwargs):
+  makedocicons_opts(optsFromDict(**kwargs))
+
+
+def getopts():
+  parser = OptionParser(usage='%prog [options]', version='%prog 1.01')
+  parser.add_option('--background', '--bg', default='default-split',
+      help='Used as background (special values: "default-split" (default), ' \
+          '"default-unsplit").')
+  parser.add_option('--appicon', help='App icon, defaults to no icon.')
+
+  parser.add_option('--text', help='Text on icon. Defaults to empty. '
+      'More than one text is supported, multiple docicons are generated in '
+      'that case.', action='append')
+  parser.add_option('--sizes', help='Sizes of icons. ' \
+      'Defaults to all sizes available in input appicon. Example: "512,128,16"')
+  # XXX(Nico): This has to go
+  parser.add_option('--debug', help='If set, write out pngs for all variants.' \
+      ' This needs to look like "debug%d.png".')
+  # XXX(Nico): This has to go once IconFamily is less buggy and can be used
+  # directly
+  parser.add_option('--makeicns', help='Path to makeicns binary',
+      default='./makeicns')
+  return parser
+
+
+def main():
+  options, args = getopts().parse_args()
+  makedocicons_opts(options)
+
+
+if __name__ == '__main__':
+  main()

src/MacVim/icons/docerator_test.py

@@ -0,0 +1,65 @@
+import docerator
+import unittest
+
+
+class TextDictFromTextListTest(unittest.TestCase):
+
+  def testBasic(self):
+
+    self.assertEquals({16: 'a', 32: 'a', 128: 'a', 256: 'a', 512: 'a'},
+        docerator.textDictFromTextList(['a']))
+    self.assertEquals({16: 'b', 32: 'b', 128: 'a', 256: 'a', 512: 'a'},
+        docerator.textDictFromTextList(['a', 'b']))
+    self.assertEquals({16: 'c', 32: 'b', 128: 'a', 256: 'a', 512: 'a'},
+        docerator.textDictFromTextList(['a', 'b', 'c']))
+
+
+class OutnameTest(unittest.TestCase):
+
+  class FakeOptions(object):
+    def __init__(self, **kwargs):
+      for k in kwargs:
+        self.__setattr__(k, kwargs[k])
+
+  def testBasic(self):
+    options = OutnameTest.FakeOptions(
+        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
+        text='MP3')
+    self.assertEquals('iTunes-MP3.icns', docerator.getOutname(options))
+
+  def testTextList(self):
+    options = OutnameTest.FakeOptions(
+        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
+        text='PYTHON,PY')
+    self.assertEquals('iTunes-PYTHON.icns',
+        docerator.getOutname(options))
+
+  def testEmptyText(self):
+    options = OutnameTest.FakeOptions(
+        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
+        text='')
+    self.assertEquals('iTunes-Generic.icns', docerator.getOutname(options))
+    options = OutnameTest.FakeOptions(
+        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
+        text=None)
+    self.assertEquals('iTunes-Generic.icns',
+        docerator.getOutname(options))
+
+  def testEmptyIcon(self):
+    options = OutnameTest.FakeOptions(appicon=None, text='MP3')
+    self.assertEquals('GenericDocumentIcon-MP3.icns',
+        docerator.getOutname(options))
+    options = OutnameTest.FakeOptions(appicon=None, text='')
+    self.assertEquals('GenericDocumentIcon-Generic.icns',
+        docerator.getOutname(options))
+    options = OutnameTest.FakeOptions(appicon=None, text='',
+        background='/Applications/Bla/bgicon.icns')
+    self.assertEquals('bgicon-Generic.icns',
+        docerator.getOutname(options))
+
+
+# XXX(Nico): Look at the doctest module.
+
+
+if __name__ == '__main__':
+  unittest.main()

src/MacVim/icons/loadfont.c

@@ -0,0 +1,56 @@
+// A small python module that registers a font with ATS, given the name of
+// the font.
+
+#include <Python/Python.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <Carbon/Carbon.h>
+
+static PyObject* loadfont(PyObject* self, PyObject* args) {
+  PyObject*   result = Py_False;
+  const char* path = NULL;
+  int         ok = PyArg_ParseTuple(args, "s", &path);
+
+  if (ok) {
+    CFStringRef componentPath = CFStringCreateWithCString(kCFAllocatorDefault,
+        path, kCFStringEncodingUTF8);
+    CFURLRef componentURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
+        componentPath, kCFURLPOSIXPathStyle, false);
+    FSRef fsref;
+
+    if (CFURLGetFSRef(componentURL, &fsref)) {
+      OSStatus err = noErr;
+      ATSFontContainerRef fontContainerRef;  // we don't deactivate the font
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+      err = ATSFontActivateFromFileReference(&fsref,
+          kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
+          kATSOptionFlagsDefault, &fontContainerRef);
+#else
+      FSSpec fsSpec;
+      FSRef  fsRef;
+      if ((err = FSGetCatalogInfo(
+              &fsRef, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL)) == noErr) {
+        err = ATSFontActivateFromFileSpecification(&fsSpec,
+            kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
+            kATSOptionFlagsDefault, &fontContainerRef);
+      }
+
+#endif
+
+      if (err == noErr) {
+        result = Py_True;
+      }
+    }
+    CFRelease(componentURL);
+    CFRelease(componentPath);       
+  }
+  return result;
+}
+
+static PyMethodDef LoadfontMethods[] = {
+  { "loadfont", loadfont, METH_VARARGS, "Locally activates font from file." },
+  { NULL, NULL, 0, NULL }
+};
+
+PyMODINIT_FUNC initloadfont(void) {
+  Py_InitModule("loadfont", LoadfontMethods);
+}

src/MacVim/icons/make_icons.py

@@ -1,30 +1,52 @@
-# Creates a document icon from an app icon and an optional text.
-
-# The font is not quite right, use this script to create a document icon
-# for 'PDF' and compare the D with the D in Preview's pdf.icns
+# Creates all of MacVim document icons.
 
 # http://www.macresearch.org/cocoa-scientists-part-xx-python-scriptersmeet-cocoa
 try:
-  from Foundation import *
+  # Make us independent of sysprefs->appearance->antialias fonts smaller than...
+  # Needs to happen before docerator is imported.
+  from AppKit import NSUserDefaults
+  prefs = NSUserDefaults.standardUserDefaults()
+  prefs.setInteger_forKey_(4, 'AppleAntiAliasingThreshold')
+
+  import docerator
+
+  # Load Envy Code R from a file and register it under its postscript name
+  # Thanks to DamienG for this font (redistributed with permission):
+  # http://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released
+  import loadfont
+  loadfont.loadfont('Envy Code R Bold.ttf')
+
+  from Foundation import NSString
   from AppKit import *
+
   dont_create = False
-except:
+except Exception, e:
+  print e
   dont_create = True  # most likely because we're on tiger
 
-import math
 import os
 import sys
 
+
 # icon types
 LARGE = 0  # 512, 128, 32, 16; about 96kB
 SMALL = 1  # 128, 32, 16; about 36kB
 LINK = 2  # Create link to generic icon; 4kB (== smallest block size on HFS+)
 
-# path to makeicns binary
+iconsizes = {
+    SMALL: [128, 32, 16],
+    LARGE: [512, 128, 32, 16],
+}
+
+
+# Resources
 MAKEICNS = 'makeicns/makeicns'
+APPICON = 'vim-noshadow-512.png'
+DEFAULT_BACKGROUND = '/System/Library/CoreServices/CoreTypes.bundle/' + \
+    'Contents/Resources/GenericDocumentIcon.icns'
+
 
 # List of icons to create
-# XXX: 32x32 variants only support 3-4 letters of text
 GENERIC_ICON_NAME = 'MacVim-generic'
 vimIcons = {
     GENERIC_ICON_NAME: [u'', LARGE],
@@ -35,19 +57,19 @@ vimIcons = {
     'MacVim-c': [u'C', SMALL],
     'MacVim-m': [u'M', SMALL],
     'MacVim-mm': [u'MM', SMALL],
-    'MacVim-cpp': [u'C\uff0b\uff0b', SMALL],  # fullwidth plusses
+    'MacVim-cpp': [u'C\uff0b\uff0b,C++,C++', SMALL],  # fullwidth plusses
     'MacVim-java': [u'JAVA', SMALL],
     'MacVim-f': [u'FTRAN', SMALL],
     'MacVim-html': [u'HTML', SMALL],
     'MacVim-xml': [u'XML', SMALL],
     'MacVim-js': [u'JS', SMALL],
-    'MacVim-perl': [u'PERL', SMALL],
-    'MacVim-py': [u'PYTHON', SMALL],
+    'MacVim-perl': [u'PERL,PL', SMALL],
+    'MacVim-py': [u'PYTHON,PY', SMALL],
     'MacVim-php': [u'PHP', SMALL],
-    'MacVim-rb': [u'RUBY', SMALL],
+    'MacVim-rb': [u'RUBY,RB', SMALL],
     'MacVim-bash': [u'SH', SMALL],
     'MacVim-patch': [u'DIFF', SMALL],
-    'MacVim-applescript': [u'\uf8ffSCPT', SMALL],  # apple sign
+    'MacVim-applescript': [u'\uf8ffSCPT,\uf8ffS', SMALL],  # apple sign
     'MacVim-as': [u'FLASH', LINK],
     'MacVim-asp': [u'ASP', LINK],
     'MacVim-bib': [u'BIB', LINK],
@@ -60,8 +82,8 @@ vimIcons = {
     'MacVim-css': [u'CSS', SMALL],
     'MacVim-dtd': [u'DTD', LINK],
     'MacVim-dylan': [u'DYLAN', LINK],
-    'MacVim-erl': [u'ERLANG', SMALL],
-    'MacVim-fscript': [u'FSCPT', SMALL],
+    'MacVim-erl': [u'ERLANG,ERL', SMALL],
+    'MacVim-fscript': [u'FSCPT,FSCR,FS', SMALL],
     'MacVim-hs': [u'HS', SMALL],
     'MacVim-inc': [u'INC', LINK],
     'MacVim-ics': [u'ICS', SMALL],
@@ -70,386 +92,24 @@ vimIcons = {
     'MacVim-bsh': [u'BSH', LINK],
     'MacVim-properties': [u'PROP', LINK],
     'MacVim-jsp': [u'JSP', SMALL],
-    'MacVim-lisp': [u'LISP', SMALL],
+    'MacVim-lisp': [u'LISP,LISP,LSP', SMALL],
     'MacVim-log': [u'LOG', SMALL],
     'MacVim-wiki': [u'WIKI', SMALL],
     'MacVim-ps': [u'PS', LINK],
     #'MacVim-plist': [u'PLIST', SMALL],
-    'MacVim-sch': [u'SCHEME', SMALL],
+    'MacVim-sch': [u'SCHEME,SCM', SMALL],
     'MacVim-sql': [u'SQL', SMALL],
     'MacVim-tcl': [u'TCL', SMALL],
     'MacVim-xsl': [u'XSL', LINK],
-    'MacVim-vcf': [u'VCARD', SMALL],
-    'MacVim-vb': [u'VBASIC', LINK],
-    'MacVim-yaml': [u'YAML', SMALL],
+    'MacVim-vcf': [u'VCARD,VCF', SMALL],
+    'MacVim-vb': [u'VBASIC,VB', LINK],
+    'MacVim-yaml': [u'YAML,YAML,YML', SMALL],
     'MacVim-gtd': [u'GTD', LINK],
+    'MacVim-markdown': [u'MARK\u2193,M\u2193', LINK],  # down arrow
+    'MacVim-rst': [u'RST', LINK],
+    'MacVim-vba': [u'VBA', LINK],
 }
 
-shorttext = {
-    u'MacVim-py': u'PY',
-    u'MacVim-rb': u'RB',
-    u'MacVim-perl': u'PL',
-    u'MacVim-applescript': u'\uf8ffS',
-    u'MacVim-erl': u'ERL',
-    u'MacVim-fscript': u'FSCR',
-    u'MacVim-sch': u'SCM',
-    u'MacVim-vcf': u'VCF',
-    u'MacVim-vb': u'VB',
-}
-
-
-# Resources
-BACKGROUND = '/System/Library/CoreServices/CoreTypes.bundle/' + \
-    'Contents/Resources/GenericDocumentIcon.icns'  # might require leopard?
-APPICON = 'vim-noshadow-512.png'
-#APPICON = 'vim-noshadow-no-v-512.png'
-
-class Surface(object):
-  """Represents a simple bitmapped image."""
-
-  def __init__(self, *p, **kw):
-    if not 'premultiplyAlpha' in kw:
-      kw['premultiplyAlpha'] = True
-    if len(p) == 1 and isinstance(p[0], NSBitmapImageRep):
-      self.bitmapRep = p[0]
-    elif len(p) == 2 and isinstance(p[0], int) and isinstance(p[1], int):
-      format = NSAlphaFirstBitmapFormat
-      if not kw['premultiplyAlpha']:
-        format += NSAlphaNonpremultipliedBitmapFormat
-      self.bitmapRep = NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-          None, p[0], p[1], 8, 4, True, False, NSDeviceRGBColorSpace,
-          format, 0, 0)
-
-    if not hasattr(self, 'bitmapRep') or not self.bitmapRep:
-      raise Exception('Failed to create surface: ' + str(p))
-
-  def size(self):
-    return map(int, self.bitmapRep.size())  # cocoa returns floats. cocoa ftw
-
-  def data(self):
-    """Returns data in ARGB order (on intel, at least)."""
-    r = self.bitmapRep
-    if r.bitmapFormat() != (NSAlphaNonpremultipliedBitmapFormat |
-          NSAlphaFirstBitmapFormat) or \
-        r.bitsPerPixel() != 32 or \
-        r.isPlanar() or \
-        r.samplesPerPixel() != 4:
-      raise Exception("Unsupported image format")
-    return self.bitmapRep.bitmapData()
-
-  def save(self, filename):
-    """Saves image as png file."""
-    self.bitmapRep.representationUsingType_properties_(NSPNGFileType, None) \
-        .writeToFile_atomically_(filename, True)
-
-  def draw(self):
-    self.bitmapRep.draw()
-
-  def context(self):
-    # Note: Cocoa only supports contexts with premultiplied alpha
-    return NSGraphicsContext.graphicsContextWithBitmapImageRep_(self.bitmapRep)
-
-  def copy(self):
-    return Surface(self.bitmapRep.copy())
-
-
-class Image(object):
-  """Represents an image that can consist of several Surfaces."""
-
-  def __init__(self, param):
-    if isinstance(param, str):
-      self.image = NSImage.alloc().initWithContentsOfFile_(param)
-    elif isinstance(param, Surface):
-      self.image = NSImage.alloc().initWithSize_( param.size() )
-      self.image.addRepresentation_(param.bitmapRep)
-
-    if not self.image:
-      raise Exception('Failed to load image: ' + str(filename))
-
-  def surfaceOfSize(self, w, h):
-    """Returns an ARGB, non-premultiplied surface of size w*h or throws."""
-    r = None
-    for rep in self.image.representations():
-      if map(int, rep.size()) == [w, h]:
-        r = rep
-        break
-    if not r:
-      raise Exception('Unsupported size %dx%d', w, h)
-    return Surface(r)
-
-  def blend(self):
-    self.compositeInRect( ((0, 0), self.image.size()) )
-
-  def compositeInRect(self, r, mode=NSCompositeSourceOver):
-    self.image.drawInRect_fromRect_operation_fraction_(r, NSZeroRect,
-        mode, 1.0)
-
-
-class Context(object):
-  # Tiger has only Python2.3, so we can't use __enter__ / __exit__ for this :-(
-
-  def __init__(self, surface):
-    NSGraphicsContext.saveGraphicsState()
-    c = surface.context()
-    c.setShouldAntialias_(True);
-    c.setImageInterpolation_(NSImageInterpolationHigh);
-    NSGraphicsContext.setCurrentContext_(c)
-
-  def done(self):
-    NSGraphicsContext.restoreGraphicsState()
-
-
-class SplittableBackground(object):
-
-  def __init__(self, unsplitted, shouldSplit=True):
-    self.unsplitted = unsplitted
-    self.shouldSplit = shouldSplit
-    self.ground = {}
-    self.shadow = {}
-
-  def rawGroundAtSize(self, s):
-    return self.unsplitted.surfaceOfSize(s, s)
-
-  def groundAtSize(self, s):
-    if not self.shouldSplit:
-      return self.rawGroundAtSize(s)
-    self._performSplit(s)
-    return self.ground[s]
-
-  def shadowAtSize(self, s):
-    if not self.shouldSplit:
-      return None
-    self._performSplit(s)
-    return self.shadow[s]
-
-  def _performSplit(self, s):
-    if s in self.ground:
-      assert s in self.shadow
-      return
-    assert s not in self.shadow
-    ground, shadow = splitGenericDocumentIcon(self.unsplitted, s)
-    self.ground[s] = ground
-    self.shadow[s] = shadow
-
-
-class BackgroundRenderer(object):
-
-  def __init__(self, bg, icon=None):
-    self.bgRenderer = bg
-    self.icon = icon
-    self.cache = {}
-
-  def drawIcon(self, s):
-    if not self.icon:
-      return
-    # found by flow program, better than anything i came up with manually before
-    # (except for the 16x16 variant :-( )
-    transforms = {
-        512: [ 0.7049, 0.5653, -4.2432, 0.5656],
-        256: [ 0.5690, 0.5658, -1.9331, 0.5656],
-        128: [ 1.1461, 0.5684, -0.8482, 0.5681],
-
-         32: [-0.2682, 0.5895, -2.2130, 0.5701],  # intensity
-         #32: [-0.2731, 0.5898, -2.2262, 0.5729],  # rgb (no rmse difference)
-
-         #16: [-0.3033, 0.4909, -1.3235, 0.4790],  # program, intensity
-         #16: [-0.3087, 0.4920, -1.2990, 0.4750],  # program, rgb mode
-         16: [ 0.0000, 0.5000, -1.0000, 0.5000],  # manually, better
-        }
-
-    assert s in [16, 32, 128, 256, 512]
-    a = transforms[s]
-
-    # convert from `flow` coords to cocoa
-    a[2] = -a[2]  # mirror y
-
-    w, h = s*a[1], s*a[3]
-    self.icon.compositeInRect( (((s-w)/2 + a[0], (s-h)/2 + a[2]), (w, h)) )
-
-  def drawAtSize(self, s):
-    self.bgRenderer.groundAtSize(s).draw()
-    self.drawIcon(s)
-    if self.bgRenderer.shouldSplit:
-      # shadow needs to be composited, so it needs to be in an image
-      Image(self.bgRenderer.shadowAtSize(s)).blend()
-
-  def backgroundAtSize(self, s):
-    if not s in self.cache:
-      result = Surface(s, s)
-      context = Context(result)
-      self.drawAtSize(s)
-      context.done()
-      self.cache[s] = result
-    return self.cache[s]
-
-
-def splitGenericDocumentIcon(img, s):
-  """Takes the generic document icon and splits it into a background and a
-  shadow layer. For the 32x32 and 16x16 variants, the white pixels of the page
-  curl are hardcoded into the otherwise transparent shadow layer."""
-
-  w, h = s, s
-  r = img.surfaceOfSize(w, h)
-  bps = 4*w
-  data = r.data()
-
-  ground = Surface(w, h, premultiplyAlpha=False)
-  shadow = Surface(w, h, premultiplyAlpha=False)
-
-  grounddata = ground.data()
-  shadowdata = shadow.data()
-
-  for y in xrange(h):
-    for x in xrange(w):
-      idx = y*bps + 4*x
-      ia, ir, ig, ib = data[idx:idx + 4]
-      if ia != chr(255):
-        # buffer objects don't support slice assignment :-(
-        grounddata[idx] = ia
-        grounddata[idx + 1] = ir
-        grounddata[idx + 2] = ig
-        grounddata[idx + 3] = ib
-        shadowdata[idx] = chr(0)
-        shadowdata[idx + 1] = chr(0)
-        shadowdata[idx + 2] = chr(0)
-        shadowdata[idx + 3] = chr(0)
-        continue
-
-      assert ir == ig == ib
-      grounddata[idx] = chr(255)
-      grounddata[idx + 1] = chr(255)
-      grounddata[idx + 2] = chr(255)
-      grounddata[idx + 3] = chr(255)
-      shadowdata[idx] = chr(255 - ord(ir))
-      shadowdata[idx + 1] = chr(0)
-      shadowdata[idx + 2] = chr(0)
-      shadowdata[idx + 3] = chr(0)
-
-  # Special-case 16x16 and 32x32 cases: Make some pixels on the fold white.
-  # Ideally, I could make the fold whiteish in all variants, but I can't.
-  whitePix = { 16: [(10, 2), (10, 3), (11, 3), (10, 4), (11, 4), (12, 4)],
-               32: [(21, 4), (21, 5), (22, 5), (21, 6), (22, 6), (23, 6)]}
-  if (w, h) in [(16, 16), (32, 32)]:
-    for x, y in whitePix[w]:
-      idx = y*bps + 4*x
-      shadowdata[idx] = chr(255)
-      shadowdata[idx + 1] = chr(255)
-      shadowdata[idx + 2] = chr(255)
-      shadowdata[idx + 3] = chr(255)
-
-  return ground, shadow
-
-
-class TextRenderer(object):
-
-  def __init__(self):
-    self.cache = {}
-
-  def attribsAtSize(self, s):
-    if s not in self.cache:
-      self.cache[s] = self._attribsAtSize(s)
-    return self.cache[s]
-
-  def centeredStyle(self):
-    style = NSMutableParagraphStyle.new()
-    style.setParagraphStyle_(NSParagraphStyle.defaultParagraphStyle())
-    style.setAlignment_(NSCenterTextAlignment)
-    return style
-
-  def _attribsAtSize(self, s):
-    # This looks not exactly like the font on Preview.app's document icons,
-    # but I believe that's because Preview's icons are drawn by Photoshop,
-    # and Adobe's font rendering is different from Apple's.
-    fontname = 'LucidaGrande-Bold'
-
-    # Prepare text format
-    fontsizes = { 512: 72.0,  256: 36.0,  128: 18.0,  32: 7.0,  16: 3.0 }
-    # http://developer.apple.com/documentation/Cocoa/Conceptual/AttributedStrings/Articles/standardAttributes.html#//apple_ref/doc/uid/TP40004903
-    attribs = {
-      NSParagraphStyleAttributeName: self.centeredStyle(),
-      NSForegroundColorAttributeName: NSColor.colorWithDeviceWhite_alpha_(
-          0.34, 1),
-      NSFontAttributeName: NSFont.fontWithName_size_(fontname, fontsizes[s])
-    }
-
-    # tighten font a bit for some sizes
-    if s in [256, 512]:
-      attribs[NSKernAttributeName] = -1.0
-    elif s == 32:
-      attribs[NSKernAttributeName] = -0.25
-
-    if not attribs[NSFontAttributeName]:
-      raise Exception('Failed to load font %s' % fontname)
-    return attribs
-
-  def drawTextAtSize(self, text, s):
-    """Draws text `s` into the current context of size `s`."""
-
-    textRects = {
-        512: ((0, 7), (512, 119)),
-        128: ((0, 6), (128, 26.5)),
-        256: ((0, 7), (256, 57)),
-         16: ((1, 1), (15, 5)),
-         #32: ((1, 1), (31, 9))
-        }
-
-    attribs = self.attribsAtSize(s)
-    text = NSString.stringWithString_(text)
-    if s in [16, 128, 256, 512]:
-      text.drawInRect_withAttributes_(textRects[s], attribs)
-    elif s == 32:
-      # Try to align text on pixel boundary:
-      attribs = attribs.copy()
-      attribs[NSParagraphStyleAttributeName] = \
-          NSParagraphStyle.defaultParagraphStyle()
-      ts = text.sizeWithAttributes_(attribs)
-      text.drawAtPoint_withAttributes_( (math.floor((32.0-ts[0])/2) + 0.5, 1.5),
-          attribs)
-
-
-class OfficeTextRenderer(TextRenderer):
-  """Uses Office's LucidaSans font for 32x32.
-
-  This font looks much better for certain strings (e.g. "PDF") but much worse
-  for most others (e.g. "VIM", "JAVA") -- and office fonts are usually not
-  installed. Hence, this class is better not used.
-  """
-
-  def _attribsAtSize(self, s):
-    self.useOfficeFont = False
-    attribs = TextRenderer._attribsAtSize(self, s)
-    if s == 32:
-      font = NSFont.fontWithName_size_('LucidaSans-Demi', 7.0)
-      if font:
-        attribs[NSFontAttributeName] = font
-        attribs[NSKernAttributeName] = 0
-        self.useOfficeFont = True
-    return attribs
-
-  def drawTextAtSize(self, text, s):
-    attribs = self.attribsAtSize(s)
-    if not self.useOfficeFont or s != 32:
-      TextRenderer.drawTextAtSize(self, text, s)
-      return
-    text = NSString.stringWithString_(text)
-    text.drawInRect_withAttributes_( ((0, 1), (31, 11)), attribs)
-
-
-def createIcon(outname, s, bg, textRenderer, text, shorttext=None):
-
-  # Fill in background
-  output = bg.backgroundAtSize(s).copy()
-
-  # Draw text on top of shadow
-  context = Context(output)
-  if s in [16, 32] and shorttext:
-    text = shorttext
-  textRenderer.drawTextAtSize(text, s)
-  context.done()
-
-  # Save
-  output.save(outname)
-
 
 def createLinks(icons, target):
   assert len(icons) > 0
@@ -460,65 +120,75 @@ def createLinks(icons, target):
     os.symlink(target, icnsName)
 
 
-TMPFILE = 'make_icons_tmp_%d.png'
-sizes = [512, 128, 32, 16]
+if not dont_create:
+  # define a few classes to render custom 16x16 icons
+
+  class NoTextRenderer(docerator.TextRenderer):
+    def drawTextAtSize(self, text, s):
+      if s == 16: return  # No text at 16x16
+      docerator.TextRenderer.drawTextAtSize(self, text, s)
+
+  class NoIconRenderer(docerator.BackgroundRenderer):
+    def drawIcon(self, s):
+      if s == 16: return  # no "MacVim" icon on the sheet at 16x16
+      docerator.BackgroundRenderer.drawIcon(self, s)
+
+  class SmallTextRenderer(docerator.TextRenderer):
+    def _attribsAtSize(self, s):
+      attribs = docerator.TextRenderer._attribsAtSize(self, s)
+      if s == 16:
+        font = NSFont.fontWithName_size_('EnvyCodeR-Bold', 7.0)
+        assert font
+        attribs[NSFontAttributeName] = font
+        attribs[NSForegroundColorAttributeName] = \
+            NSColor.colorWithDeviceRed_green_blue_alpha_(
+                0/255.0, 82/255.0, 0/255.0, 1)
+      return attribs
+
+    def drawTextAtSize(self, text, s):
+      if s != 16:
+        docerator.TextRenderer.drawTextAtSize(self, text, s)
+        return
+      text = NSString.stringWithString_(text.lower()[0:3])  # at most 3 chars
+      attribs = self.attribsAtSize(s)
+      if len(text) <= 2:
+        attribs[NSKernAttributeName] = 0  # we have some space
+      else:
+        attribs[NSKernAttributeName] = -1  # we need all the room we can get
+      text.drawInRect_withAttributes_( ((1, 2), (15, 11)), attribs)
+
+
 def main():
+  if dont_create:
+    print "PyObjC not found, only using a stock icon for document icons."
+    # Can't use the constants from docerator in this case
+    import shutil
+    shutil.copyfile(DEFAULT_BACKGROUND, '%s.icns' % GENERIC_ICON_NAME)
+    createLinks([name for name in vimIcons if name != GENERIC_ICON_NAME],
+        '%s.icns' % GENERIC_ICON_NAME)
+    return
+
   srcdir = os.getcwd()
   if len(sys.argv) > 1:
     os.chdir(sys.argv[1])
   appIcon = os.path.join(srcdir, APPICON)
   makeIcns = os.path.join(srcdir, MAKEICNS)
 
-  if dont_create:
-    print "PyObjC not found, only using a stock icon for document icons."
-    import shutil
-    shutil.copyfile(BACKGROUND, '%s.icns' % GENERIC_ICON_NAME)
-    createLinks([name for name in vimIcons if name != GENERIC_ICON_NAME],
-        '%s.icns' % GENERIC_ICON_NAME)
-    return
-  # Make us not crash
-  # http://www.cocoabuilder.com/archive/message/cocoa/2008/8/6/214964
-  NSApplicationLoad()
-
-  textRenderer = TextRenderer()
-  #textRenderer = OfficeTextRenderer()
-
-  # Prepare input images
-  bgIcon = Image(BACKGROUND)
-
-  #bg = SplittableBackground(bgIcon, shouldSplit=False)
-  bg = SplittableBackground(bgIcon, shouldSplit=True)
-
-  icon = Image(appIcon)
-  bgRenderer = BackgroundRenderer(bg, icon)
-
-  if not os.access(makeIcns, os.X_OK):
-    print 'Cannot find makeicns at %s', makeIcns
-    return
-
   # create LARGE and SMALL icons first...
   for name, t in vimIcons.iteritems():
     text, size = t
     if size == LINK: continue
     print name
-    icnsName = '%s.icns' % name
-
-    if size == SMALL:
-      currSizes = [128, 32, 16]
-      args = '-128 %s -32 %s -16 %s' % (
-          TMPFILE % 128, TMPFILE % 32, TMPFILE % 16)
-    elif size == LARGE:
-      currSizes = [512, 128, 32, 16]
-      args = '-512 %s -128 %s -32 %s -16 %s' % (
-          TMPFILE % 512, TMPFILE % 128, TMPFILE % 32, TMPFILE % 16)
-
-    st = shorttext.get(name)
-    for s in currSizes:
-      createIcon(TMPFILE % s, s, bgRenderer, textRenderer, text, shorttext=st)
-
-    os.system('%s %s -out %s' % (makeIcns, args, icnsName))
-
-  del text, size, name, t
+    if name == GENERIC_ICON_NAME:
+      # The generic icon has no text; make the appicon a bit larger
+      docerator.makedocicon(outname='%s.icns' % name, appicon=appIcon,
+          text=text, sizes=iconsizes[size], makeicns=makeIcns,
+          textrenderer=NoTextRenderer, rects={16:(0.0, 0.5533, 0.0, 0.5533)})
+    else:
+      # For the other icons, leave out appicon and render text in Envy Code R
+      docerator.makedocicon(outname='%s.icns' % name, appicon=appIcon,
+          text=text, sizes=iconsizes[size], makeicns=makeIcns,
+          textrenderer=SmallTextRenderer, backgroundrenderer=NoIconRenderer)
 
   # ...create links later (to make sure the link targets exist)
   createLinks([name for (name, t) in vimIcons.items() if t[1] == LINK],
@@ -526,9 +196,4 @@ def main():
 
 
 if __name__ == '__main__':
-  try:
     main()
-  finally:
-    for s in sizes:
-      if os.access(TMPFILE % s, os.F_OK):
-        os.remove(TMPFILE % s)

src/MacVim/icons/makeicns/IconFamily.h

@@ -176,6 +176,8 @@
 
 @end
 
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050  // Scrap Manager has been nixed on Snow Leopard
 // Methods for interfacing with the Carbon Scrap Manager (analogous to and
 // interoperable with the Cocoa Pasteboard).
 @interface IconFamily (ScrapAdditions)
@@ -184,3 +186,5 @@
 - initWithScrap;
 - (BOOL) putOnScrap;
 @end
+#endif
+

src/MacVim/icons/makeicns/IconFamily.m

@@ -1498,6 +1498,7 @@ enum {
 
 @end
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050  // Scrap Manager has been nixed on Snow Leopard
 // Methods for interfacing with the Carbon Scrap Manager (analogous to and
 // interoperable with the Cocoa Pasteboard).
 
@@ -1573,4 +1574,4 @@ enum {
 
 @end
 
-
+#endif

src/MacVim/icons/makeicns/makeicns.m

@@ -54,9 +54,10 @@ void usage() {
 NSBitmapImageRep* getBitmapImageRepOfSize(NSImage* img, int size) {
 
   // Don't resample if it's not necessary
-  // XXX: Seems as if this creates problems in some situations, disable this
-  // for now.
 #if 0
+  // IconFamily does not work correctly with
+  // NSAlphaNonpremultipliedBitmapFormat images, so this has to stay disabled
+  // until IconFamily is fixed (if ever).
   NSEnumerator* e = [[img representations] objectEnumerator];
   NSImageRep* ir;
   while ((ir = [e nextObject])) {

src/MacVim/icons/setup.py

@@ -0,0 +1,5 @@
+from distutils.core import setup, Extension
+
+setup(name="loadfont", version="1.0",
+	ext_modules = [Extension("loadfont", ["loadfont.c"])])
+

src/MacVim/macvim_latest.xml

@@ -40,6 +40,182 @@
     Sparkle supports updates in zip, tar, tbz, tgz, or dmg format.
     -->
 
+    <item>
+      <title>Snapshot 49 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 49 released</h1>
+
+<p> Changes since snapshot 47:
+  <ul>
+    <li> ATSUI clips text to display cell to avoid "bleeding" </li>
+    <li> The pwd is set properly when dropping a folder on the Dock </li>
+    <li> Add Vimball (.vba) as a supported filetype </li>
+    <li> Refactored input code (e.g. can now bind to numeric keypad) </li>
+    <li> Improved IM support (separate keyboard layouts in normal/insert modes using the 'noimd' option, see ":h macvim-international") </li>
+    <li> Draw marked text inline (listed as +xim in ":ver") </li>
+    <li> Add user default MMUseInlineIm (use to disable above feature) </li>
+    <li> Update Vim source and runtime files </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Sun, 16 Aug 2009 01:17 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-49.tbz"
+        length="8212194"
+        sparkle:version="49"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
+    <item>
+      <title>Snapshot 47 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 47 released</h1>
+
+<p> Changes since snapshot 45:
+  <ul>
+    <li> Markdown (Nico Weber) and reStructuredText (Travis Jeffery) are supported file types </li>
+    <li> The forever bouncing Dock icon bug should now really really be fixed (Kazuki Sakamoto) </li>
+    <li> Fixed bug when file name contained decomposed UTF8 characters </li>
+    <li> Quick Look should work for most/all supported filetypes now (although the preview is simple text and is not syntax highlighted) </li>
+    <li> Update the help file </li>
+    <li> 'guifontwide' is updated on Cmd-+/Cmd-- </li>
+    <li> The titles of the next/previous tab menu items now match other apps </li>
+    <li> Add NetBeans support (Kazuki Sakamoto) </li>
+    <li> Add simple logging facility </li>
+    <li> Fix a bug which could cause a crash when a dialog sheet was used </li>
+    <li> Update to latest Vim patches and runtime files </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Fri, 16 Jul 2009 19:43 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-47.tbz"
+        length="8200839"
+        sparkle:version="47"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
+    <item>
+      <title>Snapshot 45 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 45 released</h1>
+
+<p> Changes since snapshot 44:
+  <ul>
+    <li> The toolbar is not hidden by default again (if you prefer having the toolbar hidden, then add the line "set go-=T" to your ~/.gvimrc file) </li>
+    <li> The ATSUI renderer honors the 'guisp' highlighting color </li>
+    <li> Fix the forever bouncing Dock icon bug (Kazuki Sakamoto) </li>
+    <li> Add the "Show Hidden Files" checkbox button to the Save dialog whenever the file browser is expanded </li>
+    <li> Frontend refactoring </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Mon, 13 Apr 2009 19:19 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-45.tbz"
+        length="8135831"
+        sparkle:version="45"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
+    <item>
+      <title>Snapshot 44 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 44 released</h1>
+
+<p> Changes since snapshot 43:
+  <ul>
+      <li> The color table had many erroneous entries which have been corrected (Zvezdan Petkovic) </li>
+      <li> Ctrl+tab works again </li>
+      <li> Tab labels only show file tail by default to make them more legible (reset to default by adding "set guitablabel&" to .gvimrc) </li>
+      <li> The number of columns does not change on ":set go+=rT" </li>
+      <li> Fixed problems with view not maximizing when entering full-screen and the Dock was visible </li>
+      <li> Fix various problems related to having windows on a screen that got unplugged (fixes Issue 162) </li>
+      <li> Latest source code version and runtime files (e.g. the Python syntax file is fixed, fixes Issue 160) </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Sun, 29 Mar 2009 16:56 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-44.tbz"
+        length="8139075"
+        sparkle:version="44"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
+    <item>
+      <title>Snapshot 43 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 43 released</h1>
+
+<p><b>The automatic updating feature is broken in snapshots 39 and 40.  If the automatic updating never finishes extracting then you are affected by this bug and will have to upgrade manually.  To do so, simply go to the <a href="http://code.google.com/p/macvim/wiki/Snapshot">Snapshot page</a> to download the latest version.</b></p>
+
+<p> Changes since snapshot 42:
+  <ul>
+    <li> Do inclusive search when opening files (Jonathon Mah) </li>
+    <li> Respect layout prefs when double-clicking an already open file </li>
+    <li> Fix two minor memory leaks </li>
+    <li> Ctrl-] works on German keyboard layout </li>
+    <li> The .viminfo file is written on Cmd-q </li>
+    <li> New 16x16 icons (Nico Weber) </li>
+    <li> Untitled window again opens on reopen event if requested in prefs </li>
+    <li> Fork earlier; fixes bug with 'autochdir', faster startup, "f" no longer supported in 'guioptions' </li>
+    <li> Some other minor bug fixes </li>
+    <li> Use latest runtime files and Vim patches </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Fri, 20 Feb 2009 13:49 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-43.tbz"
+        length="8136440"
+        sparkle:version="43"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
+    <item>
+      <title>Snapshot 42 released</title>
+      <description><![CDATA[
+<h1>MacVim snapshot 42 released</h1>
+
+<p><b>The automatic updating feature is broken in snapshots 39 and 40.  If the automatic updating never finishes extracting then you are affected by this bug and will have to upgrade manually.  To do so, simply go to the <a href="http://code.google.com/p/macvim/wiki/Snapshot">Snapshot page</a> to download the latest version.</b></p>
+
+<p> Changes since snapshot 40:
+  <ul>
+    <li> The menu bar behaves better when using full-screen and switching Spaces (Nico Weber) </li>
+    <li> Don't switch Spaces when using "mvim" on one Space and a MacVim window is open on another Space </li>
+    <li> Add user default to toggle the "add tab" button on the tabline (to disable, enter "defaults org.vim.MacVim MMShowAddTabButton 0" in Terminal) </li>
+    <li> Avoid the "Press ENTER..." prompt when dragging and dropping </li>
+    <li> Faster startup (and shutdown, but you're not likely to notice that unless you are me ;-) </li>
+    <li> Automatic updating works again </li>
+    <li> Possible to interrupt external commands (e.g. you can Ctrl-C during a lenghty :grep now) </li>
+    <li> The output from external commands is displayed "interactively" (i.e. you don't have to wait for the command to finish before any output is drawn; try ":!ls -l /usr/lib" and compare with snap 40 to see what I mean) </li>
+    <li> Cmd-. sends SIGINT (so that if a Vim process is stuck you should always be able to interrupt it with Cmd-. even if Ctrl-C doesn't work) </li>
+    <li> Fix crashing bug: e.g. with snap 40 if you go to the src/ folder of Vim and type ":grep a *.c" MacVim would crash </li>
+    <li> Toggle loading of default font with user default MMLoadDefaultFont </li>
+  </ul>
+</p>
+      ]]></description>
+      <pubDate>Sat, 12 Jan 2009 16:12 CET</pubDate>
+      <enclosure type="application/octet-stream"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-42.tbz"
+        length="8131516"
+        sparkle:version="42"
+        sparkle:shortVersionString="7.2"
+        />
+    </item>
+
+
     <item>
       <title>Snapshot 40 released</title>
       <description><![CDATA[

src/MacVim/vimrc

@@ -1,10 +1,15 @@
 " System vimrc file for MacVim
 "
 " Maintainer:	Bjorn Winckler <bjorn.winckler@gmail.com>
-" Last Change:	Sun May 25 2008
+" Last Change:	Sat Aug 29 2009
 
 set nocompatible
 
 " The default for 'backspace' is very confusing to new users, so change it to a
 " more sensible value.  Add "set backspace&" to your ~/.vimrc to reset it.
 set backspace+=indent,eol,start
+
+" Disable localized menus for now since only some items are translated (e.g.
+" the entire MacVim menu is set up in a nib file which currently only is
+" translated to English).
+set langmenu=none

src/Make_cyg.mak

@@ -212,13 +212,34 @@ ifndef MZSCHEME_VER
 MZSCHEME_VER = 209_000
 endif
 
+ifndef MZSCHEME_PRECISE_GC
+MZSCHEME_PRECISE_GC=no
+endif
+
+# for version 4.x we need to generate byte-code for Scheme base
+ifndef MZSCHEME_GENERATE_BASE
+MZSCHEME_GENERATE_BASE=no
+endif
+
 ifeq (yes, $(DYNAMIC_MZSCHEME))
 DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 else
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS = $(MZSCHEME)
 endif
-EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+else
+MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+endif
+EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+endif
+ifeq (yes,$(MZSCHEME_GENERATE_BASE))
+DEFINES += -DINCLUDE_MZSCHEME_BASE
+MZ_EXTRA_DEP += mzscheme_base.c
+endif
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+DEFINES += -DMZ_PRECISE_GC
 endif
 endif
 
@@ -472,6 +493,9 @@ clean:
 	-$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
 ifdef PERL
 	-$(DEL) if_perl.c
+endif
+ifdef MZSCHEME
+	-$(DEL) mzscheme_base.c
 endif
 	-$(DEL) pathdef.c
 	$(MAKE) -C xxd -f Make_cyg.mak clean
@@ -523,9 +547,15 @@ endif
 $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
 	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
 
+$(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+
 $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
 	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
 
+mzscheme_base.c:
+	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+
 pathdef.c: $(INCL)
 ifneq (sh.exe, $(SHELL))
 	@echo creating pathdef.c

src/Make_ming.mak

@@ -115,14 +115,27 @@ ifndef MZSCHEME_VER
 MZSCHEME_VER=205_000
 endif
 
+ifndef MZSCHEME_PRECISE_GC
+MZSCHEME_PRECISE_GC=no
+endif
+
+# for version 4.x we need to generate byte-code for Scheme base
+ifndef MZSCHEME_GENERATE_BASE
+MZSCHEME_GENERATE_BASE=no
+endif
+
 ifeq (no,$(DYNAMIC_MZSCHEME))
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+else
 MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+endif
 # the modern MinGW can dynamically link to dlls directly.
 # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS=$(MZSCHEME)
 endif
-MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
+MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
 endif
 
 endif
@@ -410,6 +423,13 @@ endif
 ifdef MZSCHEME
 OBJ += $(OUTDIR)/if_mzsch.o
 MZSCHEME_INCL = if_mzsch.h
+ifeq (yes,$(MZSCHEME_GENERATE_BASE))
+CFLAGS += -DINCLUDE_MZSCHEME_BASE
+MZ_EXTRA_DEP += mzscheme_base.c
+endif
+ifeq (yes,$(MZSCHEME_PRECISE_GC))
+CFLAGS += -DMZ_PRECISE_GC
+endif
 endif
 ifdef PYTHON
 OBJ += $(OUTDIR)/if_python.o
@@ -542,6 +562,9 @@ clean:
 	-$(DEL) pathdef.c
 ifdef PERL
 	-$(DEL) if_perl.c
+endif
+ifdef MZSCHEME
+	-$(DEL) mzscheme_base.c
 endif
 	$(MAKE) -C GvimExt -f Make_ming.mak clean
 	$(MAKE) -C xxd -f Make_cyg.mak clean
@@ -588,6 +611,12 @@ if_perl.c: if_perl.xs typemap
 $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
 	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
 
+$(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
+	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
+
+mzscheme_base.c:
+	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
+
 pathdef.c: $(INCL)
 ifneq (sh.exe, $(SHELL))
 	@echo creating pathdef.c

src/Make_mvc.mak

@@ -1,18 +1,18 @@
 # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
 # and Win64, using the Microsoft Visual C++ compilers. Known to work with
 # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
-# and VC9 (VS2008).
+# VC9 (VS2008), and VC10 (VS2010).
 #
 # To build using other Windows compilers, see INSTALLpc.txt
 #
 # This makefile can build the console, GUI, OLE-enable, Perl-enabled and
-# Python-enabled versions of vim for Win32 platforms.
+# Python-enabled versions of Vim for Win32 platforms.
 #
-# The basic command line to build vim is:
+# The basic command line to build Vim is:
 #
 #	nmake -f Make_mvc.mak
 #
-# This will build the console version of vim with no additional interfaces.
+# This will build the console version of Vim with no additional interfaces.
 # To add features, define any of the following:
 #
 #	!!!!  After changing features do "nmake clean" first  !!!!
@@ -34,6 +34,7 @@
 #	  MZSCHEME=[Path to MzScheme directory]
 #	  DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically)
 #	  MZSCHEME_VER=[version, 205_000, ...]
+#	  MZSCHEME_DEBUG=no
 #
 #	Perl interface:
 #	  PERL=[Path to Perl directory]
@@ -354,6 +355,12 @@ MSVCVER = 9.0
 !if "$(_NMAKE_VER)" == "9.00.21022.08"
 MSVCVER = 9.0
 !endif
+!if "$(_NMAKE_VER)" == "9.00.30729.01"
+MSVCVER = 9.0
+!endif
+!if "$(_NMAKE_VER)" == "10.00.20506.01"
+MSVCVER = 10.0
+!endif
 !endif
 
 # Abort bulding VIM if version of VC is unrecognised.
@@ -368,7 +375,7 @@ MSVCVER = 9.0
 !endif
 
 # Convert processor ID to MVC-compatible number
-!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
+!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
 !if "$(CPUNR)" == "i386"
 CPUARG = /G3
 !elseif "$(CPUNR)" == "i486"
@@ -401,7 +408,7 @@ OPTFLAG = /O2
 !else # MAXSPEED
 OPTFLAG = /Ox
 !endif
-!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
 # Use link time code generation if not worried about size
 !if "$(OPTIMIZE)" != "SPACE"
 OPTFLAG = $(OPTFLAG) /GL
@@ -618,15 +625,37 @@ PYTHON_LIB = $(PYTHON)\libs\python$(PYTHON_VER).lib
 MZSCHEME_VER = 205_000
 !endif
 CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
+!if EXIST("$(MZSCHEME)\collects\scheme\base.ss")
+# for MzScheme 4.x we need to include byte code for basic Scheme stuff
+MZSCHEME_EXTRA_DEP = mzscheme_base.c
+CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
+!endif
+!if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") \
+	&& !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
+!message Building with Precise GC
+MZSCHEME_PRECISE_GC = yes
+CFLAGS = $(CFLAGS) -DMZ_PRECISE_GC
+!endif
 !if "$(DYNAMIC_MZSCHEME)" == "yes"
+!if "$(MZSCHEME_PRECISE_GC)" == "yes"
+!error MzScheme with Precise GC cannot be loaded dynamically
+!endif
 !message MzScheme DLLs will be loaded dynamically
 CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
 		-DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \
 		-DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 !else
+!if "$(MZSCHEME_DEBUG)" == "yes"
+CFLAGS = $(CFLAGS) -DMZSCHEME_FORCE_GC
+!endif
+!if "$(MZSCHEME_PRECISE_GC)" == "yes"
+# Precise GC does not use separate dll
+MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+!else
 MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
 		$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
 !endif
+!endif
 MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj
 !endif
 
@@ -767,7 +796,7 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
 
 # Report link time code generation progress if used. 
 !ifdef NODEBUG
-!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
 !if "$(OPTIMIZE)" != "SPACE"
 LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
 !endif
@@ -836,6 +865,7 @@ clean:
 	- if exist dimm_i.c del dimm_i.c
 	- if exist dimm.tlb del dimm.tlb
 	- if exist dosinst.exe del dosinst.exe
+	- if exist mzscheme_base.c del mzscheme_base.c
 	cd xxd
 	$(MAKE) /NOLOGO -f Make_mvc.mak clean
 	cd ..
@@ -927,9 +957,11 @@ $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c  $(INCL)
 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c  $(INCL)
 	$(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
 
-$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c  $(INCL)
+$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c  $(INCL) $(MZSCHEME_EXTRA_DEP)
 	$(CC) $(CFLAGS) if_mzsch.c \
 		-DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\"
+mzscheme_base.c:
+	$(MZSCHEME)\mzc --c-mods mzscheme_base.c ++lib scheme/base
 
 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c  $(INCL)
 	$(CC) $(CFLAGS) $(PYTHON_INC) if_python.c
@@ -1009,7 +1041,7 @@ $(OUTDIR)/window.obj:	$(OUTDIR) window.c  $(INCL)
 $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
 	$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
 
-$(OUTDIR)/vim.res:	$(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
+$(OUTDIR)/vim.res:	$(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp tearoff.bmp \
 		vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
 	$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
 

src/Makefile

@@ -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 @@ CClink = $(CC)
 #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 @@ CClink = $(CC)
 # }}}
 
 # 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.
@@ -1246,7 +1257,7 @@ MACVIMGUI_SRC	= gui.c MacVim/gui_macvim.m MacVim/MMBackend.m \
 MACVIMGUI_OBJ	= objects/gui.o objects/pty.o objects/gui_macvim.o \
 		  objects/MMBackend.o objects/MacVim.o
 MACVIMGUI_DEFS	= -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe
-MACVIMGUI_IPATH	= -I. -Iproto
+MACVIMGUI_IPATH	=
 MACVIMGUI_LIBS_DIR =
 MACVIMGUI_LIBS1	= -framework Cocoa -framework Carbon
 MACVIMGUI_LIBS2	=
@@ -1254,7 +1265,7 @@ MACVIMGUI_INSTALL = install_normal
 MACVIMGUI_TARGETS =
 MACVIMGUI_MAN_TARGETS =
 MACVIMGUI_TESTTARGET = gui
-MACVIMGUI_BUNDLE = 
+MACVIMGUI_BUNDLE = macvim
 
 # All GUI files
 ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c
@@ -1275,16 +1286,16 @@ CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) \
 #     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:
@@ -1448,6 +1459,7 @@ LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(PYTHON_SRC) $(TCL_SRC) \
 	$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)
 #LINT_SRC = $(SRC)
 #LINT_SRC = $(ALL_SRC)
+#LINT_SRC = $(BASIC_SRC)
 
 OBJ = \
 	objects/buffer.o \
@@ -1753,7 +1765,8 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
 # 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)
@@ -2198,11 +2211,12 @@ uninstall_runtime:
 
 # Clean up all the files that have been produced, except configure's.
 # We support common typing mistakes for Juergen! :-)
-clean celan: testclean
+clean celan: testclean macvimclean
 	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
 	-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
@@ -2288,12 +2302,12 @@ depend:
 
 # 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
 
 ###########################################################################
@@ -2445,8 +2459,11 @@ objects/if_cscope.o: if_cscope.c
 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
@@ -2455,7 +2472,7 @@ objects/if_perlsfio.o: if_perlsfio.c
 	$(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
@@ -2669,6 +2686,18 @@ $(APPDIR)/Contents:
 	-$(SHELL) ./mkinstalldirs $(RESDIR)/English.lproj
 
 
+##############################################################################
+### MacVim GUI
+.PHONY: macvim macvimclean
+macvim: $(VIMTARGET)
+	xcodebuild -project MacVim/MacVim.xcodeproj $(XCODEFLAGS)
+
+macvimclean:
+	if test -d MacVim; then \
+		xcodebuild -project MacVim/MacVim.xcodeproj clean; \
+	fi
+
+
 ###############################################################################
 ### (automatically generated by 'make depend')
 ### Dependencies:

src/VisVim/Commands.cpp

@@ -20,20 +20,21 @@ static char THIS_FILE[] = __FILE__;
 
 static BOOL g_bEnableVim = TRUE;	// Vim enabled
 static BOOL g_bDevStudioEditor = FALSE;	// Open file in Dev Studio editor simultaneously
+static BOOL g_bNewTabs = FALSE;
 static int g_ChangeDir = CD_NONE;	// CD after file open?
 
-static void VimSetEnableState (BOOL bEnableState);
-static BOOL VimOpenFile (BSTR& FileName, long LineNr);
-static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method);
-static void VimErrDiag (COleAutomationControl& VimOle);
-static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
-static void DebugMsg (char* Msg, char* Arg = NULL);
+static void VimSetEnableState(BOOL bEnableState);
+static BOOL VimOpenFile(BSTR& FileName, long LineNr);
+static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method);
+static void VimErrDiag(COleAutomationControl& VimOle);
+static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName);
+static void DebugMsg(char* Msg, char* Arg = NULL);
 
 
 /////////////////////////////////////////////////////////////////////////////
 // CCommands
 
-CCommands::CCommands ()
+CCommands::CCommands()
 {
 	// m_pApplication == NULL; M$ Code generation bug!!!
 	m_pApplication = NULL;
@@ -41,17 +42,17 @@ CCommands::CCommands ()
 	m_pDebuggerEventsObj = NULL;
 }
 
-CCommands::~CCommands ()
+CCommands::~CCommands()
 {
-	ASSERT (m_pApplication != NULL);
+	ASSERT(m_pApplication != NULL);
 	if (m_pApplication)
 	{
-		m_pApplication->Release ();
+		m_pApplication->Release();
 		m_pApplication = NULL;
 	}
 }
 
-void CCommands::SetApplicationObject (IApplication * pApplication)
+void CCommands::SetApplicationObject(IApplication * pApplication)
 {
 	// This function assumes pApplication has already been AddRef'd
 	// for us, which CDSAddIn did in it's QueryInterface call
@@ -61,55 +62,57 @@ void CCommands::SetApplicationObject (IApplication * pApplication)
 		return;
 
 	// Create Application event handlers
-	XApplicationEventsObj::CreateInstance (&m_pApplicationEventsObj);
+	XApplicationEventsObj::CreateInstance(&m_pApplicationEventsObj);
 	if (! m_pApplicationEventsObj)
 	{
-		ReportInternalError ("XApplicationEventsObj::CreateInstance");
+		ReportInternalError("XApplicationEventsObj::CreateInstance");
 		return;
 	}
-	m_pApplicationEventsObj->AddRef ();
-	m_pApplicationEventsObj->Connect (m_pApplication);
+	m_pApplicationEventsObj->AddRef();
+	m_pApplicationEventsObj->Connect(m_pApplication);
 	m_pApplicationEventsObj->m_pCommands = this;
 
 #ifdef NEVER
 	// Create Debugger event handler
 	CComPtr < IDispatch > pDebugger;
-	if (SUCCEEDED (m_pApplication->get_Debugger (&pDebugger))
+	if (SUCCEEDED(m_pApplication->get_Debugger(&pDebugger))
 	    && pDebugger != NULL)
 	{
-		XDebuggerEventsObj::CreateInstance (&m_pDebuggerEventsObj);
-		m_pDebuggerEventsObj->AddRef ();
-		m_pDebuggerEventsObj->Connect (pDebugger);
+		XDebuggerEventsObj::CreateInstance(&m_pDebuggerEventsObj);
+		m_pDebuggerEventsObj->AddRef();
+		m_pDebuggerEventsObj->Connect(pDebugger);
 		m_pDebuggerEventsObj->m_pCommands = this;
 	}
 #endif
 
 	// Get settings from registry HKEY_CURRENT_USER\Software\Vim\VisVim
-	HKEY hAppKey = GetAppKey ("Vim");
+	HKEY hAppKey = GetAppKey("Vim");
 	if (hAppKey)
 	{
-		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
 		if (hSectionKey)
 		{
-			g_bEnableVim = GetRegistryInt (hSectionKey, "EnableVim",
+			g_bEnableVim = GetRegistryInt(hSectionKey, "EnableVim",
 						       g_bEnableVim);
-			g_bDevStudioEditor = GetRegistryInt(hSectionKey,"DevStudioEditor",
-							    g_bDevStudioEditor);
-			g_ChangeDir = GetRegistryInt (hSectionKey, "ChangeDir",
+			g_bDevStudioEditor = GetRegistryInt(hSectionKey,
+					"DevStudioEditor", g_bDevStudioEditor);
+			g_bNewTabs = GetRegistryInt(hSectionKey, "NewTabs",
+						    g_bNewTabs);
+			g_ChangeDir = GetRegistryInt(hSectionKey, "ChangeDir",
 						      g_ChangeDir);
-			RegCloseKey (hSectionKey);
+			RegCloseKey(hSectionKey);
 		}
-		RegCloseKey (hAppKey);
+		RegCloseKey(hAppKey);
 	}
 }
 
-void CCommands::UnadviseFromEvents ()
+void CCommands::UnadviseFromEvents()
 {
-	ASSERT (m_pApplicationEventsObj != NULL);
+	ASSERT(m_pApplicationEventsObj != NULL);
 	if (m_pApplicationEventsObj)
 	{
-		m_pApplicationEventsObj->Disconnect (m_pApplication);
-		m_pApplicationEventsObj->Release ();
+		m_pApplicationEventsObj->Disconnect(m_pApplication);
+		m_pApplicationEventsObj->Release();
 		m_pApplicationEventsObj = NULL;
 	}
 
@@ -121,10 +124,10 @@ void CCommands::UnadviseFromEvents ()
 		// unadvise from its events (thus the VERIFY_OK below--see
 		// stdafx.h).
 		CComPtr < IDispatch > pDebugger;
-		VERIFY_OK (m_pApplication->get_Debugger (&pDebugger));
-		ASSERT (pDebugger != NULL);
-		m_pDebuggerEventsObj->Disconnect (pDebugger);
-		m_pDebuggerEventsObj->Release ();
+		VERIFY_OK(m_pApplication->get_Debugger(&pDebugger));
+		ASSERT(pDebugger != NULL);
+		m_pDebuggerEventsObj->Disconnect(pDebugger);
+		m_pDebuggerEventsObj->Release();
 		m_pDebuggerEventsObj = NULL;
 	}
 #endif
@@ -136,21 +139,21 @@ void CCommands::UnadviseFromEvents ()
 
 // Application events
 
-HRESULT CCommands::XApplicationEvents::BeforeBuildStart ()
+HRESULT CCommands::XApplicationEvents::BeforeBuildStart()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::BuildFinish (long nNumErrors, long nNumWarnings)
+HRESULT CCommands::XApplicationEvents::BuildFinish(long nNumErrors, long nNumWarnings)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()
+HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
@@ -158,9 +161,9 @@ HRESULT CCommands::XApplicationEvents::BeforeApplicationShutDown ()
 // is done.
 // Vim gets called from here.
 //
-HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
+HRESULT CCommands::XApplicationEvents::DocumentOpen(IDispatch * theDocument)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 
 	if (! g_bEnableVim)
 		// Vim not enabled or empty command line entered
@@ -169,7 +172,7 @@ HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
 	// First get the current file name and line number
 
 	// Get the document object
-	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
+	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
 	if (! pDoc)
 		return S_OK;
 
@@ -177,26 +180,26 @@ HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
 	long LineNr = -1;
 
 	// Get the document name
-	if (FAILED (pDoc->get_FullName (&FileName)))
+	if (FAILED(pDoc->get_FullName(&FileName)))
 		return S_OK;
 
 	LPDISPATCH pDispSel;
 
 	// Get a selection object dispatch pointer
-	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
+	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
 	{
 		// Get the selection object
-		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
+		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
 
 		if (pSel)
 			// Get the selection line number
-			pSel->get_CurrentLine (&LineNr);
+			pSel->get_CurrentLine(&LineNr);
 
-		pDispSel->Release ();
+		pDispSel->Release();
 	}
 
 	// Open the file in Vim and position to the current line
-	if (VimOpenFile (FileName, LineNr))
+	if (VimOpenFile(FileName, LineNr))
 	{
 		if (! g_bDevStudioEditor)
 		{
@@ -204,30 +207,30 @@ HRESULT CCommands::XApplicationEvents::DocumentOpen (IDispatch * theDocument)
 			CComVariant vSaveChanges = dsSaveChangesPrompt;
 			DsSaveStatus Saved;
 
-			pDoc->Close (vSaveChanges, &Saved);
+			pDoc->Close(vSaveChanges, &Saved);
 		}
 	}
 
 	// We're done here
-	SysFreeString (FileName);
+	SysFreeString(FileName);
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::BeforeDocumentClose (IDispatch * theDocument)
+HRESULT CCommands::XApplicationEvents::BeforeDocumentClose(IDispatch * theDocument)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::DocumentSave (IDispatch * theDocument)
+HRESULT CCommands::XApplicationEvents::DocumentSave(IDispatch * theDocument)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
+HRESULT CCommands::XApplicationEvents::NewDocument(IDispatch * theDocument)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 
 	if (! g_bEnableVim)
 		// Vim not enabled or empty command line entered
@@ -235,19 +238,19 @@ HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
 
 	// First get the current file name and line number
 
-	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (theDocument);
+	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(theDocument);
 	if (! pDoc)
 		return S_OK;
 
 	BSTR FileName;
 	HRESULT hr;
 
-	hr = pDoc->get_FullName (&FileName);
-	if (FAILED (hr))
+	hr = pDoc->get_FullName(&FileName);
+	if (FAILED(hr))
 		return S_OK;
 
 	// Open the file in Vim and position to the current line
-	if (VimOpenFile (FileName, 0))
+	if (VimOpenFile(FileName, 0))
 	{
 		if (! g_bDevStudioEditor)
 		{
@@ -255,49 +258,49 @@ HRESULT CCommands::XApplicationEvents::NewDocument (IDispatch * theDocument)
 			CComVariant vSaveChanges = dsSaveChangesPrompt;
 			DsSaveStatus Saved;
 
-			pDoc->Close (vSaveChanges, &Saved);
+			pDoc->Close(vSaveChanges, &Saved);
 		}
 	}
 
-	SysFreeString (FileName);
+	SysFreeString(FileName);
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::WindowActivate (IDispatch * theWindow)
+HRESULT CCommands::XApplicationEvents::WindowActivate(IDispatch * theWindow)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::WindowDeactivate (IDispatch * theWindow)
+HRESULT CCommands::XApplicationEvents::WindowDeactivate(IDispatch * theWindow)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::WorkspaceOpen ()
+HRESULT CCommands::XApplicationEvents::WorkspaceOpen()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::WorkspaceClose ()
+HRESULT CCommands::XApplicationEvents::WorkspaceClose()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
-HRESULT CCommands::XApplicationEvents::NewWorkspace ()
+HRESULT CCommands::XApplicationEvents::NewWorkspace()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
 // Debugger event
 
-HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)
+HRESULT CCommands::XDebuggerEvents::BreakpointHit(IDispatch * pBreakpoint)
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 	return S_OK;
 }
 
@@ -308,17 +311,18 @@ HRESULT CCommands::XDebuggerEvents::BreakpointHit (IDispatch * pBreakpoint)
 class CMainDialog : public CDialog
 {
     public:
-	CMainDialog (CWnd * pParent = NULL);	// Standard constructor
+	CMainDialog(CWnd * pParent = NULL);	// Standard constructor
 
 	//{{AFX_DATA(CMainDialog)
 	enum { IDD = IDD_ADDINMAIN };
 	int	m_ChangeDir;
 	BOOL	m_bDevStudioEditor;
+	BOOL	m_bNewTabs;
 	//}}AFX_DATA
 
 	//{{AFX_VIRTUAL(CMainDialog)
     protected:
-	virtual void DoDataExchange (CDataExchange * pDX);	// DDX/DDV support
+	virtual void DoDataExchange(CDataExchange * pDX);	// DDX/DDV support
 	//}}AFX_VIRTUAL
 
     protected:
@@ -326,100 +330,106 @@ class CMainDialog : public CDialog
 	afx_msg void OnEnable();
 	afx_msg void OnDisable();
 	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP ()
+	DECLARE_MESSAGE_MAP()
 };
 
-CMainDialog::CMainDialog (CWnd * pParent /* =NULL */ )
-	: CDialog (CMainDialog::IDD, pParent)
+CMainDialog::CMainDialog(CWnd * pParent /* =NULL */ )
+	: CDialog(CMainDialog::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(CMainDialog)
 	m_ChangeDir = -1;
 	m_bDevStudioEditor = FALSE;
+	m_bNewTabs = FALSE;
 	//}}AFX_DATA_INIT
 }
 
-void CMainDialog::DoDataExchange (CDataExchange * pDX)
+void CMainDialog::DoDataExchange(CDataExchange * pDX)
 {
-	CDialog::DoDataExchange (pDX);
+	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CMainDialog)
 	DDX_Radio(pDX, IDC_CD_SOURCE_PATH, m_ChangeDir);
-	DDX_Check (pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
+	DDX_Check(pDX, IDC_DEVSTUDIO_EDITOR, m_bDevStudioEditor);
+	DDX_Check(pDX, IDC_NEW_TABS, m_bNewTabs);
 	//}}AFX_DATA_MAP
 }
 
-BEGIN_MESSAGE_MAP (CMainDialog, CDialog)
+BEGIN_MESSAGE_MAP(CMainDialog, CDialog)
 	//{{AFX_MSG_MAP(CMainDialog)
 	//}}AFX_MSG_MAP
-END_MESSAGE_MAP ()
+END_MESSAGE_MAP()
 
 
 /////////////////////////////////////////////////////////////////////////////
 // CCommands methods
 
-STDMETHODIMP CCommands::VisVimDialog ()
+STDMETHODIMP CCommands::VisVimDialog()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 
 	// Use m_pApplication to access the Developer Studio Application
 	// object,
 	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
 	// (see stdafx.h)
 
-	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_FALSE));
+	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_FALSE));
 
 	CMainDialog Dlg;
 
 	Dlg.m_bDevStudioEditor = g_bDevStudioEditor;
+	Dlg.m_bNewTabs = g_bNewTabs;
 	Dlg.m_ChangeDir = g_ChangeDir;
-	if (Dlg.DoModal () == IDOK)
+	if (Dlg.DoModal() == IDOK)
 	{
 		g_bDevStudioEditor = Dlg.m_bDevStudioEditor;
+		g_bNewTabs = Dlg.m_bNewTabs;
 		g_ChangeDir = Dlg.m_ChangeDir;
 
 		// Save settings to registry HKEY_CURRENT_USER\Software\Vim\VisVim
-		HKEY hAppKey = GetAppKey ("Vim");
+		HKEY hAppKey = GetAppKey("Vim");
 		if (hAppKey)
 		{
-			HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+			HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
 			if (hSectionKey)
 			{
-				WriteRegistryInt (hSectionKey, "DevStudioEditor",
+				WriteRegistryInt(hSectionKey, "DevStudioEditor",
 						  g_bDevStudioEditor);
-				WriteRegistryInt (hSectionKey, "ChangeDir", g_ChangeDir);
-				RegCloseKey (hSectionKey);
+				WriteRegistryInt(hSectionKey, "NewTabs",
+						  g_bNewTabs);
+				WriteRegistryInt(hSectionKey, "ChangeDir", g_ChangeDir);
+				RegCloseKey(hSectionKey);
 			}
-			RegCloseKey (hAppKey);
+			RegCloseKey(hAppKey);
 		}
 	}
 
-	VERIFY_OK (m_pApplication->EnableModeless (VARIANT_TRUE));
+	VERIFY_OK(m_pApplication->EnableModeless(VARIANT_TRUE));
 	return S_OK;
 }
 
-STDMETHODIMP CCommands::VisVimEnable ()
+STDMETHODIMP CCommands::VisVimEnable()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
-	VimSetEnableState (true);
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	VimSetEnableState(true);
 	return S_OK;
 }
 
-STDMETHODIMP CCommands::VisVimDisable ()
+STDMETHODIMP CCommands::VisVimDisable()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
-	VimSetEnableState (false);
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	VimSetEnableState(false);
 	return S_OK;
 }
 
-STDMETHODIMP CCommands::VisVimToggle ()
+STDMETHODIMP CCommands::VisVimToggle()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
-	VimSetEnableState (! g_bEnableVim);
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	VimSetEnableState(! g_bEnableVim);
 	return S_OK;
 }
 
-STDMETHODIMP CCommands::VisVimLoad ()
+STDMETHODIMP CCommands::VisVimLoad()
 {
-	AFX_MANAGE_STATE (AfxGetStaticModuleState ());
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
 
 	// Use m_pApplication to access the Developer Studio Application object,
 	// and VERIFY_OK to see error strings in DEBUG builds of your add-in
@@ -430,7 +440,7 @@ STDMETHODIMP CCommands::VisVimLoad ()
 	CComPtr < IDispatch > pDispDoc, pDispSel;
 
 	// Get a document object dispatch pointer
-	VERIFY_OK (m_pApplication->get_ActiveDocument (&pDispDoc));
+	VERIFY_OK(m_pApplication->get_ActiveDocument(&pDispDoc));
 	if (! pDispDoc)
 		return S_OK;
 
@@ -438,30 +448,30 @@ STDMETHODIMP CCommands::VisVimLoad ()
 	long LineNr = -1;
 
 	// Get the document object
-	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc (pDispDoc);
+	CComQIPtr < ITextDocument, &IID_ITextDocument > pDoc(pDispDoc);
 
 	if (! pDoc)
 		return S_OK;
 
 	// Get the document name
-	if (FAILED (pDoc->get_FullName (&FileName)))
+	if (FAILED(pDoc->get_FullName(&FileName)))
 		return S_OK;
 
 	// Get a selection object dispatch pointer
-	if (SUCCEEDED (pDoc->get_Selection (&pDispSel)))
+	if (SUCCEEDED(pDoc->get_Selection(&pDispSel)))
 	{
 		// Get the selection object
-		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel (pDispSel);
+		CComQIPtr < ITextSelection, &IID_ITextSelection > pSel(pDispSel);
 
 		if (pSel)
 			// Get the selection line number
-			pSel->get_CurrentLine (&LineNr);
+			pSel->get_CurrentLine(&LineNr);
 	}
 
 	// Open the file in Vim
-	VimOpenFile (FileName, LineNr);
+	VimOpenFile(FileName, LineNr);
 
-	SysFreeString (FileName);
+	SysFreeString(FileName);
 	return S_OK;
 }
 
@@ -472,16 +482,16 @@ STDMETHODIMP CCommands::VisVimLoad ()
 
 // Set the enable state and save to registry
 //
-static void VimSetEnableState (BOOL bEnableState)
+static void VimSetEnableState(BOOL bEnableState)
 {
 	g_bEnableVim = bEnableState;
-	HKEY hAppKey = GetAppKey ("Vim");
+	HKEY hAppKey = GetAppKey("Vim");
 	if (hAppKey)
 	{
-		HKEY hSectionKey = GetSectionKey (hAppKey, "VisVim");
+		HKEY hSectionKey = GetSectionKey(hAppKey, "VisVim");
 		if (hSectionKey)
-			WriteRegistryInt (hSectionKey, "EnableVim", g_bEnableVim);
-		RegCloseKey (hAppKey);
+			WriteRegistryInt(hSectionKey, "EnableVim", g_bEnableVim);
+		RegCloseKey(hAppKey);
 	}
 }
 
@@ -490,7 +500,7 @@ static void VimSetEnableState (BOOL bEnableState)
 // letter.
 // 'LineNr' must contain a valid line number or 0, e. g. for a new file
 //
-static BOOL VimOpenFile (BSTR& FileName, long LineNr)
+static BOOL VimOpenFile(BSTR& FileName, long LineNr)
 {
 
 	// OLE automation object for com. with Vim
@@ -507,7 +517,7 @@ static BOOL VimOpenFile (BSTR& FileName, long LineNr)
 	// Get a dispatch id for the SendKeys method of Vim;
 	// enables connection to Vim if necessary
 	DISPID DispatchId;
-	DispatchId = VimGetDispatchId (VimOle, "SendKeys");
+	DispatchId = VimGetDispatchId(VimOle, "SendKeys");
 	if (! DispatchId)
 		// OLE error, can't obtain dispatch id
 		goto OleError;
@@ -525,20 +535,28 @@ static BOOL VimOpenFile (BSTR& FileName, long LineNr)
 #ifdef SINGLE_WINDOW
 	// Update the current file in Vim if it has been modified.
 	// Disabled, because it could write the file when you don't want to.
-	sprintf (VimCmd + 2, ":up\n");
+	sprintf(VimCmd + 2, ":up\n");
 #endif
-	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
 		goto OleError;
 
 	// Change Vim working directory to where the file is if desired
 	if (g_ChangeDir != CD_NONE)
-		VimChangeDir (VimOle, DispatchId, FileName);
+		VimChangeDir(VimOle, DispatchId, FileName);
 
 	// Make Vim open the file.
 	// In the filename convert all \ to /, put a \ before a space.
-	sprintf(VimCmd, ":drop ");
+	if (g_bNewTabs)
+	{
+		sprintf(VimCmd, ":tab drop ");
+		s = VimCmd + 11;
+	}
+	else
+	{
+		sprintf(VimCmd, ":drop ");
+		s = VimCmd + 6;
+	}
 	sprintf(FileNameTmp, "%S", (char *)FileName);
-	s = VimCmd + 6;
 	for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
 									  ++p)
 		if (*p == '\\')
@@ -552,20 +570,20 @@ static BOOL VimOpenFile (BSTR& FileName, long LineNr)
 	*s++ = '\n';
 	*s = '\0';
 
-	if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+	if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
 		goto OleError;
 
 	if (LineNr > 0)
 	{
 		// Goto line
-		sprintf (VimCmd, ":%d\n", LineNr);
-		if (! VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf)))
+		sprintf(VimCmd, ":%d\n", LineNr);
+		if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
 			goto OleError;
 	}
 
 	// Make Vim come to the foreground
-	if (! VimOle.Method ("SetForeground"))
-		VimOle.ErrDiag ();
+	if (! VimOle.Method("SetForeground"))
+		VimOle.ErrDiag();
 
 	// We're done
 	return true;
@@ -573,7 +591,7 @@ static BOOL VimOpenFile (BSTR& FileName, long LineNr)
     OleError:
 	// There was an OLE error
 	// Check if it's the "unknown class string" error
-	VimErrDiag (VimOle);
+	VimErrDiag(VimOle);
 	return false;
 }
 
@@ -581,18 +599,18 @@ static BOOL VimOpenFile (BSTR& FileName, long LineNr)
 // Create the Vim OLE object if necessary
 // Returns a valid dispatch id or null on error
 //
-static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
+static DISPID VimGetDispatchId(COleAutomationControl& VimOle, char* Method)
 {
 	// Initialize Vim OLE connection if not already done
-	if (! VimOle.IsCreated ())
+	if (! VimOle.IsCreated())
 	{
-		if (! VimOle.CreateObject ("Vim.Application"))
+		if (! VimOle.CreateObject("Vim.Application"))
 			return NULL;
 	}
 
 	// Get the dispatch id for the SendKeys method.
 	// By doing this, we are checking if Vim is still there...
-	DISPID DispatchId = VimOle.GetDispatchId ("SendKeys");
+	DISPID DispatchId = VimOle.GetDispatchId("SendKeys");
 	if (! DispatchId)
 	{
 		// We can't get a dispatch id.
@@ -604,12 +622,12 @@ static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
 		// should not be kept long enough to allow the user to terminate Vim
 		// to avoid memory corruption (why the heck is there no system garbage
 		// collection for those damned OLE memory chunks???).
-		VimOle.DeleteObject ();
-		if (! VimOle.CreateObject ("Vim.Application"))
+		VimOle.DeleteObject();
+		if (! VimOle.CreateObject("Vim.Application"))
 			// If this create fails, it's time for an error msg
 			return NULL;
 
-		if (! (DispatchId = VimOle.GetDispatchId ("SendKeys")))
+		if (! (DispatchId = VimOle.GetDispatchId("SendKeys")))
 			// There is something wrong...
 			return NULL;
 	}
@@ -620,20 +638,20 @@ static DISPID VimGetDispatchId (COleAutomationControl& VimOle, char* Method)
 // Output an error message for an OLE error
 // Check on the classstring error, which probably means Vim wasn't registered.
 //
-static void VimErrDiag (COleAutomationControl& VimOle)
+static void VimErrDiag(COleAutomationControl& VimOle)
 {
-	SCODE sc = GetScode (VimOle.GetResult ());
+	SCODE sc = GetScode(VimOle.GetResult());
 	if (sc == CO_E_CLASSSTRING)
 	{
 		char Buf[256];
-		sprintf (Buf, "There is no registered OLE automation server named "
+		sprintf(Buf, "There is no registered OLE automation server named "
 			 "\"Vim.Application\".\n"
 			 "Use the OLE-enabled version of Vim with VisVim and "
 			 "make sure to register Vim by running \"vim -register\".");
-		MessageBox (NULL, Buf, "OLE Error", MB_OK);
+		MessageBox(NULL, Buf, "OLE Error", MB_OK);
 	}
 	else
-		VimOle.ErrDiag ();
+		VimOle.ErrDiag();
 }
 
 // Change directory to the directory the file 'FileName' is in or it's parent
@@ -644,7 +662,7 @@ static void VimErrDiag (COleAutomationControl& VimOle)
 //	CD_SOURCE_PATH
 //	CD_SOURCE_PARENT
 //
-static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
+static void VimChangeDir(COleAutomationControl& VimOle, DISPID DispatchId, BSTR& FileName)
 {
 	// Do a :cd first
 
@@ -655,7 +673,7 @@ static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR
 	char DirUnix[_MAX_DIR * 2];
 	char *s, *t;
 
-	_splitpath (StrFileName, Drive, Dir, NULL, NULL);
+	_splitpath(StrFileName, Drive, Dir, NULL, NULL);
 
 	// Convert to Unix path name format, escape spaces.
 	t = DirUnix;
@@ -676,19 +694,18 @@ static void VimChangeDir (COleAutomationControl& VimOle, DISPID DispatchId, BSTR
 	OLECHAR Buf[MAX_OLE_STR];
 	char VimCmd[MAX_OLE_STR];
 
-	sprintf (VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
+	sprintf(VimCmd, ":cd %s%s%s\n", Drive, DirUnix,
 		 g_ChangeDir == CD_SOURCE_PARENT && DirUnix[1] ? ".." : "");
-	VimOle.Method (DispatchId, "s", TO_OLE_STR_BUF (VimCmd, Buf));
+	VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf));
 }
 
 #ifdef _DEBUG
 // Print out a debug message
 //
-static void DebugMsg (char* Msg, char* Arg)
+static void DebugMsg(char* Msg, char* Arg)
 {
 	char Buf[400];
-	sprintf (Buf, Msg, Arg);
-	AfxMessageBox (Buf);
+	sprintf(Buf, Msg, Arg);
+	AfxMessageBox(Buf);
 }
 #endif
-

src/VisVim/Resource.h

@@ -16,6 +16,7 @@
 #define IDC_CD_SOURCE_PATH		1001
 #define IDC_CD_SOURCE_PARENT		1002
 #define IDC_CD_NONE			1003
+#define IDC_NEW_TABS			1004
 
 // Next default values for new objects
 //

src/VisVim/VisVim.rc

@@ -122,6 +122,9 @@ BEGIN
     CONTROL         "&Open file in DevStudio editor simultaneously",
                     IDC_DEVSTUDIO_EDITOR,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
                     WS_TABSTOP,7,7,153,10
+    CONTROL         "Open files in new tabs",
+                    IDC_NEW_TABS,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
+                    WS_TABSTOP,7,21,153,10
     GROUPBOX        "Current directory",IDC_STATIC,7,35,164,58,WS_GROUP
     CONTROL         "Set to &source file path",IDC_CD_SOURCE_PATH,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,49,85,10

src/buffer.c

@@ -44,6 +44,7 @@ static int	otherfile_buf __ARGS((buf_T *buf, char_u *ffname));
 #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 @@ close_buffer(win, buf, action)
 	return;
 #endif
 
-#ifdef FEAT_NETBEANS_INTG
-    if (usingNetbeans)
-	netbeans_file_closed(buf);
-#endif
 #ifdef FEAT_ODB_EDITOR
     odb_buffer_close(buf);
 #endif
@@ -519,12 +516,11 @@ buf_clear_file(buf)
  * 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);
@@ -643,6 +639,10 @@ free_buffer_stuff(buf, free_options)
 #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 */
@@ -819,9 +819,6 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
     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);
@@ -916,9 +913,6 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
 	}
     }
 
-#ifdef FEAT_NETBEANS_INTG
-    netbeansCloseFile = 0;
-#endif
 
     return errormsg;
 }
@@ -1463,13 +1457,13 @@ enter_buffer(buf)
 
 #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);
@@ -1687,9 +1681,10 @@ buflist_new(ffname, sfname, lnum, flags)
     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;
     }
@@ -2034,13 +2029,12 @@ buflist_findname_stat(ffname, stp)
  * 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;
@@ -2445,11 +2439,10 @@ wininfo_other_tab_diff(wip)
  * another tab page.
  * Returns NULL when there isn't any info.
  */
-/*ARGSUSED*/
     static wininfo_T *
 find_wininfo(buf, skip_diff_buffer)
     buf_T	*buf;
-    int		skip_diff_buffer;
+    int		skip_diff_buffer UNUSED;
 {
     wininfo_T	*wip;
 
@@ -2526,7 +2519,7 @@ buflist_findfpos(buf)
     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, FALSE);
     if (wip != NULL)
@@ -2549,7 +2542,6 @@ buflist_findlnum(buf)
 /*
  * List all know file names (for :files and :buffers command).
  */
-/*ARGSUSED*/
     void
 buflist_list(eap)
     exarg_T	*eap;
@@ -2587,8 +2579,8 @@ buflist_list(eap)
 	{
 	    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 */
@@ -2702,9 +2694,10 @@ setfname(buf, ffname, sfname, message)
     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;
     }
@@ -2898,7 +2891,7 @@ otherfile_buf(buf, ffname
 	/* 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;
 	}
@@ -2935,11 +2928,12 @@ buf_setino(buf)
 
     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;
 }
 
 /*
@@ -2950,7 +2944,7 @@ buf_same_ino(buf, stp)
     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);
 }
@@ -2977,7 +2971,7 @@ fileinfo(fullname, shorthelp, dont_truncate)
 
     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
@@ -3051,11 +3045,12 @@ fileinfo(fullname, shorthelp, dont_truncate)
 		(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)
     {
@@ -3083,15 +3078,16 @@ fileinfo(fullname, shorthelp, dont_truncate)
 }
 
     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)
@@ -3208,20 +3204,18 @@ maketitle()
 		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, ")");
 	    }
 
-#ifndef FEAT_GUI_MACVIM
-	    append_arg_number(curwin, buf, FALSE, IOSIZE);
-#endif
+	    append_arg_number(curwin, buf, IOSIZE, FALSE);
 
 #if defined(FEAT_CLIENTSERVER)
 	    if (serverName != NULL)
@@ -3358,14 +3352,13 @@ free_titles()
  * 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) */
@@ -3536,7 +3529,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 		    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. */
@@ -3566,7 +3559,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 		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);
@@ -3702,7 +3695,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 	    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;
@@ -3769,13 +3762,13 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 
 	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;
 
@@ -3810,7 +3803,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 	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
 	    {
@@ -3983,7 +3976,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 	    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)
@@ -4176,13 +4169,14 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 #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 */
@@ -4193,34 +4187,35 @@ get_rel_pos(wp, str)
 #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++ = '(';
@@ -4229,7 +4224,8 @@ append_arg_number(wp, buf, add_file, maxlen)
 	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;
 }
@@ -4285,10 +4281,9 @@ fix_fname(fname)
  * 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;
 {
@@ -5012,7 +5007,7 @@ read_viminfo_bufferlist(virp, writing)
 	if (tab != NULL)
 	{
 	    *tab++ = '\0';
-	    col = atoi((char *)tab);
+	    col = (colnr_T)atoi((char *)tab);
 	    tab = vim_strrchr(xline, '\t');
 	    if (tab != NULL)
 	    {
@@ -5050,6 +5045,7 @@ write_viminfo_bufferlist(fp)
 #endif
     char_u	*line;
     int		max_buffers;
+    size_t	len;
 
     if (find_viminfo_parameter('%') == NULL)
 	return;
@@ -5058,7 +5054,8 @@ write_viminfo_bufferlist(fp)
     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;
 
@@ -5084,7 +5081,8 @@ write_viminfo_bufferlist(fp)
 	    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);
@@ -5114,7 +5112,8 @@ buf_spname(buf)
 	 */
 	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
@@ -5241,7 +5240,7 @@ buf_addsign(buf, id, lnum, typenr)
     return;
 }
 
-    int
+    linenr_T
 buf_change_sign_type(buf, markId, typenr)
     buf_T	*buf;		/* buffer to store sign in */
     int		markId;		/* sign ID */
@@ -5258,10 +5257,10 @@ buf_change_sign_type(buf, markId, typenr)
 	}
     }
 
-    return 0;
+    return (linenr_T)0;
 }
 
-    int_u
+    int
 buf_getsigntype(buf, lnum, type)
     buf_T	*buf;
     linenr_T	lnum;
@@ -5580,11 +5579,10 @@ buf_contents_changed(buf)
  * 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;

src/charset.c

@@ -17,7 +17,7 @@ static int win_chartabsize __ARGS((win_T *wp, char_u *p, colnr_T col));
 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;
 
@@ -174,6 +174,11 @@ buf_init_chartab(buf, global)
 	    if (VIM_ISDIGIT(*p))
 		c = getdigits(&p);
 	    else
+#ifdef FEAT_MBYTE
+		 if (has_mbyte)
+		c = mb_ptr2char_adv(&p);
+	    else
+#endif
 		c = *p++;
 	    c2 = -1;
 	    if (*p == '-' && p[1] != NUL)
@@ -664,7 +669,7 @@ transchar_hex(buf, c)
     }
 #endif
     buf[++i] = nr2hex((unsigned)c >> 4);
-    buf[++i] = nr2hex(c);
+    buf[++i] = nr2hex((unsigned)c);
     buf[++i] = '>';
     buf[++i] = NUL;
 }
@@ -674,9 +679,9 @@ transchar_hex(buf, c)
  * Lower case letters are used to avoid the confusion of <F1> 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 +889,7 @@ vim_iswordc(c)
     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 +1031,12 @@ lbr_chartabsize_adv(s, col)
  * 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 +1094,7 @@ win_lbr_chartabsize(wp, s, col, headp)
 	 */
 	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,19 +1205,21 @@ in_win_border(wp, vcol)
     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);
+    if (width2 <= 0)
+	return FALSE;
     return ((vcol - width1) % width2 == width2 - 1);
 }
 #endif /* FEAT_MBYTE */
@@ -1396,13 +1402,13 @@ getvvcol(wp, pos, start, cursor, end)
 # 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

src/config.h.in

@@ -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 <sys/types.h> doesn't define.  */
 #undef mode_t
 

src/config.mk.in

@@ -21,6 +21,7 @@ CC		= @CC@
 DEFS		= @DEFS@
 CFLAGS		= @CFLAGS@
 CPPFLAGS	= @CPPFLAGS@
+XCODEFLAGS	= @XCODEFLAGS@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 LDFLAGS		= @LDFLAGS@
@@ -41,6 +42,8 @@ MZSCHEME_SRC	= @MZSCHEME_SRC@
 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@