From: João Távora <joaotavora@gmail.com>
Date: Fri, 10 Jul 2020 17:07:32 +0000 (+0100)
Subject: Revert "Fix Eldoc problem when loading on Emacs 26.3"
X-Git-Tag: emacs-28.0.90~7028
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2599632b0d8b2ca9861806b2094e0de3849e931;p=emacs.git

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
---

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 <friedman@splode.com>
 ;; 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")