From 7fd0ef0d7ea2115ca8a91f7090f4384a588df605 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 21 Oct 2005 08:55:12 +0000 Subject: [PATCH] (set-variable): Use user-variable-p instead of symbolp. Add the old variable value as 4th default-value arg of read-string. --- lisp/simple.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 8f98b1cc907..efe1559cb4d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4572,10 +4572,10 @@ in the definition is used to check that VALUE is valid. With a prefix argument, set VARIABLE to VALUE buffer-locally." (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: "))) + (var (if (user-variable-p 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)) (obsolete (car (get var 'byte-obsolete-variable))) @@ -4600,7 +4600,8 @@ With a prefix argument, set VARIABLE to VALUE buffer-locally." arg)) (read (read-string prompt nil - 'set-variable-value-history)))))) + 'set-variable-value-history + (format "%S" (symbol-value var)))))))) (list var val current-prefix-arg))) (and (custom-variable-p variable) -- 2.11.4.GIT