Mercurial > emacs
comparison lisp/vc.el @ 83219:e86fc76a45e4
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
Add {arch}/=commit-merge-make-log
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
{arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 14 Oct 2004 14:42:03 +0000 |
parents | 47f53c5c9620 5f1d886ba411 |
children | ae7fab96922c |
comparison
equal
deleted
inserted
replaced
83218:47f53c5c9620 | 83219:e86fc76a45e4 |
---|---|
2999 (interactive) | 2999 (interactive) |
3000 (if mode (setq vc-annotate-display-mode mode)) | 3000 (if mode (setq vc-annotate-display-mode mode)) |
3001 (when buffer | 3001 (when buffer |
3002 (set-buffer buffer) | 3002 (set-buffer buffer) |
3003 (display-buffer buffer)) | 3003 (display-buffer buffer)) |
3004 (if (not vc-annotate-parent-ref) | 3004 (if (not vc-annotate-parent-rev) |
3005 (vc-annotate-mode)) | 3005 (vc-annotate-mode)) |
3006 (cond ((null vc-annotate-display-mode) | 3006 (cond ((null vc-annotate-display-mode) |
3007 (vc-annotate-display-default vc-annotate-ratio)) | 3007 (vc-annotate-display-default vc-annotate-ratio)) |
3008 ;; One of the auto-scaling modes | 3008 ;; One of the auto-scaling modes |
3009 ((eq vc-annotate-display-mode 'scale) | 3009 ((eq vc-annotate-display-mode 'scale) |