From: Glenn Morris <rgm@gnu.org>
Date: Thu, 12 Jun 2008 03:49:52 +0000 (+0000)
Subject: (vc-dir-mode): Check tool-bar-mode is bound.
X-Git-Tag: emacs-pretest-23.0.90~4868
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b9ebb348af24cdc11c4fa1bbabdd3b4006cf64c;p=emacs.git

(vc-dir-mode): Check tool-bar-mode is bound.
---

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 6bd43cb2644..066e45f08cc 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -1354,7 +1354,8 @@ U - if the cursor is on a file: unmark all the files with the same state
   (setq major-mode 'vc-dir-mode)
   (setq buffer-read-only t)
   (use-local-map vc-dir-mode-map)
-  (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map)
+  (if (boundp 'tool-bar-map)
+      (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map))
   (set (make-local-variable 'vc-client-mode) client-object)
   (let ((buffer-read-only nil))
     (erase-buffer)