jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.469

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.469
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.469 (after 7.4.467)
3ef2ca
Problem:    Can't build with MSVC. (Ken Takata)
3ef2ca
Solution:   Move the assignment after the declarations.
3ef2ca
Files:	    src/normal.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.468/src/normal.c	2014-10-09 13:22:41.804886993 +0200
3ef2ca
--- src/normal.c	2014-10-09 14:46:05.728897923 +0200
3ef2ca
***************
3ef2ca
*** 1382,1390 ****
3ef2ca
      int		restart_edit_save;
3ef2ca
  #ifdef FEAT_LINEBREAK
3ef2ca
      int		lbr_saved = curwin->w_p_lbr;
3ef2ca
- 
3ef2ca
-     curwin->w_p_lbr = FALSE;	/* avoid a problem with unwanted linebreaks in
3ef2ca
- 				 * block mode */
3ef2ca
  #endif
3ef2ca
  
3ef2ca
      /* The visual area is remembered for redo */
3ef2ca
--- 1382,1387 ----
3ef2ca
***************
3ef2ca
*** 1396,1401 ****
3ef2ca
--- 1393,1402 ----
3ef2ca
      int		    include_line_break = FALSE;
3ef2ca
  #endif
3ef2ca
  
3ef2ca
+ #ifdef FEAT_LINEBREAK
3ef2ca
+     curwin->w_p_lbr = FALSE;	/* Avoid a problem with unwanted linebreaks in
3ef2ca
+ 				 * block mode. */
3ef2ca
+ #endif
3ef2ca
  #if defined(FEAT_CLIPBOARD)
3ef2ca
      /*
3ef2ca
       * Yank the visual area into the GUI selection register before we operate
3ef2ca
*** ../vim-7.4.468/src/version.c	2014-10-09 13:36:12.736888764 +0200
3ef2ca
--- src/version.c	2014-10-09 14:46:58.760898039 +0200
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     469,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
"After a few years of marriage a man can look right at a woman
3ef2ca
without seeing her and a woman can see right through a man
3ef2ca
without looking at him."
3ef2ca
 - Helen Rowland
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///