emacs-pretest-bug
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: customize objects are in no useful order


From: Juri Linkov
Subject: Re: customize objects are in no useful order
Date: Wed, 07 Sep 2005 08:27:32 +0300
User-agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux)

> Even the faces in the `basic-faces' group (the original complaint was
> about this group) are now in useless order.  Before this change, they
> were logically grouped to different groups in the customization buffer:
> text appearance faces, temporarily highlighting faces, frame faces, etc.
> There are some irregularities (for example, `secondary-selection' and
> `region' are not together, `fixed-pitch' is too far from other related
> faces like `bold'), but this order can be fixed by moving defface
> definitions in faces.el.
>
> So for options in the customization buffer it is better not to change
> the order of option names defined by authors in source files.

The patch below contains the following changes:

1. Change the default of `custom-buffer-sort-alphabetically' back to nil.

2. Reorder all basic faces in faces.el (and consequently in the
   Customization buffer) to be in the same order as their face
   descriptions in the Emacs manual, node (info "(emacs)Standard Faces").

3. Add the group `basic-faces' to the faces `isearch', `lazy-highlight'
   and `tooltip', because these faces are documented in the Emacs manual
   as basic faces.

4. Change the group of compilation faces from `font-lock-highlighting-faces'
   to `compilation'.  The `compilation' group is more natural place
   to look for compilation faces than `font-lock-highlighting-faces'.

5. Remove the group `font-lock-highlighting-faces' from VHDL faces,
   because this group is too general for VHDL faces.

6. Remove the group `font-lock-highlighting-faces' from `Buffer-menu-buffer'
   because this face has nothing to do with the font-locking feature.

Index: lisp/cus-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.231
diff -c -r1.231 cus-edit.el
*** lisp/cus-edit.el    30 Aug 2005 10:35:09 -0000      1.231
--- lisp/cus-edit.el    6 Sep 2005 11:46:29 -0000
***************
*** 670,676 ****
    :type 'boolean
    :group 'custom-browse)
  
! (defcustom custom-buffer-sort-alphabetically t
    "If non-nil, sort members of each customization group alphabetically."
    :type 'boolean
    :group 'custom-buffer)
--- 670,676 ----
    :type 'boolean
    :group 'custom-browse)
  
! (defcustom custom-buffer-sort-alphabetically nil
    "If non-nil, sort members of each customization group alphabetically."
    :type 'boolean
    :group 'custom-buffer)

Index: lisp/isearch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.271
diff -c -r1.271 isearch.el
*** lisp/isearch.el     25 Aug 2005 10:58:48 -0000      1.271
--- lisp/isearch.el     6 Sep 2005 11:48:30 -0000
***************
***************
*** 219,225 ****
       (:background "magenta4" :foreground "cyan1"))
      (t (:inverse-video t)))
    "Face for highlighting Isearch matches."
!   :group 'isearch)
  (defvar isearch 'isearch)
  
  (defcustom isearch-lazy-highlight t
--- 224,231 ----
       (:background "magenta4" :foreground "cyan1"))
      (t (:inverse-video t)))
    "Face for highlighting Isearch matches."
!   :group 'isearch
!   :group 'basic-faces)
  (defvar isearch 'isearch)
  
  (defcustom isearch-lazy-highlight t
***************
*** 289,295 ****
       (:background "turquoise3"))
      (t (:underline t)))
    "Face for lazy highlighting of matches other than the current one."
