From a343d218fd889e57ab80565815366734fb606b37 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 25 Jun 2013 20:50:50 -0400 Subject: [PATCH] * lisp/simple.el (set-variable): Use read-from-minibuffer. Fixes: debbugs:14710 --- lisp/ChangeLog | 2 ++ lisp/simple.el | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3ac3a0f2b9..4cd17401bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-06-26 Stefan Monnier + * 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 363ce8407e..61f32363db 100644 --- 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) -- 2.20.1