summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-10-11 19:56:32 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-10-11 19:56:32 +0000
commit675ccaf0171c41eb09cce771a0de386459293305 (patch)
tree55fdfbab1a5159de960476af03d1e444db871d93 /lisp/mail
parentafb465eb0e3f9f5558fa6cc38a50453576ff670f (diff)
downloademacs-675ccaf0171c41eb09cce771a0de386459293305.tar.gz
* pmail.el (pmail-tool-bar-map): Initialize it unconditionally.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/ChangeLog.pmail4
-rw-r--r--lisp/mail/pmail.el53
2 files changed, 30 insertions, 27 deletions
diff --git a/lisp/mail/ChangeLog.pmail b/lisp/mail/ChangeLog.pmail
index 21ef83ee595..6ba1c7c932c 100644
--- a/lisp/mail/ChangeLog.pmail
+++ b/lisp/mail/ChangeLog.pmail
@@ -1,3 +1,7 @@
+2008-10-11 Chong Yidong <cyd@stupidchicken.com>
+
+ * pmail.el (pmail-tool-bar-map): Initialize it unconditionally.
+
2008-10-05 Paul Reilly <pmr@pajato.com>
* pmail.el, pmailsum.el:
diff --git a/lisp/mail/pmail.el b/lisp/mail/pmail.el
index 86436663013..6dc03bef4d4 100644
--- a/lisp/mail/pmail.el
+++ b/lisp/mail/pmail.el
@@ -1203,33 +1203,32 @@ the region."
;; Pmail toolbar
(defvar pmail-tool-bar-map
- (if (display-graphic-p)
- (let ((map (make-sparse-keymap)))
- (tool-bar-local-item-from-menu 'pmail-get-new-mail "mail/inbox"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-next-undeleted-message "right-arrow"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-previous-undeleted-message "left-arrow"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-search "search"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-input "open"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-mail "mail/compose"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-reply "mail/reply-all"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-forward "mail/forward"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-delete-forward "close"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-output "mail/move"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-output-body-to-file "mail/save"
- map pmail-mode-map)
- (tool-bar-local-item-from-menu 'pmail-expunge "delete"
- map pmail-mode-map)
- map)))
+ (let ((map (make-sparse-keymap)))
+ (tool-bar-local-item-from-menu 'pmail-get-new-mail "mail/inbox"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-next-undeleted-message "right-arrow"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-previous-undeleted-message "left-arrow"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-search "search"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-input "open"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-mail "mail/compose"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-reply "mail/reply-all"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-forward "mail/forward"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-delete-forward "close"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-output "mail/move"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-output-body-to-file "mail/save"
+ map pmail-mode-map)
+ (tool-bar-local-item-from-menu 'pmail-expunge "delete"
+ map pmail-mode-map)
+ map))