* utils/bbdb-wl.el (bbdb-wl-get-update-record): Use `with-current-buffer'.

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

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index a9caf18..05adf97 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -1,7 +1,7 @@
 ;;; wl-xmas.el -- Wanderlust modules for XEmacsen.
 
-;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
-;; Copyright 2000 Katsumi Yamaoka <yamaoka@jpl.org>
+;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 2000 Katsumi Yamaoka <yamaoka@jpl.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;;     Katsumi Yamaoka <yamaoka@jpl.org>
@@ -284,7 +284,7 @@
                ((string= fld-name wl-queue-folder);; queue folder
                 (get 'wl-folder-queue-glyph 'glyph))
                (;; and one of many other folders
-                (setq type (elmo-folder-get-type fld-name))
+                (setq type (elmo-folder-type fld-name))
                 (get (intern (format "wl-folder-%s-glyph" type)) 'glyph))))))
          (let ((end (point-at-eol)))
            (when wl-use-highlight-mouse-line
@@ -371,6 +371,8 @@
     (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-shimbun-glyph      . wl-shimbun-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)
@@ -518,6 +520,19 @@ Special commands:
 
 (defalias 'wl-defface 'defface)
 
+(defun wl-read-event-char ()
+  "Get the next event."
+  (let ((event (next-command-event)))
+    (sit-for 0)
+    ;; We junk all non-key events.  Is this naughty?
+    (while (not (or (key-press-event-p event)
+                   (button-press-event-p event)))
+      (dispatch-event event)
+      (setq event (next-command-event)))
+    (cons (and (key-press-event-p event)
+              (event-to-character event))
+         event)))
+
 (require 'product)
 (product-provide (provide 'wl-xmas) (require 'wl-version))