From 97aa25b89a81ff0102907c1435d4b76ea9d03126 Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 8 May 2001 16:31:44 +0000 Subject: [PATCH] * wl-mime.el (wl-mime-setup): Added setting for `mime-setup-signature-key-alist' to avoid overriding key bind for `wl-draft-send'. * wl-e21.el (wl-draft-overload-functions): Don't override key binding for `wl-draft-send'. * wl-mule.el (wl-draft-overload-functions): Ditto. * wl-xmas.el (wl-draft-overload-functions): Ditto. * wl-draft.el (wl-draft-send): Ditto. * wl-message.el (wl-message-display-internal): Fixed typo (elmo-fetch-threshold->elmo-message-fetch-threshold). (Patch is provided by ). * elmo.el (elmo-message-fetch-confirm): Fixed docstring. (Patch is provided by ). --- elmo/ChangeLog | 5 +++++ elmo/elmo.el | 3 ++- wl/ChangeLog | 16 ++++++++++++++++ wl/wl-draft.el | 6 +++--- wl/wl-e21.el | 2 +- wl/wl-message.el | 2 +- wl/wl-mime.el | 7 +++++-- wl/wl-mule.el | 2 +- wl/wl-xmas.el | 2 +- 9 files changed, 35 insertions(+), 10 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index ef5f815..7232c20 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2001-05-08 Yuuichi Teranishi + + * elmo.el (elmo-message-fetch-confirm): Fixed docstring. + (Patch is provided by ). + 2001-05-08 Hiroya Murata * elmo.el (elmo-folder-synchronize): Don't check important mark in diff --git a/elmo/elmo.el b/elmo/elmo.el index 353fa53..c790a85 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -50,7 +50,8 @@ :group 'elmo) (defcustom elmo-message-fetch-confirm t - "Confirm fetching if message size is larger than `elmo-fetch-threshold'. + "If non-nil, confirm fetching if message size is larger than +`elmo-message-fetch-threshold'. Otherwise, entire fetching of the message is aborted without confirmation." :type 'boolean :group 'elmo) diff --git a/wl/ChangeLog b/wl/ChangeLog index 34d85d2..2265e19 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,19 @@ +2001-05-08 Yuuichi Teranishi + + * wl-mime.el (wl-mime-setup): Added setting for + `mime-setup-signature-key-alist' to avoid overriding key bind for + `wl-draft-send'. + + * wl-e21.el (wl-draft-overload-functions): Don't override key binding + for `wl-draft-send'. + * wl-mule.el (wl-draft-overload-functions): Ditto. + * wl-xmas.el (wl-draft-overload-functions): Ditto. + * wl-draft.el (wl-draft-send): Ditto. + + * wl-message.el (wl-message-display-internal): + Fixed typo (elmo-fetch-threshold->elmo-message-fetch-threshold). + (Patch is provided by ). + 2001-05-09 Kenichi OKADA * wl-folder.el (wl-folder-guess-mailing-list-by-refile-rule): Fix. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index e398248..e19857c 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1118,9 +1118,9 @@ If optional argument is non-nil, current draft buffer is killed" (cdr (car mail-send-actions))) (error)) (setq mail-send-actions (cdr mail-send-actions))) - (if (or (eq major-mode 'wl-draft-mode) - (eq major-mode 'mail-mode)) - (local-set-key "\C-c\C-s" 'wl-draft-send)) ; override +;; (if (or (eq major-mode 'wl-draft-mode) +;; (eq major-mode 'mail-mode)) +;; (local-set-key "\C-c\C-s" 'wl-draft-send)) ; override (if wl-draft-verbose-send (message (concat (or wl-draft-verbose-msg mes-string "Sending...") diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 0a171aa..e441e07 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -614,7 +614,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) - (local-set-key "\C-c\C-s" 'wl-draft-send);; override +;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override (wl-e21-setup-draft-toolbar) (wl-draft-overload-menubar)) diff --git a/wl/wl-message.el b/wl/wl-message.el index 2e8747f..d578079 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -452,7 +452,7 @@ Returns non-nil if bottom of message." wl-message-ignored-field-list)) (elmo-message-visible-field-list wl-message-visible-field-list) (elmo-message-sorted-field-list wl-message-sort-field-list) - (elmo-fetch-threshold wl-fetch-confirm-threshold)) + (elmo-message-fetch-threshold wl-fetch-confirm-threshold)) (prog1 (if (eq flag 'as-is) (let (wl-highlight-x-face-function) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index a51d29c..0702c11 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -333,10 +333,13 @@ By setting following-method as yank-content." (set-alist 'mime-header-presentation-method-alist 'wl-original-message-mode (function elmo-mime-insert-header)) + ;; To avoid overriding wl-draft-mode-map. + (unless (assq 'wl-draft-mode mime-setup-signature-key-alist) + (setq mime-setup-signature-key-alist + (cons '(wl-draft-mode . "\C-c\C-w") + mime-setup-signature-key-alist))) (add-hook 'elmo-message-text-content-inserted-hook 'wl-highlight-body-all) (add-hook 'elmo-message-header-inserted-hook 'wl-highlight-headers)) - - (require 'product) (product-provide (provide 'wl-mime) (require 'wl-version)) diff --git a/wl/wl-mule.el b/wl/wl-mule.el index bf29d38..a00456e 100644 --- a/wl/wl-mule.el +++ b/wl/wl-mule.el @@ -175,7 +175,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) - (local-set-key "\C-c\C-s" 'wl-draft-send);; override +;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override (wl-draft-overload-menubar)) ;; for "ja-mule-canna-2.3.mini" on PocketBSD diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index fbacd37..7612bcd 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -514,7 +514,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) - (local-set-key "\C-c\C-s" 'wl-draft-send);; override + ;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override (wl-xmas-setup-draft-toolbar) (wl-draft-overload-menubar)) -- 1.7.10.4