[Emacs-diffs] emacs/lisp ChangeLog vc-dir.el

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     08/12/18 03:29:06

Modified files:
        lisp           : ChangeLog vc-dir.el 

Log message:
        (vc-at-event): Handle (tool-bar) events. Fix bug#1585.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14955&r2=1.14956
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14955
retrieving revision 1.14956
diff -u -b -r1.14955 -r1.14956
--- ChangeLog   18 Dec 2008 01:17:07 -0000      1.14955
+++ ChangeLog   18 Dec 2008 03:29:02 -0000      1.14956
@@ -1,3 +1,7 @@
+2008-12-18  Sam Steingold  <address@hidden>
+
+       * vc-dir.el (vc-at-event): Handle (tool-bar) events. Fix bug#1585.
+
 2008-12-18  Juri Linkov  <address@hidden>
 
        * isearch.el (minibuffer-local-isearch-map): Unbind "C-w" from

Index: vc-dir.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- vc-dir.el   4 Nov 2008 08:58:27 -0000       1.27
+++ vc-dir.el   18 Dec 2008 03:29:06 -0000      1.28
@@ -280,11 +280,12 @@
 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 (event-start ,event)))
-       (save-excursion
+    `(save-excursion
+       (unless (equal ,event '(tool-bar))
+         (let ((,posn (event-start ,event)))
          (set-buffer (window-buffer (posn-window ,posn)))
-         (goto-char (posn-point ,posn))
-         ,@body))))
+           (goto-char (posn-point ,posn))))
+       ,@body)))
 
 (defun vc-dir-menu (e)
   "Popup the VC dir menu."