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

[Richard M. Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.139 emacs/lisp/cus-edit.el:1.140
*** emacs/lisp/cus-edit.el:1.139        Mon Dec 31 15:13:54 2001
--- emacs/lisp/cus-edit.el      Mon Dec 31 15:22:27 2001
***************
*** 1485,1491 ****
  (defface custom-invalid-face '((((class color))
                                (:foreground "yellow" :background "red"))
                               (t
!                               (:bold t :italic t :underline t)))
    "Face used when the customize item is invalid."
    :group 'custom-magic-faces)
  
--- 1485,1491 ----
  (defface custom-invalid-face '((((class color))
                                (:foreground "yellow" :background "red"))
                               (t
!                               (:weight bold :slant italic :underline t)))
    "Face used when the customize item is invalid."
    :group 'custom-magic-faces)
  
***************
*** 1499,1519 ****
  (defface custom-modified-face '((((class color))
                                 (:foreground "white" :background "blue"))
                                (t
!                                (:italic t :bold)))
    "Face used when the customize item has been modified."
    :group 'custom-magic-faces)
  
  (defface custom-set-face '((((class color))
                                (:foreground "blue" :background "white"))
                               (t
!                               (:italic t)))
    "Face used when the customize item has been set."
    :group 'custom-magic-faces)
  
  (defface custom-changed-face '((((class color))
                                (:foreground "white" :background "blue"))
                               (t
!                               (:italic t)))
    "Face used when the customize item has been changed."
    :group 'custom-magic-faces)
  
--- 1499,1519 ----
  (defface custom-modified-face '((((class color))
                                 (:foreground "white" :background "blue"))
                                (t
!                                (:slant italic :bold)))
    "Face used when the customize item has been modified."
    :group 'custom-magic-faces)
  
  (defface custom-set-face '((((class color))
                                (:foreground "blue" :background "white"))
                               (t
!                               (:slant italic)))
    "Face used when the customize item has been set."
    :group 'custom-magic-faces)
  
  (defface custom-changed-face '((((class color))
                                (:foreground "white" :background "blue"))
                               (t
!                               (:slant italic)))
    "Face used when the customize item has been changed."
    :group 'custom-magic-faces)
  
***************
*** 1958,1964 ****
                                 (background dark))
                                (:background "dim gray"))
                               (t
!                               (:italic t)))
    "Face used for comments on variables or faces"
    :version "21.1"
    :group 'custom-faces)
--- 1958,1964 ----
                                 (background dark))
                                (:background "dim gray"))
                               (t
!                               (:slant italic)))
    "Face used for comments on variables or faces"
    :version "21.1"
    :group 'custom-faces)
***************
*** 1968,1977 ****
    '((((class color) (background dark)) (:foreground "gray80"))
      (((class color) (background light)) (:foreground "blue4"))
      (((class grayscale) (background light))
!      (:foreground "DimGray" :bold t :italic t))
      (((class grayscale) (background dark))
!      (:foreground "LightGray" :bold t :italic t))
!     (t (:bold t)))
    "Face used for variables or faces comment tags"
    :group 'custom-faces)
  
--- 1968,1977 ----
    '((((class color) (background dark)) (:foreground "gray80"))
      (((class color) (background light)) (:foreground "blue4"))
      (((class grayscale) (background light))
!      (:foreground "DimGray" :weight bold :slant italic))
      (((class grayscale) (background dark))
!      (:foreground "LightGray" :weight bold :slant italic))
!     (t (:weight bold)))
    "Face used for variables or faces comment tags"
    :group 'custom-faces)
  
***************
*** 2016,2030 ****
  (defface custom-variable-tag-face
    `((((class color)
        (background dark))
!      (:foreground "light blue" :bold t :height 1.2 :inherit variable-pitch))
      (((class color)
        (background light))
!      (:foreground "blue" :bold t :height 1.2 :inherit variable-pitch))
!     (t (:bold t)))
    "Face used for unpushable variable tags."
    :group 'custom-faces)
  
! (defface custom-variable-button-face '((t (:underline t :bold t)))
    "Face used for pushable variable tags."
    :group 'custom-faces)
  
--- 2016,2030 ----
  (defface custom-variable-tag-face
    `((((class color)
        (background dark))
!      (:foreground "light blue" :weight bold :height 1.2 :inherit 
variable-pitch))
      (((class color)
        (background light))
!      (:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
!     (t (:weight bold)))
    "Face used for unpushable variable tags."
    :group 'custom-faces)
  
! (defface custom-variable-button-face '((t (:underline t :weight bold)))
    "Face used for pushable variable tags."
    :group 'custom-faces)
  
***************
*** 2476,2482 ****
    "Ignoring WIDGET, convert :bold and :italic in VALUE to new form."
    (let (result)
      (while value
-       (assert (cdr value))
        (let ((key (car value))
            (val (car (cdr value))))
        (cond ((eq key :italic)
--- 2476,2481 ----
***************
*** 2632,2638 ****
  ;;; The `custom-face' Widget.
  
  (defface custom-face-tag-face
!   `((t (:bold t :height 1.2 :inherit variable-pitch)))
    "Face used for face tags."
    :group 'custom-faces)
  
--- 2631,2637 ----
  ;;; The `custom-face' Widget.
  
  (defface custom-face-tag-face
!   `((t (:weight bold :height 1.2 :inherit variable-pitch)))
    "Face used for face tags."
    :group 'custom-faces)
  
***************
*** 3140,3161 ****
  (defface custom-group-tag-face-1
    `((((class color)
        (background dark))
!      (:foreground "pink" :bold t :height 1.2 :inherit variable-pitch))
      (((class color)
        (background light))
!      (:foreground "red" :bold t :height 1.2 :inherit variable-pitch))
!     (t (:bold t)))
    "Face used for group tags."
    :group 'custom-faces)
  
  (defface custom-group-tag-face
    `((((class color)
        (background dark))
!      (:foreground "light blue" :bold t :height 1.2))
      (((class color)
        (background light))
!      (:foreground "blue" :bold t :height 1.2))
!     (t (:bold t)))
    "Face used for low level group tags."
    :group 'custom-faces)
  
--- 3139,3160 ----
  (defface custom-group-tag-face-1
    `((((class color)
        (background dark))
!      (:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
      (((class color)
        (background light))
!      (:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
!     (t (:weight bold)))
    "Face used for group tags."
    :group 'custom-faces)
  
  (defface custom-group-tag-face
    `((((class color)
        (background dark))
!      (:foreground "light blue" :weight bold :height 1.2))
      (((class color)
        (background light))
!      (:foreground "blue" :weight bold :height 1.2))
!     (t (:weight bold)))
    "Face used for low level group tags."
    :group 'custom-faces)