vim/patches/vim-7.3.483.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.483
   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.483  (after 7.3.477)
  11 Problem:    More prompt shows up too often.
  12 Solution:   Instead of adding a line break, only start a new line in the
  13             message history. (Christian Brabandt)
  14 Files:      src/eval.c, src/message.c, src/proto/message.pro
  15
  16
  17 *** ../vim-7.3.482/src/eval.c   2012-03-23 15:36:57.000000000 +0100
  18 --- src/eval.c  2012-03-28 16:41:03.000000000 +0200
  19 ***************
  20 *** 20493,20501 ****
  21                  * may cause a message to appear. */
  22                 if (eap->cmdidx == CMD_echo)
  23                 {
  24 !                   /* Put the output below the command, makes scrolling back
  25 !                    * at more prompt work. */
  26 !                   msg_didout = TRUE;
  27                     msg_start();
  28                 }
  29             }
  30 --- 20493,20502 ----
  31                  * may cause a message to appear. */
  32                 if (eap->cmdidx == CMD_echo)
  33                 {
  34 !                   /* Mark the saved text as finishing the line, so that what
  35 !                    * follows is displayed on a new line when scrolling back
  36 !                    * at the more prompt. */
  37 !                   msg_sb_eol();
  38                     msg_start();
  39                 }
  40             }
  41 *** ../vim-7.3.482/src/message.c        2012-01-26 13:01:54.000000000 +0100
  42 --- src/message.c       2012-03-28 16:35:26.000000000 +0200
  43 ***************
  44 *** 2348,2353 ****
  45 --- 2348,2363 ----
  46   }
  47
  48   /*
  49 +  * Mark the last message chunk as finishing the line.
  50 +  */
  51 +     void
  52 + msg_sb_eol()
  53 + {
  54 +     if (last_msgchunk != NULL)
  55 +       last_msgchunk->sb_eol = TRUE;
  56 + }
  57 +
  58 + /*
  59    * Display a screen line from previously displayed text at row "row".
  60    * Returns a pointer to the text for the next line (can be NULL).
  61    */
  62 *** ../vim-7.3.482/src/proto/message.pro        2012-01-20 20:44:38.000000000 +0100
  63 --- src/proto/message.pro       2012-03-28 16:35:33.000000000 +0200
  64 ***************
  65 *** 45,50 ****
  66 --- 45,51 ----
  67   void may_clear_sb_text __ARGS((void));
  68   void clear_sb_text __ARGS((void));
  69   void show_sb_text __ARGS((void));
  70 + void msg_sb_eol __ARGS((void));
  71   int msg_use_printf __ARGS((void));
  72   void mch_errmsg __ARGS((char *str));
  73   void mch_msg __ARGS((char *str));
  74 *** ../vim-7.3.482/src/version.c        2012-03-28 14:19:46.000000000 +0200
  75 --- src/version.c       2012-03-28 16:48:53.000000000 +0200
  76 ***************
  77 *** 716,717 ****
  78 --- 716,719 ----
  79   {   /* Add new patch number below this line */
  80 + /**/
  81 +     483,
  82   /**/
  83
  84 --
  85        We're knights of the Round Table
  86        Our shows are formidable
  87        But many times
  88        We're given rhymes
  89        That are quite unsingable
  90        We're opera mad in Camelot
  91        We sing from the diaphragm a lot.
  92                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  93
  94  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  95 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  96 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  97  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///