[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/cus-edit.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/cus-edit.el |
Date: |
Fri, 10 Jun 2005 03:17:00 -0400 |
Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.222 emacs/lisp/cus-edit.el:1.223
*** emacs/lisp/cus-edit.el:1.222 Thu May 26 12:40:44 2005
--- emacs/lisp/cus-edit.el Fri Jun 10 07:16:58 2005
***************
*** 1636,1685 ****
:group 'custom-faces
:group 'custom-buffer)
! (defface custom-invalid-face '((((class color))
! (:foreground "yellow1" :background "red1"))
! (t
! (:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid."
:group 'custom-magic-faces)
! (defface custom-rogue-face '((((class color))
! (:foreground "pink" :background "black"))
! (t
! (:underline t)))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
! (defface custom-modified-face '((((min-colors 88) (class color))
! (:foreground "white" :background "blue1"))
! (((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 '((((min-colors 88) (class color))
! (:foreground "blue1" :background "white"))
! (((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 '((((min-colors 88) (class color))
! (:foreground "white" :background "blue1"))
! (((class color))
! (:foreground "white" :background "blue"))
! (t
! (:slant italic)))
"Face used when the customize item has been changed."
:group 'custom-magic-faces)
! (defface custom-saved-face '((t (:underline t)))
"Face used when the customize item has been saved."
:group 'custom-magic-faces)
(defconst custom-magic-alist
'((nil "#" underline "\
--- 1636,1697 ----
:group 'custom-faces
:group 'custom-buffer)
! (defface custom-invalid '((((class color))
! (:foreground "yellow1" :background "red1"))
! (t
! (:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-invalid-face 'face-alias 'custom-invalid)
! (defface custom-rogue '((((class color))
! (:foreground "pink" :background "black"))
! (t
! (:underline t)))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-rogue-face 'face-alias 'custom-rogue)
! (defface custom-modified '((((min-colors 88) (class color))
! (:foreground "white" :background "blue1"))
! (((class color))
! (:foreground "white" :background "blue"))
! (t
! (:slant italic :bold)))
"Face used when the customize item has been modified."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-modified-face 'face-alias 'custom-modified)
! (defface custom-set '((((min-colors 88) (class color))
! (:foreground "blue1" :background "white"))
! (((class color))
! (:foreground "blue" :background "white"))
! (t
! (:slant italic)))
"Face used when the customize item has been set."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-set-face 'face-alias 'custom-set)
! (defface custom-changed '((((min-colors 88) (class color))
! (:foreground "white" :background "blue1"))
! (((class color))
! (:foreground "white" :background "blue"))
! (t
! (:slant italic)))
"Face used when the customize item has been changed."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-changed-face 'face-alias 'custom-changed)
! (defface custom-saved '((t (:underline t)))
"Face used when the customize item has been saved."
:group 'custom-magic-faces)
+ ;; backward-compatibility alias
+ (put 'custom-saved-face 'face-alias 'custom-saved)
(defconst custom-magic-alist
'((nil "#" underline "\
***************
*** 1689,1709 ****
(hidden "-" default "\
HIDDEN, invoke \"Show\" in the previous line to show." "\
group now hidden, invoke \"Show\", above, to show contents.")
! (invalid "x" custom-invalid-face "\
INVALID, the displayed value cannot be set.")
! (modified "*" custom-modified-face "\
EDITED, shown value does not take effect until you set or save it." "\
something in this group has been edited but not set.")
! (set "+" custom-set-face "\
SET for current session only." "\
something in this group has been set but not saved.")
! (changed ":" custom-changed-face "\
CHANGED outside Customize; operating on it here may be unreliable." "\
something in this group has been changed outside customize.")
! (saved "!" custom-saved-face "\
SAVED and set." "\
something in this group has been set and saved.")
! (rogue "@" custom-rogue-face "\
NO CUSTOMIZATION DATA; you should not see this." "\
something in this group is not prepared for customization.")
(standard " " nil "\
--- 1701,1721 ----
(hidden "-" default "\
HIDDEN, invoke \"Show\" in the previous line to show." "\
group now hidden, invoke \"Show\", above, to show contents.")
! (invalid "x" custom-invalid "\
INVALID, the displayed value cannot be set.")
! (modified "*" custom-modified "\
EDITED, shown value does not take effect until you set or save it." "\
something in this group has been edited but not set.")
! (set "+" custom-set "\
SET for current session only." "\
something in this group has been set but not saved.")
! (changed ":" custom-changed "\
CHANGED outside Customize; operating on it here may be unreliable." "\
something in this group has been changed outside customize.")
! (saved "!" custom-saved "\
SAVED and set." "\
something in this group has been set and saved.")
! (rogue "@" custom-rogue "\
NO CUSTOMIZATION DATA; you should not see this." "\
something in this group is not prepared for customization.")
(standard " " nil "\
***************
*** 1830,1836 ****
(insert " (lisp)"))
((eq form 'mismatch)
(insert " (mismatch)")))
! (put-text-property start (point) 'face 'custom-state-face))
(insert "\n"))
(when (and (eq category 'group)
(not (and (eq custom-buffer-style 'links)
--- 1842,1848 ----
(insert " (lisp)"))
((eq form 'mismatch)
(insert " (mismatch)")))
! (put-text-property start (point) 'face 'custom-state))
(insert "\n"))
(when (and (eq category 'group)
(not (and (eq custom-buffer-style 'links)
***************
*** 1864,1870 ****
;;; The `custom' Widget.
! (defface custom-button-face
'((((type x w32 mac) (class color)) ; Like default modeline
(:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
--- 1876,1882 ----
;;; The `custom' Widget.
! (defface custom-button
'((((type x w32 mac) (class color)) ; Like default modeline
(:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
***************
*** 1873,1880 ****
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
! (defface custom-button-pressed-face
'((((type x w32 mac) (class color))
(:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black"))
--- 1885,1894 ----
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-button-face 'face-alias 'custom-button)
! (defface custom-button-pressed
'((((type x w32 mac) (class color))
(:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black"))
***************
*** 1883,1902 ****
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
! (defface custom-documentation-face nil
"Face used for documentation strings in customization buffers."
:group 'custom-faces)
! (defface custom-state-face '((((class color)
! (background dark))
! (:foreground "lime green"))
! (((class color)
! (background light))
! (:foreground "dark green"))
! (t nil))
"Face used for State descriptions in the customize buffer."
:group 'custom-faces)
(define-widget 'custom 'default
"Customize a user option."
--- 1897,1922 ----
"Face used for buttons in customization buffers."
:version "21.1"
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
! (defface custom-documentation nil
"Face used for documentation strings in customization buffers."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-documentation-face 'face-alias 'custom-documentation)
! (defface custom-state '((((class color)
! (background dark))
! (:foreground "lime green"))
! (((class color)
! (background light))
! (:foreground "dark green"))
! (t nil))
"Face used for State descriptions in the customize buffer."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-state-face 'face-alias 'custom-state)
(define-widget 'custom 'default
"Customize a user option."
***************
*** 2092,2111 ****
;;; The `custom-comment' Widget.
;; like the editable field
! (defface custom-comment-face '((((class grayscale color)
! (background light))
! (:background "gray85"))
! (((class grayscale color)
! (background dark))
! (:background "dim gray"))
! (t
! (:slant italic)))
"Face used for comments on variables or faces"
:version "21.1"
:group 'custom-faces)
;; like font-lock-comment-face
! (defface custom-comment-tag-face
'((((class color) (background dark)) (:foreground "gray80"))
(((class color) (background light)) (:foreground "blue4"))
(((class grayscale) (background light))
--- 2112,2133 ----
;;; The `custom-comment' Widget.
;; like the editable field
! (defface custom-comment '((((class grayscale color)
! (background light))
! (:background "gray85"))
! (((class grayscale color)
! (background dark))
! (:background "dim gray"))
! (t
! (:slant italic)))
"Face used for comments on variables or faces"
:version "21.1"
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-comment-face 'face-alias 'custom-comment)
;; like font-lock-comment-face
! (defface custom-comment-tag
'((((class color) (background dark)) (:foreground "gray80"))
(((class color) (background light)) (:foreground "blue4"))
(((class grayscale) (background light))
***************
*** 2115,2120 ****
--- 2137,2144 ----
(t (:weight bold)))
"Face used for variables or faces comment tags"
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-comment-tag-face 'face-alias 'custom-comment-tag)
(define-widget 'custom-comment 'string
"User comment."
***************
*** 2154,2160 ****
;; 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" :weight bold :height 1.2 :inherit
variable-pitch))
--- 2178,2184 ----
;; When this was underlined blue, users confused it with a
;; Mosaic-style hyperlink...
! (defface custom-variable-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2 :inherit
variable-pitch))
***************
*** 2167,2176 ****
(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)
(defcustom custom-variable-default-form 'edit
"Default form of displaying variable values."
--- 2191,2204 ----
(t (:weight bold)))
"Face used for unpushable variable tags."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-variable-tag-face 'face-alias 'custom-variable-tag)
! (defface custom-variable-button '((t (:underline t :weight bold)))
"Face used for pushable variable tags."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-variable-button-face 'face-alias 'custom-variable-button)
(defcustom custom-variable-default-form 'edit
"Default form of displaying variable values."
***************
*** 2874,2883 ****
;;; 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)
(defcustom custom-face-default-form 'selected
"Default form of displaying face definition."
--- 2902,2913 ----
;;; The `custom-face' Widget.
! (defface custom-face-tag
`((t (:weight bold :height 1.2 :inherit variable-pitch)))
"Face used for face tags."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-face-tag-face 'face-alias 'custom-face-tag)
(defcustom custom-face-default-form 'selected
"Default form of displaying face definition."
***************
*** 3396,3407 ****
;; Fixme: make it do so in Emacs.
"Face used for group tags.
The first member is used for level 1 groups, the second for level 2,
! and so forth. The remaining group tags are shown with
! `custom-group-tag-face'."
:type '(repeat face)
:group 'custom-faces)
! (defface custom-group-tag-face-1
`((((class color)
(background dark))
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
--- 3426,3436 ----
;; Fixme: make it do so in Emacs.
"Face used for group tags.
The first member is used for level 1 groups, the second for level 2,
! and so forth. The remaining group tags are shown with `custom-group-tag'."
:type '(repeat face)
:group 'custom-faces)
! (defface custom-group-tag-1
`((((class color)
(background dark))
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
***************
*** 3414,3421 ****
(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))
--- 3443,3452 ----
(t (:weight bold)))
"Face used for group tags."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-group-tag-face-1 'face-alias 'custom-group-tag-1)
! (defface custom-group-tag
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2))
***************
*** 3428,3433 ****
--- 3459,3466 ----
(t (:weight bold)))
"Face used for low level group tags."
:group 'custom-faces)
+ ;; backward-compatibility alias
+ (put 'custom-group-tag-face 'face-alias 'custom-group-tag)
(define-widget 'custom-group 'custom
"Customize group."
***************
*** 3448,3454 ****
(defun custom-group-sample-face-get (widget)
;; Use :sample-face.
(or (nth (1- (widget-get widget :custom-level)) custom-group-tag-faces)
! 'custom-group-tag-face))
(define-widget 'custom-group-visibility 'visibility
"An indicator and manipulator for hidden group contents."
--- 3481,3487 ----
(defun custom-group-sample-face-get (widget)
;; Use :sample-face.
(or (nth (1- (widget-get widget :custom-level)) custom-group-tag-faces)
! 'custom-group-tag))
(define-widget 'custom-group-visibility 'visibility
"An indicator and manipulator for hidden group contents."
***************
*** 4261,4273 ****
(make-local-variable 'custom-options)
(make-local-variable 'custom-local-buffer)
(make-local-variable 'widget-documentation-face)
! (setq widget-documentation-face 'custom-documentation-face)
(make-local-variable 'widget-button-face)
! (setq widget-button-face 'custom-button-face)
! (set (make-local-variable 'widget-button-pressed-face)
! 'custom-button-pressed-face)
(set (make-local-variable 'widget-mouse-face)
! 'custom-button-pressed-face) ; buttons `depress' when moused
;; When possible, use relief for buttons, not bracketing. This test
;; may not be optimal.
(when custom-raised-buttons
--- 4294,4305 ----
(make-local-variable 'custom-options)
(make-local-variable 'custom-local-buffer)
(make-local-variable 'widget-documentation-face)
! (setq widget-documentation-face 'custom-documentation)
(make-local-variable 'widget-button-face)
! (setq widget-button-face 'custom-button)
! (set (make-local-variable 'widget-button-pressed-face)
'custom-button-pressed)
(set (make-local-variable 'widget-mouse-face)
! 'custom-button-pressed) ; buttons `depress' when moused
;; When possible, use relief for buttons, not bracketing. This test
;; may not be optimal.
(when custom-raised-buttons
- [Emacs-diffs] Changes to emacs/lisp/cus-edit.el,
Miles Bader <=