updated for version 7.1-124

diff --git a/src/gui_mac.c b/src/gui_mac.c
index bfa3b2a1aad9fbb09e4bd09f1db2298e26b6e7a7..adc8ddc1f19884958b875d7c345b5670f07fe185 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -1046,6 +1046,7 @@ HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
     {
        int i;
        char_u *p;
+       int fnum = -1;
 
        /* these are the initial files dropped on the Vim icon */
        for (i = 0 ; i < numFiles; i++)
@@ -1055,6 +1056,18 @@ HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
                mch_exit(2);
            else
                alist_add(&global_alist, p, 2);
+           if (fnum == -1)
+               fnum = GARGLIST[GARGCOUNT - 1].ae_fnum;
+       }
+
+       /* If the file name was already in the buffer list we need to switch
+        * to it. */
+       if (curbuf->b_fnum != fnum)
+       {
+           char_u cmd[30];
+
+           vim_snprintf((char *)cmd, 30, "silent %dbuffer", fnum);
+           do_cmdline_cmd(cmd);
        }
 
        /* Change directory to the location of the first file. */
@@ -2920,7 +2933,6 @@ gui_mch_init(void)
     /* TODO: Move most of this stuff toward gui_mch_init */
     Rect       windRect;
     MenuHandle pomme;
-    long       gestalt_rc;
     EventTypeSpec   eventTypeSpec;
     EventHandlerRef mouseWheelHandlerRef;
 #ifdef USE_CARBONKEYHANDLER

diff --git a/src/version.c b/src/version.c
index 8dcac6be9d52200e039b8e97b15dcd6ddc709091..3a310ad56a6c5d150dfcfa8735d3182b851fe2da 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    124,
 /**/
     123,
 /**/