[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 3fdeb4b 27/28: Setup preview differently; fixes
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 3fdeb4b 27/28: Setup preview differently; fixes bug#21188 |
Date: |
Fri, 07 Aug 2015 15:59:28 +0000 |
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))
- [elpa] externals/auctex 5178ba6 16/28: Parse hf-tikz messages suggesting to rerun LaTeX., (continued)
- [elpa] externals/auctex 5178ba6 16/28: Parse hf-tikz messages suggesting to rerun LaTeX., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex bb195ae 15/28: Add new style file for mnras class., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex c2c7dd9 18/28: Parse user-defined new column types., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex e301b71 22/28: Add new style textpos.el., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex d27e773 21/28: Add new style environ.el., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex 482dddb 24/28: Query for default first arg when (re-)defining env's., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex 107f106 23/28: Add new style vwcol.el., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex e351a3a 26/28: Add missing commands `\nameref*' and `\Nameref'., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex 6094700 17/28: Restore deleted preview README., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex 166e14b 25/28: Fix a typo in the name of provided env's., Tassilo Horn, 2015/08/07
- [elpa] externals/auctex 3fdeb4b 27/28: Setup preview differently; fixes bug#21188,
Tassilo Horn <=
- [elpa] externals/auctex 1fc2c7a 28/28: Merge branch 'master' into elpa, Tassilo Horn, 2015/08/07