summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-02-15 14:09:12 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-02-15 14:09:12 -0800
commita644fa367504c4587c1b9e5fc20b7af79e6e99a0 (patch)
tree4647c040ba7c430db2d102e39180950ffd90e49f /Makefile.in
parent8c4e041bdbc07a159305b41e1bcb64f1d301b99f (diff)
parentf5d6b9bb5b307067547f0b26c74e9f538464bfc6 (diff)
downloademacs-a644fa367504c4587c1b9e5fc20b7af79e6e99a0.tar.gz
Merge from origin/emacs-25
f5d6b9b Revert "Support integer image rotation and respect EXIF rotations" afe7d1f Revert "Document EXIF image rotation" c6f377c Document OS X LANG default eb4a18c Set locale when run from OS X GUI 456c0a3 make-docfile cleanup for I/O, etc. 25ec995 Memory-management cleanup in make-docfile 02d925e Kevin Gallagher has new email address 4ef153b Improve doc strings of 'forward/backward-word-strictly' 3ad05a0 Describe Makefile test targets in test/README
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 31a073b6749..7aac403adac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,6 +57,10 @@
#
# make docs
# Make Emacs documentation files from their sources; requires makeinfo.
+#
+# make check or make check-expensive
+# Run Emacs test suite. check-expensive runs also tests which
+# take more time to perform.
SHELL = @SHELL@