From 33896013b52a24d03ad840ad066e6978c2f6d26b Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 16 Jan 2001 05:54:59 +0000 Subject: [PATCH] toplevel: 2001-01-16 Yuuichi Teranishi * samples/en/dot.wl (wl-template-alist): file-bottom -> bottom-file. (Pointed out by Tsuyoshi Kitamoto ) * samples/ja/dot.wl (wl-template-alist): Ditto. wl: 2001-01-16 Yuuichi Teranishi * wl-score.el (wl-score-guess-like-gnus): Abolished. (wl-score-get-score-files): Don't use `wl-score-guess-like-gnus'. elmo: 2001-01-16 Yuuichi Teranishi * elmo-imap4.el (elmo-imap4-arrival-filter): Check process-buffer. (Based on the report by AMAKAWA Shuhei ) * elmo-pop3.el (elmo-pop3-msgdb-create-as-numlist): Sort msgdb by date. (Pointed out by Mikiya Tani ) 2001-01-13 Takaaki MORIYAMA * elmo2.el (elmo-make-folder-numbers-list): Fixed problem when elmo-mark-as-read is called with second argument nil. --- elmo/ChangeLog | 13 +++++++++++++ elmo/elmo-imap4.el | 5 +++-- elmo/elmo-pop3.el | 9 +++++---- elmo/elmo2.el | 3 ++- samples/en/dot.wl | 2 +- samples/ja/dot.wl | 2 +- wl/ChangeLog | 8 +++++++- wl/wl-score.el | 17 ----------------- 8 files changed, 32 insertions(+), 27 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 832c4c9..53fc6e5 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,16 @@ +2001-01-16 Yuuichi Teranishi + + * elmo-imap4.el (elmo-imap4-arrival-filter): Check process-buffer. + (Based on the report by AMAKAWA Shuhei ) + + * elmo-pop3.el (elmo-pop3-msgdb-create-as-numlist): Sort msgdb by date. + (Pointed out by Mikiya Tani ) + +2001-01-13 Takaaki MORIYAMA + + * elmo2.el (elmo-make-folder-numbers-list): Fixed problem + when elmo-mark-as-read is called with second argument nil. + 2001-01-12 Yuuichi Teranishi * elmo-pipe.el (elmo-pipe-spec-src, elmo-pipe-spec-dst): diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index adc7137..04c98ff 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -661,7 +661,7 @@ BUFFER must be a single-byte buffer." (if elmo-use-server-diff (elmo-imap4-server-diff spec) (elmo-generic-folder-diff spec folder number-list))) - + (defun elmo-imap4-get-session (spec &optional if-exists) (elmo-network-get-session 'elmo-imap4-session @@ -1582,6 +1582,7 @@ Return nil if no complete line has arrived." (defun elmo-imap4-arrival-filter (proc string) "IMAP process filter." + (when (buffer-live-p (process-buffer proc)) (with-current-buffer (process-buffer proc) (elmo-imap4-debug "-> %s" string) (goto-char (point-max)) @@ -1609,7 +1610,7 @@ Return nil if no complete line has arrived." (t (message "Unknown state %s in arrival filter" elmo-imap4-status)))) - (delete-region (point-min) (point-max))))))) + (delete-region (point-min) (point-max)))))))) ;; IMAP parser. diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index 294f2ad..cb4ac69 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -532,10 +532,11 @@ (setq loc-alist (if msgdb (elmo-msgdb-get-location msgdb) (elmo-msgdb-location-load (elmo-msgdb-expand-path spec))))) - (elmo-pop3-msgdb-create-by-header process numlist - new-mark already-mark - seen-mark seen-list - loc-alist)))) + (elmo-msgdb-sort-by-date + (elmo-pop3-msgdb-create-by-header process numlist + new-mark already-mark + seen-mark seen-list + loc-alist))))) (defun elmo-pop3-uidl-to-number (uidl) (string-to-number (elmo-get-hash-val uidl diff --git a/elmo/elmo2.el b/elmo/elmo2.el index d49914c..cb21136 100644 --- a/elmo/elmo2.el +++ b/elmo/elmo2.el @@ -426,7 +426,8 @@ without cacheing." pair fld-list ret-val) (while msg-list - (when (> (car msg-list) 0) + (when (and (numberp (car msg-list)) + (> (car msg-list) 0)) (setq pair (elmo-get-real-folder-number folder (car msg-list))) (if (setq fld-list (assoc (car pair) ret-val)) (setcdr fld-list (cons (cdr pair) (cdr fld-list))) diff --git a/samples/en/dot.wl b/samples/en/dot.wl index f06b1fc..30f3a6d 100644 --- a/samples/en/dot.wl +++ b/samples/en/dot.wl @@ -288,7 +288,7 @@ ("To" . "boss@company.jp") ("Subject" . "Report") (top . "Sir, here is my report\n") ;; insert in top. -;; (file-bottom . "~/work/report.txt") ;; insert file in bottom +;; (bottom-file . "~/work/report.txt") ;; insert file in bottom ) )) ;; Change headers in draft sending time. diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl index 3af0ef2..a9d2a49 100644 --- a/samples/ja/dot.wl +++ b/samples/ja/dot.wl @@ -291,7 +291,7 @@ ("To" . "boss@company.jp") ("Subject" . "報告") (top . "今週の報告です。\n") ;; 本文先頭への挿入 -;; (file-bottom . "~/work/report.txt") ;; 本文末尾へファイルの挿入 +;; (bottom-file . "~/work/report.txt") ;; 本文末尾へファイルの挿入 ) )) diff --git a/wl/ChangeLog b/wl/ChangeLog index a74d4b0..34e15ba 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2001-01-16 Yuuichi Teranishi + + * wl-score.el (wl-score-guess-like-gnus): Abolished. + (wl-score-get-score-files): Don't use `wl-score-guess-like-gnus'. + 2001-01-12 Yuuichi Teranishi * wl-xmas.el (wl-read-event-char): Move from wl-util.el. @@ -9,7 +14,8 @@ * wl-nemacs.el (wl-read-event-char): Ditto. (read-event): Removed. - * wl-util.el (toplevel): Comment out definition of `read-event'. + * wl-util.el (toplevel): Removed dummy definition of + `read-event'. (wl-read-event-char, wl-xmas-read-event-char): Removed. 2001-01-10 Katsumi Yamaoka diff --git a/wl/wl-score.el b/wl/wl-score.el index be5832a..a0d93b8 100644 --- a/wl/wl-score.el +++ b/wl/wl-score.el @@ -337,21 +337,6 @@ Set `wl-score-cache' nil." (setq wl-current-score-file file) (setq wl-score-alist alist))) -(defun wl-score-guess-like-gnus (folder) - (let* (score-list - (spec (elmo-folder-get-spec folder)) - (method (symbol-name (car spec))) - (fld-name (elmo-string (car (cdr spec))))) - (when (stringp fld-name) - (while (string-match "[\\/:,;*?\"<>|]" fld-name) - (setq fld-name (replace-match "." t nil fld-name))) - (setq score-list (list (concat method "@" fld-name ".SCORE"))) - (while (string-match "[\\/.][^\\/.]*$" fld-name) - (setq fld-name (substring fld-name 0 (match-beginning 0))) - (wl-append score-list (list (concat method "@" fld-name - ".all.SCORE")))) - score-list))) - (defun wl-score-get-score-files (score-alist folder) (let ((files (wl-get-assoc-list-value score-alist folder @@ -362,8 +347,6 @@ Set `wl-score-cache' nil." fl (cond ((functionp f) (funcall f folder)) - ((and (symbolp f) (eq f 'guess)) - (wl-score-guess-like-gnus folder)) (t (list f))))) fl)) -- 1.7.10.4