[AUCTeX-diffs] [elpa] externals/auctex f761ab4 48/48: Merge branch 'master' into externals/auctex

[Tassilo Horn]

branch: externals/auctex
commit f761ab401f5ca6455f050588edb40bdc0e14b425
Merge: 0e878e9 a7cde09
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into externals/auctex
---
 COPYING                         |   6 +-
 Makefile.in                     |  15 +-
 RELEASE                         |   8 +-
 auctex.spec                     |  15 +-
 bib-cite.el                     |  12 +-
 build-aux/gitlog-to-auctexlog   |   2 +-
 build-aux/gitlog-to-changelog   |   6 +-
 doc/auctex.texi                 |  16 +--
 doc/changes.texi                |  43 ++++--
 doc/fdl.texi                    |   4 +-
 doc/install.texi                |   8 +-
 doc/intro.texi                  |   6 +-
 doc/preview-latex.texi          |  20 ++-
 doc/preview-readme.texi         |   8 +-
 doc/wininstall.texi             |  18 +--
 latex.el                        |   7 +-
 latex/README                    |   6 +-
 latex/preview.dtx               |   2 +-
 multi-prompt.el                 |   9 +-
 plain-tex.el                    |  26 +++-
 preview.el                      | 124 +++++++----------
 prv-emacs.el                    |   8 +-
 style/amsmath.el                |  77 ++++++-----
 style/comment.el                |   4 +-
 style/floatrow.el               |   4 +-
 style/foils.el                  |   2 +-
 style/geometry.el               |  16 +--
 style/graphicx.el               | 135 +++++++++++-------
 style/hyperref.el               |   6 +-
 style/ifluatex.el               |   2 +-
 style/latexinfo.el              |   9 +-
 style/lettrine.el               |  47 ++++---
 style/luatextra.el              |   2 +-
 style/marginnote.el             |  64 +++++++++
 style/mathtools.el              |   2 +-
 style/ocg-p.el                  | 190 +++++++++++++++++++++++++
 style/ocgx.el                   |  68 +++++++++
 style/pstricks.el               |  10 +-
 style/thm-restate.el            | 115 ++++++++++++++++
 style/thmtools.el               | 299 ++++++++++++++++++++++++++++++++++++++++
 tests/Makefile                  |   2 +-
 tests/japanese/preview-latex.el |  94 ++++++-------
 tests/latex/latex-test.el       |  95 +++++++++++++
 tests/tex/command-expansion.el  |  59 +++++++-
 tex-buf.el                      | 211 ++++++++++++++++++++--------
 tex-fold.el                     |  29 ++--
 tex-jp.el                       |  98 +++----------
 tex-site.el.in                  |   4 +-
 tex.el                          |  98 +++++++------
 toolbar-x.el                    |   6 +-
 50 files changed, 1572 insertions(+), 545 deletions(-)

diff --git a/COPYING b/COPYING
index 94a9ed0..335f658 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an 
"about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.in b/Makefile.in
index 5a61a37..6c80882 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,8 @@ STYLESRC = style/prosper.el \
           style/csquotes.el  style/babel.el     style/dk-bib.el \
           style/floatrow.el  style/moodle.el    style/canadian.el \
           style/arabxetex.el style/australian.el style/newzealand.el \
-          style/xltabular.el
+          style/xltabular.el style/marginnote.el style/thmtools.el \
+          style/ocg-p.el     style/ocgx.el      style/thm-restate.el
 
 STYLEELC = $(STYLESRC:.el=.elc)
 
