Mercurial > emacs

changeset 85412:c401c87aabbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(emerge-setup): Use insert-buffer-substring. (emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.
author Thien-Thi Nguyen <ttn@gnuvola.org>
date Thu, 18 Oct 2007 18:24:45 +0000
parents 065fa2d96c5a
children 73a49d587762
files lisp/emerge.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emerge.el	Thu Oct 18 16:07:35 2007 +0000
+++ b/lisp/emerge.el	Thu Oct 18 18:24:45 2007 +0000
@@ -633,7 +633,7 @@
 	   (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 @@
   (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 @@
 	   (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))