[Emacs-diffs] Changes to emacs/lisp/ediff-util.el

[Michael Kifer]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.40 emacs/lisp/ediff-util.el:1.41
*** emacs/lisp/ediff-util.el:1.40       Mon Jan  7 23:36:01 2002
--- emacs/lisp/ediff-util.el    Sun Feb 10 01:46:12 2002
***************
*** 2628,2634 ****
  ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
  (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask 
keep-variants)
    ;; if this is indirect buffer, kill it and substitute with direct buf
!   (if (ediff-with-current-buffer buff ediff-temp-indirect-buffer)
        (let ((wind (ediff-get-visible-buffer-window buff))
            (base (buffer-base-buffer buff))
            (modified-p (buffer-modified-p buff)))
--- 2628,2635 ----
  ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
  (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask 
keep-variants)
    ;; if this is indirect buffer, kill it and substitute with direct buf
!   (if (and (ediff-buffer-live-p buff)
!          (ediff-with-current-buffer buff ediff-temp-indirect-buffer))
        (let ((wind (ediff-get-visible-buffer-window buff))
            (base (buffer-base-buffer buff))
            (modified-p (buffer-modified-p buff)))