[Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/10/12 13:46:14

Index: grep.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/grep.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- grep.el     11 Oct 2008 19:58:49 -0000      1.96
+++ grep.el     12 Oct 2008 13:46:13 -0000      1.97
@@ -228,6 +228,9 @@
 `compilation-minor-mode-map' is a cdr of this.")
 
 (defvar grep-mode-tool-bar-map
+  ;; When bootstrapping, tool-bar-map is not properly initialized yet,
+  ;; so don't do anything.
+  (when (keymapp (butlast tool-bar-map))
   (let ((map (butlast (copy-keymap tool-bar-map)))
        (help (last tool-bar-map))) ;; Keep Help last in tool bar
     (tool-bar-local-item
@@ -246,7 +249,7 @@
     (tool-bar-local-item
      "refresh" 'recompile 'recompile map
      :help "Restart grep")
-    (append map help)))
+      (append map help))))
 
 (defalias 'kill-grep 'kill-compilation)