emacs: lisp/cus-edit.el comparison

comparison lisp/cus-edit.el @ 90195:a1b34dec1104

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 358-423) - Update from CVS - Remove "-face" suffix from widget faces - Remove "-face" suffix from custom faces - Remove "-face" suffix from change-log faces - Remove "-face" suffix from compilation faces - Remove "-face" suffix from diff-mode faces - lisp/longlines.el (longlines-visible-face): Face removed - Remove "-face" suffix from woman faces - Remove "-face" suffix from whitespace-highlight face - Remove "-face" suffix from ruler-mode faces - Remove "-face" suffix from show-paren faces - Remove "-face" suffix from log-view faces - Remove "-face" suffix from smerge faces - Remove "-face" suffix from show-tabs faces - Remove "-face" suffix from highlight-changes faces - Remove "-face" suffix from and downcase info faces - Remove "-face" suffix from pcvs faces - Update uses of renamed pcvs faces - Tweak ChangeLog - Remove "-face" suffix from strokes-char face - Remove "-face" suffix from compare-windows face - Remove "-face" suffix from calendar faces - Remove "-face" suffix from diary-button face - Remove "-face" suffix from testcover faces - Remove "-face" suffix from viper faces - Remove "-face" suffix from org faces - Remove "-face" suffix from sgml-namespace face - Remove "-face" suffix from table-cell face - Remove "-face" suffix from tex-mode faces - Remove "-face" suffix from texinfo-heading face - Remove "-face" suffix from flyspell faces - Remove "-face" suffix from gomoku faces - Remove "-face" suffix from mpuz faces - Merge from gnus--rel--5.10 - Remove "-face" suffix from Buffer-menu-buffer face - Remove "-face" suffix from antlr-mode faces - Remove "-face" suffix from ebrowse faces - Remove "-face" suffix from flymake faces - Remove "-face" suffix from idlwave faces - Remove "-face" suffix from sh-script faces - Remove "-face" suffix from vhdl-mode faces - Remove "-face" suffix from which-func face - Remove "-face" suffix from cperl-mode faces - Remove "-face" suffix from ld-script faces - Fix cperl-mode font-lock problem - Tweak which-func face * gnus--rel--5.10 (patch 80-82) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Wed, 15 Jun 2005 23:32:15 +0000
parents	01137c1fdbe9 32b12a7e7c4f
children	b7da78284d4c

comparison

equal deleted inserted replaced

