[Emacs-diffs] /srv/bzr/emacs/trunk r99627: Correct pathname for vc-git-annotate-extract-revision-at-line (Bug#5657)

[Chong Yidong]

------------------------------------------------------------
revno: 99627
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-07 09:45:53 -0500
message:
  Correct pathname for vc-git-annotate-extract-revision-at-line (Bug#5657)
  
  * vc-git.el (vc-git-annotate-extract-revision-at-line): Use
  vc-git-root as default direcotry for revision path (Bug#5657).
modified:
  lisp/ChangeLog
  lisp/vc-git.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-06 18:23:23 +0000
+++ b/lisp/ChangeLog    2010-03-07 14:45:53 +0000
@@ -1,3 +1,8 @@
+2010-03-07  Štěpán Němec  <address@hidden>  (tiny change)
+
+       * vc-git.el (vc-git-annotate-extract-revision-at-line): Use
+       vc-git-root as default direcotry for revision path (Bug#5657).
+
 2010-03-06  Chong Yidong  <address@hidden>
 
        * calculator.el (calculator): Don't bind split-window-keep-point

=== modified file 'lisp/vc-git.el'
--- a/lisp/vc-git.el    2010-03-06 04:05:47 +0000
+++ b/lisp/vc-git.el    2010-03-07 14:45:53 +0000
@@ -703,7 +703,8 @@
     (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?")
       (let ((revision (match-string-no-properties 1)))
        (if (match-beginning 2)
-         (cons revision (expand-file-name (match-string-no-properties 3)))
+           (cons revision (expand-file-name (match-string-no-properties 3)
+                                            (vc-git-root default-directory)))
          revision)))))
 
 ;;; TAG SYSTEM