Don't require `vc' during compilation;

requiring it leads to a recursive loading of vc.el and vc-hooks.el
during bootstrap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55b0ecb024024ecf3443b79e549ee56c63308de3..36a589d672262bc5ac1bfd7477b3a7a1ab29b1e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-06  Gerd Moellmann  <gerd@gnu.org>
+
+       * vc-hooks.el (toplevel): Don't require `vc' during compilation;
+       requiring it leads to a recursive loading of vc.el and vc-hooks.el
+       during bootstrap.
+
 2000-09-05  Stefan Monnier  <monnier@cs.yale.edu>
 
        * vc.el: (toplevel): Don't require `dired' at run-time.

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 4554e1e68604a2ad2983731d0c4489eedc380c4d..beaa468eab6d8f70dc5e378c8359e390dd0aafbe 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-hooks.el,v 1.116 2000/09/04 19:47:25 gerd Exp $
+;; $Id: vc-hooks.el,v 1.1 2000/09/06 09:19:14 gerd Exp gerd $
 
 ;; This file is part of GNU Emacs.
 
@@ -33,8 +33,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'vc))
+;(eval-when-compile
+;  (require 'vc))
 
 ;; Customization Variables (the rest is in vc.el)