comparison lisp/cus-edit.el @ 46408:ccaa90ab16a3

New operation :custom-standard-value. (Custom-reset-standard): Use it. (custom-variable, custom-face): Define it. (custom-variable-standard-value, custom-face-standard-value): New fns. (custom-face-save): Don't save a face whose value is standard. (custom-save-faces): Use SYMBOL, not 'default, to set NOW and COMMENT. (custom-face-edit-fix-value): If VALUE is not a list, pass it thru.

46407:4c4398249108

This operation eliminates any saved settings for the group members,
making them as if they had never been customized at all."
  (interactive)
  (let ((children custom-options))
    (mapc (lambda (widget)
	    (and (get (widget-value widget) 'standard-value)
		 (if (memq (widget-get widget :custom-state)
			   '(modified set changed saved rogue))
		     (widget-apply widget :custom-reset-standard))))
	    children)))

  :action 'custom-variable-action
  :custom-set 'custom-variable-set
  :custom-save 'custom-variable-save
  :custom-reset-current 'custom-redraw
  :custom-reset-saved 'custom-variable-reset-saved
  :custom-reset-standard 'custom-variable-reset-standard)

(defun custom-variable-type (symbol)
  "Return a widget suitable for editing the value of SYMBOL.
If SYMBOL has a `custom-type' property, use that.
Otherwise, look up symbol in `custom-guess-type-alist'."

			   'standard
			 'changed))
		      (t 'rogue))))
    (widget-put widget :custom-state state)))

(defvar custom-variable-menu
  '(("Set for Current Session" custom-variable-set
     (lambda (widget)
       (eq (widget-get widget :custom-state) 'modified)))
    ("Save for Future Sessions" custom-variable-save

			(nth 1 att)))
		custom-face-attributes))

(defun custom-face-edit-fix-value (widget value)
  "Ignoring WIDGET, convert :bold and :italic in VALUE to new form."
  (let (result)
    (while value
      (let ((key (car value))
	    (val (car (cdr value))))
	(cond ((eq key :italic)
	       (push :slant result)
	       (push (if val 'italic 'normal) result))
	      ((eq key :bold)
	       (push :weight result)
	       (push (if val 'bold 'normal) result))
	      (t 
	       (push key result)
	       (push val result))))
      (setq value (cdr (cdr value))))
    (setq result (nreverse result))
    result))

(defun custom-face-edit-convert-widget (widget)
  "Convert :args as widget types in WIDGET."
  (widget-put
   widget

  :custom-set 'custom-face-set
  :custom-save 'custom-face-save
  :custom-reset-current 'custom-redraw
  :custom-reset-saved 'custom-face-reset-saved
  :custom-reset-standard 'custom-face-reset-standard
  :custom-menu 'custom-face-menu-create)

(define-widget 'custom-face-all 'editable-list
  "An editable list of display specifications and attributes."
  :entry-format "%i %d %v"

    (if (face-spec-choose value)
	(face-spec-set symbol value)
      ;; face-set-spec ignores empty attribute lists, so just give it
      ;; something harmless instead.
      (face-spec-set symbol '((t :foreground unspecified))))
    (put symbol 'saved-face value)
    (put symbol 'customized-face nil)
    (put symbol 'face-comment comment)
    (put symbol 'customized-face-comment nil)
    (put symbol 'saved-face-comment comment)
    (custom-save-all)

    (widget-value-set child value)
    ;; This call manages the comment visibility
    (widget-value-set comment-widget (or comment ""))
    (custom-face-state-set widget)
    (custom-redraw-magic widget)))

(defun custom-face-reset-standard (widget)
  "Restore WIDGET to the face's standard settings.
This operation eliminates any saved setting for the face,
restoring it to the state of a face that has never been customized."

  ;; custom-set-faces was added by Custom -- don't edit or cut/paste it!
  ;; Your init file should contain only one such instance.\n")
      (mapcar
       (lambda (symbol)
	 (let ((value (get symbol 'saved-face))
	       (now (not (or (get 'default 'face-defface-spec)
			     (and (not (custom-facep 'default))
				  (not (get 'default 'force-face))))))
	       (comment (get 'default 'saved-face-comment)))
	   (unless (eq symbol 'default))
	   ;; Don't print default face here.
	   (unless (bolp)
	     (princ "\n"))
	   (princ " '(")
	   (prin1 symbol)

46408:ccaa90ab16a3

This operation eliminates any saved settings for the group members,
making them as if they had never been customized at all."
  (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))))
	    children)))

  :action 'custom-variable-action
  :custom-set 'custom-variable-set
  :custom-save 'custom-variable-save
  :custom-reset-current 'custom-redraw
  :custom-reset-saved 'custom-variable-reset-saved
  :custom-reset-standard 'custom-variable-reset-standard
  :custom-standard-value 'custom-variable-standard-value)

(defun custom-variable-type (symbol)
  "Return a widget suitable for editing the value of SYMBOL.
If SYMBOL has a `custom-type' property, use that.
Otherwise, look up symbol in `custom-guess-type-alist'."

			   'standard
			 'changed))
		      (t 'rogue))))
    (widget-put widget :custom-state state)))

(defun custom-variable-standard-value (widget)
  (get (widget-value widget) 'standard-value))

(defvar custom-variable-menu
  '(("Set for Current Session" custom-variable-set
     (lambda (widget)
       (eq (widget-get widget :custom-state) 'modified)))
    ("Save for Future Sessions" custom-variable-save

			(nth 1 att)))
		custom-face-attributes))

(defun custom-face-edit-fix-value (widget value)
  "Ignoring WIDGET, convert :bold and :italic in VALUE to new form."
  (if (listp value)
      (let (result)
	(while value
	  (let ((key (car value))
		(val (car (cdr value))))
	    (cond ((eq key :italic)
		   (push :slant result)
		   (push (if val 'italic 'normal) result))
		  ((eq key :bold)
		   (push :weight result)
		   (push (if val 'bold 'normal) result))
		  (t 
		   (push key result)
		   (push val result))))
	  (setq value (cdr (cdr value))))
	(setq result (nreverse result))
	result)
    value))

(defun custom-face-edit-convert-widget (widget)
  "Convert :args as widget types in WIDGET."
  (widget-put
   widget

  :custom-set 'custom-face-set
  :custom-save 'custom-face-save
  :custom-reset-current 'custom-redraw
  :custom-reset-saved 'custom-face-reset-saved
  :custom-reset-standard 'custom-face-reset-standard
  :custom-standard-value 'custom-face-standard-value
  :custom-menu 'custom-face-menu-create)

(define-widget 'custom-face-all 'editable-list
  "An editable list of display specifications and attributes."
  :entry-format "%i %d %v"

    (if (face-spec-choose value)
	(face-spec-set symbol value)
      ;; face-set-spec ignores empty attribute lists, so just give it
      ;; something harmless instead.
      (face-spec-set symbol '((t :foreground unspecified))))
    (unless (eq (widget-get widget :custom-state) 'standard)
      (put symbol 'saved-face value))
    (put symbol 'customized-face nil)
    (put symbol 'face-comment comment)
    (put symbol 'customized-face-comment nil)
    (put symbol 'saved-face-comment comment)
    (custom-save-all)

    (widget-value-set child value)
    ;; This call manages the comment visibility
    (widget-value-set comment-widget (or comment ""))
    (custom-face-state-set widget)
    (custom-redraw-magic widget)))

(defun custom-face-standard-value (widget)
  (get (widget-value widget) 'face-defface-spec))

(defun custom-face-reset-standard (widget)
  "Restore WIDGET to the face's standard settings.
This operation eliminates any saved setting for the face,
restoring it to the state of a face that has never been customized."

  ;; custom-set-faces was added by Custom -- don't edit or cut/paste it!
  ;; Your init file should contain only one such instance.\n")
      (mapcar
       (lambda (symbol)
	 (let ((value (get symbol 'saved-face))
	       (now (not (or (get symbol 'face-defface-spec)
			     (and (not (custom-facep symbol))
				  (not (get symbol 'force-face))))))
	       (comment (get symbol 'saved-face-comment)))
	   ;; Don't print default face here.
	   (unless (bolp)
	     (princ "\n"))
	   (princ " '(")
	   (prin1 symbol)