* vc-dir.el (tool-bar): Require.

* vc.el (ewoc, tool-bar): Do no require.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 194b58aa093c856d24a6ef616ad28fc7f16cec45..85e3e91ab3b97956af5aaee482dcea46202b9d92 100644 (file)
--- 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 7963d9cd388bca620388255d2a9fdc8c30e55f0c..68abb053a316bba97f8c791ccda1a95fdaf8e678 100644 (file)
--- 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 6a5d420ccf9cedc034e26f4beec7bee39f17120c..6cc1dd9c6807503e5295dfbbbcd9770e71d9cb4f 100644 (file)
--- 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))