# HG changeset patch
# User Thien-Thi Nguyen <ttn@gnuvola.org>
# Date 1192731915 0
# Node ID 73a49d58776204d8a9c0c9003ef20af9c25c0c42
# Parent  c401c87aabbf9244944d7426a32220843096edfe
*** empty log message ***

diff -r c401c87aabbf -r 73a49d587762 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 18 18:24:45 2007 +0000
+++ b/lisp/ChangeLog	Thu Oct 18 18:25:15 2007 +0000
@@ -6,6 +6,9 @@
 	* textmodes/org.el (org-columns-eval):
 	Use forward-line.
 
+	* emerge.el (emerge-setup): Use insert-buffer-substring.
+	(emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.
+
 2007-10-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* textmodes/fill.el (fill-individual-paragraphs): Doc fix.