From 778808cac571b2066f34b3eda74e30cb15db5354 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 10 Feb 2004 06:22:32 +0000
Subject: [PATCH] * wl-summary.el (wl-summary-decide-flag): Use
 wl-completing-read-multiple instead of
 completing-read-multiple.

* wl-mule.el,wl-e21.el,wl-xmas.el (wl-completing-read-multiple):
New alias.

* wl-demo.el (wl-demo-setup-properties)[XEmacs]:
Use face-background-name instead of face-background.

* wl-summary.el (wl-summary-save): Use it.
(wl-summary-mode-menu-spec): Added wl-summary-sort-by-size.
---
 wl/ChangeLog       |    9 +++++++++
 wl/wl-demo.el      |    2 +-
 wl/wl-e21.el       |    2 ++
 wl/wl-highlight.el |   25 ++++---------------------
 wl/wl-mule.el      |    2 ++
 wl/wl-summary.el   |    2 +-
 wl/wl-xmas.el      |    2 ++
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c6debff..496ad06 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,14 @@
 2004-02-10  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-summary.el (wl-summary-decide-flag): Use
+	wl-completing-read-multiple instead of completing-read-multiple.
+
+	* wl-mule.el,wl-e21.el,wl-xmas.el (wl-completing-read-multiple): 
+	New alias.
+
+	* wl-demo.el (wl-demo-setup-properties)[XEmacs]:
+	Use face-background-name instead of face-background.
+
 	* wl-vars.el (wl-summary-save-file-suffix): New user option.
 
 	* wl-summary.el (wl-summary-save): Use it.
diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 6efca5e..dabb49a 100644
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -302,7 +302,7 @@ Return a number of lines that an image occupies in the buffer."
 				  (list ':foreground fg))))))
    ((featurep 'xemacs)
     (set-face-background 'default
-			 (face-background 'wl-highlight-demo-face)
+			 (face-background-name 'wl-highlight-demo-face)
 			 (current-buffer)))))
 
 (defun wl-demo-insert-text (height)
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index fae406d..ffabf4a 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -670,6 +670,8 @@ Special commands:
   (let ((event (read-event)))
     (cons (and (numberp event) event) event)))
 
+(defalias 'wl-completing-read-multiple 'completing-read-multiple)
+
 (put 'wl-modeline-biff-state-on 'risky-local-variable t)
 (put 'wl-modeline-biff-state-off 'risky-local-variable t)
 (put 'wl-modeline-plug-state-on 'risky-local-variable t)
diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index a34cae6..a191dcf 100644
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -189,21 +189,6 @@
 
 ;; important messages
 
-(wl-defface wl-highlight-summary-important-face
-  '(
-    (((type tty)
-      (background dark))
-     (:foreground "magenta"))
-    (((class color)
-      (background dark))
-     (:foreground "orange"))
-    (((class color)
-      (background light))
-     (:foreground "purple")))
-  "Face used for displaying important messages."
-  :group 'wl-summary-faces
-  :group 'wl-faces)
-
 (wl-defface wl-highlight-summary-new-face
   '(
     (((type tty)
@@ -854,10 +839,8 @@
 				  (intern (format
 					   "wl-highlight-summary-%s-flag-face"
 					   (car (car fl)))))
-			     (unless (facep face)
-			       (make-face face 'no-init)
-			       (set-face-foreground face (nth 1 (car fl))))
-			     (list face))
+			    (when (facep face)
+			      (list face)))
 			  fl nil))
 		  (setq fl (cdr fl)))
 	      (when (memq (car priorities) flags)
@@ -1014,11 +997,11 @@ Variables used:
   "Highlight summary between start and end.
 Faces used:
   wl-highlight-summary-unread-face      unread messages
-  wl-highlight-summary-important-face   important messages
   wl-highlight-summary-deleted-face     messages mark as deleted
   wl-highlight-summary-refiled-face     messages mark as refiled
   wl-highlight-summary-copied-face      messages mark as copied
-  wl-highlight-summary-new-face         new messages"
+  wl-highlight-summary-new-face         new messages
+  wl-highlight-summary-*-flag-face      flagged messages"
   (if (< end start)
       (let ((s start)) (setq start end end s)))
   (let (lines too-big gc-message e p hend i percent)
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 7cc59ca..dab21bd 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -307,6 +307,8 @@ Warning: Unknown req `%S' with options `%S'" req options)
   (let ((event (read-event)))
     (cons (and (numberp event) event) event)))
 
+(defalias 'wl-completing-read-multiple 'completing-read)
+
 (require 'product)
 (product-provide (provide 'wl-mule) (require 'wl-version))
 
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 18fbee1..b815513 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3089,7 +3089,7 @@ Return non-nil if the mark is updated"
 		 (lambda (flag)
 		   (and (> (length flag) 0)
 			(intern (downcase flag))))
-		 (completing-read-multiple
+		 (wl-completing-read-multiple
 		  "Flags: "
 		  (mapcar (lambda (flag)
 			    (list (capitalize (symbol-name flag))))
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index b5af874..86ade39 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -565,6 +565,8 @@ Special commands:
 	       (event-to-character event))
 	  event)))
 
+(defalias 'wl-completing-read-multiple 'completing-read)
+
 (require 'product)
 (product-provide (provide 'wl-xmas) (require 'wl-version))
 
-- 
1.7.10.4