aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2005-06-10 10:45:56 +0000
committerMiles Bader2005-06-10 10:45:56 +0000
commitad49d9d6ecd1884cd9567cc25fcb91354fe43a46 (patch)
tree69fdd55c0aec1af0c66f88acf7466bbb6b7e7be3
parentb4c925d8e57082786c4f7dc5d209888fb8af0f82 (diff)
downloademacs-ad49d9d6ecd1884cd9567cc25fcb91354fe43a46.tar.gz
emacs-ad49d9d6ecd1884cd9567cc25fcb91354fe43a46.zip
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces 2005-06-10 Miles Bader <miles@gnu.org> * lisp/textmodes/tex-mode.el (tex-math, tex-verbatim): Remove "-face" suffix from face names. (tex-math-face, tex-verbatim-face): New backward-compatibility aliases for renamed faces. (tex-math-face, tex-verbatim-face): Use renamed tex-mode faces. (tex-insert-quote): Use `tex-verbatim-face' variable instead of literal face name.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/textmodes/tex-mode.el15
2 files changed, 18 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84cc6c6ee22..0b13139e0ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
12005-06-10 Miles Bader <miles@gnu.org> 12005-06-10 Miles Bader <miles@gnu.org>
2 2
3 * textmodes/tex-mode.el (tex-math, tex-verbatim): Remove "-face"
4 suffix from face names.
5 (tex-math-face, tex-verbatim-face):
6 New backward-compatibility aliases for renamed faces.
7 (tex-math-face, tex-verbatim-face): Use renamed tex-mode faces.
8 (tex-insert-quote): Use `tex-verbatim-face' variable instead of
9 literal face name.
10
3 * textmodes/table.el (table-cell): Remove "-face" suffix from face 11 * textmodes/table.el (table-cell): Remove "-face" suffix from face
4 name. 12 name.
5 (table-cell-face): New backward-compatibility alias for renamed face. 13 (table-cell-face): New backward-compatibility alias for renamed face.
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index a715900b604..7d04464346a 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -650,17 +650,22 @@ An alternative value is \" . \", if you use a font with a narrow period."
650 "Face used for subscripts." 650 "Face used for subscripts."
651 :group 'tex) 651 :group 'tex)
652 652
653(defface tex-math-face 653(defface tex-math
654 '((t :inherit font-lock-string-face)) 654 '((t :inherit font-lock-string-face))
655 "Face used to highlight TeX math expressions." 655 "Face used to highlight TeX math expressions."
656 :group 'tex) 656 :group 'tex)
657(defvar tex-math-face 'tex-math-face) 657;; backward-compatibility alias
658(defface tex-verbatim-face 658(put 'tex-math-face 'face-alias 'tex-math)
659(defvar tex-math-face 'tex-math)
660
661(defface tex-verbatim
659 ;; '((t :inherit font-lock-string-face)) 662 ;; '((t :inherit font-lock-string-face))
660 '((t :family "courier")) 663 '((t :family "courier"))
661 "Face used to highlight TeX verbatim environments." 664 "Face used to highlight TeX verbatim environments."
662 :group 'tex) 665 :group 'tex)
663(defvar tex-verbatim-face 'tex-verbatim-face) 666;; backward-compatibility alias
667(put 'tex-verbatim-face 'face-alias 'tex-verbatim)
668(defvar tex-verbatim-face 'tex-verbatim)
664 669
665;; Use string syntax but math face for $...$. 670;; Use string syntax but math face for $...$.
666(defun tex-font-lock-syntactic-face-function (state) 671(defun tex-font-lock-syntactic-face-function (state)
@@ -1101,7 +1106,7 @@ Inserts the value of `tex-open-quote' (normally ``) or `tex-close-quote'
1101inserts \" characters." 1106inserts \" characters."
1102 (interactive "*P") 1107 (interactive "*P")
1103 (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\)) 1108 (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
1104 (eq (get-text-property (point) 'face) 'tex-verbatim-face) 1109 (eq (get-text-property (point) 'face) tex-verbatim-face)
1105 (save-excursion 1110 (save-excursion
1106 (backward-char (length tex-open-quote)) 1111 (backward-char (length tex-open-quote))
1107 (when (or (looking-at (regexp-quote tex-open-quote)) 1112 (when (or (looking-at (regexp-quote tex-open-quote))