# HG changeset patch # User Dave Love # Date 958489141 0 # Node ID 54b181bf04dc72334dd5f5f5480b9fd73d1d7ae8 # Parent 2a91228f7aa35e6488e66fc1628c79ca16551fa7 Don't require cl or easymenu. (custom-variable-prompt): Test standard-value property, not user-variable-p. diff -r 2a91228f7aa3 -r 54b181bf04dc lisp/cus-edit.el --- a/lisp/cus-edit.el Tue May 16 14:47:46 2000 +0000 +++ b/lisp/cus-edit.el Tue May 16 14:59:01 2000 +0000 @@ -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 @@ 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 @@ (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)))))