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

Conflicts:
	src/auto/configure

Author: splhack

src/MacVim/MMBackend.m

@@ -991,7 +991,7 @@ - (void)setFont:(GuiFont)font wide:(BOOL)wide
 {
     NSString *fontName = (NSString *)font;
     float size = 0;
-    NSArray *components = [fontName componentsSeparatedByString:@":"];
+    NSArray *components = [fontName componentsSeparatedByString:@":h"];
     if ([components count] == 2) {
         size = [[components lastObject] floatValue];
         fontName = [components objectAtIndex:0];

src/MacVim/gui_macvim.m

@@ -1025,7 +1025,7 @@
 gui_macvim_font_with_name(char_u *name)
 {
     if (!name)
-        return (GuiFont)[[NSString alloc] initWithFormat:@"%@:%d",
+        return (GuiFont)[[NSString alloc] initWithFormat:@"%@:h%d",
                                         MMDefaultFontName, MMDefaultFontSize];
 
     NSString *fontName = [NSString stringWithVimString:name];
@@ -1063,7 +1063,7 @@
         // can load it.  Otherwise we ask NSFont if it can load it.
         if ([fontName isEqualToString:MMDefaultFontName]
                 || [NSFont fontWithName:fontName size:size])
-            return [[NSString alloc] initWithFormat:@"%@:%d", fontName, size];
+            return [[NSString alloc] initWithFormat:@"%@:h%d", fontName, size];
     }
 
     return NOFONT;

src/auto/configure

@@ -7059,7 +7059,7 @@ $as_echo "$rubyhdrdir" >&6; }
 	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
         elif test -d "/System/Library/Frameworks/Ruby.framework"; then
                         RUBY_LIBS="-framework Ruby"
-                        RUBY_CFLAGS=
+                        RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion"
             librubyarg=
 	fi
 

src/configure.in

@@ -1846,7 +1846,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
             dnl On Mac OS X it is safer to just use the -framework flag
             RUBY_LIBS="-framework Ruby"
             dnl Don't include the -I flag when -framework is set
-            RUBY_CFLAGS=
+            RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion"
             librubyarg=
 	fi
 

src/if_ruby.c

@@ -113,7 +113,11 @@
 # include <ruby.h>
 #endif
 #ifdef RUBY19_OR_LATER
-# include <ruby/encoding.h>
+# ifdef FEAT_GUI_MACVIM
+#  include <Ruby/ruby/encoding.h>
+# else
+#  include <ruby/encoding.h>
+# endif
 #endif
 
 #undef off_t	/* ruby defines off_t as _int64, Mingw uses long */

src/os_mac.h

@@ -16,6 +16,11 @@
 # define OPAQUE_TOOLBOX_STRUCTS 0
 #endif
 
+/* Include MAC_OS_X_VERSION_* macros (needed for OS X 10.9, should be supported
+ * as of OS X 10.2)
+ * */
+#include <AvailabilityMacros.h>
+
 /*
  * Macintosh machine-dependent things.
  *