Merge from origin/emacs-26

7f089aa5f6 Require seq in rmc.el
53aaad1dfc Make an example code introduced in the Gnus info work (bug...
7b29db222f Enable gnus-read-ephemeral-* to run multiple times (bug#29...
015f0bb2d8 Port thread.c to OpenBSD ARM
ad68bbd0da Fix another "wrong side of point" error in CC Mode.
646e56e150 Fix Bug#28959
685fd77959 Fix duplicate .o file on QNX
e562356c3f Fix two js indentation problems
b8cf159bbc Update documentation for windows build
46540a1c7a Fix a "wrong side of point" error in CC Mode.  Fixes bug #...
57ca409111 Fix autoload of flymake from elisp-mode during bootstrap (...
aee0bc8775 Fix non-native fullscreen on NS (bug#28872)
d6c1a9cb8a ; Fix author email address in test/lisp/url/url-tramp-test...
761c630766 Fix Bug#28982
628b653209 Fix windows build errors
e8a06a5f9a Fix compile warning for non-w32 builds
0c536a20fb Display commit in package description, if available (Bug#2...
1d83257a1d Port to QNX
19667f44ef * configure.ac: Tweak libcurses diagnostic.
3fc05cfaec Scripts to automate windows binary distribution
928a106939 Fix Edebug specs for map-let and with-maps-do
46f2ee0d4c * test/lisp/net/tramp-tests.el (tramp-test41-delay-load): ...
b51009d7f0 * admin/authors.el (authors-canonical-author-name): Ignore...
a015db90e3 * test/lisp/progmodes/sql-tests.el (sql-tests-postgres-lis...
529a9c09d3 Further work on Bug#28889
c6deabaf4d Improve Tramp backward compatibility
8093e82e42 Improve backward compatibility of tramp-tests.el
46cdc01daa Fix some ‘window-normalize-’ prefixed functions (Bug#28947)
6360611457 Port to OpenIndiana
a012ec766c Don't fill keywords after Emacs Lisp docstring
b7c4aa951c Refactor c-forward-token-2 with new function c-forward-ove...
3aee7be62e Avoid unnecessary rounding errors in timestamps
2bfa42855b Fix xdg timestamp error on 32-bit Emacs
237e96bc52 Test that advice doesn't trigger bytecomp warnings (Bug#28...
d719ea6ad5 Another fix for unsafe directory error message (Bug#865)
b060e091c3 Handle https url for debbugs mbox (Bug#28831)
9e4265ef91 Ignore string properties when saving eshell history (Bug#2...
0f286ca85a Fix Bug#28889

6 files changed, 510 insertions, 3 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index c13cb552a78..753a676e81a 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -62,6 +62,7 @@ Michael Albinus
             lisp/url/url-tramp.el
             doc/misc/tramp*.texi
             test/lisp/net/tramp-tests.el
+            test/lisp/url/url-tramp-tests.el
 
         D-Bus
             src/dbusbind.c
diff --git a/admin/authors.el b/admin/authors.el
index 71995d5764c..603ceb3fa08 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1321,9 +1321,10 @@ it is found in `authors-fixed-case'."
     (setq author (replace-regexp-in-string "[ \t]+" " " author))
     ;; NB this ignores the first name only case.
     (unless (string-match "[-, \t]" author)
-      (push (format-message "%s:%d: ignored `%s'"
-                            file (1+ (count-lines (point-min) pos)) author)
-            authors-ignored-names)
+      (or (authors-lax-changelog-p file)
+          (push (format-message "%s:%d: ignored `%s'"
+                                file (1+ (count-lines (point-min) pos)) author)
+                authors-ignored-names))
       (setq author ""))
     (or (car (member author authors-fixed-case))
         (capitalize author))))
diff --git a/admin/nt/dist-build/README-scripts b/admin/nt/dist-build/README-scripts
new file mode 100644
index 00000000000..a20099e4eb6
--- /dev/null
+++ b/admin/nt/dist-build/README-scripts
@@ -0,0 +1,92 @@
+Distribution Build Scripts for Windows
+======================================
+
+The scripts are used to build the binary distribution zip files for windows.
+
+File System Organisation
+------------------------
+
+
+They are relatively strict about the file system organisation. In
+general, they should work across several more than just the version of
+Emacs they come with, as the dependencies of Emacs change relatively slowly.
+
+The file system needs to be organised like so:
+
+~/emacs-build/git
+
+Contains a checkout of the Emacs git repository, organised according
+to branches, with git worktree
+
+~/emacs-build/git/emacs-$branch
+
+A branch of the git repository containing the current release
+branch. This has to be created by hand.
+
+~/emacs-build/git/emacs-$version
+
+A branch of the git repository containing the last release. The
+build-zips.sh file will create this for you.
+
+~/emacs-build/deps
+
+A location for the dependencies. This needs to contain two zip files
+with the dependencies. build-dep-zips.py will create these files for you.
+
+~/emacs-build/deps/libXpm/i686
+~/emacs-build/deps/libXpm/x86_64
+
+Contain libXpm-noX4.dll. This file is used to load images for the
+splash screen, menu items and so on. Emacs runs without it, but looks
+horrible. The x86_64 comes from msys2, while the i686 comes from
+ezwinports because it itself has no dependencies. These have to be
+placed manually (but probably never need updating).
+
+
+~/emacs-build/build/$version/i686
+~/emacs-build/build/$version/x86_64
+
+We build Emacs out-of-source here. This directory is created by
+build-zips.sh. This directory can be freely deleted after zips have
+been created
+
+
+~/emacs-build/install/$version/i686
+~/emacs-build/install/$version/x86_64
+
+We install Emacs here. This directory is created by build-zips.sh.
+This directory can and *should* be deleted after zips have been
+created.
+
+~/emacs-upload
+
+Zips are created and moved here from where they can be, well,
+uploaded.
+
+
+
+Build Process
+-------------
+
+For each major version:
+
+The dependencies files need to be created. This can be around the time
+of the pre-tests, then used for all releases of that version, to
+ensure the maximum stability.
+
+To do this:
+
+Update msys to the latest version with `pacman -Syu`.
+
+Then run build-dep-zips.py, in this directory. Three zips will be
+created, containing the 64bit and 32bit dependencies, as well as the
+source for these.
+
+For emacs release or pre-test version:
+
+Run `build-zips.sh -g` in the release branch. This will create a worktree
+with the tag of the last version.
+
+Then run `build-zips.sh` in this worktree. Eventually, four new zip
+files will be created in ~/emacs-upload from where they can be signed
+and uploaded with `gnupload`.
diff --git a/admin/nt/dist-build/README-windows-binaries b/admin/nt/dist-build/README-windows-binaries
new file mode 100644
index 00000000000..27a5483c02b
--- /dev/null
+++ b/admin/nt/dist-build/README-windows-binaries
@@ -0,0 +1,45 @@
+Windows Binaries
+================
+
+Currently, we provide four different binary packages for Emacs, which
+are:
+
+emacs-$VERSION-x86_64.zip
+
+Contains a 64-bit build of Emacs with dependencies. Mostly, this is
+the best one to install.
+
+emacs-$VERSION-x86_64-no-deps.zip
+
+Contains a 64-bit build of Emacs without any dependencies. This may be
+useful if you wish to install where the dependencies are already
+available, or if you want the small possible Emacs.
+
+emacs-$VERSION-i686.zip
+
+Contains a 32-bit build of Emacs with dependencies. This is useful for
+running on a 32-bit machine.
+
+emacs-$VERSION-i686-no-deps.zip
+
+Contains a 32-bit build of Emacs without dependencies
+
+In addition, we provide the following files which will not be useful
+for most end-users.
+
+emacs-26-x86_64-deps.zip
+
+The dependencies. Unzipping this file on top of
+emacs-$VERSION-x86_64-no-deps.zip should result in the same install as
+emacs-$VERSION-x86_64.zip.
+
+emacs-26-i686-deps.zip
+
+The 32-bit version of the dependencies.
+
+emacs-26-deps-mingw-w64-src.zip
+
+The source for the dependencies. Source for Emacs itself is available
+in the main distribution tarball. These dependencies were produced
+from an updated msys2 at the point of the first pre-test. It is not
+intended that these will be updated after that point.
\ No newline at end of file
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
new file mode 100755
index 00000000000..33bc4b586c9
--- /dev/null
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -0,0 +1,223 @@
+#!/usr/bin/python3
+
+## 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 <https://www.gnu.org/licenses/>.
+import argparse
+import multiprocessing as mp
+import glob
+import os
+import shutil
+import re
+
+from subprocess import check_output
+
+## Constants
+EMACS_MAJOR_VERSION="26"
+
+
+## Options
+DRY_RUN=False
+
+## Packages to fiddle with
+SKIP_PKGS=["mingw-w64-gcc-libs"]
+MUNGE_PKGS ={"mingw-w64-libwinpthread-git":"mingw-w64-winpthreads-git"}
+ARCH_PKGS=["mingw-w64-mpc",
+           "mingw-w64-termcap",
+           "mingw-w64-xpm-nox"]
+SRC_REPO="https://sourceforge.net/projects/msys2/files/REPOS/MINGW/Sources"
+
+
+def check_output_maybe(*args,**kwargs):
+    if(DRY_RUN):
+        print("Calling: {}{}".format(args,kwargs))
+    else:
+        return check_output(*args,**kwargs)
+
+def extract_deps():
+
+    # This list derives from the features we want Emacs to compile with.
+    PKG_REQ='''mingw-w64-x86_64-giflib
+mingw-w64-x86_64-gnutls
+mingw-w64-x86_64-libjpeg-turbo
+mingw-w64-x86_64-libpng
+mingw-w64-x86_64-librsvg
+mingw-w64-x86_64-libtiff
+mingw-w64-x86_64-libxml2
+mingw-w64-x86_64-xpm-nox
+mingw-w64-x86_64-lcms2'''.split()
+
+    # Get a list of all dependencies needed for packages mentioned above.
+    # Run `pactree -lu' for each elment of $PKG_REQ
+    pkgs = set()
+    for x in PKG_REQ:
+        pkgs.update(
+            check_output(["pactree", "-lu", x]).decode("utf-8").split()
+        )
+
+    return sorted(pkgs)
+
+def gather_deps(deps, arch, directory):
+
+    os.mkdir(arch)
+    os.chdir(arch)
+
+    ## Replace the architecture with the correct one
+    deps = [re.sub(r"x86_64",arch,x) for x in deps]
+
+    ## find all files the transitive dependencies
+    deps_files = check_output(
+        ["pacman", "-Ql"] + deps
+    ).decode("utf-8").split("\n")
+
+    ## Produces output like
+    ## mingw-w64-x86_64-zlib /mingw64/lib/libminizip.a
+
+    ## drop the package name
+    tmp = deps_files.copy()
+    deps_files=[]
+    for d in tmp:
+        slt = d.split()
+        if(not slt==[]):
+            deps_files.append(slt[1])
+
+    ## sort uniq
+    deps_files = sorted(list(set(deps_files)))
+    ## copy all files into local
+    print("Copying dependencies: {}".format(arch))
+    check_output_maybe(["rsync", "-R"] + deps_files + ["."])
+
+    ## And package them up
+    os.chdir(directory)
+    print("Zipping: {}".format(arch))
+    check_output_maybe("zip -9r ../../emacs-26-{}-deps.zip *".format(arch),
+                       shell=True)
+    os.chdir("../../")
+
+
+def download_source(tarball):
+    print("Downloading {}...".format(tarball))
+    check_output_maybe(
+        "wget -a ../download.log -O {} {}/{}/download"
+        .format(tarball, SRC_REPO, tarball),
+        shell=True
+    )
+    print("Downloading {}... done".format(tarball))
+
+def gather_source(deps):
+
+
+    ## Source for gcc-libs is part of gcc
+    ## Source for libwinpthread is in libwinpthreads
+    ## mpc, termcap, xpm -- has x86_64, and i686 versions
+
+    ## This needs to have been run first at the same time as the
+    ## system was udpated.
+    os.mkdir("emacs-src")
+    os.chdir("emacs-src")
+
+    to_download = []
+    for pkg in deps:
+        pkg_name_and_version= \
+            check_output(["pacman","-Q", pkg]).decode("utf-8").strip()
+
+        ## Produces output like:
+        ## mingw-w64-x86_64-zlib 2.43.2
+        pkg_name_components = pkg_name_and_version.split()
+        pkg_name=pkg_name_components[0]
+        pkg_version=pkg_name_components[1]
+
+        ## make a simple name to make lookup easier
+        simple_pkg_name = re.sub(r"x86_64-","",pkg_name)
+
+        if(simple_pkg_name in SKIP_PKGS):
+            continue
+
+        ## Some packages have different source files for different
+        ## architectures. For these we need two downloads.
+        if(simple_pkg_name in ARCH_PKGS):
+            downloads = [pkg_name,
+                         re.sub(r"x86_64","i686",pkg_name)]
+        else:
+            downloads = [simple_pkg_name]
+
+        for d in downloads:
+            ## Switch names if necessary
+            d = MUNGE_PKGS.get(d,d)
+
+            tarball = "{}-{}.src.tar.gz".format(d,pkg_version)
+
+            to_download.append(tarball)
+
+    ## Download in parallel or it is just too slow
+    p = mp.Pool(16)
+    p.map(download_source,to_download)
+
+    print("Zipping")
+    check_output_maybe("zip -9 ../emacs-{}-deps-mingw-w64-src.zip *"
+                       .format(EMACS_MAJOR_VERSION),
+                       shell=True)
+
+    os.chdir("..")
+
+
+def clean():
+    print("Cleaning")
+    os.path.isdir("emacs-src") and shutil.rmtree("emacs-src")
+    os.path.isdir("i686") and shutil.rmtree("i686")
+    os.path.isdir("x86_64") and shutil.rmtree("x86_64")
+    os.path.isfile("download.log") and os.remove("download.log")
+
+
+if(os.environ["MSYSTEM"] != "MSYS"):
+    print("Run this script in an MSYS-shell!")
+    exit(1)
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-t", help="32 bit deps only",
+                    action="store_true")
+
+parser.add_argument("-f", help="64 bit deps only",
+                    action="store_true")
+
+parser.add_argument("-s", help="source code only",
+                    action="store_true")
+
+parser.add_argument("-c", help="clean only",
+                    action="store_true")
+
+parser.add_argument("-d", help="dry run",
+                    action="store_true")
+
+args = parser.parse_args()
+do_all=not (args.c or args.s or args.f or args.t)
+
+deps=extract_deps()
+
+DRY_RUN=args.d
+
+if( do_all or args.t ):
+    gather_deps(deps,"i686","mingw32")
+
+if( do_all or args.f ):
+    gather_deps(deps,"x86_64","mingw64")
+
+if( do_all or args.s ):
+    gather_source(deps)
+
+if( args.c ):
+    clean()
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
new file mode 100755
index 00000000000..fb44c31c70d
--- /dev/null
+++ b/admin/nt/dist-build/build-zips.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+## 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 <https://www.gnu.org/licenses/>.
+
+
+function git_up {
+    echo Making git worktree for Emacs $VERSION
+    cd $HOME/emacs-build/git/emacs-$MAJOR_VERSION
+    git pull
+    git worktree add ../emacs-$BRANCH emacs-$BRANCH
+
+    cd ../emacs-$BRANCH
+    ./autogen.sh
+
+}
+
+function build_zip {
+
+    ARCH=$1
+    PKG=$2
+    HOST=$3
+
+    echo Building Emacs-$VERSION for $ARCH
+    if [ $ARCH == "i686" ]
+    then
+        PATH=/mingw32/bin:$PATH
+        MSYSTEM=MINGW32
+    fi
+
+    mkdir --parents $HOME/emacs-build/build/emacs-$VERSION/$ARCH
+    cd $HOME/emacs-build/build/emacs-$VERSION/$ARCH
+
+    export PKG_CONFIG_PATH=$PKG
+    ../../../git/emacs-$BRANCH/configure \
+        --without-dbus \
+        --host=$HOST --without-compress-install \
+        CFLAGS="-O2 -static -g3"
+    make -j 8 install \
+         prefix=$HOME/emacs-build/install/emacs-$VERSION/$ARCH
+    cd $HOME/emacs-build/install/emacs-$VERSION/$ARCH
+    cp $HOME/emacs-build/deps/libXpm/$ARCH/libXpm-noX4.dll bin
+    zip -r -9 emacs-$VERSION-$ARCH-no-deps.zip *
+    mv emacs-$VERSION-$ARCH-no-deps.zip $HOME/emacs-upload
+    rm bin/libXpm-noX4.dll
+    unzip $HOME/emacs-build/deps/emacs-26-$ARCH-deps.zip
+    zip -r -9 emacs-$VERSION-$ARCH.zip *
+    mv emacs-$VERSION-$ARCH.zip ~/emacs-upload
+}
+
+
+##set -o xtrace
+set -o errexit
+
+SNAPSHOT=
+
+BUILD_32=1
+BUILD_64=1
+GIT_UP=0
+
+while getopts "36ghsV:" opt; do
+  case $opt in
+    3)
+        BUILD_32=1
+        BUILD_64=0
+        GIT_UP=0
+        ;;
+    6)
+        BUILD_32=0
+        BUILD_64=1
+        GIT_UP=0
+        ;;
+
+    g)
+        BUILD_32=0
+        BUILD_64=0
+        GIT_UP=1
+        ;;
+    V)
+        VERSION=$OPTARG
+        ;;
+    s)
+        SNAPSHOT="-snapshot"
+        ;;
+    h)
+        echo "build-zips.sh"
+        echo "  -3 32 bit build only"
+        echo "  -6 64 bit build only"
+        echo "  -g git update and worktree only"
+        exit 0
+        ;;
+    \?)
+        echo "Invalid option: -$OPTARG" >&2
+        ;;
+  esac
+done
+
+if [ -z $VERSION ];
+then
+    echo "doing version thing"
+    VERSION=`
+  sed -n 's/^AC_INIT(GNU Emacs,[         ]*\([^  ,)]*\).*/\1/p' < ../../../configure.ac
+`
+fi
+
+if [ -z $VERSION ];
+then
+    echo Cannot determine Emacs version
+    exit 1
+fi
+
+MAJOR_VERSION="$(echo $VERSION | cut -d'.' -f1)"
+BRANCH=$VERSION
+VERSION=$VERSION$SNAPSHOT
+
+if (($GIT_UP))
+then
+    git_up
+fi
+
+if (($BUILD_64))
+then
+    build_zip x86_64 /mingw64/lib/pkgconfig x86_64-w64-mingw32
+fi
+
+## Do the 64 bit build first, because we reset some environment
+## variables during the 32 bit which will break the build.
+if (($BUILD_32))
+then
+    build_zip i686 /mingw32/lib/pkgconfig i686-w64-mingw32
+fi