diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-02-25 11:01:11 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-02-25 11:01:11 +0800 |
| commit | 3c9dfce6da30c2b4483b0e95d33af3dd0bd9b26f (patch) | |
| tree | f8db60a58e03ea6a58869935e5c55b12f4848abf /lisp | |
| parent | 833e48d3d84885cc62f6c3daf9ad26f53a7f5cf1 (diff) | |
| download | emacs-3c9dfce6da30c2b4483b0e95d33af3dd0bd9b26f.tar.gz | |
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')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired.el | 2 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1af7193b4f3..3dbed71d4b5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-25 Chong Yidong <cyd@gnu.org> + + * term/x-win.el (x-initialize-window-system): Reduce default for + x-selection-timeout to 5 seconds (Bug#8869). + 2012-02-24 Thierry Volpiatto <thierry.volpiatto@gmail.com> * files.el (file-subdir-of-p): Fix typo. diff --git a/lisp/dired.el b/lisp/dired.el index c087f65eaeb..57bf3c88322 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3732,7 +3732,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "e77c506a0dd793230c5856a67e408fc6") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "cab9b84177ac3555c24cf8e870a64095") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ 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'." (cons '(reverse . t) default-frame-alist))))) ;; Set x-selection-timeout, measured in milliseconds. - (let ((res-selection-timeout - (x-get-resource "selectionTimeout" "SelectionTimeout"))) - (setq x-selection-timeout 20000) - (if res-selection-timeout - (setq x-selection-timeout (string-to-number res-selection-timeout)))) + (let ((res-selection-timeout (x-get-resource "selectionTimeout" + "SelectionTimeout"))) + (setq x-selection-timeout + (if res-selection-timeout + (string-to-number res-selection-timeout) + 5000))) ;; Don't let Emacs suspend under X. (add-hook 'suspend-hook 'x-win-suspend-error) |