6.2.489

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.489
   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.2.489
  11 Problem:    When accidentally opening a session in Vim which has already been
  12             opened in another Vim there is a long row of ATTENTION prompts.
  13             Need to quit each of them to get out. (Robert Webb)
  14 Solution:   Add the "Abort" alternative to the dialog.
  15 Files:      src/memline.c
  16
  17
  18 *** ../vim-6.2.488/src/memline.c        Fri Apr 16 22:03:45 2004
  19 --- src/memline.c       Tue Apr 20 20:10:50 2004
  20 ***************
  21 *** 3727,3735 ****
  22                                         : name,
  23   # if defined(UNIX) || defined(__EMX__) || defined(VMS)
  24                                     process_still_running
  25 !                                       ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit") :
  26   # endif
  27 !                                       (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Delete it"), 1, NULL))
  28                         {
  29                             case 1:
  30                                 buf->b_p_ro = TRUE;
  31 --- 3727,3735 ----
  32                                         : name,
  33   # if defined(UNIX) || defined(__EMX__) || defined(VMS)
  34                                     process_still_running
  35 !                                       ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
  36   # endif
  37 !                                       (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort\n&Delete it"), 1, NULL))
  38                         {
  39                             case 1:
  40                                 buf->b_p_ro = TRUE;
  41 ***************
  42 *** 3743,3748 ****
  43 --- 3743,3752 ----
  44                                 swap_exists_action = SEA_QUIT;
  45                                 break;
  46                             case 5:
  47 +                               swap_exists_action = SEA_QUIT;
  48 +                               got_int = TRUE;
  49 +                               break;
  50 +                           case 6:
  51                                 mch_remove(fname);
  52                                 break;
  53                         }
  54 *** ../vim-6.2.488/src/version.c        Tue Apr 20 17:22:22 2004
  55 --- src/version.c       Tue Apr 20 20:13:03 2004
  56 ***************
  57 *** 639,640 ****
  58 --- 639,642 ----
  59   {   /* Add new patch number below this line */
  60 + /**/
  61 +     489,
  62   /**/
  63
  64 --
  65 DENNIS: Oh, very nice. King, eh!  I expect you've got a palace and fine
  66         clothes and courtiers and plenty of food.  And how d'you get that?  By
  67         exploiting the workers! By hanging on to outdated imperialist dogma
  68         which perpetuates the social and economic differences in our society!
  69                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  70
  71  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  72 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  73 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  74  \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///