[Emacs-diffs] emacs-26 71a2d50: Fix minibuffer-help-form for lexical binding

[Andreas Schwab]

branch: emacs-26
commit 71a2d509f9d2350c6aacfeed24e1e9d8c7fdfebe
Author: Andreas Schwab <address@hidden>
Commit: Andreas Schwab <address@hidden>

    Fix minibuffer-help-form for lexical binding
    
    * lisp/simple.el (set-variable): Substitute var into
    minibuffer-help-form.
    * lisp/cus-edit.el (custom-prompt-variable): Likewise.
---
 lisp/cus-edit.el | 2 +-
 lisp/simple.el   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3ede483..33efdd9 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -917,7 +917,7 @@ the current value of the variable, otherwise `symbol-value' 
is used.
 If optional COMMENT argument is non-nil, also prompt for a comment and return
 it as the third element in the list."
   (let* ((var (read-variable prompt-var))
-        (minibuffer-help-form '(describe-variable var))
+        (minibuffer-help-form `(describe-variable ',var))
         (val
          (let ((prop (get var 'variable-interactive))
                (type (get var 'custom-type))
diff --git a/lisp/simple.el b/lisp/simple.el
index 8bbafe4..ba39a49 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7930,7 +7930,7 @@ With a prefix argument, set VARIABLE to VALUE 
buffer-locally."
                   (read-variable (format "Set variable (default %s): " 
default-var)
                                  default-var)
                 (read-variable "Set variable: ")))
-         (minibuffer-help-form '(describe-variable var))
+         (minibuffer-help-form `(describe-variable ',var))
          (prop (get var 'variable-interactive))
           (obsolete (car (get var 'byte-obsolete-variable)))
          (prompt (format "Set %s %s to value: " var