(emerge-setup): Use insert-buffer-substring.

(emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24be43701540949718a0f49e8a038f7cc508adba..39daa6aef77390b3a44310c99d3df86c0526fd05 100644 (file)
--- 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  <lekktu@gmail.com>
 
        * textmodes/fill.el (fill-individual-paragraphs): Doc fix.

diff --git a/lisp/emerge.el b/lisp/emerge.el
index 0c1b3b170cdf57e3f94188e845309a5a0daa24fd..fd002409a7f59d0228307483221df5943b872e14 100644 (file)
--- 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))