summaryrefslogtreecommitdiff
path: root/lisp/vc-rcs.el
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnuvola.org>2007-03-24 11:33:42 +0000
committerThien-Thi Nguyen <ttn@gnuvola.org>2007-03-24 11:33:42 +0000
commit53cc5b9c5723b9593ca80b8a984dbedb829ba2c4 (patch)
treee1a610c6fa9ddc0c7b6a3e9600912bc7cda36ecf /lisp/vc-rcs.el
parentae18604f6376c02ea825d810c047094e381a8dda (diff)
downloademacs-53cc5b9c5723b9593ca80b8a984dbedb829ba2c4.tar.gz
emacs-53cc5b9c5723b9593ca80b8a984dbedb829ba2c4.tar.bz2
emacs-53cc5b9c5723b9593ca80b8a984dbedb829ba2c4.zip
(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.
Diffstat (limited to 'lisp/vc-rcs.el')
-rw-r--r--lisp/vc-rcs.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index ae4758169f4..a4b3b11301e 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -666,6 +666,7 @@ Optional arg REVISION is a revision to annotate from."
" "
(aref rda 0)
ls)
+ :vc-annotate-prefix t
:vc-rcs-r/d/a rda)))
(maphash
(if all-me
@@ -688,9 +689,9 @@ encoded as fractional days."
"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 @@ Returns: nil if no headers were found
(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