From cfecdf09a009b80395fae21e4ec4beeb7727db53 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 11 Feb 2012 15:06:46 -0800 Subject: [PATCH] Update some function declarations * lisp/select.el (x-get-selection-internal, x-own-selection-internal) (x-disown-selection-internal): * lisp/x-dnd.el (x-get-selection-internal): Update declarations. --- lisp/ChangeLog | 4 ++++ lisp/select.el | 6 +++--- lisp/x-dnd.el | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c17384d9d23..86de66e1c24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2012-02-11 Glenn Morris + * select.el (x-get-selection-internal, x-own-selection-internal) + (x-disown-selection-internal): + * x-dnd.el (x-get-selection-internal): Update declarations. + * vc/log-view.el (vc-diff-internal): Remove unneeded declaration. * window.el (window-sides-slots): diff --git a/lisp/select.el b/lisp/select.el index 8d9d7cc386b..0260eba4682 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -72,7 +72,7 @@ variable is set, it is used for the next communication only. After the communication, this variable is set to nil.") (declare-function x-get-selection-internal "xselect.c" - (selection-symbol target-type &optional time-stamp)) + (selection-symbol target-type &optional time-stamp terminal)) ;; Only declared obsolete in 23.3. (define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34") @@ -118,9 +118,9 @@ in `selection-converter-alist', which see." (x-get-selection-internal 'CLIPBOARD 'STRING)) (declare-function x-own-selection-internal "xselect.c" - (selection-name selection-value)) + (selection-name selection-value &optional frame)) (declare-function x-disown-selection-internal "xselect.c" - (selection &optional time)) + (selection &optional time terminal)) (defun x-set-selection (type data) "Make an X selection of type TYPE and value DATA. 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"