vim/patches/vim-7.3.061.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.061
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.061
  11 Problem:    Remote ":drop" does not respect 'autochdir'. (Peter Odding)
  12 Solution:   Don't restore the directory when 'autochdir' is set. (Benjamin
  13             Fritz)
  14 Files:      src/main.c
  15
  16
  17 *** ../vim-7.3.060/src/main.c   2010-09-29 17:26:57.000000000 +0200
  18 --- src/main.c  2010-11-16 16:16:11.000000000 +0100
  19 ***************
  20 *** 3817,3822 ****
  21 --- 3817,3824 ----
  22       /* Check if we have at least one argument. */
  23       if (filec <= 0)
  24         mainerr_arg_missing((char_u *)filev[-1]);
  25 +
  26 +     /* Temporarily cd to the current directory to handle relative file names. */
  27       if (mch_dirname(cwd, MAXPATHL) != OK)
  28         return NULL;
  29       if ((p = vim_strsave_escaped_ext(cwd,
  30 ***************
  31 *** 3858,3870 ****
  32         ga_concat(&ga, p);
  33         vim_free(p);
  34       }
  35       /* The :drop commands goes to Insert mode when 'insertmode' is set, use
  36        * CTRL-\ CTRL-N again. */
  37 !     ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
  38 !     ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -");
  39       if (sendReply)
  40 !       ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()");
  41 !     ga_concat(&ga, (char_u *)"<CR>:");
  42       if (inicmd != NULL)
  43       {
  44         /* Can't use <CR> after "inicmd", because an "startinsert" would cause
  45 --- 3860,3879 ----
  46         ga_concat(&ga, p);
  47         vim_free(p);
  48       }
  49 +     ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
  50 +
  51       /* The :drop commands goes to Insert mode when 'insertmode' is set, use
  52        * CTRL-\ CTRL-N again. */
  53 !     ga_concat(&ga, (char_u *)"<C-\\><C-N>");
  54 !
  55 !     /* Switch back to the correct current directory (prior to temporary path
  56 !      * switch) unless 'autochdir' is set, in which case it will already be
  57 !      * correct after the :drop command. */
  58 !     ga_concat(&ga, (char_u *)":if !exists('+acd')||!&acd|cd -|endif<CR>");
  59 !
  60       if (sendReply)
  61 !       ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
  62 !     ga_concat(&ga, (char_u *)":");
  63       if (inicmd != NULL)
  64       {
  65         /* Can't use <CR> after "inicmd", because an "startinsert" would cause
  66 *** ../vim-7.3.060/src/version.c        2010-11-16 15:48:57.000000000 +0100
  67 --- src/version.c       2010-11-16 16:19:58.000000000 +0100
  68 ***************
  69 *** 716,717 ****
  70 --- 716,719 ----
  71   {   /* Add new patch number below this line */
  72 + /**/
  73 +     61,
  74   /**/
  75
  76 --
  77 BEDEVERE: Stand by for attack!!
  78    [CUT TO enormous army forming up.  Trebuchets, rows of PIKEMEN, siege
  79    towers, pennants flying, shouts of "Stand by for attack!"  Traditional
  80    army build-up shots.  The shouts echo across the ranks of the army.
  81    We see various groups reacting, and stirring themselves in readiness.]
  82 ARTHUR:   Who are they?
  83 BEDEVERE: Oh, just some friends!
  84                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  85
  86  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  87 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  88 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  89  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///