|
 |
5111c2d |
To: vim-dev@vim.org
|
|
|
5111c2d |
Subject: patch 7.1.124
|
|
|
5111c2d |
Fcc: outbox
|
|
|
5111c2d |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
5111c2d |
Mime-Version: 1.0
|
|
|
5111c2d |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
5111c2d |
Content-Transfer-Encoding: 8bit
|
|
|
5111c2d |
------------
|
|
|
5111c2d |
|
|
|
5111c2d |
Patch 7.1.124 (extra)
|
|
|
5111c2d |
Problem: Mac: When dropping a file on Vim.app that is already in the buffer
|
|
|
5111c2d |
list (from .viminfo) results in editing an empty, unnamed buffer.
|
|
|
5111c2d |
(Axel Kielhorn) Also: warning for unused variable.
|
|
|
5111c2d |
Solution: Move to the buffer of the first agument. Delete unused variable.
|
|
|
5111c2d |
Files: src/gui_mac.c
|
|
|
5111c2d |
|
|
|
5111c2d |
|
|
|
5111c2d |
*** ../vim-7.1.123/src/gui_mac.c Thu Aug 30 12:50:00 2007
|
|
|
5111c2d |
--- src/gui_mac.c Sat Sep 29 13:12:26 2007
|
|
|
5111c2d |
***************
|
|
|
5111c2d |
*** 1046,1051 ****
|
|
|
5111c2d |
--- 1046,1052 ----
|
|
|
5111c2d |
{
|
|
|
5111c2d |
int i;
|
|
|
5111c2d |
char_u *p;
|
|
|
5111c2d |
+ int fnum = -1;
|
|
|
5111c2d |
|
|
|
5111c2d |
/* these are the initial files dropped on the Vim icon */
|
|
|
5111c2d |
for (i = 0 ; i < numFiles; i++)
|
|
|
5111c2d |
***************
|
|
|
5111c2d |
*** 1055,1060 ****
|
|
|
5111c2d |
--- 1056,1073 ----
|
|
|
5111c2d |
mch_exit(2);
|
|
|
5111c2d |
else
|
|
|
5111c2d |
alist_add(&global_alist, p, 2);
|
|
|
5111c2d |
+ if (fnum == -1)
|
|
|
5111c2d |
+ fnum = GARGLIST[GARGCOUNT - 1].ae_fnum;
|
|
|
5111c2d |
+ }
|
|
|
5111c2d |
+
|
|
|
5111c2d |
+ /* If the file name was already in the buffer list we need to switch
|
|
|
5111c2d |
+ * to it. */
|
|
|
5111c2d |
+ if (curbuf->b_fnum != fnum)
|
|
|
5111c2d |
+ {
|
|
|
5111c2d |
+ char_u cmd[30];
|
|
|
5111c2d |
+
|
|
|
5111c2d |
+ vim_snprintf((char *)cmd, 30, "silent %dbuffer", fnum);
|
|
|
5111c2d |
+ do_cmdline_cmd(cmd);
|
|
|
5111c2d |
}
|
|
|
5111c2d |
|
|
|
5111c2d |
/* Change directory to the location of the first file. */
|
|
|
5111c2d |
***************
|
|
|
5111c2d |
*** 2920,2926 ****
|
|
|
5111c2d |
/* TODO: Move most of this stuff toward gui_mch_init */
|
|
|
5111c2d |
Rect windRect;
|
|
|
5111c2d |
MenuHandle pomme;
|
|
|
5111c2d |
- long gestalt_rc;
|
|
|
5111c2d |
EventTypeSpec eventTypeSpec;
|
|
|
5111c2d |
EventHandlerRef mouseWheelHandlerRef;
|
|
|
5111c2d |
#ifdef USE_CARBONKEYHANDLER
|
|
|
5111c2d |
--- 2933,2938 ----
|
|
|
5111c2d |
*** ../vim-7.1.123/src/version.c Wed Sep 26 22:35:06 2007
|
|
|
5111c2d |
--- src/version.c Sat Sep 29 13:13:16 2007
|
|
|
5111c2d |
***************
|
|
|
5111c2d |
*** 668,669 ****
|
|
|
5111c2d |
--- 668,671 ----
|
|
|
5111c2d |
{ /* Add new patch number below this line */
|
|
|
5111c2d |
+ /**/
|
|
|
5111c2d |
+ 124,
|
|
|
5111c2d |
/**/
|
|
|
5111c2d |
|
|
|
5111c2d |
--
|
|
|
5111c2d |
ERIC IDLE PLAYED: THE DEAD COLLECTOR, MR BINT (A VILLAGE NE'ER-DO -WELL VERY
|
|
|
5111c2d |
KEEN ON BURNING WITCHES), SIR ROBIN, THE GUARD WHO DOESN'T
|
|
|
5111c2d |
HICOUGH BUT TRIES TO GET THINGS STRAIGHT, CONCORDE (SIR
|
|
|
5111c2d |
LAUNCELOT'S TRUSTY STEED), ROGER THE SHRUBBER (A SHRUBBER),
|
|
|
5111c2d |
BROTHER MAYNARD
|
|
|
5111c2d |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
5111c2d |
|
|
|
5111c2d |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
5111c2d |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
5111c2d |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
5111c2d |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|