update packages and add valign

lisp/diff-hl/diff-hl.el

@@ -5,8 +5,8 @@
 ;; Author:   Dmitry Gutov <dmitry@gutov.dev>
 ;; URL:      https://github.com/dgutov/diff-hl
 ;; Keywords: vc, diff
-;; Package-Version: 20251216.242
-;; Package-Revision: e79aa49ad3cb
+;; Package-Version: 20260328.1925
+;; Package-Revision: b965e19e6e7f
 ;; Package-Requires: ((cl-lib "0.2") (emacs "26.1"))
 
 ;; This file is part of GNU Emacs.
@@ -143,6 +143,11 @@ enclosed in a `progn' form.  ELSE-FORMS may be empty."
   :group 'diff-hl
   :type 'boolean)
 
+(defcustom diff-hl-next-previous-hunk-auto-recenter nil
+  "Non-nil to `recenter' after `diff-hl-next-hunk' and `diff-hl-previous-hunk'."
+  :group 'diff-hl
+  :type 'boolean)
+
 (defcustom diff-hl-fallback-to-margin t
   "Non-nil to use margin instead of fringe on non-graphic displays.
 
@@ -316,10 +321,13 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
                     (expt text-scale-mode-step text-scale-mode-amount)
                   1))
          (spacing (or (and (display-graphic-p) (default-value 'line-spacing)) 0))
+         (total-spacing (pcase spacing
+                          ((pred numberp) spacing)
+                          (`(,above . ,below) (+ above below))))
          (h (+ (ceiling (* (frame-char-height) scale))
-               (if (floatp spacing)
-                   (truncate (* (frame-char-height) spacing))
-                 spacing)))
+               (if (floatp total-spacing)
+                   (truncate (* (frame-char-height) total-spacing))
+                 total-spacing)))
          (w (min (frame-parameter nil (intern (format "%s-fringe" diff-hl-side)))
                  diff-hl-bmp-max-width))
          (_ (when (zerop w) (setq w diff-hl-bmp-max-width)))
@@ -483,12 +491,14 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
          (hide-staged (and (eq backend 'Git) (not diff-hl-show-staged-changes))))
     (when backend
       (let ((state (vc-state file backend))
-            ;; Workaround for debbugs#78946.
+            ;; Workaround for debbugs#78946 for the `thread' async update method.
             ;; This is fiddly, but we basically allow the thread to start, while
             ;; prohibiting the async process call inside.
-            ;; That still makes it partially async.
-            (diff-hl-update-async (and (not (eq window-system 'ns))
-                                       (eq diff-hl-update-async t))))
+            ;; That still makes it partially async on macOS.
+            ;; Or just use "simple async" if your Emacs is new enough.
+            (diff-hl-update-async (or (and (eq diff-hl-update-async 'thread)
+                                           (not (eq window-system 'ns)))
+                                      (eq diff-hl-update-async t))))
         (cond
          ((and
            (not diff-hl-highlight-reference-function)
@@ -581,11 +591,6 @@ contents as they are (or would be) after applying the changes in NEW."
       (setq old (cdr old)))
     ref))
 
-(defun diff-hl-process-wait (buf)
-  (let ((proc (get-buffer-process buf)))
-    (while (process-live-p proc)
-      (accept-process-output proc 0.01))))
-
 (defun diff-hl-changes-from-buffer (buf)
   (with-current-buffer buf
     (let (res)
@@ -765,8 +770,9 @@ Return a list of line overlays used."
      ((eq (process-status proc) 'signal))
      ;; If a process is running, set the sentinel.
      ((eq (process-status proc) 'run)
-      (set-process-sentinel
-       proc
+      (add-function
+       :after
+       (process-sentinel proc)
        (lambda (proc _status)
          ;; Delegate to the parent cond for decision logic.
          (diff-hl--when-done buffer get-value callback proc))))
@@ -1110,9 +1116,11 @@ its end position."
   "Go to the beginning of the next hunk in the current buffer."
   (interactive)
   (let ((overlay (diff-hl-search-next-hunk backward)))
-    (if overlay
-        (goto-char (overlay-start overlay))
-      (user-error "No further hunks found"))))
+    (unless overlay
+      (user-error "No further hunks found"))
+    (goto-char (overlay-start overlay))
+    (when diff-hl-next-previous-hunk-auto-recenter
+      (recenter))))
 
 (defun diff-hl-previous-hunk ()
   "Go to the beginning of the previous hunk in the current buffer."
@@ -1120,7 +1128,8 @@ its end position."
   (diff-hl-next-hunk t))
 
 (defun diff-hl-find-current-hunk ()
-  (let (o)
+  (let ((o)
+        (diff-hl-next-previous-hunk-auto-recenter nil))
     (cond
      ((diff-hl-hunk-overlay-at (point)))
      ((setq o (diff-hl-search-next-hunk t))