diff options
| author | Glenn Morris | 2013-09-17 21:34:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 21:34:56 -0700 |
| commit | 38702b5be4c489fa9d42cc4998a4a30e975b1bbd (patch) | |
| tree | ee21afaaf51814d9a4b240397696fd7a77e35a13 | |
| parent | 5fa89513d571eccb834632574cbfeff41fd1936f (diff) | |
| download | emacs-38702b5be4c489fa9d42cc4998a4a30e975b1bbd.tar.gz emacs-38702b5be4c489fa9d42cc4998a4a30e975b1bbd.zip | |
* w32-common-fns.el (x-server-version, x-select-enable-clipboard): Declare.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/w32-common-fns.el | 3 |
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 @@ | |||
| 31 | 31 | ||
| 32 | * term/w32-win.el (create-default-fontset): Declare. | 32 | * term/w32-win.el (create-default-fontset): Declare. |
| 33 | 33 | ||
| 34 | * w32-common-fns.el (x-server-version, x-select-enable-clipboard): | ||
| 35 | Declare. | ||
| 36 | |||
| 34 | * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. | 37 | * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. |
| 35 | (fit-frame-to-buffer): Explicit error if --without-x. | 38 | (fit-frame-to-buffer): Explicit error if --without-x. |
| 36 | (mouse-autoselect-window-select): Silence compiler. | 39 | (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 @@ | |||
| 23 | ;;; and Cygwin Emacs compiled to use the native Windows widget | 23 | ;;; and Cygwin Emacs compiled to use the native Windows widget |
| 24 | ;;; library. | 24 | ;;; library. |
| 25 | 25 | ||
| 26 | (declare-function x-server-version "w32fns.c" (&optional terminal)) | ||
| 27 | |||
| 26 | (defun w32-version () | 28 | (defun w32-version () |
| 27 | "Return the MS-Windows version numbers. | 29 | "Return the MS-Windows version numbers. |
| 28 | The value is a list of three integers: the major and minor version | 30 | The value is a list of three integers: the major and minor version |
| @@ -100,6 +102,7 @@ in `selection-converter-alist', which see." | |||
| 100 | ;; current selection against it, and avoid passing back our own text | 102 | ;; current selection against it, and avoid passing back our own text |
| 101 | ;; from x-selection-value. | 103 | ;; from x-selection-value. |
| 102 | (defvar x-last-selected-text nil) | 104 | (defvar x-last-selected-text nil) |
| 105 | (defvar x-select-enable-clipboard) | ||
| 103 | 106 | ||
| 104 | (defun x-get-selection-value () | 107 | (defun x-get-selection-value () |
| 105 | "Return the value of the current selection. | 108 | "Return the value of the current selection. |