Re: No default value, but prompt says there is one: customize-variable

[Richard M. Stallman]

Does this fix give good results?

Index: cus-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.237
diff -c -c -r1.237 cus-edit.el
*** cus-edit.el 23 Oct 2005 17:40:38 -0000      1.237
--- cus-edit.el 15 Nov 2005 04:26:45 -0000
***************
*** 497,503 ****
                (if (and (symbolp v) (custom-variable-p v))
                    (format "Customize option (default %s): " v)
                  "Customize option: ")
!               obarray 'custom-variable-p t))
       (list (if (equal val "")
               (if (symbolp v) v nil)
             (intern val)))))
--- 497,504 ----
                (if (and (symbolp v) (custom-variable-p v))
                    (format "Customize option (default %s): " v)
                  "Customize option: ")
!               obarray 'custom-variable-p t nil nil
!               (and (symbolp v) (symbol-name v))))
       (list (if (equal val "")
               (if (symbolp v) v nil)
             (intern val)))))
***************
*** 798,804 ****
    (interactive)
    (let ((children custom-options))
      (mapc (lambda (widget)
!           (and (widget-apply widget :custom-standard-value)
                 (if (memq (widget-get widget :custom-state)
                           '(modified set changed saved rogue))
                     (widget-apply widget :custom-reset-standard))))
--- 799,806 ----
    (interactive)
    (let ((children custom-options))
      (mapc (lambda (widget)
!           (and (widget-get widget :custom-standard-value)
!                (widget-apply widget :custom-standard-value)
                 (if (memq (widget-get widget :custom-state)
                           '(modified set changed saved rogue))
                     (widget-apply widget :custom-reset-standard))))
***************
*** 3397,3403 ****
  
  (define-widget 'face 'symbol
    "A Lisp face name (with sample)."
!   :format "%t: (%{sample%}) %v"
    :tag "Face"
    :value 'default
    :sample-face-get 'widget-face-sample-face-get
--- 3399,3405 ----
  
  (define-widget 'face 'symbol
    "A Lisp face name (with sample)."
!   :format "%{%t%}: (%{sample%}) %v"
    :tag "Face"
    :value 'default
    :sample-face-get 'widget-face-sample-face-get