update packages

lisp/diff-hl/diff-hl-pkg.el

@@ -1,11 +1,11 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "diff-hl" "20250613.2144"
+(define-package "diff-hl" "20250710.145"
   "Highlight uncommitted changes using VC."
   '((cl-lib "0.2")
     (emacs  "26.1"))
   :url "https://github.com/dgutov/diff-hl"
-  :commit "830b05253ba8f35b80448e5de2201aecb6943840"
-  :revdesc "830b05253ba8"
+  :commit "08243a6e0b681c34eb4e4abf1d1c4c1b251ce91e"
+  :revdesc "08243a6e0b68"
   :keywords '("vc" "diff")
   :authors '(("Dmitry Gutov" . "dmitry@gutov.dev"))
   :maintainers '(("Dmitry Gutov" . "dmitry@gutov.dev")))

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: 20250613.2144
-;; Package-Revision: 830b05253ba8
+;; Package-Version: 20250710.145
+;; Package-Revision: 08243a6e0b68
 ;; Package-Requires: ((cl-lib "0.2") (emacs "26.1"))
 
 ;; This file is part of GNU Emacs.
@@ -389,7 +389,13 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
   (let* ((file buffer-file-name)
          (backend (vc-backend file)))
     (when backend
-      (let ((state (vc-state file backend)))
+      (let ((state (vc-state file backend))
+            ;; Workaround for debbugs#78946.
+            ;; 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 diff-hl-update-async
+                                       (not (eq window-system 'ns)))))
         (cond
          ((diff-hl-modified-p state)
           (diff-hl-changes-from-buffer
@@ -923,6 +929,7 @@ Pops up a diff buffer that can be edited to choose the changes to stage."
          (file buffer-file-name)
          (dest-buffer (get-buffer-create "*diff-hl-stage-some*"))
          (orig-buffer (current-buffer))
+         (diff-hl-update-async nil)
          ;; FIXME: If the file name has double quotes, these need to be quoted.
          (file-base (file-name-nondirectory file)))
     (with-current-buffer dest-buffer
@@ -965,14 +972,18 @@ Pops up a diff buffer that can be edited to choose the changes to stage."
 
 (defun diff-hl-stage-finish ()
   (interactive)
-  (let ((count 0))
-    (when (diff-hl-stage-diff diff-hl-stage--orig)
+  (let ((count 0)
+        (orig-buffer diff-hl-stage--orig))
+    (when (diff-hl-stage-diff orig-buffer)
       (save-excursion
         (goto-char (point-min))
         (while (re-search-forward diff-hunk-header-re-unified nil t)
           (cl-incf count)))
       (message "Staged %d hunks" count)
-      (bury-buffer))))
+      (bury-buffer)
+      (unless diff-hl-show-staged-changes
+        (with-current-buffer orig-buffer
+          (diff-hl-update))))))
 
 (defvar diff-hl-command-map
   (let ((map (make-sparse-keymap)))
@@ -1027,7 +1038,7 @@ The value of this variable is a mode line template as in
         (add-hook 'text-scale-mode-hook 'diff-hl-maybe-redefine-bitmaps nil t))
     (remove-hook 'after-save-hook 'diff-hl-update t)
     (remove-hook 'after-change-functions 'diff-hl-edit t)
-    (remove-hook 'find-file-hook 'diff-hl-update t)
+    (remove-hook 'find-file-hook 'diff-hl-update-once t)
     (remove-hook 'after-revert-hook 'diff-hl-after-revert t)
     (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)
     (remove-hook 'magit-not-reverted-hook 'diff-hl-update t)