diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 100 |
2 files changed, 64 insertions, 42 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0de3ca1c7a..d08a269843 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2000-03-16 Gerd Moellmann <[email protected]> + * cus-edit.el (custom-variable-tag-face): Handle case that + default face's height is not a number. + (custom-face-tag-face, custom-group-tag-face-1) + (custom-group-tag-face): Ditto. + (custom-group-tag-face-1): Add :group. + * info.el (Info-fontify-maximum-menu-size): Increase to 100000. 2000-03-15 Gerd Moellmann <[email protected]> diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 9851de8d3b..85cef188e8 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1985,20 +1985,22 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." ;; When this was underlined blue, users confused it with a ;; Mosaic-style hyperlink... -(defface custom-variable-tag-face `((((class color) - (background dark)) - (:foreground "light blue" - :bold t - :family "helv" - :height ,(floor (face-attribute - 'default :height) 0.9))) - (((class color) - (background light)) - (:foreground "blue" :family "helv" - :bold t - :height ,(floor (face-attribute - 'default :height) 0.9))) - (t (:bold t))) +(defface custom-variable-tag-face + `((((class color) + (background dark)) + (:foreground "light blue" :bold t :family "helv" + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)))) + (((class color) + (background light)) + (:foreground "blue" :family "helv" :bold t + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)))) + (t (:bold t))) "Face used for unpushable variable tags." :group 'custom-faces) @@ -2520,9 +2522,12 @@ Match frames with dark backgrounds.") ;;; The `custom-face' Widget. -(defface custom-face-tag-face `((t (:bold t :family "helv" - :height ,(floor (face-attribute - 'default :height) 0.9)))) +(defface custom-face-tag-face + `((t (:bold t :family "helv" + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height))))) "Face used for face tags." :group 'custom-faces) @@ -2976,31 +2981,42 @@ and so forth. The remaining group tags are shown with :type '(repeat face) :group 'custom-faces) -(defface custom-group-tag-face-1 `((((class color) - (background dark)) - (:foreground "pink" :family "helv" - :height ,(floor (face-attribute - 'default :height) 0.9) - :bold t)) - (((class color) - (background light)) - (:foreground "red" :bold t - :height ,(floor (face-attribute - 'default :height) 0.9))) - (t (:bold t))) - "Face used for group tags.") - -(defface custom-group-tag-face `((((class color) - (background dark)) - (:foreground "light blue" :bold t - :height ,(floor (face-attribute - 'default :height) 0.9))) - (((class color) - (background light)) - (:foreground "blue" :bold t - :height ,(floor (face-attribute - 'default :height) 0.9))) - (t (:bold t))) +(defface custom-group-tag-face-1 + `((((class color) + (background dark)) + (:foreground "pink" :family "helv" + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)) + :bold t)) + (((class color) + (background light)) + (:foreground "red" :bold t + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)))) + (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 ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)))) + (((class color) + (background light)) + (:foreground "blue" :bold t + :height ,(let ((height (face-attribute 'default :height))) + (if (numberp height) + (floor height 0.9) + height)))) + (t (:bold t))) "Face used for low level group tags." :group 'custom-faces) |