[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v |
Date: |
Wed, 09 Jan 2008 06:16:12 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/01/09 06:16:09
Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- ediff-util.el 8 Jan 2008 20:44:45 -0000 1.83
+++ ediff-util.el 9 Jan 2008 06:16:06 -0000 1.84
@@ -2406,7 +2406,9 @@
temporarily reverses the meaning of this variable."
(interactive "P")
(ediff-barf-if-not-control-buffer)
- (let ((ctl-buf (current-buffer)))
+ (let ((ctl-buf (current-buffer))
+ (ctl-frm (selected-frame))
+ (minibuffer-auto-raise t))
(if (y-or-n-p (format "Quit this Ediff session%s? "
(if (ediff-buffer-live-p ediff-meta-buffer)
" & show containing session group" "")))
@@ -2414,6 +2416,8 @@
(message "")
(set-buffer ctl-buf)
(ediff-really-quit reverse-default-keep-variants))
+ (select-frame ctl-frm)
+ (raise-frame ctl-frm)
(message ""))))
@@ -2818,7 +2822,8 @@
;; ediff-barf-if-not-control-buffer ensures only called from ediff.
-(declare-function ediff-version "ediff" ())
+;; declare-function does not exist in XEmacs
+;;(declare-function ediff-version "ediff" ()))
(defun ediff-status-info ()
"Show the names of the buffers or files being operated on by Ediff.