(defvar-maybe wl-folder-mode-map (make-sparse-keymap))
(defvar-maybe wl-draft-mode-map (make-sparse-keymap)))
+;; For Emacs 21.0.104 or earlier
+(defun-maybe make-mode-line-mouse-map (mouse function) "\
+Return a keymap with single entry for mouse key MOUSE on the mode line.
+MOUSE is defined to run function FUNCTION with no args in the buffer
+corresponding to the mode line clicked."
+ (let ((map (make-sparse-keymap)))
+ (define-key map (vector 'mode-line mouse) function)
+ map))
+
+;; `display-images-p' has not been available prior to Emacs 21.0.105.
+(defalias-maybe 'display-images-p 'display-graphic-p)
+
(add-hook 'wl-folder-mode-hook 'wl-setup-folder)
(add-hook 'wl-folder-mode-hook 'wl-folder-init-icons)
(add-hook 'wl-summary-mode-hook 'wl-setup-summary)
+(add-hook 'wl-message-display-internal-hook 'wl-setup-message)
+
(defvar wl-use-toolbar (image-type-available-p 'xpm))
(defvar wl-plugged-image nil)
(defvar wl-unplugged-image nil)
(eval-when-compile
(defmacro wl-e21-display-image-p ()
- '(and (display-graphic-p)
+ '(and (display-images-p)
(image-type-available-p 'xpm))))
(defun wl-e21-setup-toolbar (bar)
:color-symbols (("backgroundToolBarColor" . "None"))
:file))
(success t)
- icon up down disabled name success)
+ icon up down disabled name)
(while bar
(setq icon (aref (pop bar) 0))
(unless (boundp icon)
(wl-e21-make-toolbar-buttons wl-summary-mode-map wl-summary-toolbar)))
(eval-when-compile
- (defsubst wl-e21-setup-message-toolbar (keymap)
- (when (wl-e21-setup-toolbar wl-message-toolbar)
- (wl-e21-make-toolbar-buttons keymap wl-message-toolbar)))
-
(defsubst wl-e21-setup-draft-toolbar ()
(when (wl-e21-setup-toolbar wl-draft-toolbar)
(wl-e21-make-toolbar-buttons wl-draft-mode-map wl-draft-toolbar))))
+(defun wl-e21-setup-message-toolbar ()
+ (when (wl-e21-setup-toolbar wl-message-toolbar)
+ (wl-e21-make-toolbar-buttons (current-local-map) wl-message-toolbar)))
+
(defvar wl-folder-toggle-icon-list
'((wl-folder-opened-image . wl-opened-group-folder-icon)
(wl-folder-closed-image . wl-closed-group-folder-icon)))
(let ((inhibit-read-only t))
(if (and wl-highlight-folder-by-numbers
numbers (nth 0 numbers) (nth 1 numbers)
- (re-search-forward "[0-9-]+/[0-9-]+/[0-9-]+"
+ (re-search-forward "[-[:digit:]]+/[-[:digit:]]+/[-[:digit:]]+"
(line-end-position) t))
(let* ((unsync (nth 0 numbers))
(unread (nth 1 numbers))
(;; basic folder
(and (setq fld-name (wl-folder-get-folder-name-by-id
(get-text-property (point) 'wl-folder-entity-id)))
- (looking-at "[\t ]+\\([^\t\n ]+\\)"))
+ (looking-at "[[:blank:]]+\\([^[:blank:]\n]+\\)"))
(setq start (match-beginning 1)
end (match-end 1))
(let (image)
(when (display-color-p)
(wl-e21-highlight-folder-by-numbers
start end
- (if (looking-at (format "^[\t ]*\\(%s\\|%s\\)"
+ (if (looking-at (format "^[[:blank:]]*\\(?:%s\\|%s\\)"
wl-folder-unsubscribe-mark
wl-folder-removed-mark))
'wl-highlight-folder-killed-face
(when (wl-e21-display-image-p)
(save-excursion
(beginning-of-line)
- (when (looking-at "[\t ]*\\(\\[\\([^]]+\\)\\]\\)")
+ (when (looking-at "[[:blank:]]*\\(\\[\\([^]]+\\)\\]\\)")
(let* ((start (match-beginning 1))
(end (match-end 1))
(status (match-string-no-properties 2))
(if (wl-e21-display-image-p)
(let (type)
(cond ((string= folder wl-queue-folder)
- (concat (propertize " " 'display
- (get 'wl-folder-queue-image 'image))
+ (concat (get 'wl-folder-queue-image 'image)
string))
((setq type (elmo-folder-type folder))
- (concat (propertize " " 'display
- (get (intern (format "wl-folder-%s-image"
- type))
- 'image))
+ (concat (get (intern (format "wl-folder-%s-image"
+ type))
+ 'image)
string))
(t
string)))
(defun wl-plugged-init-icons ()
(let ((props (when (display-mouse-p)
- (list 'local-map (purecopy (make-mode-line-mouse2-map
- #'wl-toggle-plugged))
+ (list 'local-map (purecopy (make-mode-line-mouse-map
+ 'mouse-2 #'wl-toggle-plugged))
'help-echo "mouse-2 toggles plugged status"))))
(if (wl-e21-display-image-p)
(progn
(defun wl-biff-init-icons ()
(let ((props (when (display-mouse-p)
- (list 'local-map (purecopy (make-mode-line-mouse2-map
- #'wl-biff-check-folders))
+ (list 'local-map (purecopy (make-mode-line-mouse-map
+ 'mouse-2 #'wl-biff-check-folders))
'help-echo "mouse-2 checks new mails"))))
(if (wl-e21-display-image-p)
(progn
(defalias 'wl-setup-summary 'wl-e21-setup-summary-toolbar)
-(defun wl-message-overload-functions ()
- (let ((keymap (current-local-map)))
- (when keymap
- (wl-e21-setup-message-toolbar keymap)
- (define-key keymap "l" 'wl-message-toggle-disp-summary)
- (define-key keymap [mouse-2] 'wl-message-refer-article-or-url)
- (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)
- (define-key keymap [S-mouse-5] 'wl-message-wheel-up)
- (set-keymap-parent wl-message-button-map keymap)
- (define-key wl-message-button-map
- [mouse-2] 'wl-message-button-dispatcher))))
+(defvar widget-keymap)
+(defun wl-message-define-keymap ()
+ (let ((keymap (make-sparse-keymap)))
+ (define-key keymap "l" 'wl-message-toggle-disp-summary)
+ (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)
+ (define-key keymap [S-mouse-5] 'wl-message-wheel-up)
+ (when (and (get 'mime-button 'widget-type) ; mime-button is defined.
+ (boundp 'widget-keymap))
+ (set-keymap-parent keymap widget-keymap))
+ (set-keymap-parent wl-message-button-map keymap)
+ (define-key wl-message-button-map
+ [mouse-2] 'wl-message-button-dispatcher)
+ keymap))
+
+(defalias 'wl-setup-message 'wl-e21-setup-message-toolbar)
(defun wl-message-wheel-up (event)
(interactive "e")
(defun wl-draft-key-setup ()
(define-key wl-draft-mode-map "\C-c\C-y" 'wl-draft-yank-original)
(define-key wl-draft-mode-map "\C-c\C-s" 'wl-draft-send)
- (define-key wl-draft-mode-map "\C-c\C-a" 'wl-draft-insert-x-face-field)
(define-key wl-draft-mode-map "\C-c\C-c" 'wl-draft-send-and-exit)
(define-key wl-draft-mode-map "\C-c\C-z" 'wl-draft-save-and-exit)
(define-key wl-draft-mode-map "\C-c\C-k" 'wl-draft-kill)
(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-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))
projects / elisp / wanderlust.git / blobdiff