From 10a95fa561ec82f555499e359e703a69eaecbad5 Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 31 Oct 2000 01:15:19 +0000 Subject: [PATCH] * wl-vars.el (wl-draft-send-hook): Changed default value to '(wl-draft-config-exec). * wl-draft.el (wl-draft-send): Don't call `wl-draft-config-exec' explicitly. (wl-draft): Set `wl-draft-config-exec-flag' before running `wl-mail-setup-hook'. * wl-xmas.el (toplevel): Add `wl-plugged-init-icons' and `wl-biff-init-icons' to `wl-init-hook' instead of `wl-make-plugged-hook'. (Because if `wl-draft' command is invoked at first, they are not initialized) Updated copyright notice. * wl-e21.el (toplevel): Ditto; * wl-demo.el (toplevel): Updated copyright notice. * wl-address.el (toplevel): Ditto. * wl-draft.el (toplevel): Ditto. * wl-version.el (toplevel): Ditto. * wl-folder.el (toplevel): Ditto. * wl-summary.el (toplevel): Ditto. * wl-thread.el (toplevel): Ditto. * wl-util.el (toplevel): Ditto. * wl-vars.el (toplevel): Ditto. * wl.el (toplevel): Ditto. --- wl/ChangeLog | 30 ++++++++++++++++++++++++++++++ wl/wl-address.el | 5 ++++- wl/wl-demo.el | 2 ++ wl/wl-draft.el | 8 ++++++-- wl/wl-e21.el | 9 ++++++--- wl/wl-folder.el | 2 ++ wl/wl-summary.el | 6 ++++++ wl/wl-thread.el | 2 ++ wl/wl-util.el | 4 ++++ wl/wl-vars.el | 4 +++- wl/wl-version.el | 2 ++ wl/wl-xmas.el | 10 +++++++--- wl/wl.el | 2 ++ 13 files changed, 76 insertions(+), 10 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index a53fa33..68a3600 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,33 @@ +2000-10-31 Yuuichi Teranishi + + * wl-vars.el (wl-draft-send-hook): Changed default value to + '(wl-draft-config-exec). + + * wl-draft.el (wl-draft-send): Don't call `wl-draft-config-exec' + explicitly. + (wl-draft): Set `wl-draft-config-exec-flag' before running + `wl-mail-setup-hook'. + + * wl-xmas.el (toplevel): Add `wl-plugged-init-icons' and + `wl-biff-init-icons' to `wl-init-hook' instead of + `wl-make-plugged-hook'. + (Because if `wl-draft' command is invoked at first, + they are not initialized) + Updated copyright notice. + + * wl-e21.el (toplevel): Ditto; + + * wl-demo.el (toplevel): Updated copyright notice. + * wl-address.el (toplevel): Ditto. + * wl-draft.el (toplevel): Ditto. + * wl-version.el (toplevel): Ditto. + * wl-folder.el (toplevel): Ditto. + * wl-summary.el (toplevel): Ditto. + * wl-thread.el (toplevel): Ditto. + * wl-util.el (toplevel): Ditto. + * wl-vars.el (toplevel): Ditto. + * wl.el (toplevel): Ditto. + 2000-10-30 Yuuichi Teranishi * wl-highlight.el (wl-highlight-message): Fixed problem of diff --git a/wl/wl-address.el b/wl/wl-address.el index 178619b..68126ab 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -1,8 +1,11 @@ ;;; wl-address.el -- Tiny address management for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi - +;; Shun-ichi GOTO +;; Takeshi Chiba ;; Author: Yuuichi Teranishi +;; Shun-ichi GOTO +;; Takeshi Chiba ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-demo.el b/wl/wl-demo.el index 18349da..2f07451 100644 --- a/wl/wl-demo.el +++ b/wl/wl-demo.el @@ -1,8 +1,10 @@ ;;; wl-demo.el -- Opening demo on Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Copyright 2000 Katsumi Yamaoka ;; Author: Yuuichi Teranishi +;; Katsumi Yamaoka ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 1810203..cf609df 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1,8 +1,10 @@ ;;; wl-draft.el -- Message draft mode for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). @@ -1127,7 +1129,9 @@ If FORCE-MSGID, ignore 'wl-insert-message-id'." "Send current draft message. If optional argument is non-nil, current draft buffer is killed" (interactive) - (wl-draft-config-exec) + ;; Don't call this explicitly. + ;; Added to 'wl-draft-send-hook (by teranisi) + ;; (wl-draft-config-exec) (run-hooks 'wl-draft-send-hook) (when (or (not wl-interactive-send) (y-or-n-p "Send current draft. OK?")) @@ -1429,6 +1433,7 @@ If optional argument is non-nil, current draft buffer is killed" (wl-draft-overload-functions) (wl-highlight-headers 'for-draft) (goto-char (point-min)) + (setq wl-draft-config-exec-flag t) (if (interactive-p) (run-hooks 'wl-mail-setup-hook)) (wl-user-agent-compose-internal) ;; user-agent @@ -1438,7 +1443,6 @@ If optional argument is non-nil, current draft buffer is killed" (mail-position-on-field "To")) (t (goto-char (point-max)))) - (setq wl-draft-config-exec-flag t) (setq wl-draft-buffer-cur-summary-buffer (or summary-buf (get-buffer wl-summary-buffer-name))) diff --git a/wl/wl-e21.el b/wl/wl-e21.el index accef24..70483af 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -1,6 +1,7 @@ ;;; wl-e21.el -- Wanderlust modules for Emacs 21. -;; Copyright 2000 Yuuichi Teranishi +;; Copyright 2000 Katsumi Yamaoka +;; Yuuichi Teranishi ;; Author: Katsumi Yamaoka ;; Keywords: mail, net news @@ -69,8 +70,10 @@ (add-hook 'wl-folder-mode-hook 'wl-setup-folder) (add-hook 'wl-folder-mode-hook 'wl-folder-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-biff-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-plugged-init-icons) +(add-hook 'wl-init-hook 'wl-biff-init-icons) +(add-hook 'wl-init-hook 'wl-plugged-init-icons) +;; (add-hook 'wl-make-plugged-hook 'wl-biff-init-icons) +;; (add-hook 'wl-make-plugged-hook 'wl-plugged-init-icons) (add-hook 'wl-summary-mode-hook 'wl-setup-summary) diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 74e56f5..d5e0d54 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -1,8 +1,10 @@ ;;; wl-folder.el -- Folder mode for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 3b57282..b7de036 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1,8 +1,14 @@ ;;; wl-summary.el -- Summary mode for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA +;; Copyright 1999,2000 TSUMURA Tomoaki +;; Copyright 1999,2000 Kenichi OKADA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA +;; TSUMURA Tomoaki +;; Kenichi OKADA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-thread.el b/wl/wl-thread.el index df5c7f1..1dda072 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -1,8 +1,10 @@ ;;; wl-thread.el -- Thread display modules for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-util.el b/wl/wl-util.el index d0606d0..6febe6e 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -1,8 +1,12 @@ ;;; wl-util.el -- Utility modules for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Copyright 2000 A. SAGATA +;; Katsumi Yamaoka ;; Author: Yuuichi Teranishi +;; A. SAGATA +;; Katsumi Yamaoka ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-vars.el b/wl/wl-vars.el index ce892a5..42f8f99 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -1,8 +1,10 @@ ;;; wl-vars.el -- Variable definitions for Wanderlust. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). @@ -440,7 +442,7 @@ system internal to accord facilities for the Emacs variants.") "A hook called when Draft is prepared.") (defvar wl-draft-reedit-hook nil "A hook called when Draft is re-edited.") -(defvar wl-draft-send-hook nil +(defvar wl-draft-send-hook '(wl-draft-config-exec) "A hook called on the draft editing buffer before sending process starts.") (defvar wl-mail-send-pre-hook nil "A hook called just before the mail sending process starts.") diff --git a/wl/wl-version.el b/wl/wl-version.el index f0e2fc3..4217c59 100644 --- a/wl/wl-version.el +++ b/wl/wl-version.el @@ -1,8 +1,10 @@ ;;; wl-version.el -- Version information for Wanderlust. ;; Copyright 2000 Yuuichi Teranishi +;; Copyright 2000 TAKAHASHI Kaoru ;; Author: Yuuichi Teranishi +;; TAKAHASHI Kaoru ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index f4977a7..2eddb57 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -1,8 +1,10 @@ ;;; wl-xmas.el -- Wanderlust modules for XEmacsen. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Copyright 2000 Katsumi Yamaoka -;; Author: Yuuichi Teranishi +;; Author: Yuuichi Teranishi , +;; Katsumi Yamaoka ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). @@ -41,8 +43,10 @@ (add-hook 'wl-folder-mode-hook 'wl-setup-folder) (add-hook 'wl-folder-mode-hook 'wl-folder-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-biff-init-icons) -(add-hook 'wl-make-plugged-hook 'wl-plugged-init-icons) +(add-hook 'wl-init-hook 'wl-biff-init-icons) +(add-hook 'wl-init-hook 'wl-plugged-init-icons) +;; (add-hook 'wl-make-plugged-hook 'wl-biff-init-icons) +;; (add-hook 'wl-make-plugged-hook 'wl-plugged-init-icons) (add-hook 'wl-summary-mode-hook 'wl-setup-summary) diff --git a/wl/wl.el b/wl/wl.el index 3f58f0c..2d693f7 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -1,8 +1,10 @@ ;;; wl.el -- Wanderlust bootstrap. ;; Copyright 1998,1999,2000 Yuuichi Teranishi +;; Masahiro MURATA ;; Author: Yuuichi Teranishi +;; Masahiro MURATA ;; Keywords: mail, net news ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen). -- 1.7.10.4