Mercurial > emacs

changeset 93145:9a34bf3a4363

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-git-annotate-extract-revision-at-line): Allow "^" in a version name.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 22 Mar 2008 17:21:48 +0000
parents 33c08cf9fb3a
children c73e70274c0c
files lisp/ChangeLog lisp/vc-git.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Mar 22 17:09:33 2008 +0000
+++ b/lisp/ChangeLog	Sat Mar 22 17:21:48 2008 +0000
@@ -1,5 +1,8 @@
 2008-03-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* vc-git.el (vc-git-annotate-extract-revision-at-line):
+	Allow "^" in a version name.
+
 	* vc-mtn.el (vc-mtn-state): Support the added state.
 
 2008-03-22  Carsten Dominik  <dominik@science.uva.nl>
--- a/lisp/vc-git.el	Sat Mar 22 17:09:33 2008 +0000
+++ b/lisp/vc-git.el	Sat Mar 22 17:21:48 2008 +0000
@@ -400,7 +400,7 @@
 (defun vc-git-annotate-extract-revision-at-line ()
   (save-excursion
     (move-beginning-of-line 1)
-    (and (looking-at "[0-9a-f]+")
+    (and (looking-at "[0-9a-f^][0-9a-f]+")
          (buffer-substring-no-properties (match-beginning 0) (match-end 0)))))
 
 ;;; SNAPSHOT SYSTEM