2628 |
;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor |
;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor |
2629 |
(defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants) |
(defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants) |
2630 |
;; if this is indirect buffer, kill it and substitute with direct buf |
;; if this is indirect buffer, kill it and substitute with direct buf |
2631 |
(if (ediff-with-current-buffer buff ediff-temp-indirect-buffer) |
(if (and (ediff-buffer-live-p buff) |
2632 |
|
(ediff-with-current-buffer buff ediff-temp-indirect-buffer)) |
2633 |
(let ((wind (ediff-get-visible-buffer-window buff)) |
(let ((wind (ediff-get-visible-buffer-window buff)) |
2634 |
(base (buffer-base-buffer buff)) |
(base (buffer-base-buffer buff)) |
2635 |
(modified-p (buffer-modified-p buff))) |
(modified-p (buffer-modified-p buff))) |