X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-xmas.el;h=93da3a2c7095d6fdaaadb264e8993392a9c92771;hb=c50cc4923f2b8db952b90cba5534e12a436b1a5a;hp=94348c52c8749f0945f1b6040e56789cb1ea4ff7;hpb=50e87247bc89cd4eead8633be07a758798831042;p=elisp%2Fwanderlust.git diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index 94348c5..93da3a2 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -1,4 +1,4 @@ -;;; wl-xmas.el -- Wanderlust modules for XEmacsen. +;;; wl-xmas.el --- Wanderlust modules for XEmacsen. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 2000 Katsumi Yamaoka @@ -48,6 +48,8 @@ (add-hook 'wl-summary-mode-hook 'wl-setup-summary) +(add-hook 'wl-message-display-internal-hook 'wl-setup-message) + (defvar wl-use-toolbar (if (featurep 'toolbar) 'default-toolbar nil)) (defvar wl-plugged-glyph nil) (defvar wl-unplugged-glyph nil) @@ -63,12 +65,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-folder-goto-draft-folder + wl-folder-goto-draft-folder t "Go to Draft Folder"] [wl-folder-empty-trash wl-folder-empty-trash t "Empty Trash"] [wl-exit @@ -92,7 +94,7 @@ [wl-summary-mark-as-important wl-summary-mark-as-important t "Mark Current Message as Important"] [wl-draft - wl-draft t "Write a New Message"] + 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 @@ -131,11 +133,13 @@ wl-draft-insert-signature t "Insert Signature"] [wl-draft-kill wl-draft-kill t "Kill Current Draft"] + [wl-draft-save-and-exit + wl-draft-save-and-exit t "Save Draft and Exit"] ) "The Draft buffer toolbar.") (defun wl-xmas-setup-toolbar (bar) - (let ((dir wl-icon-dir) + (let ((dir wl-icon-directory) icon up down disabled name) (when dir (while bar @@ -160,7 +164,7 @@ (when wl-highlight-folder-with-icon (set-glyph-image glyph (vector 'xpm :file (expand-file-name - icon-file wl-icon-dir)) + icon-file wl-icon-directory)) locale tag-set 'prepend)) glyph)) @@ -177,18 +181,18 @@ (set-specifier (symbol-value wl-use-toolbar) (cons (current-buffer) wl-summary-toolbar)))) - (defsubst wl-xmas-setup-message-toolbar () - (and wl-use-toolbar - (wl-xmas-setup-toolbar wl-message-toolbar) - (set-specifier (symbol-value wl-use-toolbar) - (cons (current-buffer) wl-message-toolbar)))) - (defsubst wl-xmas-setup-draft-toolbar () (and wl-use-toolbar (wl-xmas-setup-toolbar wl-draft-toolbar) (set-specifier (symbol-value wl-use-toolbar) (cons (current-buffer) wl-draft-toolbar))))) +(defun wl-xmas-setup-message-toolbar () + (and wl-use-toolbar + (wl-xmas-setup-toolbar wl-message-toolbar) + (set-specifier (symbol-value wl-use-toolbar) + (cons (current-buffer) wl-message-toolbar)))) + (defvar wl-folder-toggle-icon-list '((wl-folder-opened-glyph . wl-opened-group-folder-icon) (wl-folder-closed-glyph . wl-closed-group-folder-icon))) @@ -290,7 +294,7 @@ (when wl-use-highlight-mouse-line (put-text-property start end 'mouse-face 'highlight)) (let ((text-face - (if (looking-at (format "^[ \t]*\\(%s\\|%s\\)" + (if (looking-at (format "^[ \t]*\\(?:%s\\|%s\\)" wl-folder-unsubscribe-mark wl-folder-removed-mark)) 'wl-highlight-folder-killed-face @@ -360,23 +364,23 @@ (defvar wl-folder-internal-icon-list ;; alist of (glyph . icon-file) - '((wl-folder-nntp-glyph . wl-nntp-folder-icon) - (wl-folder-imap4-glyph . wl-imap-folder-icon) - (wl-folder-pop3-glyph . wl-pop-folder-icon) - (wl-folder-localdir-glyph . wl-localdir-folder-icon) - (wl-folder-localnews-glyph . wl-localnews-folder-icon) - (wl-folder-internal-glyph . wl-internal-folder-icon) - (wl-folder-multi-glyph . wl-multi-folder-icon) - (wl-folder-filter-glyph . wl-filter-folder-icon) - (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) - (wl-folder-trash-glyph . wl-trash-folder-icon))) + '((wl-folder-nntp-glyph . wl-nntp-folder-icon) + (wl-folder-imap4-glyph . wl-imap-folder-icon) + (wl-folder-pop3-glyph . wl-pop-folder-icon) + (wl-folder-localdir-glyph . wl-localdir-folder-icon) + (wl-folder-localnews-glyph . wl-localnews-folder-icon) + (wl-folder-internal-glyph . wl-internal-folder-icon) + (wl-folder-multi-glyph . wl-multi-folder-icon) + (wl-folder-filter-glyph . wl-filter-folder-icon) + (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) + (wl-folder-trash-glyph . wl-trash-folder-icon))) (defun wl-folder-init-icons () (dolist (icon wl-folder-internal-icon-list) @@ -438,43 +442,52 @@ (set-specifier scrollbar-height (cons (current-buffer) 0))) (wl-xmas-setup-summary-toolbar)) -(defun wl-message-overload-functions () - (wl-xmas-setup-message-toolbar) - (local-set-key "l" 'wl-message-toggle-disp-summary) - (local-set-key 'button2 'wl-message-refer-article-or-url) - (local-set-key 'button4 'wl-message-wheel-down) - (local-set-key 'button5 'wl-message-wheel-up) - (local-set-key [(shift button4)] 'wl-message-wheel-down) - (local-set-key [(shift button5)] 'wl-message-wheel-up) - (set-keymap-parent wl-message-button-map (current-local-map)) - (define-key wl-message-button-map 'button2 - 'wl-message-button-dispatcher)) +(defalias 'wl-setup-message 'wl-xmas-setup-message-toolbar) + +(defun wl-message-define-keymap () + (let ((keymap (make-sparse-keymap))) + (define-key keymap "D" 'wl-message-delete-current-part) + (define-key keymap "l" 'wl-message-toggle-disp-summary) + (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) + (define-key keymap [(shift button5)] 'wl-message-wheel-up) + (set-keymap-parent wl-message-button-map keymap) + (define-key wl-message-button-map 'button2 + 'wl-message-button-dispatcher) + keymap)) (defun wl-message-wheel-up (event) (interactive "e") - (let ((cur-buf (current-buffer)) - proceed) - (save-selected-window - (select-window (event-window event)) - (set-buffer cur-buf) - (setq proceed (wl-message-next-page))) - (when proceed - (if (memq 'shift (event-modifiers event)) - (wl-summary-down t) - (wl-summary-next t))))) + (if (string-match (regexp-quote wl-message-buffer-name) + (regexp-quote (buffer-name))) + (wl-message-prev-page) + (let ((cur-buf (current-buffer)) + proceed) + (save-selected-window + (select-window (event-window event)) + (set-buffer cur-buf) + (setq proceed (wl-message-next-page))) + (when proceed + (if (memq 'shift (event-modifiers event)) + (wl-summary-down t) + (wl-summary-next t)))))) (defun wl-message-wheel-down (event) (interactive "e") - (let ((cur-buf (current-buffer)) - proceed) - (save-selected-window - (select-window (event-window event)) - (set-buffer cur-buf) - (setq proceed (wl-message-prev-page))) - (when proceed - (if (memq 'shift (event-modifiers event)) - (wl-summary-up t) - (wl-summary-prev t))))) + (if (string-match (regexp-quote wl-message-buffer-name) + (regexp-quote (buffer-name))) + (wl-message-prev-page) + (let ((cur-buf (current-buffer)) + proceed) + (save-selected-window + (select-window (event-window event)) + (set-buffer cur-buf) + (setq proceed (wl-message-prev-page))) + (when proceed + (if (memq 'shift (event-modifiers event)) + (wl-summary-up t) + (wl-summary-prev t)))))) (defun wl-draft-overload-menubar () (when (featurep 'menubar) @@ -483,7 +496,14 @@ (add-menu-item '("Mail") "Send Message" 'wl-draft-send-and-exit t "Send and Exit") (delete-menu-item '("Mail" "Send Mail")) - (delete-menu-item '("Mail" "Send and Exit")))) + (delete-menu-item '("Mail" "Send and Exit")) + (add-menu-item '("Mail") "Preview Message" + 'wl-draft-preview-message t "Cancel") + (add-menu-item '("Mail") "Save Draft and Exit" + 'wl-draft-save-and-exit t "Cancel") + (add-menu-item '("Mail") "Kill Current Draft" + 'wl-draft-kill t "Cancel") + (delete-menu-item '("Mail" "Cancel")))) (defun wl-draft-mode-setup () (require 'derived) @@ -508,10 +528,11 @@ 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-c\C-x" 'wl-draft-insert-x-face-field) - (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer)) + (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)) (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification)