073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.531
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.531
073263
Problem:    Comments about parsing an Ex command are wrong.
073263
Solution:   Correct the steop numbers.
073263
Files:	    src/ex_docmd.c
073263
073263
073263
*** ../vim-7.4.530/src/ex_docmd.c	2014-11-27 16:22:42.742413039 +0100
073263
--- src/ex_docmd.c	2014-11-27 16:37:22.164760647 +0100
073263
***************
073263
*** 1721,1728 ****
073263
   *
073263
   * 1. skip comment lines and leading space
073263
   * 2. handle command modifiers
073263
!  * 3. parse command
073263
   * 4. parse range
073263
   * 6. parse arguments
073263
   * 7. switch on command name
073263
   *
073263
--- 1721,1729 ----
073263
   *
073263
   * 1. skip comment lines and leading space
073263
   * 2. handle command modifiers
073263
!  * 3. find the command
073263
   * 4. parse range
073263
+  * 5. Parse the command.
073263
   * 6. parse arguments
073263
   * 7. switch on command name
073263
   *
073263
***************
073263
*** 2335,2341 ****
073263
  	ea.forceit = FALSE;
073263
  
073263
  /*
073263
!  * 5. Parse arguments.
073263
   */
073263
      if (!IS_USER_CMDIDX(ea.cmdidx))
073263
  	ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
073263
--- 2336,2342 ----
073263
  	ea.forceit = FALSE;
073263
  
073263
  /*
073263
!  * 6. Parse arguments.
073263
   */
073263
      if (!IS_USER_CMDIDX(ea.cmdidx))
073263
  	ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
073263
***************
073263
*** 2782,2788 ****
073263
  #endif
073263
  
073263
  /*
073263
!  * 6. Switch on command name.
073263
   *
073263
   * The "ea" structure holds the arguments that can be used.
073263
   */
073263
--- 2783,2789 ----
073263
  #endif
073263
  
073263
  /*
073263
!  * 7. Switch on command name.
073263
   *
073263
   * The "ea" structure holds the arguments that can be used.
073263
   */
073263
***************
073263
*** 3319,3325 ****
073263
      ea.argt = 0;
073263
  
073263
  /*
073263
!  * 2. skip comment lines and leading space, colons or bars
073263
   */
073263
      for (cmd = buff; vim_strchr((char_u *)" \t:|", *cmd) != NULL; cmd++)
073263
  	;
073263
--- 3320,3326 ----
073263
      ea.argt = 0;
073263
  
073263
  /*
073263
!  * 1. skip comment lines and leading space, colons or bars
073263
   */
073263
      for (cmd = buff; vim_strchr((char_u *)" \t:|", *cmd) != NULL; cmd++)
073263
  	;
073263
***************
073263
*** 3334,3346 ****
073263
      }
073263
  
073263
  /*
073263
!  * 3. parse a range specifier of the form: addr [,addr] [;addr] ..
073263
   */
073263
      cmd = skip_range(cmd, &xp->xp_context);
073263
- 
073263
- /*
073263
-  * 4. parse command
073263
-  */
073263
      xp->xp_pattern = cmd;
073263
      if (*cmd == NUL)
073263
  	return NULL;
073263
--- 3335,3343 ----
073263
      }
073263
  
073263
  /*
073263
!  * 3. Skip over the range to find the command.
073263
   */
073263
      cmd = skip_range(cmd, &xp->xp_context);
073263
      xp->xp_pattern = cmd;
073263
      if (*cmd == NUL)
073263
  	return NULL;
073263
***************
073263
*** 3446,3452 ****
073263
      }
073263
  
073263
  /*
073263
!  * 5. parse arguments
073263
   */
073263
      if (!IS_USER_CMDIDX(ea.cmdidx))
073263
  	ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
073263
--- 3443,3449 ----
073263
      }
073263
  
073263
  /*
073263
!  * 6. parse arguments
073263
   */
073263
      if (!IS_USER_CMDIDX(ea.cmdidx))
073263
  	ea.argt = (long)cmdnames[(int)ea.cmdidx].cmd_argt;
073263
***************
073263
*** 3682,3688 ****
073263
      }
073263
  
073263
  /*
073263
!  * 6. switch on command name
073263
   */
073263
      switch (ea.cmdidx)
073263
      {
073263
--- 3679,3685 ----
073263
      }
073263
  
073263
  /*
073263
!  * 6. Switch on command name.
073263
   */
073263
      switch (ea.cmdidx)
073263
      {
073263
*** ../vim-7.4.530/src/version.c	2014-11-27 16:22:42.746412995 +0100
073263
--- src/version.c	2014-11-27 16:30:25.149339297 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     531,
073263
  /**/
073263
073263
-- 
073263
Wi n0t trei a h0liday in Sweden thi yer?
073263
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///