-:d940db5a66b9
+:a1b34dec1104
 (defgroup debug nil
 "Debugging Emacs itself."
 :group 'development)
 (defgroup minibuffer nil
-"Controling the behaviour of the minibuffer."
+"Controling the behavior of the minibuffer."
 :link '(custom-manual "(emacs)Minibuffer")
 :group 'environment)
 (defgroup keyboard nil
 "Input from the keyboard."
 (defgroup custom-magic-faces nil
 "Faces used by the magic button."
 :group 'custom-faces
 :group 'custom-buffer)
-(defface custom-invalid-face '((((class color))
+(defface custom-invalid '((((class color))
-				(:foreground "yellow1" :background "red1"))
+			   (:foreground "yellow1" :background "red1"))
-			       (t
+			  (t
-				(:weight bold :slant italic :underline t)))
+			   (:weight bold :slant italic :underline t)))
 "Face used when the customize item is invalid."
 :group 'custom-magic-faces)
+;; backward-compatibility alias
-(defface custom-rogue-face '((((class color))
+(put 'custom-invalid-face 'face-alias 'custom-invalid)
-			      (:foreground "pink" :background "black"))
-			     (t
+(defface custom-rogue '((((class color))
-			      (:underline t)))
+			 (: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
-(defface custom-modified-face '((((min-colors 88) (class color))
+(put 'custom-rogue-face 'face-alias 'custom-rogue)
-				 (:foreground "white" :background "blue1"))
-				(((class color))
+(defface custom-modified '((((min-colors 88) (class color))
-				 (:foreground "white" :background "blue"))
+			    (:foreground "white" :background "blue1"))
-				(t
+			   (((class color))
-				 (:slant italic :bold)))
+			    (:foreground "white" :background "blue"))
+			   (t
+			    (:slant italic :bold)))
 "Face used when the customize item has been modified."
 :group 'custom-magic-faces)
+;; backward-compatibility alias
-(defface custom-set-face '((((min-colors 88) (class color))
+(put 'custom-modified-face 'face-alias 'custom-modified)
-			    (:foreground "blue1" :background "white"))
-			   (((class color))
+(defface custom-set '((((min-colors 88) (class color))
-			    (:foreground "blue" :background "white"))
+		       (:foreground "blue1" :background "white"))
-			   (t
+		      (((class color))
-			    (:slant italic)))
+		       (:foreground "blue" :background "white"))
+		      (t
+		       (:slant italic)))
 "Face used when the customize item has been set."
 :group 'custom-magic-faces)
+;; backward-compatibility alias
-(defface custom-changed-face '((((min-colors 88) (class color))
+(put 'custom-set-face 'face-alias 'custom-set)
-				(:foreground "white" :background "blue1"))
-			       (((class color))
+(defface custom-changed '((((min-colors 88) (class color))
-				(:foreground "white" :background "blue"))
+			   (:foreground "white" :background "blue1"))
-			       (t
+			  (((class color))
-				(:slant italic)))
+			   (:foreground "white" :background "blue"))
+			  (t
+			   (:slant italic)))
 "Face used when the customize item has been changed."
 :group 'custom-magic-faces)
+;; backward-compatibility alias
-(defface custom-saved-face '((t (:underline t)))
+(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 "\
 UNINITIALIZED, you should not see this.")
 (unknown "?" italic "\
 UNKNOWN, you should not see this.")
 (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 "x" custom-invalid "\
 INVALID, the displayed value cannot be set.")
-(modified "*" custom-modified-face "\
+(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-face "\
+(set "+" custom-set "\
 SET for current session only." "\
 something in this group has been set but not saved.")
-(changed ":" custom-changed-face "\
+(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-face "\
+(saved "!" custom-saved "\
 SAVED and set." "\
 something in this group has been set and saved.")
-(rogue "@" custom-rogue-face "\
+(rogue "@" custom-rogue "\
 NO CUSTOMIZATION DATA; you should not see this." "\
 something in this group is not prepared for customization.")
 (standard " " nil "\
 STANDARD." "\
 visible group members are all at standard settings."))
 	  (insert (symbol-name state)))
 	(cond ((eq form 'lisp)
 	       (insert " (lisp)"))
 	      ((eq form 'mismatch)
 	       (insert " (mismatch)")))
-	(put-text-property start (point) 'face 'custom-state-face))
+	(put-text-property start (point) 'face 'custom-state))
 (insert "\n"))
 (when (and (eq category 'group)
 	       (not (and (eq custom-buffer-style 'links)
 			 (> (widget-get parent :custom-level) 1))))
 (insert-char ?\  (* custom-buffer-indent
 (let ((magic (widget-get widget :custom-magic)))
 (widget-value-set magic (widget-value magic))))
 ;;; The `custom' Widget.
-(defface custom-button-face
+(defface custom-button
 '((((type x w32 mac) (class color))		; Like default modeline
 (:box (:line-width 2 :style released-button)
 	   :background "lightgrey" :foreground "black"))
 (t
 nil))
 "Face used for buttons in customization buffers."
 :version "21.1"
 :group 'custom-faces)
+;; backward-compatibility alias
-(defface custom-button-pressed-face
+(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"))
 (t
 (:inverse-video t)))
 "Face used for buttons in customization buffers."
 :version "21.1"
 :group 'custom-faces)
+;; backward-compatibility alias
-(defface custom-documentation-face nil
+(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
-(defface custom-state-face '((((class color)
+(put 'custom-documentation-face 'face-alias 'custom-documentation)
-			       (background dark))
-			      (:foreground "lime green"))
+(defface custom-state '((((class color)
-			     (((class color)
+			  (background dark))
-			       (background light))
+			 (:foreground "lime green"))
-			      (:foreground "dark green"))
+			(((class color)
-			     (t nil))
+			  (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."
 :format "%v"
 :convert-widget 'custom-convert-widget
 parents))
 ;;; The `custom-comment' Widget.
 ;; like the editable field
-(defface custom-comment-face '((((class grayscale color)
+(defface custom-comment '((((class grayscale color)
-				 (background light))
+			    (background light))
-				(:background "gray85"))
+			   (:background "gray85"))
-			       (((class grayscale color)
+			  (((class grayscale color)
-				 (background dark))
+			    (background dark))
-				(:background "dim gray"))
+			   (:background "dim gray"))
-			       (t
+			  (t
-				(:slant italic)))
+			   (: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-face
+(defface custom-comment-tag
 '((((class color) (background dark)) (:foreground "gray80"))
 (((class color) (background light)) (:foreground "blue4"))
 (((class grayscale) (background light))
 (:foreground "DimGray" :weight bold :slant italic))
 (((class grayscale) (background dark))
 (:foreground "LightGray" :weight bold :slant italic))
 (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."
 :tag "Comment"
 :help-echo "Edit a comment here."
 ;;; The `custom-variable' Widget.
 ;; When this was underlined blue, users confused it with a
 ;; Mosaic-style hyperlink...
-(defface custom-variable-tag-face
+(defface custom-variable-tag
 `((((class color)
 (background dark))
 (:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
 (((min-colors 88) (class color)
 (background light))
 (:foreground "blue1" :weight bold :height 1.2 :inherit variable-pitch))
 (((class color)
 (background light))
 (:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
 (t (:weight bold)))
 "Face used for unpushable variable tags."
 :group 'custom-faces)
+;; backward-compatibility alias
-(defface custom-variable-button-face '((t (:underline t :weight bold)))
+(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."
 :type '(choice (const edit)
 		 (const lisp))
 			 (const :format "Supports attributes:" supports)
 			 (custom-face-edit :inline t :format "%n%v"))))))
 ;;; The `custom-face' Widget.
-(defface custom-face-tag-face
+(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."
 :type '(choice (const all)
 		 (const selected)
 (defcustom custom-group-tag-faces nil
 ;; In XEmacs, this ought to play games with font size.
 ;; 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
+and so forth.  The remaining group tags are shown with `custom-group-tag'."
-`custom-group-tag-face'."
 :type '(repeat face)
 :group 'custom-faces)
-(defface custom-group-tag-face-1
+(defface custom-group-tag-1
 `((((class color)
 (background dark))
 (:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
 (((min-colors 88) (class color)
 (background light))
 (background light))
 (:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
 (t (:weight bold)))
 "Face used for group tags."
 :group 'custom-faces)
+;; backward-compatibility alias
-(defface custom-group-tag-face
+(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))
 (((min-colors 88) (class color)
 (background light))
 (background light))
 (:foreground "blue" :weight bold :height 1.2))
 (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."
 :format "%v"
 :sample-face-get 'custom-group-sample-face-get
 :custom-menu 'custom-group-menu-create)
 (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))
+'custom-group-tag))
 (define-widget 'custom-group-visibility 'visibility
 "An indicator and manipulator for hidden group contents."
 :create 'custom-group-visibility-create)
 (use-local-map custom-mode-map)
 (easy-menu-add Custom-mode-menu)
 (make-local-variable 'custom-options)
 (make-local-variable 'custom-local-buffer)
 (make-local-variable 'widget-documentation-face)
-(setq widget-documentation-face 'custom-documentation-face)
+(setq widget-documentation-face 'custom-documentation)
 (make-local-variable 'widget-button-face)
-(setq widget-button-face 'custom-button-face)
+(setq widget-button-face 'custom-button)
-(set (make-local-variable 'widget-button-pressed-face)
+(set (make-local-variable 'widget-button-pressed-face) 'custom-button-pressed)
-'custom-button-pressed-face)
 (set (make-local-variable 'widget-mouse-face)
-'custom-button-pressed-face)	; buttons `depress' when moused
+'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
 (set (make-local-variable 'widget-push-button-prefix) "")
 (set (make-local-variable 'widget-push-button-suffix) "")

Mercurial > emacs

comparison lisp/cus-edit.el @ 90195:a1b34dec1104