Add "Write for current folder" entry to the toolbar.

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

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 11b8939..8f7c028 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -33,7 +33,7 @@
 ;;(let (image icon from to overlay)
 ;;  ;; The function `find-image' will look for an image first on `load-path'
 ;;  ;; and then in `data-directory'.
-;;  (let ((load-path (cons wl-icon-dir load-path)))
+;;  (let ((load-path (cons wl-icon-directory load-path)))
 ;;    (setq image (find-image (list (list :type 'xpm :file wl-nntp-folder-icon
 ;;                                     :ascent 'center)))))
 ;;  ;; `propertize' is a convenient function in such a case.
@@ -97,12 +97,12 @@
      wl-folder-prev-entity t "Previous Folder"]
     [wl-folder-check-current-entity
      wl-folder-check-current-entity t "Check Current Folder"]
-    ;;[wl-draft
-    ;; wl-draft t "Write a New Message"]
     [wl-folder-sync-current-entity
      wl-folder-sync-current-entity t "Sync Current Folder"]
     [wl-draft
      wl-draft t "Write a New Message"]
+    [wl-write-current-folder
+     wl-folder-write-current-folder t "Write for Current Folder"]
     [wl-folder-empty-trash
      wl-folder-empty-trash t "Empty Trash"]
     [wl-exit
@@ -127,6 +127,8 @@
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft
      wl-draft t "Write a New Message"]
+    [wl-write-current-folder
+     wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
      wl-summary-reply t "Reply to Current Message" ]
     [wl-summary-reply-with-citation
@@ -176,7 +178,7 @@
 (defun wl-e21-setup-toolbar (bar)
   (when (and wl-use-toolbar
             (wl-e21-display-image-p))
-    (let ((load-path (cons wl-icon-dir load-path))
+    (let ((load-path (cons wl-icon-directory load-path))
          (props '(:type xpm :ascent center
                         :color-symbols (("backgroundToolBarColor" . "None"))
                         :file))
@@ -198,7 +200,7 @@
       success)))
 
 (defvar wl-e21-toolbar-configurations
-  '((auto-resize-tool-bar        . t)
+  '((auto-resize-tool-bars       . t)
     (auto-raise-tool-bar-buttons . t)
     (tool-bar-button-margin      . 0)
     (tool-bar-button-relief      . 2)))
@@ -260,7 +262,7 @@
          (unless image
            (let ((name (symbol-value
                         (cdr (assq icon wl-folder-toggle-icon-list))))
-                 (load-path (cons wl-icon-dir load-path)))
+                 (load-path (cons wl-icon-directory load-path)))
              (when (setq image (find-image `((:type xpm :file ,name
                                                     :ascent center))))
                (setq image (put icon 'image (propertize name
@@ -444,7 +446,7 @@
 
 (defun wl-folder-init-icons ()
   (when (wl-e21-display-image-p)
-    (let ((load-path (cons wl-icon-dir load-path))
+    (let ((load-path (cons wl-icon-directory load-path))
          (icons wl-folder-internal-icon-list)
          icon name image)
       (while (setq icon (pop icons))
@@ -462,7 +464,7 @@
     (if (wl-e21-display-image-p)
        (progn
          (unless wl-plugged-image
-           (let ((load-path (cons wl-icon-dir load-path)))
+           (let ((load-path (cons wl-icon-directory load-path)))
              (setq wl-plugged-image (find-image
                                      `((:type xpm
                                               :file ,wl-plugged-icon
@@ -493,7 +495,7 @@
     (if (wl-e21-display-image-p)
        (progn
          (unless wl-biff-mail-image
-           (let ((load-path (cons wl-icon-dir load-path)))
+           (let ((load-path (cons wl-icon-directory load-path)))
              (setq wl-biff-mail-image (find-image
                                        `((:type xpm
                                                 :file ,wl-biff-mail-icon
@@ -609,8 +611,9 @@ Special commands:
   (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-c\C-a" 'wl-addrmgr)
-  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
-  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer))
+;;  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
+  (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))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)