From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 24 Apr 2022 14:03:12 +0000 (+0200)
Subject: Further help-fns--editable-variable fixes
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2370^2~328
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=07f8fafe6ba095bb5a811d947ad2772dad058d4f;p=emacs.git

Further help-fns--editable-variable fixes

* lisp/help-fns.el (help-fns--editable-variable): Don't bug out on
non-symbols.
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 12a4ecf2f3a..23cfb04798f 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1303,8 +1303,9 @@ it is displayed along with the global value."
 
 (defun help-fns--editable-variable (start end variable value buffer)
   (when (and (readablep value)
-             (not (and (symbolp value) (boundp value)))
-             (not (and (symbolp value) (fboundp value)))
+             (or (not (symbolp value))
+                 (and (not (and (symbolp value) (boundp value)))
+                      (not (and (symbolp value) (fboundp value)))))
              help-enable-variable-value-editing)
     (add-text-properties
      start end