Define unmark functions for temporary marks.

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

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 652184f..3e62300 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -90,10 +90,10 @@
      wl-summary-jump-to-current-message t "Jump to Current Message"]
     [wl-summary-sync-force-update
      wl-summary-sync-force-update t "Sync Current Folder"]
-    [wl-summary-delete
-     wl-summary-delete t "Delete Current Message"]
-    [wl-summary-mark-as-important
-     wl-summary-mark-as-important t "Mark Current Message as Important"]
+    [wl-summary-dispose
+     wl-summary-dispose t "Dispose Current Message"]
+    [wl-summary-set-flags
+     wl-summary-set-flags t "Set Flags"]
     [wl-draft
      wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
@@ -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
@@ -378,8 +380,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-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)
@@ -453,6 +457,7 @@
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
     (define-key keymap "\C-c:d" 'wl-message-decrypt-pgp-nonmime)
     (define-key keymap "\C-c:v" 'wl-message-verify-pgp-nonmime)
+    (define-key keymap "w" 'wl-draft)
     (define-key keymap 'button4 'wl-message-wheel-down)
     (define-key keymap 'button5 'wl-message-wheel-up)
     (define-key keymap [(shift button4)] 'wl-message-wheel-down)
@@ -533,23 +538,25 @@ 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)
-  (define-key wl-draft-mode-map "\C-a" 'wl-draft-beginning-of-line))
+  (define-key wl-draft-mode-map "\C-a" 'wl-draft-beginning-of-line)
+  (define-key wl-draft-mode-map "\M-p" 'wl-draft-previous-history-element)
+  (define-key wl-draft-mode-map "\M-n" 'wl-draft-next-history-element))
 
 (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)