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

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   06/06/18 17:08:25

Index: ediff-mult.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ediff-mult.el       19 Feb 2006 03:16:44 -0000      1.47
+++ ediff-mult.el       18 Jun 2006 17:08:24 -0000      1.48
@@ -1656,6 +1656,7 @@
 multifile patches.  For `ediff-directory-revisions', we insist that
 all marked sessions must be active."
   (interactive)
+  (let ((coding-system-for-read ediff-coding-system-for-read))
   (or (ediff-buffer-live-p ediff-meta-diff-buffer)
       (setq ediff-meta-diff-buffer
            (get-buffer-create
@@ -1669,9 +1670,12 @@
        (display-buffer ediff-meta-diff-buffer 'not-this-window)
        (ediff-with-current-buffer ediff-meta-diff-buffer
          (set-buffer-modified-p nil)
-         (setq buffer-read-only t)))
+                                    (setq buffer-read-only t))
+         (if (fboundp 'diff-mode)
+             (with-current-buffer ediff-meta-diff-buffer
+               (diff-mode))))
     (beep)
-    (message "No marked sessions found")))
+      (message "No marked sessions found"))))
 
 (defun ediff-meta-show-patch ()
   "Show the multi-file patch associated with this group session."