Snapshot 22

The 'make-snapshot.sh' script has also been updated.

runtime/doc/gui_mac.txt

@@ -125,6 +125,22 @@ strings like "((3) of 2)" to appear in the window title.
 These are the non-standard options that MacVim supports:
 	'fullscreen' 'toolbariconsize' 'transparency'
 
+							*macvim-find*
+Whenever you search for something in Vim (e.g. using "/") the search query is
+copied to the OS X "Find Pasteboard".  The idea is that if you search for
+something and switch to another application, then you can hit <D-g> (or <D-G>)
+to repeat the search in the new app.  The same feature works if you search in
+some app, switch to MacVim and hit <D-g>.
+
+Note that the command |n| is not the same as <D-g>.  The former will repeat
+the last search made in Vim, whereas the latter searches for the string on the
+OS X Find Pasteboard using the action findNext: (see |:macaction|).
+
+The <D-g> key equivalent is a great way to bring a search from one window to
+another in MacVim.  Simply search for something in one window (using "/") then
+switch to another (e.g. with <D-`>) and hit <D-g> and the search will be
+repeated in the new window.
+
 ==============================================================================
 2. Starting MacVim					*macvim-start*
 
@@ -327,11 +343,14 @@ Here is a random assortment of actions from Actions.plist which might be
 useful.
 
 Action				Description ~
+findNext:			Search forward using the "Find Pasteboard"
+findPrevious:			Search backward using the "Find Pasteboard"
 fontSizeDown:			Decrease font size
 fontSizeUp:			Increase font size
 newWindow:			Open a new (empty) window
 orderFrontCharacterPalette:	Show the the "Special Characters" dialog
 orderFrontFontPanel:		Show the Font panel
+orderFrontPreferencePanel:	Show the Preferences panel
 performZoom:			Zoom window (same as clicking the green blob)
 selectNextWindow:		Select next window (similar to <D-`>)
 selectPreviousWindow:		Select previous window (similar to <S-D-`>)

src/MacVim/Info.plist

@@ -530,7 +530,7 @@
 	<key>CFBundleSignature</key>
 	<string>VIMM</string>
 	<key>CFBundleVersion</key>
-	<string>21</string>
+	<string>22</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -605,7 +605,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -646,7 +646,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -677,7 +677,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",

src/MacVim/README-snapshot.txt

@@ -0,0 +1,7 @@
+This archive contains a snapshot of 'MacVim.app' and the shell script
+'mvim'.
+
+For usage instructions, please start MacVim and type ":h macvim"
+(without the quotes).
+
+MacVim requires a PPC or Intel Mac running Mac OS X 10.4 or 10.5.

src/MacVim/gui_macvim.m

@@ -1527,6 +1527,9 @@ gui_macvim_add_to_find_pboard(char_u *pat)
 {
     if (!pat) return;
 
+    // HACK: Do not call Cocoa during a fork or bad things (TM) will happen.
+    if (gui.dofork) return;
+
 #ifdef FEAT_MBYTE
     pat = CONVERT_TO_UTF8(pat);
 #endif

src/MacVim/macvim_latest.xml

@@ -46,14 +46,14 @@
 <h1>MacVim snapshot 21 released</h1>
 <ul>
   <li>The macvim color scheme changed so that line numbers look better when
-    the background is dark (enable line numbers with :set number, set dark
+    the background is dark (enable line numbers with :set number; set dark
     background with :set bg=dark)</li>
-  <li>Improved support for Voice Over (enable with <D-F5>)</li>
+  <li>Improved support for Voice Over (enable with &lt;D-F5&gt;)</li>
   <li>System bell support (see :h 'vb' on how to turn it off)</li>
   <li>MacVim no longer associates to .plist and .dict since these may well be
     in binary format</li>
-  <li>Added Find Next <D-g>, Find Previous <D-G> and Use Selection for Find
-    <D-e> menu items</li>
+  <li>Added Find Next &lt;D-g&gt;, Find Previous &lt;D-G&gt; and Use Selection
+    for Find &lt;D-e&gt; menu items</li>
   <li>Track pad scrolling is now force sensitive</li>
   <li>Added help section on preferences</li>
   <li>Preferences panel updated (also no longer hides when MacVim loses focus)

src/MacVim/make-snapshot.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Increment build number
+/Developer/Tools/agvtool next-version -all > /dev/null
+
+# Get current build number
+BUILDNUM=`/Developer/Tools/agvtool what-version -terse`
+DEST=~/Desktop/MacVim-snapshot-$BUILDNUM
+
+echo '****************************************************'
+echo "              BUILDING SNAPSHOT $BUILDNUM"
+echo '****************************************************'
+echo ''
+
+# Build Vim binary
+echo 'BUILDING VIM BINARY'
+echo '    running configure...'
+cd .. && ./configure --enable-gui=macvim --with-mac-arch=both \
+    --with-features=huge --enable-pythoninterp --enable-tclinterp \
+    --enable-cscope \
+    --with-compiledby="Bjorn Winckler <bjorn.winckler@gmail.com>" > /dev/null
+
+echo '    cleaning...'
+make clean > /dev/null
+echo '    calling make...'
+make > /dev/null
+echo '    done'
+
+# Build MacVim.app
+echo 'BUILDING MacVim.app'
+cd MacVim
+echo '    cleaning...'
+xcodebuild -configuration Universal clean > /dev/null
+echo '    calling xcodebuild...'
+xcodebuild -configuration Universal > /dev/null
+echo '    done'
+
+# Create archive of build/Universal/MacVim.app
+echo 'CREATING SNAPSHOT ARCHIVE'
+echo '    copying MacVim.app and supporting files...'
+mkdir $DEST
+cp -pR build/Universal/MacVim.app $DEST/
+cp -p mvim $DEST/
+cp -p README-snapshot.txt $DEST/
+echo '    creating archive....'
+cd $DEST && cd ..
+tar cjf MacVim-snapshot-$BUILDNUM.tbz MacVim-snapshot-$BUILDNUM
+echo '    done'
+
+echo 'ALL DONE'
+echo 'Now update the Appcast, commit and tag, then post on vim_mac.'
+# Update app-cast
+
+# Commit & tag
+# git-commit -a -m "$BUILDNUM"
+# git-tag -a -F tagfile $BUILDNUM
+
+# Post on vim_mac

src/search.c

@@ -280,7 +280,8 @@ save_re_pat(idx, pat, magic)
     if (spats[idx].pat != pat)
     {
 #if FEAT_GUI_MACVIM
-	gui_macvim_add_to_find_pboard(pat);
+	if (RE_SEARCH == idx)
+	    gui_macvim_add_to_find_pboard(pat);
 #endif
 	vim_free(spats[idx].pat);
 	spats[idx].pat = vim_strsave(pat);
@@ -426,7 +427,8 @@ set_last_search_pat(s, idx, magic, setlast)
     int		setlast;
 {
 #if FEAT_GUI_MACVIM
-    gui_macvim_add_to_find_pboard(s);
+    if (RE_SEARCH == idx)
+	gui_macvim_add_to_find_pboard(s);
 #endif
 
     vim_free(spats[idx].pat);