Mercurial > emacs
diff lisp/vc-rcs.el @ 76694:f35ed3fecce9
(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.
author | Thien-Thi Nguyen <ttn@gnuvola.org> |
---|---|
date | Sat, 24 Mar 2007 11:32:37 +0000 |
parents | e3694f1cb928 |
children | 9355f9b7bbff cedd5b77aae4 dc002877ce12 4ef881a120fe |
line wrap: on
line diff
--- 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