summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc-dir.el1
-rw-r--r--lisp/vc.el2
3 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 194b58aa093..85e3e91ab3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-26 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * vc-dir.el (tool-bar): Require.
+
+ * vc.el (ewoc, tool-bar): Do no require.
+
2008-06-26 Kenichi Handa <handa@m17n.org>
* composite.el (terminal-composition-base-character-p): New function.
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 7963d9cd388..68abb053a31 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -39,6 +39,7 @@
(require 'vc-hooks)
(require 'vc)
+(require 'tool-bar)
(require 'ewoc)
;;; Code:
diff --git a/lisp/vc.el b/lisp/vc.el
index 6a5d420ccf9..6cc1dd9c680 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -650,8 +650,6 @@
(require 'vc-hooks)
(require 'vc-dispatcher)
-(require 'tool-bar)
-(require 'ewoc)
(eval-when-compile
(require 'cl))