Mercurial > emacs
comparison lisp/vc.el @ 82907:92ccd83174e6
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 27 Aug 2007 04:00:19 +0000 |
parents | ea5864b698fd 3ec4d1da6eeb |
children | 64474f5a185a b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
82906:69b183268e31 | 82907:92ccd83174e6 |
---|---|
3409 (when newrev | 3409 (when newrev |
3410 (vc-annotate vc-annotate-parent-file newrev | 3410 (vc-annotate vc-annotate-parent-file newrev |
3411 vc-annotate-parent-display-mode | 3411 vc-annotate-parent-display-mode |
3412 buf) | 3412 buf) |
3413 (goto-line (min oldline (progn (goto-char (point-max)) | 3413 (goto-line (min oldline (progn (goto-char (point-max)) |
3414 (previous-line) | 3414 (forward-line -1) |
3415 (line-number-at-pos))) buf))))) | 3415 (line-number-at-pos))) buf))))) |
3416 | 3416 |
3417 (defun vc-annotate-compcar (threshold a-list) | 3417 (defun vc-annotate-compcar (threshold a-list) |
3418 "Test successive cons cells of A-LIST against THRESHOLD. | 3418 "Test successive cons cells of A-LIST against THRESHOLD. |
3419 Return the first cons cell with a car that is not less than THRESHOLD, | 3419 Return the first cons cell with a car that is not less than THRESHOLD, |