vim/patches/vim-7.3.519.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.519
   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.519
  11 Problem:    When completefunction returns it cannot indicate end of completion
  12             mode.
  13 Solution:   Recognize completefunction returning -3.  (Mtsushita Shougo)
  14 Files:      src/edit.c
  15
  16
  17 *** ../vim-7.3.518/src/edit.c   2012-04-30 18:18:43.000000000 +0200
  18 --- src/edit.c  2012-05-18 16:35:06.000000000 +0200
  19 ***************
  20 *** 5205,5213 ****
  21             }
  22
  23             /* Return value -2 means the user complete function wants to
  24 !            * cancel the complete without an error. */
  25             if (col == -2)
  26                 return FAIL;
  27
  28             /*
  29              * Reset extended parameters of completion, when start new
  30 --- 5205,5221 ----
  31             }
  32
  33             /* Return value -2 means the user complete function wants to
  34 !            * cancel the complete without an error.
  35 !            * Return value -3 does the same as -2 and leaves CTRL-X mode.*/
  36             if (col == -2)
  37                 return FAIL;
  38 +           if (col == -3)
  39 +           {
  40 +               ctrl_x_mode = 0;
  41 +               edit_submode = NULL;
  42 +               msg_clr_cmdline();
  43 +               return FAIL;
  44 +           }
  45
  46             /*
  47              * Reset extended parameters of completion, when start new
  48 *** ../vim-7.3.518/src/version.c        2012-05-18 16:24:06.000000000 +0200
  49 --- src/version.c       2012-05-18 16:34:27.000000000 +0200
  50 ***************
  51 *** 716,717 ****
  52 --- 716,719 ----
  53   {   /* Add new patch number below this line */
  54 + /**/
  55 +     519,
  56   /**/
  57
  58 --
  59 Looking at Perl through Lisp glasses, Perl looks atrocious.
  60
  61  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  62 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  63 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  64  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///