/[emacs]/emacs/lisp/cus-edit.el
ViewVC logotype

Diff of /emacs/lisp/cus-edit.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.222 by lute, Thu May 26 12:40:44 2005 UTC revision 1.223 by miles, Fri Jun 10 07:16:58 2005 UTC
# Line 1636  item in another window.\n\n")) Line 1636  item in another window.\n\n"))
1636    :group 'custom-faces    :group 'custom-faces
1637    :group 'custom-buffer)    :group 'custom-buffer)
1638    
1639  (defface custom-invalid-face '((((class color))  (defface custom-invalid '((((class color))
1640                                  (:foreground "yellow1" :background "red1"))                             (:foreground "yellow1" :background "red1"))
1641                                 (t                            (t
1642                                  (:weight bold :slant italic :underline t)))                             (:weight bold :slant italic :underline t)))
1643    "Face used when the customize item is invalid."    "Face used when the customize item is invalid."
1644    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1645    ;; backward-compatibility alias
1646    (put 'custom-invalid-face 'face-alias 'custom-invalid)
1647    
1648  (defface custom-rogue-face '((((class color))  (defface custom-rogue '((((class color))
1649                                (:foreground "pink" :background "black"))                           (:foreground "pink" :background "black"))
1650                               (t                          (t
1651                                (:underline t)))                           (:underline t)))
1652    "Face used when the customize item is not defined for customization."    "Face used when the customize item is not defined for customization."
1653    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1654    ;; backward-compatibility alias
1655    (put 'custom-rogue-face 'face-alias 'custom-rogue)
1656    
1657  (defface custom-modified-face '((((min-colors 88) (class color))  (defface custom-modified '((((min-colors 88) (class color))
1658                                   (:foreground "white" :background "blue1"))                              (:foreground "white" :background "blue1"))
1659                                  (((class color))                             (((class color))
1660                                   (:foreground "white" :background "blue"))                              (:foreground "white" :background "blue"))
1661                                  (t                             (t
1662                                   (:slant italic :bold)))                              (:slant italic :bold)))
1663    "Face used when the customize item has been modified."    "Face used when the customize item has been modified."
1664    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1665    ;; backward-compatibility alias
1666    (put 'custom-modified-face 'face-alias 'custom-modified)
1667    
1668  (defface custom-set-face '((((min-colors 88) (class color))  (defface custom-set '((((min-colors 88) (class color))
1669                              (:foreground "blue1" :background "white"))                         (:foreground "blue1" :background "white"))
1670                             (((class color))                        (((class color))
1671                              (:foreground "blue" :background "white"))                         (:foreground "blue" :background "white"))
1672                             (t                        (t
1673                              (:slant italic)))                         (:slant italic)))
1674    "Face used when the customize item has been set."    "Face used when the customize item has been set."
1675    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1676    ;; backward-compatibility alias
1677    (put 'custom-set-face 'face-alias 'custom-set)
1678    
1679  (defface custom-changed-face '((((min-colors 88) (class color))  (defface custom-changed '((((min-colors 88) (class color))
1680                                  (:foreground "white" :background "blue1"))                             (:foreground "white" :background "blue1"))
1681                                 (((class color))                            (((class color))
1682                                  (:foreground "white" :background "blue"))                             (:foreground "white" :background "blue"))
1683                                 (t                            (t
1684                                  (:slant italic)))                             (:slant italic)))
1685    "Face used when the customize item has been changed."    "Face used when the customize item has been changed."
1686    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1687    ;; backward-compatibility alias
1688    (put 'custom-changed-face 'face-alias 'custom-changed)
1689    
1690  (defface custom-saved-face '((t (:underline t)))  (defface custom-saved '((t (:underline t)))
1691    "Face used when the customize item has been saved."    "Face used when the customize item has been saved."
1692    :group 'custom-magic-faces)    :group 'custom-magic-faces)
1693    ;; backward-compatibility alias
1694    (put 'custom-saved-face 'face-alias 'custom-saved)
1695    
1696  (defconst custom-magic-alist  (defconst custom-magic-alist
1697    '((nil "#" underline "\    '((nil "#" underline "\
# Line 1689  UNKNOWN, you should not see this.") Line 1701  UNKNOWN, you should not see this.")
1701      (hidden "-" default "\      (hidden "-" default "\
1702  HIDDEN, invoke \"Show\" in the previous line to show." "\  HIDDEN, invoke \"Show\" in the previous line to show." "\
1703  group now hidden, invoke \"Show\", above, to show contents.")  group now hidden, invoke \"Show\", above, to show contents.")
1704      (invalid "x" custom-invalid-face "\      (invalid "x" custom-invalid "\
1705  INVALID, the displayed value cannot be set.")  INVALID, the displayed value cannot be set.")
1706      (modified "*" custom-modified-face "\      (modified "*" custom-modified "\
1707  EDITED, shown value does not take effect until you set or save it." "\  EDITED, shown value does not take effect until you set or save it." "\
1708  something in this group has been edited but not set.")  something in this group has been edited but not set.")
1709      (set "+" custom-set-face "\      (set "+" custom-set "\
1710  SET for current session only." "\  SET for current session only." "\
1711  something in this group has been set but not saved.")  something in this group has been set but not saved.")
1712      (changed ":" custom-changed-face "\      (changed ":" custom-changed "\
1713  CHANGED outside Customize; operating on it here may be unreliable." "\  CHANGED outside Customize; operating on it here may be unreliable." "\
1714  something in this group has been changed outside customize.")  something in this group has been changed outside customize.")
1715      (saved "!" custom-saved-face "\      (saved "!" custom-saved "\
1716  SAVED and set." "\  SAVED and set." "\
1717  something in this group has been set and saved.")  something in this group has been set and saved.")
1718      (rogue "@" custom-rogue-face "\      (rogue "@" custom-rogue "\
1719  NO CUSTOMIZATION DATA; you should not see this." "\  NO CUSTOMIZATION DATA; you should not see this." "\
1720  something in this group is not prepared for customization.")  something in this group is not prepared for customization.")
1721      (standard " " nil "\      (standard " " nil "\
# Line 1830  and `face'." Line 1842  and `face'."
1842                 (insert " (lisp)"))                 (insert " (lisp)"))
1843                ((eq form 'mismatch)                ((eq form 'mismatch)
1844                 (insert " (mismatch)")))                 (insert " (mismatch)")))
1845          (put-text-property start (point) 'face 'custom-state-face))          (put-text-property start (point) 'face 'custom-state))
1846        (insert "\n"))        (insert "\n"))
1847      (when (and (eq category 'group)      (when (and (eq category 'group)
1848                 (not (and (eq custom-buffer-style 'links)                 (not (and (eq custom-buffer-style 'links)
# Line 1864  and `face'." Line 1876  and `face'."
1876    
1877  ;;; The `custom' Widget.  ;;; The `custom' Widget.
1878    
1879  (defface custom-button-face  (defface custom-button
1880    '((((type x w32 mac) (class color))           ; Like default modeline    '((((type x w32 mac) (class color))           ; Like default modeline
1881       (:box (:line-width 2 :style released-button)       (:box (:line-width 2 :style released-button)
1882             :background "lightgrey" :foreground "black"))             :background "lightgrey" :foreground "black"))
# Line 1873  and `face'." Line 1885  and `face'."
1885    "Face used for buttons in customization buffers."    "Face used for buttons in customization buffers."
1886    :version "21.1"    :version "21.1"
1887    :group 'custom-faces)    :group 'custom-faces)
1888    ;; backward-compatibility alias
1889    (put 'custom-button-face 'face-alias 'custom-button)
1890    
1891  (defface custom-button-pressed-face  (defface custom-button-pressed
1892    '((((type x w32 mac) (class color))    '((((type x w32 mac) (class color))
1893       (:box (:line-width 2 :style pressed-button)       (:box (:line-width 2 :style pressed-button)
1894             :background "lightgrey" :foreground "black"))             :background "lightgrey" :foreground "black"))
# Line 1883  and `face'." Line 1897  and `face'."
1897    "Face used for buttons in customization buffers."    "Face used for buttons in customization buffers."
1898    :version "21.1"    :version "21.1"
1899    :group 'custom-faces)    :group 'custom-faces)
1900    ;; backward-compatibility alias
1901    (put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
1902    
1903  (defface custom-documentation-face nil  (defface custom-documentation nil
1904    "Face used for documentation strings in customization buffers."    "Face used for documentation strings in customization buffers."
1905    :group 'custom-faces)    :group 'custom-faces)
1906    ;; backward-compatibility alias
1907    (put 'custom-documentation-face 'face-alias 'custom-documentation)
1908    
1909  (defface custom-state-face '((((class color)  (defface custom-state '((((class color)
1910                                 (background dark))                            (background dark))
1911                                (:foreground "lime green"))                           (:foreground "lime green"))
1912                               (((class color)                          (((class color)
1913                                 (background light))                            (background light))
1914                                (:foreground "dark green"))                           (:foreground "dark green"))
1915                               (t nil))                          (t nil))
1916    "Face used for State descriptions in the customize buffer."    "Face used for State descriptions in the customize buffer."
1917    :group 'custom-faces)    :group 'custom-faces)
1918    ;; backward-compatibility alias
1919    (put 'custom-state-face 'face-alias 'custom-state)
1920    
1921  (define-widget 'custom 'default  (define-widget 'custom 'default
1922    "Customize a user option."    "Customize a user option."
# Line 2092  If INITIAL-STRING is non-nil, use that r Line 2112  If INITIAL-STRING is non-nil, use that r
2112  ;;; The `custom-comment' Widget.  ;;; The `custom-comment' Widget.
2113    
2114  ;; like the editable field  ;; like the editable field
2115  (defface custom-comment-face '((((class grayscale color)  (defface custom-comment '((((class grayscale color)
2116                                   (background light))                              (background light))
2117                                  (:background "gray85"))                             (:background "gray85"))
2118                                 (((class grayscale color)                            (((class grayscale color)
2119                                   (background dark))                              (background dark))
2120                                  (:background "dim gray"))                             (:background "dim gray"))
2121                                 (t                            (t
2122                                  (:slant italic)))                             (:slant italic)))
2123    "Face used for comments on variables or faces"    "Face used for comments on variables or faces"
2124    :version "21.1"    :version "21.1"
2125    :group 'custom-faces)    :group 'custom-faces)
2126    ;; backward-compatibility alias
2127    (put 'custom-comment-face 'face-alias 'custom-comment)
2128    
2129  ;; like font-lock-comment-face  ;; like font-lock-comment-face
2130  (defface custom-comment-tag-face  (defface custom-comment-tag
2131    '((((class color) (background dark)) (:foreground "gray80"))    '((((class color) (background dark)) (:foreground "gray80"))
2132      (((class color) (background light)) (:foreground "blue4"))      (((class color) (background light)) (:foreground "blue4"))
2133      (((class grayscale) (background light))      (((class grayscale) (background light))
# Line 2115  If INITIAL-STRING is non-nil, use that r Line 2137  If INITIAL-STRING is non-nil, use that r
2137      (t (:weight bold)))      (t (:weight bold)))
2138    "Face used for variables or faces comment tags"    "Face used for variables or faces comment tags"
2139    :group 'custom-faces)    :group 'custom-faces)
2140    ;; backward-compatibility alias
2141    (put 'custom-comment-tag-face 'face-alias 'custom-comment-tag)
2142    
2143  (define-widget 'custom-comment 'string  (define-widget 'custom-comment 'string
2144    "User comment."    "User comment."
# Line 2154  If INITIAL-STRING is non-nil, use that r Line 2178  If INITIAL-STRING is non-nil, use that r
2178    
2179  ;; When this was underlined blue, users confused it with a  ;; When this was underlined blue, users confused it with a
2180  ;; Mosaic-style hyperlink...  ;; Mosaic-style hyperlink...
2181  (defface custom-variable-tag-face  (defface custom-variable-tag
2182    `((((class color)    `((((class color)
2183        (background dark))        (background dark))
2184       (:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))       (:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
# Line 2167  If INITIAL-STRING is non-nil, use that r Line 2191  If INITIAL-STRING is non-nil, use that r
2191      (t (:weight bold)))      (t (:weight bold)))
2192    "Face used for unpushable variable tags."    "Face used for unpushable variable tags."
2193    :group 'custom-faces)    :group 'custom-faces)
2194    ;; backward-compatibility alias
2195    (put 'custom-variable-tag-face 'face-alias 'custom-variable-tag)
2196    
2197  (defface custom-variable-button-face '((t (:underline t :weight bold)))  (defface custom-variable-button '((t (:underline t :weight bold)))
2198    "Face used for pushable variable tags."    "Face used for pushable variable tags."
2199    :group 'custom-faces)    :group 'custom-faces)
2200    ;; backward-compatibility alias
2201    (put 'custom-variable-button-face 'face-alias 'custom-variable-button)
2202    
2203  (defcustom custom-variable-default-form 'edit  (defcustom custom-variable-default-form 'edit
2204    "Default form of displaying variable values."    "Default form of displaying variable values."
# Line 2874  Only match frames that support the speci Line 2902  Only match frames that support the speci
2902    
2903  ;;; The `custom-face' Widget.  ;;; The `custom-face' Widget.
2904    
2905  (defface custom-face-tag-face  (defface custom-face-tag
2906    `((t (:weight bold :height 1.2 :inherit variable-pitch)))    `((t (:weight bold :height 1.2 :inherit variable-pitch)))
2907    "Face used for face tags."    "Face used for face tags."
2908    :group 'custom-faces)    :group 'custom-faces)
2909    ;; backward-compatibility alias
2910    (put 'custom-face-tag-face 'face-alias 'custom-face-tag)
2911    
2912  (defcustom custom-face-default-form 'selected  (defcustom custom-face-default-form 'selected
2913    "Default form of displaying face definition."    "Default form of displaying face definition."
# Line 3396  restoring it to the state of a face that Line 3426  restoring it to the state of a face that
3426    ;; Fixme: make it do so in Emacs.    ;; Fixme: make it do so in Emacs.
3427    "Face used for group tags.    "Face used for group tags.
3428  The first member is used for level 1 groups, the second for level 2,  The first member is used for level 1 groups, the second for level 2,
3429  and so forth.  The remaining group tags are shown with  and so forth.  The remaining group tags are shown with `custom-group-tag'."
 `custom-group-tag-face'."  
3430    :type '(repeat face)    :type '(repeat face)
3431    :group 'custom-faces)    :group 'custom-faces)
3432    
3433  (defface custom-group-tag-face-1  (defface custom-group-tag-1
3434    `((((class color)    `((((class color)
3435        (background dark))        (background dark))
3436       (:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))       (:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
# Line 3414  and so forth.  The remaining group tags Line 3443  and so forth.  The remaining group tags
3443      (t (:weight bold)))      (t (:weight bold)))
3444    "Face used for group tags."    "Face used for group tags."
3445    :group 'custom-faces)    :group 'custom-faces)
3446    ;; backward-compatibility alias
3447    (put 'custom-group-tag-face-1 'face-alias 'custom-group-tag-1)
3448    
3449  (defface custom-group-tag-face  (defface custom-group-tag
3450    `((((class color)    `((((class color)
3451        (background dark))        (background dark))
3452       (:foreground "light blue" :weight bold :height 1.2))       (:foreground "light blue" :weight bold :height 1.2))
# Line 3428  and so forth.  The remaining group tags Line 3459  and so forth.  The remaining group tags
3459      (t (:weight bold)))      (t (:weight bold)))
3460    "Face used for low level group tags."    "Face used for low level group tags."
3461    :group 'custom-faces)    :group 'custom-faces)
3462    ;; backward-compatibility alias
3463    (put 'custom-group-tag-face 'face-alias 'custom-group-tag)
3464    
3465  (define-widget 'custom-group 'custom  (define-widget 'custom-group 'custom
3466    "Customize group."    "Customize group."
# Line 3448  and so forth.  The remaining group tags Line 3481  and so forth.  The remaining group tags
3481  (defun custom-group-sample-face-get (widget)  (defun custom-group-sample-face-get (widget)
3482    ;; Use :sample-face.    ;; Use :sample-face.
3483    (or (nth (1- (widget-get widget :custom-level)) custom-group-tag-faces)    (or (nth (1- (widget-get widget :custom-level)) custom-group-tag-faces)
3484        'custom-group-tag-face))        'custom-group-tag))
3485    
3486  (define-widget 'custom-group-visibility 'visibility  (define-widget 'custom-group-visibility 'visibility
3487    "An indicator and manipulator for hidden group contents."    "An indicator and manipulator for hidden group contents."
# Line 4261  if that value is non-nil." Line 4294  if that value is non-nil."
4294    (make-local-variable 'custom-options)    (make-local-variable 'custom-options)
4295    (make-local-variable 'custom-local-buffer)    (make-local-variable 'custom-local-buffer)
4296    (make-local-variable 'widget-documentation-face)    (make-local-variable 'widget-documentation-face)
4297    (setq widget-documentation-face 'custom-documentation-face)    (setq widget-documentation-face 'custom-documentation)
4298    (make-local-variable 'widget-button-face)    (make-local-variable 'widget-button-face)
4299    (setq widget-button-face 'custom-button-face)    (setq widget-button-face 'custom-button)
4300    (set (make-local-variable 'widget-button-pressed-face)    (set (make-local-variable 'widget-button-pressed-face) 'custom-button-pressed)
        'custom-button-pressed-face)  
4301    (set (make-local-variable 'widget-mouse-face)    (set (make-local-variable 'widget-mouse-face)
4302         'custom-button-pressed-face)     ; buttons `depress' when moused         'custom-button-pressed)          ; buttons `depress' when moused
4303    ;; When possible, use relief for buttons, not bracketing.  This test    ;; When possible, use relief for buttons, not bracketing.  This test
4304    ;; may not be optimal.    ;; may not be optimal.
4305    (when custom-raised-buttons    (when custom-raised-buttons

Legend:
Removed from v.1.222  
changed lines
  Added in v.1.223

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26