andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.
This commit is contained in:
Thien-Thi Nguyen 2007-10-18 18:25:15 +00:00
parent e73ea842b7
commit de3cc8168d
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -6,6 +6,9 @@
* textmodes/org.el (org-columns-eval): * textmodes/org.el (org-columns-eval):
Use forward-line. 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> 2007-10-18 Juanma Barranquero <lekktu@gmail.com>
* textmodes/fill.el (fill-individual-paragraphs): Doc fix. * textmodes/fill.el (fill-individual-paragraphs): Doc fix.

6
lisp/emerge.el
View file

@ -633,7 +633,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if output-file (if output-file
(concat "Output to file: " output-file) (concat "Output to file: " output-file)
(concat "Output to buffer: " (buffer-name merge-buffer)))) (concat "Output to buffer: " (buffer-name merge-buffer))))
(insert-buffer emerge-A-buffer) (save-excursion (insert-buffer-substring emerge-A-buffer))
(emerge-set-keys) (emerge-set-keys)
(setq emerge-difference-list (emerge-make-diff-list file-A file-B)) (setq emerge-difference-list (emerge-make-diff-list file-A file-B))
(setq emerge-number-of-differences (length emerge-difference-list)) (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-eval-in-buffer
emerge-diff-error-buffer emerge-diff-error-buffer
(erase-buffer) (erase-buffer)
(insert-buffer emerge-diff-buffer) (save-excursion (insert-buffer-substring emerge-diff-buffer))
(delete-matching-lines ok-regexp))) (delete-matching-lines ok-regexp)))
;;; Top-level and setup functions for three-file mode. ;;; 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 (if output-file
(concat "Output to file: " output-file) (concat "Output to file: " output-file)
(concat "Output to buffer: " (buffer-name merge-buffer)))) (concat "Output to buffer: " (buffer-name merge-buffer))))
(insert-buffer emerge-A-buffer) (save-excursion (insert-buffer-substring emerge-A-buffer))
(emerge-set-keys) (emerge-set-keys)
(setq emerge-difference-list (setq emerge-difference-list
(emerge-make-diff3-list file-A file-B file-ancestor)) (emerge-make-diff3-list file-A file-B file-ancestor))