6.3.001

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.3.001
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.3.001
  11 Problem:    ":browse split" gives the file selection dialog twice. (Gordon
  12             Bazeley)  Same problem for ":browse diffpatch".
  13 Solution:   Reset cmdmod.browse before calling do_ecmd().
  14 Files:      src/diff.c, src/ex_docmd.c
  15
  16
  17 *** ../vim-6.3.000/src/diff.c   Wed Jun  9 14:56:26 2004
  18 --- src/diff.c  Wed Jun  9 14:43:17 2004
  19 ***************
  20 *** 810,815 ****
  21 --- 810,816 ----
  22   #endif
  23   #ifdef FEAT_BROWSE
  24       char_u    *browseFile = NULL;
  25 +     int               browse_flag = cmdmod.browse;
  26   #endif
  27
  28   #ifdef FEAT_BROWSE
  29 ***************
  30 *** 820,825 ****
  31 --- 821,827 ----
  32         if (browseFile == NULL)
  33             return;             /* operation cancelled */
  34         eap->arg = browseFile;
  35 +       cmdmod.browse = FALSE;  /* don't let do_ecmd() browse again */
  36       }
  37   #endif
  38
  39 ***************
  40 *** 960,965 ****
  41 --- 962,968 ----
  42   #endif
  43   #ifdef FEAT_BROWSE
  44       vim_free(browseFile);
  45 +     cmdmod.browse = browse_flag;
  46   #endif
  47   }
  48
  49 *** ../vim-6.3.000/src/ex_docmd.c       Wed Jun  9 14:56:25 2004
  50 --- src/ex_docmd.c      Wed Jun  9 14:28:58 2004
  51 ***************
  52 *** 6342,6347 ****
  53 --- 6342,6350 ----
  54   #if defined(FEAT_SEARCHPATH) || defined(FEAT_BROWSE)
  55       char_u    *fname = NULL;
  56   #endif
  57 + #ifdef FEAT_BROWSE
  58 +     int               browse_flag = cmdmod.browse;
  59 + #endif
  60
  61   #ifndef FEAT_VERTSPLIT
  62       if (eap->cmdidx == CMD_vsplit || eap->cmdidx == CMD_vnew)
  63 ***************
  64 *** 6396,6402 ****
  65 --- 6399,6407 ----
  66             goto theend;
  67         eap->arg = fname;
  68       }
  69 +     cmdmod.browse = FALSE;    /* Don't browse again in do_ecmd(). */
  70   #endif
  71 +
  72       if (win_split(eap->addr_count > 0 ? (int)eap->line2 : 0,
  73                                      *eap->cmd == 'v' ? WSP_VERT : 0) != FAIL)
  74       {
  75 ***************
  76 *** 6414,6419 ****
  77 --- 6419,6428 ----
  78   #endif
  79         do_exedit(eap, old_curwin);
  80       }
  81 +
  82 + #ifdef FEAT_BROWSE
  83 +     cmdmod.browse = browse_flag;
  84 + #endif
  85
  86   #if defined(FEAT_SEARCHPATH) || defined(FEAT_BROWSE)
  87   theend:
  88 *** ../vim-6.3.000/src/version.c        Wed Jun  9 14:56:26 2004
  89 --- src/version.c       Wed Jun  9 14:53:52 2004
  90 ***************
  91 *** 643,644 ****
  92 --- 643,646 ----
  93   {   /* Add new patch number below this line */
  94 + /**/
  95 +     1,
  96   /**/
  97
  98 --
  99 From "know your smileys":
 100  (:-#   Said something he shouldn't have
 101
 102  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 103 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 104 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 105  \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///