emacs: lisp/ediff-util.el comparison

new version

author	Michael Kifer <kifer@cs.stonybrook.edu>
date	Thu, 11 Sep 1997 16:08:19 +0000
parents	1ecc4a79d048
children	9bc6a4017c8c

comparison

equal deleted inserted replaced

-:3c4025f3be8f
+:a016beb4f4cf
 (run-hooks 'ediff-quit-hook)
 (ediff-cleanup-meta-buffer meta-buffer)
 ;; warp mouse into a working window
 (setq warp-frame  ; if mouse is over a reasonable frame, use it
-	(cond ((and ediff-xemacs-p (window-live-p (car (mouse-position))))
+	(cond ((ediff-good-frame-under-mouse))
-	       (window-frame (car (mouse-position))))
-	      ((frame-live-p (car (mouse-position)))
-	       (car (mouse-position)))
 	      (t warp-frame)))
 (if (frame-live-p warp-frame)
 (set-mouse-position (if ediff-emacs-p
 			      warp-frame
 			    (frame-selected-window warp-frame))
 			  2 1))
 (if (ediff-buffer-live-p meta-buffer)
 (ediff-show-meta-buffer meta-buffer))
 ))
+;; Returns frame under mouse, if this frame is not a minibuffer
+;; frame. Otherwise: nil
+(defun ediff-good-frame-under-mouse ()
+(let ((frame-or-win (car (mouse-position)))
+	(buf-name "")
+	frame obj-ok)
+(setq obj-ok
+	  (if ediff-emacs-p
+	      (frame-live-p frame-or-win)
+	    (window-live-p frame-or-win)))
+(if obj-ok
+	(setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win))
+	      buf-name
+	      (buffer-name (window-buffer (frame-selected-window frame)))))
+(if (string-match "Minibuf" buf-name)
+	nil
+frame)))
 (defun ediff-delete-temp-files ()
 (if (stringp ediff-temp-file-A)
 (delete-file ediff-temp-file-A))

Mercurial > emacs