Mercurial > emacs
comparison lisp/ediff-util.el @ 19870:a016beb4f4cf
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
19869:3c4025f3be8f | 19870:a016beb4f4cf |
---|---|
2353 (run-hooks 'ediff-quit-hook) | 2353 (run-hooks 'ediff-quit-hook) |
2354 (ediff-cleanup-meta-buffer meta-buffer) | 2354 (ediff-cleanup-meta-buffer meta-buffer) |
2355 | 2355 |
2356 ;; warp mouse into a working window | 2356 ;; warp mouse into a working window |
2357 (setq warp-frame ; if mouse is over a reasonable frame, use it | 2357 (setq warp-frame ; if mouse is over a reasonable frame, use it |
2358 (cond ((and ediff-xemacs-p (window-live-p (car (mouse-position)))) | 2358 (cond ((ediff-good-frame-under-mouse)) |
2359 (window-frame (car (mouse-position)))) | |
2360 ((frame-live-p (car (mouse-position))) | |
2361 (car (mouse-position))) | |
2362 (t warp-frame))) | 2359 (t warp-frame))) |
2363 (if (frame-live-p warp-frame) | 2360 (if (frame-live-p warp-frame) |
2364 (set-mouse-position (if ediff-emacs-p | 2361 (set-mouse-position (if ediff-emacs-p |
2365 warp-frame | 2362 warp-frame |
2366 (frame-selected-window warp-frame)) | 2363 (frame-selected-window warp-frame)) |
2367 2 1)) | 2364 2 1)) |
2368 | 2365 |
2369 (if (ediff-buffer-live-p meta-buffer) | 2366 (if (ediff-buffer-live-p meta-buffer) |
2370 (ediff-show-meta-buffer meta-buffer)) | 2367 (ediff-show-meta-buffer meta-buffer)) |
2371 )) | 2368 )) |
2369 | |
2370 ;; Returns frame under mouse, if this frame is not a minibuffer | |
2371 ;; frame. Otherwise: nil | |
2372 (defun ediff-good-frame-under-mouse () | |
2373 (let ((frame-or-win (car (mouse-position))) | |
2374 (buf-name "") | |
2375 frame obj-ok) | |
2376 (setq obj-ok | |
2377 (if ediff-emacs-p | |
2378 (frame-live-p frame-or-win) | |
2379 (window-live-p frame-or-win))) | |
2380 (if obj-ok | |
2381 (setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win)) | |
2382 buf-name | |
2383 (buffer-name (window-buffer (frame-selected-window frame))))) | |
2384 (if (string-match "Minibuf" buf-name) | |
2385 nil | |
2386 frame))) | |
2372 | 2387 |
2373 | 2388 |
2374 (defun ediff-delete-temp-files () | 2389 (defun ediff-delete-temp-files () |
2375 (if (stringp ediff-temp-file-A) | 2390 (if (stringp ediff-temp-file-A) |
2376 (delete-file ediff-temp-file-A)) | 2391 (delete-file ediff-temp-file-A)) |