[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#52855: vc-shrink-buffer
From: |
Juri Linkov |
Subject: |
bug#52855: vc-shrink-buffer |
Date: |
Tue, 28 Dec 2021 20:29:09 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) |
When no shrink is needed, two new hooks are added in this patch
with the default value containing vc-shrink-buffer to preserve
the current behavior that can be easily removed in user configuration
by e.g.:
(remove-hook 'vc-diff-finish-functions 'vc-shrink-buffer)
(remove-hook 'vc-log-finish-functions 'vc-shrink-buffer)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ba94d908d1..7b710efff7 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1730,12 +1730,22 @@ vc-switches
;; any switches in diff-switches.
(when (listp switches) switches))))
+(defun vc-shrink-buffer (&optional buffer)
+ "Call `shrink-window-if-larger-than-buffer' only when BUFFER is visible.
+BUFFER defaults to the current buffer."
+ (let ((window (get-buffer-window buffer t)))
+ (when window
+ (shrink-window-if-larger-than-buffer window))))
+
+(defvar vc-diff-finish-functions '(vc-shrink-buffer)
+ "Functions run at the end of the diff command.
+Each function runs in the diff output buffer without args.")
+
(defun vc-diff-finish (buffer messages)
;; The empty sync output case has already been handled, so the only
;; possibility of an empty output is for an async process.
(when (buffer-live-p buffer)
- (let ((window (get-buffer-window buffer t))
- (emptyp (zerop (buffer-size buffer))))
+ (let ((emptyp (zerop (buffer-size buffer))))
(with-current-buffer buffer
(and messages emptyp
(let ((inhibit-read-only t))
@@ -1744,8 +1754,7 @@ vc-diff-finish
(diff-setup-whitespace)
(diff-setup-buffer-type)
(goto-char (point-min))
- (when window
- (shrink-window-if-larger-than-buffer window)))
+ (run-hooks 'vc-diff-finish-functions))
(when (and messages (not emptyp))
(message "%sdone" (car messages))))))
@@ -2498,6 +2507,10 @@ vc-log-view-type
(put 'vc-log-view-type 'permanent-local t)
(defvar vc-sentinel-movepoint)
+(defvar vc-log-finish-functions '(vc-shrink-buffer)
+ "Functions run at the end of the log command.
+Each function runs in the log output buffer without args.")
+
(defun vc-log-internal-common (backend
buffer-name
files
@@ -2529,11 +2542,11 @@ vc-log-internal-common
(vc-run-delayed
(let ((inhibit-read-only t))
(funcall setup-buttons-func backend files retval)
- (shrink-window-if-larger-than-buffer)
(when goto-location-func
(funcall goto-location-func backend)
(setq vc-sentinel-movepoint (point)))
- (set-buffer-modified-p nil)))))
+ (set-buffer-modified-p nil)
+ (run-hooks 'vc-log-finish-functions)))))
(defun vc-incoming-outgoing-internal (backend remote-location buffer-name type)
(vc-log-internal-common
- bug#52855: vc-shrink-buffer,
Juri Linkov <=