lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
8b2c30c
To: vim-dev@vim.org
8b2c30c
Subject: patch 7.1.097
8b2c30c
Fcc: outbox
8b2c30c
From: Bram Moolenaar <Bram@moolenaar.net>
8b2c30c
Mime-Version: 1.0
8b2c30c
Content-Type: text/plain; charset=ISO-8859-1
8b2c30c
Content-Transfer-Encoding: 8bit
8b2c30c
------------
8b2c30c
8b2c30c
Patch 7.1.097
8b2c30c
Problem:    ":setlocal stl=%!1+1" does not work.
8b2c30c
Solution:   Adjust check for pointer. (Politz)
8b2c30c
Files:	    src/option.c
8b2c30c
8b2c30c
8b2c30c
*** ../vim-7.1.096/src/option.c	Sun Aug 12 15:50:26 2007
8b2c30c
--- src/option.c	Wed Sep  5 22:34:27 2007
8b2c30c
***************
8b2c30c
*** 6348,6354 ****
8b2c30c
  		errmsg = check_stl_option(p_ruf);
8b2c30c
  	}
8b2c30c
  	/* check 'statusline' only if it doesn't start with "%!" */
8b2c30c
! 	else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
8b2c30c
  	    errmsg = check_stl_option(s);
8b2c30c
  	if (varp == &p_ruf && errmsg == NULL)
8b2c30c
  	    comp_col();
8b2c30c
--- 6352,6358 ----
8b2c30c
  		errmsg = check_stl_option(p_ruf);
8b2c30c
  	}
8b2c30c
  	/* check 'statusline' only if it doesn't start with "%!" */
8b2c30c
! 	else if (varp == &p_ruf || s[0] != '%' || s[1] != '!')
8b2c30c
  	    errmsg = check_stl_option(s);
8b2c30c
  	if (varp == &p_ruf && errmsg == NULL)
8b2c30c
  	    comp_col();
8b2c30c
*** ../vim-7.1.096/src/version.c	Thu Sep  6 12:53:59 2007
8b2c30c
--- src/version.c	Thu Sep  6 13:31:37 2007
8b2c30c
***************
8b2c30c
*** 668,669 ****
8b2c30c
--- 668,671 ----
8b2c30c
  {   /* Add new patch number below this line */
8b2c30c
+ /**/
8b2c30c
+     97,
8b2c30c
  /**/
8b2c30c
8b2c30c
-- 
8b2c30c
Not too long ago, cut and paste was done with scissors and glue...
8b2c30c
8b2c30c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b2c30c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b2c30c
\\\        download, build and distribute -- http://www.A-A-P.org        ///
8b2c30c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///