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) |
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))) |