From: Glenn Morris <rgm@gnu.org>
Date: Sat, 11 Feb 2012 23:06:46 +0000 (-0800)
Subject: Update some function declarations
X-Git-Tag: emacs-pretest-24.0.94~170
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/cfecdf09a009b80395fae21e4ec4beeb7727db53

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c17384d9d2..86de66e1c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-11  Glenn Morris  <rgm@gnu.org>
 
+	* 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 8d9d7cc386..0260eba468 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 65dcf84506..539b95a18f 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"