From: Glenn Morris <rgm@gnu.org>
Date: Thu, 12 Jun 2008 03:58:11 +0000 (+0000)
Subject: Check tool-bar-map is bound.
X-Git-Tag: emacs-pretest-23.0.90~4859
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=219d0838417ab0a39bbcd5ebc0e26fe7d0315b15;p=emacs.git

Check tool-bar-map is bound.
---

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 05f850ee6ed..89f7c912f81 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-12  Glenn Morris  <rgm@gnu.org>
+
+	* mh-seq.el (tool-bar-map): Define for compiler.
+
+	* mh-folder.el (mh-folder-mode):
+	* mh-letter.el (mh-letter-mode):
+	* mh-show.el (mh-show-mode):  Check tool-bar-map is bound.
+
 2008-06-08  John Paul Wallington  <jpw@pobox.com>
 
 	* mh-acros.el (toplevel): Put `doc-string-elt' properties on
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 86f9518459a..d857b48cf8a 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1,6 +1,7 @@
 ;;; mh-folder.el --- MH-Folder mode
 
-;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -590,7 +591,8 @@ perform the operation on all messages in that region.
   (mh-do-in-gnu-emacs
     (unless mh-folder-tool-bar-map
         (mh-tool-bar-folder-buttons-init))
-    (set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map))
+    (if (boundp 'tool-bar-map)
+        (set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map)))
   (mh-do-in-xemacs
     (mh-tool-bar-init :folder))
   (make-local-variable 'font-lock-defaults)
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 15696ecbdf0..8c54111470a 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -1,7 +1,7 @@
 ;;; mh-letter.el --- MH-Letter mode
 
-;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;  2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -310,7 +310,8 @@ order).
   (mh-do-in-gnu-emacs
     (unless mh-letter-tool-bar-map
       (mh-tool-bar-letter-buttons-init))
-    (set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map))
+    (if (boundp 'tool-bar-map)
+        (set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map)))
   (mh-do-in-xemacs
     (mh-tool-bar-init :letter))
   ;; Set the local value of mh-mail-header-separator according to what is
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index bd7d218b989..5d52b2e8f2c 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -1,7 +1,7 @@
 ;;; mh-show.el --- MH-Show mode
 
-;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -847,7 +847,8 @@ See also `mh-folder-mode'.
 
 \\{mh-show-mode-map}"
   (mh-do-in-gnu-emacs
-    (set (make-local-variable 'tool-bar-map) mh-show-tool-bar-map))
+   (if (boundp 'tool-bar-map)
+       (set (make-local-variable 'tool-bar-map) mh-show-tool-bar-map)))
   (mh-do-in-xemacs
     (mh-tool-bar-init :show))
   (set (make-local-variable 'mail-header-separator) mh-mail-header-separator)