summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-03-21 19:28:14 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2022-03-21 19:28:14 +0100
commita5e8da4fa28a233f3c1dee25a31072df7db6cf61 (patch)
treee7792a3d8accaf28b892314529c35d28a99637fa /lisp/vc
parentfd5fe11211a469c42fb7142f5a26f577e8ff0010 (diff)
downloademacs-a5e8da4fa28a233f3c1dee25a31072df7db6cf61.tar.gz
Add new user option `diff-entire-buffers'
* lisp/vc/diff.el (diff-entire-buffers): New user option (bug#54060). (diff-file-local-copy): Use it. (diff-buffers): Mention it in the doc string.
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/diff.el14
1 files changed, 12 insertions, 2 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 4abcf6c15a7..926993eebb7 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -52,6 +52,12 @@ set (`vc-git-diff-switches' for git, for instance), and
"The command to use to run diff."
:type 'string)
+(defcustom diff-entire-buffers t
+ "If non-nil, diff the entire buffers, not just the visible part.
+If nil, only use the narrowed-to parts of the buffers."
+ :type 'boolean
+ :version "29.1")
+
;; prompt if prefix arg present
(defun diff-switches ()
(if current-prefix-arg
@@ -119,7 +125,9 @@ temporary file with the buffer's contents."
(if (bufferp file-or-buf)
(with-current-buffer file-or-buf
(let ((tempfile (make-temp-file "buffer-content-")))
- (write-region nil nil tempfile nil 'nomessage)
+ (if diff-entire-buffers
+ (write-region nil nil tempfile nil 'nomessage)
+ (write-region (point-min) (point-max) tempfile nil 'nomessage))
tempfile))
(file-local-copy file-or-buf)))
@@ -274,7 +282,9 @@ interactively for diff switches. Otherwise, the switches
specified in the variable `diff-switches' are passed to the
diff command.
-OLD and NEW may each be a buffer or a buffer name."
+OLD and NEW may each be a buffer or a buffer name.
+
+Also see the `diff-entire-buffers' variable."
(interactive
(let ((newb (read-buffer "Diff new buffer" (current-buffer) t))
(oldb (read-buffer "Diff original buffer"