astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
3a43b59
To: vim-dev@vim.org
3a43b59
Subject: Patch 7.1.250
3a43b59
Fcc: outbox
3a43b59
From: Bram Moolenaar <Bram@moolenaar.net>
3a43b59
Mime-Version: 1.0
3a43b59
Content-Type: text/plain; charset=ISO-8859-1
3a43b59
Content-Transfer-Encoding: 8bit
3a43b59
------------
3a43b59
3a43b59
Patch 7.1.250
3a43b59
Problem:    ":setglobal fenc=anything" gives an error message in a buffer
3a43b59
	    where 'modifiable' is off.  (Ben Schmidt)
3a43b59
Solution:   Don't give an error if 'modifiable' doesn't matter.
3a43b59
Files:	    src/option.c
3a43b59
3a43b59
3a43b59
*** ../vim-7.1.249/src/option.c	Sat Jan 19 15:55:51 2008
3a43b59
--- src/option.c	Wed Feb 13 18:31:39 2008
3a43b59
***************
3a43b59
*** 5671,5677 ****
3a43b59
      {
3a43b59
  	if (gvarp == &p_fenc)
3a43b59
  	{
3a43b59
! 	    if (!curbuf->b_p_ma)
3a43b59
  		errmsg = e_modifiable;
3a43b59
  	    else if (vim_strchr(*varp, ',') != NULL)
3a43b59
  		/* No comma allowed in 'fileencoding'; catches confusing it
3a43b59
--- 5671,5677 ----
3a43b59
      {
3a43b59
  	if (gvarp == &p_fenc)
3a43b59
  	{
3a43b59
! 	    if (!curbuf->b_p_ma && opt_flags != OPT_GLOBAL)
3a43b59
  		errmsg = e_modifiable;
3a43b59
  	    else if (vim_strchr(*varp, ',') != NULL)
3a43b59
  		/* No comma allowed in 'fileencoding'; catches confusing it
3a43b59
*** ../vim-7.1.249/src/version.c	Wed Feb 13 15:20:59 2008
3a43b59
--- src/version.c	Wed Feb 13 18:34:24 2008
3a43b59
***************
3a43b59
*** 668,669 ****
3a43b59
--- 668,671 ----
3a43b59
  {   /* Add new patch number below this line */
3a43b59
+ /**/
3a43b59
+     250,
3a43b59
  /**/
3a43b59
3a43b59
-- 
3a43b59
How To Keep A Healthy Level Of Insanity:
3a43b59
3. Every time someone asks you to do something, ask if they want fries
3a43b59
   with that.
3a43b59
3a43b59
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3a43b59
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3a43b59
\\\        download, build and distribute -- http://www.A-A-P.org        ///
3a43b59
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///