From: Erik Naggum <erik@naggum.no>
Date: Fri, 28 Mar 1997 02:33:07 +0000 (+0000)
Subject: (set-variable): Use user-variable-p.  Clean up.
X-Git-Tag: emacs-20.1~2691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b1434c2cac71fa1099a609b2ea96c2809422e69;p=emacs.git

(set-variable): Use user-variable-p.  Clean up.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 3b7913ff753..a25c33447c5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2979,15 +2979,14 @@ If you want VALUE to be a string, you must surround it with doublequotes.
 If VARIABLE has a `variable-interactive' property, that is used as if
 it were the arg to `interactive' (which see) to interactively read the value."
   (interactive
-   (let* ((var (let ((v (variable-at-point))
-		     (enable-recursive-minibuffers t)
-		     val)
-		 (setq val (completing-read (if v
-						(format "Set variable (default %s): " v)
-					      "Set variable: ")
-					    obarray 'boundp t))
-		 (if (equal val "")
-		     v (intern val))))
+   (let* ((v (variable-at-point))
+	  (enable-recursive-minibuffers t)
+	  (val (completing-read
+		(if v
+		    (format "Set variable (default %s): " v)
+		  "Set variable: ")
+		obarray 'user-variable-p t))
+	  (var (if (equal val "") v (intern val)))
 	  (minibuffer-help-form
 	   '(funcall myhelp))
 	  (myhelp