|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.031
|
|
|
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.031
|
|
|
8b9a1c |
Problem: ":diffoff!" resets options even when 'diff' is not set. (Charles
|
|
|
8b9a1c |
Cooper)
|
|
|
8b9a1c |
Solution: Only resets related options in a window where 'diff' is set.
|
|
|
8b9a1c |
Files: src/diff.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.030/src/diff.c 2013-07-17 13:43:15.000000000 +0200
|
|
|
8b9a1c |
--- src/diff.c 2013-09-20 19:58:47.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 1203,1209 ****
|
|
|
8b9a1c |
|
|
|
8b9a1c |
for (wp = firstwin; wp != NULL; wp = wp->w_next)
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
! if (wp == curwin || (eap->forceit && wp->w_p_diff))
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
/* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
|
|
|
8b9a1c |
* were saved in diff_win_options() restore them. */
|
|
|
8b9a1c |
--- 1203,1209 ----
|
|
|
8b9a1c |
|
|
|
8b9a1c |
for (wp = firstwin; wp != NULL; wp = wp->w_next)
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
! if (eap->forceit ? wp->w_p_diff : wp == curwin)
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
/* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
|
|
|
8b9a1c |
* were saved in diff_win_options() restore them. */
|
|
|
8b9a1c |
*** ../vim-7.4.030/src/version.c 2013-09-19 20:48:59.000000000 +0200
|
|
|
8b9a1c |
--- src/version.c 2013-09-20 19:59:45.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 31,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
"Marriage is a wonderful institution...
|
|
|
8b9a1c |
but who wants to live in an institution?"
|
|
|
8b9a1c |
- Groucho Marx
|
|
|
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 ///
|