aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2007-10-11 16:53:58 +0000
committerEric S. Raymond2007-10-11 16:53:58 +0000
commitf23c992e985680ec7d5ef80d3aaf8879f9767573 (patch)
tree2e93bd7509e746126b069014b859ead066f04811
parentd69db164a17875a49496553f999bf7b351832b06 (diff)
downloademacs-f23c992e985680ec7d5ef80d3aaf8879f9767573.tar.gz
emacs-f23c992e985680ec7d5ef80d3aaf8879f9767573.zip
Corrected version of Juanma's fix patch.
.
-rw-r--r--lisp/vc.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index a72921d0e3d..9c2a5097498 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1882,13 +1882,11 @@ The meaning of REV1 and REV2 is the same as for `vc-revision-diff'."
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