Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 76693:518fe7945c1a | 76694:f35ed3fecce9 |
|---|---|
| 664 (apply 'concat | 664 (apply 'concat |
| 665 (format-time-string "%Y-%m-%d" (aref rda 1)) | 665 (format-time-string "%Y-%m-%d" (aref rda 1)) |
| 666 " " | 666 " " |
| 667 (aref rda 0) | 667 (aref rda 0) |
| 668 ls) | 668 ls) |
| 669 :vc-annotate-prefix t | |
| 669 :vc-rcs-r/d/a rda))) | 670 :vc-rcs-r/d/a rda))) |
| 670 (maphash | 671 (maphash |
| 671 (if all-me | 672 (if all-me |
| 672 (lambda (rda w) | 673 (lambda (rda w) |
| 673 (puthash rda (render rda (pad w) ": ") ht)) | 674 (puthash rda (render rda (pad w) ": ") ht)) |
| 686 | 687 |
| 687 (defun vc-rcs-annotate-time () | 688 (defun vc-rcs-annotate-time () |
| 688 "Return the time of the next annotation (as fraction of days) | 689 "Return the time of the next annotation (as fraction of days) |
| 689 systime, or nil if there is none. Also, reposition point." | 690 systime, or nil if there is none. Also, reposition point." |
| 690 (unless (eobp) | 691 (unless (eobp) |
| 691 (search-forward ": ") | 692 (prog1 (vc-annotate-convert-time |
| 692 (vc-annotate-convert-time | 693 (aref (get-text-property (point) :vc-rcs-r/d/a) 1)) |
| 693 (aref (get-text-property (point) :vc-rcs-r/d/a) 1)))) | 694 (goto-char (next-single-property-change (point) :vc-annotate-prefix))))) |
| 694 | 695 |
| 695 (defun vc-rcs-annotate-extract-revision-at-line () | 696 (defun vc-rcs-annotate-extract-revision-at-line () |
| 696 (aref (get-text-property (point) :vc-rcs-r/d/a) 0)) | 697 (aref (get-text-property (point) :vc-rcs-r/d/a) 0)) |
| 697 | 698 |
| 698 | 699 |
| 905 (if status (vc-file-setprop file 'vc-workfile-version version)) | 906 (if status (vc-file-setprop file 'vc-workfile-version version)) |
| 906 (and (eq status 'rev-and-lock) | 907 (and (eq status 'rev-and-lock) |
| 907 (vc-file-setprop file 'vc-state | 908 (vc-file-setprop file 'vc-state |
| 908 (cond | 909 (cond |
| 909 ((eq locking-user 'none) 'up-to-date) | 910 ((eq locking-user 'none) 'up-to-date) |
| 910 ((string= locking-user (vc-user-login-name file)) | 911 ((string= locking-user (vc-user-login-name file)) |
| 911 'edited) | 912 'edited) |
| 912 (t locking-user))) | 913 (t locking-user))) |
| 913 ;; If the file has headers, we don't want to query the | 914 ;; If the file has headers, we don't want to query the |
| 914 ;; master file, because that would eliminate all the | 915 ;; master file, because that would eliminate all the |
| 915 ;; performance gain the headers brought us. We therefore | 916 ;; performance gain the headers brought us. We therefore |