Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-25 06:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Michael Kifer 1995-10-06 00:56:53 +00:00
parent 8343426b70
commit c439fb3045
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ediff-merg.el
View file

@ -90,6 +90,7 @@ skiped over. Nil means show all regions.")
;; by Stig@hackvan.com
(normal-mode t)
(remove-hook 'local-write-file-hooks 'ediff-set-merge-mode))
;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C
;; according to the state of the difference.
@ -113,7 +114,6 @@ skiped over. Nil means show all regions.")
ediff-number-of-differences))
(setq state-of-merge (ediff-get-state-of-merge n))
(setq do-not-copy (string= state-of-merge default-state-of-merge))
(if remerging
(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))