From 0526b9d0b7a5c27d03de5e20a51eccd0d62db19a Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 20 Dec 2007 15:19:44 +0000 Subject: [PATCH] (nxml-heading, nxml-outline-indicator) (nxml-outline-active-indicator, nxml-outline-ellipsis): Rename, removing -face suffix. (nxml-highlighted-less-than, nxml-highlighted-greater-than) (nxml-highlighted-colon, nxml-highlighted-slash) (nxml-highlighted-ellipsis, nxml-highlighted-inactive-minus) (nxml-highlighted-active-minus, nxml-highlighted-active-plus) (nxml-highlighted-qname, nxml-outline-display-heading): Use new face names. --- lisp/ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++ lisp/nxml/nxml-outln.el | 42 ++++++++++++++++++++-------------------- 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d07e5984d29..e6c0d0020ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,46 @@ +2007-12-20 Jason Rumney + + * nxml/nxml-mode.el (nxml-faces): Rename from nxml-highlighting-faces. + Parent group is font-lock-faces. + (nxml-light-blue-color, nxml-dark-blue-color, nxml-green-color) + (nxml-sky-blue-color, nxml-dark-green-color, nxml-light-green-color): + (nxml-version): Remove. + (nxml-delimited-data, nxml-name, nxml-ref, nxml-delimiter) + (nxml-text, nxml-comment-content, nxml-comment-delimiter) + (nxml-processing-instruction-delimiter) + (nxml-processing-instruction-target) + (nxml-processing-instruction-content, nxml-cdata-section-delimiter) + (nxml-cdata-section-CDATA, nxml-cdata-section-content) + (nxml-char-ref-number, nxml-char-ref-delimiter, nxml-entity-ref-name) + (nxml-entity-ref-delimiter, nxml-tag-delimiter, nxml-tag-slash) + (nxml-element-prefix, nxml-element-colon, nxml-element-local-name) + (nxml-attribute-prefix, nxml-attribute-colon) + (nxml-attribute-local-name, nxml-namespace-attribute-xmlns) + (nxml-namespace-attribute-colon, nxml-namespace-attribute-prefix) + (nxml-attribute-value, nxml-attribute-value-delimiter) + (nxml-namespace-attibute-value) + (nxml-namespace-attribure-value-delimiter) + (nxml-prolog-literal-delimiter, nxml-prolog-literal-content) + (nxml-prolog-keyword, nxml-markup-declaration-delimiter, nxml-hash) + (nxml-glyph): Rename, removing -face suffix. + Inherit from existing font-lock faces. + (nxml-apply-fontify-rule, nxml-char-ref-display-extra): + Use new face names. + + * nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator) + (nxml-outline-active-indicator, nxml-outline-ellipsis): + Rename, removing -face suffix. + (nxml-highlighted-less-than, nxml-highlighted-greater-than) + (nxml-highlighted-colon, nxml-highlighted-slash) + (nxml-highlighted-ellipsis, nxml-highlighted-inactive-minus) + (nxml-highlighted-active-minus, nxml-highlighted-active-plus) + (nxml-highlighted-qname, nxml-outline-display-heading): + Use new face names. + + * nxml/rng-valid.el (rng-error): Rename from rng-error-face. + + * nxml/rng-nxml.el (rng-nxml-easy-menu): Remove nxml-version. + 2007-12-19 Martin Rudalics * cus-start.el (all): Use correct group name for members of diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el index 841e0e70146..96d8cebf5dc 100644 --- a/lisp/nxml/nxml-outln.el +++ b/lisp/nxml/nxml-outln.el @@ -111,25 +111,25 @@ See the variable `nxml-section-element-name-regexp' for more details." :group 'nxml :type 'integer) -(defface nxml-heading-face +(defface nxml-heading '((t (:weight bold))) "Face used for the contents of abbreviated heading elements." - :group 'nxml-highlighting-faces) + :group 'nxml-faces) -(defface nxml-outline-indicator-face +(defface nxml-outline-indicator '((t (:inherit default))) "Face used for `+' or `-' before element names in outlines." - :group 'nxml-highlighting-faces) + :group 'nxml-faces) -(defface nxml-outline-active-indicator-face - '((t (:box t :inherit nxml-outline-indicator-face))) +(defface nxml-outline-active-indicator + '((t (:box t :inherit nxml-outline-indicator))) "Face used for clickable `+' or `-' before element names in outlines." - :group 'nxml-highlighting-faces) + :group 'nxml-faces) -(defface nxml-outline-ellipsis-face +(defface nxml-outline-ellipsis '((t (:bold t :inherit default))) "Face used for `...' in outlines." - :group 'nxml-highlighting-faces) + :group 'nxml-faces) (defvar nxml-heading-scan-distance 1000 "Maximum distance from section to scan for heading.") @@ -514,19 +514,19 @@ non-transparent child section." had-children)) (defconst nxml-highlighted-less-than - (propertize "<" 'face 'nxml-tag-delimiter-face)) + (propertize "<" 'face 'nxml-tag-delimiter)) (defconst nxml-highlighted-greater-than - (propertize ">" 'face 'nxml-tag-delimiter-face)) + (propertize ">" 'face 'nxml-tag-delimiter)) (defconst nxml-highlighted-colon - (propertize ":" 'face 'nxml-element-colon-face)) + (propertize ":" 'face 'nxml-element-colon)) (defconst nxml-highlighted-slash - (propertize "/" 'face 'nxml-tag-slash-face)) + (propertize "/" 'face 'nxml-tag-slash)) (defconst nxml-highlighted-ellipsis - (propertize "..." 'face 'nxml-outline-ellipsis-face)) + (propertize "..." 'face 'nxml-outline-ellipsis)) (defconst nxml-highlighted-empty-end-tag (concat nxml-highlighted-ellipsis @@ -535,13 +535,13 @@ non-transparent child section." nxml-highlighted-greater-than)) (defconst nxml-highlighted-inactive-minus - (propertize "-" 'face 'nxml-outline-indicator-face)) + (propertize "-" 'face 'nxml-outline-indicator)) (defconst nxml-highlighted-active-minus - (propertize "-" 'face 'nxml-outline-active-indicator-face)) + (propertize "-" 'face 'nxml-outline-active-indicator)) (defconst nxml-highlighted-active-plus - (propertize "+" 'face 'nxml-outline-active-indicator-face)) + (propertize "+" 'face 'nxml-outline-active-indicator)) (defun nxml-display-section (last-pos section-start-pos @@ -642,14 +642,14 @@ non-transparent child section." (if colon (concat (propertize (substring qname 0 colon) 'face - 'nxml-element-prefix-face) + 'nxml-element-prefix) nxml-highlighted-colon (propertize (substring qname (1+ colon)) 'face - 'nxml-element-local-name-face)) + 'nxml-element-local-name)) (propertize qname 'face - 'nxml-element-local-name-face)))) + 'nxml-element-local-name)))) (defun nxml-outline-display-single-line-end-tag (last-pos) (nxml-outline-set-overlay 'nxml-outline-display-hide @@ -727,7 +727,7 @@ non-transparent child section." (put 'nxml-outline-display-heading 'help-echo nxml-outline-show-help) (put 'nxml-outline-display-heading 'nxml-outline-display t) (put 'nxml-outline-display-heading 'evaporate t) -(put 'nxml-outline-display-heading 'face 'nxml-heading-face) +(put 'nxml-outline-display-heading 'face 'nxml-heading) (defvar nxml-outline-hiding-tag-map (let ((map (make-sparse-keymap))) -- 2.39.2