jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.081

8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.081
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.081 (after 7.4.078)
8b9a1c
Problem:    Wrong logic when ANALYZE is "yes".
8b9a1c
Solution:   Use or instead of and. (KF Leong)
8b9a1c
Files:      src/Make_mvc.mak
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.080/src/Make_mvc.mak	2013-11-08 03:15:39.000000000 +0100
8b9a1c
--- src/Make_mvc.mak	2013-11-08 18:02:54.000000000 +0100
8b9a1c
***************
8b9a1c
*** 488,494 ****
8b9a1c
  !endif
8b9a1c
  
8b9a1c
  # Static code analysis generally available starting with VS2012
8b9a1c
! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
8b9a1c
  CFLAGS=$(CFLAGS) /analyze
8b9a1c
  !endif
8b9a1c
  
8b9a1c
--- 488,494 ----
8b9a1c
  !endif
8b9a1c
  
8b9a1c
  # Static code analysis generally available starting with VS2012
8b9a1c
! !if ("$(ANALYZE)" == "yes") && (("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0"))
8b9a1c
  CFLAGS=$(CFLAGS) /analyze
8b9a1c
  !endif
8b9a1c
  
8b9a1c
*** ../vim-7.4.080/src/version.c	2013-11-09 01:44:38.000000000 +0100
8b9a1c
--- src/version.c	2013-11-09 02:31:34.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     81,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
Wi n0t trei a h0liday in Sweden thi yer?
8b9a1c
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///