2 files changed, 22 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2067128fbe8..ef35353bb0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * select.el: Support clipboard managers with built-in function
+        x-clipboard-manager-save, via delete-frame-functions and
+        kill-emacs-hook.
+        (xselect-convert-to-targets): Add MULTIPLE target to list.
+        (xselect-convert-to-save-targets): New function.
+
 2011-05-27  Kenichi Handa  <handa@m17n.org>
 
         * mail/sendmail.el (mail-encode-header): Avoid double encoding by
diff --git a/lisp/select.el b/lisp/select.el
index 1f5191e86c1..5abbf8f795d 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -289,7 +289,9 @@ two markers or an overlay.  Otherwise, it is nil."
 
 (defun xselect-convert-to-targets (_selection _type _value)
   ;; return a vector of atoms, but remove duplicates first.
-  (let* ((all (cons 'TIMESTAMP (mapcar 'car selection-converter-alist)))
+  (let* ((all (cons 'TIMESTAMP
+                    (cons 'MULTIPLE
+                          (mapcar 'car selection-converter-alist))))
          (rest all))
     (while rest
       (cond ((memq (car rest) (cdr rest))
@@ -365,6 +367,12 @@ This function returns the string \"emacs\"."
 (defun xselect-convert-to-identity (_selection _type value) ; used internally
   (vector value))
 
+;; Null target that tells clipboard managers we support SAVE_TARGETS
+;; (see freedesktop.org Clipboard Manager spec).
+(defun xselect-convert-to-save-targets (selection _type _value)
+  (when (eq selection 'CLIPBOARD)
+    'NULL))
+
 (setq selection-converter-alist
       '((TEXT . xselect-convert-to-string)
         (COMPOUND_TEXT . xselect-convert-to-string)
@@ -384,8 +392,13 @@ This function returns the string \"emacs\"."
         (NAME . xselect-convert-to-name)
         (ATOM . xselect-convert-to-atom)
         (INTEGER . xselect-convert-to-integer)
+        (SAVE_TARGETS . xselect-convert-to-save-targets)
         (_EMACS_INTERNAL . xselect-convert-to-identity)))
 
+(when (fboundp 'x-clipboard-manager-save)
+  (add-hook 'delete-frame-functions 'x-clipboard-manager-save)
+  (add-hook 'kill-emacs-hook 'x-clipboard-manager-save))
+
 (provide 'select)
 
 ;;; select.el ends here