(tex-font-lock-keywords-3): #n is atomic.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e636573b47c907b8c266f7a0d522ae7b03272e42..30ab0be240a3c26f264e04a28f34db3b2fc199e4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/tex-mode.el (tex-font-lock-keywords-3): #n is atomic.
+
 2005-02-24  Kim F. Storm  <storm@cua.dk>
 
        * international/iso-acc.el (iso-accents-compose): Fix crash
@@ -26,13 +30,13 @@
 
 2005-02-22  Kim F. Storm  <storm@cua.dk>
 
-       * progmodes/hideif.el (hide-ifdef-use-define-alist): Use
-       completing-read.  Suggested by Juan-Leon Lahoz Garcia.
+       * progmodes/hideif.el (hide-ifdef-use-define-alist):
+       Use completing-read.  Suggested by Juan-Leon Lahoz Garcia.
 
 2005-02-22  Simon Josefsson  <jas@extundo.com>
 
-       * net/browse-url.el (browse-url-netscape-new-window-is-tab): New
-       variable.
+       * net/browse-url.el (browse-url-netscape-new-window-is-tab):
+       New variable.
        (browse-url-netscape): Use it.  Suggested by "Johann 'Myrkraverk'
        Oskarsson" <myrkraverk@users.sourceforget.net>.
 

diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 4b878f4f24001ae22c7c183103a5b3cd575496a1..d15b72c98babd871d02ece6a4f8fce4b83563539 100644 (file)
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,7 +1,7 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tex
@@ -602,7 +602,7 @@ An alternative value is \" . \", if you use a font with a narrow period."
           ;; degenerate to nasty complexity (because we try to match the
           ;; closing brace, which forces trying all matching combinations).
           (arg "{\\(?:[^{}\\]\\|\\\\.\\|{[^}]*}\\)*"))
-       `((,(concat "[_^] *\\([^\n\\{}]\\|" slash general "\\|" arg "}\\)")
+       `((,(concat "[_^] *\\([^\n\\{}#]\\|" slash general "\\|#[0-9]\\|" arg "}\\)")
          (1 (tex-font-lock-suscript (match-beginning 0))
             append))))))
   "Experimental expressions to highlight in TeX modes.")
@@ -1027,10 +1027,8 @@ Entering SliTeX mode runs the hook `text-mode-hook', then the hook
        'tex-categorize-whitespace)
   (set (make-local-variable 'facemenu-add-face-function)
        (lambda (face end)
-        (let ((face-text (cdr (assq face tex-face-alist))))
-          (if face-text
-              face-text
-            (error "Face %s not configured for %s mode" face mode-name)))))
+        (or (cdr (assq face tex-face-alist))
+            (error "Face %s not configured for %s mode" face mode-name))))
   (set (make-local-variable 'facemenu-end-add-face) "}")
   (set (make-local-variable 'facemenu-remove-face-function) t)
   (set (make-local-variable 'font-lock-defaults)