From de3cc8168d9f9840c2b65265611c6541a2232d5c Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 18 Oct 2007 18:25:15 +0000 Subject: [PATCH] (emerge-setup): Use insert-buffer-substring. (emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise. --- lisp/ChangeLog | 3 +++ lisp/emerge.el | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24be4370154..39daa6aef77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 * textmodes/fill.el (fill-individual-paragraphs): Doc fix. diff --git a/lisp/emerge.el b/lisp/emerge.el index 0c1b3b170cd..fd002409a7f 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -633,7 +633,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") (if output-file (concat "Output to file: " output-file) (concat "Output to buffer: " (buffer-name merge-buffer)))) - (insert-buffer emerge-A-buffer) + (save-excursion (insert-buffer-substring emerge-A-buffer)) (emerge-set-keys) (setq emerge-difference-list (emerge-make-diff-list file-A file-B)) (setq emerge-number-of-differences (length emerge-difference-list)) @@ -712,7 +712,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") (emerge-eval-in-buffer emerge-diff-error-buffer (erase-buffer) - (insert-buffer emerge-diff-buffer) + (save-excursion (insert-buffer-substring emerge-diff-buffer)) (delete-matching-lines ok-regexp))) ;;; Top-level and setup functions for three-file mode. @@ -802,7 +802,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") (if output-file (concat "Output to file: " output-file) (concat "Output to buffer: " (buffer-name merge-buffer)))) - (insert-buffer emerge-A-buffer) + (save-excursion (insert-buffer-substring emerge-A-buffer)) (emerge-set-keys) (setq emerge-difference-list (emerge-make-diff3-list file-A file-B file-ancestor)) -- 2.11.4.GIT