1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

(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.
This commit is contained in:
Thien-Thi Nguyen 2007-03-24 11:33:42 +00:00
parent ae18604f63
commit 53cc5b9c57
2 changed files with 13 additions and 5 deletions

View File

@ -1,7 +1,14 @@
2007-03-24 Thien-Thi Nguyen <ttn@gnu.org>
* vc-rcs.el (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.
2007-03-24 Martin Rudalics <rudalics@gmx.at>
* whitespace.el (top level): Remove calls putting
permanent-local nil property since these are no-ops.
permanent-local nil property since these are no-ops.
* man.el (Man-support-local-filenames): Assure that
default-directory exists when doing call-process.

View File

@ -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