Fixed merge

Author: splhack

src/MacVim/MMCoreTextView.m

@@ -1086,12 +1086,11 @@ - (void)batchDrawData:(NSData *)data
                     surrogatePair = YES;
                     g += 2;
                     c += 2;
-                    p += 2;
                 } else {
                     ++g;
                     ++c;
-                    ++p;
                 }
+                ++p;
             }
 
             int count = g-glyphs;
@@ -1113,12 +1112,11 @@ - (void)batchDrawData:(NSData *)data
                 if (emojiEnabled && CFStringIsSurrogateHighCharacter(*c)) {
                     g += 2;
                     c += 2;
-                    p += 2;
                 } else {
                     ++g;
                     ++c;
-                    ++p;
                 }
+                ++p;
             }
 
             // Figure out which font to draw these chars with.

src/auto/configure

@@ -4361,7 +4361,7 @@ fi
 for ac_header in AvailabilityMacros.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
+if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVAILABILITYMACROS_H 1
 _ACEOF