[elpa] 01/02: Update font-latex.el to curren AUCTeX git version.

[Tassilo Horn]

tsdh pushed a commit to branch externals/auctex
in repository elpa.

commit 7e05bd598757a4e5c0bd890278a6489b84574de4
Author: Tassilo Horn <address@hidden>
Date:   Wed Feb 26 12:47:45 2014 +0100

    Update font-latex.el to curren AUCTeX git version.
    
    Fixes bug#16879.
---
 font-latex.el |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/font-latex.el b/font-latex.el
index 765d6cb..33eb1ad 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -1,6 +1,6 @@
 ;;; font-latex.el --- LaTeX fontification for Font Lock mode.
 
-;; Copyright (C) 1996-2009, 2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2013  Free Software Foundation, Inc.
 
 ;; Authors:    Peter S. Galbraith <address@hidden>
 ;;             Simon Marshall <address@hidden>
@@ -302,8 +302,8 @@ variable `font-latex-fontify-sectioning'." num)
       ("defbibheading" "{[{") ("defbibnote" "{{") ("defbibfilter" "{{") 
("defbibcheck" "{{")
       ("defbibentryset" "{{") ("Cite" "[[{") ("parencite" "*[[{") ("Parencite" 
"[[{")
       ("footcite" "[[{") ("footcitetext" "[[{") ("textcite" "[[{") ("Textcite" 
"[[{")
-      ("smartcite" "[[{") ("Smartcite" "[[{") ("supercite" "{") ("autocite" 
"*[{{")
-      ("Autocite" "*[{{") ("citeauthor" "[{{") ("Citeauthor" "[{{") 
("citetitle" "*[{{")
+      ("smartcite" "[[{") ("Smartcite" "[[{") ("supercite" "{") ("autocite" 
"*[[{")
+      ("Autocite" "*[[{") ("citeauthor" "[[{") ("Citeauthor" "[[{") 
("citetitle" "*[[{")
       ("citeyear" "*[[{") ("citedate" "*[[{") ("citeurl" "[[{") ("parentext" 
"{")
       ("brackettext" "{") ("fullcite" "[[{") ("fullfootcite" "[[{") ("volcite" 
"[{[[")
       ("Volcite" "[{[[") ("pvolcite" "[{[[") ("Pvolcite" "[{[[") ("fvolcite" 
"[{[[")
@@ -823,7 +823,7 @@ Generated by `font-latex-make-user-keywords'.")))
 KEYWORDS is a list of keywords or keywords with syntax specs.
 CLASS corresponds to a keyword class and can be one of the
 symbols 'warning, 'variable, 'reference, 'biblatex, 'function,
-sectioning-0, 'sectioning-1, 'sectioning-2, 'sectioning-3,
+'sectioning-0, 'sectioning-1, 'sectioning-2, 'sectioning-3,
 'sectioning-4, 'sectioning-5, 'slide-title, 'textual,
 'bold-command, 'italic-command, 'math-command, 'type-command,
 'bold-declaration, 'italic-declaration or 'type-declaration.
@@ -1125,15 +1125,11 @@ end up in `font-lock-defaults'.  Each entry in LIST 
should be a
 cons pair as expected by `font-lock-defaults'.  The function also
 triggers Font Lock to recognize the change."
   (make-local-variable 'font-latex-syntax-alist)
-  (nconc font-latex-syntax-alist list)
-;; FIXME: Are there situations where we need to alter `font-lock-defaults'
-;; directly?
-;;   (dolist (entry list)
-;;     (setcar (cdddr font-lock-defaults)
-;;         (cons entry (cadddr font-lock-defaults))))
+  (set (make-local-variable 'font-latex-syntax-alist)
+       (append font-latex-syntax-alist list))
   ;; Tell font-lock about the update.
   (setq font-lock-set-defaults nil)
-  (font-lock-set-defaults))
+  (font-latex-setup))
 
 ;;;###autoload
 (defun font-latex-setup ()
@@ -1219,8 +1215,6 @@ triggers Font Lock to recognize the change."
 
 (defun font-latex-jit-lock-force-redisplay (buf start end)
   "Compatibility for Emacsen not offering `jit-lock-force-redisplay'."
-  (if (fboundp 'jit-lock-force-redisplay)
-      (jit-lock-force-redisplay buf start end)
     ;; The following block is an expansion of `jit-lock-force-redisplay'
     ;; and involved macros taken from CVS Emacs on 2007-04-28.
     (with-current-buffer buf
@@ -1235,7 +1229,7 @@ triggers Font Lock to recognize the change."
                  buffer-file-truename)
              (put-text-property start end 'fontified t))
          (unless modified
-           (restore-buffer-modified-p nil)))))))
+           (restore-buffer-modified-p nil))))))
 
 (defun font-latex-fontify-region (beg end &optional loudly)
   "Fontify region from BEG to END.
@@ -1670,7 +1664,7 @@ END marks boundaries for searching for environment ends."
 
 (defcustom font-latex-math-environments
   '("display" "displaymath" "equation" "eqnarray" "gather" "multline"
-    "align" "alignat" "xalignat")
+    "align" "alignat" "xalignat" "xxalignat" "flalign")
   "List of math environment names for font locking."
   :type '(repeat string)
   :group 'font-latex)