Master

.gitignore

@@ -0,0 +1,44 @@
+.*.swp
+.DS_Store
+src/MacVim/MacVim.xcodeproj/*.mode1
+src/MacVim/MacVim.xcodeproj/*.mode1v3
+src/MacVim/MacVim.xcodeproj/*.pbxuser
+src/MacVim/MacVim.xcodeproj/project.xcworkspace
+src/MacVim/MacVim.xcodeproj/xcuserdata
+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/PSMTabBarControl.xcodeproj/xcuserdata
+src/MacVim/PSMTabBarControl/build
+src/MacVim/PSMTabBarControl/build
+src/MacVim/build
+src/TAGS
+src/Vim
+src/auto/config.cache
+src/auto/config.h
+src/auto/config.log
+src/auto/config.mk
+src/auto/config.status
+src/auto/if_perl.c
+src/auto/link.log
+src/auto/link.sed
+src/auto/osdef.h
+src/auto/pathdef.c
+src/config.log
+src/config.status
+src/objects
+src/po/*.mo
+src/tags
+src/xxd/xxd
+src/xxd/xxd.dSYM
+src/a.out.dSYM

README_extra.txt

@@ -19,8 +19,10 @@ src/os_beos.*		Files for the BeOS port.
 src/os_msdos.*
 src/os_dos.*		Files for the MS-DOS port.
 
-src/gui_mac.*
-src/os_mac.*		Files for the Mac port.
+src/gui_mac.*           Carbon GUI (not used)
+src/os_mac*		Shared files for the different Mac ports.
+
+src/MacVim/*		Files for the MacVim port.
 
 src/os_mint.8		Files for the Atari Mint port.
 

README_mac.txt

@@ -1,8 +1,38 @@
 README_mac.txt for version 7.4 of Vim: Vi IMproved.
 
-This file explains the installation of Vim on Macintosh systems.
+This file explains the installation of MacVim.
 See "README.txt" for general information about Vim.
+See "src/MacVim/README" for an overview of the MacVim specific source code.
 
+MacVim uses the usual configure/make steps to build the binary but instead of
+"make install" you just drag the app bundle into the directory you wish to
+install in (usually `/Applications').
 
-Sorry, this text still needs to be written!
 
+How to build and install
+========================
+
+Run `./configure` in the `src/` directory with the flags you want (call
+`./configure --help` to see a list of flags) e.g.:
+
+    $ cd src
+    $ ./configure --with-features=huge \
+                  --enable-rubyinterp \
+                  --enable-pythoninterp \
+                  --enable-perlinterp \
+                  --enable-cscope
+
+Now build the project using `make`:
+
+    $ make
+
+The resulting app bundle will reside under `MacVim/build/Release`.  To try it
+out quickly, type:
+
+    $ open MacVim/build/Release/MacVim.app
+
+To install MacVim, type
+
+    $ open MacVim/build/Release
+
+and drag the MacVim icon into your `Applications` folder.

runtime/colors/macvim.vim

@@ -0,0 +1,133 @@
+" MacVim colorscheme
+"
+" Maintainer:   Bjorn Winckler <[email protected]>
+" Last Change:  2008 May 9
+"
+" This is the default MacVim color scheme.  It supports both light and dark
+" backgrounds (see :h 'background').
+"
+
+
+highlight clear
+
+" Reset String -> Constant links etc if they were reset
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "macvim"
+
+
+"
+" First list all groups common to both 'light' and 'dark' background.
+"
+
+" `:he highlight-groups`
+hi DiffAdd      guibg=MediumSeaGreen
+hi Directory    guifg=#1600FF
+hi ErrorMsg     guibg=Firebrick2 guifg=White
+hi FoldColumn   guibg=Grey guifg=DarkBlue
+hi Folded       guibg=#E6E6E6 guifg=DarkBlue
+hi IncSearch    gui=reverse
+hi ModeMsg      gui=bold
+hi MoreMsg      gui=bold guifg=SeaGreen4
+hi NonText      gui=bold guifg=Blue
+hi Pmenu        guibg=LightSteelBlue1
+hi PmenuSbar    guibg=Grey
+hi PmenuSel     guifg=White guibg=SkyBlue4
+hi PmenuThumb   gui=reverse
+hi Question     gui=bold guifg=Chartreuse4
+hi SignColumn   guibg=Grey guifg=DarkBlue
+hi SpecialKey   guifg=Blue
+hi SpellBad     guisp=Firebrick2 gui=undercurl
+hi SpellCap     guisp=Blue gui=undercurl
+hi SpellLocal   guisp=DarkCyan gui=undercurl
+hi SpellRare    guisp=Magenta gui=undercurl
+hi StatusLine   gui=NONE guifg=White guibg=DarkSlateGray
+hi StatusLineNC gui=NONE guifg=SlateGray guibg=Gray90
+hi TabLine      gui=underline guibg=LightGrey
+hi TabLineFill  gui=reverse
+hi TabLineSel   gui=bold
+hi Title        gui=bold guifg=DeepSkyBlue3
+hi VertSplit    gui=NONE guifg=DarkSlateGray guibg=Gray90
+if has("gui_macvim")
+  hi Visual       guibg=MacSelectedTextBackgroundColor
+else
+  hi Visual       guibg=#72F7FF
+endif
+hi WarningMsg   guifg=Firebrick2
+
+" Syntax items (`:he group-name` -- more groups are available, these are just
+" the top level syntax items for now).
+hi Error        gui=NONE guifg=White guibg=Firebrick3
+hi Identifier   gui=NONE guifg=Aquamarine4 guibg=NONE
+hi Ignore       gui=NONE guifg=bg guibg=NONE
+hi PreProc      gui=NONE guifg=DodgerBlue3 guibg=NONE
+hi Special      gui=NONE guifg=BlueViolet guibg=NONE
+hi String       gui=NONE guifg=SkyBlue4 guibg=NONE
+hi Underlined   gui=underline guifg=SteelBlue1
+
+
+"
+" Groups that differ between 'light' and 'dark' background.
+"
+
+if &background == "dark"
+  hi Boolean      gui=NONE guifg=DeepPink4 guibg=NONE
+  hi Comment      gui=italic guifg=CadetBlue3
+  hi Constant     gui=NONE guifg=Goldenrod1 guibg=NONE
+  hi Cursor       guibg=LightGoldenrod guifg=bg
+  hi CursorColumn guibg=Gray20
+  hi CursorIM     guibg=LightSlateGrey guifg=bg
+  hi CursorLine   guibg=Gray20
+  hi DiffChange   guibg=MediumPurple4
+  hi DiffDelete   gui=bold guifg=White guibg=SlateBlue
+  hi DiffText     gui=NONE guifg=White guibg=SteelBlue
+  hi LineNr       guifg=#552A7B guibg=Grey5
+  hi MatchParen   guifg=White guibg=Magenta
+  hi Normal       guifg=Grey50 guibg=Grey10
+  hi Search       guibg=Blue4 guifg=NONE
+  hi Statement    gui=bold guifg=Purple1 guibg=NONE
+  hi Todo         gui=NONE guifg=Green4 guibg=DeepSkyBlue1
+  hi Type         gui=bold guifg=Cyan4 guibg=NONE
+  hi WildMenu     guibg=SkyBlue guifg=White
+  hi lCursor      guibg=LightSlateGrey guifg=bg
+else
+  hi Boolean      gui=NONE guifg=Red3 guibg=NONE
+  hi Comment      gui=italic guifg=Blue2 guibg=NONE
+  hi Constant     gui=NONE guifg=DarkOrange guibg=NONE
+  hi Cursor       guibg=fg guifg=bg
+  hi CursorColumn guibg=#F1F5FA
+  hi CursorIM     guibg=fg guifg=bg
+  hi CursorLine   guibg=#F1F5FA
+  hi DiffChange   guibg=DeepSkyBlue
+  hi DiffDelete   gui=bold guifg=Black guibg=SlateBlue
+  hi DiffText     gui=NONE guibg=Gold
+  hi LineNr       guifg=#888888 guibg=#E6E6E6
+  hi MatchParen   guifg=White guibg=MediumPurple1
+  if has("gui_macvim")
+    hi Normal       gui=NONE guifg=MacTextColor guibg=MacTextBackgroundColor
+  else
+    hi Normal       gui=NONE guifg=Black guibg=White
+  endif
+  hi Search       guibg=CadetBlue1 guifg=NONE
+  hi Statement    gui=bold guifg=Maroon guibg=NONE
+  hi Todo         gui=NONE guifg=DarkGreen guibg=PaleGreen1
+  hi Type         gui=bold guifg=Green4 guibg=NONE
+  hi WildMenu     guibg=SkyBlue guifg=Black
+  hi lCursor      guibg=fg guifg=bg
+endif
+
+
+"
+" Change the selection color on focus change (but only if the "macvim"
+" colorscheme is active).
+"
+if has("gui_macvim") && !exists("s:augroups_defined")
+  au FocusLost * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSecondarySelectedControlColor | endif
+  au FocusGained * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSelectedTextBackgroundColor | endif
+
+  let s:augroups_defined = 1
+endif
+
+" vim: sw=2

runtime/doc/change.txt

@@ -869,13 +869,13 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.
 :promptf[ind] [string]
 			Put up a Search dialog.  When [string] is given, it is
 			used as the initial search string.
-			{only for Win32, Motif and GTK GUI}
+			{only for Win32, Motif, GTK and MacVim GUI}
 
 						*:promptr* *:promptrepl*
 :promptr[epl] [string]
 			Put up a Search/Replace dialog.  When [string] is
 			given, it is used as the initial search string.
-			{only for Win32, Motif and GTK GUI}
+			{only for Win32, Motif, GTK and MacVim GUI}
 
 
 4.4 Changing tabs					*change-tabs*

runtime/doc/eval.txt

@@ -6644,13 +6644,15 @@ fname_case		Case in file names matters (for Amiga, MS-DOS, and
 folding			Compiled with |folding| support.
 footer			Compiled with GUI footer support. |gui-footer|
 fork			Compiled to use fork()/exec() instead of system().
+fullscreen              Compiled with 'fullscreen' support.
 gettext			Compiled with message translation |multi-lang|
 gui			Compiled with GUI enabled.
 gui_athena		Compiled with Athena GUI.
 gui_gnome		Compiled with Gnome support (gui_gtk is also defined).
 gui_gtk			Compiled with GTK+ GUI (any version).
 gui_gtk2		Compiled with GTK+ 2 GUI (gui_gtk is also defined).
 gui_mac			Compiled with Macintosh GUI.
+gui_macvim		Compiled with MacVim GUI.
 gui_motif		Compiled with Motif GUI.
 gui_photon		Compiled with Photon GUI.
 gui_running		Vim is running in the GUI, or it will start soon.
@@ -6693,6 +6695,7 @@ multi_lang		Compiled with support for multiple languages.
 mzscheme		Compiled with MzScheme interface |mzscheme|.
 netbeans_enabled	Compiled with support for |netbeans| and connected.
 netbeans_intg		Compiled with support for |netbeans|.
+odbeditor               Compiled with |odbeditor| support.
 ole			Compiled with OLE automation support for Win32.
 os2			OS/2 version of Vim.
 path_extra		Compiled with up/downwards search in 'path' and 'tags'
@@ -6736,6 +6739,7 @@ tgetent			Compiled with tgetent support, able to use a termcap
 			or terminfo file.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
+transparency            Compiled with 'transparency' support.
 unix			Unix version of Vim.
 user_commands		User-defined commands.
 vertsplit		Compiled with vertically split windows |:vsplit|.

runtime/doc/gui.txt

@@ -25,8 +25,8 @@ Other GUI documentation:
 
 First you must make sure you actually have a version of Vim with the GUI code
 included.  You can check this with the ":version" command, it says "with xxx
-GUI", where "xxx" is X11-Motif, X11-Athena, Photon, GTK, GTK2, etc., or
-"MS-Windows 32 bit GUI version".
+GUI", where "xxx" is Macvim, X11-Motif, X11-Athena, Photon, GTK, GTK2, etc.,
+or "MS-Windows 32 bit GUI version".
 
 How to start the GUI depends on the system used.  Mostly you can run the
 GUI version of Vim with:
@@ -93,7 +93,7 @@ and initialize other things that you may want to set up differently from the
 terminal version.
 
 Recommended place for your personal GUI initializations:
-	Unix		    $HOME/.gvimrc or $HOME/.vim/gvimrc
+	Unix and Mac OS X   $HOME/.gvimrc or $HOME/.vim/gvimrc
 	OS/2		    $HOME/.gvimrc, $HOME/vimfiles/gvimrc
 			    or $VIM/.gvimrc
 	MS-DOS and Win32    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
@@ -692,9 +692,10 @@ because the item will never be selected.  Use a single colon to keep it
 simple.
 
 							*gui-toolbar*
-The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11),
-and Photon GUI.  It should turn up in other GUIs in due course.  The
-default toolbar is setup in menu.vim.
+The toolbar is currently available in the MacVim, Win32, Athena, Motif, GTK+
+(X11), and Photon GUI.  It should turn up in other GUIs in due course.  The
+default toolbar is setup in menu.vim.  (Note: The MacVim toolbar is modified
+in "$VIM/gvimrc".)
 The display of the toolbar is controlled by the 'guioptions' letter 'T'.  You
 can thus have menu & toolbar together, or either on its own, or neither.
 The appearance is controlled by the 'toolbar' option.  You can choose between
@@ -931,9 +932,9 @@ a menu item - you don't need to do a :tunmenu as well.
 
 5.9 Popup Menus
 
-In the Win32 and GTK+ GUI, you can cause a menu to popup at the cursor.
-This behaves similarly to the PopUp menus except that any menu tree can
-be popped up.
+In the Win32, MacVim, and GTK+ GUI, you can cause a menu to popup at the
+cursor.  This behaves similarly to the PopUp menus except that any menu tree
+can be popped up.
 
 This command is for backwards compatibility, using it is discouraged, because
 it behaves in a strange way.
@@ -942,7 +943,7 @@ it behaves in a strange way.
 :popu[p] {name}			Popup the menu {name}.  The menu named must
 				have at least one subentry, but need not
 				appear on the menu-bar (see |hidden-menus|).
-				{only available for Win32 and GTK GUI}
+				{only available for Win32, MacVim, and GTK GUI}
 
 :popu[p]! {name}		Like above, but use the position of the mouse
 				pointer instead of the cursor.
@@ -996,6 +997,8 @@ This section describes other features which are related to the GUI.
 		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
 	    elseif has("gui_win32")
 		:set guifont=Luxi_Mono:h12:cANSI
+	    elseif has("gui_macvim")
+	        :set guifont=DejaVu\ Sans\ Mono:h13
 	    endif
 	endif