aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-06-14 00:13:11 +0000
committerJuanma Barranquero2007-06-14 00:13:11 +0000
commit2dde79d898037f3d48f73ce10bd17d827b2a9961 (patch)
treef25bcebe9ed8ac348c562d81a8c4a951211a3365
parent36754e8e790f70fd078b88a2e3d3a8ab0e2eceea (diff)
downloademacs-2dde79d898037f3d48f73ce10bd17d827b2a9961.tar.gz
emacs-2dde79d898037f3d48f73ce10bd17d827b2a9961.zip
(mac-dnd-drop-data): Remove redundant check.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/term/mac-win.el2
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee072eca720..cfe2b2ee82d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12007-06-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * follow.el (follow-all-followers, follow-generic-filter):
4 * pcomplete.el (pcomplete-restore-windows):
5 * x-dnd.el (x-dnd-maybe-call-test-function, x-dnd-save-state)
6 (x-dnd-drop-data):
7 * emacs-lisp/edebug.el (edebug-pop-to-buffer, edebug-display):
8 * progmodes/python.el (python-complete-symbol):
9 * term/mac-win.el (mac-dnd-drop-data): Remove redundant check.
10
12007-06-13 Ryan Yeske <rcyeske@gmail.com> 112007-06-13 Ryan Yeske <rcyeske@gmail.com>
2 12
3 * rcirc.el (rcirc-format-response-string): Use rcirc-nick-syntax 13 * rcirc.el (rcirc-format-response-string): Use rcirc-nick-syntax
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 6370b40d367..0c9abe2f837 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -2252,7 +2252,7 @@ See also `mac-dnd-known-types'."
2252 (handler (cdr type-info)) 2252 (handler (cdr type-info))
2253 (w (posn-window (event-start event)))) 2253 (w (posn-window (event-start event))))
2254 (when handler 2254 (when handler
2255 (if (and (windowp w) (window-live-p w) 2255 (if (and (window-live-p w)
2256 (not (window-minibuffer-p w)) 2256 (not (window-minibuffer-p w))
2257 (not (window-dedicated-p w))) 2257 (not (window-dedicated-p w)))
2258 ;; If dropping in an ordinary window which we could use, 2258 ;; If dropping in an ordinary window which we could use,