summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-09-17 21:34:56 -0700
committerGlenn Morris <rgm@gnu.org>2013-09-17 21:34:56 -0700
commit38702b5be4c489fa9d42cc4998a4a30e975b1bbd (patch)
treeee21afaaf51814d9a4b240397696fd7a77e35a13 /lisp
parent5fa89513d571eccb834632574cbfeff41fd1936f (diff)
downloademacs-38702b5be4c489fa9d42cc4998a4a30e975b1bbd.tar.gz
* w32-common-fns.el (x-server-version, x-select-enable-clipboard): Declare.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/w32-common-fns.el3
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b27fbea0d14..1bb24cb549f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -31,6 +31,9 @@
* term/w32-win.el (create-default-fontset): Declare.
+ * w32-common-fns.el (x-server-version, x-select-enable-clipboard):
+ Declare.
+
* window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
(fit-frame-to-buffer): Explicit error if --without-x.
(mouse-autoselect-window-select): Silence compiler.
diff --git a/lisp/w32-common-fns.el b/lisp/w32-common-fns.el
index 5d8d7171860..6b1c3ac976e 100644
--- a/lisp/w32-common-fns.el
+++ b/lisp/w32-common-fns.el
@@ -23,6 +23,8 @@
;;; and Cygwin Emacs compiled to use the native Windows widget
;;; library.
+(declare-function x-server-version "w32fns.c" (&optional terminal))
+
(defun w32-version ()
"Return the MS-Windows version numbers.
The value is a list of three integers: the major and minor version
@@ -100,6 +102,7 @@ in `selection-converter-alist', which see."
;; current selection against it, and avoid passing back our own text
;; from x-selection-value.
(defvar x-last-selected-text nil)
+(defvar x-select-enable-clipboard)
(defun x-get-selection-value ()
"Return the value of the current selection.