Merge branch 'master' of git://github.com/b4winckler/macvim

Conflicts:
	src/MacVim/Info.plist

Author: splhack

.gitignore

@@ -24,8 +24,11 @@ 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

runtime/doc/gui_mac.txt

@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 7.3.  Last change: 2012 Jan 13
+*gui_mac.txt*	For Vim version 7.4a.  Last change: 2012 Jan 13
 
 
 		  VIM REFERENCE MANUAL    by Bjorn Winckler

src/MacVim/English.lproj/InfoPlist.strings

@@ -1232,7 +1232,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20130621</string>
+	<string>20130711</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/Info.plist

@@ -736,7 +736,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 66;
+				CURRENT_PROJECT_VERSION = 67;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -769,7 +769,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 66;
+				CURRENT_PROJECT_VERSION = 67;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -2506,9 +2506,12 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 			gui_mch_set_font(wide_font);
 		    gui_mch_draw_string(gui.row, scol, s + start, thislen,
 #  ifdef FEAT_GUI_MACVIM
-								  cells,
+				    cells,
+				    draw_flags | (prev_wide ? DRAW_WIDE : 0)
+# else
+				    draw_flag
 #  endif
-								  draw_flags);
+				    );
 		    if (prev_wide)
 			gui_mch_set_font(font);
 		    start += thislen;