Mid-July rollup

.gitattributes

@@ -24,11 +24,12 @@ admin/charsets/mapfiles/PTCP154 whitespace=cr-at-eol
 leim/MISC-DIC/cangjie-table.b5 whitespace=cr-at-eol
 leim/MISC-DIC/cangjie-table.cns whitespace=cr-at-eol
 leim/MISC-DIC/pinyin.map whitespace=cr-at-eol
-lib-src/update-game-score.exe.manifest whitespace=cr-at-eol
-nt/nmake.defs whitespace=cr-at-eol
-test/etags/c-src/dostorture.c whitespace=cr-at-eol
-test/etags/cp-src/c.C whitespace=cr-at-eol
-test/etags/html-src/algrthms.html whitespace=cr-at-eol
+test/manual/etags/c-src/dostorture.c whitespace=cr-at-eol
+test/manual/etags/cp-src/c.C whitespace=cr-at-eol
+test/manual/etags/html-src/algrthms.html whitespace=cr-at-eol
+
+# The todo-mode file format includes trailing whitespace.
+*.tod[aorty] -whitespace=blank-at-eol
 
 # The upstream maintainer does not want to remove trailing whitespace.
 doc/misc/texinfo.tex -whitespace=blank-at-eol
@@ -48,23 +49,23 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol
 etc/e/eterm-color binary
 
 # Git's builtin diff hunk header styles.
-*.ada diff=ada
-*.[ch] diff=cpp
+*.ad[abs] diff=ada
+*.[Cch] diff=cpp
 *.cc diff=cpp
-*.cpp diff=cpp
+*.[ch]pp diff=cpp
 *.hh diff=cpp
 *.for diff=fortran
 *.html diff=html
 *.shtml diff=html
 *.xml diff=html
 *.java diff=java
-*.m diff=objc
+*.[HMm] diff=objc
+*.pas diff=pascal
 *.perl diff=perl
 *.pl diff=perl
 *.php diff=php
 *.py diff=python
 *.rb diff=ruby
-*.ruby diff=ruby
 *.tex diff=tex
 
 # Hooks for non-default diff hunk headers; see autogen.sh.
@@ -74,7 +75,7 @@ etc/e/eterm-color binary
 *.mk diff=make
 *[Mm]akefile diff=make
 Makefile.in diff=make
-*.sh diff=shell
+*[-.]sh diff=shell
 *.texi diff=texinfo
 #
 # Diff hunk header special-case file names.
@@ -87,6 +88,8 @@ admin/merge-pkg-config diff=shell
 admin/quick-install-emacs diff=shell
 admin/update-copyright diff=shell
 admin/update_autogen diff=shell
+build-aux/config.guess diff=shell
+build-aux/config.sub diff=shell
 build-aux/git-hooks/commit-msg diff=shell
 build-aux/git-hooks/pre-commit diff=shell
 build-aux/gitlog-to-emacslog diff=shell

.gitignore

@@ -26,14 +26,6 @@
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
-build-aux/ar-lib
-build-aux/compile
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/missing
-lib/Makefile.in
 src/config.in
 
 # Built by 'configure'.
@@ -42,29 +34,29 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
-!modules/mod-test/Makefile
 !test/lisp/progmodes/flymake-resources/Makefile
-!test/manual/indent/Makefile
 !test/manual/etags/Makefile
 !test/manual/etags/make-src/Makefile
