From 89ad947e860aa5742cdb322a3019cc606cab690f Mon Sep 17 00:00:00 2001 From: yoichi Date: Sun, 10 Mar 2002 16:32:45 +0000 Subject: [PATCH] * wl-addrmgr.el (wl-addrmgr-quit-yes): Put cursor on draft buffer if addrmgr is called from draft in splitted window. * wl-e21.el (wl-draft-overload-menubar): Undo last change. * wl-mule.el: Ditto. * wl-xmas.el: Ditto. --- wl/ChangeLog | 9 +++++++++ wl/wl-addrmgr.el | 17 ++++++++++------- wl/wl-e21.el | 8 ++++---- wl/wl-mule.el | 8 ++++---- wl/wl-xmas.el | 8 ++++---- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 51d5c88..5011a30 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,12 @@ +2002-03-10 Yoichi NAKAYAMA + + * wl-addrmgr.el (wl-addrmgr-quit-yes): Put cursor on draft buffer + if addrmgr is called from draft in splitted window. + + * wl-e21.el (wl-draft-overload-menubar): Undo last change. + * wl-mule.el: Ditto. + * wl-xmas.el: Ditto. + 2002-03-09 Yoichi NAKAYAMA * wl-folder.el (wl-folder-mode-menu-spec): Fix docstring. diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el index f115523..35ba567 100644 --- a/wl/wl-addrmgr.el +++ b/wl/wl-addrmgr.el @@ -362,13 +362,16 @@ Return nil if no ADDRESS exists." (forward-char 4))))) (defun wl-addrmgr-quit-yes () - (if (and wl-addrmgr-draft-buffer - (buffer-live-p wl-addrmgr-draft-buffer) - (null (get-buffer-window wl-addrmgr-draft-buffer))) - (switch-to-buffer wl-addrmgr-draft-buffer) - (unless (one-window-p) - (delete-window))) - (kill-buffer wl-addrmgr-buffer-name)) + (let ((draft-buffer wl-addrmgr-draft-buffer)) + (if (and draft-buffer + (buffer-live-p draft-buffer) + (null (get-buffer-window draft-buffer))) + (switch-to-buffer draft-buffer) + (unless (one-window-p) + (delete-window))) + (kill-buffer wl-addrmgr-buffer-name) + (if (and draft-buffer (not (one-window-p))) + (switch-to-buffer-other-window draft-buffer)))) (defun wl-addrmgr-quit () "Exit from electric reference mode without inserting reference." diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 0332e9d..6262ac6 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -578,16 +578,16 @@ (defun wl-draft-overload-menubar () (let ((keymap (current-local-map))) - (define-key keymap [menu-bar mail preview] - '("Preview Message" . wl-draft-preview-message)) +; (define-key keymap [menu-bar mail preview] +; '("Preview Message" . wl-draft-preview-message)) (define-key keymap [menu-bar mail send] '("Send Message" . wl-draft-send-and-exit)) (define-key keymap [menu-bar mail send-stay] '("Send, Keep Editing" . wl-draft-send)) (define-key keymap [menu-bar mail cancel] '("Kill Current Draft" . wl-draft-kill)) - (define-key keymap [menu-bar mail save] - '("Save Draft and Exit" . wl-draft-save-and-exit)) +; (define-key keymap [menu-bar mail save] +; '("Save Draft and Exit" . wl-draft-save-and-exit)) (define-key keymap [menu-bar mail yank] '("Cite Message" . wl-draft-yank-original)) (define-key keymap [menu-bar mail signature] diff --git a/wl/wl-mule.el b/wl/wl-mule.el index dd4d654..9bf61b4 100644 --- a/wl/wl-mule.el +++ b/wl/wl-mule.el @@ -162,16 +162,16 @@ Special commands: (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region)) (defun wl-draft-overload-menubar () - (local-set-key [menu-bar mail preview] - '("Preview Message" . wl-draft-preview-message)) +; (local-set-key [menu-bar mail preview] +; '("Preview Message" . wl-draft-preview-message)) (local-set-key [menu-bar mail send] '("Send Message" . wl-draft-send-and-exit)) (local-set-key [menu-bar mail send-stay] '("Send, Keep Editing" . wl-draft-send)) (local-set-key [menu-bar mail cancel] '("Kill Current Draft" . wl-draft-kill)) - (local-set-key [menu-bar mail save] - '("Save Draft and Exit" . wl-draft-save-and-exit)) +; (local-set-key [menu-bar mail save] +; '("Save Draft and Exit" . wl-draft-save-and-exit)) (local-set-key [menu-bar mail yank] '("Cite Message" . wl-draft-yank-original)) (local-set-key [menu-bar mail signature] diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index 445d12e..8f1bb42 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -488,14 +488,14 @@ (defun wl-draft-overload-menubar () (when (featurep 'menubar) - (add-menu-item '("Mail") "Preview Message" - 'wl-draft-preview-message t "Preview Message") +; (add-menu-item '("Mail") "Preview Message" +; 'wl-draft-preview-message t "Preview Message") (add-menu-item '("Mail") "Send, Keep Editing" 'wl-draft-send t "Send Mail") (add-menu-item '("Mail") "Send Message" 'wl-draft-send-and-exit t "Send and Exit") - (add-menu-item '("Mail") "Save Draft and Exit" - 'wl-draft-save-and-exit t "Save Draft and Exit") +; (add-menu-item '("Mail") "Save Draft and Exit" +; 'wl-draft-save-and-exit t "Save Draft and Exit") (delete-menu-item '("Mail" "Send Mail")) (delete-menu-item '("Mail" "Send and Exit")))) -- 1.7.10.4