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

[Miles Bader]

Index: emacs/lisp/cus-face.el
diff -c emacs/lisp/cus-face.el:1.31 emacs/lisp/cus-face.el:1.32
*** emacs/lisp/cus-face.el:1.31 Mon Dec 23 13:40:38 2002
--- emacs/lisp/cus-face.el      Tue Feb  4 06:05:04 2003
***************
*** 86,92 ****
             (const :tag "ultracondensed" ultra-condensed)
             (const :tag "ultraexpanded" ultra-expanded)
             (const :tag "wide" extra-expanded)))
!     
      (:height
       (choice :tag "Height"
             :help-echo "Face's font height."
--- 86,92 ----
             (const :tag "ultracondensed" ultra-condensed)
             (const :tag "ultraexpanded" ultra-expanded)
             (const :tag "wide" extra-expanded)))
! 
      (:height
       (choice :tag "Height"
             :help-echo "Face's font height."
***************
*** 113,119 ****
             (const :tag "semilight" semi-light)
             (const :tag "ultralight" ultra-light)
             (const :tag "ultrabold" ultra-bold)))
!     
      (:slant
       (choice :tag "Slant"
             :help-echo "Font slant."
--- 113,119 ----
             (const :tag "semilight" semi-light)
             (const :tag "ultralight" ultra-light)
             (const :tag "ultrabold" ultra-bold)))
! 
      (:slant
       (choice :tag "Slant"
             :help-echo "Font slant."
***************
*** 121,148 ****
             (const :tag "italic" italic)
             (const :tag "oblique" oblique)
             (const :tag "normal" normal)))
!     
      (:underline
       (choice :tag "Underline"
             :help-echo "Control text underlining."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
!     
      (:overline
       (choice :tag "Overline"
             :help-echo "Control text overlining."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
!     
      (:strike-through
       (choice :tag "Strike-through"
             :help-echo "Control text strike-through."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
!     
      (:box
       ;; Fixme: this can probably be done better.
       (choice :tag "Box around text"
--- 121,148 ----
             (const :tag "italic" italic)
             (const :tag "oblique" oblique)
             (const :tag "normal" normal)))
! 
      (:underline
       (choice :tag "Underline"
             :help-echo "Control text underlining."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
! 
      (:overline
       (choice :tag "Overline"
             :help-echo "Control text overlining."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
! 
      (:strike-through
       (choice :tag "Strike-through"
             :help-echo "Control text strike-through."
             (const :tag "Off" nil)
             (const :tag "On" t)
             (color :tag "Colored")))
! 
      (:box
       ;; Fixme: this can probably be done better.
       (choice :tag "Box around text"
***************
*** 190,210 ****
                     (nconc (and lwidth `(:line-width ,lwidth))
                            (and color  `(:color ,color))
                            (and style  `(:style ,style)))))))))
!     
      (:inverse-video
       (choice :tag "Inverse-video"
             :help-echo "Control whether text should be in inverse-video."
             (const :tag "Off" nil)
             (const :tag "On" t)))
!     
      (:foreground
       (color :tag "Foreground"
            :help-echo "Set foreground color."))
!     
      (:background
       (color :tag "Background"
            :help-echo "Set background color."))
!     
      (:stipple
       (choice :tag "Stipple"
             :help-echo "Background bit-mask"
--- 190,210 ----
                     (nconc (and lwidth `(:line-width ,lwidth))
                            (and color  `(:color ,color))
                            (and style  `(:style ,style)))))))))
! 
      (:inverse-video
       (choice :tag "Inverse-video"
             :help-echo "Control whether text should be in inverse-video."
             (const :tag "Off" nil)
             (const :tag "On" t)))
! 
      (:foreground
       (color :tag "Foreground"
            :help-echo "Set foreground color."))
! 
      (:background
       (color :tag "Background"
            :help-echo "Set background color."))
! 
      (:stipple
       (choice :tag "Stipple"
             :help-echo "Background bit-mask"
***************
*** 230,236 ****
         (if (and (consp cus-value) (null (cdr cus-value)))
           (car cus-value)
         cus-value))))
!        
    "Alist of face attributes.
  
  The elements are of the form (KEY TYPE PRE-FILTER POST-FILTER),
--- 230,236 ----
         (if (and (consp cus-value) (null (cdr cus-value)))
           (car cus-value)
         cus-value))))
! 
    "Alist of face attributes.
  
  The elements are of the form (KEY TYPE PRE-FILTER POST-FILTER),