6.2.433

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.433
   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.433
  11 Problem:    Translating "VISUAL" and "BLOCK" separately doesn't give a good
  12             result. (Alejandro Lopez Valencia)
  13 Solution:   Use a string for each combination.
  14 Files:      src/screen.c
  15
  16
  17 *** ../vim-6.2.432/src/screen.c Tue Mar 30 21:49:18 2004
  18 --- src/screen.c        Fri Apr  2 22:16:45 2004
  19 ***************
  20 *** 7995,8008 ****
  21   #ifdef FEAT_VISUAL
  22                 if (VIsual_active)
  23                 {
  24 !                   if (VIsual_select)
  25 !                       MSG_PUTS_ATTR(_(" SELECT"), attr);
  26 !                   else
  27 !                       MSG_PUTS_ATTR(_(" VISUAL"), attr);
  28 !                   if (VIsual_mode == Ctrl_V)
  29 !                       MSG_PUTS_ATTR(_(" BLOCK"), attr);
  30 !                   else if (VIsual_mode == 'V')
  31 !                       MSG_PUTS_ATTR(_(" LINE"), attr);
  32                 }
  33   #endif
  34                 MSG_PUTS_ATTR(" --", attr);
  35 --- 8001,8022 ----
  36   #ifdef FEAT_VISUAL
  37                 if (VIsual_active)
  38                 {
  39 !                   char *p;
  40 !
  41 !                   /* Don't concatenate separate words to avoid translation
  42 !                    * problems. */
  43 !                   switch ((VIsual_select ? 4 : 0)
  44 !                           + (VIsual_mode == Ctrl_V) * 2
  45 !                           + (VIsual_mode == 'V'))
  46 !                   {
  47 !                       case 0: p = N_(" VISUAL"); break;
  48 !                       case 1: p = N_(" VISUAL LINE"); break;
  49 !                       case 2: p = N_(" VISUAL BLOCK"); break;
  50 !                       case 4: p = N_(" SELECT"); break;
  51 !                       case 5: p = N_(" SELECT LINE"); break;
  52 !                       default: p = N_(" SELECT BLOCK"); break;
  53 !                   }
  54 !                   MSG_PUTS_ATTR(_(p), attr);
  55                 }
  56   #endif
  57                 MSG_PUTS_ATTR(" --", attr);
  58 *** ../vim-6.2.432/src/version.c        Fri Apr  2 22:25:53 2004
  59 --- src/version.c       Fri Apr  2 22:26:43 2004
  60 ***************
  61 *** 639,640 ****
  62 --- 639,642 ----
  63   {   /* Add new patch number below this line */
  64 + /**/
  65 +     433,
  66   /**/
  67
  68 --
  69 hundred-and-one symptoms of being an internet addict:
  70 250. You've given up the search for the "perfect woman" and instead,
  71      sit in front of the PC until you're just too tired to care.
  72
  73  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  74 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  75 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  76  \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///