2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4037a5d772..9e38b1236dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-16  John Paul Wallington  <jpw@pobox.com>
+
+        * vc-dispatcher.el (top-level): Don't require cl when compiling.
+        (vc-dir-mode-map): Fix backquote.
+        (vc-at-event): Doc fix.  Use `make-symbol' instead of `gensym'.
+
 2008-05-16  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-handle-write-region): Fix check for short
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 1d04a5541e4..f9ff4ba1480 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -122,9 +122,6 @@
 
 (require 'ewoc)
 
-(eval-when-compile
-  (require 'cl))
-
 ;; General customization
 
 (defcustom vc-logentry-check-hook nil
@@ -798,7 +795,7 @@ See `run-hooks'."
 
     ;; Hook up the menu.
     (define-key map [menu-bar vc-dir-mode]
-      '(menu-item
+      `(menu-item
         ;; This is used so that client modes can add mode-specific
         ;; menu items to vc-dir-menu-map.
         "*vc-dispatcher*" ,vc-dir-menu-map :filter vc-dir-menu-map-filter))
@@ -806,10 +803,10 @@ See `run-hooks'."
   "Keymap for directory buffer.")
 
 (defmacro vc-at-event (event &rest body)
-  "Evaluate `body' wich point located at event-start of `event'.
+  "Evaluate `body' with point located at event-start of `event'.
 If `body' uses `event', it should be a variable,
  otherwise it will be evaluated twice."
-  (let ((posn (gensym "vc-at-event-posn")))
+  (let ((posn (make-symbol "vc-at-event-posn")))
     `(let ((,posn (event-start ,event)))
        (save-excursion
          (set-buffer (window-buffer (posn-window ,posn)))