diff options
| author | Glenn Morris | 2013-09-17 21:30:33 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 21:30:33 -0700 |
| commit | e843de776724c563b32aded5405fcada1a75d465 (patch) | |
| tree | 20b429e067628c37e5c6e21421f1e703e265b9b7 /lisp | |
| parent | 047a1a4c20c6af269f16f8a1cfc9d7366764770b (diff) | |
| download | emacs-e843de776724c563b32aded5405fcada1a75d465.tar.gz emacs-e843de776724c563b32aded5405fcada1a75d465.zip | |
* term/x-win.el (x-select-enable-clipboard): Declare.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14ba74410b7..c88da2e5d69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | (x-last-selected-text-primary, x-last-selected-text-clipboard): | 27 | (x-last-selected-text-primary, x-last-selected-text-clipboard): |
| 28 | Declare. | 28 | Declare. |
| 29 | 29 | ||
| 30 | * term/x-win.el (x-select-enable-clipboard): Declare. | ||
| 31 | |||
| 30 | * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. | 32 | * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. |
| 31 | (fit-frame-to-buffer): Explicit error if --without-x. | 33 | (fit-frame-to-buffer): Explicit error if --without-x. |
| 32 | (mouse-autoselect-window-select): Silence compiler. | 34 | (mouse-autoselect-window-select): Silence compiler. |
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 28fd3d7090c..3c7373b6d65 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -1217,6 +1217,8 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)." | |||
| 1217 | (remove-text-properties 0 (length text) '(foreign-selection nil) text)) | 1217 | (remove-text-properties 0 (length text) '(foreign-selection nil) text)) |
| 1218 | text)) | 1218 | text)) |
| 1219 | 1219 | ||
| 1220 | (defvar x-select-enable-clipboard) ; common-win | ||
| 1221 | |||
| 1220 | ;; Return the value of the current X selection. | 1222 | ;; Return the value of the current X selection. |
| 1221 | ;; Consult the selection. Treat empty strings as if they were unset. | 1223 | ;; Consult the selection. Treat empty strings as if they were unset. |
| 1222 | ;; If this function is called twice and finds the same text, | 1224 | ;; If this function is called twice and finds the same text, |