* lisp/simple.el (set-variable): Use read-from-minibuffer.

Fixes: debbugs:14710

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ac3a0f..4cd1740 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-06-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * simple.el (set-variable): Use read-from-minibuffer (bug#14710).
+
        * emacs-lisp/package.el (package--add-to-archive-contents): Add missing
        nil terminate the loop (bug#14718).
 

diff --git a/lisp/simple.el b/lisp/simple.el
index 363ce84..61f3236 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6448,10 +6448,10 @@ With a prefix argument, set VARIABLE to VALUE buffer-locally."
                      (call-interactively `(lambda (arg)
                                             (interactive ,prop)
                                             arg))
-                   (read
-                    (read-string prompt nil
-                                 'set-variable-value-history
-                                (format "%S" (symbol-value var))))))))
+                   (read-from-minibuffer prompt nil
+                                         read-expression-map t
+                                         'set-variable-value-history
+                                         (format "%S" (symbol-value var)))))))
      (list var val current-prefix-arg)))
 
   (and (custom-variable-p variable)