Mercurial > emacs
changeset 81390:fe478726dca2
(x-dnd-maybe-call-test-function, x-dnd-save-state, x-dnd-drop-data):
Remove redundant checks.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 14 Jun 2007 00:09:10 +0000 |
| parents | 4e4dec192190 |
| children | 0842cee3ad33 |
| files | lisp/x-dnd.el |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/x-dnd.el Thu Jun 14 00:07:15 2007 +0000 +++ b/lisp/x-dnd.el Thu Jun 14 00:09:10 2007 +0000 @@ -171,7 +171,7 @@ WINDOW is the window the mouse is over. ACTION is the suggested action from the source. If nothing has changed, return the last action and type we got from `x-dnd-test-function'." - (let ((buffer (when (and (windowp window) (window-live-p window)) + (let ((buffer (when (window-live-p window) (window-buffer window))) (current-state (x-dnd-get-state-for-frame window))) (when (or (not (equal buffer (aref current-state 0))) @@ -206,9 +206,7 @@ (when types (aset current-state 2 types)) (when extra-data (aset current-state 6 extra-data)) (aset current-state 1 window) - (aset current-state 0 (if (and (windowp window) - (window-live-p window)) - (window-buffer window) nil)) + (aset current-state 0 (and (window-live-p window) (window-buffer window))) (setcdr (x-dnd-get-state-cons-for-frame window) current-state))) @@ -319,7 +317,7 @@ (action (aref state 5)) (w (posn-window (event-start event)))) (when handler - (if (and (windowp w) (window-live-p w) + (if (and (window-live-p w) (not (window-minibuffer-p w)) (not (window-dedicated-p w))) ;; If dropping in an ordinary window which we could use,