branch: main
commit cf43037c6a2eeb826934e19bed9c7c976006713a
Merge: c4c1a3c9 c332551d
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Merge from upstream
---
ChangeLog | 26 ++++++++++++++
ChangeLog-preview | 9 +++++
Makefile.in | 11 ++++--
README.GIT | 18 ++++++++++
latex/Makefile.in | 2 +-
tests/Makefile | 89 +++++++++++++++++++++++++++++++++++++++++++++++
tests/latex/latex-test.el | 16 ++++++---
tex.el | 8 +++--
8 files changed, 169 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 34efff3b..8b081a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2014-12-04 Mos� Giordano <m...@gnu.org>
+
+ * tex.el (TeX-Omega-command): Add aleph and omega choices.
+ (LaTeX-Omega-command): Add lamed and lambda choices. (Bug#19260)
+
+2014-12-03 Mos� Giordano <m...@gnu.org>
+
+ * README.GIT: Describe branches of the repository.
+
+2014-12-02 Vladimir Lomov <lomov...@gmail.com> (tiny change)
+
+ * latex/Makefile.in (MKINSTALLDIRS): Fix MKINSTALLDIRS path.
+
+2014-11-29 Mos� Giordano <m...@gnu.org>
+
+ * tests/latex/latex-test.el (latex): Require latex.el.
+ (LaTeX-indent-tabular-test/in): Expand file name in load
+ directory, for automated tests.
+ (LaTeX-indent-tabular-test/out): Ditto.
+
+ * tests/Makefile: New Makefile.
+
+ * Makefile.in (.PHONY): Add new check target.
+ (check): New rule. Suggest in comments to run it before a new
+ release.
+
2014-11-28 Stefan Monnier <monn...@iro.umontreal.ca>
* tex.el (TeX-view-program-list-builtin): Fix up paren typo.
diff --git a/ChangeLog-preview b/ChangeLog-preview
index b6518ebd..d86946dc 100644
--- a/ChangeLog-preview
+++ b/ChangeLog-preview
@@ -1,3 +1,12 @@
+2014-11-28 Stefan Monnier <monn...@iro.umontreal.ca>
+
+ * preview.el.in: Cleanup compiler warnings. Mark unused arguments.
+ (error): Don't declare; we don't use it anyway.
+ (view-exit-action): Declare.
+ (desktop-buffer-preview): Use normal names for the function's args.
+ (preview-parse-messages): Remove unused vars `error', `context-start',
+ and `context' (this last one wasn't even bound).
+
2014-11-04 Stefan Monnier <monn...@iro.umontreal.ca>
* prv-install.el: Adjust copyright years.
diff --git a/Makefile.in b/Makefile.in
index 950a27a2..60e21dcc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,8 +178,8 @@ 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 \
- tar-ball-clean check-tag release-commit dist snapshot patch \
- tar-ball rpm-packages wc xemacs-package windows-package \
+ tar-ball-clean check-tag check release-commit dist snapshot \
+ patch tar-ball rpm-packages wc xemacs-package windows-package \
release-sign release-upload preview-ball
texmf: latex/Makefile
@@ -381,6 +381,10 @@ wc:
# Steps for making a release:
#
+# 0) check
+# Run tests using ERT tool. Not necessary but strongly suggested before a
+# release.
+#
# 1) release-commit TAG=<tag> COMMITTER=<committer>
# Tag the release.
# Pass `COMMITTER=<committer>' argument only if it is different from
@@ -418,6 +422,9 @@ snapshot: dist
check-tag:
@if [ "X$(TAG)" = "X" ]; then echo "*** Error: No TAG ***"; exit 1; fi
+check:
+ cd tests && $(MAKE) check
+
release-commit: check-tag
@echo "Tagging release $(TAG) in Git ..."
sleep 5
diff --git a/README.GIT b/README.GIT
index 44992ece..ad0bc85a 100644
--- a/README.GIT
+++ b/README.GIT
@@ -1,3 +1,21 @@
+Organization of the repository
+******************************
+
+This repository has currently three branches:
+
+ * 'master': the main branch of development of AUCTeX;
+
+ * 'simplify-TeX-parse-error': a feature branch for improving parsing
+ of TeX logs;
+
+ * 'gendocspatch': keeps a patch to build on-line manuals and is
+ intended to be used only by AUCTeX maintainers. Unless you are one
+ of them and know how to handle it, you really do not want to pull
+ this branch as it will be rebased frequently.
+
+Installation information
+************************
+
If you retrieved AUCTeX via Git instead of as a regular release, there
are some files that need to be generated from their respective source
files before you can continue reasonably with the instructions
diff --git a/latex/Makefile.in b/latex/Makefile.in
index bccc79e2..8a40ca0b 100644
--- a/latex/Makefile.in
+++ b/latex/Makefile.in
@@ -39,7 +39,7 @@ TEXMFGEN = @TEXMFGEN@
DESTDIR=
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = ../../mkinstalldirs
+MKINSTALLDIRS = ../mkinstalldirs
all: $(TEXMFGEN) preview.drv preview-mk.ins preview.dvi preview.pdf
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 00000000..6f281bca
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,89 @@
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+
+# This file is part of AUCTeX.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+## Some targets:
+## check: re-run all tests, writing to .log files.
+## check-maybe: run all tests whose .log file needs updating
+## filename.log: run tests from filename.el if .log file needs updating
+## filename: re-run tests from filename.el, with no logging
+
+## Adapted from test/automated/Makefile.in of GNU Emacs.
+
+### Code:
+
+SHELL = /bin/sh
+
+EMACS = emacs
+# AUCTeX source directory.
+SRCDIR = ".."
+
+# Command line flags for Emacs.
+EMACSOPT = -batch -L $(SRCDIR)
+
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSPATH
+
+## To run tests under a debugger, set this to eg: "gdb --args".
+GDB =
+
+# The actual Emacs command run in the targets below.
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+emacs = EMACSLOADPATH= LC_ALL=C $(GDB) "$(EMACS)" $(EMACSOPT)
+
+.PHONY: all check
+
+all: check
+
+# In GNU Emacs there is a bashism here to direct output to file and to standard
+# output at the same time.
+WRITE_LOG = 2>&1 | tee $@
+
+%.log: %.el
+ $(emacs) -l ert -l $< -f ert-run-tests-batch-and-exit ${WRITE_LOG}
+
+ELFILES = $(wildcard */*.el)
+LOGFILES = $(patsubst %.el,%.log, ${ELFILES})
+TESTS = ${LOGFILES:.log=}
+
+## If we have to interrupt a hanging test, preserve the log so we can
+## see what the problem was.
+.PRECIOUS: %.log
+
+.PHONY: ${TESTS}
+
+## The short aliases that always re-run the tests, with no logging.
+define test_template
+$(1):
+ @test ! -f $(1).log || mv $(1).log $(1).log~
+ @${MAKE} $(1).log WRITE_LOG=
+endef
+
+$(foreach test,${TESTS},$(eval $(call test_template,${test})))
+
+## Re-run all the tests every time.
+check:
+ -@for f in */*.log; do test ! -f $$f || mv $$f $$f~; done
+ @${MAKE} ${LOGFILES}
+
+.PHONY: clean
+
+clean:
+ -rm -f */*.log */*.log~
+
+# Makefile ends here.
diff --git a/tests/latex/latex-test.el b/tests/latex/latex-test.el
index 6e042308..ac662db3 100644
--- a/tests/latex/latex-test.el
+++ b/tests/latex/latex-test.el
@@ -1,4 +1,4 @@
-;;; latex-test.el --- tests for LaTeX mode?
+;;; latex-test.el --- tests for LaTeX mode
;; Copyright (C) 2014 Free Software Foundation, Inc.
@@ -22,10 +22,16 @@
;;; Code:
(require 'ert)
-
-
-(defvar LaTeX-indent-tabular-test/in (expand-file-name "tabular-in.tex"))
-(defvar LaTeX-indent-tabular-test/out (expand-file-name "tabular-out.tex"))
+(require 'latex)
+
+(defvar LaTeX-indent-tabular-test/in
+ (expand-file-name "tabular-in.tex"
+ (when load-file-name
+ (file-name-directory load-file-name))))
+(defvar LaTeX-indent-tabular-test/out
+ (expand-file-name "tabular-out.tex"
+ (when load-file-name
+ (file-name-directory load-file-name))))
(ert-deftest LaTeX-indent-tabular ()
(should (string=
diff --git a/tex.el b/tex.el
index 7dfba896..a81b7d0f 100644
--- a/tex.el
+++ b/tex.el
@@ -67,7 +67,9 @@
(defcustom TeX-Omega-command "omega"
"Command to run plain TeX on Omega."
:group 'TeX-command
- :type 'string)
+ :type '(choice (const :tag "Aleph" "aleph")
+ (const :tag "Omega" "omega")
+ (string :tag "Other command")))
(defcustom LaTeX-command "latex"
"Command to run LaTeX."
@@ -77,7 +79,9 @@
(defcustom LaTeX-Omega-command "lambda"
"Command to run LaTeX on Omega."
:group 'TeX-command
- :type 'string)
+ :type '(choice (const :tag "Lamed" "lamed")
+ (const :tag "Lambda" "lambda")
+ (string :tag "Other command")))
(defcustom TeX-file-line-error t
"Whether to have TeX produce file:line:error style error messages."
