mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity

2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* ediff-mult.el (ediff-filegroup-action): use
	ediff-default-filtering-regexp.

	* ediff-util.el (ediff-recenter): don't call
	ediff-restore-highlighting twice.
	(ediff-select-difference): set current difference.
	(ediff-unselect-and-select-difference): added comment.

	* ediff.el (ediff-directories,ediff-directory-revisions,
	ediff-directories3,ediff-merge-directories,
	ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
	ediff-merge-directory-revisions-with-ancestor): use
	ediff-default-filtering-regexp.
This commit is contained in:
Michael Kifer 2003-10-13 01:28:49 +00:00
parent a4887377a2
commit 81ef89602d
4 changed files with 103 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ediff-util.el
View file

@ -826,7 +826,8 @@ Reestablish the default three-window display."
(eq this-command 'ediff-quit))))
))
(ediff-restore-highlighting)
(or no-rehighlight
(ediff-restore-highlighting))
(ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
))
@ -2940,6 +2941,8 @@ Hit \\[ediff-recenter] to reset the windows afterward."
))
(ediff-install-fine-diff-if-necessary n)
;; set current difference here so the hook will be able to refer to it
(setq ediff-current-difference n)
(run-hooks 'ediff-select-hook))))
@ -2991,6 +2994,9 @@ Hit \\[ediff-recenter] to reset the windows afterward."
(or (eq flag 'unselect-only)
(ediff-select-difference n))
;; need to set current diff here even though it is also set in
;; ediff-select-difference because ediff-select-difference might not
;; be called if unselect-only is specified
(setq ediff-current-difference n)
) ; end protected section