To: vim-dev@vim.org
Subject: Patch 6.1.282
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.282
Problem:    Elvis uses "se" in a modeline, Vim doesn't recognize this.
Solution:   Also accept "se " where "set " is accepted in a modeline.
	    (Yasuhiro Matsumoto)
Files:	    src/buffer.c


*** ../vim61.281/src/buffer.c	Mon Oct 14 20:41:51 2002
--- src/buffer.c	Tue Jan  7 20:55:15 2003
***************
*** 4075,4087 ****
  	     * ignore the stuff after the ':'.
  	     * "vi:set opt opt opt: foo" -- foo not interpreted
  	     * "vi:opt opt opt: foo" -- foo interpreted
  	     */
! 	    if (STRNCMP(s, "set ", (size_t)4) == 0)
  	    {
  		if (*e != ':')		/* no terminating ':'? */
  		    break;
  		end = TRUE;
! 		s += 4;
  	    }
  	    *e = NUL;			/* truncate the set command */
  
--- 4075,4089 ----
  	     * ignore the stuff after the ':'.
  	     * "vi:set opt opt opt: foo" -- foo not interpreted
  	     * "vi:opt opt opt: foo" -- foo interpreted
+ 	     * Accept "se" for compatibility with Elvis.
  	     */
! 	    if (STRNCMP(s, "set ", (size_t)4) == 0
! 		    || STRNCMP(s, "se ", (size_t)3) == 0)
  	    {
  		if (*e != ':')		/* no terminating ':'? */
  		    break;
  		end = TRUE;
! 		s = vim_strchr(s, ' ') + 1;
  	    }
  	    *e = NUL;			/* truncate the set command */
  
*** ../vim61.281/src/version.c	Tue Jan  7 20:50:40 2003
--- src/version.c	Tue Jan  7 20:59:46 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     282,
  /**/

-- 
Q: Is selling software the same as selling hardware?
A: No, good hardware is sold new, good software has already been used by many.

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///