diff options
| author | Gerd Moellmann | 2000-09-06 10:41:41 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-09-06 10:41:41 +0000 |
| commit | 8ddceaf120e8cdabc557a0638d0b37a568407262 (patch) | |
| tree | eaee4c09db898118d12468993ecb546a70274ebb | |
| parent | 099bd78a963080c986d8374d8af79d32c5fe0ca3 (diff) | |
| download | emacs-8ddceaf120e8cdabc557a0638d0b37a568407262.tar.gz emacs-8ddceaf120e8cdabc557a0638d0b37a568407262.zip | |
Don't require `vc' during compilation;
requiring it leads to a recursive loading of vc.el and vc-hooks.el
during bootstrap.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 55b0ecb0240..36a589d6722 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2000-09-06 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * vc-hooks.el (toplevel): Don't require `vc' during compilation; | ||
| 4 | requiring it leads to a recursive loading of vc.el and vc-hooks.el | ||
| 5 | during bootstrap. | ||
| 6 | |||
| 1 | 2000-09-05 Stefan Monnier <monnier@cs.yale.edu> | 7 | 2000-09-05 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 8 | ||
| 3 | * vc.el: (toplevel): Don't require `dired' at run-time. | 9 | * vc.el: (toplevel): Don't require `dired' at run-time. |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 4554e1e6860..beaa468eab6 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-hooks.el,v 1.116 2000/09/04 19:47:25 gerd Exp $ | 8 | ;; $Id: vc-hooks.el,v 1.1 2000/09/06 09:19:14 gerd Exp gerd $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -33,8 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | ;;; Code: | 34 | ;;; Code: |
| 35 | 35 | ||
| 36 | (eval-when-compile | 36 | ;(eval-when-compile |
| 37 | (require 'vc)) | 37 | ; (require 'vc)) |
| 38 | 38 | ||
| 39 | ;; Customization Variables (the rest is in vc.el) | 39 | ;; Customization Variables (the rest is in vc.el) |
| 40 | 40 | ||