Backport dabbrev-capf bugfix permanently

Closes #5556.

1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 5f5ec06..cdb8e20 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1042,6 +1042,17 @@ setting `imenu--index-alist' to nil before calling that function."
   (setq imenu--index-alist nil)
   (which-function))
 
+(static-if (version< emacs-version "31.1")
+    (define-advice dabbrev-capf (:around (fn) git-commit)
+      "Backport bugfix from debbug#80645 / a7d05207214 / 31.1.
+See #5551 and #5556."
+      (cl-letf (((symbol-function #'user-error)
+                 (lambda (format &rest args)
+                   (unless (string-prefix-p "No dynamic expansion" format)
+                     (signal 'user-error
+                             (list (apply #'format-message format args)))))))
+        (funcall fn))))
+
 ;;; Kludges for Custom
 
 (defun magit-custom-initialize-reset (symbol exp)