From 48f244ac2670b488b2f00cd6c70733d1c8ddfb11 Mon Sep 17 00:00:00 2001 From: teranisi Date: Mon, 9 Feb 2004 13:08:21 +0000 Subject: [PATCH] * wl-e21.el (wl-highlight-folder-current-line): Use elmo-folder-type-internal when elmo-folder-type returns nil. * wl-xmas.el (wl-highlight-folder-current-line): Ditto. * elmo.el (elmo-folder-type): Undo last change. --- elmo/ChangeLog | 2 ++ elmo/elmo.el | 4 +--- wl/ChangeLog | 5 +++++ wl/wl-e21.el | 4 +++- wl/wl-xmas.el | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index dbd458d..98fd399 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,7 @@ 2004-02-09 Yuuichi Teranishi + * elmo.el (elmo-folder-type): Undo last change. + * slp.el (slp-exec-wait): Avoid byte-compile warnings. * elmo-nntp.el (elmo-nntp-folder-list-subfolders): Avoid byte-compile diff --git a/elmo/elmo.el b/elmo/elmo.el index c31befe..039702a 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -105,9 +105,7 @@ If a folder name begins with PREFIX, use BACKEND." (defmacro elmo-folder-type (name) "Get folder type from NAME string." `(and (stringp ,name) - (or (cdr (assoc (string-to-char ,name) elmo-folder-type-alist)) - (when (string-match "\\([^:]*\\):" ,name) - (intern (match-string 1 ,name)))))) + (cdr (assoc (string-to-char ,name) elmo-folder-type-alist)))) ;;; ELMO folder ;; A elmo folder provides uniformed (orchestrated) access diff --git a/wl/ChangeLog b/wl/ChangeLog index 2ac1038..4219325 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,10 @@ 2004-02-09 Yuuichi Teranishi + * wl-e21.el (wl-highlight-folder-current-line): Use + elmo-folder-type-internal when elmo-folder-type returns nil. + + * wl-xmas.el (wl-highlight-folder-current-line): Ditto. + * wl.el (wl-init): Setup faces accoding to wl-summary-flag-alist. * wl-xmas.el (wl-summary-toolbar): Setup wl-summary-set-flags. diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 0520364..fae406d 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -363,7 +363,9 @@ ((string= fld-name wl-queue-folder);; queue folder (get 'wl-folder-queue-image 'image)) (;; and one of many other folders - (setq type (elmo-folder-type fld-name)) + (setq type (or (elmo-folder-type fld-name) + (elmo-folder-type-internal + (elmo-make-folder fld-name)))) (get (intern (format "wl-folder-%s-image" type)) 'image))))) (overlay-put overlay 'before-string image))) diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index 2994415..b5af874 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -291,7 +291,9 @@ ((string= fld-name wl-queue-folder);; queue folder (get 'wl-folder-queue-glyph 'glyph)) (;; and one of many other folders - (setq type (elmo-folder-type fld-name)) + (setq type (or (elmo-folder-type fld-name) + (elmo-folder-type-internal + (elmo-make-folder fld-name)))) (get (intern (format "wl-folder-%s-glyph" type)) 'glyph)))))) (let ((end (point-at-eol))) (when wl-use-highlight-mouse-line -- 1.7.10.4