summaryrefslogtreecommitdiff
path: root/lisp/x-dnd.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-02-24 22:41:40 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-02-24 22:41:40 -0800
commita89654f8f34114db543cb91363e8fded6d73e986 (patch)
tree5ac508597ef2aa460308b4b26c244779e48cdb40 /lisp/x-dnd.el
parent6e6c82a4e687708d5a7a3887f92db45bd74da276 (diff)
parent67b0de11479247cb8bd8491e10e0b464046f18be (diff)
downloademacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/x-dnd.el')
-rw-r--r--lisp/x-dnd.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 65dcf845064..539b95a18fd 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -431,7 +431,7 @@ otherwise return the frame coordinates."
(declare-function x-send-client-message "xselect.c"
(display dest from message-type format values))
(declare-function x-get-selection-internal "xselect.c"
- (selection-symbol target-type &optional time-stamp))
+ (selection-symbol target-type &optional time-stamp terminal))
(defun x-dnd-version-from-flags (flags)
"Return the version byte from the 32 bit FLAGS in an XDndEnter message"