[Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el

[Stefan Monnier]

Index: emacs/lisp/textmodes/tex-mode.el
diff -c emacs/lisp/textmodes/tex-mode.el:1.156 
emacs/lisp/textmodes/tex-mode.el:1.157
*** emacs/lisp/textmodes/tex-mode.el:1.156      Wed Feb  9 15:50:36 2005
--- emacs/lisp/textmodes/tex-mode.el    Thu Feb 24 15:33:02 2005
***************
*** 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.
  
  ;; Maintainer: FSF
  ;; Keywords: tex
--- 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, 2005  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: tex
***************
*** 602,608 ****
           ;; degenerate to nasty complexity (because we try to match the
           ;; closing brace, which forces trying all matching combinations).
           (arg "{\\(?:[^{}\\]\\|\\\\.\\|{[^}]*}\\)*"))
!        `((,(concat "[_^] *\\([^\n\\{}]\\|" slash general "\\|" arg "}\\)")
          (1 (tex-font-lock-suscript (match-beginning 0))
             append))))))
    "Experimental expressions to highlight in TeX modes.")
--- 602,608 ----
           ;; degenerate to nasty complexity (because we try to match the
           ;; closing brace, which forces trying all matching combinations).
           (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,1036 ****
         '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)))))
    (set (make-local-variable 'facemenu-end-add-face) "}")
    (set (make-local-variable 'facemenu-remove-face-function) t)
    (set (make-local-variable 'font-lock-defaults)
--- 1027,1034 ----
         'tex-categorize-whitespace)
    (set (make-local-variable 'facemenu-add-face-function)
         (lambda (face end)
!        (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)