[Emacs-diffs] Changes to emacs/lisp/cus-edit.el

[John Paul Wallington]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.176 emacs/lisp/cus-edit.el:1.177
*** emacs/lisp/cus-edit.el:1.176        Fri Jan 17 22:18:20 2003
--- emacs/lisp/cus-edit.el      Wed Jan 29 16:44:18 2003
***************
*** 758,764 ****
    (interactive (custom-prompt-variable "Set variable: "
                                       "Set %s to value: "
                                       current-prefix-arg))
!    
    (cond ((string= comment "")
         (put variable 'variable-comment nil))
        (comment
--- 758,764 ----
    (interactive (custom-prompt-variable "Set variable: "
                                       "Set %s to value: "
                                       current-prefix-arg))
! 
    (cond ((string= comment "")
         (put variable 'variable-comment nil))
        (comment
***************
*** 2515,2521 ****
    :button-args '(:help-echo "Control whether this attribute has any effect.")
    :value-to-internal 'custom-face-edit-fix-value
    :match (lambda (widget value)
!          (widget-checklist-match widget 
                                   (custom-face-edit-fix-value widget value)))
    :convert-widget 'custom-face-edit-convert-widget
    :args (mapcar (lambda (att)
--- 2515,2521 ----
    :button-args '(:help-echo "Control whether this attribute has any effect.")
    :value-to-internal 'custom-face-edit-fix-value
    :match (lambda (widget value)
!          (widget-checklist-match widget
                                   (custom-face-edit-fix-value widget value)))
    :convert-widget 'custom-face-edit-convert-widget
    :args (mapcar (lambda (att)
***************
*** 2543,2549 ****
                  ((eq key :reverse-video)
                   (push :inverse-video result)
                   (push val result))
!                 (t 
                   (push key result)
                   (push val result))))
          (setq value (cdr (cdr value))))
--- 2543,2549 ----
                  ((eq key :reverse-video)
                   (push :inverse-video result)
                   (push val result))
!                 (t
                   (push key result)
                   (push val result))))
          (setq value (cdr (cdr value))))
***************
*** 2606,2612 ****
        (delete-region (car (cdr inactive))
                     (+ (car (cdr inactive)) (cdr (cdr inactive))))
        (widget-put widget :inactive nil))))
!       
  
  (defun custom-face-edit-attribute-tag (widget)
    "Returns the first :tag property in WIDGET or one of its children."
--- 2606,2612 ----
        (delete-region (car (cdr inactive))
                     (+ (car (cdr inactive)) (cdr (cdr inactive))))
        (widget-put widget :inactive nil))))
! 
  
  (defun custom-face-edit-attribute-tag (widget)
    "Returns the first :tag property in WIDGET or one of its children."
***************
*** 3709,3715 ****
           (when (or (and spec
                          (eq (nth 0 spec) 'user)
                          (eq (nth 1 spec) 'set))
!                    comment)
             (unless (bolp)
               (princ "\n"))
             (princ " '(")
--- 3709,3716 ----
           (when (or (and spec
                          (eq (nth 0 spec) 'user)
                          (eq (nth 1 spec) 'set))
!                    comment
!                    (and (null spec) (get symbol 'saved-value)))
             (unless (bolp)
               (princ "\n"))
             (princ " '(")
***************
*** 3779,3785 ****
           (when (or (and theme-spec
                          (eq (nth 0 theme-spec) 'user)
                          (eq (nth 1 theme-spec) 'set))
!                    comment)
             ;; Don't print default face here.
             (unless (bolp)
               (princ "\n"))
--- 3780,3787 ----
           (when (or (and theme-spec
                          (eq (nth 0 theme-spec) 'user)
                          (eq (nth 1 theme-spec) 'set))
!                    comment
!                    (and (null theme-spec) (get symbol 'saved-face)))
             ;; Don't print default face here.
             (unless (bolp)
               (princ "\n"))
***************
*** 3833,3839 ****
        (mapatoms mapper)
        (when started-writing
        (princ ")\n")))))
!                       
  (defun custom-save-loaded-themes ()
    (let ((themes (reverse (get 'user 'theme-loads-themes)))
        (standard-output (current-buffer)))
--- 3835,3841 ----
        (mapatoms mapper)
        (when started-writing
        (princ ")\n")))))
! 
  (defun custom-save-loaded-themes ()
    (let ((themes (reverse (get 'user 'theme-loads-themes)))
        (standard-output (current-buffer)))
***************
*** 3843,3849 ****
        (mapc (lambda (theme)
              (princ "\n   '")
              (prin1 theme)) themes)
!       (princ " )\n"))))       
  
  ;;;###autoload
  (defun customize-save-customized ()
--- 3845,3851 ----
        (mapc (lambda (theme)
              (princ "\n   '")
              (prin1 theme)) themes)
!       (princ " )\n"))))
  
  ;;;###autoload
  (defun customize-save-customized ()