+!test/manual/indent/Makefile
 /*.cache
 /confdefs.h
 /config.status
 /configure.lineno
 /conftest*
+lib/gnulib.mk
 src/config.h
 src/epaths.h
+src/emacs-module.h
 
 # C-level sources built by 'make'.
 lib/alloca.h
-lib/arg-nonnull.h
 lib/byteswap.h
-lib/c++defs.h
 lib/dirent.h
 lib/errno.h
 lib/execinfo.h
 lib/fcntl.h
 lib/getopt.h
+lib/getopt-cdefs.h
 lib/inttypes.h
 lib/libgnu.a
 lib/limits.h
@@ -76,7 +68,6 @@ lib/string.h
 lib/sys/
 lib/time.h
 lib/unistd.h
-lib/warn-on-use.h
 src/buildobj.h
 src/globals.h
 src/lisp.mk
@@ -131,8 +122,6 @@ deps/
 *.stamp
 stamp_BLD
 src/gl-stamp
-src/stamp-h.in
-src/stamp-h1
 
 # Object files and debugging.
 *.a
@@ -143,7 +132,6 @@ src/stamp-h1
 *.o
 *.res
 *.so
-[0-9]*.core
 core
 core.*[0-9]
 gmon.out
@@ -152,13 +140,12 @@ oo-spd/
 src/*.map
 
 # Tests.
-test/indent/*.new
-test/make-test-deps.mk
 test/manual/biditest.txt
 test/manual/etags/srclist
 test/manual/etags/regexfile
 test/manual/etags/ETAGS
 test/manual/etags/CTAGS
+test/manual/indent/*.new
 
 # ctags, etags.
 TAGS
@@ -256,6 +243,7 @@ gnustmp*
 # Version control and locks.
 *.orig
 *.rej
+*.swp
 *~
 .#*
 \#*\#
@@ -274,7 +262,7 @@ etc/emacs.tmpdesktop
 # Microsoft-related builds and installations.
 *.in-h
 _*
-!build-aux/snippet/_Noreturn.h
+!lib/_Noreturn.h
 /bin/
 /BIN/
 /data/
@@ -288,7 +276,6 @@ lib/SYS/
 /site-lisp/
 nt/emacs.rc
 nt/emacsclient.rc
-nt/gnulib.mk
 src/gdb.ini
 /var/
 

.gitlab-ci.yml

@@ -0,0 +1,41 @@
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+#  This file is part of GNU Emacs.
+#
+#  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/>.
+
+# GNU Emacs support for the GitLab protocol for CI
+
+# The presence of this file does not imply any FSF/GNU endorsement of
+# any particular service that uses that protocol.  Also, it is intended for
+# evaluation purposes, thus possibly temporary.
+
+# Maintainer: tzz@lifelogs.com
+# URL: https://gitlab.com/emacs-ci/emacs
+
+image: debian:unstable
+
+before_script:
+  - apt update -qq
+  - apt install -y -qq build-essential autoconf automake libncurses-dev gnutls-dev
+
+stages:
+  - test
+
+test:
+  stage: test
+  script:
+    - ./autogen.sh
+    - ./configure --without-makeinfo
+    - make check

INSTALL

@@ -258,12 +258,23 @@ inconvenient for Emacs when running as daemon or running via a remote
 ssh connection.  In order to completely prevent the use of D-Bus, configure
 Emacs with the options '--without-dbus --without-gconf --without-gsettings'.
 
+To read email via a network protocol like IMAP or POP, you can
+configure Emacs with the option '--with-mailutils', so that it always
+uses the GNU Mailutils 'movemail' program to retrieve mail.  Otherwise
+the Emacs build procedure builds and installs an auxiliary 'movemail'
+program, a limited and insecure substitute that Emacs can use when
+Mailutils is not installed; when this happens, there are several
+configure options such as --without-pop that provide fine-grained
+control over Emacs 'movemail' construction.
+
 The Emacs mail reader RMAIL is configured to be able to read mail from
 a POP3 server by default.  Versions of the POP protocol older than
-POP3 are not supported.  For Kerberos-authenticated POP add
-'--with-kerberos', for Hesiod support add '--with-hesiod'.  While POP3
-is always enabled, whether Emacs actually uses POP is controlled by
-individual users--see the Rmail chapter of the Emacs manual.
+POP3 are not supported.  While POP3 support is typically enabled,
+whether Emacs actually uses POP3 is controlled by individual users;
+see the Rmail chapter of the Emacs manual.  Unless you configure
+--with-mailutils, it is a good idea to configure --without-pop so that
+users are less likely to inadvertently read email via insecure
+channels.
 
 For image support you may have to download, build, and install the
 appropriate image support libraries for image types other than XBM and
@@ -302,16 +313,17 @@ build a small executable with very basic X support, use --without-all
 use --without-all --without-x.  If you want to build with just a few
 features enabled, you can combine --without-all with --with-FEATURE.
 For example, you can use --without-all --without-x --with-dbus to
-build with DBus support and nothing more.
+build with D-Bus support and nothing more.
 
 Use --with-wide-int to implement Emacs values with the type 'long long',
 even on hosts where a narrower type would do.  With this option, on a
 typical 32-bit host, Emacs integers have 62 bits instead of 30.
 
 Use --with-cairo to compile Emacs with Cairo drawing.
 
-Use --with-modules to build Emacs with support for loading dynamic
-modules.
+Use --with-modules to build Emacs with support for dynamic modules.
+This needs a C compiler that supports '__attribute__ ((cleanup (...)))',
+as in GCC 3.4 and later.
 
 Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
@@ -537,7 +549,8 @@ information on this.
 Emacs info files.
 
 8) If your system uses lock files to interlock access to mailer inbox files,
-then you might need to make the movemail program setuid or setgid
+and if you did not configure --with-mailutils, then you might need to
+make the Emacs-specific 'movemail' program setuid or setgid in order
 to enable it to write the lock files.  We believe this is safe.
 
 9) You are done!  You can remove executables and object files from

INSTALL.REPO

@@ -10,8 +10,6 @@ that are not needed when building from a release.  You will need:
 
 autoconf  - at least the version specified near the start of
   configure.ac (in the AC_PREREQ command).
-automake  - at least the version specified near the start of
-  configure.ac (in the AM_INIT_AUTOMAKE command).
 git - at least Git 1.7.1.  If your repository was created by an older
   Git version, you may need to reclone it.
 makeinfo  - not strictly necessary, but highly recommended, so that
@@ -52,8 +50,21 @@ To update loaddefs.el (and similar files), do:
   $ make autoloads
 
 If either of the above partial procedures fails, try 'make bootstrap'.
-If CPU time is not an issue, 'make bootstrap' is the most thorough way
-to rebuild, and avoid any spurious problems.
+If CPU time is not an issue, 'make bootstrap' is a more thorough way
+to rebuild, avoiding spurious problems.
+
+Occasionally, there are changes that 'make bootstrap' won't be able to
+handle.  The most thorough cleaning can be achieved by 'git clean -fx'
+which will leave you with only files from the git repository.  Here
+are some faster methods for a couple of particular error cases:
+
+    /usr/bin/m4:aclocal.m4:9: cannot open `m4/count-leading-zeros.m4': No such file or directory
+
+This can be fixed with 'rm aclocal.m4'.
+
+    make: *** No rule to make target 'lib/Makefile.am', needed by 'lib/Makefile.in'
+
+This can be fixed with 'rm lib/Makefile Makefile'.
 
 Because the repository version of Emacs is a work in progress, it will
 sometimes fail to build.  Please wait a day or so (and check the