[elpa] externals/auctex 3fdeb4b 27/28: Setup preview differently; fixes bug#21188

[Tassilo Horn]

branch: externals/auctex
commit 3fdeb4b8de31702d4c58b063cd9536284bb27ff7
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Setup preview differently; fixes bug#21188
    
    * latex.el (TeX-latex-mode): Call `LaTeX-preview-setup'
    unconditionally instead of calling it from `LaTeX-mode-hook' which
    breaks things if that hook is customized (bug#21188).
    
    * preview.el.in: Don't add `LaTeX-preview-setup' to
    `LaTeX-mode-hook'.
---
 ChangeLog     |    9 +++++++++
 latex.el      |    4 ++++
 preview.el.in |    9 +--------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ff7097..8e92d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-07  Tassilo Horn  <address@hidden>
+
+       * latex.el (TeX-latex-mode): Call `LaTeX-preview-setup'
+       unconditionally instead of calling it from `LaTeX-mode-hook' which
+       breaks things if that hook is customized (bug#21188).
+
+       * preview.el.in: Don't add `LaTeX-preview-setup' to
+       `LaTeX-mode-hook'.
+
 2015-07-21  Arash Esbati  <address@hidden>
 
        * style/nameref.el ("nameref"): Add missing commands `\nameref*'
diff --git a/latex.el b/latex.el
index 0fb1641..fee3f8b 100644
--- a/latex.el
+++ b/latex.el
@@ -5742,6 +5742,9 @@ This happens when \\left is inserted."
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.hva\\'" . latex-mode))
 
+(when (fboundp 'declare-function)
+  (declare-function LaTeX-preview-setup "preview"))
+
 ;;;###autoload
 (defun TeX-latex-mode ()
   "Major mode in AUCTeX for editing LaTeX files.
@@ -5773,6 +5776,7 @@ of `LaTeX-mode-hook'."
              (if (local-variable-p 'LaTeX-biblatex-use-Biber (current-buffer))
                  (setq LaTeX-using-Biber LaTeX-biblatex-use-Biber))) nil t)
   (TeX-run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'LaTeX-mode-hook)
+  (LaTeX-preview-setup)
   (TeX-set-mode-name)
   ;; Defeat filladapt
   (if (and (boundp 'filladapt-mode)
diff --git a/preview.el.in b/preview.el.in
index 9dded29..b26cf0a 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -2571,20 +2571,13 @@ later while in use."
     (add-hook 'kill-emacs-hook #'preview-cleanout-tempfiles t)
     (setq TeX-active-tempdir
          (list (make-temp-file (expand-file-name
-                          "tmp" (file-name-as-directory topdir)) t)
+                                "tmp" (file-name-as-directory topdir)) t)
                topdir
                0))
     (shell-quote-argument
      (concat (file-name-as-directory (file-name-nondirectory topdir))
             (file-name-nondirectory (nth 0 TeX-active-tempdir))))))
 
-;; Hook into TeX immediately if it's loaded, use LaTeX-mode-hook if not.
-(if (featurep 'latex)
-    (LaTeX-preview-setup)
-  (add-hook 'LaTeX-mode-hook #'LaTeX-preview-setup))
-
-;;;###autoload (add-hook 'LaTeX-mode-hook #'LaTeX-preview-setup)
-
 (defun preview-parse-counters (string)
   "Extract counter information from STRING."
   (let ((list preview-parsed-counters) (pos 0))