@@ -619,12 +620,12 @@ windows-package: check-tag
        test -d $(WBUILDDIR) || mkdir $(WBUILDDIR)
        test -f $(WBUILDDIR)/$(WEMACSPACKAGE) \
        || { cd $(WBUILDDIR) \
-       && wget http://ftp.gnu.org/gnu/emacs/windows/$(WEMACSPACKAGE); }
+       && wget https://ftp.gnu.org/gnu/emacs/windows/$(WEMACSPACKAGE); }
        test -f $(WBUILDDIR)/auctex-$(TAG).zip \
        || { test -f $(FTPDIR)/auctex-$(TAG).zip \
          && $(CP) $(FTPDIR)/auctex-$(TAG).zip $(WBUILDDIR); } \
        || { cd $(WBUILDDIR) \
-         && wget http://ftp.gnu.org/gnu/auctex/auctex-$(TAG).zip; }
+         && wget https://ftp.gnu.org/gnu/auctex/auctex-$(TAG).zip; }
 # Reset to clean state
        cd $(WBUILDDIR) \
        && rm -rf emacs-$(WEMACSVER) \
@@ -685,14 +686,14 @@ www-doc: check-tag
        mkdir -p $(WWWDIR)/manual
        $(CP) auctex-$(TAG)/doc/*.texi $(WWWDIR)/manual
        cd $(WWWDIR)/manual \
-       && wget -O gendocs.sh 
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs.sh'
 \
-       && wget -O gendocs.sh.patch 
'http://git.savannah.gnu.org/gitweb/?p=auctex.git;a=blob_plain;f=gendocs.sh.patch;hb=gendocspatch'
 \
+       && wget -O gendocs.sh 
'https://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs.sh'
 \
+       && wget -O gendocs.sh.patch 
'https://git.savannah.gnu.org/gitweb/?p=auctex.git;a=blob_plain;f=gendocs.sh.patch;hb=gendocspatch'
 \
        && patch <gendocs.sh.patch \
        && chmod u+x gendocs.sh \
-       && wget -O gendocs_template 
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs_template'
 \
+       && wget -O gendocs_template 
'https://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs_template'
 \
        && sed -i -e 's/html_node\/index\.html/%%PACKAGE%%\/index.html/' 
gendocs_template \
        && mkdir .texinfo \
-       && echo -e "emacs split 
http://www.gnu.org/software/emacs/manual/html_node/emacs/
emacs mono http://www.gnu.org/software/emacs/manual/html_mono/emacs.html
reftex split http://www.gnu.org/software/auctex/manual/reftex/
reftex mono http://www.gnu.org/software/auctex/manual/reftex.html
" > .texinfo/htmlxref.cnf \
+       && echo -e "emacs split 
https://www.gnu.org/software/emacs/manual/html_node/emacs/
emacs mono https://www.gnu.org/software/emacs/manual/html_mono/emacs.html
reftex split https://www.gnu.org/software/auctex/manual/reftex/
reftex mono https://www.gnu.org/software/auctex/manual/reftex.html
" > .texinfo/htmlxref.cnf \
        && ./gendocs.sh --email address@hidden --texi2html \
          --html --use-nodes auctex "AUCTeX Manual" \
        && ./gendocs.sh --email address@hidden --texi2html \
diff --git a/RELEASE b/RELEASE
index 7d540e4..c64bf1f 100644
--- a/RELEASE
+++ b/RELEASE
@@ -48,7 +48,7 @@ Availability
 The easiest way for getting AUCTeX is installing it with GNU ELPA, see
 <URL:https://elpa.gnu.org/packages/auctex.html> for more information.
 Other download options are available at
-<URL:ftp://ftp.gnu.org/gnu/auctex/>.  At release time, we provide the
+<URL:https://ftp.gnu.org/gnu/auctex/>.  At release time, we provide the
 source tarball.  You can also use versions of Emacs that already
 include AUCTeX or a software package management system for your
 operating system which provides you with the latest release.
@@ -59,7 +59,7 @@ The download area is mirrored to the directory support/auctex 
on CTAN.
 AUCTeX is licensed under the GNU General Public License version 3.
 
 You'll find more information at the web site of AUCTeX
-<URL:http://www.gnu.org/software/auctex/>, including its mailing list
+<URL:https://www.gnu.org/software/auctex/>, including its mailing list
 addresses.
 
 Future development and additional information
@@ -95,7 +95,7 @@ we forgot somebody.)
 
 Footnotes:
 
-[1]  <URL:ftp://ftp.dante.de/tex-archive/macros/latex/contrib/preview/>
+[1]  <URL:https://www.ctan.org/pkg/preview>
 
 [2]  dvipng is available via its project page
-<URL:http://savannah.nongnu.org/projects/dvipng> and from CTAN.
+<URL:https://savannah.nongnu.org/projects/dvipng> and from CTAN.
diff --git a/auctex.spec b/auctex.spec
index a482661..286dd4b 100644
--- a/auctex.spec
+++ b/auctex.spec
@@ -2,7 +2,7 @@
 
 # Maintainer: address@hidden
 
-# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2006, 2018 Free Software Foundation, Inc.
 
 # This file is part of AUCTeX.
 
@@ -27,22 +27,20 @@
 %define distri       .suse
 %define commongroup  Productivity/Editors/Emacs
 %define texgroup     Productivity/Publishing/TeX/Utilities
-%define xemacspkgdir %{_datadir}/xemacs/xemacs-packages
 %else
 %define distri       .fedora
 %define commongroup  Applications/Editors
 %define texgroup     Applications/Publishing
-%define xemacspkgdir %{_datadir}/xemacs/site-packages
 %endif
 
 Summary:       Enhanced TeX modes for Emacsen
 Name:          auctex
-Version:       11.86
+Version:       12.1
 Release:       1%{distri}
 License:       GPL
 Group:                 %{commongroup}
-URL:           http://www.gnu.org/software/auctex/
-Source0:        ftp://ftp.gnu.org/pub/gnu/auctex/%{name}-%{version}.tar.gz
+URL:           https://www.gnu.org/software/auctex/
+Source0:        https://ftp.gnu.org/pub/gnu/auctex/%{name}-%{version}.tar.gz
 BuildArchitectures: noarch
 BuildRoot:     %{_tmppath}/%{name}-root
 
@@ -63,7 +61,7 @@ source buffer.
 %package emacs
 Summary:       Enhanced TeX modes for GNU Emacs
 Group:          %{commongroup}
-Requires:      emacs >= 21
+Requires:      emacs >= 24
 Obsoletes:      ge_auc emacs-auctex auctex preview-latex-emacs
 Conflicts:      emacspeak < 18
 Provides:       auctex
@@ -78,8 +76,7 @@ Texinfo and basic support for ConTeXt.  Documentation can be 
found under
 manual is available in Emacs info (C-h i d m AUCTeX RET).  On the AUCTeX home
 page, we provide manuals in various formats.
 
-This package is for GNU Emacs.  XEmacs users should use the package system for
-installation.
+This package is for GNU Emacs.  XEmacs is no longer supported.
 
 The package enables AUCTeX modes system-wide.  The README file
 contains information how users may override this choice.
diff --git a/bib-cite.el b/bib-cite.el
index 5cb8a1d..2a7e74c 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -37,9 +37,9 @@
 ;; associated with