diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-02-10 06:46:12 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-02-10 06:46:12 +0000 |
| commit | db52ec2a354443e3ba56f32e1e052832519f799e (patch) | |
| tree | ed86ae03977f76db973ad5e5be78267d046997aa /lisp/ediff-util.el | |
| parent | b44d93f71e206f942c6d4577eb747501926f947d (diff) | |
| download | emacs-db52ec2a354443e3ba56f32e1e052832519f799e.tar.gz | |
2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-util.el (viper-read-key-sequence): fixed so it'll read
fast key sequences in emacs native mode
(viper-events-to-keys): deleted
* viper.el (describe-key, describe-key-briefly): get rid of
viper-events-to-keys.
* ediff-init.el (ediff-has-gutter-support): Steven Turnbull's patch.
* ediff-wind.el (ediff-setup-control-frame): Use
ediff-has-gutter-support.
* ediff-util.el (ediff-dispose-of-variant-according-to-user):
check if buff is alive.
* ediff.el: typo in comment.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index c7f0be3638d..e1dbdc7f336 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -2628,7 +2628,8 @@ delete this buffer in another session as well." ;; 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) + (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))) |