Mercurial > emacs
comparison lisp/vc.el @ 85175:7d4d92ce0b88
Corrected version of Juanma's fix patch.
.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 11 Oct 2007 16:53:58 +0000 |
| parents | 9a5e220ae278 |
| children | 435ebb14becf |
comparison
equal
deleted
inserted
replaced
| 85174:32540f0e375c | 85175:7d4d92ce0b88 |
|---|---|
| 1880 (pop-to-buffer "*vc-diff*") | 1880 (pop-to-buffer "*vc-diff*") |
| 1881 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's | 1881 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's |
| 1882 ;; not available. Work around that. | 1882 ;; not available. Work around that. |
| 1883 (if (require 'diff-mode nil t) (diff-mode)) | 1883 (if (require 'diff-mode nil t) (diff-mode)) |
| 1884 (when verbose | 1884 (when verbose |
| 1885 (let (buffer-read-only t) | 1885 (let (buffer-read-only) |
| 1886 (goto-char (point-max)) | 1886 (goto-char (point-max)) |
| 1887 (if verbose | 1887 (insert (format "\n\nDiffs between %s and %s end here." rev1-name rev2-name)) |
| 1888 (insert (format "\n\nDiffs between %s and %s end here." rev1-name rev2-name))) | |
| 1889 (goto-char (point-min)) | 1888 (goto-char (point-min)) |
| 1890 (if verbose | 1889 (insert (format "Diffs between %s and %s:\n\n" rev1-name rev2-name)))) |
| 1891 (insert (format "Diffs between %s and %s:\n\n" rev1-name rev2-name))))) | |
| 1892 (shrink-window-if-larger-than-buffer) | 1890 (shrink-window-if-larger-than-buffer) |
| 1893 t) | 1891 t) |
| 1894 (progn | 1892 (progn |
| 1895 (message "No changes between %s and %s" rev1-name rev2-name) | 1893 (message "No changes between %s and %s" rev1-name rev2-name) |
| 1896 nil))) | 1894 nil))) |