[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex f34ce5a 67/67: Merge remote-track
|
From: |
Tassilo Horn |
|
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex f34ce5a 67/67: Merge remote-tracking branch 'origin/master' into externals/auctex |
|
Date: |
Fri, 8 Feb 2019 11:40:41 -0500 (EST) |
branch: externals/auctex
commit f34ce5a0652f14b4911c7a3da347080efea198e2
Merge: eca4ffe 34eab00
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>
Merge remote-tracking branch 'origin/master' into externals/auctex
---
Makefile.in | 110 +++----
RELEASE | 18 +-
aclocal.m4 | 112 +-------
bib-cite.el | 2 +-
configure.ac | 101 +++----
context.el | 107 ++++---
doc/Makefile.in | 24 +-
doc/auctex.texi | 79 ++++--
doc/changes.texi | 17 ++
doc/install.texi | 44 ++-
doc/preview-latex.texi | 2 +-
doc/wininstall.texi | 4 +-
font-latex.el | 61 ++--
latex.el | 276 ++++++++++--------
plain-tex.el | 75 +++--
preview.el | 36 ++-
prv-install.el | 114 --------
style/Alegreya.el | 7 +-
style/AlegreyaSans.el | 7 +-
style/FiraMono.el | 7 +-
style/FiraSans.el | 7 +-
style/MinionPro.el | 7 +-
style/MyriadPro.el | 7 +-
style/XCharter.el | 7 +-
style/acro.el | 7 +-
style/acronym.el | 7 +-
style/alltt.el | 7 +-
style/alphanum.el | 5 +-
style/amsfonts.el | 7 +-
style/amsthm.el | 7 +-
style/arabxetex.el | 7 +-
style/array.el | 11 +-
style/attachfile.el | 8 +-
style/babel.el | 7 +-
style/baskervaldx.el | 7 +-
style/beamer.el | 75 +++--
style/biblatex.el | 9 +-
style/bicaption.el | 41 ++-
style/bidi.el | 7 +-
style/bm.el | 7 +-
style/booktabs.el | 7 +-
style/breqn.el | 4 +
style/bulgarian.el | 7 +-
style/captcont.el | 7 +-
style/caption.el | 43 ++-
style/cleveref.el | 7 +-
style/color.el | 223 ++++++++-------
style/colortbl.el | 7 +-
style/commath.el | 7 +-
style/comment.el | 13 +-
style/csquotes.el | 8 +-
style/danish.el | 5 +
style/dashundergaps.el | 103 +++++++
style/dinbrief.el | 6 +-
style/emp.el | 41 ++-
style/empheq.el | 27 +-
style/enumitem.el | 132 ++++++---
style/environ.el | 7 +-
style/epigraph.el | 7 +-
style/erewhon.el | 7 +-
style/exam.el | 17 +-
style/expl3.el | 7 +-
style/fancyhdr.el | 11 +-
style/fancyref.el | 7 +-
style/fancyvrb.el | 193 +++++++------
style/fbb.el | 7 +-
style/flashcards.el | 7 +-
style/floatrow.el | 60 ++--
style/fontaxes.el | 7 +-
style/fontspec.el | 10 +-
style/footmisc.el | 7 +-
style/fvextra.el | 5 +
style/geometry.el | 14 +-
style/german.el | 9 +
style/gloss-italian.el | 10 +-
style/graphics.el | 9 +-
style/graphicx.el | 19 +-
style/hologo.el | 7 +-
style/hyperref.el | 26 +-
style/icelandic.el | 7 +-
style/ifluatex.el | 9 +-
style/italian.el | 7 +-
style/jurabib.el | 9 +-
style/kpfonts.el | 7 +-
style/letter.el | 7 +-
style/lettrine.el | 5 +
style/listings.el | 62 +++-
style/longtable.el | 7 +-
style/ltxtable.el | 11 +-
style/luacode.el | 7 +-
style/marginnote.el | 5 +
style/mathtools.el | 17 +-
style/mdframed.el | 12 +-
style/mdwlist.el | 7 +-
style/menukeys.el | 11 +-
style/metalogo.el | 7 +-
style/mflogo.el | 5 +
style/minted.el | 16 ++
style/mn2e.el | 7 +-
style/mnras.el | 7 +-
style/moodle.el | 7 +-
style/multirow.el | 7 +-
style/nameref.el | 7 +-
style/natbib.el | 7 +-
style/newfloat.el | 9 +-
style/newpxtext.el | 7 +-
style/newtxtext.el | 7 +-
style/newtxttt.el | 7 +-
style/ngerman.el | 9 +
style/nicefrac.el | 7 +-
style/nomencl.el | 7 +-
style/ntheorem.el | 15 +-
style/ocg-p.el | 5 +
style/ocgx.el | 5 +
style/paracol.el | 7 +-
style/paralist.el | 7 +-
style/pdfpages.el | 8 +-
style/polski.el | 7 +-
style/polyglossia.el | 7 +-
style/preview.el | 7 +-
style/pst-grad.el | 5 +
style/pst-node.el | 11 +
style/pst-plot.el | 57 ++--
style/pst-slpe.el | 5 +
style/pstricks.el | 7 +-
style/pythontex.el | 570 +++++++++++++++++++++++++++++++++++++
style/relsize.el | 7 +-
style/scrbase.el | 8 +-
style/scrbook.el | 7 +-
style/scrlttr2.el | 7 +-
style/scrpage2.el | 5 +
style/scrreprt.el | 7 +-
style/setspace.el | 7 +-
style/shortvrb.el | 7 +-
style/siunitx.el | 7 +-
style/slovak.el | 5 +
style/sourcecodepro.el | 7 +-
style/splitidx.el | 9 +-
style/subcaption.el | 10 +-
style/subfigure.el | 7 +-
style/subfiles.el | 11 +-
style/tcolorbox.el | 13 +-
style/tcolorboxlib-raster.el | 10 +-
style/textpos.el | 4 +
style/theorem.el | 7 +-
style/thm-restate.el | 4 +
style/thmtools.el | 7 +-
style/titleps.el | 7 +-
style/titlesec.el | 7 +-
style/titletoc.el | 7 +-
style/transparent.el | 7 +-
style/ulem.el | 7 +-
style/unicode-math.el | 7 +-
style/units.el | 7 +-
style/url.el | 21 +-
style/varioref.el | 7 +-
style/vwcol.el | 7 +-
style/xcolor.el | 73 +++--
style/xparse.el | 7 +-
style/xspace.el | 7 +-
style/zlmtt.el | 7 +-
tests/latex/latex-test.el | 65 ++++-
tests/latex/preview-latex-test.el | 49 ++++
tests/tex/command-expansion.el | 8 +-
tex-bar.el | 15 +-
tex-buf.el | 150 ++++------
tex-fold.el | 16 +-
tex-info.el | 144 +++++-----
tex-ispell.el | 50 +++-
tex-style.el | 5 +-
tex.el | 582 ++++++++++++++++----------------------
171 files changed, 3229 insertions(+), 1775 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6c80882..3c07c16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: address@hidden
-# Copyright (C) 2003-2008, 2010, 2013-2015 Free Software
+# Copyright (C) 2003-2008, 2010, 2013-2015, 2018 Free Software
# Foundation, Inc.
# This file is part of AUCTeX.
@@ -37,7 +37,6 @@ address@hidden@
previewstartfile = @previewstartfile@
packagelispdir = @address@hidden(null)
packagedatadir = @address@hidden(null)
-packagedir = @address@hidden(null)
autodir = @address@hidden(null)
address@hidden@
styledir = $(packagedatadir)/style
@@ -74,18 +73,14 @@ DIST_PREFIX=$(PWD)/auctex-dist
FTPDIR = $(DIST_PREFIX)/ftp
WWWDIR = $(DIST_PREFIX)/www
CTANDIR = $(DIST_PREFIX)/ctan
-XEMACS_BUILD_DIR = xemacs-build
PREVIEW_BUILD_DIR = preview-build
COMMITTER="`git config --get user.name`\ \ \<`git config --get user.email`\>"
RPMROOT = /usr/src/redhat
RPM_SIGN = --sign
-MULESRC = @MULESRC@
-MULEELC = @MULEELC@
-
AUCSRC = tex.el tex-buf.el tex-style.el plain-tex.el latex.el tex-info.el \
texmathp.el multi-prompt.el tex-mik.el font-latex.el tex-font.el \
- context.el context-en.el context-nl.el tex-fold.el \
+ context.el context-en.el context-nl.el tex-fold.el tex-jp.el \
toolbar-x.el tex-bar.el bib-cite.el tex-ispell.el latex-flymake.el
AUCELC = $(AUCSRC:.el=.elc)
@@ -169,19 +164,20 @@ STYLESRC = style/prosper.el \
style/floatrow.el style/moodle.el style/canadian.el \
style/arabxetex.el style/australian.el style/newzealand.el \
style/xltabular.el style/marginnote.el style/thmtools.el \
- style/ocg-p.el style/ocgx.el style/thm-restate.el
+ style/ocg-p.el style/ocgx.el style/thm-restate.el \
+ style/pythontex.el style/dashundergaps.el
STYLEELC = $(STYLESRC:.el=.elc)
ifeq (@preview_enabled@,yes)
PREVIEWSRC = @PLAT_LISP@ preview.el
PREVIEWELC = $(PREVIEWSRC:.el=.elc)
- PREVIEWLATEX = test "x$(packagedir)" != xno || $(MAKE) preview-latex.el
+ PREVIEWLATEX = $(MAKE) preview-latex.el
TEXMF = (cd latex ; $(MAKE) all)
# Install actions
INS_TEXMF = (cd latex ; $(MAKE) DESTDIR=$(DESTDIR) install)
- PREVIEW_INS_STARTUP = test $(packagedir) != no || \
+ PREVIEW_INS_STARTUP = \
$(INSTALL_DATA) preview-latex.el $(DESTDIR)$(previewstartfile)
else
# Don't do anything with preview if the user doesn't want the
@@ -196,7 +192,7 @@ endif
-CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC) $(PREVIEWELC) preview-latex.el
+CLEANFILES = $(AUCELC) $(STYLEELC) $(PREVIEWELC) preview-latex.el
DISTCLEANFILES = Makefile tex-site.el tex-site.el.out auctex.el \
auto-loads.el config.* preview.el
DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO PROBLEMS.preview
@@ -206,17 +202,17 @@ NOSEARCH = style/.nosearch
all: texmf lisp docs
.PHONY: all lisp info dvi some install install-el install-lisp docs \
- install-docs install-auto install-metadata install-startup \
- install-man clean distclean maintainer-clean extraclean \
+ install-docs install-auto install-startup \
+ clean distclean maintainer-clean extraclean \
tar-ball-clean check-tag check release-commit dist snapshot \
- patch tar-ball rpm-packages wc xemacs-package windows-package \
+ patch tar-ball rpm-packages wc windows-package \
release-sign release-upload preview-ball uninstall
texmf: latex/Makefile
$(TEXMF)
-lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC) $(PREVIEWSRC)
- $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC)
$(PREVIEWSRC)
+lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(PREVIEWSRC)
+ $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(PREVIEWSRC)
$(PREVIEWLATEX)
preview-latex.el: preview.el
@@ -239,9 +235,9 @@ dvi:
tex-site.el: tex-site.el.out auto-loads.el Makefile
cat tex-site.el.out >$@
- test X$(packagedir) != Xno || cat auto-loads.el >>$@
+ cat auto-loads.el >>$@
echo "(provide 'tex-site)" >>$@ ; \
- test X$(packagedir) != Xno || echo ";;; tex-site.el ends here" >>$@
+ echo ";;; tex-site.el ends here" >>$@
tex-site.el.out: tex-site.el.in Makefile config.status
./config.status
@@ -264,32 +260,24 @@ doc/Makefile: doc/Makefile.in config.status ChangeLog.1
config.status: configure
./config.status --recheck
-auto-loads.el: $(AUCSRC) $(MULESRC) Makefile
- test X$(packagedir) != Xno || { \
- rm -f $@ ; \
- $(ELCC) $(AUTOLOAD) $(AUCSRC) $(MULESRC) || : ; \
- test -r $@ || { \
- echo ";; Auto-generated part of tex-site.el" > $@ ; \
- echo " " >> $@ ; \
- $(ELCC) $(AUTOLOAD) $(AUCSRC) $(MULESRC) ; \
- } ; \
+auto-loads.el: $(AUCSRC) Makefile
+ rm -f $@
+ -$(ELCC) $(AUTOLOAD) $(AUCSRC)
+ test -r $@ || { \
+ echo ";; Auto-generated part of tex-site.el" > $@ ; \
+ echo " " >> $@ ; \
+ $(ELCC) $(AUTOLOAD) $(AUCSRC) ; \
}
some: $(AUCELC) $(STYLEELC)
install: install-texmf install-lisp install-docs install-images \
install-startup
- $(MAKE) 'DESTDIR=$(DESTDIR)' install-metadata
-
-install-man: doc/Makefile
- cd doc && $(MAKE) 'DESTDIR=$(DESTDIR)' install-man
- $(INSTALL_DATA) RELEASE $(DESTDIR)$(packagedir)/man/auctex
install-startup:
$(PREVIEWLATEX)
$(PREVIEW_INS_STARTUP)
- test $(packagedir) != no || \
- $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
+ $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
install-texmf:
$(INS_TEXMF)
@@ -305,15 +293,12 @@ install-el:
mv $(DESTDIR)$(lispdir)/tex-site.el
$(DESTDIR)$(lispdir)/tex-site.el.save ; \
fi; \
}
- if test X$(packagedir) = Xno; \
- then $(INSTALL_DATA) tex-site.el $(DESTDIR)$(lispdir) ; \
- else rm -f $(DESTDIR)$(lispdir)/tex-site.el ; \
- fi
+ $(INSTALL_DATA) tex-site.el $(DESTDIR)$(lispdir)
-$(MKINSTALLDIRS) $(DESTDIR)$(packagelispdir)
- @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @: $(MAKE) ; for x in $(AUCSRC) $(PREVIEWSRC); do \
echo '$(INSTALL_DATA)' $$x '$(DESTDIR)$(packagelispdir)' ; \
done
- @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @for x in $(AUCSRC) $(PREVIEWSRC); do \
$(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
done;
-$(MKINSTALLDIRS) $(DESTDIR)$(styledir)
@@ -328,10 +313,10 @@ install-el:
-$(INSTALL_DATA) $(NOSEARCH) $(DESTDIR)$(autodir)
install-lisp: some install-el
- @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @: $(MAKE) ; for x in $(AUCSRC) $(PREVIEWSRC); do \
echo '$(INSTALL_DATA)' $${x}c '$(DESTDIR)$(packagelispdir)' ; \
done
- @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @for x in $(AUCSRC) $(PREVIEWSRC); do \
$(INSTALL_DATA) $${x}c $(DESTDIR)$(packagelispdir) ; \
done
@: $(MAKE) ; for x in $(STYLESRC) ; do \
@@ -358,28 +343,10 @@ install-docs: doc/Makefile
install-auto:
@echo "Use \"M-x TeX-auto-generate-global RET\" instead."
-install-metadata:
- test "x$(packagedir)" = xno || { \
- $(MKINSTALLDIRS) $(DESTDIR)$(packagedir)/pkginfo || : ; \
- $(ELCC) -l prv-install -f preview-make-package
$(DESTDIR)$(packagedir) "$(PACKAGE)" \"`echo $(AUCTEXDATE)|sed
's/\(.*\)-\(.*\)-\(.*\)/./'`\" \"$(AUCTEXVERSION)\" tex-site.el && \
- cd $(DESTDIR)$(packagedir) && \
- find "etc/$(PACKAGE)" "lisp/$(PACKAGE)" -print
>"pkginfo/MANIFEST.$(PACKAGE)" && \
- for i in $(PACKAGE_INFO); do \
- test -r "info/$$i.info" && echo "info/$$i.info" >>
"pkginfo/MANIFEST.$(PACKAGE)" ; \
- done && \
- echo "pkginfo/MANIFEST.$(PACKAGE)" >> "pkginfo/MANIFEST.$(PACKAGE)" ;
\
- }
-
uninstall:
rm -rf $(DESTDIR)$(packagelispdir) $(DESTDIR)$(packagedatadir) \
$(DESTDIR)$(autodir)
- if test X$(packagedir) = Xno ; then \
- rm -f $(DESTDIR)$(lispdir)/tex-site.el \
- $(DESTDIR)$(auctexstartfile) ; \
- else \
- rm -f $(DESTDIR)$(packagedir)/man/auctex/RELEASE \
- $(DESTDIR)$(packagedir)/pkginfo/MANIFEST.$(PACKAGE); \
- fi
+ rm -f $(DESTDIR)$(lispdir)/tex-site.el $(DESTDIR)$(auctexstartfile)
cd doc ; $(MAKE) DESTDIR=$(DESTDIR) uninstall
rm -f $(DESTDIR)$(previewstartfile)
rm -rf $(DESTDIR)$(packagelispdir)
@@ -407,7 +374,6 @@ extraclean: maintainer-clean
tar-ball-clean: check-tag
rm -rf auctex-$(TAG)/
- rm -rf $(XEMACS_BUILD_DIR)/
wc:
wc $(AUCSRC) $(STYLESRC)
@@ -488,25 +454,22 @@ change-history-commit:
# 3) dist TAG=<tag>
# Create the tar ball and other release files and put them into $FTPDIR.
#
-# 4) xemacs-package TAG=<tag>
-# Create the precompiled XEmacs package.
-#
-# 5) windows-package WEMACSVER=<emacs-version> TAG=<tag>
+# 4) windows-package WEMACSVER=<emacs-version> TAG=<tag>
# Create the precompiled AUCTeX package for Windows.
# This requires a compiled Emacs of the same version at location $WEMACS.
# NOTA BENE: you may need to use bash shell for this recipe to work.
#
-# 6) release-sign TAG=<tag>
+# 5) release-sign TAG=<tag>
# Sign the tar ball and create directive files for upload. NOTA BENE: you
# may need to use bash shell for this recipe to work.
#
-# 7) release-upload
+# 6) release-upload
# Upload files to GNU FTP server.
#
-# 8) www-doc TAG=<tag>
+# 7) www-doc TAG=<tag>
# Create documentation for AUCTeX home page.
#
-# 9) preview-ball TAG=<tag>
+# 8) preview-ball TAG=<tag>
# Create preview package. (Not for GNU FTP server but for CTAN.)
dist: check-tag tar-ball
@@ -573,13 +536,6 @@ patch:
diff -u auctex-$(OLD) auctex-$(TAG) | gzip --best \
>$(FTPDIR)/auctex-$(OLD)-to-$(TAG).patch.gz
-xemacs-package: check-tag
- rm -rf $(XEMACS_BUILD_DIR)
- $(CP_A) auctex-$(TAG) $(XEMACS_BUILD_DIR)
- cd $(XEMACS_BUILD_DIR) \
- && ./configure INSTALL_INFO=: TEXHASH=: --with-xemacs
--with-packagedir=`pwd`/xemacs-package --without-texmf-dir
--with-auto-dir=etc/auctex/auto \
- && $(MAKE) all install-man install && cd xemacs-package && tar -cf -
--owner=root --group=root . | gzip --best > $(FTPDIR)/auctex-$(TAG)-pkg.tar.gz
-
# Pre-compiled AUCTeX package for Emacs on Windows
WBUILDDIR=$(PWD)/windows-package
WEMACS=/usr/src/emacs-$(WEMACSVER)/src/emacs
diff --git a/RELEASE b/RELEASE
index c64bf1f..763957e 100644
--- a/RELEASE
+++ b/RELEASE
@@ -3,15 +3,15 @@ Release notes for AUCTeX 12.1 with preview-latex
AUCTeX provides by far the most wide-spread and sophisticated
environment for editing LaTeX, TeX, ConTeXt and Texinfo documents with
-Emacs or XEmacs. Combined with packages like RefTeX, flyspell and
-others it is pretty much without peer as a comprehensive authoring
-solution for a large variety of operating system platforms and TeX
-distributions. It supports document-dependent completion and syntax
-highlighting, easily accessible menus, jumping to error locations in
-the source file, a number of editing shortcuts, intelligent
-indentation and filling of text during entry, and WYSIWYG previews of
-graphical elements like math formulas right in the Emacs source
-buffer, by virtue of its preview-latex component.
+Emacs. Combined with packages like RefTeX, flyspell and others it is
+pretty much without peer as a comprehensive authoring solution for a
+large variety of operating system platforms and TeX distributions. It
+supports document-dependent completion and syntax highlighting, easily
+accessible menus, jumping to error locations in the source file, a
+number of editing shortcuts, intelligent indentation and filling of
+text during entry, and WYSIWYG previews of graphical elements like
+math formulas right in the Emacs source buffer, by virtue of its
+preview-latex component.
One part of the preview-latex subsystem is the central `preview.sty'
file that is independently useful for a number of applications and is
diff --git a/aclocal.m4 b/aclocal.m4
index 08b0b52..383a593 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -34,7 +34,7 @@ AC_DEFUN(EMACS_PATH_PREFIX,[
prefix) (error "NONE"))]],[[-no-site-file]],[[cmd]],[$2])])
AC_DEFUN(EMACS_PROG_EMACS, [
-# Check for (X)Emacs, report its path, flavor and prefix
+# Check for Emacs, report its path, flavor and prefix
# Apparently, if you run a shell window in Emacs, it sets the EMACS
# environment variable to 't'. Let's undo the damage.
@@ -44,48 +44,16 @@ fi
AC_ARG_WITH(emacs,
[ --with-emacs@<:@=PATH@:>@ Use Emacs to build (on PATH if given)],
[if test "${withval}" = "yes"; then EMACS=emacs
- elif test "${withval}" = "no"; then EMACS=xemacs
else EMACS="${withval}"; fi])
-AC_ARG_WITH(xemacs,
- [ --with-xemacs@<:@=PATH@:>@ Use XEmacs to build (on PATH if given)],
- [if test "x${withval}" != xno
- then
- if test "x${with_emacs}" != xno -a "x${with_emacs}" != x
- then
- AC_MSG_ERROR([[cannot use both Emacs and XEmacs]])
- fi
- if test "x${withval}" = "xyes"
- then
- EMACS=xemacs
- else
- EMACS="${withval}"
- fi
- elif test "x${with_emacs}" = xno
- then
- AC_MSG_ERROR([[need to use either Emacs or XEmacs]])
- fi])
-
# "${prefix}/bin" is for Windows users
-AC_PATH_PROGS(EMACS, ${EMACS} emacs xemacs, "", ${PATH} "${prefix}/bin" )
+AC_PATH_PROGS(EMACS, ${EMACS} emacs, "", ${PATH} "${prefix}/bin" )
if test -z "${EMACS}"; then
- AC_MSG_ERROR([(X)Emacs not found! Aborting!])
+ AC_MSG_ERROR([Emacs not found! Aborting!])
fi
-AC_MSG_CHECKING([if ${EMACS} is XEmacs])
-EMACS_LISP(XEMACS,
- [[(if (featurep (quote xemacs)) \"yes\" \"no\")]],[[-no-site-file]])
-if test "${XEMACS}" = "yes"; then
- EMACS_FLAVOR=xemacs
- EMACS_NAME="XEmacs"
-elif test "${XEMACS}" = "no"; then
EMACS_FLAVOR=emacs
EMACS_NAME="Emacs"
-else
- AC_MSG_ERROR([Unable to run ${EMACS}! Aborting!])
-fi
- AC_MSG_RESULT(${XEMACS})
- AC_SUBST(XEMACS)
AC_SUBST(EMACS_FLAVOR)
AC_MSG_CHECKING([for ${EMACS_NAME} prefix])
EMACS_PATH_PREFIX([[emacsprefix]],[["${EMACS}"]])
@@ -189,31 +157,6 @@ AC_DEFUN(EMACS_EXAMINE_INSTALLATION_DIR,
[prefix expanded $6],["${currentprefix}" "${expprefix}" $7])
if test "[$]$1" != NONE; then break; fi; done])
-AC_DEFUN(EMACS_PATH_PACKAGEDIR,
- [AC_ARG_WITH(packagedir,
- [ --with-packagedir=DIR package DIR for XEmacs],
- [packagedir="`echo ${withval} | sed 's/^~\//${HOME}\//;s/[[\/\]]$//'`"],
- [if test ${EMACS_FLAVOR} = xemacs; then
- AC_MSG_CHECKING([for XEmacs package directory])
- EMACS_EXAMINE_INSTALLATION_DIR(packagedir,
- [['${datadir}/xemacs/xemacs-packages' \
- '${libdir}/xemacs/xemacs-packages' \
- '${datadir}' '${libdir}' "${emacsprefix}"]],
- [[(list \"xemacs/site-packages\" \"xemacs/xemacs-packages\"
- \"site-packages\" \"xemacs-packages\")]],
- [[(if (boundp 'late-packages)
- (append late-packages last-packages early-packages)
- (append late-package-hierarchies last-package-hierarchies
- early-package-hierarchies))]])
- if test "x${packagedir}" = xNONE -o -z "${packagedir}"; then
- AC_MSG_ERROR([not found, exiting!])
- fi
- AC_MSG_RESULT(${packagedir})
- else
- packagedir=no
- fi])
- AC_SUBST(packagedir)])
-
AC_DEFUN(EMACS_PATH_LISPDIR, [
AC_MSG_CHECKING([where lisp files go])
AC_ARG_WITH(lispdir,
@@ -221,24 +164,19 @@ AC_DEFUN(EMACS_PATH_LISPDIR, [
files will be place in a subdirectory.],
[[lispdir="${withval}"]])
if test "X${lispdir}" = X; then
- if test "X${packagedir}" = Xno; then
- # Test paths relative to prefixes
- EMACS_EXAMINE_INSTALLATION_DIR(lispdir,
- [['${datadir}/'${EMACS_FLAVOR} '${libdir}/'${EMACS_FLAVOR} \
- "${emacsprefix}/share/${EMACS_FLAVOR}" \
- '${datadir}' '${libdir}' "${emacsprefix}"]],
- [[(list \"${EMACS_FLAVOR}/site-lisp\" \"${EMACS_FLAVOR}/site-packages\"
- \"site-lisp\" \"site-packages\")]], load-path)
- if test "${lispdir}" = "NONE"; then
- # No? notify user.
- AC_MSG_ERROR([Cannot locate lisp directory,
+ # Test paths relative to prefixes
+ EMACS_EXAMINE_INSTALLATION_DIR(lispdir,
+ [['${datadir}/'${EMACS_FLAVOR} '${libdir}/'${EMACS_FLAVOR} \
+ "${emacsprefix}/share/${EMACS_FLAVOR}" \
+ '${datadir}' '${libdir}' "${emacsprefix}"]],
+ [[(list \"${EMACS_FLAVOR}/site-lisp\" \"${EMACS_FLAVOR}/site-packages\"
+ \"site-lisp\" \"site-packages\")]], load-path)
+ if test "${lispdir}" = "NONE"; then
+ # No? notify user.
+ AC_MSG_ERROR([Cannot locate lisp directory,
use --with-lispdir, --datadir, or possibly --prefix to rectify this])
- fi
- else
- # XEmacs
- lispdir="${packagedir}/lisp"
- fi
fi
+ fi
AC_MSG_RESULT([[${lispdir}]])
AC_SUBST(lispdir)
])
@@ -511,28 +449,6 @@ AC_SUBST(auctexdir)
])
dnl
-dnl Check if (X)Emacs supports international characters,
-dnl i.e. provides MULE libraries and runs in multibyte mode.
-dnl
-AC_DEFUN(EMACS_CHECK_MULE, [
-AC_MSG_CHECKING(for MULE support)
-EMACS_CHECK_REQUIRE(mule,silent)
-if test "${HAVE_mule}" = "yes" && test "X${EMACS_UNIBYTE}" = X; then
- MULESRC="tex-jp.el"
- MULEELC="tex-jp.elc"
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- if test "X${EMACS_UNIBYTE}" != X; then
- AC_MSG_WARN([[EMACS_UNIBYTE environment variable set.
-Disabling features requiring international character support.]])
- fi
-fi
-AC_SUBST(MULESRC)
-AC_SUBST(MULEELC)
-])
-
-dnl
dnl MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND
dnl [, ACTION-IF-NOT-FOUND]])
dnl
diff --git a/bib-cite.el b/bib-cite.el
index 2a7e74c..d871cb0 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -7,7 +7,7 @@
;; Author: Peter S. Galbraith <address@hidden>
;; Created: 06 July 1994
;; Version: 3.28 (Feb 23 2005)
-;; Keywords: bibtex, cite, auctex, emacs, xemacs
+;; Keywords: bibtex, cite, auctex, emacs
;;; This file is not part of GNU Emacs.
diff --git a/configure.ac b/configure.ac
index fe7fef6..4ba8b57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,14 +37,7 @@ AC_SUBST(PREVIEWVERSION)
EMACS_PROG_EMACS
-if test ${EMACS_FLAVOR} = xemacs
-then
- EMACS_CHECK_VERSION(21,4)
-else
- EMACS_CHECK_VERSION(21,1)
-fi
-
-EMACS_CHECK_MULE
+EMACS_CHECK_VERSION(24,1)
# The Debian package uses `--disable-build-dir-test'; normal users should
# never need to modify the default behavior.
@@ -62,59 +55,40 @@ AC_ARG_ENABLE(preview,
[preview_enabled="yes"])
AC_SUBST(preview_enabled)
-if test ${EMACS_FLAVOR} = "xemacs" ; then
- EMACS_PATH_PACKAGEDIR
- PLAT_LISP=prv-xemacs.el
-else
- packagedir=no
- PLAT_LISP=prv-emacs.el
-fi
+PLAT_LISP=prv-emacs.el
-if test "X${packagedir}" = Xno
+EMACS_PATH_LISPDIR
+AC_MSG_CHECKING(what file to use for auctex startup)
+AC_ARG_WITH(auctexstartfile,
+[[ --with-auctexstartfile=FILE What file to use for auctex startup.]],
+[[ auctexstartfile="${withval}" ]],
+[ _tmpdir_="${lispdir}"
+AC_FULL_EXPAND(_tmpdir_)
+if test -d "${_tmpdir_}/site-start.d"
then
- EMACS_PATH_LISPDIR
- AC_MSG_CHECKING(what file to use for auctex startup)
- AC_ARG_WITH(auctexstartfile,
- [[ --with-auctexstartfile=FILE What file to use for auctex startup.]],
- [[ auctexstartfile="${withval}" ]],
- [ _tmpdir_="${lispdir}"
- AC_FULL_EXPAND(_tmpdir_)
- if test -d "${_tmpdir_}/site-start.d"
- then
- auctexstartfile="${lispdir}/site-start.d/auctex.el"
- else
- auctexstartfile="${lispdir}/auctex.el"
- fi])
- AC_MSG_RESULT([[${auctexstartfile}]])
-
- AC_MSG_CHECKING(what file to use for preview startup)
- AC_ARG_WITH(previewstartfile,
- [[ --with-previewstartfile=FILE What file to use for preview startup.]],
- [[ previewstartfile="${withval}" ]],
- [ _tmpdir_="${lispdir}"
- AC_FULL_EXPAND(_tmpdir_)
- if test -d "${_tmpdir_}/site-start.d"
- then
- previewstartfile="${lispdir}/site-start.d/preview-latex.el"
- else
- previewstartfile="${lispdir}/preview-latex.el"
- fi])
- AC_MSG_RESULT([[${previewstartfile}]])
-
- packagelispdir="${lispdir}/auctex"
- packagedatadir="${packagelispdir}"
- texsitedir="${lispdir}"
+auctexstartfile="${lispdir}/site-start.d/auctex.el"
else
- #lispdir is only used for determining relative files.
- lispdir="${packagedir}"
- packagelispdir="${packagedir}/lisp/auctex"
- texsitedir="$packagelispdir"
- auctexstartfile="${packagelispdir}"/auto-autoloads.el
- previewstartfile="${packagelispdir}"/auto-autoloads.el
- packagedatadir="${packagedir}/etc/auctex"
- infodir="${packagedir}/info"
- INSTALL_INFO=:
-fi
+auctexstartfile="${lispdir}/auctex.el"
+fi])
+AC_MSG_RESULT([[${auctexstartfile}]])
+
+AC_MSG_CHECKING(what file to use for preview startup)
+AC_ARG_WITH(previewstartfile,
+[[ --with-previewstartfile=FILE What file to use for preview startup.]],
+[[ previewstartfile="${withval}" ]],
+[ _tmpdir_="${lispdir}"
+AC_FULL_EXPAND(_tmpdir_)
+if test -d "${_tmpdir_}/site-start.d"
+then
+previewstartfile="${lispdir}/site-start.d/preview-latex.el"
+else
+previewstartfile="${lispdir}/preview-latex.el"
+fi])
+AC_MSG_RESULT([[${previewstartfile}]])
+
+packagelispdir="${lispdir}/auctex"
+packagedatadir="${packagelispdir}"
+texsitedir="${lispdir}"
AC_SUBST(auctexstartfile)
AC_SUBST(previewstartfile)
@@ -140,14 +114,6 @@
AC_LISPIFY_DIR(texsite,[["${auctexstartfile}"]],tex-site.el)
AC_MSG_CHECKING(where the info files go)
AC_MSG_RESULT([[${infodir}]])
-AC_SUBST(packagedir)
-
-if test $EMACS_FLAVOR = "xemacs" -a "$infodir" = '${prefix}/info'; then
- if test $packagedir != 'no'; then
- infodir='${packagedir}/info'
- fi
-fi
-
AUCTEX_AUTO_DIR
AC_LISPIFY_DIR(autodir,"${texsitedir}/tex-site.el")
@@ -278,7 +244,7 @@ AC_PATH_PROG(TEXI2HTML, texi2html, :)
AC_PATH_PROG(TEXI2DVI, texi2dvi, :)
AC_PATH_PROG(TEXI2PDF, texi2pdf, :)
-AC_ARG_VAR(INSTALL_INFO, [install-info executable. Set to : to skip making a
dir file. This is the default when installing into an XEmacs package.])
+AC_ARG_VAR(INSTALL_INFO, [install-info executable. Set to : to skip making a
dir file.])
if test "X${INSTALL_INFO}" = X
then
@@ -287,7 +253,6 @@ fi
AC_SHELL_QUOTIFY(prefix)
AC_SHELL_QUOTIFY(localstatedir)
-AC_SHELL_QUOTIFY(packagedir)
AC_SHELL_QUOTIFY(packagelispdir)
AC_SHELL_QUOTIFY(packagedatadir)
AC_SHELL_QUOTIFY(lispdir)
diff --git a/context.el b/context.el
index ee35eb6..db2f86f 100644
--- a/context.el
+++ b/context.el
@@ -1,6 +1,6 @@
;;; context.el --- Support for ConTeXt documents.
-;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2017
+;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2018
;; Free Software Foundation, Inc.
;; Maintainer: Berend de Boer <address@hidden>
@@ -1482,58 +1482,57 @@ else. There might be text before point."
(easy-menu-define ConTeXt-mode-menu
ConTeXt-mode-map
"Menu used in ConTeXt mode."
- (TeX-menu-with-help
- `("ConTeXt"
- (,ConTeXt-project-structure-menu-name)
- (,ConTeXt-section-block-menu-name)
- (,ConTeXt-numbered-section-menu-name)
- (,ConTeXt-unnumbered-section-menu-name)
- ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
- "-"
- ["Macro ..." TeX-insert-macro
- :help "Insert a macro and possibly arguments"]
- ["Complete" TeX-complete-symbol
- :help "Complete the current macro or environment name"]
- ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
- "-"
- (,ConTeXt-environment-menu-name)
- (,ConTeXt-environment-modify-menu-name)
- ["Item" ConTeXt-insert-item
- :help "Insert a new \item into current environment"]
- (,ConTeXt-define-menu-name)
- (,ConTeXt-setup-menu-name)
- (,ConTeXt-other-macro-menu-name)
- "-"
- ("Insert Font"
- ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
- ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
- ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
- ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
- ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
- ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
- ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
- ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
- ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
- ("Replace Font"
- ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
- ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
- ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
- ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
- ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
- ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
- ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
- ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
- ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
- ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
- "-"
- ["Comment or Uncomment Region"
- comment-or-uncomment-region
- :help "Make the selected region outcommented or active again"]
- ["Comment or Uncomment Paragraph"
- TeX-comment-or-uncomment-paragraph
- :help "Make the current paragraph outcommented or active again"]
- ,TeX-fold-menu
- "-" . ,TeX-common-menu-entries)))
+ `("ConTeXt"
+ (,ConTeXt-project-structure-menu-name)
+ (,ConTeXt-section-block-menu-name)
+ (,ConTeXt-numbered-section-menu-name)
+ (,ConTeXt-unnumbered-section-menu-name)
+ ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
+ "-"
+ ["Macro ..." TeX-insert-macro
+ :help "Insert a macro and possibly arguments"]
+ ["Complete" TeX-complete-symbol
+ :help "Complete the current macro or environment name"]
+ ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
+ "-"
+ (,ConTeXt-environment-menu-name)
+ (,ConTeXt-environment-modify-menu-name)
+ ["Item" ConTeXt-insert-item
+ :help "Insert a new \item into current environment"]
+ (,ConTeXt-define-menu-name)
+ (,ConTeXt-setup-menu-name)
+ (,ConTeXt-other-macro-menu-name)
+ "-"
+ ("Insert Font"
+ ["Emphasize" (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+ ["Bold" (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+ ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+ ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+ ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+ ["Italic" (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+ ["Slanted" (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+ ["Roman" (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+ ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+ ("Replace Font"
+ ["Emphasize" (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+ ["Bold" (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+ ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+ ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+ ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+ ["Italic" (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+ ["Slanted" (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+ ["Roman" (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+ ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+ ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+ "-"
+ ["Comment or Uncomment Region"
+ comment-or-uncomment-region
+ :help "Make the selected region outcommented or active again"]
+ ["Comment or Uncomment Paragraph"
+ TeX-comment-or-uncomment-paragraph
+ :help "Make the current paragraph outcommented or active again"]
+ ,TeX-fold-menu
+ "-" . ,TeX-common-menu-entries))
(defun ConTeXt-menu-update (&optional menu)
"Update entries on AUCTeX menu."
@@ -1783,7 +1782,7 @@ i.e. you do _not_ have to cater for this yourself by
adding \\' or $."
;; run hooks
(setq TeX-command-default "ConTeXt")
(setq TeX-sentinel-default-function 'TeX-ConTeXt-sentinel)
- (TeX-run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'ConTeXt-mode-hook))
+ (run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'ConTeXt-mode-hook))
(defun context-guess-current-interface ()
"Guess what ConTeXt interface the current buffer is using."
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6a37541..6f40d82 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: address@hidden
-# Copyright (C) 2003-2008, 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008, 2013-2015, 2018 Free Software Foundation, Inc
- [AUCTeX-diffs] [elpa] externals/auctex 906ac31 55/67: Add new style/pythontex.el, (continued)
- [AUCTeX-diffs] [elpa] externals/auctex 906ac31 55/67: Add new style/pythontex.el, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 33329c3 57/67: ; * doc/auctex.texi (Completion): Fix typo., Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 6e8aa67 41/67: ; Silence the compiler in styles for `font-latex-add-quotes', Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 4fed4a7 64/67: Remove combatibility code for older emasen, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex a4576a1 49/67: ; * tex.el (TeX-math-toggle-off-input-method): Fix doc string., Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex c893152 50/67: Redefine support for \url in hyperref, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 5827aeb 34/67: Remove TeX-mark-active, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 2c73857 51/67: ; * style/pst-plot.el (LaTeX-pstplot-cleanup): Fix typo., Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 45ad237 35/67: Remove TeX-maybe-remove-help,, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 3d0c445 38/67: ; Silence the compiler in styles for `font-latex-add-keywords'., Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex f34ce5a 67/67: Merge remote-tracking branch 'origin/master' into externals/auctex,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex 088e10c 45/67: ; Silence the compiler in styles for various functions and variables, Tassilo Horn, 2019/02/08
- [AUCTeX-diffs] [elpa] externals/auctex 88b381c 54/67: Drop xemacs support and mule check from configure and Makefile, Tassilo Horn, 2019/02/08