(vc-dir-at-event): Rename from vc-at-event. Change

all callers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d2216b76d12b73f960da3a6c3b5d1c9c96b1a19..9adef563e0de3dd75e9bf1f451bbb37868e30263 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-dir.el (vc-dir-at-event): Rename from vc-at-event.  Change
+       all callers.
+
 2008-12-18  Sam Steingold  <sds@gnu.org>
 
        * vc-dir.el (vc-at-event): Handle (tool-bar) events. Fix bug#1585.

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index aaa5b1b58c1ee225f59ec4698949b2f62a8bf9f5..53e7d854dadf983e4ca79e18501f8813c19f0d98 100644 (file)
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -275,11 +275,11 @@ See `run-hooks'."
     map)
   "Keymap for directory buffer.")
 
-(defmacro vc-at-event (event &rest body)
+(defmacro vc-dir-at-event (event &rest body)
   "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 (make-symbol "vc-at-event-posn")))
+  (let ((posn (make-symbol "vc-dir-at-event-posn")))
     `(save-excursion
        (unless (equal ,event '(tool-bar))
          (let ((,posn (event-start ,event)))
@@ -290,7 +290,7 @@ If `body' uses `event', it should be a variable,
 (defun vc-dir-menu (e)
   "Popup the VC dir menu."
   (interactive "e")
-  (vc-at-event e (popup-menu vc-dir-menu-map e)))
+  (vc-dir-at-event e (popup-menu vc-dir-menu-map e)))
 
 (defvar vc-dir-tool-bar-map
   (let ((map (make-sparse-keymap)))
@@ -676,7 +676,7 @@ that share the same state."
 
 (defun vc-dir-toggle-mark (e)
   (interactive "e")
-  (vc-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file)))
+  (vc-dir-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file)))
 
 (defun vc-dir-delete-file ()
   "Delete the marked files, or the current file if no marks."