Don't require cl or easymenu.

(custom-variable-prompt): Test standard-value property, not
user-variable-p.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee70d51bc1c708ceed78ea4a75fec32b23ee646f..9096e57bfb97f5776a2de2d9b70258590be9e958 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-16  Dave Love  <fx@gnu.org>
+
+       * cus-edit.el: Don't require cl or easymenu.
+       (custom-variable-prompt): Test standard-value property, not
+       user-variable-p.
+
 2000-05-16  Sam Steingold  <sds@gnu.org>
 
        * subr.el (add-hook): `setq' hook-value, not `set'.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 30383bff98909b80820663e0102f9930909693f5..42f5d0978bed45cf4c7084dd7f0f3a784a1f10dd 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -36,9 +36,7 @@
 
 (require 'cus-face)
 (require 'wid-edit)
-(require 'easymenu)
 (eval-when-compile
-  (require 'cl)
   (defvar custom-versions-load-alist)) ; from cus-load
 
 (condition-case nil
@@ -385,7 +383,6 @@ IF REGEXP is not a string, return it unchanged."
     regexp))
 
 (defun custom-variable-prompt ()
-  ;; Code stolen from `help.el'.
   "Prompt for a variable, defaulting to the variable at point.
 Return a list suitable for use in `interactive'."
    (let ((v (variable-at-point))
@@ -399,7 +396,7 @@ Return a list suitable for use in `interactive'."
                          (and (boundp symbol)
                               (or (get symbol 'custom-type)
                                   (get symbol 'custom-loads)
-                                  (user-variable-p symbol)))) t))
+                                  (get symbol 'standard-value)))) t))
      (list (if (equal val "")
               (if (symbolp v) v nil)
             (intern val)))))