diff options
| author | Jim Blandy | 1993-08-08 00:44:26 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-08-08 00:44:26 +0000 |
| commit | 064726ac89628fe46e57e20cbeb2f20074e43a36 (patch) | |
| tree | 36f8ce4fec993038dd7bad03b4c0e662b0883ac7 /lisp | |
| parent | 1b3250ab67e98c9deb8f51be46239e886f85c7ee (diff) | |
| download | emacs-064726ac89628fe46e57e20cbeb2f20074e43a36.tar.gz emacs-064726ac89628fe46e57e20cbeb2f20074e43a36.zip | |
* vc.el (vc-diff, vc-directory-18): Add missing paren to end of
vc-diff, and remove extra paren from vc-directory-18.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 7eb4b5c8f69..7a0102cd71d 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -739,7 +739,8 @@ and two version designators specifying which versions to compare." | |||
| 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)) |
| @@ -763,12 +764,8 @@ and two version designators specifying which versions to compare." | |||
| 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. |
| @@ -954,7 +951,7 @@ on a buffer attached to the file named in the current Dired buffer line." | |||
| 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)) |