From: Dan Nicolaescu Date: Sat, 22 Mar 2008 17:21:48 +0000 (+0000) Subject: (vc-git-annotate-extract-revision-at-line): X-Git-Tag: emacs-pretest-23.0.90~6991 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd3ffb9a381f5fb3ef61988d0c0733b33c059c8f;p=emacs.git (vc-git-annotate-extract-revision-at-line): Allow "^" in a version name. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dbdf5ab03ad..f7bacf9b31b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-03-22 Dan Nicolaescu + * 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 diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 8bbb16a62a0..36d17ad4a75 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -400,7 +400,7 @@ or BRANCH^ (where \"^\" can be repeated)." (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