diff options
| author | Stefan Monnier | 2008-04-09 20:42:39 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-04-09 20:42:39 +0000 |
| commit | 8f49a7254d9fce4e9d6cba135c285b329d5684e9 (patch) | |
| tree | 7f8445621c268e2c7fcdd0d656f6f7ed86b2af87 | |
| parent | 5bad314022cf58cdfcebd29d63ff15a5e68b2c9e (diff) | |
| download | emacs-8f49a7254d9fce4e9d6cba135c285b329d5684e9.tar.gz emacs-8f49a7254d9fce4e9d6cba135c285b329d5684e9.zip | |
(vc-cvs-diff-tree): Remove unused function.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 25 |
2 files changed, 4 insertions, 25 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a54975f5586..5971d250802 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-04-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc-cvs.el (vc-cvs-diff-tree): Remove unused function. | ||
| 4 | |||
| 1 | 2008-04-09 Michael Albinus <michael.albinus@gmx.de> | 5 | 2008-04-09 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp.el (tramp-find-file-name-coding-system-alist): New defun. | 7 | * net/tramp.el (tramp-find-file-name-coding-system-alist): New defun. |
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index e3ad094d557..2a6bbf51750 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -549,31 +549,6 @@ Will fail unless you have administrative privileges on the repo." | |||
| 549 | (vc-switches 'CVS 'diff)))) | 549 | (vc-switches 'CVS 'diff)))) |
| 550 | (if async 1 status))) ; async diff, pessimistic assumption | 550 | (if async 1 status))) ; async diff, pessimistic assumption |
| 551 | 551 | ||
| 552 | |||
| 553 | (defun vc-cvs-diff-tree (dir &optional rev1 rev2) | ||
| 554 | "Diff all files at and below DIR." | ||
| 555 | (with-current-buffer "*vc-diff*" | ||
| 556 | (setq default-directory dir) | ||
| 557 | (if (vc-stay-local-p dir) | ||
| 558 | ;; local diff: do it filewise, and only for files that are modified | ||
| 559 | (vc-file-tree-walk | ||
| 560 | dir | ||
| 561 | (lambda (f) | ||
| 562 | (vc-exec-after | ||
| 563 | `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) | ||
| 564 | ;; possible optimization: fetch the state of all files | ||
| 565 | ;; in the tree via vc-cvs-dir-state-heuristic | ||
| 566 | (unless (vc-up-to-date-p ',f) | ||
| 567 | (message "Looking at %s" ',f) | ||
| 568 | (vc-diff-internal ',f ',rev1 ',rev2)))))) | ||
| 569 | ;; cvs diff: use a single call for the entire tree | ||
| 570 | (let ((coding-system-for-read | ||
| 571 | (or coding-system-for-read 'undecided))) | ||
| 572 | (apply 'vc-cvs-command "*vc-diff*" 1 nil "diff" | ||
| 573 | (and rev1 (concat "-r" rev1)) | ||
| 574 | (and rev2 (concat "-r" rev2)) | ||
| 575 | (vc-switches 'CVS 'diff)))))) | ||
| 576 | |||
| 577 | (defconst vc-cvs-annotate-first-line-re "^[0-9]") | 552 | (defconst vc-cvs-annotate-first-line-re "^[0-9]") |
| 578 | 553 | ||
| 579 | (defun vc-cvs-annotate-process-filter (process string) | 554 | (defun vc-cvs-annotate-process-filter (process string) |