MacVim Snapshot 84

Binary targets OS X 10.8(Mountain Lion), 10.9(Mavericks), 10.10(Yosemite), and 10.11(El Capitan)

- Vim patch 7.4.936
- Fix to enable graphical sign
- Update the default Python 2.7 dylib path

Script interfaces have compatibility with these versions

- Lua 5.2
- Perl 5.16
- Python2 2.7
- Python3 3.5
- Ruby 2.0

.travis.yml

@@ -15,6 +15,7 @@ env:
     vi_cv_path_python3=/usr/local/bin/python3
     vi_cv_path_plain_lua=/usr/local/bin/lua
     vi_cv_dll_name_perl=/System/Library/Perl/5.16/darwin-thread-multi-2level/CORE/libperl.dylib
+    vi_cv_dll_name_python=/System/Library/Frameworks/Python.framework/Versions/2.7/Python
     vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.5/Python
     "CONFOPT='--with-features=huge --enable-multibyte --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
 
@@ -29,6 +30,7 @@ script:
   - NPROC=$(getconf _NPROCESSORS_ONLN)
   - ./configure $CONFOPT --enable-fail-if-missing
   - grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"$vi_cv_dll_name_perl\\\\\"" src/auto/config.mk
+  - grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"$vi_cv_dll_name_python\\\\\"" src/auto/config.mk
   - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"$vi_cv_dll_name_python3\\\\\"" src/auto/config.mk
   - make -j$NPROC
   - cat src/auto/config.mk

appveyor.yml

@@ -1,5 +1,7 @@
 version: "{build}"
 
+skip_tags: true
+
 before_build:
   - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
 

src/MacVim/Info.plist

@@ -1256,7 +1256,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>83</string>
+	<string>84</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/MMVimController.m

@@ -71,6 +71,8 @@ static BOOL isUnsafeMessage(int msgid);
 }
 - (void)setTextFieldString:(NSString *)textFieldString;
 - (NSTextField *)textField;
+- (void)beginSheetModalForWindow:(NSWindow *)window
+                   modalDelegate:(id)delegate;
 @end
 
 
@@ -1533,9 +1535,7 @@ static BOOL isUnsafeMessage(int msgid);
     }
 
     [alert beginSheetModalForWindow:[windowController window]
-                      modalDelegate:self
-                     didEndSelector:@selector(alertDidEnd:code:context:)
-                        contextInfo:NULL];
+                      modalDelegate:self];
 
     [alert release];
 }
@@ -1602,13 +1602,19 @@ static BOOL isUnsafeMessage(int msgid);
 
 - (void)beginSheetModalForWindow:(NSWindow *)window
                    modalDelegate:(id)delegate
-                  didEndSelector:(SEL)didEndSelector
-                     contextInfo:(void *)contextInfo
 {
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
+    [super beginSheetModalForWindow:window
+                  completionHandler:^(NSModalResponse code) {
+                      [delegate alertDidEnd:self code:code context:NULL];
+                  }];
+#else
     [super beginSheetModalForWindow:window
                       modalDelegate:delegate
-                     didEndSelector:didEndSelector
-                        contextInfo:contextInfo];
+                     didEndSelector:@selector(alertDidEnd:code:context:)
+                        contextInfo:NULL];
+#endif
 
     // HACK! Place the input text field at the bottom of the informative text
     // (which has been made a bit larger by adding newline characters).

src/MacVim/gui_macvim.m

@@ -176,6 +176,12 @@ gui_macvim_after_fork_init()
     val = CFPreferencesGetAppIntegerValue((CFStringRef)MMRendererKey,
                                             kCFPreferencesCurrentApplication,
                                             &keyValid);
+    if (!keyValid) {
+        // If MMRendererKey is not valid in the defaults, it means MacVim uses
+        // the Core Text Renderer.
+        keyValid = YES;
+        val = MMRendererCoreText;
+    }
     if (keyValid) {
         ASLogInfo(@"Use renderer=%ld", val);
         use_gui_macvim_draw_string = (val != MMRendererCoreText);

src/ex_getln.c

@@ -3715,7 +3715,7 @@ ExpandOne(xp, str, orig, options, mode)
 	    }
 	    else
 #endif
-		c0 = xp->xp_files[i][len];
+		c0 = xp->xp_files[0][len];
 	    for (i = 1; i < xp->xp_numfiles; ++i)
 	    {
 #ifdef FEAT_MBYTE

src/term.c

@@ -5231,6 +5231,13 @@ check_termcode(max_offset, buf, bufsize, buflen)
 	    else
 		key_name[1] = get_pseudo_mouse_code(current_button,
 							   is_click, is_drag);
+
+	    /* Make sure the mouse position is valid.  Some terminals may
+	     * return weird values. */
+	    if (mouse_col >= Columns)
+		mouse_col = Columns - 1;
+	    if (mouse_row >= Rows)
+		mouse_row = Rows - 1;
 	}
 #endif /* FEAT_MOUSE */
 

src/testdir/test94.in

@@ -17,7 +17,7 @@ Test cases:
 
 STARTTEST
 :so small.vim
-:set nocp viminfo+=nviminfo
+:set enc=utf-8 nocp viminfo+=nviminfo
 :
 :" User functions
 :function MoveToCap()

src/testdir/test_utf8.in

@@ -3,39 +3,42 @@ Tests for Unicode manipulations                vim: set ft=vim :
 STARTTEST
 :so small.vim
 :set encoding=utf-8
+:"
 :" Visual block Insert adjusts for multi-byte char
 :new
 :call setline(1, ["aaa", "あああ", "bbb"])
 :exe ":norm! gg0l\<C-V>jjIx\<Esc>"
 :let r = getline(1, '$')
-:
+:"
 :bwipeout!
 :$put=r
+:"
 :" Test for built-in function strchars()
 :for str in ["a", "あいa", "A\u20dd", "A\u20dd\u20dd", "\u20dd"]
 :	$put=strchars(str)
 :	$put=strchars(str, 0)
 :	$put=strchars(str, 1)
 :endfor
+:"
 :" Test for customlist completion
 :function! CustomComplete1(lead, line, pos)
 :	return ['あ', 'い']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete1 Test1 :
-:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo
+:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete2(lead, line, pos)
 :	return ['あたし', 'あたま', 'あたりめ']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete2 Test2 :
-:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo
+:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete3(lead, line, pos)
 :	return ['Nこ', 'Nん', 'Nぶ']
 :endfunction
-:command -nargs=1 -complete=customlist,CustomComplete3 Test3 :
-:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
+:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :call garbagecollect(1)
 :/^start:/,$wq! test.out
 ENDTEST

src/version.c

@@ -756,6 +756,18 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    936,
+/**/
+    935,
+/**/
+    934,
+/**/
+    933,
+/**/
+    932,
+/**/
+    931,
 /**/
     930,
 /**/

src/window.c

@@ -5790,6 +5790,8 @@ win_drag_vsep_line(dragwin, offset)
 	offset = room;		/* Move as far as we can */
     if (offset <= 0)		/* No room at all, quit. */
 	return;
+    if (fr == NULL)
+	return;			/* Safety check, should not happen. */
 
     /* grow frame fr by offset lines */
     frame_new_width(fr, fr->fr_width + offset, left, FALSE);