[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el

[Michael Kifer]

Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.43 emacs/lisp/ediff-mult.el:1.44
*** emacs/lisp/ediff-mult.el:1.43       Sat Sep 24 23:26:28 2005
--- emacs/lisp/ediff-mult.el    Thu Oct  6 00:09:49 2005
***************
*** 1624,1630 ****
           (save-excursion
             (set-buffer meta-diff-buff)
             (goto-char (point-max))
!            (insert-buffer custom-diff-buf)
             (insert "\n")))
          ;; if ediff session is not live, run diff directly on the files
          ((memq metajob '(ediff-directories
--- 1624,1630 ----
           (save-excursion
             (set-buffer meta-diff-buff)
             (goto-char (point-max))
!            (insert-buffer-substring custom-diff-buf)
             (insert "\n")))
          ;; if ediff session is not live, run diff directly on the files
          ((memq metajob '(ediff-directories
***************
*** 1643,1649 ****
           (save-excursion
             (set-buffer meta-diff-buff)
             (goto-char (point-max))
!            (insert-buffer tmp-buf)
             (insert "\n")))
          (t
           (ediff-kill-buffer-carefully meta-diff-buff)
--- 1643,1649 ----
           (save-excursion
             (set-buffer meta-diff-buff)
             (goto-char (point-max))
!            (insert-buffer-substring tmp-buf)
             (insert "\n")))
          (t
           (ediff-kill-buffer-carefully meta-diff-buff)
***************
*** 1691,1697 ****
               (ediff-get-session-objC-name info)))
            (set-buffer (get-buffer-create ediff-tmp-buffer))
            (erase-buffer)
!           (insert-buffer patchbuffer)
            (display-buffer ediff-tmp-buffer 'not-this-window)
            ))
        (error "The patch buffer wasn't found"))))
--- 1691,1698 ----
               (ediff-get-session-objC-name info)))
            (set-buffer (get-buffer-create ediff-tmp-buffer))
            (erase-buffer)
!           (insert-buffer-substring patchbuffer)
!           (goto-char (point-min))
            (display-buffer ediff-tmp-buffer 'not-this-window)
            ))
        (error "The patch buffer wasn't found"))))