[Emacs-diffs] /srv/bzr/emacs/trunk r107416: Reduce x-selection-timeout to 5s, and add a message for clipboard manager saving.

[Chong Yidong]

------------------------------------------------------------
revno: 107416
fixes bug(s): http://debbugs.gnu.org/8869
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-25 11:01:11 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/dired.el
  lisp/term/x-win.el
  src/ChangeLog
  src/xselect.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-24 22:14:05 +0000
+++ b/lisp/ChangeLog    2012-02-25 03:01:11 +0000
@@ -1,3 +1,8 @@
+2012-02-25  Chong Yidong  <address@hidden>
+
+       * term/x-win.el (x-initialize-window-system): Reduce default for
+       x-selection-timeout to 5 seconds (Bug#8869).
+
 2012-02-24  Thierry Volpiatto  <address@hidden>
 
        * files.el (file-subdir-of-p): Fix typo.

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2012-02-22 06:10:03 +0000
+++ b/lisp/dired.el     2012-02-25 03:01:11 +0000
@@ -3732,7 +3732,7 @@
 ;;;;;;  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" "\

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2012-01-19 07:21:25 +0000
+++ b/lisp/term/x-win.el        2012-02-25 03:01:11 +0000
@@ -1408,11 +1408,12 @@
                (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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-24 19:39:07 +0000
+++ b/src/ChangeLog     2012-02-25 03:01:11 +0000
@@ -1,3 +1,9 @@
+2012-02-25  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keyboard.c (process_special_events): Handle all X selection

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2012-02-12 03:13:13 +0000
+++ b/src/xselect.c     2012-02-25 03:01:11 +0000
@@ -2142,9 +2142,9 @@
        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 @@
 
       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);
+       }
     }
 }