Mercurial > emacs
comparison lisp/vc.el @ 4480:208145c77950
* vc.el (vc-diff, vc-directory-18): Add missing paren to end of
vc-diff, and remove extra paren from vc-directory-18.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sun, 08 Aug 1993 00:44:26 +0000 |
| parents | 2c0ac46d5d5b |
| children | aeef9d07f78d |
comparison
equal
deleted
inserted
replaced
| 4479:9fab557f1e16 | 4480:208145c77950 |
|---|---|
| 737 (while vc-parent-buffer | 737 (while vc-parent-buffer |
| 738 (pop-to-buffer vc-parent-buffer)) | 738 (pop-to-buffer vc-parent-buffer)) |
| 739 (if historic | 739 (if historic |
| 740 (call-interactively 'vc-version-diff) | 740 (call-interactively 'vc-version-diff) |
| 741 (if (or (null buffer-file-name) (null (vc-name buffer-file-name))) | 741 (if (or (null buffer-file-name) (null (vc-name buffer-file-name))) |
| 742 (error "There is no version-control master associated with this buffer")) | 742 (error |
| 743 "There is no version-control master associated with this buffer")) | |
| 743 (let ((file buffer-file-name) | 744 (let ((file buffer-file-name) |
| 744 unchanged) | 745 unchanged) |
| 745 (or (and file (vc-name file)) | 746 (or (and file (vc-name file)) |
| 746 (vc-registration-error file)) | 747 (vc-registration-error file)) |
| 747 (vc-buffer-sync) | 748 (vc-buffer-sync) |
| 761 (if (= 0 (buffer-size)) | 762 (if (= 0 (buffer-size)) |
| 762 (progn | 763 (progn |
| 763 (setq unchanged t) | 764 (setq unchanged t) |
| 764 (message "No changes to %s since latest version." file)) | 765 (message "No changes to %s since latest version." file)) |
| 765 (goto-char (point-min)) | 766 (goto-char (point-min)) |
| 766 (shrink-window-if-larger-than-buffer) | 767 (shrink-window-if-larger-than-buffer))) |
| 767 ) | 768 (not unchanged)))) |
| 768 (not unchanged) | |
| 769 ) | |
| 770 ) | |
| 771 ) | |
| 772 | 769 |
| 773 (defun vc-version-diff (file rel1 rel2) | 770 (defun vc-version-diff (file rel1 rel2) |
| 774 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | 771 "For FILE, report diffs between two stored versions REL1 and REL2 of it. |
| 775 If FILE is a directory, generate diffs between versions for all registered | 772 If FILE is a directory, generate diffs between versions for all registered |
| 776 files in or below it." | 773 files in or below it." |
| 952 (pop-to-buffer "*vc-status*" t) | 949 (pop-to-buffer "*vc-status*" t) |
| 953 (goto-char (point-min)) | 950 (goto-char (point-min)) |
| 954 (shrink-window-if-larger-than-buffer))) | 951 (shrink-window-if-larger-than-buffer))) |
| 955 (message "No files are currently %s under %s" | 952 (message "No files are currently %s under %s" |
| 956 (if verbose "registered" "locked") default-directory)) | 953 (if verbose "registered" "locked") default-directory)) |
| 957 )) | 954 ) |
| 958 | 955 |
| 959 (or (boundp 'minor-mode-map-alist) | 956 (or (boundp 'minor-mode-map-alist) |
| 960 (fset 'vc-directory 'vc-directory-18)) | 957 (fset 'vc-directory 'vc-directory-18)) |
| 961 | 958 |
| 962 ; Emacs 18 also lacks these. | 959 ; Emacs 18 also lacks these. |