(set-variable): Offer variable at point as default.

diff --git a/lisp/simple.el b/lisp/simple.el
index ae4ce3911101d0cff992077413e7ccfcab3f647b..e025788bb70416c7426ba13442b6b1291fd6a790 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3549,7 +3549,12 @@ it were the arg to `interactive' (which see) to interactively read VALUE.
 
 If VARIABLE has been defined with `defcustom', then the type information
 in the definition is used to check that VALUE is valid."
-  (interactive (let* ((var (read-variable "Set variable: "))
+  (interactive
+   (let* ((default-var (variable-at-point))
+          (var (if (symbolp default-var)
+                   (read-variable (format "Set variable (default %s): " default-var)
+                                  default-var)
+                 (read-variable "Set variable: ")))
                      (minibuffer-help-form '(describe-variable var))
                      (prop (get var 'variable-interactive))
                      (prompt (format "Set %s to value: " var))