From 693f880f9123b5c887c9fbb0d5b3e6809b195e60 Mon Sep 17 00:00:00 2001 From: hmurata Date: Fri, 12 Nov 2004 15:36:49 +0000 Subject: [PATCH] (wl-summary-buffer-detach): New function. (wl-summary-buffer-set-folder): Call it. (wl-summary-mode): Add `wl-summary-buffer-detach' to change-major-mode-hook and kill-buffer-hook. (wl-summary-exit): Does not call `elmo-folder-remove-handler'. (wl-summary-switch-to-clone-buffer): Ditto. (wl-summary-goto-folder-subr): Ditto. --- wl/ChangeLog | 10 ++++++++++ wl/wl-summary.el | 22 ++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 0cfe909..4139bc6 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,13 @@ +2004-11-12 Hiroya Murata + + * wl-summary.el (wl-summary-buffer-detach): New function. + (wl-summary-buffer-set-folder): Call it. + (wl-summary-mode): Add `wl-summary-buffer-detach' to + change-major-mode-hook and kill-buffer-hook. + (wl-summary-exit): Does not call `elmo-folder-remove-handler'. + (wl-summary-switch-to-clone-buffer): Ditto. + (wl-summary-goto-folder-subr): Ditto. + 2004-11-11 TAKAHASHI Kaoru * wl-summary.el (wl-summary-mode): Set `show-trailing-whitespace' diff --git a/wl/wl-summary.el b/wl/wl-summary.el index efb6cb2..352af13 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -650,6 +650,13 @@ See also variable `wl-use-petname'." (wl-summary-jump-to-msg number)) (wl-summary-update-persistent-mark number)))))) +(defun wl-summary-buffer-detach () + (when (and (eq major-mode 'wl-summary-mode) + wl-summary-buffer-elmo-folder + wl-summary-buffer-event-handler) + (elmo-folder-remove-handler wl-summary-buffer-elmo-folder + wl-summary-buffer-event-handler))) + (defun wl-status-update () (interactive) (wl-address-init)) @@ -797,6 +804,7 @@ you." wl-summary-buffer-persistent-mark-column persistent))) (defun wl-summary-buffer-set-folder (folder) + (wl-summary-buffer-detach) (if (stringp folder) (setq folder (wl-folder-get-elmo-folder folder))) (setq wl-summary-buffer-elmo-folder folder) @@ -896,6 +904,9 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (make-local-hook hook) (dolist (function wl-summary-buffer-window-scroll-functions) (add-hook hook function nil t)))) + (make-local-hook 'change-major-mode-hook) + (add-hook 'change-major-mode-hook #'wl-summary-buffer-detach nil t) + (add-hook 'kill-buffer-hook #'wl-summary-buffer-detach) ;; This hook may contain the function `wl-setup-summary' for reasons ;; of system internal to accord facilities for the Emacs variants. (run-hooks 'wl-summary-mode-hook)) @@ -1211,10 +1222,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (progn (wl-summary-save-view) (if (or force-exit (not sticky)) - (progn - (elmo-folder-close wl-summary-buffer-elmo-folder) - (elmo-folder-remove-handler wl-summary-buffer-elmo-folder - wl-summary-buffer-event-handler)) + (elmo-folder-close wl-summary-buffer-elmo-folder) (elmo-folder-commit wl-summary-buffer-elmo-folder) (elmo-folder-check wl-summary-buffer-elmo-folder)) (if wl-use-scoring (wl-score-save))) @@ -2246,9 +2254,6 @@ If ARG, without confirm." (symbol-value (car copy-variables)))) (setq copy-variables (cdr copy-variables))) (switch-to-buffer buf) - (with-current-buffer cur-buf - (elmo-folder-remove-handler wl-summary-buffer-elmo-folder - wl-summary-buffer-event-handler)) (kill-buffer cur-buf) (wl-summary-count-unread) (wl-summary-update-modeline) @@ -2338,9 +2343,6 @@ If ARG, without confirm." (if other-window (delete-other-windows)) (set-buffer buf) - (when wl-summary-buffer-event-handler - (elmo-folder-remove-handler wl-summary-buffer-elmo-folder - wl-summary-buffer-event-handler)) (unless (eq major-mode 'wl-summary-mode) (wl-summary-mode)) (wl-summary-buffer-set-folder folder) -- 1.7.10.4