[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.173 
emacs/lisp/textmodes/tex-mode.el:1.174
*** emacs/lisp/textmodes/tex-mode.el:1.173      Fri Sep  2 18:24:29 2005
--- emacs/lisp/textmodes/tex-mode.el    Sat Sep 24 17:44:29 2005
***************
*** 472,478 ****
           (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
        (list
         ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
!        ;; 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 $$
--- 472,478 ----
           (arg "{\\(\\(?:[^{}\\]+\\|\\\\.\\|{[^}]*}\\)+\\)"))
        (list
         ;; font-lock-syntactic-keywords causes the \ of \end{verbatim} to be
!        ;; 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,515 ****
  
  (defun tex-font-lock-append-prop (prop)
    (unless (memq (get-text-property (match-end 1) 'face)
!               '(font-lock-comment-face tex-verbatim-face))
      prop))
  
  (defconst tex-font-lock-keywords-2
--- 509,515 ----
  
  (defun tex-font-lock-append-prop (prop)
    (unless (memq (get-text-property (match-end 1) 'face)
!               '(font-lock-comment-face tex-verbatim))
      prop))
  
  (defconst tex-font-lock-keywords-2
***************
*** 583,589 ****
  (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))
              ;; Check for backslash quoting
              (let ((odd nil)
                    (pos pos))
--- 583,589 ----
  (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))
              ;; Check for backslash quoting
              (let ((odd nil)
                    (pos pos))
***************
*** 1109,1115 ****
  inserts \" characters."
    (interactive "*P")
    (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
!         (eq (get-text-property (point) 'face) tex-verbatim-face)
          (save-excursion
            (backward-char (length tex-open-quote))
            (when (or (looking-at (regexp-quote tex-open-quote))
--- 1109,1115 ----
  inserts \" characters."
    (interactive "*P")
    (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
!         (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,2347 ****
  
  (defun latex-indent (&optional arg)
    (if (and (eq (get-text-property (line-beginning-position) 'face)
!              tex-verbatim-face))
        'noindent
      (with-syntax-table tex-latex-indent-syntax-table
        ;; TODO: Rather than ignore $, we should try to be more clever about it.
--- 2341,2347 ----
  
  (defun latex-indent (&optional arg)
    (if (and (eq (get-text-property (line-beginning-position) '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.