From 096952c07bcfb2a4671a1db43a44b305d8f3aaca Mon Sep 17 00:00:00 2001 From: yoichi Date: Fri, 10 Jan 2003 09:53:49 +0000 Subject: [PATCH] Merge from trunk: 2003-01-10 Masahiro Murata * wl-draft.el (wl-draft-reedit): Avoid error on Meadow [wl:11209]. 2003-01-06 Yoichi NAKAYAMA * wl-vars.el: Follow "Left Margin Convention" in Emacs Manual. In most major modes, Emacs assumes that any opening delimiter found at the left margin is the start of a top-level definition, or defun. Therefore, *never put an opening delimiter at the left margin unless it should have that significance.* 2003-01-10 Tsutomu OKADA * elmo-map.el (elmo-folder-pack-numbers): Fix name of the function. --- elmo/ChangeLog | 4 ++++ elmo/elmo-map.el | 2 +- wl/ChangeLog | 13 +++++++++++++ wl/wl-draft.el | 1 + wl/wl-vars.el | 20 ++++++++++---------- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 60d40eb..298845f 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,7 @@ +2003-01-10 Tsutomu OKADA + + * elmo-map.el (elmo-folder-pack-numbers): Fix name of the function. + 2003-01-06 Yuuichi Teranishi * elmo-version.el (elmo-version): Up to 2.10.1. diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el index cb13519..2a96abc 100644 --- a/elmo/elmo-map.el +++ b/elmo/elmo-map.el @@ -121,7 +121,7 @@ (concat "#" (int-to-string number)) (elmo-map-folder-location-hash-internal folder)))) -(luna-define-method elmo-folder-pack-number ((folder elmo-map-folder)) +(luna-define-method elmo-folder-pack-numbers ((folder elmo-map-folder)) (let* ((msgdb (elmo-folder-msgdb folder)) (old-number-alist (elmo-msgdb-get-number-alist msgdb)) (old-overview (elmo-msgdb-get-overview msgdb)) diff --git a/wl/ChangeLog b/wl/ChangeLog index b91ba12..590c797 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,16 @@ +2003-01-10 Masahiro Murata + + * wl-draft.el (wl-draft-reedit): Avoid error on Meadow [wl:11209]. + +2003-01-06 Yoichi NAKAYAMA + + * wl-vars.el: Follow "Left Margin Convention" in Emacs Manual. + In most major modes, Emacs assumes that any opening + delimiter found at the left margin is the start of a + top-level definition, or defun. Therefore, *never put an + opening delimiter at the left margin unless it should have + that significance.* + 2003-01-06 Yuuichi Teranishi * wl-version.el (wl-version): Changed codename. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index edbbb30..88b7897 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1870,6 +1870,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed" (switch-to-buffer buffer)) (set-buffer buffer) (insert-file-contents-as-binary file-name) + (elmo-delete-cr-buffer) (let((mime-edit-again-ignored-field-regexp "^\\(Content-.*\\|Mime-Version\\):")) ; (wl-draft-decode-message-in-buffer)) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index b37442d..4f222ba 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -200,7 +200,7 @@ If no match, `wl-summary-default-view' is used." (?a (length wl-summary-buffer-number-list))) "An alist of format specifications that can appear in summary mode-lines. Each element is a list of following: -\(SPEC STRING-EXP\) +\(SPEC STRING-EXP) SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") @@ -247,7 +247,7 @@ which are replaced by the given information: (?@ (wl-summary-line-attached))) "An alist of format specifications that can appear in summary lines. Each element is a list of following: -\(SPEC STRING-EXP\) +\(SPEC STRING-EXP) SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") @@ -475,7 +475,7 @@ If nil, don't authenticate." "*POP3 user name to send mail using POP-before-SMTP. If nil, `elmo-pop3-default-user' is used. To use POP-before-SMTP, -\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp\)" +\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)" :type '(choice (const :tag "none" nil) string) :group 'wl @@ -742,7 +742,7 @@ Prepared candidates are 'wl-draft-send-mail-with-smtp, ("Mail-Reply-To" . (("Mail-Reply-To") nil nil)) ("From" . (("From") nil nil))) "Alist of cons cell of -\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -761,7 +761,7 @@ Default is for 'reply-to-author'." ("Reply-To" . (("Reply-To") ("To" "Cc" "From") ("Newsgroups"))) ("From" . (("From") ("To" "Cc") ("Newsgroups")))) "Alist of cons cell of -\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -779,7 +779,7 @@ Default is for 'reply-to-all'." ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) ("From" . (("To") ("Cc") nil))) "Alist of cons cell of -\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -797,7 +797,7 @@ Default is for 'reply-to-me'." ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) ("From" . (("To") ("Cc") nil))) "Alist of cons cell of -\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')\) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -940,7 +940,7 @@ Default is for 'followup-to-me'." (defcustom wl-summary-fix-timezone nil "*Time zone of the date string in summary mode. If nil, it is adjust to the default time zone information -\(system's default time zone or environment variable TZ\)." +\(system's default time zone or environment variable TZ)." :type '(choice (const :tag "Default time zone" nil) string) :group 'wl-summary) @@ -1409,7 +1409,7 @@ which appear just before @." (?n wl-message-buffer-cur-number)) "An alist of format specifications for message buffer's mode-lines. Each element is a list of following: -\(SPEC STRING-EXP\) +\(SPEC STRING-EXP) SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") @@ -1999,7 +1999,7 @@ e.x. ("^-han\\." . (2 "+" "+" "|" "-" " "))) "Thread indent set alist. If no match, following indent set is used. -(wl-thread-indent-level +\(wl-thread-indent-level wl-thread-have-younger-brother-str wl-thread-youngest-child-str wl-thread-vertical-str -- 1.7.10.4