diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-05-28 20:45:00 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-05-28 20:45:00 -0400 |
| commit | 1dd3c2d9b2466eb6dc379da6a67074dbd4c13fa5 (patch) | |
| tree | a812814e376414db37827f4298e375ff868ecdaf /lisp/select.el | |
| parent | 8e6ca83dfede41bbc8d060a4aaa72f2a414f59ae (diff) | |
| download | emacs-1dd3c2d9b2466eb6dc379da6a67074dbd4c13fa5.tar.gz | |
Move clipboard-manager functionality out of hooks.
* lisp/select.el: Don't perform clipboard-manager saving in hooks;
leave the hooks empty.
* src/emacs.c (Fkill_emacs): Call x_clipboard_manager_save_all.
* src/frame.c (delete_frame): Call x_clipboard_manager_save_frame.
* src/xselect.c (x_clipboard_manager_save_frame)
(x_clipboard_manager_save_all): New functions.
(Fx_clipboard_manager_save): Lisp function deleted.
* src/xterm.h: Update prototype.
Diffstat (limited to 'lisp/select.el')
| -rw-r--r-- | lisp/select.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/select.el b/lisp/select.el index 5abbf8f795d..10c8f0b1efd 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -395,10 +395,6 @@ This function returns the string \"emacs\"." (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 |