diff options
| author | Chong Yidong | 2012-02-25 11:01:11 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-02-25 11:01:11 +0800 |
| commit | 3c9dfce6da30c2b4483b0e95d33af3dd0bd9b26f (patch) | |
| tree | f8db60a58e03ea6a58869935e5c55b12f4848abf /lisp/term | |
| parent | 833e48d3d84885cc62f6c3daf9ad26f53a7f5cf1 (diff) | |
| download | emacs-3c9dfce6da30c2b4483b0e95d33af3dd0bd9b26f.tar.gz emacs-3c9dfce6da30c2b4483b0e95d33af3dd0bd9b26f.zip | |
Reduce x-selection-timeout to 5s, and add a message for clipboard manager saving.
* lisp/term/x-win.el (x-initialize-window-system): Reduce default for
x-selection-timeout to 5 seconds.
* src/xselect.c (Fx_selection_exists_p): Doc fix.
(x_clipboard_manager_save_all): Print an informative message
before saving to clipboard manager.
Fixes: debbugs:8869
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/x-win.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 394e4d4fe48..21d49267b21 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -1408,11 +1408,12 @@ Request data types in the order specified by `x-select-request-type'." | |||
| 1408 | (cons '(reverse . t) default-frame-alist))))) | 1408 | (cons '(reverse . t) default-frame-alist))))) |
| 1409 | 1409 | ||
| 1410 | ;; Set x-selection-timeout, measured in milliseconds. | 1410 | ;; Set x-selection-timeout, measured in milliseconds. |
| 1411 | (let ((res-selection-timeout | 1411 | (let ((res-selection-timeout (x-get-resource "selectionTimeout" |
| 1412 | (x-get-resource "selectionTimeout" "SelectionTimeout"))) | 1412 | "SelectionTimeout"))) |
| 1413 | (setq x-selection-timeout 20000) | 1413 | (setq x-selection-timeout |
| 1414 | (if res-selection-timeout | 1414 | (if res-selection-timeout |
| 1415 | (setq x-selection-timeout (string-to-number res-selection-timeout)))) | 1415 | (string-to-number res-selection-timeout) |
| 1416 | 5000))) | ||
| 1416 | 1417 | ||
| 1417 | ;; Don't let Emacs suspend under X. | 1418 | ;; Don't let Emacs suspend under X. |
| 1418 | (add-hook 'suspend-hook 'x-win-suspend-error) | 1419 | (add-hook 'suspend-hook 'x-win-suspend-error) |