changeset 85413:73a49d587762

*** empty log message ***
author Thien-Thi Nguyen <ttn@gnuvola.org>
date Thu, 18 Oct 2007 18:25:15 +0000
parents c401c87aabbf
children f79d3fec6de7
files lisp/ChangeLog
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.