# HG changeset patch # User Thien-Thi Nguyen # Date 1174735957 0 # Node ID f35ed3fecce903f298d78099ced0f64fefd9a583 # Parent 518fe7945c1a2d67ea1c6a7dad2746ac2e616f1a (vc-rcs-annotate-command): Set text property :vc-annotate-prefix on the annotation text. (vc-rcs-annotate-time): Instead of searching for ": ", search for end of text propertized with :vc-annotate-prefix. diff -r 518fe7945c1a -r f35ed3fecce9 lisp/vc-rcs.el --- a/lisp/vc-rcs.el Sat Mar 24 09:51:52 2007 +0000 +++ b/lisp/vc-rcs.el Sat Mar 24 11:32:37 2007 +0000 @@ -666,6 +666,7 @@ " " (aref rda 0) ls) + :vc-annotate-prefix t :vc-rcs-r/d/a rda))) (maphash (if all-me @@ -688,9 +689,9 @@ "Return the time of the next annotation (as fraction of days) systime, or nil if there is none. Also, reposition point." (unless (eobp) - (search-forward ": ") - (vc-annotate-convert-time - (aref (get-text-property (point) :vc-rcs-r/d/a) 1)))) + (prog1 (vc-annotate-convert-time + (aref (get-text-property (point) :vc-rcs-r/d/a) 1)) + (goto-char (next-single-property-change (point) :vc-annotate-prefix))))) (defun vc-rcs-annotate-extract-revision-at-line () (aref (get-text-property (point) :vc-rcs-r/d/a) 0)) @@ -907,7 +908,7 @@ (vc-file-setprop file 'vc-state (cond ((eq locking-user 'none) 'up-to-date) - ((string= locking-user (vc-user-login-name file)) + ((string= locking-user (vc-user-login-name file)) 'edited) (t locking-user))) ;; If the file has headers, we don't want to query the