From c2599632b0d8b2ca9861806b2094e0de3849e931 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Fri, 10 Jul 2020 18:07:32 +0100 Subject: [PATCH] Revert "Fix Eldoc problem when loading on Emacs 26.3" This reverts commit 9ade7ea7b77ec40c16deb4dff139ce7127a703e2. * lisp/emacs-lisp/eldoc.el (Version): Bump to 1.4.0 --- lisp/emacs-lisp/eldoc.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 925f8e7c0a9..7964c4c45ab 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -5,7 +5,7 @@ ;; Author: Noah Friedman ;; Keywords: extensions ;; Created: 1995-10-06 -;; Version: 1.3.0 +;; Version: 1.4.0 ;; Package-Requires: ((emacs "26.3")) ;; This is a GNU ELPA :core package. Avoid functionality that is not @@ -535,9 +535,6 @@ Meant as a value for `eldoc-documentation-strategy'." (if (stringp str) (funcall callback str)) nil)))) -;; FIXME: The unintern fixes "don't know how to make a localized -;; variable an alias". -(unintern 'eldoc-documentation-function nil) (define-obsolete-variable-alias 'eldoc-documentation-function 'eldoc-documentation-strategy "eldoc-1.1.0") -- 2.39.5