changeset 98625:e80860881779

* pmail.el (pmail-tool-bar-map): Initialize it unconditionally.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 11 Oct 2008 19:56:16 +0000
parents 14621c767c96
children 5ea82b1a813b
files lisp/mail/pmail.el
diffstat 1 files changed, 26 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/pmail.el	Sat Oct 11 19:45:51 2008 +0000
+++ b/lisp/mail/pmail.el	Sat Oct 11 19:56:16 2008 +0000
@@ -1203,33 +1203,32 @@
 
 ;; 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))