vim/patches/vim-7.3.405.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.405
   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.405
  11 Problem:    When xterm gets back the function keys it may delete the urxvt
  12             mouse termcap code.
  13 Solution:   Check for the whole code, not just the start. (Egmont Koblinger)
  14 Files:      src/keymap.h, src/misc2.c, src/term.c
  15
  16
  17 *** ../vim-7.3.404/src/keymap.h 2011-10-20 21:09:25.000000000 +0200
  18 --- src/keymap.h        2012-01-20 16:35:43.000000000 +0100
  19 ***************
  20 *** 411,416 ****
  21 --- 411,417 ----
  22   #define K_DEC_MOUSE   TERMCAP2KEY(KS_DEC_MOUSE, KE_FILLER)
  23   #define K_JSBTERM_MOUSE       TERMCAP2KEY(KS_JSBTERM_MOUSE, KE_FILLER)
  24   #define K_PTERM_MOUSE TERMCAP2KEY(KS_PTERM_MOUSE, KE_FILLER)
  25 + #define K_URXVT_MOUSE TERMCAP2KEY(KS_URXVT_MOUSE, KE_FILLER)
  26
  27   #define K_SELECT      TERMCAP2KEY(KS_SELECT, KE_FILLER)
  28   #define K_TEAROFF     TERMCAP2KEY(KS_TEAROFF, KE_FILLER)
  29 *** ../vim-7.3.404/src/misc2.c  2012-01-10 22:26:12.000000000 +0100
  30 --- src/misc2.c 2012-01-20 16:38:27.000000000 +0100
  31 ***************
  32 *** 2416,2425 ****
  33 --- 2416,2436 ----
  34       {'<',             (char_u *)"lt"},
  35
  36       {K_MOUSE,         (char_u *)"Mouse"},
  37 + #ifdef FEAT_MOUSE_NET
  38       {K_NETTERM_MOUSE, (char_u *)"NetMouse"},
  39 + #endif
  40 + #ifdef FEAT_MOUSE_DEC
  41       {K_DEC_MOUSE,     (char_u *)"DecMouse"},
  42 + #endif
  43 + #ifdef FEAT_MOUSE_JSB
  44       {K_JSBTERM_MOUSE, (char_u *)"JsbMouse"},
  45 + #endif
  46 + #ifdef FEAT_MOUSE_PTERM
  47       {K_PTERM_MOUSE,   (char_u *)"PtermMouse"},
  48 + #endif
  49 + #ifdef FEAT_MOUSE_URXVT
  50 +     {K_URXVT_MOUSE,   (char_u *)"UrxvtMouse"},
  51 + #endif
  52       {K_LEFTMOUSE,     (char_u *)"LeftMouse"},
  53       {K_LEFTMOUSE_NM,  (char_u *)"LeftMouseNM"},
  54       {K_LEFTDRAG,      (char_u *)"LeftDrag"},
  55 *** ../vim-7.3.404/src/term.c   2011-12-01 20:59:16.000000000 +0100
  56 --- src/term.c  2012-01-20 16:50:41.000000000 +0100
  57 ***************
  58 *** 5252,5263 ****
  59       char_u    *src;
  60   {
  61       int               i;
  62 !     int               slen;
  63
  64       for (i = 0; i < tc_len; ++i)
  65       {
  66 !       slen = termcodes[i].len;
  67 !       if (slen > 1 && STRNCMP(termcodes[i].code, src, (size_t)slen) == 0)
  68             return i;
  69       }
  70       return -1;
  71 --- 5252,5263 ----
  72       char_u    *src;
  73   {
  74       int               i;
  75 !     int               slen = STRLEN(src);
  76
  77       for (i = 0; i < tc_len; ++i)
  78       {
  79 !       if (slen == termcodes[i].len
  80 !                       && STRNCMP(termcodes[i].code, src, (size_t)slen) == 0)
  81             return i;
  82       }
  83       return -1;
  84 *** ../vim-7.3.404/src/version.c        2012-01-20 14:32:22.000000000 +0100
  85 --- src/version.c       2012-01-20 16:59:47.000000000 +0100
  86 ***************
  87 *** 716,717 ****
  88 --- 716,719 ----
  89   {   /* Add new patch number below this line */
  90 + /**/
  91 +     405,
  92   /**/
  93
  94 --
  95 "The future's already arrived - it's just not evenly distributed yet."
  96                 -- William Gibson
  97
  98  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  99 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 100 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 101  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///