# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1129884912 0
# Node ID 3213e48ea8b3a51a90b6b311ccf370eec0d0137c
# Parent  843776c843bf9c5fbc96c6138871f53b30d8a52c
(set-variable): Use user-variable-p instead of symbolp.
Add the old variable value as 4th default-value arg of read-string.

diff -r 843776c843bf -r 3213e48ea8b3 lisp/simple.el
--- a/lisp/simple.el	Fri Oct 21 08:50:28 2005 +0000
+++ b/lisp/simple.el	Fri Oct 21 08:55:12 2005 +0000
@@ -4572,10 +4572,10 @@
 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 @@
                                             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)