[elpa] elpa 7fc63f1 39/51: Tweak mode name only when file local variable is enabled.

[Tassilo Horn]

branch: elpa
commit 7fc63f1deeeb1ef76ba2806fa4baf972ba44befc
Author: Ikumi Keita <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Tweak mode name only when file local variable is enabled.
    
    * tex-jp.el (japanese-plain-tex-mode-initialization)
      (japanese-latex-mode-initialization): Tweak mode name only
      when `enable-local-variables' is non-nil.
    
    Signed-off-by: Mosè Giordano <address@hidden>
---
 tex-jp.el |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tex-jp.el b/tex-jp.el
index 368f62d..57b5de4 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -406,9 +406,10 @@ Set `japanese-TeX-mode' to t, and enter 
`TeX-plain-tex-mode'."
 
     ;; For the intent of the following lines, see the comments below
     ;; in `japanese-latex-mode-initialization'.
-    (setq major-mode 'japanese-plain-tex-mode)
-    (add-hook 'hack-local-variables-hook 'japanese-TeX-reset-mode-name
-             nil t)))
+    (when enable-local-variables
+      (setq major-mode 'japanese-plain-tex-mode)
+      (add-hook 'hack-local-variables-hook 'japanese-TeX-reset-mode-name
+               nil t))))
 
 (add-hook 'plain-TeX-mode-hook 'japanese-plain-tex-mode-initialization)
 
@@ -456,9 +457,10 @@ Set `japanese-TeX-mode' to t, and enter `TeX-latex-mode'."
     ;; Thus we temporarily set `major-mode' to `japanese-latex-mode'
     ;; here and plan to reset it to `latex-mode' after
     ;; `hack-local-variables' is done.
-    (setq major-mode 'japanese-latex-mode)
-    (add-hook 'hack-local-variables-hook 'japanese-TeX-reset-mode-name
-             nil t)))
+    (when enable-local-variables
+      (setq major-mode 'japanese-latex-mode)
+      (add-hook 'hack-local-variables-hook 'japanese-TeX-reset-mode-name
+               nil t))))
 
 (add-hook 'LaTeX-mode-hook 'japanese-latex-mode-initialization)