>From address@hidden Fri Feb 03 19:12:26 2017
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [PATCH] Fix minor problems
X-Mercurial-Node: 74d3eda9719c056c2a758350afdcca19657640f3
X-Mercurial-Series-Index: 1
X-Mercurial-Series-Total: 1
Message-Id: <address@hidden>
X-Mercurial-Series-Id: <address@hidden>
User-Agent: Mercurial-patchbomb/4.0.1
Date: Fri, 03 Feb 2017 19:12:26 +0900
From: Ikumi Keita <address@hidden>
To: dummy

* tex.el (TeX-view-predicate-list-builtin): Enclose whole alternatives
in regexp with shy group in order that the effect of "\`" and "\'"
covers all the alternatives.
* latex.el (LaTeX-auto-cleanup): Regard "Class", in addition to
"class", as an indicator of LaTeX2e document.

diff --git a/latex.el b/latex.el
--- a/latex.el
+++ b/latex.el
@@ -1799,9 +1799,10 @@
 			      (list (cons style options)))))
 
 	;; The third argument if "class" indicates LaTeX2e features.
-	(cond ((equal class "class")
+	(cond ((or (string-equal class "class")
+		   (string-equal class "Class"))
 	       (add-to-list 'TeX-auto-file "latex2e"))
-	      ((equal class "style")
+	      ((string-equal class "style")
 	       (add-to-list 'TeX-auto-file "latex2"))))))
 
   ;; Cleanup optional arguments
diff --git a/tex.el b/tex.el
--- a/tex.el
+++ b/tex.el
@@ -1167,18 +1167,18 @@
     (mode-io-correlate
      TeX-source-correlate-mode)
     (paper-landscape
-     (and (fboundp 'LaTeX-provided-class-options)
+     (and (fboundp 'LaTeX-match-class-option)
 	  (LaTeX-match-class-option "\\`landscape\\'")))
     (paper-portrait
-     (not (and (fboundp 'LaTeX-provided-class-options)
+     (not (and (fboundp 'LaTeX-match-class-option)
 	       (LaTeX-match-class-option "\\`landscape\\'"))))
     (paper-a4
-     (let ((regex "\\`a4paper\\|a4dutch\\|a4wide\\|sem-a4\\'"))
+     (let ((regex "\\`\\(?:a4paper\\|a4dutch\\|a4wide\\|sem-a4\\)\\'"))
        (or (TeX-match-style regex)
 	   (and (fboundp 'LaTeX-match-class-option)
 		(LaTeX-match-class-option regex)))))
     (paper-a5
-     (let ((regex "\\`a5paper\\|a5comb\\'"))
+     (let ((regex "\\`\\(?:a5paper\\|a5comb\\)\\'"))
        (or (TeX-match-style regex)
 	   (and (fboundp 'LaTeX-match-class-option)
 		(LaTeX-match-class-option regex)))))