Mercurial > vim

comparison src/diff.c @ 5358:b21b5dcdca21 v7.4.031

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.031 Problem: ":diffoff!" resets options even when 'diff' is not set. (Charles Cooper) Solution: Only resets related options in a window where 'diff' is set.
author Bram Moolenaar <bram@vim.org>
date Fri, 20 Sep 2013 20:13:53 +0200
parents b3ff17862b4c
children e3d2b8d83bb3
comparison
equal deleted inserted replaced
5357:8115b4c7a154 5358:b21b5dcdca21
1201 int diffwin = FALSE; 1201 int diffwin = FALSE;
1202 #endif 1202 #endif
1203 1203
1204 for (wp = firstwin; wp != NULL; wp = wp->w_next) 1204 for (wp = firstwin; wp != NULL; wp = wp->w_next)
1205 { 1205 {
1206 if (wp == curwin || (eap->forceit && wp->w_p_diff)) 1206 if (eap->forceit ? wp->w_p_diff : wp == curwin)
1207 { 1207 {
1208 /* Set 'diff', 'scrollbind' off and 'wrap' on. If option values 1208 /* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
1209 * were saved in diff_win_options() restore them. */ 1209 * were saved in diff_win_options() restore them. */
1210 wp->w_p_diff = FALSE; 1210 wp->w_p_diff = FALSE;
1211 1211