procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce x-selection-timeout to 5s, and add a message for clipboard manager saving.

Browse source 
* 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
This commit is contained in:
Chong Yidong 2012-02-25 11:01:11 +08:00
parent 833e48d3d8
commit 3c9dfce6da
5 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

2
lisp/dired.el
View file

@ -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" "\

11
lisp/term/x-win.el
View file

@ -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)

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-25 Chong Yidong <cyd@gnu.org>
* xselect.c (Fx_selection_exists_p): Doc fix.
(x_clipboard_manager_save_all): Print an informative message
before saving to clipboard manager.
2012-02-24 Chong Yidong <cyd@gnu.org>
* keyboard.c (process_special_events): Handle all X selection

16
src/xselect.c
View file

@ -2142,9 +2142,9 @@ DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
0, 2, 0,
doc: /* Whether there is an owner for the given X selection.
SELECTION should be the name of the selection in question, typically
one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. (X expects
these literal upper-case names.) The symbol nil is the same as
`PRIMARY', and t is the same as `SECONDARY'.
one of the symbols `PRIMARY', `SECONDARY', `CLIPBOARD', or
`CLIPBOARD_MANAGER' (X expects these literal upper-case names.) The
symbol nil is the same as `PRIMARY', and t is the same as `SECONDARY'.
TERMINAL should be a terminal object or a frame specifying the X
server to query. If omitted or nil, that stands for the selected
@ -2273,8 +2273,14 @@ x_clipboard_manager_save_all (void)
local_frame = XCAR (XCDR (XCDR (XCDR (local_selection))));
if (FRAME_LIVE_P (XFRAME (local_frame)))
internal_condition_case_1 (x_clipboard_manager_save, local_frame,
Qt, x_clipboard_manager_error_2);
{
Lisp_Object args[1];
args[0] = build_string ("Saving clipboard to X clipboard manager...");
Fmessage (1, args);
internal_condition_case_1 (x_clipboard_manager_save, local_frame,
Qt, x_clipboard_manager_error_2);
}
}
}