Remove defining user variables via * in docstring.

* lisp/apropos.el (apropos-variable):
* lisp/files-x.el (read-file-local-variable):
* lisp/simple.el (set-variable):
* lisp/woman.el (woman-mini-help):
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns): Callers changed.

* lisp/custom.el (custom-variable-p): Return nil for non-symbol
arguments instead of signaling an error.
(user-variable-p): Obsolete alias for custom-variable-p.

* lisp/erc/erc.el (erc-cmd-SET): Call custom-variable-p instead of
user-variable-p.

* src/callint.c (Finteractive, Fcall_interactively):
* src/minibuf.c (Fread_variable): Callers changed.

* src/eval.c (Fuser_variable_p, user_variable_p_eh)
(lisp_indirect_variable): Functions deleted.
(Fdefvar): Caller changed.

* doc/lispref/commands.texi (Interactive Codes):
* doc/lispref/help.texi (Accessing Documentation):
* doc/lispref/minibuf.texi (High-Level Completion): Callers changed.

* doc/lispref/customize.texi (Variable Definitions): Remove user-variable-p.

10 files changed, 31 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed4470b998a..8c3093aa2c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-09  Chong Yidong  <cyd@gnu.org>
+
+        * custom.el (custom-variable-p): Return nil for non-symbol
+        arguments instead of signaling an error.
+        (user-variable-p): Obsolete alias for custom-variable-p.
+
+        * apropos.el (apropos-variable):
+        * files-x.el (read-file-local-variable):
+        * simple.el (set-variable):
+        * woman.el (woman-mini-help):
+        * emacs-lisp/byte-opt.el (side-effect-free-fns): Callers changed.
+
 2012-04-09  Glenn Morris  <rgm@gnu.org>
 
         * startup.el (normal-top-level): Don't look for leim-list.el
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 423656c21fa..56b27e9b9b4 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -466,7 +466,7 @@ normal variables."
                        #'(lambda (symbol)
                            (and (boundp symbol)
                                 (get symbol 'variable-documentation)))
-                     'user-variable-p)))
+                     'custom-variable-p)))
 
 ;; For auld lang syne:
 ;;;###autoload
diff --git a/lisp/custom.el b/lisp/custom.el
index bffd30bff21..d8909f8be92 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -599,15 +599,17 @@ If NOSET is non-nil, don't bother autoloading LOAD when setting the variable."
   (put symbol 'custom-autoload (if noset 'noset t))
   (custom-add-load symbol load))
 
-;; This test is also in the C code of `user-variable-p'.
 (defun custom-variable-p (variable)
   "Return non-nil if VARIABLE is a customizable variable.
 A customizable variable is either (i) a variable whose property
 list contains a non-nil `standard-value' or `custom-autoload'
 property, or (ii) an alias for another customizable variable."
-  (setq variable (indirect-variable variable))
-  (or (get variable 'standard-value)
-      (get variable 'custom-autoload)))
+  (when (symbolp variable)
+    (setq variable (indirect-variable variable))
+    (or (get variable 'standard-value)
+        (get variable 'custom-autoload))))
+
+(define-obsolete-function-alias 'user-variable-p 'custom-variable-p "24.2")
 
 (defun custom-note-var-changed (variable)
   "Inform Custom that VARIABLE has been set (changed).
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 78ac29d89df..3b324a09659 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1237,7 +1237,7 @@
          string-to-multibyte
          tan truncate
          unibyte-char-to-multibyte upcase user-full-name
-         user-login-name user-original-login-name user-variable-p
+         user-login-name user-original-login-name custom-variable-p
          vconcat
          window-buffer window-dedicated-p window-edges window-height
          window-hscroll window-minibuffer-p window-width
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index af853c4e230..34aa015d7ac 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09  Chong Yidong  <cyd@gnu.org>
+
+        * erc.el (erc-cmd-SET): Call custom-variable-p instead of
+        user-variable-p.
+
 2012-02-08  Glenn Morris  <rgm@gnu.org>
 
         * erc-backend.el (erc-coding-system-precedence):
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index b95d42b154a..63777fb3897 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2616,7 +2616,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp."
                            (if (consp val)
                                (concat "\n" (pp-to-string val))
                              (format " %S\n" val)))))
-               (apropos-internal "^erc-" 'user-variable-p))))
+               (apropos-internal "^erc-" 'custom-variable-p))))
      (current-buffer)) t)
    (t nil)))
 (defalias 'erc-cmd-VAR 'erc-cmd-SET)
diff --git a/lisp/files-x.el b/lisp/files-x.el
index b4a04401a77..e28e2ba83e3 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -49,7 +49,7 @@ Intended to be used in the `interactive' spec of
              (format "%s: " prompt))
            obarray
            (lambda (sym)
-             (or (user-variable-p sym)
+             (or (custom-variable-p sym)
                  (get sym 'safe-local-variable)
                  (memq sym '(mode eval coding unibyte))))
            nil nil nil default nil))
diff --git a/lisp/simple.el b/lisp/simple.el
index 8b04534455d..64356ce8aa7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5983,7 +5983,7 @@ 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 (user-variable-p default-var)
+          (var (if (custom-variable-p default-var)
                    (read-variable (format "Set variable (default %s): " default-var)
                                   default-var)
                  (read-variable "Set variable: ")))
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 0f28d32293b..5838915b1f5 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -456,7 +456,7 @@ automatically, and you are prompted to fill in the variable parts.")))
 ;;                   obarray
 ;;                   (lambda (symbol)
 ;;                     (or (eq symbol 'eval)
-;;                         (user-variable-p symbol)))
+;;                         (custom-variable-p symbol)))
 ;;                   t)
 ;;    comment-start str ": "
 ;;    (read-from-minibuffer "Expression: " nil read-expression-map nil
diff --git a/lisp/woman.el b/lisp/woman.el
index 4ecf7c8891d..c76399a96e5 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1987,7 +1987,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
                             (lambda (symbol)
                               (and
                                (or (commandp symbol)
-                                   (user-variable-p symbol))
+                                   (custom-variable-p symbol))
                                (not (get symbol 'apropos-inhibit))))))
     ;; Find documentation strings:
     (let ((p apropos-accumulator)
@@ -1999,7 +1999,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
                        (if (setq doc (documentation symbol t))
                            (substring doc 0 (string-match "\n" doc))
                          "(not documented)"))
-                   (if (user-variable-p symbol) ; 3. variable doc
+                   (if (custom-variable-p symbol)       ; 3. variable doc
                        (if (setq doc (documentation-property
                                       symbol 'variable-documentation t))
                            (substring doc 0 (string-match "\n" doc))))))