ptexinfmt.el; Fix last change

[elisp/wanderlust.git] / wl / wl-xmas.el

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 3cff4ad..8bd5086 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -123,7 +123,7 @@
     )
   "The Message buffer toolbar.")
 
-(defalias 'wl-draft-insert-signature 'insert-signature);; for draft toolbar.
+(defalias 'wl-draft-insert-signature 'insert-signature)        ; for draft toolbar.
 
 (defvar wl-draft-toolbar
   '([wl-draft-send-from-toolbar
@@ -252,20 +252,20 @@
     (beginning-of-line)
     (let (fld-name)
       (cond
-       (;; opened folder group
-       (and (wl-folder-buffer-group-p)
+       ;; opened folder group
+       ((and (wl-folder-buffer-group-p)
             (looking-at wl-highlight-folder-opened-regexp))
        (wl-xmas-highlight-folder-group-line 'wl-folder-opened-glyph
                                             'wl-highlight-folder-opened-face
                                             numbers))
-       (;; closed folder group
-       (and (wl-folder-buffer-group-p)
+       ;; closed folder group
+       ((and (wl-folder-buffer-group-p)
             (looking-at wl-highlight-folder-closed-regexp))
        (wl-xmas-highlight-folder-group-line 'wl-folder-closed-glyph
                                             'wl-highlight-folder-closed-face
                                             numbers))
-       (;; basic folder
-       (and (setq fld-name (wl-folder-get-folder-name-by-id
+       ;; basic folder
+       ((and (setq fld-name (wl-folder-get-folder-name-by-id
                             (get-text-property (point) 'wl-folder-entity-id)))
             (looking-at "[ \t]+\\([^ \t]+\\)"))
        (let ((start (match-beginning 1)))
@@ -280,18 +280,21 @@
              (set-extent-begin-glyph
               extent
               (cond
-               ((string= fld-name wl-trash-folder);; trash folder
-                (let ((num (nth 2 numbers)));; number of messages
+               ;; trash folder
+               ((string= fld-name wl-trash-folder)
+                (let ((num (nth 2 numbers))) ; number of messages
                   (get (if (or (not num) (zerop num))
                            'wl-folder-trash-empty-glyph
                          'wl-folder-trash-glyph)
                        'glyph)))
-               ((string= fld-name wl-draft-folder);; draft folder
+               ;; draft folder
+               ((string= fld-name wl-draft-folder)
                 (get 'wl-folder-draft-glyph 'glyph))
-               ((string= fld-name wl-queue-folder);; queue folder
+               ;; queue folder
+               ((string= fld-name wl-queue-folder)
                 (get 'wl-folder-queue-glyph 'glyph))
-               (;; and one of many other folders
-                (setq type (or (elmo-folder-type fld-name)
+               ;; and one of many other folders
+               ((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))))))
@@ -380,10 +383,10 @@
     (wl-folder-archive-glyph   . wl-archive-folder-icon)
     (wl-folder-pipe-glyph      . wl-pipe-folder-icon)
     (wl-folder-maildir-glyph   . wl-maildir-folder-icon)
-    (wl-folder-nmz-glyph       . wl-nmz-folder-icon)
+    (wl-folder-search-glyph    . wl-search-folder-icon)
     (wl-folder-shimbun-glyph   . wl-shimbun-folder-icon)
     (wl-folder-file-glyph      . wl-file-folder-icon)
-    (wl-folder-access-image    . wl-access-folder-icon)
+    (wl-folder-access-glyph    . wl-access-folder-icon)
     (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon)
     (wl-folder-draft-glyph     . wl-draft-folder-icon)
     (wl-folder-queue-glyph     . wl-queue-folder-icon)
@@ -538,7 +541,7 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-e" 'wl-draft-config-exec)
   (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select)
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
-;;   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
+;;;  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
   (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer)
   (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region)
@@ -548,15 +551,15 @@ 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))
 
 (defalias 'wl-defface 'defface)
 
-(defun wl-read-event-char ()
+(defun wl-read-event-char (&optional prompt)
   "Get the next event."
-  (let ((event (next-command-event)))
+  (let ((event (next-command-event nil prompt)))
     (sit-for 0)
     ;; We junk all non-key events.  Is this naughty?
     (while (not (or (key-press-event-p event)
@@ -567,14 +570,6 @@ Special commands:
               (event-to-character event))
          event)))
 
-(defun wl-completing-read-multiple (prompt
-                                   table
-                                   &optional predicate
-                                   require-match initial-input)
-  "Read multiple strings in the minibuffer"
-  (split-string (completing-read prompt table predicate require-match
-                                initial-input) ","))
-
 (require 'product)
 (product-provide (provide 'wl-xmas) (require 'wl-version))