|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.435
|
|
|
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.435
|
|
|
3ef2ca |
Problem: Line formatting behaves differently when 'linebreak' is set.
|
|
|
3ef2ca |
(mvxxc)
|
|
|
3ef2ca |
Solution: Disable 'linebreak' temporarily. (Christian Brabandt)
|
|
|
3ef2ca |
Files: src/edit.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.434/src/edit.c 2014-08-16 18:13:00.082044726 +0200
|
|
|
3ef2ca |
--- src/edit.c 2014-09-09 16:21:08.556532751 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 6131,6136 ****
|
|
|
3ef2ca |
--- 6131,6142 ----
|
|
|
3ef2ca |
int no_leader = FALSE;
|
|
|
3ef2ca |
int do_comments = (flags & INSCHAR_DO_COM);
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
+ #ifdef FEAT_LINEBREAK
|
|
|
3ef2ca |
+ int has_lbr = curwin->w_p_lbr;
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
+ /* make sure win_lbr_chartabsize() counts correctly */
|
|
|
3ef2ca |
+ curwin->w_p_lbr = FALSE;
|
|
|
3ef2ca |
+ #endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/*
|
|
|
3ef2ca |
* When 'ai' is off we don't want a space under the cursor to be
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 6483,6488 ****
|
|
|
3ef2ca |
--- 6489,6497 ----
|
|
|
3ef2ca |
if (save_char != NUL) /* put back space after cursor */
|
|
|
3ef2ca |
pchar_cursor(save_char);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ #ifdef FEAT_LINEBREAK
|
|
|
3ef2ca |
+ curwin->w_p_lbr = has_lbr;
|
|
|
3ef2ca |
+ #endif
|
|
|
3ef2ca |
if (!format_only && haveto_redraw)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
update_topline();
|
|
|
3ef2ca |
*** ../vim-7.4.434/src/version.c 2014-09-09 16:13:05.040531695 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-09-09 16:19:57.272532595 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 435,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
hundred-and-one symptoms of being an internet addict:
|
|
|
3ef2ca |
109. You actually read -- and enjoy -- lists like this.
|
|
|
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 ///
|