[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/11 14:55:57

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -b -r1.479 -r1.480
--- vc.el       10 Nov 2007 05:22:16 -0000      1.479
+++ vc.el       11 Nov 2007 14:55:55 -0000      1.480
@@ -1637,10 +1637,14 @@
 \(current one if no file).  AFTER-HOOK specifies the local value
 for vc-log-operation-hook."
   (let ((parent
+         (if (eq major-mode 'vc-dired-mode)
+             ;; If we are called from VC dired, the parent buffer is
+             ;; the current buffer.
+             (current-buffer)
         (if (and files (equal (length files) 1))
             (get-file-buffer (car files))
-          (current-buffer))))
-    (if vc-before-checkin-hook
+             (current-buffer)))))
+    (when vc-before-checkin-hook
         (if files
             (with-current-buffer parent
               (run-hooks 'vc-before-checkin-hook))
@@ -1654,7 +1658,7 @@
     ;;(if file (vc-mode-line file))
     (vc-log-edit files)
     (make-local-variable 'vc-log-after-operation-hook)
-    (if after-hook
+    (when after-hook
        (setq vc-log-after-operation-hook after-hook))
     (setq vc-log-operation action)
     (setq vc-log-revision rev)