Mercurial > emacs
comparison lisp/vc.el @ 83676:27d11c1d4e46
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* 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--multi-tty--0--patch-38
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 27 Aug 2007 09:21:49 +0000 |
parents | 92ccd83174e6 |
children | 64474f5a185a b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
83675:67601f702028 | 83676:27d11c1d4e46 |
---|---|
105 ;; BACKEND PROPERTIES | 105 ;; BACKEND PROPERTIES |
106 ;; | 106 ;; |
107 ;; * revision-granularity | 107 ;; * revision-granularity |
108 ;; | 108 ;; |
109 ;; Takes no arguments. Returns either 'file or 'repository. | 109 ;; Takes no arguments. Returns either 'file or 'repository. |
110 ;; FIXME: What does this mean? Why "repository"? | |
110 ;; | 111 ;; |
111 ;; STATE-QUERYING FUNCTIONS | 112 ;; STATE-QUERYING FUNCTIONS |
112 ;; | 113 ;; |
113 ;; * registered (file) | 114 ;; * registered (file) |
114 ;; | 115 ;; |
2379 (defun vc-dired-buffers-for-dir (dir) | 2380 (defun vc-dired-buffers-for-dir (dir) |
2380 "Return a list of all vc-dired buffers that currently display DIR." | 2381 "Return a list of all vc-dired buffers that currently display DIR." |
2381 (let (result) | 2382 (let (result) |
2382 ;; Check whether dired is loaded. | 2383 ;; Check whether dired is loaded. |
2383 (when (fboundp 'dired-buffers-for-dir) | 2384 (when (fboundp 'dired-buffers-for-dir) |
2384 (mapcar (lambda (buffer) | 2385 (mapc (lambda (buffer) |
2385 (with-current-buffer buffer | 2386 (with-current-buffer buffer |
2386 (if vc-dired-mode | 2387 (if vc-dired-mode |
2387 (setq result (append result (list buffer)))))) | 2388 (setq result (append result (list buffer)))))) |
2388 (dired-buffers-for-dir dir))) | 2389 (dired-buffers-for-dir dir))) |
2389 result)) | 2390 result)) |
3408 (when newrev | 3409 (when newrev |
3409 (vc-annotate vc-annotate-parent-file newrev | 3410 (vc-annotate vc-annotate-parent-file newrev |
3410 vc-annotate-parent-display-mode | 3411 vc-annotate-parent-display-mode |
3411 buf) | 3412 buf) |
3412 (goto-line (min oldline (progn (goto-char (point-max)) | 3413 (goto-line (min oldline (progn (goto-char (point-max)) |
3413 (previous-line) | 3414 (forward-line -1) |
3414 (line-number-at-pos))) buf))))) | 3415 (line-number-at-pos))) buf))))) |
3415 | 3416 |
3416 (defun vc-annotate-compcar (threshold a-list) | 3417 (defun vc-annotate-compcar (threshold a-list) |
3417 "Test successive cons cells of A-LIST against THRESHOLD. | 3418 "Test successive cons cells of A-LIST against THRESHOLD. |
3418 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, |