From: Greg Minshall <minshall@umich.edu>
Date: Thu, 18 Nov 2021 09:32:34 +0000 (+0100)
Subject: Fix eldoc usage of newly introduced variable
X-Git-Tag: emacs-29.0.90~2852^2~220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1625123e4ceb8d23eef00f3944341ecf0a75dc77;p=emacs.git

Fix eldoc usage of newly introduced variable

* lisp/emacs-lisp/eldoc.el
(eldoc-display-message-no-interference-p): Make this function work
in older Emacs versions again (bug#51939).
---

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index b30d3fc30f4..cd0e7dca7cf 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -385,7 +385,8 @@ Also store it in `eldoc-last-message' and return that value."
            ;; The following configuration shows "Matches..." in the
            ;; echo area when point is after a closing bracket, which
            ;; conflicts with eldoc.
-           (and show-paren-context-when-offscreen
+           (and (boundp 'show-paren-context-when-offscreen)
+                show-paren-context-when-offscreen
                 (not (pos-visible-in-window-p
                       (overlay-end show-paren--overlay)))))))