aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-11 15:06:46 -0800
committerGlenn Morris2012-02-11 15:06:46 -0800
commitcfecdf09a009b80395fae21e4ec4beeb7727db53 (patch)
tree16b25a220adbd9eb2f444c32acf5627588d0d1ca
parent6d216d7f115365eb0e2e423e0b3a55083b4e663d (diff)
downloademacs-cfecdf09a009b80395fae21e4ec4beeb7727db53.tar.gz
emacs-cfecdf09a009b80395fae21e4ec4beeb7727db53.zip
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.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/select.el6
-rw-r--r--lisp/x-dnd.el2
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 @@
12012-02-11 Glenn Morris <rgm@gnu.org> 12012-02-11 Glenn Morris <rgm@gnu.org>
2 2
3 * select.el (x-get-selection-internal, x-own-selection-internal)
4 (x-disown-selection-internal):
5 * x-dnd.el (x-get-selection-internal): Update declarations.
6
3 * vc/log-view.el (vc-diff-internal): Remove unneeded declaration. 7 * vc/log-view.el (vc-diff-internal): Remove unneeded declaration.
4 8
5 * window.el (window-sides-slots): 9 * 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.
72After the communication, this variable is set to nil.") 72After the communication, this variable is set to nil.")
73 73
74(declare-function x-get-selection-internal "xselect.c" 74(declare-function x-get-selection-internal "xselect.c"
75 (selection-symbol target-type &optional time-stamp)) 75 (selection-symbol target-type &optional time-stamp terminal))
76 76
77;; Only declared obsolete in 23.3. 77;; Only declared obsolete in 23.3.
78(define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34") 78(define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34")
@@ -118,9 +118,9 @@ in `selection-converter-alist', which see."
118 (x-get-selection-internal 'CLIPBOARD 'STRING)) 118 (x-get-selection-internal 'CLIPBOARD 'STRING))
119 119
120(declare-function x-own-selection-internal "xselect.c" 120(declare-function x-own-selection-internal "xselect.c"
121 (selection-name selection-value)) 121 (selection-name selection-value &optional frame))
122(declare-function x-disown-selection-internal "xselect.c" 122(declare-function x-disown-selection-internal "xselect.c"
123 (selection &optional time)) 123 (selection &optional time terminal))
124 124
125(defun x-set-selection (type data) 125(defun x-set-selection (type data)
126 "Make an X selection of type TYPE and value DATA. 126 "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."
431(declare-function x-send-client-message "xselect.c" 431(declare-function x-send-client-message "xselect.c"
432 (display dest from message-type format values)) 432 (display dest from message-type format values))
433(declare-function x-get-selection-internal "xselect.c" 433(declare-function x-get-selection-internal "xselect.c"
434 (selection-symbol target-type &optional time-stamp)) 434 (selection-symbol target-type &optional time-stamp terminal))
435 435
436(defun x-dnd-version-from-flags (flags) 436(defun x-dnd-version-from-flags (flags)
437 "Return the version byte from the 32 bit FLAGS in an XDndEnter message" 437 "Return the version byte from the 32 bit FLAGS in an XDndEnter message"