home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.4 / 7.4.486 < prev    next >
Encoding:
Internet Message Format  |  2014-10-21  |  6.7 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.4.486
  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.4.486
  11. Problem:    Check for writing to a yank register is wrong.
  12. Solution:   Negate the check. (Zyx).  Also clean up the #ifdefs.
  13. Files:        src/ex_docmd.c, src/ex_cmds.h
  14.  
  15.  
  16. *** ../vim-7.4.485/src/ex_docmd.c    2014-09-19 20:07:22.546449677 +0200
  17. --- src/ex_docmd.c    2014-10-21 19:56:31.290287055 +0200
  18. ***************
  19. *** 49,58 ****
  20. --- 49,63 ----
  21.   static char_u *get_user_command_name __ARGS((int idx));
  22.   # endif
  23.   
  24. + /* Wether a command index indicates a user command. */
  25. + # define IS_USER_CMDIDX(idx) ((int)(idx) < 0)
  26. + 
  27.   #else
  28.   # define ex_command    ex_ni
  29.   # define ex_comclear    ex_ni
  30.   # define ex_delcommand    ex_ni
  31. + /* Wether a command index indicates a user command. */
  32. + # define IS_USER_CMDIDX(idx) (FALSE)
  33.   #endif
  34.   
  35.   #ifdef FEAT_EVAL
  36. ***************
  37. *** 2190,2200 ****
  38.       goto doend;
  39.       }
  40.   
  41. !     ni = (
  42. ! #ifdef FEAT_USR_CMDS
  43. !         !USER_CMDIDX(ea.cmdidx) &&
  44. ! #endif
  45. !         (cmdnames[ea.cmdidx].cmd_func == ex_ni
  46.   #ifdef HAVE_EX_SCRIPT_NI
  47.            || cmdnames[ea.cmdidx].cmd_func == ex_script_ni
  48.   #endif
  49. --- 2195,2202 ----
  50.       goto doend;
  51.       }
  52.   
  53. !     ni = (!IS_USER_CMDIDX(ea.cmdidx)
  54. !         && (cmdnames[ea.cmdidx].cmd_func == ex_ni
  55.   #ifdef HAVE_EX_SCRIPT_NI
  56.            || cmdnames[ea.cmdidx].cmd_func == ex_script_ni
  57.   #endif
  58. ***************
  59. *** 2229,2237 ****
  60.   /*
  61.    * 5. parse arguments
  62.    */
  63. ! #ifdef FEAT_USR_CMDS
  64. !     if (!USER_CMDIDX(ea.cmdidx))
  65. ! #endif
  66.       ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
  67.   
  68.       if (!ea.skip)
  69. --- 2231,2237 ----
  70.   /*
  71.    * 5. parse arguments
  72.    */
  73. !     if (!IS_USER_CMDIDX(ea.cmdidx))
  74.       ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
  75.   
  76.       if (!ea.skip)
  77. ***************
  78. *** 2252,2261 ****
  79.       }
  80.   
  81.       if (text_locked() && !(ea.argt & CMDWIN)
  82. ! # ifdef FEAT_USR_CMDS
  83. !         && !USER_CMDIDX(ea.cmdidx)
  84. ! # endif
  85. !        )
  86.       {
  87.           /* Command not allowed when editing the command line. */
  88.   #ifdef FEAT_CMDWIN
  89. --- 2252,2258 ----
  90.       }
  91.   
  92.       if (text_locked() && !(ea.argt & CMDWIN)
  93. !         && !IS_USER_CMDIDX(ea.cmdidx))
  94.       {
  95.           /* Command not allowed when editing the command line. */
  96.   #ifdef FEAT_CMDWIN
  97. ***************
  98. *** 2273,2281 ****
  99.       if (!(ea.argt & CMDWIN)
  100.           && ea.cmdidx != CMD_edit
  101.           && ea.cmdidx != CMD_checktime
  102. ! # ifdef FEAT_USR_CMDS
  103. !         && !USER_CMDIDX(ea.cmdidx)
  104. ! # endif
  105.           && curbuf_locked())
  106.           goto doend;
  107.   #endif
  108. --- 2270,2276 ----
  109.       if (!(ea.argt & CMDWIN)
  110.           && ea.cmdidx != CMD_edit
  111.           && ea.cmdidx != CMD_checktime
  112. !         && !IS_USER_CMDIDX(ea.cmdidx)
  113.           && curbuf_locked())
  114.           goto doend;
  115.   #endif
  116. ***************
  117. *** 2468,2477 ****
  118.       /* accept numbered register only when no count allowed (:put) */
  119.       if (       (ea.argt & REGSTR)
  120.           && *ea.arg != NUL
  121. ! #ifdef FEAT_USR_CMDS
  122. !         /* Do not allow register = for user commands */
  123. !         && (!USER_CMDIDX(ea.cmdidx) || *ea.arg != '=')
  124. ! #endif
  125.           && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg)))
  126.       {
  127.   #ifndef FEAT_CLIPBOARD
  128. --- 2463,2470 ----
  129.       /* accept numbered register only when no count allowed (:put) */
  130.       if (       (ea.argt & REGSTR)
  131.           && *ea.arg != NUL
  132. !            /* Do not allow register = for user commands */
  133. !         && (!IS_USER_CMDIDX(ea.cmdidx) || *ea.arg != '=')
  134.           && !((ea.argt & COUNT) && VIM_ISDIGIT(*ea.arg)))
  135.       {
  136.   #ifndef FEAT_CLIPBOARD
  137. ***************
  138. *** 2482,2495 ****
  139.           goto doend;
  140.       }
  141.   #endif
  142. !     if (
  143. ! #ifdef FEAT_USR_CMDS
  144. !         valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put
  145. !                            && USER_CMDIDX(ea.cmdidx)))
  146. ! #else
  147. !         valid_yank_reg(*ea.arg, ea.cmdidx != CMD_put)
  148. ! #endif
  149. !        )
  150.       {
  151.           ea.regname = *ea.arg++;
  152.   #ifdef FEAT_EVAL
  153. --- 2475,2482 ----
  154.           goto doend;
  155.       }
  156.   #endif
  157. !     if (valid_yank_reg(*ea.arg, (ea.cmdidx != CMD_put
  158. !                           && !IS_USER_CMDIDX(ea.cmdidx))))
  159.       {
  160.           ea.regname = *ea.arg++;
  161.   #ifdef FEAT_EVAL
  162. ***************
  163. *** 2663,2672 ****
  164.        * number.  Don't do this for a user command.
  165.        */
  166.       if ((ea.argt & BUFNAME) && *ea.arg != NUL && ea.addr_count == 0
  167. ! # ifdef FEAT_USR_CMDS
  168. !         && !USER_CMDIDX(ea.cmdidx)
  169. ! # endif
  170. !         )
  171.       {
  172.       /*
  173.        * :bdelete, :bwipeout and :bunload take several arguments, separated
  174. --- 2650,2656 ----
  175.        * number.  Don't do this for a user command.
  176.        */
  177.       if ((ea.argt & BUFNAME) && *ea.arg != NUL && ea.addr_count == 0
  178. !         && !IS_USER_CMDIDX(ea.cmdidx))
  179.       {
  180.       /*
  181.        * :bdelete, :bwipeout and :bunload take several arguments, separated
  182. ***************
  183. *** 2704,2710 ****
  184.   #endif
  185.   
  186.   #ifdef FEAT_USR_CMDS
  187. !     if (USER_CMDIDX(ea.cmdidx))
  188.       {
  189.       /*
  190.        * Execute a user-defined command.
  191. --- 2688,2694 ----
  192.   #endif
  193.   
  194.   #ifdef FEAT_USR_CMDS
  195. !     if (IS_USER_CMDIDX(ea.cmdidx))
  196.       {
  197.       /*
  198.        * Execute a user-defined command.
  199. ***************
  200. *** 2763,2773 ****
  201.       }
  202.   #ifdef FEAT_EVAL
  203.       do_errthrow(cstack,
  204. !         (ea.cmdidx != CMD_SIZE
  205. ! # ifdef FEAT_USR_CMDS
  206. !          && !USER_CMDIDX(ea.cmdidx)
  207. ! # endif
  208. !         ) ? cmdnames[(int)ea.cmdidx].cmd_name : (char_u *)NULL);
  209.   #endif
  210.   
  211.       if (verbose_save >= 0)
  212. --- 2747,2754 ----
  213.       }
  214.   #ifdef FEAT_EVAL
  215.       do_errthrow(cstack,
  216. !         (ea.cmdidx != CMD_SIZE && !IS_USER_CMDIDX(ea.cmdidx))
  217. !             ? cmdnames[(int)ea.cmdidx].cmd_name : (char_u *)NULL);
  218.   #endif
  219.   
  220.       if (verbose_save >= 0)
  221. ***************
  222. *** 3361,3369 ****
  223.   /*
  224.    * 5. parse arguments
  225.    */
  226. ! #ifdef FEAT_USR_CMDS
  227. !     if (!USER_CMDIDX(ea.cmdidx))
  228. ! #endif
  229.       ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
  230.   
  231.       arg = skipwhite(p);
  232. --- 3342,3348 ----
  233.   /*
  234.    * 5. parse arguments
  235.    */
  236. !     if (!IS_USER_CMDIDX(ea.cmdidx))
  237.       ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
  238.   
  239.       arg = skipwhite(p);
  240. *** ../vim-7.4.485/src/ex_cmds.h    2014-09-19 20:07:22.546449677 +0200
  241. --- src/ex_cmds.h    2014-10-21 19:52:45.926286562 +0200
  242. ***************
  243. *** 1153,1160 ****
  244.   #endif
  245.   };
  246.   
  247. - #define USER_CMDIDX(idx) ((int)(idx) < 0)
  248. - 
  249.   #ifndef DO_DECLARE_EXCMD
  250.   typedef enum CMD_index cmdidx_T;
  251.   
  252. --- 1153,1158 ----
  253. *** ../vim-7.4.485/src/version.c    2014-10-21 19:35:28.406284296 +0200
  254. --- src/version.c    2014-10-21 20:00:44.350287607 +0200
  255. ***************
  256. *** 743,744 ****
  257. --- 743,746 ----
  258.   {   /* Add new patch number below this line */
  259. + /**/
  260. +     486,
  261.   /**/
  262.  
  263. -- 
  264. FATHER: One day, lad, all this will be yours ...
  265. PRINCE: What - the curtains?
  266.                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  267.  
  268.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  269. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  270. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  271.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  272.