(top-level): Revert previous change: require cl when compiling.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17f42d14d5dd5ad0e00de93c170bd2265e4b29db..0404a51edff378d3aa464f612d4bc2fdb1177e68 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
-<<<<<<< ChangeLog
+2008-05-16  John Paul Wallington  <jpw@pobox.com>
+
+       * vc-dispatcher.el (top-level): Revert previous change: require cl
+       when compiling.
+
 2008-05-16  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc.el (vc-default-status-printer)

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index f9ff4ba14804506f9fa2cb5c4ef320eec1649f83..b257025d5019b2a2a603f960e45049704bc54d9f 100644 (file)
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -122,8 +122,10 @@
 
 (require 'ewoc)
 
-;; General customization
+(eval-when-compile
+  (require 'cl))
 
+;; General customization
 (defcustom vc-logentry-check-hook nil
   "Normal hook run by `vc-finish-logentry'.
 Use this to impose your own rules on the entry in addition to any the