jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.462
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.462
073263
Problem:    Setting the local value of 'backupcopy' empty gives an error.
073263
	    (Peter Mattern)
073263
Solution:   When using an empty value set the flags to zero. (Hirohito
073263
	    Higashi)
073263
Files:	    src/option.c
073263
073263
073263
*** ../vim-7.4.461/src/option.c	2014-09-23 15:45:04.870801055 +0200
073263
--- src/option.c	2014-09-29 17:03:06.963943648 +0200
073263
***************
073263
*** 5742,5756 ****
073263
  	    flags = &curbuf->b_bkc_flags;
073263
  	}
073263
  
073263
! 	if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK)
073263
! 	    errmsg = e_invarg;
073263
! 	if ((((int)*flags & BKC_AUTO) != 0)
073263
! 		+ (((int)*flags & BKC_YES) != 0)
073263
! 		+ (((int)*flags & BKC_NO) != 0) != 1)
073263
  	{
073263
! 	    /* Must have exactly one of "auto", "yes"  and "no". */
073263
! 	    (void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE);
073263
! 	    errmsg = e_invarg;
073263
  	}
073263
      }
073263
  
073263
--- 5742,5762 ----
073263
  	    flags = &curbuf->b_bkc_flags;
073263
  	}
073263
  
073263
! 	if ((opt_flags & OPT_LOCAL) && *bkc == NUL)
073263
! 	    /* make the local value empty: use the global value */
073263
! 	    *flags = 0;
073263
! 	else
073263
  	{
073263
! 	    if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK)
073263
! 		errmsg = e_invarg;
073263
! 	    if ((((int)*flags & BKC_AUTO) != 0)
073263
! 		    + (((int)*flags & BKC_YES) != 0)
073263
! 		    + (((int)*flags & BKC_NO) != 0) != 1)
073263
! 	    {
073263
! 		/* Must have exactly one of "auto", "yes"  and "no". */
073263
! 		(void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE);
073263
! 		errmsg = e_invarg;
073263
! 	    }
073263
  	}
073263
      }
073263
  
073263
*** ../vim-7.4.461/src/version.c	2014-09-27 11:18:08.179520979 +0200
073263
--- src/version.c	2014-09-29 17:13:50.235945053 +0200
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     462,
073263
  /**/
073263
073263
-- 
073263
Some of the well known MS-Windows errors:
073263
	EMEMORY		Memory error caused by..., eh...
073263
	ELICENSE	Your license has expired, give us more money!
073263
	EMOUSE		Mouse moved, reinstall Windows
073263
	EILLEGAL	Illegal error, you are not allowed to see this
073263
	EVIRUS		Undetectable virus found
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    ///