From 1a695f0f1acdb537e7fa05bcbed5996ce1ee6ce2 Mon Sep 17 00:00:00 2001 From: Daanturo Date: Thu, 10 Nov 2022 19:32:20 +0700 Subject: [PATCH 2/2] Eldoc on old Emacs: correct the obsolete variable * lisp/emacs-lisp/eldoc.el (eldoc--documentation-strategy-defcustom): make eldoc-documentation-function the obsolete one instead of eldoc-documentation-strategy. --- lisp/emacs-lisp/eldoc.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index d5d46446eb..2356a8e024 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -697,7 +697,8 @@ This is meant to be used as a value for `eldoc-documentation-strategy'." ;; 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")) + (defvaralias ',main ',secondary) + (make-obsolete-variable ',secondary ',main "eldoc-1.14.0")) (progn (defcustom ,main ,value ,docstring ,@more) (defvaralias ',secondary ',main ,docstring)))) -- 2.38.1