7.2.131

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.131
   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 7.2.131
  11 Problem:    When 'keymap' is cleared may still use the cursor highlighting for
  12             when it's enabled.
  13 Solution:   Reset 'iminsert' and 'imsearch'. (partly by Dominique Pelle)
  14             Also avoid ":setlocal" for these options have a global effect.
  15 Files:      src/option.c
  16
  17
  18 *** ../vim-7.2.130/src/option.c Sat Feb 21 20:27:00 2009
  19 --- src/option.c        Wed Mar  4 04:09:51 2009
  20 ***************
  21 *** 5797,5810 ****
  22         /* load or unload key mapping tables */
  23         errmsg = keymap_init();
  24
  25 !       /* When successfully installed a new keymap switch on using it. */
  26 !       if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
  27         {
  28 !           curbuf->b_p_iminsert = B_IMODE_LMAP;
  29 !           if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
  30 !               curbuf->b_p_imsearch = B_IMODE_LMAP;
  31 !           set_iminsert_global();
  32 !           set_imsearch_global();
  33   # ifdef FEAT_WINDOWS
  34             status_redraw_curbuf();
  35   # endif
  36 --- 5797,5824 ----
  37         /* load or unload key mapping tables */
  38         errmsg = keymap_init();
  39
  40 !       if (errmsg == NULL)
  41         {
  42 !           if (*curbuf->b_p_keymap != NUL)
  43 !           {
  44 !               /* Installed a new keymap, switch on using it. */
  45 !               curbuf->b_p_iminsert = B_IMODE_LMAP;
  46 !               if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
  47 !                   curbuf->b_p_imsearch = B_IMODE_LMAP;
  48 !           }
  49 !           else
  50 !           {
  51 !               /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
  52 !               if (curbuf->b_p_iminsert == B_IMODE_LMAP)
  53 !                   curbuf->b_p_iminsert = B_IMODE_NONE;
  54 !               if (curbuf->b_p_imsearch == B_IMODE_LMAP)
  55 !                   curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
  56 !           }
  57 !           if ((opt_flags & OPT_LOCAL) == 0)
  58 !           {
  59 !               set_iminsert_global();
  60 !               set_imsearch_global();
  61 !           }
  62   # ifdef FEAT_WINDOWS
  63             status_redraw_curbuf();
  64   # endif
  65 *** ../vim-7.2.130/src/version.c        Mon Mar  2 02:44:54 2009
  66 --- src/version.c       Wed Mar  4 04:10:32 2009
  67 ***************
  68 *** 678,679 ****
  69 --- 678,681 ----
  70   {   /* Add new patch number below this line */
  71 + /**/
  72 +     131,
  73   /**/
  74
  75 --
  76 hundred-and-one symptoms of being an internet addict:
  77 157. You fum through a magazine, you first check to see if it has a web
  78      address.
  79
  80  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  81 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  82 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  83  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///