(start (progn (beginning-of-line) (point)))
(inhibit-read-only t)
(text-face
- (cond ((looking-at wl-highlight-folder-opened-regexp)
+ (cond ((and (wl-folder-buffer-group-p)
+ (looking-at wl-highlight-folder-opened-regexp))
'wl-highlight-folder-opened-face)
- ((looking-at wl-highlight-folder-closed-regexp)
+ ((and (wl-folder-buffer-group-p)
+ (looking-at wl-highlight-folder-closed-regexp))
'wl-highlight-folder-closed-face)
(t
(if (looking-at (format "^[ \t]*\\(%s\\|%s\\)"
(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 "\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 [mouse-4] 'wl-message-wheel-down)
(define-key keymap [mouse-5] 'wl-message-wheel-up)
(define-key keymap [S-mouse-4] 'wl-message-wheel-down)
(defun wl-message-wheel-up (event)
(interactive "e")
- (if (string-match (regexp-quote wl-message-buffer-cache-name)
+ (if (string-match (regexp-quote wl-message-buffer-name)
(regexp-quote (buffer-name)))
(wl-message-next-page)
(let ((cur-buf (current-buffer))
(defun wl-message-wheel-down (event)
(interactive "e")
- (if (string-match (regexp-quote wl-message-buffer-cache-name)
+ (if (string-match (regexp-quote wl-message-buffer-name)
(regexp-quote (buffer-name)))
(wl-message-prev-page)
(let ((cur-buf (current-buffer))
(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-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 "\M-p" 'wl-draft-previous-history-element)
+ (define-key wl-draft-mode-map "\M-n" 'wl-draft-next-history-element))
(defun wl-draft-overload-menubar ()
- (local-set-key [menu-bar mail send]
- '("Send Message" . wl-draft-send-and-exit))
- (local-set-key [menu-bar mail send-stay]
- '("Send, Keep Editing" . wl-draft-send))
- (local-set-key [menu-bar mail cancel]
- '("Kill Current Draft" . wl-draft-kill))
- (local-set-key [menu-bar mail yank]
- '("Cite Message" . wl-draft-yank-original))
- (local-set-key [menu-bar mail signature]
- '("Insert Signature" . insert-signature))
- (local-set-key [menu-bar headers fcc]
- '("Fcc" . wl-draft-fcc)))
+ (let ((keymap (current-local-map)))
+ (define-key keymap [menu-bar mail send]
+ '("Send Message" . wl-draft-send-and-exit))
+ (define-key keymap [menu-bar mail send-stay]
+ '("Send, Keep Editing" . wl-draft-send))
+ (define-key-after (lookup-key keymap [menu-bar mail])
+ [mail-sep-send] '("--")
+ 'send-stay)
+ (define-key keymap [menu-bar mail cancel]
+ '("Kill Current Draft" . wl-draft-kill))
+ (define-key-after (lookup-key keymap [menu-bar mail])
+ [save] '("Save Draft and Exit" . wl-draft-save-and-exit)
+ 'cancel)
+ (define-key-after (lookup-key keymap [menu-bar mail])
+ [mail-sep-exit] '("--")
+ 'save)
+ (define-key-after (lookup-key keymap [menu-bar mail])
+ [preview] '("Preview Message" . wl-draft-preview-message)
+ 'mail-sep-exit)
+ (define-key keymap [menu-bar mail yank]
+ '("Cite Message" . wl-draft-yank-original))
+ (define-key keymap [menu-bar mail signature]
+ '("Insert Signature" . insert-signature))
+ (define-key keymap [menu-bar headers fcc]
+ '("Fcc" . wl-draft-fcc))))
(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-draft-overload-menubar))
;; for "ja-mule-canna-2.3.mini" on PocketBSD
nil))))
match)))))
-(defun wl-read-event-char ()
+(defun wl-read-event-char (&optional prompt)
"Get the next event."
- (let ((event (read-event)))
+ (let ((event (read-event prompt)))
(cons (and (numberp event) event) event)))
(require 'product)