/[emacs]/emacs/lisp/ediff-mult.el
ViewVC logotype

Diff of /emacs/lisp/ediff-mult.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.25 by kifer, Fri Sep 28 03:06:09 2001 UTC revision 1.26 by kifer, Mon Dec 24 05:50:31 2001 UTC
# Line 2110  If this is a session registry buffer the Line 2110  If this is a session registry buffer the
2110    (ediff-update-meta-buffer (current-buffer) 'must-redraw))    (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2111    
2112    
2113  (defun ediff-meta-mark-equal-files ()  ;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply
2114    "Run though the session list and mark identical files.  ;; indicate which are equal files
2115  This is used only for sessions that involve 2 or 3 files at the same time."  (defun ediff-meta-mark-equal-files (&optional action)
2116      "Run through the session list and mark identical files.
2117    This is used only for sessions that involve 2 or 3 files at the same time.
2118    ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
2119    for operation, or simply indicate which are equal files. If it is nil, then
2120    last-command-char is used to decide which action to take."
2121    (interactive)    (interactive)
2122      (if (null action)
2123          (setq action last-command-char))
2124    (let ((list (cdr ediff-meta-list))    (let ((list (cdr ediff-meta-list))
2125          marked1 marked2 marked3          marked1 marked2 marked3
2126          fileinfo1 fileinfo2 fileinfo3 elt)          fileinfo1 fileinfo2 fileinfo3 elt)
# Line 2138  This is used only for sessions that invo Line 2145  This is used only for sessions that invo
2145              (or (ediff-mark-if-equal fileinfo2 fileinfo3)              (or (ediff-mark-if-equal fileinfo2 fileinfo3)
2146                  (setq marked3 nil))))                  (setq marked3 nil))))
2147        (if (and marked1 marked2 marked3)        (if (and marked1 marked2 marked3)
2148            (cond ((eq last-command-char ?h)            (cond ((eq action ?h)
2149                   (ediff-mark-session-for-hiding elt 'mark))                   (ediff-mark-session-for-hiding elt 'mark))
2150                  ((eq last-command-char ?m)                  ((eq action ?m)
2151                   (ediff-mark-session-for-operation elt 'mark))                   (ediff-mark-session-for-operation elt 'mark))
2152                  ))                  ))
2153        (setq list (cdr list)))        (setq list (cdr list)))

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26