jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.424

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.424
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.424
3ef2ca
Problem:    Get ml_get error when using Python to delete lines in a buffer
3ef2ca
	    that is not in a window.  issue 248.
3ef2ca
Solution:   Do not try adjusting the cursor for a different buffer.
3ef2ca
Files:	    src/if_py_both.h
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.423/src/if_py_both.h	2014-05-07 17:31:32.473182497 +0200
3ef2ca
--- src/if_py_both.h	2014-08-29 13:32:18.554434621 +0200
3ef2ca
***************
3ef2ca
*** 4196,4202 ****
3ef2ca
  		    break;
3ef2ca
  		}
3ef2ca
  	    }
3ef2ca
! 	    if (buf == curbuf)
3ef2ca
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
3ef2ca
  	    if (save_curbuf == NULL)
3ef2ca
  		/* Only adjust marks if we managed to switch to a window that
3ef2ca
--- 4196,4204 ----
3ef2ca
  		    break;
3ef2ca
  		}
3ef2ca
  	    }
3ef2ca
! 	    if (buf == curbuf && (save_curwin != NULL || save_curbuf == NULL))
3ef2ca
! 		/* Using an existing window for the buffer, adjust the cursor
3ef2ca
! 		 * position. */
3ef2ca
  		py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
3ef2ca
  	    if (save_curbuf == NULL)
3ef2ca
  		/* Only adjust marks if we managed to switch to a window that
3ef2ca
*** ../vim-7.4.423/src/version.c	2014-08-29 12:58:38.246430208 +0200
3ef2ca
--- src/version.c	2014-08-29 13:36:13.642435134 +0200
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     424,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
From "know your smileys":
3ef2ca
 :-H	Is missing teeth
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    ///