2 files changed, 16 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3000e2bd79f..3807037e57d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/tex-mode.el (tex-font-lock-append-prop)
+        (tex-font-lock-suscript, tex-insert-quote, latex-indent): Adjust to the
+        new symbol used for the tex-verbatim face.
+
 2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
 
         * woman.el (woman-file-name):
@@ -77,8 +83,8 @@
 
 2005-09-24  Magnus Henoch  <mange@freemail.hu>
 
-        * textmodes/ispell.el (ispell-maybe-find-aspell-dictionaries): New
-        function, code extracted from ispell-valid-dictionary-list.
+        * textmodes/ispell.el (ispell-maybe-find-aspell-dictionaries):
+        New function, code extracted from ispell-valid-dictionary-list.
         (ispell-valid-dictionary-list, ispell-accept-buffer-local-defs):
         Call it.
 
@@ -87,8 +93,7 @@
         * subr.el (version-regexp-alist): Extend valid syntax for version
         strings: allow any of the characters -,_,+ to separate the
         alpha/beta/rc part from the version part.  Doc fix.
-        (version-to-list): Doc fix.  Bind case-fold-search to t, as
-        advertised.
+        (version-to-list): Doc fix.  Bind case-fold-search to t, as advertised.
 
 2005-09-23  David Reitter  <david.reitter@gmail.com>
 
@@ -100,8 +105,8 @@
         (flyspell-incorrect-hook, flyspell-highlight-duplicate-region):
         Doc fixes.
 
-        * progmodes/cc-mode.el (c-font-lock-init): Specify
-        font-lock-lines-before.
+        * progmodes/cc-mode.el (c-font-lock-init):
+        Specify font-lock-lines-before.
 
 2005-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 82e5a1cf5f1..1c395d3663b 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -472,7 +472,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
            (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
       (list
        ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
-       ;; highlighted as tex-verbatim-face.  Let's undo that.
+       ;; highlighted as tex-verbatim face.  Let's undo that.
        ;; This is ugly and brittle :-(  --Stef
        '("^\\(\\\\\\)end" (1 (get-text-property (match-end 1) 'face) t))
        ;; display $$ math $$
@@ -509,7 +509,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
 
 (defun tex-font-lock-append-prop (prop)
   (unless (memq (get-text-property (match-end 1) 'face)
-                '(font-lock-comment-face tex-verbatim-face))
+                '(font-lock-comment-face tex-verbatim))
     prop))
 
 (defconst tex-font-lock-keywords-2
@@ -583,7 +583,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
 (defun tex-font-lock-suscript (pos)
   (unless (or (memq (get-text-property pos 'face)
                     '(font-lock-constant-face font-lock-builtin-face
-                      font-lock-comment-face tex-verbatim-face))
+                      font-lock-comment-face tex-verbatim))
               ;; Check for backslash quoting
               (let ((odd nil)
                     (pos pos))
@@ -1109,7 +1109,7 @@ Inserts the value of `tex-open-quote' (normally ``) or `tex-close-quote'
 inserts \" characters."
   (interactive "*P")
   (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
-          (eq (get-text-property (point) 'face) tex-verbatim-face)
+          (eq (get-text-property (point) 'face) tex-verbatim)
           (save-excursion
             (backward-char (length tex-open-quote))
             (when (or (looking-at (regexp-quote tex-open-quote))
@@ -2341,7 +2341,7 @@ Runs the shell command defined by `tex-show-queue-command'."
 
 (defun latex-indent (&optional arg)
   (if (and (eq (get-text-property (line-beginning-position) 'face)
-               tex-verbatim-face))
+               tex-verbatim))
       'noindent
     (with-syntax-table tex-latex-indent-syntax-table
       ;; TODO: Rather than ignore $, we should try to be more clever about it.