branch: externals/auctex
commit f4c405bed955470c155deabbdc0804bd91816833
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Delete vars preview-lispdir and preview-datadir
Since we've pulled preview from its own subdir, these two variables are
the same as TeX-lisp-directory and TeX-data-directory anyway.
* preview.el.in (preview-datadir, preview-lispdir): Delete these
two variables.
(preview-filter-specs): Use TeX-data-directory in place of
preview-datadir.
* configure.ac: Remove auto.el from AC_OUTPUT.
* Makefile.in (auto.el): Delete target.
---
ChangeLog | 11 +++++++++++
Makefile.in | 6 +-----
auto.el.in | 5 -----
configure.ac | 2 +-
preview.el.in | 12 ++----------
5 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c86eda7..68ef016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-17 Tassilo Horn <t...@gnu.org>
+
+ * preview.el.in (preview-datadir, preview-lispdir): Delete these
+ two variables.
+ (preview-filter-specs): Use TeX-data-directory in place of
+ preview-datadir.
+
+ * configure.ac: Remove auto.el from AC_OUTPUT.
+
+ * Makefile.in (auto.el): Delete target.
+
2015-04-11 Tassilo Horn <t...@gnu.org>
* style/mathtools.el (LaTeX-mathtools-env-multlined): Don't call
diff --git a/Makefile.in b/Makefile.in
index 7baff97..76cef3c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,7 +197,7 @@ lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC)
$(PREVIEWSRC)
$(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC)
$(PREVIEWSRC)
$(PREVIEWLATEX)
-preview-latex.el: preview.el auto.el
+preview-latex.el: preview.el
rm -f preview-latex.el
-$(EMACS) -batch -no-site-file -no-init-file $(PREVIEW_AUTOLOAD) ; \
test -r $@ || { \
@@ -205,7 +205,6 @@ preview-latex.el: preview.el auto.el
echo " " >> $@ ; \
$(EMACS) -batch -no-site-file -no-init-file $(PREVIEW_AUTOLOAD) ; \
}
- cat auto.el >> $@
docs:
cd doc ; $(MAKE) all
@@ -231,9 +230,6 @@ auctex.el: auctex.el.in config.status
latex/Makefile: latex/Makefile.in Makefile config.status
./config.status
-auto.el: auto.el.in Makefile config.status
- ./config.status
-
configure: configure.ac aclocal.m4
autoconf
diff --git a/auto.el.in b/auto.el.in
deleted file mode 100644
index de23bec..0000000
--- a/auto.el.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@lispGS@
-(defvar preview-lispdir @lisppackagelispdir@)
-(add-to-list 'load-path preview-lispdir)
-(defvar preview-datadir @lisppackagedatadir@)
-@lisppackagetexstyles@
diff --git a/configure.ac b/configure.ac
index d5903c6..43a229d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,7 @@ AC_SHELL_QUOTIFY(TEXI2HTML)
AC_SHELL_QUOTIFY(TEXI2DVI)
AC_SHELL_QUOTIFY(TEXI2PDF)
-AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el
preview.el auto.el latex/Makefile)
+AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el
preview.el latex/Makefile)
cat >&2 <<EOF
diff --git a/preview.el.in b/preview.el.in
index 854140a..9dded29 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -1,6 +1,6 @@
;;; preview.el --- embed preview LaTeX images in source buffer
-;; Copyright (C) 2001-2006, 2010-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2006, 2010-2015 Free Software Foundation, Inc.
;; Author: David Kastrup
;; Keywords: tex, wp, convenience
@@ -1436,20 +1436,12 @@ icon is cached in the property list of the symbol."
(throw 'preview-filter-specs nil)
(preview-filter-specs-1 args))))
-(defvar preview-datadir (file-name-directory load-file-name)
- "The directory relative to which package data may be found.
-This should be hardwired into the startup file containing the
-autoloads for preview-latex.")
-
(put 'preview-filter-specs :file
#'(lambda (_keyword value &rest args)
`(:file ,(expand-file-name value (expand-file-name "images"
- preview-datadir))
+ TeX-data-directory))
,@(preview-filter-specs-1 args))))
-(defvar preview-lispdir TeX-lisp-directory
- "The directory where the preview lisp files are located.")
-
(defun preview-ascent-from-bb (bb)
"This calculates the image ascent from its bounding box.
The bounding box BB needs to be a 4-component vector of
