From 6ecedb401fe93dea8683c055a4f5e1add93cbe65 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 24 Feb 2005 15:34:34 +0000 Subject: [PATCH] (tex-font-lock-keywords-3): #n is atomic. --- lisp/ChangeLog | 12 ++++++++---- lisp/textmodes/tex-mode.el | 10 ++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e636573b47c..30ab0be240a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-02-24 Stefan Monnier + + * textmodes/tex-mode.el (tex-font-lock-keywords-3): #n is atomic. + 2005-02-24 Kim F. Storm * international/iso-acc.el (iso-accents-compose): Fix crash @@ -26,13 +30,13 @@ 2005-02-22 Kim F. Storm - * 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 - * 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" . diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 4b878f4f240..d15b72c98ba 100644 --- 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) -- 2.39.5