aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-17 21:28:57 -0700
committerGlenn Morris2013-09-17 21:28:57 -0700
commit047a1a4c20c6af269f16f8a1cfc9d7366764770b (patch)
tree9faddb2da07dddb79b34feed3eca84e1a3e6d0fc
parent9019d095dfd04fffc000c2f00515c661f1a083f3 (diff)
downloademacs-047a1a4c20c6af269f16f8a1cfc9d7366764770b.tar.gz
emacs-047a1a4c20c6af269f16f8a1cfc9d7366764770b.zip
* term/common-win.el (x-select-enable-primary, x-last-selected-text-primary)
(x-last-selected-text-clipboard): Declare.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/common-win.el4
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b18e252aff..14ba74410b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,6 +23,10 @@
23 23
24 * subr.el (x-popup-dialog): Declare. 24 * subr.el (x-popup-dialog): Declare.
25 25
26 * term/common-win.el (x-select-enable-primary)
27 (x-last-selected-text-primary, x-last-selected-text-clipboard):
28 Declare.
29
26 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. 30 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
27 (fit-frame-to-buffer): Explicit error if --without-x. 31 (fit-frame-to-buffer): Explicit error if --without-x.
28 (mouse-autoselect-window-select): Silence compiler. 32 (mouse-autoselect-window-select): Silence compiler.
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index aadab96f75a..158db4d09c8 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -44,6 +44,10 @@ This variable is not used by the Nextstep port."
44(defvar ns-last-selected-text) ; ns-win.el 44(defvar ns-last-selected-text) ; ns-win.el
45(declare-function ns-set-pasteboard "ns-win" (string)) 45(declare-function ns-set-pasteboard "ns-win" (string))
46 46
47(defvar x-select-enable-primary) ; x-win.el
48(defvar x-last-selected-text-primary)
49(defvar x-last-selected-text-clipboard)
50
47(defun x-select-text (text) 51(defun x-select-text (text)
48 "Select TEXT, a string, according to the window system. 52 "Select TEXT, a string, according to the window system.
49 53