[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.25 emacs/lisp/ediff-mult.el:1.26
*** emacs/lisp/ediff-mult.el:1.25       Thu Sep 27 23:06:09 2001
--- emacs/lisp/ediff-mult.el    Mon Dec 24 00:50:31 2001
***************
*** 2110,2119 ****
    (ediff-update-meta-buffer (current-buffer) 'must-redraw))
  
  
! (defun ediff-meta-mark-equal-files ()
!   "Run though the session list and mark identical files.
! This is used only for sessions that involve 2 or 3 files at the same time."
    (interactive)
    (let ((list (cdr ediff-meta-list))
        marked1 marked2 marked3
        fileinfo1 fileinfo2 fileinfo3 elt)
--- 2110,2126 ----
    (ediff-update-meta-buffer (current-buffer) 'must-redraw))
  
  
! ;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply
! ;; indicate which are equal files
! (defun ediff-meta-mark-equal-files (&optional action)
!   "Run through the session list and mark identical files.
! This is used only for sessions that involve 2 or 3 files at the same time.
! ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, 
mark
! for operation, or simply indicate which are equal files. If it is nil, then
! last-command-char is used to decide which action to take."
    (interactive)
+   (if (null action)
+       (setq action last-command-char))
    (let ((list (cdr ediff-meta-list))
        marked1 marked2 marked3
        fileinfo1 fileinfo2 fileinfo3 elt)
***************
*** 2138,2146 ****
            (or (ediff-mark-if-equal fileinfo2 fileinfo3)
                (setq marked3 nil))))
        (if (and marked1 marked2 marked3)
!         (cond ((eq last-command-char ?h)
                 (ediff-mark-session-for-hiding elt 'mark))
!               ((eq last-command-char ?m)
                 (ediff-mark-session-for-operation elt 'mark))
                ))
        (setq list (cdr list)))
--- 2145,2153 ----
            (or (ediff-mark-if-equal fileinfo2 fileinfo3)
                (setq marked3 nil))))
        (if (and marked1 marked2 marked3)
!         (cond ((eq action ?h)
                 (ediff-mark-session-for-hiding elt 'mark))
!               ((eq action ?m)
                 (ediff-mark-session-for-operation elt 'mark))
                ))
        (setq list (cdr list)))