aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2004-02-19 02:10:05 +0000
committerKaroly Lorentey2004-02-19 02:10:05 +0000
commit029f9b85acbb82934121c602d64a4a058982a600 (patch)
tree083184e770f3a313ad6fb719e0b6546a6e6fcbe3
parent71e9b5ebf899d9a96ef7d627d51459c7ecde431e (diff)
downloademacs-029f9b85acbb82934121c602d64a4a058982a600.tar.gz
emacs-029f9b85acbb82934121c602d64a4a058982a600.zip
Don't try to init X drag and drop on a termcap frame.
lisp/x-dnd.el (x-dnd-init-frame): Don't do anything if the frame is not an X frame. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-80
-rw-r--r--lisp/x-dnd.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 91ca053afa2..32645bd6012 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -142,8 +142,9 @@ any protocol specific data.")
142 142
143(defun x-dnd-init-frame (&optional frame) 143(defun x-dnd-init-frame (&optional frame)
144 "Setup drag and drop for FRAME (i.e. create appropriate properties)." 144 "Setup drag and drop for FRAME (i.e. create appropriate properties)."
145 (x-dnd-init-xdnd-for-frame frame) 145 (when (eq 'x (window-system frame))
146 (x-dnd-init-motif-for-frame frame)) 146 (x-dnd-init-xdnd-for-frame frame)
147 (x-dnd-init-motif-for-frame frame)))
147 148
148(defun x-dnd-get-state-cons-for-frame (frame-or-window) 149(defun x-dnd-get-state-cons-for-frame (frame-or-window)
149 "Return the entry in x-dnd-current-state for a frame or window." 150 "Return the entry in x-dnd-current-state for a frame or window."