From 1dd3c2d9b2466eb6dc379da6a67074dbd4c13fa5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 28 May 2011 20:45:00 -0400 Subject: 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. --- lisp/select.el | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lisp/select.el') 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 -- cgit v1.2.3