From: Dave Love <fx@gnu.org>
Date: Tue, 16 May 2000 15:03:49 +0000 (+0000)
Subject: Don't require cl or easymenu.
X-Git-Tag: emacs-pretest-21.0.90~3936
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01651f075feb8057fe51dbb50f886f09572ab55e;p=emacs.git

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 ee70d51bc1c..9096e57bfb9 100644
--- 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 30383bff989..42f5d0978be 100644
--- 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)))))