From 0a77c70fdb3ca771816f4540b108e5a3d6da825e Mon Sep 17 00:00:00 2001 From: yoichi Date: Tue, 5 Mar 2002 04:26:27 +0000 Subject: [PATCH] * wl-folder.el (toplevel): Bind [(shift return)] to wl-folder-jump-to-current-entity-with-arg. (wl-folder-jump-to-current-entity-with-arg): Just call with arg `wl-folder-jump-to-current-entity'. * wl-summary.el (toplevel): Bind `wl-summary-goto-folder-sticky' to "G". (wl-summary-goto-folder-sticky): Just call with the sticky arg `wl-summary-goto-folder'. (wl-summary-goto-folder-subr): Add 7th argument force-exit. Unless force-exit, do not clean temp. marks for sticky summary. (wl-summary-goto-folder): Now the prefix argument means force-exit. --- wl/ChangeLog | 14 ++++++++++++++ wl/wl-folder.el | 5 +++++ wl/wl-summary.el | 13 ++++++++++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 693f774..8f76bd6 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,17 @@ +2002-03-05 Yoichi NAKAYAMA + + * wl-folder.el (toplevel): Bind [(shift return)] to + wl-folder-jump-to-current-entity-with-arg. + (wl-folder-jump-to-current-entity-with-arg): Just call with arg + `wl-folder-jump-to-current-entity'. + * wl-summary.el (toplevel): Bind `wl-summary-goto-folder-sticky' + to "G". + (wl-summary-goto-folder-sticky): Just call with the sticky arg + `wl-summary-goto-folder'. + (wl-summary-goto-folder-subr): Add 7th argument force-exit. + Unless force-exit, do not clean temp. marks for sticky summary. + (wl-summary-goto-folder): Now the prefix argument means force-exit. + 2002-03-05 Yuuichi Teranishi * wl-summary.el (wl-summary-mark-as-important): Refetch if cache is diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 9c40670..90549cd 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -142,6 +142,7 @@ ; (define-key wl-folder-mode-map "\M- " 'wl-folder-open-close) (define-key wl-folder-mode-map "/" 'wl-folder-open-close) (define-key wl-folder-mode-map "\C-m" 'wl-folder-jump-to-current-entity) + (define-key wl-folder-mode-map [(shift return)] 'wl-folder-jump-to-current-entity-with-arg) (define-key wl-folder-mode-map "\M-\C-m" 'wl-folder-update-recursive-current-entity) (define-key wl-folder-mode-map "rc" 'wl-folder-mark-as-read-all-region) (define-key wl-folder-mode-map "c" 'wl-folder-mark-as-read-all-current-entity) @@ -587,6 +588,10 @@ Optional argument ARG is repeart count." (t wl-force-fetch-folders))) +(defun wl-folder-jump-to-current-entity-with-arg () + (interactive) + (wl-folder-jump-to-current-entity t)) + (defun wl-folder-jump-to-current-entity (&optional arg) "Enter the current folder. If optional ARG exists, update folder list." (interactive "P") diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 6211213..5f93054 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -387,6 +387,7 @@ (define-key wl-summary-mode-map "-" 'wl-summary-prev-line-content) (define-key wl-summary-mode-map "\e\r" 'wl-summary-prev-line-content) (define-key wl-summary-mode-map "g" 'wl-summary-goto-folder) + (define-key wl-summary-mode-map "G" 'wl-summary-goto-folder-sticky) (define-key wl-summary-mode-map "c" 'wl-summary-mark-as-read-all) ; (define-key wl-summary-mode-map "D" 'wl-summary-drop-unsync) @@ -2365,7 +2366,11 @@ If ARG, without confirm." (defun wl-summary-goto-folder (&optional arg) (interactive "P") - (wl-summary-goto-folder-subr nil nil nil arg t)) + (wl-summary-goto-folder-subr nil nil nil nil t nil arg)) + +(defun wl-summary-goto-folder-sticky () + (interactive) + (wl-summary-goto-folder-subr nil nil nil t t)) (defun wl-summary-goto-last-visited-folder () (interactive) @@ -2499,7 +2504,8 @@ If ARG, without confirm." folder))))) (defun wl-summary-goto-folder-subr (&optional name scan-type other-window - sticky interactive scoring) + sticky interactive scoring + force-exit) "Display target folder on summary." (interactive) (let* ((keep-cursor (memq this-command @@ -2517,7 +2523,8 @@ If ARG, without confirm." (eq major-mode 'wl-summary-mode)) ; called in summary. (setq wl-summary-last-visited-folder (wl-summary-buffer-folder-name)) (run-hooks 'wl-summary-exit-pre-hook) - (wl-summary-cleanup-temp-marks (wl-summary-sticky-p)) + (if (or force-exit (not (wl-summary-sticky-p))) + (wl-summary-cleanup-temp-marks (wl-summary-sticky-p))) (wl-summary-save-view) (elmo-folder-commit wl-summary-buffer-elmo-folder)) (setq buf (wl-summary-get-buffer-create (elmo-folder-name-internal folder) -- 1.7.10.4