[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el |
Date: |
Tue, 20 Sep 2005 13:47:33 -0400 |
Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.60 emacs/lisp/ediff-util.el:1.61
*** emacs/lisp/ediff-util.el:1.60 Sun Sep 18 12:25:01 2005
--- emacs/lisp/ediff-util.el Tue Sep 20 17:47:28 2005
***************
*** 367,373 ****
(ediff-unique-buffer-name "*ediff-merge" "*")))
(save-excursion
(set-buffer buffer-C)
! (insert-buffer buf)
(funcall (ediff-with-current-buffer buf major-mode))
(widen) ; merge buffer is always widened
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
--- 367,373 ----
(ediff-unique-buffer-name "*ediff-merge" "*")))
(save-excursion
(set-buffer buffer-C)
! (insert-buffer-substring buf)
(funcall (ediff-with-current-buffer buf major-mode))
(widen) ; merge buffer is always widened
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)