!   :group 'lazy-highlight)
  (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
  (defvar lazy-highlight-face 'lazy-highlight)
  (define-obsolete-variable-alias 'isearch-lazy-highlight-face
--- 295,302 ----
       (:background "turquoise3"))
      (t (:underline t)))
    "Face for lazy highlighting of matches other than the current one."
!   :group 'lazy-highlight
!   :group 'basic-faces)
  (put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
  (defvar lazy-highlight-face 'lazy-highlight)
  (define-obsolete-variable-alias 'isearch-lazy-highlight-face

Index: lisp/tooltip.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tooltip.el,v
retrieving revision 1.66
diff -c -r1.66 tooltip.el
*** lisp/tooltip.el     31 Aug 2005 13:52:28 -0000      1.66
--- lisp/tooltip.el     6 Sep 2005 11:51:04 -0000
***************
*** 113,119 ****
      (t
       :inherit variable-pitch))
    "Face for tooltips."
!   :group 'tooltip)
  
  (defcustom tooltip-use-echo-area nil
    "Use the echo area instead of tooltip frames for help and GUD tooltips."
--- 113,120 ----
      (t
       :inherit variable-pitch))
    "Face for tooltips."
!   :group 'tooltip
!   :group 'basic-faces)
  
  (defcustom tooltip-use-echo-area nil
    "Use the echo area instead of tooltip frames for help and GUD tooltips."

Index: lisp/progmodes/compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.381
diff -c -r1.381 compile.el
*** lisp/progmodes/compile.el   5 Sep 2005 15:43:22 -0000       1.381
--- lisp/progmodes/compile.el   6 Sep 2005 11:51:57 -0000
***************
*** 488,494 ****
  (defface compilation-error
    '((t :inherit font-lock-warning-face))
    "Face used to highlight compiler errors."
!   :group 'font-lock-highlighting-faces
    :version "22.1")
  
  (defface compilation-warning
--- 488,494 ----
  (defface compilation-error
    '((t :inherit font-lock-warning-face))
    "Face used to highlight compiler errors."
!   :group 'compilation
    :version "22.1")
  
  (defface compilation-warning
***************
*** 496,502 ****
      (((class color)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
!   :group 'font-lock-highlighting-faces
    :version "22.1")
  
  (defface compilation-info
--- 496,502 ----
      (((class color)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
!   :group 'compilation
    :version "22.1")
  
  (defface compilation-info
***************
*** 509,527 ****
      (((class color)) (:foreground "green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler information."
!   :group 'font-lock-highlighting-faces
    :version "22.1")
  
  (defface compilation-line-number
    '((t :inherit font-lock-variable-name-face))
    "Face for displaying line numbers in compiler messages."
!   :group 'font-lock-highlighting-faces
    :version "22.1")
  
  (defface compilation-column-number
    '((t :inherit font-lock-type-face))
    "Face for displaying column numbers in compiler messages."
!   :group 'font-lock-highlighting-faces
    :version "22.1")
  
  (defvar compilation-message-face 'underline
--- 509,527 ----
      (((class color)) (:foreground "green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler information."
!   :group 'compilation
    :version "22.1")
  
  (defface compilation-line-number
    '((t :inherit font-lock-variable-name-face))
    "Face for displaying line numbers in compiler messages."
!   :group 'compilation
    :version "22.1")
  
  (defface compilation-column-number
    '((t :inherit font-lock-type-face))
    "Face for displaying column numbers in compiler messages."
!   :group 'compilation
    :version "22.1")
  
  (defvar compilation-message-face 'underline

Index: lisp/progmodes/vhdl-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/vhdl-mode.el,v
retrieving revision 1.44
diff -c -r1.44 vhdl-mode.el
*** lisp/progmodes/vhdl-mode.el 2 Sep 2005 16:59:57 -0000       1.44
--- lisp/progmodes/vhdl-mode.el 6 Sep 2005 11:54:03 -0000
***************
*** 12829,12868 ****
      (((class color) (background dark)) (:foreground "Pink" :bold t))
      (t (:inverse-video t)))
    "Font lock mode face used to highlight prompts."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-attribute-face
    '((((class color) (background light)) (:foreground "Orchid"))
      (((class color) (background dark)) (:foreground "LightSteelBlue"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized attributes."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-enumvalue-face
    '((((class color) (background light)) (:foreground "SaddleBrown"))
      (((class color) (background dark)) (:foreground "BurlyWood"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized enumeration values."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-function-face
    '((((class color) (background light)) (:foreground "Cyan4"))
      (((class color) (background dark)) (:foreground "Orchid1"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized functions and packages."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-directive-face
    '((((class color) (background light)) (:foreground "CadetBlue"))
      (((class color) (background dark)) (:foreground "Aquamarine"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight directives."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-reserved-words-face
    '((((class color) (background light)) (:foreground "Orange" :bold t))
--- 12829,12863 ----
      (((class color) (background dark)) (:foreground "Pink" :bold t))
      (t (:inverse-video t)))
    "Font lock mode face used to highlight prompts."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-attribute-face
    '((((class color) (background light)) (:foreground "Orchid"))
      (((class color) (background dark)) (:foreground "LightSteelBlue"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized attributes."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-enumvalue-face
    '((((class color) (background light)) (:foreground "SaddleBrown"))
      (((class color) (background dark)) (:foreground "BurlyWood"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized enumeration values."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-function-face
    '((((class color) (background light)) (:foreground "Cyan4"))
      (((class color) (background dark)) (:foreground "Orchid1"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight standardized functions and packages."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-directive-face
    '((((class color) (background light)) (:foreground "CadetBlue"))
      (((class color) (background dark)) (:foreground "Aquamarine"))
      (t (:italic t :bold t)))
    "Font lock mode face used to highlight directives."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-reserved-words-face
    '((((class color) (background light)) (:foreground "Orange" :bold t))
***************
*** 12871,12886 ****
      (((class color) (background dark)) (:foreground "Yellow" :bold t))
      (t ()))
    "Font lock mode face used to highlight additional reserved words."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  (defface vhdl-font-lock-translate-off-face
    '((((class color) (background light)) (:background "LightGray"))
      (((class color) (background dark)) (:background "DimGray"))
      (t ()))
    "Font lock mode face used to background highlight translate-off regions."
!   :group 'vhdl-highlight-faces
!   :group 'font-lock-highlighting-faces)
  
  ;; font lock mode faces used to highlight words with special syntax.
  (let ((syntax-alist vhdl-special-syntax-alist))
--- 12866,12879 ----
      (((class color) (background dark)) (:foreground "Yellow" :bold t))
      (t ()))
    "Font lock mode face used to highlight additional reserved words."
!   :group 'vhdl-highlight-faces)
  
  (defface vhdl-font-lock-translate-off-face
    '((((class color) (background light)) (:background "LightGray"))
      (((class color) (background dark)) (:background "DimGray"))
      (t ()))
    "Font lock mode face used to background highlight translate-off regions."
!   :group 'vhdl-highlight-faces)
  
  ;; font lock mode faces used to highlight words with special syntax.
  (let ((syntax-alist vhdl-special-syntax-alist))
***************
*** 12894,12901 ****
               (t ()))
             ,(concat "Font lock mode face used to highlight "
                      (nth 0 (car syntax-alist)) ".")
!            :group 'vhdl-highlight-faces
!            :group 'font-lock-highlighting-faces))
      (setq syntax-alist (cdr syntax-alist))))
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 12887,12893 ----
               (t ()))
             ,(concat "Font lock mode face used to highlight "
                      (nth 0 (car syntax-alist)) ".")
!            :group 'vhdl-highlight-faces))
      (setq syntax-alist (cdr syntax-alist))))
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

Index: lisp/buff-menu.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/buff-menu.el,v
retrieving revision 1.89
diff -c -r1.89 buff-menu.el
*** lisp/buff-menu.el   15 Aug 2005 21:29:32 -0000      1.89
--- lisp/buff-menu.el   6 Sep 2005 11:54:41 -0000
***************
*** 77,84 ****
  (defface Buffer-menu-buffer
    '((t (:weight bold)))
    "Face used to highlight buffer name."
!   :group 'Buffer-menu
!   :group 'font-lock-highlighting-faces)
  
  (defcustom Buffer-menu-buffer+size-width 26
    "*How wide to jointly make the buffer name and size columns."
--- 77,83 ----
  (defface Buffer-menu-buffer
    '((t (:weight bold)))
    "Face used to highlight buffer name."
!   :group 'Buffer-menu)
  
  (defcustom Buffer-menu-buffer+size-width 26
    "*How wide to jointly make the buffer name and size columns."

Index: lisp/faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.336
diff -c -r1.336 faces.el
*** lisp/faces.el       31 Aug 2005 13:48:58 -0000      1.336
--- lisp/faces.el       6 Sep 2005 11:52:57 -0000
***************
*** 1848,1859 ****
    "The standard faces of Emacs."
    :group 'faces)
  
- 
  (defface default
    '((t nil))
    "Basic default face."
    :group 'basic-faces)
  
  
  (defface mode-line
    '((((class color) (min-colors 88))
--- 1848,2001 ----
    "The standard faces of Emacs."
    :group 'faces)
  
  (defface default
    '((t nil))
    "Basic default face."
    :group 'basic-faces)
  
+ (defface bold
+   '((t :weight bold))
+   "Basic bold face."
+   :group 'basic-faces)
+ 
+ (defface italic
+   '((((supports :slant italic))
+      :slant italic)
+     (((supports :underline t))
+      :underline t)
+     (t
+      ;; default to italic, even it doesn't appear to be supported,
+      ;; because in some cases the display engine will do it's own
+      ;; workaround (to `dim' on ttys)
+      :slant italic))
+   "Basic italic face."
+   :group 'basic-faces)
+ 
+ (defface bold-italic
+   '((t :weight bold :slant italic))
+   "Basic bold-italic face."
+   :group 'basic-faces)
+ 
+ (defface underline
+   '((((supports :underline t))
+      :underline t)
+     (((supports :weight bold))
+      :weight bold)
+     (t :underline t))
+   "Basic underlined face."
+   :group 'basic-faces)
+ 
+ (defface fixed-pitch
+   '((t :family "courier"))
+   "The basic fixed-pitch face."
+   :group 'basic-faces)
+ 
+ (defface variable-pitch
+   '((t :family "helv"))
+   "The basic variable-pitch face."
+   :group 'basic-faces)
+ 
+ (defface shadow
+   '((((class color grayscale) (min-colors 88) (background light))
+      :foreground "grey50")
+     (((class color grayscale) (min-colors 88) (background dark))
+      :foreground "grey70")
+     (((class color) (min-colors 8) (background light))
+      :foreground "green")
+     (((class color) (min-colors 8) (background dark))
+      :foreground "yellow"))
+   "Basic face for shadowed text."
+   :group 'basic-faces
+   :version "22.1")
+ 
+ (defface highlight
+   '((((class color) (min-colors 88) (background light))
+      :background "darkseagreen2")
+     (((class color) (min-colors 88) (background dark))
+      :background "darkolivegreen")
+     (((class color) (min-colors 16) (background light))
+      :background "darkseagreen2")
+     (((class color) (min-colors 16) (background dark))
+      :background "darkolivegreen")
+     (((class color) (min-colors 8))
+      :background "green" :foreground "black")
+     (t :inverse-video t))
+   "Basic face for highlighting."
+   :group 'basic-faces)
+ 
+ (defface mode-line-highlight
+   '((((class color) (min-colors 88))
+      :box (:line-width 2 :color "grey40" :style released-button))
+     (t
+      :inherit highlight))
+   "Basic mode line face for highlighting."
+   :version "22.1"
+   :group 'modeline
+   :group 'basic-faces)
+ 
+ (defface region
+   '((((class color) (min-colors 88) (background dark))
+      :background "blue3")
+     (((class color) (min-colors 88) (background light))
+      :background "lightgoldenrod2")
+     (((class color) (min-colors 16) (background dark))
+      :background "blue3")
+     (((class color) (min-colors 16) (background light))
+      :background "lightgoldenrod2")
+     (((class color) (min-colors 8))
+      :background "blue" :foreground "white")
+     (((type tty) (class mono))
+      :inverse-video t)
+     (t :background "gray"))
+   "Basic face for highlighting the region."
+   :version "21.1"
+   :group 'basic-faces)
+ 
+ (defface secondary-selection
+   '((((class color) (min-colors 88) (background light))
+      :background "yellow1")
+     (((class color) (min-colors 88) (background dark))
+      :background "SkyBlue4")
+     (((class color) (min-colors 16) (background light))
+      :background "yellow")
+     (((class color) (min-colors 16) (background dark))
+      :background "SkyBlue4")
+     (((class color) (min-colors 8))
+      :background "cyan" :foreground "black")
+     (t :inverse-video t))
+   "Basic face for displaying the secondary selection."
+   :group 'basic-faces)
+ 
+ (defface trailing-whitespace
+   '((((class color) (background light))
+      :background "red1")
+     (((class color) (background dark))
+      :background "red1")
+     (t :inverse-video t))
+   "Basic face for highlighting trailing whitespace."
+   :version "21.1"
+   :group 'whitespace          ; like `show-trailing-whitespace'
+   :group 'basic-faces)
+ 
+ (defface escape-glyph
+   '((((background dark)) :foreground "cyan")
+     ;; See the comment in minibuffer-prompt for
+     ;; the reason not to use blue on MS-DOS.
+     (((type pc)) :foreground "magenta")
+     ;; red4 is too dark, but some say blue is too loud.
+     ;; brown seems to work ok. -- rms.
+     (t :foreground "brown"))
+   "Face for characters displayed as ^-sequences or \-sequences."
+   :group 'basic-faces
+   :version "22.1")
+ 
+ (defface nobreak-space
+   '((((class color) (min-colors 88)) :inherit escape-glyph :underline t)
+     (((class color) (min-colors 8)) :background "magenta")
+     (t :inverse-video t))
+   "Face for displaying nobreak space."
+   :group 'basic-faces
+   :version "22.1")
  
  (defface mode-line
    '((((class color) (min-colors 88))
***************
*** 1882,1904 ****
    :group 'modeline
    :group 'basic-faces)
  
- (defface mode-line-highlight
-   '((((class color) (min-colors 88))
-      :box (:line-width 2 :color "grey40" :style released-button))
-     (t
-      :inherit highlight))
-   "Basic mode line face for highlighting."
-   :version "22.1"
-   :group 'modeline
-   :group 'basic-faces)
- 
- (defface vertical-border
-   '((((type tty)) :inherit mode-line-inactive))
-   "Face used for vertical window dividers on ttys."
-   :version "22.1"
-   :group 'modeline
-   :group 'basic-faces)
- 
  ;; Make `modeline' an alias for `mode-line', for compatibility.
  (put 'modeline 'face-alias 'mode-line)
  (put 'modeline-inactive 'face-alias 'mode-line-inactive)
--- 2024,2029 ----
***************
*** 1939,1958 ****
    :version "21.1"
    :group 'basic-faces)
  
! 
! (defface tool-bar
!   '((default
!      :box (:line-width 1 :style released-button)
!      :foreground "black")
!     (((type x w32 mac) (class color))
!      :background "grey75")
!     (((type x) (class mono))
!      :background "grey"))
!   "Basic tool-bar face."
!   :version "21.1"
    :group 'basic-faces)
  
- 
  (defface minibuffer-prompt
    '((((background dark)) :foreground "cyan")
      ;; Don't use blue because many users of the MS-DOS port customize
--- 2064,2076 ----
    :version "21.1"
    :group 'basic-faces)
  
! (defface vertical-border
!   '((((type tty)) :inherit mode-line-inactive))
!   "Face used for vertical window dividers on ttys."
!   :version "22.1"
!   :group 'modeline
    :group 'basic-faces)
  
  (defface minibuffer-prompt
    '((((background dark)) :foreground "cyan")
      ;; Don't use blue because many users of the MS-DOS port customize
***************
*** 1969,1993 ****
  (setq minibuffer-prompt-properties
        (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt)))
  
- (defface region
-   '((((class color) (min-colors 88) (background dark))
-      :background "blue3")
-     (((class color) (min-colors 88) (background light))
-      :background "lightgoldenrod2")
-     (((class color) (min-colors 16) (background dark))
-      :background "blue3")
-     (((class color) (min-colors 16) (background light))
-      :background "lightgoldenrod2")
-     (((class color) (min-colors 8))
-      :background "blue" :foreground "white")
-     (((type tty) (class mono))
-      :inverse-video t)
-     (t :background "gray"))
-   "Basic face for highlighting the region."
-   :version "21.1"
-   :group 'basic-faces)
- 
- 
  (defface fringe
    '((((class color) (background light))
       :background "grey95")
--- 2087,2092 ----
***************
*** 2000,2033 ****
    :group 'frames
    :group 'basic-faces)
  
- 
  (defface scroll-bar '()
    "Basic face for the scroll bar colors under X."
    :version "21.1"
    :group 'frames
    :group 'basic-faces)
  
- 
- (defface menu
-   '((((type tty))
-      :inverse-video t)
-     (((type x-toolkit))
-      )
-     (t
-      :inverse-video t))
-   "Basic face for the font and colors of the menu bar and popup menus."
-   :version "21.1"
-   :group 'menu
-   :group 'basic-faces)
- 
- 
  (defface border '()
    "Basic face for the frame border under X."
    :version "21.1"
    :group 'frames
    :group 'basic-faces)
  
- 
  (defface cursor '()
    "Basic face for the cursor color under X.
  Note: Other faces cannot inherit from the cursor face."
--- 2099,2116 ----
***************
*** 2043,2167 ****
    :group 'mouse
    :group 'basic-faces)
  
! 
! (defface bold '((t :weight bold))
!   "Basic bold face."
    :group 'basic-faces)
  
! 
! (defface italic
!   '((((supports :slant italic))
!      :slant italic)
!     (((supports :underline t))
!      :underline t)
      (t
!      ;; default to italic, even it doesn't appear to be supported,
!      ;; because in some cases the display engine will do it's own
!      ;; workaround (to `dim' on ttys)
!      :slant italic))
!   "Basic italic face."
!   :group 'basic-faces)
! 
! 
! (defface bold-italic '((t :weight bold :slant italic))
!   "Basic bold-italic face."
!   :group 'basic-faces)
! 
! 
! (defface underline '((((supports :underline t))
!                     :underline t)
!                    (((supports :weight bold))
!                     :weight bold)
!                    (t :underline t))
!   "Basic underlined face."
!   :group 'basic-faces)
! 
! 
! (defface highlight
!   '((((class color) (min-colors 88) (background light))
!      :background "darkseagreen2")
!     (((class color) (min-colors 88) (background dark))
!      :background "darkolivegreen")
!     (((class color) (min-colors 16) (background light))
!      :background "darkseagreen2")
!     (((class color) (min-colors 16) (background dark))
!      :background "darkolivegreen")
!     (((class color) (min-colors 8))
!      :background "green" :foreground "black")
!     (t :inverse-video t))
!   "Basic face for highlighting."
!   :group 'basic-faces)
! 
! 
! (defface secondary-selection
!   '((((class color) (min-colors 88) (background light))
!      :background "yellow1")
!     (((class color) (min-colors 88) (background dark))
!      :background "SkyBlue4")
!     (((class color) (min-colors 16) (background light))
!      :background "yellow")
!     (((class color) (min-colors 16) (background dark))
!      :background "SkyBlue4")
!     (((class color) (min-colors 8))
!      :background "cyan" :foreground "black")
!     (t :inverse-video t))
!   "Basic face for displaying the secondary selection."
!   :group 'basic-faces)
! 
! 
! (defface fixed-pitch '((t :family "courier"))
!   "The basic fixed-pitch face."
!   :group 'basic-faces)
! 
! 
! (defface variable-pitch '((t :family "helv"))
!   "The basic variable-pitch face."
!   :group 'basic-faces)
! 
! 
! (defface trailing-whitespace
!   '((((class color) (background light))
!      :background "red1")
!     (((class color) (background dark))
!      :background "red1")
!     (t :inverse-video t))
!   "Basic face for highlighting trailing whitespace."
    :version "21.1"
!   :group 'whitespace          ; like `show-trailing-whitespace'
    :group 'basic-faces)
- 
- (defface escape-glyph
-   '((((background dark)) :foreground "cyan")
-     ;; See the comment in minibuffer-prompt for
-     ;; the reason not to use blue on MS-DOS.
-     (((type pc)) :foreground "magenta")
-     ;; red4 is too dark, but some say blue is too loud.
-     ;; brown seems to work ok. -- rms.
-     (t :foreground "brown"))
-   "Face for characters displayed as ^-sequences or \-sequences."
-   :group 'basic-faces
-   :version "22.1")
- 
- (defface nobreak-space
-   '((((class color) (min-colors 88)) :inherit escape-glyph :underline t)
-     (((class color) (min-colors 8)) :background "magenta")
-     (t :inverse-video t))
-   "Face for displaying nobreak space."
-   :group 'basic-faces
-   :version "22.1")
- 
- (defface shadow
-   '((((class color grayscale) (min-colors 88) (background light))
-      :foreground "grey50")
-     (((class color grayscale) (min-colors 88) (background dark))
-      :foreground "grey70")
-     (((class color) (min-colors 8) (background light))
-      :foreground "green")
-     (((class color) (min-colors 8) (background dark))
-      :foreground "yellow"))
-   "Basic face for shadowed text."
-   :group 'basic-faces
-   :version "22.1")
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 2126,2154 ----
    :group 'mouse
    :group 'basic-faces)
  
! (defface tool-bar
!   '((default
!      :box (:line-width 1 :style released-button)
!      :foreground "black")
!     (((type x w32 mac) (class color))
!      :background "grey75")
!     (((type x) (class mono))
!      :background "grey"))
!   "Basic tool-bar face."
!   :version "21.1"
    :group 'basic-faces)
  
! (defface menu
!   '((((type tty))
!      :inverse-video t)
!     (((type x-toolkit))
!      )
      (t
!      :inverse-video t))
!   "Basic face for the font and colors of the menu bar and popup menus."
    :version "21.1"
!   :group 'menu
    :group 'basic-faces)
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-- 
Juri Linkov
http://www.jurta.org/emacs/





reply via email to

[Prev in Thread] Current Thread [Next in Thread]