From e5e27868a7671d8d52c5920b286bf22a2cc9aac5 Mon Sep 17 00:00:00 2001 From: Daanturo Date: Thu, 10 Nov 2022 16:56:50 +0700 Subject: [PATCH 1/2] Don't set eldoc strategy to ignore on Emacs 27 and below * lisp/emacs-lisp/eldoc.el (eldoc--documentation-strategy-defcustom): on Emacs 27 and below, prevent eldoc-documentation-strategy (an alias of eldoc-documentation-function) being set to 'ignore globally. --- lisp/emacs-lisp/eldoc.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index e1801c45b7..d5d46446eb 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -691,6 +691,12 @@ This is meant to be used as a value for `eldoc-documentation-strategy'." `(if (< emacs-major-version 28) (progn (defcustom ,secondary ,value ,docstring ,@more) + ;; `eldoc-documentation-strategy' being `ignore' invalidates + ;; supports for it + (when (equal (default-value ',secondary) #'ignore) + ;; restore user setting, or our default + (setq-default ,secondary (or (and (boundp ',main) (default-value ',main)) + #'eldoc-documentation-default))) (define-obsolete-variable-alias ',main ',secondary "eldoc-1.1.0")) (progn (defcustom ,main ,value ,docstring ,@more) -- 2.38.1