Mercurial > emacs

diff lisp/smerge-mode.el @ 90208:890cc78a5a24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 493-503) - Update from CVS - Update from CVS: lisp/startup.el (command-line): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 95-98) - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 29 Jul 2005 01:54:54 +0000
parents f9a65d7ebd29 a975a8beec7f
children 2d92f5c9d6ae
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Tue Jul 26 12:03:19 2005 +0000
+++ b/lisp/smerge-mode.el	Fri Jul 29 01:54:54 2005 +0000
@@ -670,7 +670,7 @@
 	     (ediff-cleanup-mess)
 	     (with-current-buffer buf
 	       (erase-buffer)
-	       (insert-buffer buffer-C)
+	       (insert-buffer-substring buffer-C)
 	       (kill-buffer buffer-A)
 	       (kill-buffer buffer-B)
 	       (kill-buffer buffer-C)