diff -Nru emacs-26.1+1/admin/admin.el emacs-26.3+1/admin/admin.el --- emacs-26.1+1/admin/admin.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/admin.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; admin.el --- utilities for Emacs administration -;; Copyright (C) 2001-2018 Free Software Foundation, Inc. +;; Copyright (C) 2001-2019 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -138,7 +138,10 @@ (if (eq 2 (length newversion)) 0 1)))) (majorbump (and oldversion (not (equal oldmajor newmajor)))) (minorbump (and oldversion (not majorbump) - (not (equal (cadr oldversion) (cadr newversion))))) + (or (not (equal (cadr oldversion) (cadr newversion))) + ;; Eg 26.2 -> 26.2.50. + (and (> (length newversion) + (length oldversion)))))) (newsfile (expand-file-name "etc/NEWS" root)) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (unless (> (length newversion) 2) ; pretest or release candidate? @@ -261,8 +264,12 @@ ROOT should be the root of an Emacs source tree. Interactively with a prefix argument, prompt for TYPE. Optional argument TYPE is type of output (nil means all)." - (interactive (let ((root (read-directory-name "Emacs root directory: " - source-directory nil t))) + (interactive (let ((root + (if noninteractive + (or (pop command-line-args-left) + default-directory) + (read-directory-name "Emacs root directory: " + source-directory nil t)))) (list root (if current-prefix-arg (completing-read @@ -348,13 +355,22 @@ (manual-html-mono texi (expand-file-name (concat name ".html") html-mono-dir)))) +(defvar manual-makeinfo (or (getenv "MAKEINFO") "makeinfo") + "The `makeinfo' program to use.") + +(defvar manual-texi2pdf (or (getenv "TEXI2PDF") "texi2pdf") + "The `texi2pdf' program to use.") + +(defvar manual-texi2dvi (or (getenv "TEXI2DVI") "texi2dvi") + "The `texi2dvi' program to use.") + (defun manual-html-mono (texi-file dest) "Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST. This function also edits the HTML files so that they validate as HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using the @import directive." (make-directory (or (file-name-directory dest) ".") t) - (call-process "makeinfo" nil nil nil + (call-process manual-makeinfo nil nil nil "-D" "WWW_GNU_ORG" "-I" (expand-file-name "../emacs" (file-name-directory texi-file)) @@ -382,7 +398,7 @@ (unless (file-exists-p texi-file) (user-error "Manual file %s not found" texi-file)) (make-directory dir t) - (call-process "makeinfo" nil nil nil + (call-process manual-makeinfo nil nil nil "-D" "WWW_GNU_ORG" "-I" (expand-file-name "../emacs" (file-name-directory texi-file)) @@ -421,7 +437,7 @@ "Run texi2pdf on TEXI-FILE, emitting PDF output to DEST." (make-directory (or (file-name-directory dest) ".") t) (let ((default-directory (file-name-directory texi-file))) - (call-process "texi2pdf" nil nil nil + (call-process manual-texi2pdf nil nil nil "-I" "../emacs" "-I" "../misc" texi-file "-o" dest))) @@ -431,7 +447,7 @@ (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi")) (default-directory (file-name-directory texi-file))) ;; FIXME: Use `texi2dvi --ps'? --xfq - (call-process "texi2dvi" nil nil nil + (call-process manual-texi2dvi nil nil nil "-I" "../emacs" "-I" "../misc" texi-file "-o" dvi-dest) (call-process "dvips" nil nil nil dvi-dest "-o" dest) @@ -683,6 +699,7 @@ (if (file-directory-p stem) (delete-directory stem t)) (make-directory stem) + (setq stem (file-name-as-directory stem)) (copy-file "../doc/misc/texinfo.tex" stem) (unless (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem) @@ -705,7 +722,7 @@ (setq ats t) (message "Unexpanded: %s" (match-string 0))) (if ats (error "Unexpanded configure variables in Makefile?"))) - (write-region nil nil (expand-file-name (format "%s/Makefile" stem)) + (write-region nil nil (expand-file-name (format "%sMakefile" stem)) nil 'silent)) (call-process "tar" nil nil nil "-cf" tarfile stem) (delete-directory stem t) @@ -717,8 +734,12 @@ ROOT should be the root of an Emacs source tree. Interactively with a prefix argument, prompt for TYPE. Optional argument TYPE is type of output (nil means all)." - (interactive (let ((root (read-directory-name "Emacs root directory: " - source-directory nil t))) + (interactive (let ((root + (if noninteractive + (or (pop command-line-args-left) + default-directory) + (read-directory-name "Emacs root directory: " + source-directory nil t)))) (list root (if current-prefix-arg (completing-read diff -Nru emacs-26.1+1/admin/alloc-colors.c emacs-26.3+1/admin/alloc-colors.c --- emacs-26.1+1/admin/alloc-colors.c 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/alloc-colors.c 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ /* Allocate X colors. Used for testing with dense colormaps. -Copyright (C) 2001-2018 Free Software Foundation, Inc. +Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/authors.el emacs-26.3+1/admin/authors.el --- emacs-26.1+1/admin/authors.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/authors.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,7 +1,7 @@ ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -;; Copyright (C) 2000-2018 Free Software Foundation, Inc. +;; Copyright (C) 2000-2019 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Maintainer: emacs-devel@gnu.org diff -Nru emacs-26.1+1/admin/build-configs emacs-26.3+1/admin/build-configs --- emacs-26.1+1/admin/build-configs 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/build-configs 2019-09-10 00:32:49.000000000 +0000 @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2019 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/bzrmerge.el emacs-26.3+1/admin/bzrmerge.el --- emacs-26.1+1/admin/bzrmerge.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/bzrmerge.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; bzrmerge.el --- help merge one Emacs bzr branch to another -;; Copyright (C) 2010-2018 Free Software Foundation, Inc. +;; Copyright (C) 2010-2019 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: maint diff -Nru emacs-26.1+1/admin/ChangeLog.1 emacs-26.3+1/admin/ChangeLog.1 --- emacs-26.1+1/admin/ChangeLog.1 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/ChangeLog.1 2019-09-10 00:32:49.000000000 +0000 @@ -2577,7 +2577,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/charsets/Makefile.in emacs-26.3+1/admin/charsets/Makefile.in --- emacs-26.1+1/admin/charsets/Makefile.in 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/charsets/Makefile.in 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2015-2018 Free Software Foundation, Inc. +# Copyright (C) 2015-2019 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff -Nru emacs-26.1+1/admin/charsets/mapconv emacs-26.3+1/admin/charsets/mapconv --- emacs-26.1+1/admin/charsets/mapconv 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/charsets/mapconv 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2015-2018 Free Software Foundation, Inc. +# Copyright (C) 2015-2019 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff -Nru emacs-26.1+1/admin/charsets/mapfiles/README emacs-26.3+1/admin/charsets/mapfiles/README --- emacs-26.1+1/admin/charsets/mapfiles/README 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/charsets/mapfiles/README 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2009-2018 Free Software Foundation, Inc. +Copyright (C) 2009-2019 Free Software Foundation, Inc. Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff -Nru emacs-26.1+1/admin/cus-test.el emacs-26.3+1/admin/cus-test.el --- emacs-26.1+1/admin/cus-test.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/cus-test.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002-2018 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002-2019 Free Software Foundation, Inc. ;; Author: Markus Rost ;; Maintainer: Markus Rost diff -Nru emacs-26.1+1/admin/diff-tar-files emacs-26.3+1/admin/diff-tar-files --- emacs-26.1+1/admin/diff-tar-files 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/diff-tar-files 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2019 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/find-gc.el emacs-26.3+1/admin/find-gc.el --- emacs-26.1+1/admin/find-gc.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/find-gc.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff -Nru emacs-26.1+1/admin/gitmerge.el emacs-26.3+1/admin/gitmerge.el --- emacs-26.1+1/admin/gitmerge.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/gitmerge.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; gitmerge.el --- help merge one Emacs branch into another -;; Copyright (C) 2010-2018 Free Software Foundation, Inc. +;; Copyright (C) 2010-2019 Free Software Foundation, Inc. ;; Authors: David Engster ;; Stefan Monnier diff -Nru emacs-26.1+1/admin/grammars/c.by emacs-26.3+1/admin/grammars/c.by --- emacs-26.1+1/admin/grammars/c.by 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/c.by 2019-09-10 00:32:49.000000000 +0000 @@ -1,5 +1,5 @@ ;;; c.by -- LL grammar for C/C++ language specification -;; Copyright (C) 1999-2018 Free Software Foundation, Inc. +;; Copyright (C) 1999-2019 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff -Nru emacs-26.1+1/admin/grammars/grammar.wy emacs-26.3+1/admin/grammars/grammar.wy --- emacs-26.1+1/admin/grammars/grammar.wy 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/grammar.wy 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars ;; -;; Copyright (C) 2002-2018 Free Software Foundation, Inc. +;; Copyright (C) 2002-2019 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff -Nru emacs-26.1+1/admin/grammars/java-tags.wy emacs-26.3+1/admin/grammars/java-tags.wy --- emacs-26.1+1/admin/grammars/java-tags.wy 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/java-tags.wy 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; java-tags.wy -- Semantic LALR grammar for Java -;; Copyright (C) 2002-2018 Free Software Foundation, Inc. +;; Copyright (C) 2002-2019 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff -Nru emacs-26.1+1/admin/grammars/js.wy emacs-26.3+1/admin/grammars/js.wy --- emacs-26.1+1/admin/grammars/js.wy 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/js.wy 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript -;; Copyright (C) 2005-2018 Free Software Foundation, Inc. +;; Copyright (C) 2005-2019 Free Software Foundation, Inc. ;; Copyright (C) 1998-2011 Ecma International. ;; Author: Joakim Verona diff -Nru emacs-26.1+1/admin/grammars/make.by emacs-26.3+1/admin/grammars/make.by --- emacs-26.1+1/admin/grammars/make.by 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/make.by 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2018 Free Software Foundation, Inc. +;; Copyright (C) 1999-2019 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff -Nru emacs-26.1+1/admin/grammars/Makefile.in emacs-26.3+1/admin/grammars/Makefile.in --- emacs-26.1+1/admin/grammars/Makefile.in 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/Makefile.in 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2013-2018 Free Software Foundation, Inc. +## Copyright (C) 2013-2019 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/grammars/python.wy emacs-26.3+1/admin/grammars/python.wy --- emacs-26.1+1/admin/grammars/python.wy 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/python.wy 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2018 Free Software Foundation, Inc. +;; Copyright (C) 2002-2019 Free Software Foundation, Inc. ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, ;; 2009, 2010 Python Software Foundation; All Rights Reserved diff -Nru emacs-26.1+1/admin/grammars/scheme.by emacs-26.3+1/admin/grammars/scheme.by --- emacs-26.1+1/admin/grammars/scheme.by 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/scheme.by 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2018 Free Software Foundation, Inc. +;; Copyright (C) 2001-2019 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/grammars/srecode-template.wy emacs-26.3+1/admin/grammars/srecode-template.wy --- emacs-26.1+1/admin/grammars/srecode-template.wy 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/grammars/srecode-template.wy 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; srecode-template.wy --- Semantic Recoder Template parser -;; Copyright (C) 2005-2018 Free Software Foundation, Inc. +;; Copyright (C) 2005-2019 Free Software Foundation, Inc. ;; Author: Eric Ludlam ;; Keywords: syntax diff -Nru emacs-26.1+1/admin/last-chance.el emacs-26.3+1/admin/last-chance.el --- emacs-26.1+1/admin/last-chance.el 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/last-chance.el 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ ;;; last-chance.el --- dangling deterrence -*- lexical-binding: t; -*- -;; Copyright (C) 2016-2018 Free Software Foundation, Inc. +;; Copyright (C) 2016-2019 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen ;; Maintainer: emacs-devel@gnu.org diff -Nru emacs-26.1+1/admin/MAINTAINERS emacs-26.3+1/admin/MAINTAINERS --- emacs-26.1+1/admin/MAINTAINERS 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/MAINTAINERS 2019-09-10 00:32:49.000000000 +0000 @@ -61,7 +61,7 @@ lisp/net/tramp*.el lisp/url/url-tramp.el doc/misc/tramp*.texi - test/lisp/net/tramp-tests.el + test/lisp/net/tramp*-tests.el test/lisp/url/url-tramp-tests.el D-Bus @@ -211,10 +211,20 @@ src/inotify.c lisp/autorevert.el lisp/eshell/em-tramp.el + lisp/files.el (file-name-non-special) + lisp/net/ange-ftp.el lisp/notifications.el + lisp/shadowfile.el test/lisp/autorevert-tests.el + test/lisp/files-tests.el (file-name-non-special) + test/lisp/shadowfile-tests.el test/src/inotify-test.el + Secret Service API in + lisp/auth-source.el + doc/misc/auth.texi + test/lisp/auth-source-tests.el + Nicolas Petton lisp/emacs-lisp/subr-x.el lisp/arc-mode.el diff -Nru emacs-26.1+1/admin/make-emacs emacs-26.3+1/admin/make-emacs --- emacs-26.1+1/admin/make-emacs 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/make-emacs 2019-09-10 00:32:49.000000000 +0000 @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2019 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/make-manuals emacs-26.3+1/admin/make-manuals --- emacs-26.1+1/admin/make-manuals 1970-01-01 00:00:00.000000000 +0000 +++ emacs-26.3+1/admin/make-manuals 2019-09-10 00:32:49.000000000 +0000 @@ -0,0 +1,214 @@ +#!/bin/bash +### make-manuals - create the Emacs manuals to upload to the gnu.org website + +## Copyright 2018-2019 Free Software Foundation, Inc. + +## Author: Glenn Morris + +## 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 . + +### Commentary: + +## This is a helper script to create the Emacs manuals as used on the +## gnu.org website. After this, use upload-manuals to upload them. +## +## Usage: +## Call from the top-level directory of an Emacs source tree. +## This should normally be a release. +## The info files should exist. + +### Code: + +die () # write error to stderr and exit +{ + [ $# -gt 0 ] && echo "$PN: $@" >&2 + exit 1 +} + +PN=${0##*/} # basename of script + +usage () +{ + cat 1>&2 <= 1.28 so that the tarballs are more reproducible. +## (Personally I think this is way OOT. I'm not even sure if anyone +## uses these tarfiles, let alone cares whether they are reproducible.) +tar --help | grep -- '--sort.*name' >& /dev/null && tar="$tar --sort=name" + +while getopts ":hce:" option ; do + case $option in + (h) usage ;; + + (c) continue=t ;; + + (e) emacs=$OPTARG ;; + + (\?) die "Bad option -$OPTARG" ;; + + (:) die "Option -$OPTARG requires an argument" ;; + + (*) die "getopts error" ;; + esac +done +shift $(( --OPTIND )) +OPTIND=1 + +[ $# -eq 0 ] || usage + + +[ -e admin/admin.el ] || die "admin/admin.el not found" + + +tempfile=/tmp/$PN.$$ +trap "rm -f $tempfile 2> /dev/null" EXIT + + +[ "$continue" ] || rm -rf $outdir + +if [ -e $outdir ]; then + ## Speed up repeat invocation. + echo "Re-using existing $outdir/ directory" + +else + + ## This creates the manuals in a manual/ directory. + ## Note makeinfo >= 5 is much slower than makeinfo 4. + echo "Making manuals (slow)..." + $emacs --batch -Q -l admin/admin.el -f make-manuals \ + >| $tempfile 2>&1 || { + cat $tempfile 1>&2 + + die "error running make-manuals" + } +fi + +find $outdir -name '*~' -exec rm {} + + + +echo "Adding compressed html files..." +for f in emacs elisp; do + $tar -C $outdir/html_node -cf - $f | $gzip \ + > $outdir/$f.html_node.tar.gz || die "error for $f" +done + + +echo "Making manual tarfiles..." +$emacs --batch -Q -l admin/admin.el -f make-manuals-dist \ + >| $tempfile || { + + cat $tempfile 1>&2 + + die "error running make-manuals-dist" +} + +o=$outdir/texi +mkdir -p $o + +for f in $outdir/*.tar; do + of=${f##*/} + of=${of#emacs-} + of=${of%%-[0-9]*}.texi.tar + of=${of/lispintro/eintr} + of=${of/lispref/elisp} + of=${of/manual/emacs} + of=$o/$of + mv $f $of + $gzip $of || die "error compressing $f" +done + + +echo "Making refcards..." +make -C etc/refcards dist >| $tempfile 2>&1 || { + cat $tempfile 1>&2 + die "failed make dist" +} + +## This may hang if eg german.sty is missing. +make -k -C etc/refcards pdf >| $tempfile 2>&1 || { + cat $tempfile 1>&2 + echo "Warning: ignored failure(s) from make pdf" +} + +## Newer Texlive only provide mex (used by pl refcards) for pdf, AFAICS. +make -k -C etc/refcards ps >| $tempfile 2>&1 || { + cat $tempfile 1>&2 + echo "Warning: ignored failure(s) from make ps" +} + +## Note that in the website, refcards/ is not a subdirectory of manual/. +refdir=$outdir/refcards + +mkdir -p $refdir + +mv etc/refcards/emacs-refcards.tar $refdir +$gzip $refdir/emacs-refcards.tar + +for fmt in pdf ps; do + + o=$refdir/$fmt + + mkdir -p $o + + [ $fmt = pdf ] && { + cp etc/refcards/*.$fmt $o + rm $o/gnus-logo.pdf + continue + } + + for f in etc/refcards/*.$fmt; do + $gzip < $f > $o/${f##*/}.gz + done +done + +make -C etc/refcards extraclean > /dev/null + + +echo "Adding compressed info files..." + +o=$outdir/info +mkdir -p $o + +for f in eintr.info elisp.info emacs.info; do + + $gzip < info/$f > $o/$f.gz || die "error for $f" +done + + +echo "Finished OK, you might want to run upload-manuals now" + + +exit 0 diff -Nru emacs-26.1+1/admin/make-tarball.txt emacs-26.3+1/admin/make-tarball.txt --- emacs-26.1+1/admin/make-tarball.txt 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/make-tarball.txt 2019-09-10 00:32:49.000000000 +0000 @@ -203,22 +203,8 @@ page. Uncomment and the release banner in emacs.html. Keep it on the page for about a month, then comment it again. -Use M-x make-manuals from admin/admin.el to regenerate the html -manuals in manual/. If there are new manuals, add appropriate index -pages in manual/ and add them to manual/index.html. In the -manual/html_node directory, delete any old manual pages that are no -longer present. - -Tar up the generated html_node/emacs/ and elisp/ directories and update -the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz. - -Use M-x make-manuals-dist from admin/admin.el to update the -manual/texi/ tarfiles. - -Add compressed copies of the main info pages from the tarfile to manual/info/. - -Update the refcards/pdf/ and ps/ directories, and also -refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist). +Regenerate the various manuals in manual/. +The scripts admin/make-manuals and admin/upload-manuals summarize the process. Browsing is one way to check for any files that still need updating. diff -Nru emacs-26.1+1/admin/merge-gnulib emacs-26.3+1/admin/merge-gnulib --- emacs-26.1+1/admin/merge-gnulib 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/merge-gnulib 2019-09-10 00:32:49.000000000 +0000 @@ -4,7 +4,7 @@ # # admin/merge-gnulib -# Copyright 2012-2018 Free Software Foundation, Inc. +# Copyright 2012-2019 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -33,7 +33,7 @@ d-type diffseq dtoastr dtotimespec dup2 environ execinfo explicit_bzero faccessat fcntl fcntl-h fdatasync fdopendir - filemode filevercmp flexmember fstatat fsync + filemode filevercmp flexmember fpieee fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog ignore-value intprops largefile lstat manywarnings memrchr minmax mkostemp mktime nstrftime diff -Nru emacs-26.1+1/admin/merge-pkg-config emacs-26.3+1/admin/merge-pkg-config --- emacs-26.1+1/admin/merge-pkg-config 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/merge-pkg-config 2019-09-10 00:32:49.000000000 +0000 @@ -4,7 +4,7 @@ # # admin/merge-pkg-config -# Copyright 2014-2018 Free Software Foundation, Inc. +# Copyright 2014-2019 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/notes/bugtracker emacs-26.3+1/admin/notes/bugtracker --- emacs-26.1+1/admin/notes/bugtracker 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/bugtracker 2019-09-10 00:32:49.000000000 +0000 @@ -241,21 +241,29 @@ if you just send them to the bug-report number). Bcc: is better than Cc: in case people use Reply-to-All in response. +For the full documentation of control commands, see +https://debbugs.gnu.org/server-control.html + Some useful control commands: +*** To close a bug and indicate in what Emacs version it was fixed +close 123 VERSION + +where VERSION is XX.YY numerical version number, like 42.1. + *** To reopen a closed bug: reopen 123 *** Bugs can be tagged in various ways (eg wontfix, patch, etc). The available tags are: -patch wontfix moreinfo unreproducible fixed notabug +patch wontfix moreinfo unreproducible fixed notabug security confirmed See https://debbugs.gnu.org/Developer#tags The list of tags can be prefixed with +, - or =, meaning to add (the default), remove, or reset the tags. E.g.: tags 123 + wontfix -** URL shortcuts +*** URL shortcuts https://debbugs.gnu.org/... @@ -266,7 +274,7 @@ severity:severity # all bugs of given severity tag:tag # all bugs with given tag -** Usertags +*** Usertags See @@ -410,21 +418,21 @@ Note that reassigning clears the list of found versions, even if the new packages includes the original one. -** To remove spam from the tracker, move it to the 'spam' pseudo-package: +*** To remove spam from the tracker, move it to the 'spam' pseudo-package: reassign 123 spam (Should not be necessary any more, now that the input is moderated.) -** To change the title of a bug: +*** To change the title of a bug: retitle 123 Some New Title -** To change the submitter address: +*** To change the submitter address: submitter 123 none@example.com Note that it does not seem to work to specify "Submitter:" in the pseudo-header when first reporting a bug. -** How does archiving work? +*** How does archiving work? You can still send mail to a bug after it is closed. After 28 days with no activity, the bug is archived, at which point no more changes can be made. If you try to send mail to the bug after that (or merge with diff -Nru emacs-26.1+1/admin/notes/copyright emacs-26.3+1/admin/notes/copyright --- emacs-26.1+1/admin/notes/copyright 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/copyright 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2007-2018 Free Software Foundation, Inc. +Copyright (C) 2007-2019 Free Software Foundation, Inc. See the end of the file for license conditions. diff -Nru emacs-26.1+1/admin/notes/emba emacs-26.3+1/admin/notes/emba --- emacs-26.1+1/admin/notes/emba 1970-01-01 00:00:00.000000000 +0000 +++ emacs-26.3+1/admin/notes/emba 2019-09-10 00:32:49.000000000 +0000 @@ -0,0 +1,64 @@ +-*- mode: outline; coding: utf-8 -*- + +Copyright (C) 2019 Free Software Foundation, Inc. +See the end of the file for license conditions. + +NOTES FOR EMACS CONTINUOUS BUILD ON EMBA + +A continuous build for Emacs can be found at +, a Gitlab instance. It watches the +Emacs git repository and starts a pipeline (jobset) if there are new +changes. This happens for all Emacs branches. + +* Mail notifications + +In addition to the web interface, emba can send notifications by email +when a job fails. It sends notifications about test status to +. + +If you want to receive these notifications, please subscribe at +. + +Alternatively, these notifications can be read via gmane at +. + +The messages contain a URL to the log file of the failed job, like +. + +* Emacs jobset + +The Emacs jobset is defined in the Emacs source tree, file +'.gitlab-ci.yml'. It could be adapted for every Emacs branch, see +. + +Every job runs in a Debian docker container. It uses the local clone +of the Emacs git repository to perform a bootstrap and test of Emacs. +This could happen for several jobs with changed configuration, compile +and test parameters. + +* Emba configuration + +The emba configuration files are hosted on +. + +* Identifying emba + +Lisp packages, Makefiles, scripts, and other software could determine +whether they run on emba by checking for the environment variable +EMACS_EMBA_CI. + + +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 . diff -Nru emacs-26.1+1/admin/notes/font-backend emacs-26.3+1/admin/notes/font-backend --- emacs-26.1+1/admin/notes/font-backend 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/font-backend 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2002-2018 Free Software Foundation, Inc. +Copyright (C) 2002-2019 Free Software Foundation, Inc. See the end of the file for license conditions. diff -Nru emacs-26.1+1/admin/notes/hydra emacs-26.3+1/admin/notes/hydra --- emacs-26.1+1/admin/notes/hydra 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/hydra 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2013-2018 Free Software Foundation, Inc. +Copyright (C) 2013-2019 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA diff -Nru emacs-26.1+1/admin/notes/multi-tty emacs-26.3+1/admin/notes/multi-tty --- emacs-26.1+1/admin/notes/multi-tty 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/multi-tty 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007-2018 Free Software Foundation, Inc. +Copyright (C) 2007-2019 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. @@ -305,7 +305,7 @@ multidisplay (and don't mind core dumps), you can edit src/config.h and define HAVE_GTK_MULTIDISPLAY there by hand. - http://bugzilla.gnome.org/show_bug.cgi?id=85715 + https://gitlab.gnome.org/GNOME/gtk/issues/221 Update: Han reports that GTK+ version 2.8.9 almost gets display disconnects right. GTK will probably be fully fixed by the time diff -Nru emacs-26.1+1/admin/notes/unicode emacs-26.3+1/admin/notes/unicode --- emacs-26.1+1/admin/notes/unicode 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/unicode 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -*-mode: text; coding: utf-8;-*- -Copyright (C) 2002-2018 Free Software Foundation, Inc. +Copyright (C) 2002-2019 Free Software Foundation, Inc. See the end of the file for license conditions. Importing a new Unicode Standard version into Emacs @@ -46,9 +46,12 @@ script-representative-chars defined in fontset.el, and also the list of OTF script tags in otf-script-alist, whose source is on this page: - https://www.microsoft.com/typography/otspec/scripttags.htm + https://docs.microsoft.com/en-us/typography/opentype/spec/scripttags Other databases in fontset.el might also need to be updated as needed. +One notable place to check is the function setup-default-fontset, +where new scripts will generally need some addition, most probably to +the list of "simple" scripts (search for "Simple"). The function 'ucs-names', defined in lisp/international/mule-cmds.el, might need to be updated because it knows about used and unused ranges diff -Nru emacs-26.1+1/admin/notes/www emacs-26.3+1/admin/notes/www --- emacs-26.1+1/admin/notes/www 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/notes/www 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -*- outline -*- -Copyright (C) 2013-2018 Free Software Foundation, Inc. +Copyright (C) 2013-2019 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS WWW PAGES diff -Nru emacs-26.1+1/admin/nt/dist-build/build-dep-zips.py emacs-26.3+1/admin/nt/dist-build/build-dep-zips.py --- emacs-26.1+1/admin/nt/dist-build/build-dep-zips.py 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/nt/dist-build/build-dep-zips.py 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/python3 -## Copyright (C) 2017-2018 Free Software Foundation, Inc. +## Copyright (C) 2017-2019 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/nt/dist-build/build-zips.sh emacs-26.3+1/admin/nt/dist-build/build-zips.sh --- emacs-26.1+1/admin/nt/dist-build/build-zips.sh 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/nt/dist-build/build-zips.sh 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash -## Copyright (C) 2017-2018 Free Software Foundation, Inc. +## Copyright (C) 2017-2019 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff -Nru emacs-26.1+1/admin/nt/README-ftp-server emacs-26.3+1/admin/nt/README-ftp-server --- emacs-26.1+1/admin/nt/README-ftp-server 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/nt/README-ftp-server 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2018 Free Software Foundation, Inc. +Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. Precompiled Distributions of diff -Nru emacs-26.1+1/admin/nt/README-UNDUMP.W32 emacs-26.3+1/admin/nt/README-UNDUMP.W32 --- emacs-26.1+1/admin/nt/README-UNDUMP.W32 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/nt/README-UNDUMP.W32 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2018 Free Software Foundation, Inc. +Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs for Windows diff -Nru emacs-26.1+1/admin/quick-install-emacs emacs-26.3+1/admin/quick-install-emacs --- emacs-26.1+1/admin/quick-install-emacs 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/quick-install-emacs 2019-09-10 00:32:49.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2019 Free Software Foundation, Inc. ## Author: Miles Bader diff -Nru emacs-26.1+1/admin/README emacs-26.3+1/admin/README --- emacs-26.1+1/admin/README 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/README 2019-09-10 00:32:49.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2018 Free Software Foundation, Inc. +Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. diff -Nru emacs-26.1+1/admin/unidata/BidiBrackets.txt emacs-26.3+1/admin/unidata/BidiBrackets.txt --- emacs-26.1+1/admin/unidata/BidiBrackets.txt 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/unidata/BidiBrackets.txt 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -# BidiBrackets-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [AG, LI, KW] -# © 2017 Unicode®, Inc. +# BidiBrackets-11.0.0.txt +# Date: 2018-02-18, 05:50:00 GMT [AG, LI, KW] +# © 2018 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # diff -Nru emacs-26.1+1/admin/unidata/BidiMirroring.txt emacs-26.3+1/admin/unidata/BidiMirroring.txt --- emacs-26.1+1/admin/unidata/BidiMirroring.txt 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/unidata/BidiMirroring.txt 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ -# BidiMirroring-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW, LI] -# © 2017 Unicode®, Inc. +# BidiMirroring-11.0.0.txt +# Date: 2018-05-07, 18:02:00 GMT [KW, LI, RP] +# © 2018 Unicode®, Inc. # For terms of use, see http://www.unicode.org/terms_of_use.html # # Unicode Character Database @@ -15,7 +15,7 @@ # value, for which there is another Unicode character that typically has a glyph # that is the mirror image of the original character's glyph. # -# The repertoire covered by the file is Unicode 10.0.0. +# The repertoire covered by the file is Unicode 11.0.0. # # The file contains a list of lines with mappings from one code point # to another one for character-based mirroring. @@ -44,7 +44,26 @@ # # This file was originally created by Markus Scherer. # Extended for Unicode 3.2, 4.0, 4.1, 5.0, 5.1, 5.2, and 6.0 by Ken Whistler, -# and for subsequent versions by Ken Whistler and Laurentiu Iancu. +# and for subsequent versions by Ken Whistler, Laurentiu Iancu, and Roozbeh Pournader. +# +# Historical and Compatibility Information: +# +# The OpenType Mirroring Pairs List (OMPL) is frozen to match the +# Unicode 5.1 version of the Bidi_Mirroring_Glyph property (2008). +# See https://www.microsoft.com/typography/otspec/ompl.txt +# +# The Unicode 6.1 version of the Bidi_Mirroring_Glyph property (2011) +# added one mirroring pair: 27CB <--> 27CD. +# +# The Unicode 11.0 version of the Bidi_Mirroring_Glyph property (2018) +# underwent a substantial revision, to formally recognize all of the +# exact mirroring pairs and "BEST FIT" mirroring pairs that had been +# added after the freezing of the OMPL list. As a result, starting +# with Unicode 11.0, the bmg mapping values more accurately reflect +# the current status of glyphs for Bidi_Mirrored characters in +# the Unicode Standard, but this listing now extends significantly +# beyond the frozen OMPL list. Implementers should be aware of this +# intentional distinction. # # ############################################################ # @@ -83,9 +102,16 @@ 220C; 2209 # DOES NOT CONTAIN AS MEMBER 220D; 220A # SMALL CONTAINS AS MEMBER 2215; 29F5 # DIVISION SLASH +221F; 2BFE # RIGHT ANGLE +2220; 29A3 # ANGLE +2221; 299B # MEASURED ANGLE +2222; 29A0 # SPHERICAL ANGLE +2224; 2AEE # DOES NOT DIVIDE 223C; 223D # TILDE OPERATOR 223D; 223C # REVERSED TILDE 2243; 22CD # ASYMPTOTICALLY EQUAL TO +2245; 224C # APPROXIMATELY EQUAL TO +224C; 2245 # ALL EQUAL TO 2252; 2253 # APPROXIMATELY EQUAL TO OR THE IMAGE OF 2253; 2252 # IMAGE OF OR APPROXIMATELY EQUAL TO 2254; 2255 # COLON EQUALS @@ -147,6 +173,7 @@ 22B5; 22B4 # CONTAINS AS NORMAL SUBGROUP OR EQUAL TO 22B6; 22B7 # ORIGINAL OF 22B7; 22B6 # IMAGE OF +22B8; 27DC # MULTIMAP 22C9; 22CA # LEFT NORMAL FACTOR SEMIDIRECT PRODUCT 22CA; 22C9 # RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT 22CB; 22CC # LEFT SEMIDIRECT PRODUCT @@ -220,6 +247,7 @@ 27CD; 27CB # MATHEMATICAL FALLING DIAGONAL 27D5; 27D6 # LEFT OUTER JOIN 27D6; 27D5 # RIGHT OUTER JOIN +27DC; 22B8 # LEFT MULTIMAP 27DD; 27DE # LONG RIGHT TACK 27DE; 27DD # LONG LEFT TACK 27E2; 27E3 # WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK @@ -258,6 +286,19 @@ 2996; 2995 # DOUBLE RIGHT ARC LESS-THAN BRACKET 2997; 2998 # LEFT BLACK TORTOISE SHELL BRACKET 2998; 2997 # RIGHT BLACK TORTOISE SHELL BRACKET +299B; 2221 # MEASURED ANGLE OPENING LEFT +29A0; 2222 # SPHERICAL ANGLE OPENING LEFT +29A3; 2220 # REVERSED ANGLE +29A4; 29A5 # ANGLE WITH UNDERBAR +29A5; 29A4 # REVERSED ANGLE WITH UNDERBAR +29A8; 29A9 # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT +29A9; 29A8 # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT +29AA; 29AB # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT +29AB; 29AA # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT +29AC; 29AD # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP +29AD; 29AC # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP +29AE; 29AF # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN +29AF; 29AE # MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN 29B8; 2298 # CIRCLED REVERSE SOLIDUS 29C0; 29C1 # CIRCLED LESS-THAN 29C1; 29C0 # CIRCLED GREATER-THAN @@ -273,6 +314,8 @@ 29D9; 29D8 # RIGHT WIGGLY FENCE 29DA; 29DB # LEFT DOUBLE WIGGLY FENCE 29DB; 29DA # RIGHT DOUBLE WIGGLY FENCE +29E8; 29E9 # DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK +29E9; 29E8 # DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK 29F5; 2215 # REVERSE SOLIDUS OPERATOR 29F8; 29F9 # BIG SOLIDUS 29F9; 29F8 # BIG REVERSE SOLIDUS @@ -290,6 +333,8 @@ 2A65; 2A64 # Z NOTATION RANGE ANTIRESTRICTION 2A79; 2A7A # LESS-THAN WITH CIRCLE INSIDE 2A7A; 2A79 # GREATER-THAN WITH CIRCLE INSIDE +2A7B; 2A7C # [BEST FIT] LESS-THAN WITH QUESTION MARK ABOVE +2A7C; 2A7B # [BEST FIT] GREATER-THAN WITH QUESTION MARK ABOVE 2A7D; 2A7E # LESS-THAN OR SLANTED EQUAL TO 2A7E; 2A7D # GREATER-THAN OR SLANTED EQUAL TO 2A7F; 2A80 # LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE @@ -298,8 +343,18 @@ 2A82; 2A81 # GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE 2A83; 2A84 # LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT 2A84; 2A83 # GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT +2A85; 2A86 # [BEST FIT] LESS-THAN OR APPROXIMATE +2A86; 2A85 # [BEST FIT] GREATER-THAN OR APPROXIMATE +2A87; 2A88 # [BEST FIT] LESS-THAN AND SINGLE-LINE NOT EQUAL TO +2A88; 2A87 # [BEST FIT] GREATER-THAN AND SINGLE-LINE NOT EQUAL TO +2A89; 2A8A # [BEST FIT] LESS-THAN AND NOT APPROXIMATE +2A8A; 2A89 # [BEST FIT] GREATER-THAN AND NOT APPROXIMATE 2A8B; 2A8C # LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN 2A8C; 2A8B # GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN +2A8D; 2A8E # [BEST FIT] LESS-THAN ABOVE SIMILAR OR EQUAL +2A8E; 2A8D # [BEST FIT] GREATER-THAN ABOVE SIMILAR OR EQUAL +2A8F; 2A90 # [BEST FIT] LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN +2A90; 2A8F # [BEST FIT] GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN 2A91; 2A92 # LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL 2A92; 2A91 # GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL 2A93; 2A94 # LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL @@ -312,6 +367,10 @@ 2A9A; 2A99 # DOUBLE-LINE EQUAL TO OR GREATER-THAN 2A9B; 2A9C # DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN 2A9C; 2A9B # DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN +2A9D; 2A9E # [BEST FIT] SIMILAR OR LESS-THAN +2A9E; 2A9D # [BEST FIT] SIMILAR OR GREATER-THAN +2A9F; 2AA0 # [BEST FIT] SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN +2AA0; 2A9F # [BEST FIT] SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN 2AA1; 2AA2 # DOUBLE NESTED LESS-THAN 2AA2; 2AA1 # DOUBLE NESTED GREATER-THAN 2AA6; 2AA7 # LESS-THAN CLOSED BY CURVE @@ -324,8 +383,16 @@ 2AAD; 2AAC # LARGER THAN OR EQUAL TO 2AAF; 2AB0 # PRECEDES ABOVE SINGLE-LINE EQUALS SIGN 2AB0; 2AAF # SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN +2AB1; 2AB2 # [BEST FIT] PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO +2AB2; 2AB1 # [BEST FIT] SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO 2AB3; 2AB4 # PRECEDES ABOVE EQUALS SIGN 2AB4; 2AB3 # SUCCEEDS ABOVE EQUALS SIGN +2AB5; 2AB6 # [BEST FIT] PRECEDES ABOVE NOT EQUAL TO +2AB6; 2AB5 # [BEST FIT] SUCCEEDS ABOVE NOT EQUAL TO +2AB7; 2AB8 # [BEST FIT] PRECEDES ABOVE ALMOST EQUAL TO +2AB8; 2AB7 # [BEST FIT] SUCCEEDS ABOVE ALMOST EQUAL TO +2AB9; 2ABA # [BEST FIT] PRECEDES ABOVE NOT ALMOST EQUAL TO +2ABA; 2AB9 # [BEST FIT] SUCCEEDS ABOVE NOT ALMOST EQUAL TO 2ABB; 2ABC # DOUBLE PRECEDES 2ABC; 2ABB # DOUBLE SUCCEEDS 2ABD; 2ABE # SUBSET WITH DOT @@ -338,6 +405,12 @@ 2AC4; 2AC3 # SUPERSET OF OR EQUAL TO WITH DOT ABOVE 2AC5; 2AC6 # SUBSET OF ABOVE EQUALS SIGN 2AC6; 2AC5 # SUPERSET OF ABOVE EQUALS SIGN +2AC7; 2AC8 # [BEST FIT] SUBSET OF ABOVE TILDE OPERATOR +2AC8; 2AC7 # [BEST FIT] SUPERSET OF ABOVE TILDE OPERATOR +2AC9; 2ACA # [BEST FIT] SUBSET OF ABOVE ALMOST EQUAL TO +2ACA; 2AC9 # [BEST FIT] SUPERSET OF ABOVE ALMOST EQUAL TO +2ACB; 2ACC # [BEST FIT] SUBSET OF ABOVE NOT EQUAL TO +2ACC; 2ACB # [BEST FIT] SUPERSET OF ABOVE NOT EQUAL TO 2ACD; 2ACE # SQUARE LEFT OPEN BOX OPERATOR 2ACE; 2ACD # SQUARE RIGHT OPEN BOX OPERATOR 2ACF; 2AD0 # CLOSED SUBSET @@ -354,10 +427,12 @@ 2AE5; 22AB # DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE 2AEC; 2AED # DOUBLE STROKE NOT SIGN 2AED; 2AEC # REVERSED DOUBLE STROKE NOT SIGN +2AEE; 2224 # DOES NOT DIVIDE WITH REVERSED NEGATION SLASH 2AF7; 2AF8 # TRIPLE NESTED LESS-THAN 2AF8; 2AF7 # TRIPLE NESTED GREATER-THAN 2AF9; 2AFA # DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO 2AFA; 2AF9 # DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO +2BFE; 221F # REVERSED RIGHT ANGLE 2E02; 2E03 # LEFT SUBSTITUTION BRACKET 2E03; 2E02 # RIGHT SUBSTITUTION BRACKET 2E04; 2E05 # LEFT DOTTED SUBSTITUTION BRACKET @@ -432,11 +507,6 @@ # 221B; CUBE ROOT # 221C; FOURTH ROOT # 221D; PROPORTIONAL TO -# 221F; RIGHT ANGLE -# 2220; ANGLE -# 2221; MEASURED ANGLE -# 2222; SPHERICAL ANGLE -# 2224; DOES NOT DIVIDE # 2226; NOT PARALLEL TO # 222B; INTEGRAL # 222C; DOUBLE INTEGRAL @@ -455,14 +525,12 @@ # 2241; NOT TILDE # 2242; MINUS TILDE # 2244; NOT ASYMPTOTICALLY EQUAL TO -# 2245; APPROXIMATELY EQUAL TO # 2246; APPROXIMATELY BUT NOT ACTUALLY EQUAL TO # 2247; NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO # 2248; ALMOST EQUAL TO # 2249; NOT ALMOST EQUAL TO # 224A; ALMOST EQUAL OR EQUAL TO # 224B; TRIPLE TILDE -# 224C; ALL EQUAL TO # 225F; QUESTIONED EQUAL TO # 2260; NOT EQUAL TO # 2262; NOT IDENTICAL TO @@ -473,7 +541,6 @@ # 22AD; NOT TRUE # 22AE; DOES NOT FORCE # 22AF; NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE -# 22B8; MULTIMAP # 22BE; RIGHT ANGLE WITH ARC # 22BF; RIGHT TRIANGLE # 22F5; ELEMENT OF WITH DOT ABOVE @@ -486,28 +553,13 @@ # 27CC; LONG DIVISION # 27D3; LOWER RIGHT CORNER WITH DOT # 27D4; UPPER LEFT CORNER WITH DOT -# 27DC; LEFT MULTIMAP -# 299B; MEASURED ANGLE OPENING LEFT # 299C; RIGHT ANGLE VARIANT WITH SQUARE # 299D; MEASURED RIGHT ANGLE WITH DOT # 299E; ANGLE WITH S INSIDE # 299F; ACUTE ANGLE -# 29A0; SPHERICAL ANGLE OPENING LEFT -# 29A1; SPHERICAL ANGLE OPENING UP # 29A2; TURNED ANGLE -# 29A3; REVERSED ANGLE -# 29A4; ANGLE WITH UNDERBAR -# 29A5; REVERSED ANGLE WITH UNDERBAR # 29A6; OBLIQUE ANGLE OPENING UP # 29A7; OBLIQUE ANGLE OPENING DOWN -# 29A8; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT -# 29A9; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT -# 29AA; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT -# 29AB; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT -# 29AC; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP -# 29AD; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP -# 29AE; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN -# 29AF; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN # 29C2; CIRCLE WITH SMALL CIRCLE TO THE RIGHT # 29C3; CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT # 29C9; TWO JOINED SQUARES @@ -517,8 +569,6 @@ # 29E3; EQUALS SIGN AND SLANTED PARALLEL # 29E4; EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE # 29E5; IDENTICAL TO AND SLANTED PARALLEL -# 29E8; DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK -# 29E9; DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK # 29F4; RULE-DELAYED # 29F6; SOLIDUS WITH OVERBAR # 29F7; REVERSE SOLIDUS WITH HORIZONTAL STROKE @@ -559,41 +609,10 @@ # 2A70; APPROXIMATELY EQUAL OR EQUAL TO # 2A73; EQUALS SIGN ABOVE TILDE OPERATOR # 2A74; DOUBLE COLON EQUAL -# 2A7B; LESS-THAN WITH QUESTION MARK ABOVE -# 2A7C; GREATER-THAN WITH QUESTION MARK ABOVE -# 2A85; LESS-THAN OR APPROXIMATE -# 2A86; GREATER-THAN OR APPROXIMATE -# 2A87; LESS-THAN AND SINGLE-LINE NOT EQUAL TO -# 2A88; GREATER-THAN AND SINGLE-LINE NOT EQUAL TO -# 2A89; LESS-THAN AND NOT APPROXIMATE -# 2A8A; GREATER-THAN AND NOT APPROXIMATE -# 2A8D; LESS-THAN ABOVE SIMILAR OR EQUAL -# 2A8E; GREATER-THAN ABOVE SIMILAR OR EQUAL -# 2A8F; LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN -# 2A90; GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN -# 2A9D; SIMILAR OR LESS-THAN -# 2A9E; SIMILAR OR GREATER-THAN -# 2A9F; SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN -# 2AA0; SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN # 2AA3; DOUBLE NESTED LESS-THAN WITH UNDERBAR -# 2AB1; PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO -# 2AB2; SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO -# 2AB5; PRECEDES ABOVE NOT EQUAL TO -# 2AB6; SUCCEEDS ABOVE NOT EQUAL TO -# 2AB7; PRECEDES ABOVE ALMOST EQUAL TO -# 2AB8; SUCCEEDS ABOVE ALMOST EQUAL TO -# 2AB9; PRECEDES ABOVE NOT ALMOST EQUAL TO -# 2ABA; SUCCEEDS ABOVE NOT ALMOST EQUAL TO -# 2AC7; SUBSET OF ABOVE TILDE OPERATOR -# 2AC8; SUPERSET OF ABOVE TILDE OPERATOR -# 2AC9; SUBSET OF ABOVE ALMOST EQUAL TO -# 2ACA; SUPERSET OF ABOVE ALMOST EQUAL TO -# 2ACB; SUBSET OF ABOVE NOT EQUAL TO -# 2ACC; SUPERSET OF ABOVE NOT EQUAL TO # 2ADC; FORKING # 2AE2; VERTICAL BAR TRIPLE RIGHT TURNSTILE # 2AE6; LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL -# 2AEE; DOES NOT DIVIDE WITH REVERSED NEGATION SLASH # 2AF3; PARALLEL WITH TILDE OPERATOR # 2AFB; TRIPLE SOLIDUS BINARY RELATION # 2AFD; DOUBLE SOLIDUS OPERATOR diff -Nru emacs-26.1+1/admin/unidata/blocks.awk emacs-26.3+1/admin/unidata/blocks.awk --- emacs-26.1+1/admin/unidata/blocks.awk 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/unidata/blocks.awk 2019-09-10 00:32:49.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2015-2018 Free Software Foundation, Inc. +## Copyright (C) 2015-2019 Free Software Foundation, Inc. ## Author: Glenn Morris diff -Nru emacs-26.1+1/admin/unidata/Blocks.txt emacs-26.3+1/admin/unidata/Blocks.txt --- emacs-26.1+1/admin/unidata/Blocks.txt 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/unidata/Blocks.txt 2019-09-10 00:32:49.000000000 +0000 @@ -1,5 +1,5 @@ -# Blocks-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW] +# Blocks-11.0.0.txt +# Date: 2017-10-16, 24:39:00 GMT [KW] # © 2017 Unicode®, Inc. # For terms of use, see http://www.unicode.org/terms_of_use.html # @@ -95,6 +95,7 @@ 1C00..1C4F; Lepcha 1C50..1C7F; Ol Chiki 1C80..1C8F; Cyrillic Extended-C +1C90..1CBF; Georgian Extended 1CC0..1CCF; Sundanese Supplement 1CD0..1CFF; Vedic Extensions 1D00..1D7F; Phonetic Extensions @@ -234,7 +235,10 @@ 10B80..10BAF; Psalter Pahlavi 10C00..10C4F; Old Turkic 10C80..10CFF; Old Hungarian +10D00..10D3F; Hanifi Rohingya 10E60..10E7F; Rumi Numeral Symbols +10F00..10F2F; Old Sogdian +10F30..10F6F; Sogdian 11000..1107F; Brahmi 11080..110CF; Kaithi 110D0..110FF; Sora Sompeng @@ -253,6 +257,7 @@ 11660..1167F; Mongolian Supplement 11680..116CF; Takri 11700..1173F; Ahom +11800..1184F; Dogra 118A0..118FF; Warang Citi 11A00..11A4F; Zanabazar Square 11A50..11AAF; Soyombo @@ -260,6 +265,8 @@ 11C00..11C6F; Bhaiksuki 11C70..11CBF; Marchen 11D00..11D5F; Masaram Gondi +11D60..11DAF; Gunjala Gondi +11EE0..11EFF; Makasar 12000..123FF; Cuneiform 12400..1247F; Cuneiform Numbers and Punctuation 12480..1254F; Early Dynastic Cuneiform @@ -269,6 +276,7 @@ 16A40..16A6F; Mro 16AD0..16AFF; Bassa Vah 16B00..16B8F; Pahawh Hmong +16E40..16E9F; Medefaidrin 16F00..16F9F; Miao 16FE0..16FFF; Ideographic Symbols and Punctuation 17000..187FF; Tangut @@ -281,6 +289,7 @@ 1D000..1D0FF; Byzantine Musical Symbols 1D100..1D1FF; Musical Symbols 1D200..1D24F; Ancient Greek Musical Notation +1D2E0..1D2FF; Mayan Numerals 1D300..1D35F; Tai Xuan Jing Symbols 1D360..1D37F; Counting Rod Numerals 1D400..1D7FF; Mathematical Alphanumeric Symbols @@ -288,6 +297,7 @@ 1E000..1E02F; Glagolitic Supplement 1E800..1E8DF; Mende Kikakui 1E900..1E95F; Adlam +1EC70..1ECBF; Indic Siyaq Numbers 1EE00..1EEFF; Arabic Mathematical Alphabetic Symbols 1F000..1F02F; Mahjong Tiles 1F030..1F09F; Domino Tiles @@ -302,6 +312,7 @@ 1F780..1F7FF; Geometric Shapes Extended 1F800..1F8FF; Supplemental Arrows-C 1F900..1F9FF; Supplemental Symbols and Pictographs +1FA00..1FA6F; Chess Symbols 20000..2A6DF; CJK Unified Ideographs Extension B 2A700..2B73F; CJK Unified Ideographs Extension C 2B740..2B81F; CJK Unified Ideographs Extension D diff -Nru emacs-26.1+1/admin/unidata/copyright.html emacs-26.3+1/admin/unidata/copyright.html --- emacs-26.1+1/admin/unidata/copyright.html 2018-12-15 19:02:06.000000000 +0000 +++ emacs-26.3+1/admin/unidata/copyright.html 2019-09-10 00:32:49.000000000 +0000 @@ -11,7 +11,7 @@ Unicode Terms of Use - @@ -33,12 +33,12 @@ - - @@ -50,7 +50,7 @@
[Unicode]  Terms of + [Unicode]  Terms of UseHome + Home | Site Map | Search
- @@ -59,11 +59,11 @@ - - @@ -83,7 +83,7 @@
ContentsUnicode Copyright
Restricted Rights + Restricted Rights Legend
Warranties & + Warranties & Disclaimers
 
- @@ -94,7 +94,7 @@ @@ -109,98 +109,96 @@

Unicode® Terms of Use

- -

For the general privacy policy governing access to this site, see + +

For the general privacy policy governing access to this site, see the  Unicode Privacy Policy. For trademark usage, see - the + the Unicode® Consortium Name and Trademark Usage Policy.

- +
Related Links
- Unicode + Unicode Policies
-
  1. Unicode Copyright.
      -
    1. Copyright © 1991-2016 Unicode, Inc. All rights reserved.
      2. -
    2. Certain documents and files on this website contain a legend - indicating that "Modification is permitted." Any person is - hereby authorized, without fee, to modify such documents and - files to create derivative works conforming to the Unicode® +
    3. Copyright © 1991-2019 Unicode, Inc. All rights reserved.
      4. +
    4. Certain documents and files on this website contain a legend + indicating that "Modification is permitted." Any person is + hereby authorized, without fee, to modify such documents and + files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
      5. -
    5. Any person is hereby authorized, without fee, to view, use, - reproduce, and distribute all documents and files solely for - informational purposes and in the creation of products supporting - the Unicode Standard, subject to the Terms and Conditions +
    6. Any person is hereby authorized, without fee, to view, use, + reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
      7. -
    7. Further specifications of rights and restrictions pertaining - to the use of the particular set of data files known as the +
    8. Further specifications of rights and restrictions pertaining + to the use of the particular set of data files known as the "Unicode Character Database" can be found in the License.
      9. -
    9. Each version of the Unicode Standard has further - specifications of rights and restrictions of use. For the book - editions (Unicode 5.0 and earlier), these are found on the back +
    10. Each version of the Unicode Standard has further + specifications of rights and restrictions of use. For the book + editions (Unicode 5.0 and earlier), these are found on the back of the - title page. + title page. The online code charts carry specific restrictions. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
      11. -
    11. No license is granted to "mirror" the Unicode website where +
    12. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
      13. -
    13. Modification is not permitted with respect to this document. +
    14. Modification is not permitted with respect to this document. All copies of this document must be verbatim.
    2. -
  2. Restricted Rights Legend. Any technical - data or software which is licensed to the United States of - America, its agencies and/or instrumentalities under this - Agreement is commercial technical data or commercial computer - software developed exclusively at private expense as defined in - FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For - technical data, use, duplication, or disclosure by the Government - is subject to restrictions as set forth in DFARS 202.227-7015 - Technical Data, Commercial and Items (Nov 1995) and this - Agreement. For Software, in accordance with FAR 12-212 or DFARS - 227-7202, as applicable, use, duplication or disclosure by the - Government is subject to the restrictions set forth in this +
  3. Restricted Rights Legend. Any technical + data or software which is licensed to the United States of + America, its agencies and/or instrumentalities under this + Agreement is commercial technical data or commercial computer + software developed exclusively at private expense as defined in + FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For + technical data, use, duplication, or disclosure by the Government + is subject to restrictions as set forth in DFARS 202.227-7015 + Technical Data, Commercial and Items (Nov 1995) and this + Agreement. For Software, in accordance with FAR 12-212 or DFARS + 227-7202, as applicable, use, duplication or disclosure by the + Government is subject to the restrictions set forth in this Agreement.
  4. Warranties and Disclaimers.
      -
    1. This publication and/or website may include technical or - typographical errors or other inaccuracies . Changes are - periodically added to the information herein; these changes will - be incorporated in new editions of the publication and/or - website. Unicode may make improvements and/or changes in the - product(s) and/or program(s) described in this publication +
    2. This publication and/or website may include technical or + typographical errors or other inaccuracies . Changes are + periodically added to the information herein; these changes will + be incorporated in new editions of the publication and/or + website. Unicode may make improvements and/or changes in the + product(s) and/or program(s) described in this publication and/or website at any time.
      3. -
    3. If this file has been purchased on magnetic or optical media - from Unicode, Inc. the sole and exclusive remedy for any claim - will be exchange of the defective media within ninety (90) days +
    4. If this file has been purchased on magnetic or optical media + from Unicode, Inc. the sole and exclusive remedy for any claim + will be exchange of the defective media within ninety (90) days of original purchase.
      5. -
    5. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR - SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER - EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, - ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME - NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION - AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR +
    6. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR + SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER + EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, + ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS LICENSORS ASSUME + NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION + AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
    5. -
  5. Waiver of Damages. In no event shall - Unicode or its licensors be liable for any special, incidental, - indirect or consequential damages of any kind, or any damages - whatsoever, whether or not Unicode was advised of the possibility - of the damage, including, without limitation, those resulting from - the following: loss of use, data or profits, in connection with - the use, modification or distribution of this information or its +
  6. Waiver of Damages. In no event shall + Unicode or its licensors be liable for any special, incidental, + indirect or consequential damages of any kind, or any damages + whatsoever, whether or not Unicode was advised of the possibility + of the damage, including, without limitation, those resulting from + the following: loss of use, data or profits, in connection with + the use, modification or distribution of this information or its derivatives.
  7. Trademarks & Logos.
      @@ -213,31 +211,31 @@
    1. Miscellaneous.
        -
      1. Jurisdiction and Venue. This server is operated from - a location in the State of California, United States of America. - Unicode makes no representation that the materials are - appropriate for use in other locations. If you access this - server from other locations, you are responsible for compliance - with local laws. This Agreement, all use of this site and any - claims and damages resulting from use of this site are governed - solely by the laws of the State of California without regard to - any principles which would apply the laws of a different - jurisdiction. The user agrees that any disputes regarding this - site shall be resolved solely in the courts located in Santa - Clara County, California. The user agrees said courts have - personal jurisdiction and agree to waive any right to transfer +
      2. Jurisdiction and Venue. This server is operated from + a location in the State of California, United States of America. + Unicode makes no representation that the materials are + appropriate for use in other locations. If you access this + server from other locations, you are responsible for compliance + with local laws. This Agreement, all use of this site and any + claims and damages resulting from use of this site are governed + solely by the laws of the State of California without regard to + any principles which would apply the laws of a different + jurisdiction. The user agrees that any disputes regarding this + site shall be resolved solely in the courts located in Santa + Clara County, California. The user agrees said courts have + personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
        3. -
      3. Modification by Unicode Unicode shall have the right - to modify this Agreement at any time by posting it to this site. - The user may not assign any part of this Agreement without +
      4. Modification by Unicode Unicode shall have the right + to modify this Agreement at any time by posting it to this site. + The user may not assign any part of this Agreement without Unicode’s prior written consent.
        5. -
      5. Taxes. The user agrees to pay any taxes arising from - access to this website or use of the information herein, except +
      6. Taxes. The user agrees to pay any taxes arising from + access to this website or use of the information herein, except for those based on Unicode’s net income.
        7. -
      7. Severability.  If any provision of this - Agreement is declared invalid or unenforceable, the remaining +
      8. Severability.  If any provision of this + Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
        9. -
      9. Entire Agreement. This Agreement constitutes the +
      10. Entire Agreement. This Agreement constitutes the entire agreement between the parties. 
      2. @@ -252,7 +250,8 @@ 
       Unicode Data Files include all data files under the directories
 http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+http://www.unicode.org/ivd/data/, and
 http://www.unicode.org/utility/trac/browser/.
 
 Unicode Data Files do not include PDF online code charts under the
@@ -274,7 +273,7 @@
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2016 Unicode, Inc. All rights reserved.
+Copyright © 1991-2019 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -316,13 +315,13 @@
               
      
                 
      
                   
-                  Access to Copyright and terms of use
                 
      
               
      
-              
-                
 
diff -Nru emacs-26.1+1/admin/unidata/Makefile.in emacs-26.3+1/admin/unidata/Makefile.in
--- emacs-26.1+1/admin/unidata/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2012-2018 Free Software Foundation, Inc.
+# Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/admin/unidata/NormalizationTest.txt emacs-26.3+1/admin/unidata/NormalizationTest.txt
--- emacs-26.1+1/admin/unidata/NormalizationTest.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/NormalizationTest.txt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-# NormalizationTest-10.0.0.txt
-# Date: 2017-03-08, 08:41:55 GMT
-# © 2017 Unicode®, Inc.
+# NormalizationTest-11.0.0.txt
+# Date: 2018-02-19, 18:33:08 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -2149,6 +2149,7 @@
 32FC;32FC;32FC;30F0;30F0; # (㋼; ㋼; ㋼; ヰ; ヰ; ) CIRCLED KATAKANA WI
 32FD;32FD;32FD;30F1;30F1; # (㋽; ㋽; ㋽; ヱ; ヱ; ) CIRCLED KATAKANA WE
 32FE;32FE;32FE;30F2;30F2; # (㋾; ㋾; ㋾; ヲ; ヲ; ) CIRCLED KATAKANA WO
+32FF;32FF;32FF;4EE4 548C;4EE4 548C; # (㋿; ㋿; ㋿; 令和; 令和; ) SQUARE ERA NAME REIWA
 3300;3300;3300;30A2 30D1 30FC 30C8;30A2 30CF 309A 30FC 30C8; # (㌀; ㌀; ㌀; アパート; アハ◌゚ート; ) SQUARE APAATO
 3301;3301;3301;30A2 30EB 30D5 30A1;30A2 30EB 30D5 30A1; # (㌁; ㌁; ㌁; アルファ; アルファ; ) SQUARE ARUHUA
 3302;3302;3302;30A2 30F3 30DA 30A2;30A2 30F3 30D8 309A 30A2; # (㌂; ㌂; ㌂; アンペア; アンヘ◌゚ア; ) SQUARE ANPEA
@@ -17479,6 +17480,8 @@
 0061 07F2 059A 0316 302A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062; # (a◌߲◌֚◌̖◌〪b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; ) LATIN SMALL LETTER A, NKO COMBINING NASALIZATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 07F3 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062; # (a◌̕◌̀◌֮◌߳b; à◌֮◌߳◌̕b; a◌֮◌̀◌߳◌̕b; à◌֮◌߳◌̕b; a◌֮◌̀◌߳◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NKO COMBINING DOUBLE DOT ABOVE, LATIN SMALL LETTER B
 0061 07F3 0315 0300 05AE 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062; # (a◌߳◌̕◌̀◌֮b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; ) LATIN SMALL LETTER A, NKO COMBINING DOUBLE DOT ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 07FD 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062; # (a◌֚◌̖◌〪◌߽b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, NKO DANTAYALAN, LATIN SMALL LETTER B
+0061 07FD 059A 0316 302A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062; # (a◌߽◌֚◌̖◌〪b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; ) LATIN SMALL LETTER A, NKO DANTAYALAN, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 0816 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062; # (a◌̕◌̀◌֮◌ࠖb; à◌֮◌ࠖ◌̕b; a◌֮◌̀◌ࠖ◌̕b; à◌֮◌ࠖ◌̕b; a◌֮◌̀◌ࠖ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SAMARITAN MARK IN, LATIN SMALL LETTER B
 0061 0816 0315 0300 05AE 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062; # (a◌ࠖ◌̕◌̀◌֮b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; ) LATIN SMALL LETTER A, SAMARITAN MARK IN, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 0817 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062; # (a◌̕◌̀◌֮◌ࠗb; à◌֮◌ࠗ◌̕b; a◌֮◌̀◌ࠗ◌̕b; à◌֮◌ࠗ◌̕b; a◌֮◌̀◌ࠗ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SAMARITAN MARK IN-ALAF, LATIN SMALL LETTER B
@@ -17527,6 +17530,8 @@
 0061 085A 059A 0316 302A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062; # (a◌࡚◌֚◌̖◌〪b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; ) LATIN SMALL LETTER A, MANDAIC VOCALIZATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 059A 0316 302A 085B 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062; # (a◌֚◌̖◌〪◌࡛b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, MANDAIC GEMINATION MARK, LATIN SMALL LETTER B
 0061 085B 059A 0316 302A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062; # (a◌࡛◌֚◌̖◌〪b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; ) LATIN SMALL LETTER A, MANDAIC GEMINATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 08D3 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062; # (a◌֚◌̖◌〪◌࣓b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, ARABIC SMALL LOW WAW, LATIN SMALL LETTER B
+0061 08D3 059A 0316 302A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062; # (a◌࣓◌֚◌̖◌〪b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WAW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 08D4 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062; # (a◌̕◌̀◌֮◌ࣔb; à◌֮◌ࣔ◌̕b; a◌֮◌̀◌ࣔ◌̕b; à◌֮◌ࣔ◌̕b; a◌֮◌̀◌ࣔ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, ARABIC SMALL HIGH WORD AR-RUB, LATIN SMALL LETTER B
 0061 08D4 0315 0300 05AE 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062; # (a◌ࣔ◌̕◌̀◌֮b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; ) LATIN SMALL LETTER A, ARABIC SMALL HIGH WORD AR-RUB, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 08D5 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062; # (a◌̕◌̀◌֮◌ࣕb; à◌֮◌ࣕ◌̕b; a◌֮◌̀◌ࣕ◌̕b; à◌֮◌ࣕ◌̕b; a◌֮◌̀◌ࣕ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, ARABIC SMALL HIGH SAD, LATIN SMALL LETTER B
@@ -17629,6 +17634,8 @@
 0061 09BC 3099 093C 0334 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062; # (a◌়◌゙◌़◌̴b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; ) LATIN SMALL LETTER A, BENGALI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 09CD 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062; # (a◌ְ◌्◌゙◌্b; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BENGALI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 09CD 05B0 094D 3099 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062; # (a◌্◌ְ◌्◌゙b; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; ) LATIN SMALL LETTER A, BENGALI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 09FE 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062; # (a◌̕◌̀◌֮◌৾b; à◌֮◌৾◌̕b; a◌֮◌̀◌৾◌̕b; à◌֮◌৾◌̕b; a◌֮◌̀◌৾◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, BENGALI SANDHI MARK, LATIN SMALL LETTER B
+0061 09FE 0315 0300 05AE 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062; # (a◌৾◌̕◌̀◌֮b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; ) LATIN SMALL LETTER A, BENGALI SANDHI MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 3099 093C 0334 0A3C 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062; # (a◌゙◌़◌̴◌਼b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, GURMUKHI SIGN NUKTA, LATIN SMALL LETTER B
 0061 0A3C 3099 093C 0334 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062; # (a◌਼◌゙◌़◌̴b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; ) LATIN SMALL LETTER A, GURMUKHI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0A4D 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062; # (a◌ְ◌्◌゙◌੍b; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GURMUKHI SIGN VIRAMA, LATIN SMALL LETTER B
@@ -18329,6 +18336,36 @@
 0061 10AE5 0315 0300 05AE 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062; # (a◌𐫥◌̕◌̀◌֮b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; ) LATIN SMALL LETTER A, MANICHAEAN ABBREVIATION MARK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 059A 0316 302A 10AE6 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062; # (a◌֚◌̖◌〪◌𐫦b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, MANICHAEAN ABBREVIATION MARK BELOW, LATIN SMALL LETTER B
 0061 10AE6 059A 0316 302A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062; # (a◌𐫦◌֚◌̖◌〪b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; ) LATIN SMALL LETTER A, MANICHAEAN ABBREVIATION MARK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D24 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062; # (a◌̕◌̀◌֮◌𐴤b; à◌֮◌𐴤◌̕b; a◌֮◌̀◌𐴤◌̕b; à◌֮◌𐴤◌̕b; a◌֮◌̀◌𐴤◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN HARBAHAY, LATIN SMALL LETTER B
+0061 10D24 0315 0300 05AE 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062; # (a◌𐴤◌̕◌̀◌֮b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN HARBAHAY, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D25 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062; # (a◌̕◌̀◌֮◌𐴥b; à◌֮◌𐴥◌̕b; a◌֮◌̀◌𐴥◌̕b; à◌֮◌𐴥◌̕b; a◌֮◌̀◌𐴥◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TAHALA, LATIN SMALL LETTER B
+0061 10D25 0315 0300 05AE 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062; # (a◌𐴥◌̕◌̀◌֮b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TAHALA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D26 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062; # (a◌̕◌̀◌֮◌𐴦b; à◌֮◌𐴦◌̕b; a◌֮◌̀◌𐴦◌̕b; à◌֮◌𐴦◌̕b; a◌֮◌̀◌𐴦◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TANA, LATIN SMALL LETTER B
+0061 10D26 0315 0300 05AE 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062; # (a◌𐴦◌̕◌̀◌֮b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TANA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D27 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062; # (a◌̕◌̀◌֮◌𐴧b; à◌֮◌𐴧◌̕b; a◌֮◌̀◌𐴧◌̕b; à◌֮◌𐴧◌̕b; a◌֮◌̀◌𐴧◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TASSI, LATIN SMALL LETTER B
+0061 10D27 0315 0300 05AE 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062; # (a◌𐴧◌̕◌̀◌֮b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TASSI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F46 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062; # (a◌֚◌̖◌〪◌𐽆b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING DOT BELOW, LATIN SMALL LETTER B
+0061 10F46 059A 0316 302A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062; # (a◌𐽆◌֚◌̖◌〪b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F47 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062; # (a◌֚◌̖◌〪◌𐽇b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING TWO DOTS BELOW, LATIN SMALL LETTER B
+0061 10F47 059A 0316 302A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062; # (a◌𐽇◌֚◌̖◌〪b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING TWO DOTS BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F48 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062; # (a◌̕◌̀◌֮◌𐽈b; à◌֮◌𐽈◌̕b; a◌֮◌̀◌𐽈◌̕b; à◌֮◌𐽈◌̕b; a◌֮◌̀◌𐽈◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING DOT ABOVE, LATIN SMALL LETTER B
+0061 10F48 0315 0300 05AE 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062; # (a◌𐽈◌̕◌̀◌֮b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F49 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062; # (a◌̕◌̀◌֮◌𐽉b; à◌֮◌𐽉◌̕b; a◌֮◌̀◌𐽉◌̕b; à◌֮◌𐽉◌̕b; a◌֮◌̀◌𐽉◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING TWO DOTS ABOVE, LATIN SMALL LETTER B
+0061 10F49 0315 0300 05AE 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062; # (a◌𐽉◌̕◌̀◌֮b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING TWO DOTS ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F4A 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062; # (a◌̕◌̀◌֮◌𐽊b; à◌֮◌𐽊◌̕b; a◌֮◌̀◌𐽊◌̕b; à◌֮◌𐽊◌̕b; a◌֮◌̀◌𐽊◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING CURVE ABOVE, LATIN SMALL LETTER B
+0061 10F4A 0315 0300 05AE 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062; # (a◌𐽊◌̕◌̀◌֮b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING CURVE ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4B 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062; # (a◌֚◌̖◌〪◌𐽋b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING CURVE BELOW, LATIN SMALL LETTER B
+0061 10F4B 059A 0316 302A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062; # (a◌𐽋◌֚◌̖◌〪b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING CURVE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F4C 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062; # (a◌̕◌̀◌֮◌𐽌b; à◌֮◌𐽌◌̕b; a◌֮◌̀◌𐽌◌̕b; à◌֮◌𐽌◌̕b; a◌֮◌̀◌𐽌◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING HOOK ABOVE, LATIN SMALL LETTER B
+0061 10F4C 0315 0300 05AE 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062; # (a◌𐽌◌̕◌̀◌֮b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING HOOK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4D 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062; # (a◌֚◌̖◌〪◌𐽍b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING HOOK BELOW, LATIN SMALL LETTER B
+0061 10F4D 059A 0316 302A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062; # (a◌𐽍◌֚◌̖◌〪b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING HOOK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4E 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062; # (a◌֚◌̖◌〪◌𐽎b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING LONG HOOK BELOW, LATIN SMALL LETTER B
+0061 10F4E 059A 0316 302A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062; # (a◌𐽎◌֚◌̖◌〪b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING LONG HOOK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4F 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062; # (a◌֚◌̖◌〪◌𐽏b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING RESH BELOW, LATIN SMALL LETTER B
+0061 10F4F 059A 0316 302A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062; # (a◌𐽏◌֚◌̖◌〪b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING RESH BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F50 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062; # (a◌֚◌̖◌〪◌𐽐b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING STROKE BELOW, LATIN SMALL LETTER B
+0061 10F50 059A 0316 302A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062; # (a◌𐽐◌֚◌̖◌〪b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING STROKE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11046 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062; # (a◌ְ◌्◌゙◌𑁆b; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BRAHMI VIRAMA, LATIN SMALL LETTER B
 0061 11046 05B0 094D 3099 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062; # (a◌𑁆◌ְ◌्◌゙b; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; ) LATIN SMALL LETTER A, BRAHMI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1107F 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062; # (a◌ְ◌्◌゙◌𑁿b; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BRAHMI NUMBER JOINER, LATIN SMALL LETTER B
@@ -18361,6 +18398,8 @@
 0061 112E9 3099 093C 0334 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062; # (a◌𑋩◌゙◌़◌̴b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; ) LATIN SMALL LETTER A, KHUDAWADI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 112EA 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062; # (a◌ְ◌्◌゙◌𑋪b; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KHUDAWADI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 112EA 05B0 094D 3099 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062; # (a◌𑋪◌ְ◌्◌゙b; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; ) LATIN SMALL LETTER A, KHUDAWADI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 1133B 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062; # (a◌゙◌़◌̴◌𑌻b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, COMBINING BINDU BELOW, LATIN SMALL LETTER B
+0061 1133B 3099 093C 0334 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062; # (a◌𑌻◌゙◌़◌̴b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; ) LATIN SMALL LETTER A, COMBINING BINDU BELOW, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 3099 093C 0334 1133C 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062; # (a◌゙◌़◌̴◌𑌼b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, GRANTHA SIGN NUKTA, LATIN SMALL LETTER B
 0061 1133C 3099 093C 0334 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062; # (a◌𑌼◌゙◌़◌̴b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; ) LATIN SMALL LETTER A, GRANTHA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1134D 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062; # (a◌ְ◌्◌゙𑍍b; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GRANTHA SIGN VIRAMA, LATIN SMALL LETTER B
@@ -18393,6 +18432,8 @@
 0061 11442 05B0 094D 3099 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062; # (a◌𑑂◌ְ◌्◌゙b; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; ) LATIN SMALL LETTER A, NEWA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 3099 093C 0334 11446 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062; # (a◌゙◌़◌̴◌𑑆b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, NEWA SIGN NUKTA, LATIN SMALL LETTER B
 0061 11446 3099 093C 0334 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062; # (a◌𑑆◌゙◌़◌̴b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; ) LATIN SMALL LETTER A, NEWA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1145E 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062; # (a◌̕◌̀◌֮◌𑑞b; à◌֮◌𑑞◌̕b; a◌֮◌̀◌𑑞◌̕b; à◌֮◌𑑞◌̕b; a◌֮◌̀◌𑑞◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NEWA SANDHI MARK, LATIN SMALL LETTER B
+0061 1145E 0315 0300 05AE 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062; # (a◌𑑞◌̕◌̀◌֮b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; ) LATIN SMALL LETTER A, NEWA SANDHI MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 05B0 094D 3099 114C2 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062; # (a◌ְ◌्◌゙◌𑓂b; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, TIRHUTA SIGN VIRAMA, LATIN SMALL LETTER B
 0061 114C2 05B0 094D 3099 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062; # (a◌𑓂◌ְ◌्◌゙b; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; ) LATIN SMALL LETTER A, TIRHUTA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 3099 093C 0334 114C3 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062; # (a◌゙◌़◌̴◌𑓃b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, TIRHUTA SIGN NUKTA, LATIN SMALL LETTER B
@@ -18409,6 +18450,10 @@
 0061 116B7 3099 093C 0334 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062; # (a◌𑚷◌゙◌़◌̴b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; ) LATIN SMALL LETTER A, TAKRI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1172B 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062; # (a◌ְ◌्◌゙◌𑜫b; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, AHOM SIGN KILLER, LATIN SMALL LETTER B
 0061 1172B 05B0 094D 3099 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062; # (a◌𑜫◌ְ◌्◌゙b; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; ) LATIN SMALL LETTER A, AHOM SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11839 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062; # (a◌ְ◌्◌゙◌𑠹b; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DOGRA SIGN VIRAMA, LATIN SMALL LETTER B
+0061 11839 05B0 094D 3099 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062; # (a◌𑠹◌ְ◌्◌゙b; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; ) LATIN SMALL LETTER A, DOGRA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 1183A 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062; # (a◌゙◌़◌̴◌𑠺b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, DOGRA SIGN NUKTA, LATIN SMALL LETTER B
+0061 1183A 3099 093C 0334 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062; # (a◌𑠺◌゙◌़◌̴b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; ) LATIN SMALL LETTER A, DOGRA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11A34 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062; # (a◌ְ◌्◌゙◌𑨴b; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SIGN VIRAMA, LATIN SMALL LETTER B
 0061 11A34 05B0 094D 3099 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062; # (a◌𑨴◌ְ◌्◌゙b; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11A47 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062; # (a◌ְ◌्◌゙◌𑩇b; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SUBJOINER, LATIN SMALL LETTER B
@@ -18423,6 +18468,8 @@
 0061 11D44 05B0 094D 3099 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062; # (a◌𑵄◌ְ◌्◌゙b; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN HALANTA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11D45 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062; # (a◌ְ◌्◌゙◌𑵅b; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI VIRAMA, LATIN SMALL LETTER B
 0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D97 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062; # (a◌ְ◌्◌゙◌𑶗b; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GUNJALA GONDI VIRAMA, LATIN SMALL LETTER B
+0061 11D97 05B0 094D 3099 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062; # (a◌𑶗◌ְ◌्◌゙b; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; ) LATIN SMALL LETTER A, GUNJALA GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 093C 0334 16AF0 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062; # (a◌़◌̴◌𖫰b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B
 0061 16AF0 093C 0334 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062; # (a◌𖫰◌़◌̴b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 093C 0334 16AF1 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062; # (a◌़◌̴◌𖫱b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B
diff -Nru emacs-26.1+1/admin/unidata/SpecialCasing.txt emacs-26.3+1/admin/unidata/SpecialCasing.txt
--- emacs-26.1+1/admin/unidata/SpecialCasing.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/SpecialCasing.txt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-# SpecialCasing-10.0.0.txt
-# Date: 2017-04-14, 05:40:43 GMT
-# © 2017 Unicode®, Inc.
+# SpecialCasing-11.0.0.txt
+# Date: 2018-02-22, 06:16:47 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -121,7 +121,7 @@
 
 # The following cases are already in the UnicodeData.txt file, so are only commented here.
 
-# 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI
+# 0345; 0345; 0399; 0399; # COMBINING GREEK YPOGEGRAMMENI
 
 # All letters with YPOGEGRAMMENI (iota-subscript) or PROSGEGRAMMENI (iota adscript)
 # have special uppercases.
diff -Nru emacs-26.1+1/admin/unidata/UnicodeData.txt emacs-26.3+1/admin/unidata/UnicodeData.txt
--- emacs-26.1+1/admin/unidata/UnicodeData.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/UnicodeData.txt	2019-09-10 00:32:49.000000000 +0000
@@ -1362,6 +1362,7 @@
 055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
 055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
 055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
+0560;ARMENIAN SMALL LETTER TURNED AYB;Ll;0;L;;;;;N;;;;;
 0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
 0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
 0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
@@ -1401,6 +1402,7 @@
 0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
 0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
 0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L; 0565 0582;;;;N;;;;;
+0588;ARMENIAN SMALL LETTER YI WITH STROKE;Ll;0;L;;;;;N;;;;;
 0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
 058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
 058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
@@ -1488,6 +1490,7 @@
 05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
 05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
 05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
+05EF;HEBREW YOD TRIANGLE;Lo;0;R;;;;;N;;;;;
 05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
 05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
 05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
@@ -1982,6 +1985,9 @@
 07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
 07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
 07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+07FD;NKO DANTAYALAN;Mn;220;NSM;;;;;N;;;;;
+07FE;NKO DOROME SIGN;Sc;0;R;;;;;N;;;;;
+07FF;NKO TAMAN SIGN;Sc;0;R;;;;;N;;;;;
 0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;;
 0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;;
 0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;;
@@ -2112,6 +2118,7 @@
 08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;;
 08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;;
 08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;;
+08D3;ARABIC SMALL LOW WAW;Mn;220;NSM;;;;;N;;;;;
 08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;;
 08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;;
 08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;;
@@ -2379,6 +2386,7 @@
 09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
 09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
 09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+09FE;BENGALI SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
 0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
 0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
 0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2458,6 +2466,7 @@
 0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
 0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
 0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
+0A76;GURMUKHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2715,6 +2724,7 @@
 0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
 0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C04;TELUGU SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
 0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
 0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
@@ -2811,6 +2821,7 @@
 0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C84;KANNADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
 0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
 0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
 0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
@@ -3667,54 +3678,54 @@
 10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25;
 10C7;GEORGIAN CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;2D27;
 10CD;GEORGIAN CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;2D2D;
-10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
-10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
-10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
-10D3;GEORGIAN LETTER DON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;;;
-10D4;GEORGIAN LETTER EN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;;;
-10D5;GEORGIAN LETTER VIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;;;
-10D6;GEORGIAN LETTER ZEN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;;;
-10D7;GEORGIAN LETTER TAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;;;
-10D8;GEORGIAN LETTER IN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;;;
-10D9;GEORGIAN LETTER KAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;;;
-10DA;GEORGIAN LETTER LAS;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;;;
-10DB;GEORGIAN LETTER MAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;;;
-10DC;GEORGIAN LETTER NAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;;;
-10DD;GEORGIAN LETTER ON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;;;
-10DE;GEORGIAN LETTER PAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;;;
-10DF;GEORGIAN LETTER ZHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;;;
-10E0;GEORGIAN LETTER RAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;;;
-10E1;GEORGIAN LETTER SAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;;;
-10E2;GEORGIAN LETTER TAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;;;
-10E3;GEORGIAN LETTER UN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;;;
-10E4;GEORGIAN LETTER PHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;;;
-10E5;GEORGIAN LETTER KHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;;;
-10E6;GEORGIAN LETTER GHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;;;
-10E7;GEORGIAN LETTER QAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;;;
-10E8;GEORGIAN LETTER SHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;;;
-10E9;GEORGIAN LETTER CHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;;;
-10EA;GEORGIAN LETTER CAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;;;
-10EB;GEORGIAN LETTER JIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;;;
-10EC;GEORGIAN LETTER CIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;;;
-10ED;GEORGIAN LETTER CHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;;;
-10EE;GEORGIAN LETTER XAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;;;
-10EF;GEORGIAN LETTER JHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;;;
-10F0;GEORGIAN LETTER HAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;;;
-10F1;GEORGIAN LETTER HE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;;;
-10F2;GEORGIAN LETTER HIE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;;;
-10F3;GEORGIAN LETTER WE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;;;
-10F4;GEORGIAN LETTER HAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;;;
-10F5;GEORGIAN LETTER HOE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;;;
-10F6;GEORGIAN LETTER FI;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;;;
-10F7;GEORGIAN LETTER YN;Lo;0;L;;;;;N;;;;;
-10F8;GEORGIAN LETTER ELIFI;Lo;0;L;;;;;N;;;;;
-10F9;GEORGIAN LETTER TURNED GAN;Lo;0;L;;;;;N;;;;;
-10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
+10D0;GEORGIAN LETTER AN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;1C90;;10D0
+10D1;GEORGIAN LETTER BAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;1C91;;10D1
+10D2;GEORGIAN LETTER GAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;1C92;;10D2
+10D3;GEORGIAN LETTER DON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;1C93;;10D3
+10D4;GEORGIAN LETTER EN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;1C94;;10D4
+10D5;GEORGIAN LETTER VIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;1C95;;10D5
+10D6;GEORGIAN LETTER ZEN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;1C96;;10D6
+10D7;GEORGIAN LETTER TAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;1C97;;10D7
+10D8;GEORGIAN LETTER IN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;1C98;;10D8
+10D9;GEORGIAN LETTER KAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;1C99;;10D9
+10DA;GEORGIAN LETTER LAS;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;1C9A;;10DA
+10DB;GEORGIAN LETTER MAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;1C9B;;10DB
+10DC;GEORGIAN LETTER NAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;1C9C;;10DC
+10DD;GEORGIAN LETTER ON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;1C9D;;10DD
+10DE;GEORGIAN LETTER PAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;1C9E;;10DE
+10DF;GEORGIAN LETTER ZHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;1C9F;;10DF
+10E0;GEORGIAN LETTER RAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;1CA0;;10E0
+10E1;GEORGIAN LETTER SAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;1CA1;;10E1
+10E2;GEORGIAN LETTER TAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;1CA2;;10E2
+10E3;GEORGIAN LETTER UN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;1CA3;;10E3
+10E4;GEORGIAN LETTER PHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;1CA4;;10E4
+10E5;GEORGIAN LETTER KHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;1CA5;;10E5
+10E6;GEORGIAN LETTER GHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;1CA6;;10E6
+10E7;GEORGIAN LETTER QAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;1CA7;;10E7
+10E8;GEORGIAN LETTER SHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;1CA8;;10E8
+10E9;GEORGIAN LETTER CHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;1CA9;;10E9
+10EA;GEORGIAN LETTER CAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;1CAA;;10EA
+10EB;GEORGIAN LETTER JIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;1CAB;;10EB
+10EC;GEORGIAN LETTER CIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;1CAC;;10EC
+10ED;GEORGIAN LETTER CHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;1CAD;;10ED
+10EE;GEORGIAN LETTER XAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;1CAE;;10EE
+10EF;GEORGIAN LETTER JHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;1CAF;;10EF
+10F0;GEORGIAN LETTER HAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;1CB0;;10F0
+10F1;GEORGIAN LETTER HE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;1CB1;;10F1
+10F2;GEORGIAN LETTER HIE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;1CB2;;10F2
+10F3;GEORGIAN LETTER WE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;1CB3;;10F3
+10F4;GEORGIAN LETTER HAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;1CB4;;10F4
+10F5;GEORGIAN LETTER HOE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;1CB5;;10F5
+10F6;GEORGIAN LETTER FI;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;1CB6;;10F6
+10F7;GEORGIAN LETTER YN;Ll;0;L;;;;;N;;;1CB7;;10F7
+10F8;GEORGIAN LETTER ELIFI;Ll;0;L;;;;;N;;;1CB8;;10F8
+10F9;GEORGIAN LETTER TURNED GAN;Ll;0;L;;;;;N;;;1CB9;;10F9
+10FA;GEORGIAN LETTER AIN;Ll;0;L;;;;;N;;;1CBA;;10FA
 10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
 10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L; 10DC;;;;N;;;;;
-10FD;GEORGIAN LETTER AEN;Lo;0;L;;;;;N;;;;;
-10FE;GEORGIAN LETTER HARD SIGN;Lo;0;L;;;;;N;;;;;
-10FF;GEORGIAN LETTER LABIAL SIGN;Lo;0;L;;;;;N;;;;;
+10FD;GEORGIAN LETTER AEN;Ll;0;L;;;;;N;;;1CBD;;10FD
+10FE;GEORGIAN LETTER HARD SIGN;Ll;0;L;;;;;N;;;1CBE;;10FE
+10FF;GEORGIAN LETTER LABIAL SIGN;Ll;0;L;;;;;N;;;1CBF;;10FF
 1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
 1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
 1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;;
@@ -5513,6 +5524,7 @@
 1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
 1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
 1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
+1878;MONGOLIAN LETTER CHA WITH TWO DOTS;Lo;0;L;;;;;N;;;;;
 1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
 1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
 1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
@@ -6388,6 +6400,52 @@
 1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
 1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462
 1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A
+1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0;
+1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1;
+1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2;
+1C93;GEORGIAN MTAVRULI CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;10D3;
+1C94;GEORGIAN MTAVRULI CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;10D4;
+1C95;GEORGIAN MTAVRULI CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;10D5;
+1C96;GEORGIAN MTAVRULI CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;10D6;
+1C97;GEORGIAN MTAVRULI CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;10D7;
+1C98;GEORGIAN MTAVRULI CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;10D8;
+1C99;GEORGIAN MTAVRULI CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;10D9;
+1C9A;GEORGIAN MTAVRULI CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;10DA;
+1C9B;GEORGIAN MTAVRULI CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;10DB;
+1C9C;GEORGIAN MTAVRULI CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;10DC;
+1C9D;GEORGIAN MTAVRULI CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;10DD;
+1C9E;GEORGIAN MTAVRULI CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;10DE;
+1C9F;GEORGIAN MTAVRULI CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;10DF;
+1CA0;GEORGIAN MTAVRULI CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;10E0;
+1CA1;GEORGIAN MTAVRULI CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;10E1;
+1CA2;GEORGIAN MTAVRULI CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;10E2;
+1CA3;GEORGIAN MTAVRULI CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;10E3;
+1CA4;GEORGIAN MTAVRULI CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;10E4;
+1CA5;GEORGIAN MTAVRULI CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;10E5;
+1CA6;GEORGIAN MTAVRULI CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;10E6;
+1CA7;GEORGIAN MTAVRULI CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;10E7;
+1CA8;GEORGIAN MTAVRULI CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;10E8;
+1CA9;GEORGIAN MTAVRULI CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;10E9;
+1CAA;GEORGIAN MTAVRULI CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;10EA;
+1CAB;GEORGIAN MTAVRULI CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;10EB;
+1CAC;GEORGIAN MTAVRULI CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;10EC;
+1CAD;GEORGIAN MTAVRULI CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;10ED;
+1CAE;GEORGIAN MTAVRULI CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;10EE;
+1CAF;GEORGIAN MTAVRULI CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;10EF;
+1CB0;GEORGIAN MTAVRULI CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;10F0;
+1CB1;GEORGIAN MTAVRULI CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;10F1;
+1CB2;GEORGIAN MTAVRULI CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;10F2;
+1CB3;GEORGIAN MTAVRULI CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;10F3;
+1CB4;GEORGIAN MTAVRULI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;10F4;
+1CB5;GEORGIAN MTAVRULI CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;10F5;
+1CB6;GEORGIAN MTAVRULI CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;10F6;
+1CB7;GEORGIAN MTAVRULI CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;10F7;
+1CB8;GEORGIAN MTAVRULI CAPITAL LETTER ELIFI;Lu;0;L;;;;;N;;;;10F8;
+1CB9;GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN;Lu;0;L;;;;;N;;;;10F9;
+1CBA;GEORGIAN MTAVRULI CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;10FA;
+1CBD;GEORGIAN MTAVRULI CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;10FD;
+1CBE;GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;10FE;
+1CBF;GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN;Lu;0;L;;;;;N;;;;10FF;
 1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;;
 1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;;
 1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;;
@@ -9559,7 +9617,7 @@
 299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
 299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
-29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;N;;;;;
 29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
@@ -10092,6 +10150,9 @@
 2BB7;RIBBON ARROW RIGHT DOWN;So;0;ON;;;;;N;;;;;
 2BB8;UPWARDS WHITE ARROW FROM BAR WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
 2BB9;UP ARROWHEAD IN A RECTANGLE BOX;So;0;ON;;;;;N;;;;;
+2BBA;OVERLAPPING WHITE SQUARES;So;0;ON;;;;;N;;;;;
+2BBB;OVERLAPPING WHITE AND BLACK SQUARES;So;0;ON;;;;;N;;;;;
+2BBC;OVERLAPPING BLACK SQUARES;So;0;ON;;;;;N;;;;;
 2BBD;BALLOT BOX WITH LIGHT X;So;0;ON;;;;;N;;;;;
 2BBE;CIRCLED X;So;0;ON;;;;;N;;;;;
 2BBF;CIRCLED BOLD X;So;0;ON;;;;;N;;;;;
@@ -10113,10 +10174,50 @@
 2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
 2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
 2BD2;GROUP MARK;So;0;ON;;;;;N;;;;;
+2BD3;PLUTO FORM TWO;So;0;ON;;;;;N;;;;;
+2BD4;PLUTO FORM THREE;So;0;ON;;;;;N;;;;;
+2BD5;PLUTO FORM FOUR;So;0;ON;;;;;N;;;;;
+2BD6;PLUTO FORM FIVE;So;0;ON;;;;;N;;;;;
+2BD7;TRANSPLUTO;So;0;ON;;;;;N;;;;;
+2BD8;PROSERPINA;So;0;ON;;;;;N;;;;;
+2BD9;ASTRAEA;So;0;ON;;;;;N;;;;;
+2BDA;HYGIEA;So;0;ON;;;;;N;;;;;
+2BDB;PHOLUS;So;0;ON;;;;;N;;;;;
+2BDC;NESSUS;So;0;ON;;;;;N;;;;;
+2BDD;WHITE MOON SELENA;So;0;ON;;;;;N;;;;;
+2BDE;BLACK DIAMOND ON CROSS;So;0;ON;;;;;N;;;;;
+2BDF;TRUE LIGHT MOON ARTA;So;0;ON;;;;;N;;;;;
+2BE0;CUPIDO;So;0;ON;;;;;N;;;;;
+2BE1;HADES;So;0;ON;;;;;N;;;;;
+2BE2;ZEUS;So;0;ON;;;;;N;;;;;
+2BE3;KRONOS;So;0;ON;;;;;N;;;;;
+2BE4;APOLLON;So;0;ON;;;;;N;;;;;
+2BE5;ADMETOS;So;0;ON;;;;;N;;;;;
+2BE6;VULCANUS;So;0;ON;;;;;N;;;;;
+2BE7;POSEIDON;So;0;ON;;;;;N;;;;;
+2BE8;LEFT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BE9;RIGHT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BEA;STAR WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2BEB;STAR WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
 2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEF;DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BF0;ERIS FORM ONE;So;0;ON;;;;;N;;;;;
+2BF1;ERIS FORM TWO;So;0;ON;;;;;N;;;;;
+2BF2;SEDNA;So;0;ON;;;;;N;;;;;
+2BF3;RUSSIAN ASTROLOGICAL SYMBOL VIGINTILE;So;0;ON;;;;;N;;;;;
+2BF4;RUSSIAN ASTROLOGICAL SYMBOL NOVILE;So;0;ON;;;;;N;;;;;
+2BF5;RUSSIAN ASTROLOGICAL SYMBOL QUINTILE;So;0;ON;;;;;N;;;;;
+2BF6;RUSSIAN ASTROLOGICAL SYMBOL BINOVILE;So;0;ON;;;;;N;;;;;
+2BF7;RUSSIAN ASTROLOGICAL SYMBOL SENTAGON;So;0;ON;;;;;N;;;;;
+2BF8;RUSSIAN ASTROLOGICAL SYMBOL TREDECILE;So;0;ON;;;;;N;;;;;
+2BF9;EQUALS SIGN WITH INFINITY BELOW;So;0;ON;;;;;N;;;;;
+2BFA;UNITED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFB;SEPARATED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFC;DOUBLED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFD;PASSED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFE;REVERSED RIGHT ANGLE;So;0;ON;;;;;Y;;;;;
 2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
 2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
 2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
@@ -10650,6 +10751,11 @@
 2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;;
 2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;;
 2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;;
+2E4A;DOTTED SOLIDUS;Po;0;ON;;;;;N;;;;;
+2E4B;TRIPLE DAGGER;Po;0;ON;;;;;N;;;;;
+2E4C;MEDIEVAL COMMA;Po;0;ON;;;;;N;;;;;
+2E4D;PARAGRAPHUS MARK;Po;0;ON;;;;;N;;;;;
+2E4E;PUNCTUS ELEVATUS MARK;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -11286,6 +11392,7 @@
 312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
 312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
 312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;;
+312F;BOPOMOFO LETTER NN;Lo;0;L;;;;;N;;;;;
 3131;HANGUL LETTER KIYEOK;Lo;0;L; 1100;;;;N;HANGUL LETTER GIYEOG;;;;
 3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L; 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
 3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L; 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
@@ -11729,6 +11836,7 @@
 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;;
 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;;
 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L; 4EE4 548C;;;;N;;;;;
 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
@@ -12052,7 +12160,7 @@
 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
 4E00;;Lo;0;L;;;;;N;;;;;
-9FEA;;Lo;0;L;;;;;N;;;;;
+9FEF;;Lo;0;L;;;;;N;;;;;
 A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
 A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
 A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
@@ -13980,6 +14088,7 @@
 A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261;
 A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C;
 A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A;
+A7AF;LATIN LETTER SMALL CAPITAL Q;Ll;0;L;;;;;N;;;;;
 A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E;
 A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287;
 A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D;
@@ -13988,6 +14097,8 @@
 A7B5;LATIN SMALL LETTER BETA;Ll;0;L;;;;;N;;;A7B4;;A7B4
 A7B6;LATIN CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;A7B7;
 A7B7;LATIN SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;A7B6;;A7B6
+A7B8;LATIN CAPITAL LETTER U WITH STROKE;Lu;0;L;;;;;N;;;;A7B9;
+A7B9;LATIN SMALL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;A7B8;;A7B8
 A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;;
 A7F8;MODIFIER LETTER CAPITAL H WITH STROKE;Lm;0;L; 0126;;;;N;;;;;
 A7F9;MODIFIER LETTER SMALL LIGATURE OE;Lm;0;L; 0153;;;;N;;;;;
@@ -14219,6 +14330,8 @@
 A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
 A8FC;DEVANAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
 A8FD;DEVANAGARI JAIN OM;Lo;0;L;;;;;N;;;;;
+A8FE;DEVANAGARI LETTER AY;Lo;0;L;;;;;N;;;;;
+A8FF;DEVANAGARI VOWEL SIGN AY;Mn;0;NSM;;;;;N;;;;;
 A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -18363,6 +18476,8 @@
 10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
 10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
 10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
+10A34;KHAROSHTHI LETTER TTTA;Lo;0;R;;;;;N;;;;;
+10A35;KHAROSHTHI LETTER VHA;Lo;0;R;;;;;N;;;;;
 10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
 10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
 10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
@@ -18375,6 +18490,7 @@
 10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
 10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
 10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10A48;KHAROSHTHI FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
 10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
 10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
 10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
@@ -18827,6 +18943,56 @@
 10CFD;OLD HUNGARIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
 10CFE;OLD HUNGARIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
 10CFF;OLD HUNGARIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10D00;HANIFI ROHINGYA LETTER A;Lo;0;AL;;;;;N;;;;;
+10D01;HANIFI ROHINGYA LETTER BA;Lo;0;AL;;;;;N;;;;;
+10D02;HANIFI ROHINGYA LETTER PA;Lo;0;AL;;;;;N;;;;;
+10D03;HANIFI ROHINGYA LETTER TA;Lo;0;AL;;;;;N;;;;;
+10D04;HANIFI ROHINGYA LETTER TTA;Lo;0;AL;;;;;N;;;;;
+10D05;HANIFI ROHINGYA LETTER JA;Lo;0;AL;;;;;N;;;;;
+10D06;HANIFI ROHINGYA LETTER CA;Lo;0;AL;;;;;N;;;;;
+10D07;HANIFI ROHINGYA LETTER HA;Lo;0;AL;;;;;N;;;;;
+10D08;HANIFI ROHINGYA LETTER KHA;Lo;0;AL;;;;;N;;;;;
+10D09;HANIFI ROHINGYA LETTER FA;Lo;0;AL;;;;;N;;;;;
+10D0A;HANIFI ROHINGYA LETTER DA;Lo;0;AL;;;;;N;;;;;
+10D0B;HANIFI ROHINGYA LETTER DDA;Lo;0;AL;;;;;N;;;;;
+10D0C;HANIFI ROHINGYA LETTER RA;Lo;0;AL;;;;;N;;;;;
+10D0D;HANIFI ROHINGYA LETTER RRA;Lo;0;AL;;;;;N;;;;;
+10D0E;HANIFI ROHINGYA LETTER ZA;Lo;0;AL;;;;;N;;;;;
+10D0F;HANIFI ROHINGYA LETTER SA;Lo;0;AL;;;;;N;;;;;
+10D10;HANIFI ROHINGYA LETTER SHA;Lo;0;AL;;;;;N;;;;;
+10D11;HANIFI ROHINGYA LETTER KA;Lo;0;AL;;;;;N;;;;;
+10D12;HANIFI ROHINGYA LETTER GA;Lo;0;AL;;;;;N;;;;;
+10D13;HANIFI ROHINGYA LETTER LA;Lo;0;AL;;;;;N;;;;;
+10D14;HANIFI ROHINGYA LETTER MA;Lo;0;AL;;;;;N;;;;;
+10D15;HANIFI ROHINGYA LETTER NA;Lo;0;AL;;;;;N;;;;;
+10D16;HANIFI ROHINGYA LETTER WA;Lo;0;AL;;;;;N;;;;;
+10D17;HANIFI ROHINGYA LETTER KINNA WA;Lo;0;AL;;;;;N;;;;;
+10D18;HANIFI ROHINGYA LETTER YA;Lo;0;AL;;;;;N;;;;;
+10D19;HANIFI ROHINGYA LETTER KINNA YA;Lo;0;AL;;;;;N;;;;;
+10D1A;HANIFI ROHINGYA LETTER NGA;Lo;0;AL;;;;;N;;;;;
+10D1B;HANIFI ROHINGYA LETTER NYA;Lo;0;AL;;;;;N;;;;;
+10D1C;HANIFI ROHINGYA LETTER VA;Lo;0;AL;;;;;N;;;;;
+10D1D;HANIFI ROHINGYA VOWEL A;Lo;0;AL;;;;;N;;;;;
+10D1E;HANIFI ROHINGYA VOWEL I;Lo;0;AL;;;;;N;;;;;
+10D1F;HANIFI ROHINGYA VOWEL U;Lo;0;AL;;;;;N;;;;;
+10D20;HANIFI ROHINGYA VOWEL E;Lo;0;AL;;;;;N;;;;;
+10D21;HANIFI ROHINGYA VOWEL O;Lo;0;AL;;;;;N;;;;;
+10D22;HANIFI ROHINGYA MARK SAKIN;Lo;0;AL;;;;;N;;;;;
+10D23;HANIFI ROHINGYA MARK NA KHONNA;Lo;0;AL;;;;;N;;;;;
+10D24;HANIFI ROHINGYA SIGN HARBAHAY;Mn;230;NSM;;;;;N;;;;;
+10D25;HANIFI ROHINGYA SIGN TAHALA;Mn;230;NSM;;;;;N;;;;;
+10D26;HANIFI ROHINGYA SIGN TANA;Mn;230;NSM;;;;;N;;;;;
+10D27;HANIFI ROHINGYA SIGN TASSI;Mn;230;NSM;;;;;N;;;;;
+10D30;HANIFI ROHINGYA DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+10D31;HANIFI ROHINGYA DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+10D32;HANIFI ROHINGYA DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+10D33;HANIFI ROHINGYA DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+10D34;HANIFI ROHINGYA DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+10D35;HANIFI ROHINGYA DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+10D36;HANIFI ROHINGYA DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
 10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;;
 10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;;
 10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;;
@@ -18858,6 +19024,88 @@
 10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;;
 10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;;
 10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;;
+10F00;OLD SOGDIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10F01;OLD SOGDIAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
+10F02;OLD SOGDIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10F03;OLD SOGDIAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;;
+10F04;OLD SOGDIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10F05;OLD SOGDIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10F06;OLD SOGDIAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;;
+10F07;OLD SOGDIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10F08;OLD SOGDIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10F09;OLD SOGDIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10F0A;OLD SOGDIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10F0B;OLD SOGDIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10F0C;OLD SOGDIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10F0D;OLD SOGDIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10F0E;OLD SOGDIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10F0F;OLD SOGDIAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+10F10;OLD SOGDIAN LETTER FINAL NUN WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F11;OLD SOGDIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10F12;OLD SOGDIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10F13;OLD SOGDIAN LETTER ALTERNATE AYIN;Lo;0;R;;;;;N;;;;;
+10F14;OLD SOGDIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10F15;OLD SOGDIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10F16;OLD SOGDIAN LETTER FINAL SADHE;Lo;0;R;;;;;N;;;;;
+10F17;OLD SOGDIAN LETTER FINAL SADHE WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F18;OLD SOGDIAN LETTER RESH-AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F19;OLD SOGDIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10F1A;OLD SOGDIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10F1B;OLD SOGDIAN LETTER FINAL TAW;Lo;0;R;;;;;N;;;;;
+10F1C;OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F1D;OLD SOGDIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10F1E;OLD SOGDIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10F1F;OLD SOGDIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10F20;OLD SOGDIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10F21;OLD SOGDIAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10F22;OLD SOGDIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10F23;OLD SOGDIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10F24;OLD SOGDIAN NUMBER THIRTY;No;0;R;;;;30;N;;;;;
+10F25;OLD SOGDIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10F26;OLD SOGDIAN FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+10F27;OLD SOGDIAN LIGATURE AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F30;SOGDIAN LETTER ALEPH;Lo;0;AL;;;;;N;;;;;
+10F31;SOGDIAN LETTER BETH;Lo;0;AL;;;;;N;;;;;
+10F32;SOGDIAN LETTER GIMEL;Lo;0;AL;;;;;N;;;;;
+10F33;SOGDIAN LETTER HE;Lo;0;AL;;;;;N;;;;;
+10F34;SOGDIAN LETTER WAW;Lo;0;AL;;;;;N;;;;;
+10F35;SOGDIAN LETTER ZAYIN;Lo;0;AL;;;;;N;;;;;
+10F36;SOGDIAN LETTER HETH;Lo;0;AL;;;;;N;;;;;
+10F37;SOGDIAN LETTER YODH;Lo;0;AL;;;;;N;;;;;
+10F38;SOGDIAN LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+10F39;SOGDIAN LETTER LAMEDH;Lo;0;AL;;;;;N;;;;;
+10F3A;SOGDIAN LETTER MEM;Lo;0;AL;;;;;N;;;;;
+10F3B;SOGDIAN LETTER NUN;Lo;0;AL;;;;;N;;;;;
+10F3C;SOGDIAN LETTER SAMEKH;Lo;0;AL;;;;;N;;;;;
+10F3D;SOGDIAN LETTER AYIN;Lo;0;AL;;;;;N;;;;;
+10F3E;SOGDIAN LETTER PE;Lo;0;AL;;;;;N;;;;;
+10F3F;SOGDIAN LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+10F40;SOGDIAN LETTER RESH-AYIN;Lo;0;AL;;;;;N;;;;;
+10F41;SOGDIAN LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+10F42;SOGDIAN LETTER TAW;Lo;0;AL;;;;;N;;;;;
+10F43;SOGDIAN LETTER FETH;Lo;0;AL;;;;;N;;;;;
+10F44;SOGDIAN LETTER LESH;Lo;0;AL;;;;;N;;;;;
+10F45;SOGDIAN INDEPENDENT SHIN;Lo;0;AL;;;;;N;;;;;
+10F46;SOGDIAN COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10F47;SOGDIAN COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+10F48;SOGDIAN COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F49;SOGDIAN COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4A;SOGDIAN COMBINING CURVE ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4B;SOGDIAN COMBINING CURVE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4C;SOGDIAN COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4D;SOGDIAN COMBINING HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4E;SOGDIAN COMBINING LONG HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4F;SOGDIAN COMBINING RESH BELOW;Mn;220;NSM;;;;;N;;;;;
+10F50;SOGDIAN COMBINING STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F51;SOGDIAN NUMBER ONE;No;0;AL;;;;1;N;;;;;
+10F52;SOGDIAN NUMBER TEN;No;0;AL;;;;10;N;;;;;
+10F53;SOGDIAN NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+10F54;SOGDIAN NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+10F55;SOGDIAN PUNCTUATION TWO VERTICAL BARS;Po;0;AL;;;;;N;;;;;
+10F56;SOGDIAN PUNCTUATION TWO VERTICAL BARS WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F57;SOGDIAN PUNCTUATION CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
+10F58;SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F59;SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
 11000;BRAHMI SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
 11001;BRAHMI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 11002;BRAHMI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -19033,6 +19281,7 @@
 110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
 110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
 110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+110CD;KAITHI NUMBER SIGN ABOVE;Cf;0;L;;;;;N;;;;;
 110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;;
 110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;;
 110D2;SORA SOMPENG LETTER BAH;Lo;0;L;;;;;N;;;;;
@@ -19135,6 +19384,9 @@
 11141;CHAKMA DANDA;Po;0;L;;;;;N;;;;;
 11142;CHAKMA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 11143;CHAKMA QUESTION MARK;Po;0;L;;;;;N;;;;;
+11144;CHAKMA LETTER LHAA;Lo;0;L;;;;;N;;;;;
+11145;CHAKMA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11146;CHAKMA VOWEL SIGN EI;Mc;0;L;;;;;N;;;;;
 11150;MAHAJANI LETTER A;Lo;0;L;;;;;N;;;;;
 11151;MAHAJANI LETTER I;Lo;0;L;;;;;N;;;;;
 11152;MAHAJANI LETTER U;Lo;0;L;;;;;N;;;;;
@@ -19247,7 +19499,7 @@
 111C6;SHARADA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 111C7;SHARADA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 111C8;SHARADA SEPARATOR;Po;0;L;;;;;N;;;;;
-111C9;SHARADA SANDHI MARK;Po;0;L;;;;;N;;;;;
+111C9;SHARADA SANDHI MARK;Mn;0;NSM;;;;;N;;;;;
 111CA;SHARADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
 111CB;SHARADA VOWEL MODIFIER MARK;Mn;0;NSM;;;;;N;;;;;
 111CC;SHARADA EXTRA SHORT VOWEL MARK;Mn;0;NSM;;;;;N;;;;;
@@ -19507,6 +19759,7 @@
 11337;GRANTHA LETTER SSA;Lo;0;L;;;;;N;;;;;
 11338;GRANTHA LETTER SA;Lo;0;L;;;;;N;;;;;
 11339;GRANTHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1133B;COMBINING BINDU BELOW;Mn;7;NSM;;;;;N;;;;;
 1133C;GRANTHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
 1133D;GRANTHA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
 1133E;GRANTHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
@@ -19634,6 +19887,7 @@
 11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;;
 1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;;
+1145E;NEWA SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
 11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;;
 11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;;
 11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;;
@@ -19992,6 +20246,7 @@
 11717;AHOM LETTER GHA;Lo;0;L;;;;;N;;;;;
 11718;AHOM LETTER BHA;Lo;0;L;;;;;N;;;;;
 11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;;
+1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;;
 1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
 1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;;
 1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;;
@@ -20023,6 +20278,66 @@
 1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;;
 1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;;
 1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;;
+11800;DOGRA LETTER A;Lo;0;L;;;;;N;;;;;
+11801;DOGRA LETTER AA;Lo;0;L;;;;;N;;;;;
+11802;DOGRA LETTER I;Lo;0;L;;;;;N;;;;;
+11803;DOGRA LETTER II;Lo;0;L;;;;;N;;;;;
+11804;DOGRA LETTER U;Lo;0;L;;;;;N;;;;;
+11805;DOGRA LETTER UU;Lo;0;L;;;;;N;;;;;
+11806;DOGRA LETTER E;Lo;0;L;;;;;N;;;;;
+11807;DOGRA LETTER AI;Lo;0;L;;;;;N;;;;;
+11808;DOGRA LETTER O;Lo;0;L;;;;;N;;;;;
+11809;DOGRA LETTER AU;Lo;0;L;;;;;N;;;;;
+1180A;DOGRA LETTER KA;Lo;0;L;;;;;N;;;;;
+1180B;DOGRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1180C;DOGRA LETTER GA;Lo;0;L;;;;;N;;;;;
+1180D;DOGRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+1180E;DOGRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1180F;DOGRA LETTER CA;Lo;0;L;;;;;N;;;;;
+11810;DOGRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11811;DOGRA LETTER JA;Lo;0;L;;;;;N;;;;;
+11812;DOGRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11813;DOGRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11814;DOGRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+11815;DOGRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11816;DOGRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+11817;DOGRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11818;DOGRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+11819;DOGRA LETTER TA;Lo;0;L;;;;;N;;;;;
+1181A;DOGRA LETTER THA;Lo;0;L;;;;;N;;;;;
+1181B;DOGRA LETTER DA;Lo;0;L;;;;;N;;;;;
+1181C;DOGRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1181D;DOGRA LETTER NA;Lo;0;L;;;;;N;;;;;
+1181E;DOGRA LETTER PA;Lo;0;L;;;;;N;;;;;
+1181F;DOGRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11820;DOGRA LETTER BA;Lo;0;L;;;;;N;;;;;
+11821;DOGRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11822;DOGRA LETTER MA;Lo;0;L;;;;;N;;;;;
+11823;DOGRA LETTER YA;Lo;0;L;;;;;N;;;;;
+11824;DOGRA LETTER RA;Lo;0;L;;;;;N;;;;;
+11825;DOGRA LETTER LA;Lo;0;L;;;;;N;;;;;
+11826;DOGRA LETTER VA;Lo;0;L;;;;;N;;;;;
+11827;DOGRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11828;DOGRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11829;DOGRA LETTER SA;Lo;0;L;;;;;N;;;;;
+1182A;DOGRA LETTER HA;Lo;0;L;;;;;N;;;;;
+1182B;DOGRA LETTER RRA;Lo;0;L;;;;;N;;;;;
+1182C;DOGRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1182D;DOGRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1182E;DOGRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+1182F;DOGRA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11830;DOGRA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11831;DOGRA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11832;DOGRA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11833;DOGRA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11834;DOGRA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11835;DOGRA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11836;DOGRA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11837;DOGRA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11838;DOGRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11839;DOGRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1183A;DOGRA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1183B;DOGRA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 118A0;WARANG CITI CAPITAL LETTER NGAA;Lu;0;L;;;;;N;;;;118C0;
 118A1;WARANG CITI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;118C1;
 118A2;WARANG CITI CAPITAL LETTER WI;Lu;0;L;;;;;N;;;;118C2;
@@ -20114,8 +20429,8 @@
 11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
 11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
 11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mn;0;L;;;;;N;;;;;
+11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mn;0;L;;;;;N;;;;;
 11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;;
 11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
 11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;;
@@ -20254,6 +20569,7 @@
 11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;;
 11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;;
 11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A9D;SOYOMBO MARK PLUTA;Lo;0;L;;;;;N;;;;;
 11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;;
 11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;;
 11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;;
@@ -20556,6 +20872,94 @@
 11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11D60;GUNJALA GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D61;GUNJALA GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D62;GUNJALA GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D63;GUNJALA GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D64;GUNJALA GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D65;GUNJALA GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D67;GUNJALA GONDI LETTER EE;Lo;0;L;;;;;N;;;;;
+11D68;GUNJALA GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D6A;GUNJALA GONDI LETTER OO;Lo;0;L;;;;;N;;;;;
+11D6B;GUNJALA GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D6C;GUNJALA GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D6D;GUNJALA GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D6E;GUNJALA GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D6F;GUNJALA GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D70;GUNJALA GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D71;GUNJALA GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D72;GUNJALA GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D73;GUNJALA GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D74;GUNJALA GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D75;GUNJALA GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D76;GUNJALA GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D77;GUNJALA GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D78;GUNJALA GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D79;GUNJALA GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D7A;GUNJALA GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D7B;GUNJALA GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D7C;GUNJALA GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D7D;GUNJALA GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D7E;GUNJALA GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D7F;GUNJALA GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D80;GUNJALA GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D81;GUNJALA GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D82;GUNJALA GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D83;GUNJALA GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D84;GUNJALA GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D85;GUNJALA GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D86;GUNJALA GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D87;GUNJALA GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D88;GUNJALA GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D89;GUNJALA GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D8A;GUNJALA GONDI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11D8B;GUNJALA GONDI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11D8C;GUNJALA GONDI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11D8D;GUNJALA GONDI VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11D8E;GUNJALA GONDI VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11D90;GUNJALA GONDI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+11D91;GUNJALA GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D93;GUNJALA GONDI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+11D94;GUNJALA GONDI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11D95;GUNJALA GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D96;GUNJALA GONDI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11D97;GUNJALA GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D98;GUNJALA GONDI OM;Lo;0;L;;;;;N;;;;;
+11DA0;GUNJALA GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11DA1;GUNJALA GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11DA2;GUNJALA GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11DA3;GUNJALA GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11DA4;GUNJALA GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11DA5;GUNJALA GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11DA6;GUNJALA GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11DA7;GUNJALA GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11DA8;GUNJALA GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11DA9;GUNJALA GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;;
+11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;;
+11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+11EE3;MAKASAR LETTER PA;Lo;0;L;;;;;N;;;;;
+11EE4;MAKASAR LETTER BA;Lo;0;L;;;;;N;;;;;
+11EE5;MAKASAR LETTER MA;Lo;0;L;;;;;N;;;;;
+11EE6;MAKASAR LETTER TA;Lo;0;L;;;;;N;;;;;
+11EE7;MAKASAR LETTER DA;Lo;0;L;;;;;N;;;;;
+11EE8;MAKASAR LETTER NA;Lo;0;L;;;;;N;;;;;
+11EE9;MAKASAR LETTER CA;Lo;0;L;;;;;N;;;;;
+11EEA;MAKASAR LETTER JA;Lo;0;L;;;;;N;;;;;
+11EEB;MAKASAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+11EEC;MAKASAR LETTER YA;Lo;0;L;;;;;N;;;;;
+11EED;MAKASAR LETTER RA;Lo;0;L;;;;;N;;;;;
+11EEE;MAKASAR LETTER LA;Lo;0;L;;;;;N;;;;;
+11EEF;MAKASAR LETTER VA;Lo;0;L;;;;;N;;;;;
+11EF0;MAKASAR LETTER SA;Lo;0;L;;;;;N;;;;;
+11EF1;MAKASAR LETTER A;Lo;0;L;;;;;N;;;;;
+11EF2;MAKASAR ANGKA;Lo;0;L;;;;;N;;;;;
+11EF3;MAKASAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11EF4;MAKASAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11EF5;MAKASAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11EF6;MAKASAR VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11EF7;MAKASAR PASSIMBANG;Po;0;L;;;;;N;;;;;
+11EF8;MAKASAR END OF SECTION;Po;0;L;;;;;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -24219,6 +24623,97 @@
 16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;;
 16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;;
 16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;;
+16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60;
+16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61;
+16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62;
+16E43;MEDEFAIDRIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;16E63;
+16E44;MEDEFAIDRIN CAPITAL LETTER ATIU;Lu;0;L;;;;;N;;;;16E64;
+16E45;MEDEFAIDRIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;16E65;
+16E46;MEDEFAIDRIN CAPITAL LETTER KP;Lu;0;L;;;;;N;;;;16E66;
+16E47;MEDEFAIDRIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;16E67;
+16E48;MEDEFAIDRIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;16E68;
+16E49;MEDEFAIDRIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;16E69;
+16E4A;MEDEFAIDRIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;16E6A;
+16E4B;MEDEFAIDRIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16E6B;
+16E4C;MEDEFAIDRIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;16E6C;
+16E4D;MEDEFAIDRIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;16E6D;
+16E4E;MEDEFAIDRIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;16E6E;
+16E4F;MEDEFAIDRIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;16E6F;
+16E50;MEDEFAIDRIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;16E70;
+16E51;MEDEFAIDRIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;16E71;
+16E52;MEDEFAIDRIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;16E72;
+16E53;MEDEFAIDRIN CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;16E73;
+16E54;MEDEFAIDRIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;16E74;
+16E55;MEDEFAIDRIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;16E75;
+16E56;MEDEFAIDRIN CAPITAL LETTER HP;Lu;0;L;;;;;N;;;;16E76;
+16E57;MEDEFAIDRIN CAPITAL LETTER NY;Lu;0;L;;;;;N;;;;16E77;
+16E58;MEDEFAIDRIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;16E78;
+16E59;MEDEFAIDRIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;16E79;
+16E5A;MEDEFAIDRIN CAPITAL LETTER OE;Lu;0;L;;;;;N;;;;16E7A;
+16E5B;MEDEFAIDRIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;16E7B;
+16E5C;MEDEFAIDRIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;16E7C;
+16E5D;MEDEFAIDRIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;16E7D;
+16E5E;MEDEFAIDRIN CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;16E7E;
+16E5F;MEDEFAIDRIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;16E7F;
+16E60;MEDEFAIDRIN SMALL LETTER M;Ll;0;L;;;;;N;;;16E40;;16E40
+16E61;MEDEFAIDRIN SMALL LETTER S;Ll;0;L;;;;;N;;;16E41;;16E41
+16E62;MEDEFAIDRIN SMALL LETTER V;Ll;0;L;;;;;N;;;16E42;;16E42
+16E63;MEDEFAIDRIN SMALL LETTER W;Ll;0;L;;;;;N;;;16E43;;16E43
+16E64;MEDEFAIDRIN SMALL LETTER ATIU;Ll;0;L;;;;;N;;;16E44;;16E44
+16E65;MEDEFAIDRIN SMALL LETTER Z;Ll;0;L;;;;;N;;;16E45;;16E45
+16E66;MEDEFAIDRIN SMALL LETTER KP;Ll;0;L;;;;;N;;;16E46;;16E46
+16E67;MEDEFAIDRIN SMALL LETTER P;Ll;0;L;;;;;N;;;16E47;;16E47
+16E68;MEDEFAIDRIN SMALL LETTER T;Ll;0;L;;;;;N;;;16E48;;16E48
+16E69;MEDEFAIDRIN SMALL LETTER G;Ll;0;L;;;;;N;;;16E49;;16E49
+16E6A;MEDEFAIDRIN SMALL LETTER F;Ll;0;L;;;;;N;;;16E4A;;16E4A
+16E6B;MEDEFAIDRIN SMALL LETTER I;Ll;0;L;;;;;N;;;16E4B;;16E4B
+16E6C;MEDEFAIDRIN SMALL LETTER K;Ll;0;L;;;;;N;;;16E4C;;16E4C
+16E6D;MEDEFAIDRIN SMALL LETTER A;Ll;0;L;;;;;N;;;16E4D;;16E4D
+16E6E;MEDEFAIDRIN SMALL LETTER J;Ll;0;L;;;;;N;;;16E4E;;16E4E
+16E6F;MEDEFAIDRIN SMALL LETTER E;Ll;0;L;;;;;N;;;16E4F;;16E4F
+16E70;MEDEFAIDRIN SMALL LETTER B;Ll;0;L;;;;;N;;;16E50;;16E50
+16E71;MEDEFAIDRIN SMALL LETTER C;Ll;0;L;;;;;N;;;16E51;;16E51
+16E72;MEDEFAIDRIN SMALL LETTER U;Ll;0;L;;;;;N;;;16E52;;16E52
+16E73;MEDEFAIDRIN SMALL LETTER YU;Ll;0;L;;;;;N;;;16E53;;16E53
+16E74;MEDEFAIDRIN SMALL LETTER L;Ll;0;L;;;;;N;;;16E54;;16E54
+16E75;MEDEFAIDRIN SMALL LETTER Q;Ll;0;L;;;;;N;;;16E55;;16E55
+16E76;MEDEFAIDRIN SMALL LETTER HP;Ll;0;L;;;;;N;;;16E56;;16E56
+16E77;MEDEFAIDRIN SMALL LETTER NY;Ll;0;L;;;;;N;;;16E57;;16E57
+16E78;MEDEFAIDRIN SMALL LETTER X;Ll;0;L;;;;;N;;;16E58;;16E58
+16E79;MEDEFAIDRIN SMALL LETTER D;Ll;0;L;;;;;N;;;16E59;;16E59
+16E7A;MEDEFAIDRIN SMALL LETTER OE;Ll;0;L;;;;;N;;;16E5A;;16E5A
+16E7B;MEDEFAIDRIN SMALL LETTER N;Ll;0;L;;;;;N;;;16E5B;;16E5B
+16E7C;MEDEFAIDRIN SMALL LETTER R;Ll;0;L;;;;;N;;;16E5C;;16E5C
+16E7D;MEDEFAIDRIN SMALL LETTER O;Ll;0;L;;;;;N;;;16E5D;;16E5D
+16E7E;MEDEFAIDRIN SMALL LETTER AI;Ll;0;L;;;;;N;;;16E5E;;16E5E
+16E7F;MEDEFAIDRIN SMALL LETTER Y;Ll;0;L;;;;;N;;;16E5F;;16E5F
+16E80;MEDEFAIDRIN DIGIT ZERO;No;0;L;;;;0;N;;;;;
+16E81;MEDEFAIDRIN DIGIT ONE;No;0;L;;;;1;N;;;;;
+16E82;MEDEFAIDRIN DIGIT TWO;No;0;L;;;;2;N;;;;;
+16E83;MEDEFAIDRIN DIGIT THREE;No;0;L;;;;3;N;;;;;
+16E84;MEDEFAIDRIN DIGIT FOUR;No;0;L;;;;4;N;;;;;
+16E85;MEDEFAIDRIN DIGIT FIVE;No;0;L;;;;5;N;;;;;
+16E86;MEDEFAIDRIN DIGIT SIX;No;0;L;;;;6;N;;;;;
+16E87;MEDEFAIDRIN DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+16E88;MEDEFAIDRIN DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+16E89;MEDEFAIDRIN DIGIT NINE;No;0;L;;;;9;N;;;;;
+16E8A;MEDEFAIDRIN NUMBER TEN;No;0;L;;;;10;N;;;;;
+16E8B;MEDEFAIDRIN NUMBER ELEVEN;No;0;L;;;;11;N;;;;;
+16E8C;MEDEFAIDRIN NUMBER TWELVE;No;0;L;;;;12;N;;;;;
+16E8D;MEDEFAIDRIN NUMBER THIRTEEN;No;0;L;;;;13;N;;;;;
+16E8E;MEDEFAIDRIN NUMBER FOURTEEN;No;0;L;;;;14;N;;;;;
+16E8F;MEDEFAIDRIN NUMBER FIFTEEN;No;0;L;;;;15;N;;;;;
+16E90;MEDEFAIDRIN NUMBER SIXTEEN;No;0;L;;;;16;N;;;;;
+16E91;MEDEFAIDRIN NUMBER SEVENTEEN;No;0;L;;;;17;N;;;;;
+16E92;MEDEFAIDRIN NUMBER EIGHTEEN;No;0;L;;;;18;N;;;;;
+16E93;MEDEFAIDRIN NUMBER NINETEEN;No;0;L;;;;19;N;;;;;
+16E94;MEDEFAIDRIN DIGIT ONE ALTERNATE FORM;No;0;L;;;;1;N;;;;;
+16E95;MEDEFAIDRIN DIGIT TWO ALTERNATE FORM;No;0;L;;;;2;N;;;;;
+16E96;MEDEFAIDRIN DIGIT THREE ALTERNATE FORM;No;0;L;;;;3;N;;;;;
+16E97;MEDEFAIDRIN COMMA;Po;0;L;;;;;N;;;;;
+16E98;MEDEFAIDRIN FULL STOP;Po;0;L;;;;;N;;;;;
+16E99;MEDEFAIDRIN SYMBOL AIVA;Po;0;L;;;;;N;;;;;
+16E9A;MEDEFAIDRIN EXCLAMATION OH;Po;0;L;;;;;N;;;;;
 16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;;
 16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;;
 16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;;
@@ -24355,7 +24850,7 @@
 16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
 16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;;
 17000;;Lo;0;L;;;;;N;;;;;
-187EC;;Lo;0;L;;;;;N;;;;;
+187F1;;Lo;0;L;;;;;N;;;;;
 18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
 18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
 18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
@@ -26488,6 +26983,26 @@
 1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
 1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
 1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
+1D2E0;MAYAN NUMERAL ZERO;No;0;L;;;;0;N;;;;;
+1D2E1;MAYAN NUMERAL ONE;No;0;L;;;;1;N;;;;;
+1D2E2;MAYAN NUMERAL TWO;No;0;L;;;;2;N;;;;;
+1D2E3;MAYAN NUMERAL THREE;No;0;L;;;;3;N;;;;;
+1D2E4;MAYAN NUMERAL FOUR;No;0;L;;;;4;N;;;;;
+1D2E5;MAYAN NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+1D2E6;MAYAN NUMERAL SIX;No;0;L;;;;6;N;;;;;
+1D2E7;MAYAN NUMERAL SEVEN;No;0;L;;;;7;N;;;;;
+1D2E8;MAYAN NUMERAL EIGHT;No;0;L;;;;8;N;;;;;
+1D2E9;MAYAN NUMERAL NINE;No;0;L;;;;9;N;;;;;
+1D2EA;MAYAN NUMERAL TEN;No;0;L;;;;10;N;;;;;
+1D2EB;MAYAN NUMERAL ELEVEN;No;0;L;;;;11;N;;;;;
+1D2EC;MAYAN NUMERAL TWELVE;No;0;L;;;;12;N;;;;;
+1D2ED;MAYAN NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;;
+1D2EE;MAYAN NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;;
+1D2EF;MAYAN NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;;
+1D2F0;MAYAN NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;;
+1D2F1;MAYAN NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;;
+1D2F2;MAYAN NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;;
+1D2F3;MAYAN NUMERAL NINETEEN;No;0;L;;;;19;N;;;;;
 1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
 1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;;
 1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;;
@@ -26593,6 +27108,13 @@
 1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
 1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
 1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
+1D372;IDEOGRAPHIC TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D373;IDEOGRAPHIC TALLY MARK TWO;No;0;L;;;;2;N;;;;;
+1D374;IDEOGRAPHIC TALLY MARK THREE;No;0;L;;;;3;N;;;;;
+1D375;IDEOGRAPHIC TALLY MARK FOUR;No;0;L;;;;4;N;;;;;
+1D376;IDEOGRAPHIC TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
+1D377;TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D378;TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
 1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L; 0041;;;;N;;;;;
 1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L; 0042;;;;N;;;;;
 1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L; 0043;;;;N;;;;;
@@ -28599,6 +29121,74 @@
 1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
 1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;;
 1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;;
+1EC71;INDIC SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;;
+1EC72;INDIC SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;;
+1EC73;INDIC SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;;
+1EC74;INDIC SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;;
+1EC75;INDIC SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;;
+1EC76;INDIC SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;;
+1EC77;INDIC SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;;
+1EC78;INDIC SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;;
+1EC79;INDIC SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;;
+1EC7A;INDIC SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;;
+1EC7B;INDIC SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+1EC7C;INDIC SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;;
+1EC7D;INDIC SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;;
+1EC7E;INDIC SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;;
+1EC7F;INDIC SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;;
+1EC80;INDIC SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;;
+1EC81;INDIC SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;;
+1EC82;INDIC SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;;
+1EC83;INDIC SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+1EC84;INDIC SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;;
+1EC85;INDIC SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;;
+1EC86;INDIC SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;;
+1EC87;INDIC SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;;
+1EC88;INDIC SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;;
+1EC89;INDIC SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;;
+1EC8A;INDIC SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;;
+1EC8B;INDIC SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;;
+1EC8C;INDIC SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;;
+1EC8D;INDIC SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;;
+1EC8E;INDIC SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;;
+1EC8F;INDIC SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;;
+1EC90;INDIC SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;;
+1EC91;INDIC SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;;
+1EC92;INDIC SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;;
+1EC93;INDIC SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;;
+1EC94;INDIC SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;;
+1EC95;INDIC SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1EC96;INDIC SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;;
+1EC97;INDIC SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;;
+1EC98;INDIC SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;;
+1EC99;INDIC SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;;
+1EC9A;INDIC SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;;
+1EC9B;INDIC SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;;
+1EC9C;INDIC SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;;
+1EC9D;INDIC SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;;
+1EC9E;INDIC SIYAQ NUMBER LAKH;No;0;AL;;;;100000;N;;;;;
+1EC9F;INDIC SIYAQ NUMBER LAKHAN;No;0;AL;;;;200000;N;;;;;
+1ECA0;INDIC SIYAQ LAKH MARK;No;0;AL;;;;100000;N;;;;;
+1ECA1;INDIC SIYAQ NUMBER KAROR;No;0;AL;;;;10000000;N;;;;;
+1ECA2;INDIC SIYAQ NUMBER KARORAN;No;0;AL;;;;20000000;N;;;;;
+1ECA3;INDIC SIYAQ NUMBER PREFIXED ONE;No;0;AL;;;;1;N;;;;;
+1ECA4;INDIC SIYAQ NUMBER PREFIXED TWO;No;0;AL;;;;2;N;;;;;
+1ECA5;INDIC SIYAQ NUMBER PREFIXED THREE;No;0;AL;;;;3;N;;;;;
+1ECA6;INDIC SIYAQ NUMBER PREFIXED FOUR;No;0;AL;;;;4;N;;;;;
+1ECA7;INDIC SIYAQ NUMBER PREFIXED FIVE;No;0;AL;;;;5;N;;;;;
+1ECA8;INDIC SIYAQ NUMBER PREFIXED SIX;No;0;AL;;;;6;N;;;;;
+1ECA9;INDIC SIYAQ NUMBER PREFIXED SEVEN;No;0;AL;;;;7;N;;;;;
+1ECAA;INDIC SIYAQ NUMBER PREFIXED EIGHT;No;0;AL;;;;8;N;;;;;
+1ECAB;INDIC SIYAQ NUMBER PREFIXED NINE;No;0;AL;;;;9;N;;;;;
+1ECAC;INDIC SIYAQ PLACEHOLDER;So;0;AL;;;;;N;;;;;
+1ECAD;INDIC SIYAQ FRACTION ONE QUARTER;No;0;AL;;;;1/4;N;;;;;
+1ECAE;INDIC SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;;
+1ECAF;INDIC SIYAQ FRACTION THREE QUARTERS;No;0;AL;;;;3/4;N;;;;;
+1ECB0;INDIC SIYAQ RUPEE MARK;Sc;0;AL;;;;;N;;;;;
+1ECB1;INDIC SIYAQ NUMBER ALTERNATE ONE;No;0;AL;;;;1;N;;;;;
+1ECB2;INDIC SIYAQ NUMBER ALTERNATE TWO;No;0;AL;;;;2;N;;;;;
+1ECB3;INDIC SIYAQ NUMBER ALTERNATE TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1ECB4;INDIC SIYAQ ALTERNATE LAKH MARK;No;0;AL;;;;100000;N;;;;;
 1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL; 0627;;;;N;;;;;
 1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL; 0628;;;;N;;;;;
 1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL; 062C;;;;N;;;;;
@@ -29012,6 +29602,7 @@
 1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;;
 1F12D;CIRCLED CD;So;0;L; 0043 0044;;;;N;;;;;
 1F12E;CIRCLED WZ;So;0;L; 0057 005A;;;;N;;;;;
+1F12F;COPYLEFT SYMBOL;So;0;ON;;;;;N;;;;;
 1F130;SQUARED LATIN CAPITAL LETTER A;So;0;L; 0041;;;;N;;;;;
 1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L; 0042;;;;N;;;;;
 1F132;SQUARED LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;;
@@ -30226,6 +30817,7 @@
 1F6F6;CANOE;So;0;ON;;;;;N;;;;;
 1F6F7;SLED;So;0;ON;;;;;N;;;;;
 1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;;
+1F6F9;SKATEBOARD;So;0;ON;;;;;N;;;;;
 1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
 1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
 1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
@@ -30427,6 +31019,10 @@
 1F7D2;LIGHT TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
 1F7D3;HEAVY TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
 1F7D4;HEAVY TWELVE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7D5;CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
+1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
 1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
 1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
 1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
@@ -30647,6 +31243,9 @@
 1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
 1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
 1F94C;CURLING STONE;So;0;ON;;;;;N;;;;;
+1F94D;LACROSSE STICK AND BALL;So;0;ON;;;;;N;;;;;
+1F94E;SOFTBALL;So;0;ON;;;;;N;;;;;
+1F94F;FLYING DISC;So;0;ON;;;;;N;;;;;
 1F950;CROISSANT;So;0;ON;;;;;N;;;;;
 1F951;AVOCADO;So;0;ON;;;;;N;;;;;
 1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
@@ -30675,6 +31274,20 @@
 1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;;
 1F96A;SANDWICH;So;0;ON;;;;;N;;;;;
 1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;;
+1F96C;LEAFY GREEN;So;0;ON;;;;;N;;;;;
+1F96D;MANGO;So;0;ON;;;;;N;;;;;
+1F96E;MOON CAKE;So;0;ON;;;;;N;;;;;
+1F96F;BAGEL;So;0;ON;;;;;N;;;;;
+1F970;SMILING FACE WITH SMILING EYES AND THREE HEARTS;So;0;ON;;;;;N;;;;;
+1F973;FACE WITH PARTY HORN AND PARTY HAT;So;0;ON;;;;;N;;;;;
+1F974;FACE WITH UNEVEN EYES AND WAVY MOUTH;So;0;ON;;;;;N;;;;;
+1F975;OVERHEATED FACE;So;0;ON;;;;;N;;;;;
+1F976;FREEZING FACE;So;0;ON;;;;;N;;;;;
+1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;;
+1F97C;LAB COAT;So;0;ON;;;;;N;;;;;
+1F97D;GOGGLES;So;0;ON;;;;;N;;;;;
+1F97E;HIKING BOOT;So;0;ON;;;;;N;;;;;
+1F97F;FLAT SHOE;So;0;ON;;;;;N;;;;;
 1F980;CRAB;So;0;ON;;;;;N;;;;;
 1F981;LION FACE;So;0;ON;;;;;N;;;;;
 1F982;SCORPION;So;0;ON;;;;;N;;;;;
@@ -30699,7 +31312,30 @@
 1F995;SAUROPOD;So;0;ON;;;;;N;;;;;
 1F996;T-REX;So;0;ON;;;;;N;;;;;
 1F997;CRICKET;So;0;ON;;;;;N;;;;;
+1F998;KANGAROO;So;0;ON;;;;;N;;;;;
+1F999;LLAMA;So;0;ON;;;;;N;;;;;
+1F99A;PEACOCK;So;0;ON;;;;;N;;;;;
+1F99B;HIPPOPOTAMUS;So;0;ON;;;;;N;;;;;
+1F99C;PARROT;So;0;ON;;;;;N;;;;;
+1F99D;RACCOON;So;0;ON;;;;;N;;;;;
+1F99E;LOBSTER;So;0;ON;;;;;N;;;;;
+1F99F;MOSQUITO;So;0;ON;;;;;N;;;;;
+1F9A0;MICROBE;So;0;ON;;;;;N;;;;;
+1F9A1;BADGER;So;0;ON;;;;;N;;;;;
+1F9A2;SWAN;So;0;ON;;;;;N;;;;;
+1F9B0;EMOJI COMPONENT RED HAIR;So;0;ON;;;;;N;;;;;
+1F9B1;EMOJI COMPONENT CURLY HAIR;So;0;ON;;;;;N;;;;;
+1F9B2;EMOJI COMPONENT BALD;So;0;ON;;;;;N;;;;;
+1F9B3;EMOJI COMPONENT WHITE HAIR;So;0;ON;;;;;N;;;;;
+1F9B4;BONE;So;0;ON;;;;;N;;;;;
+1F9B5;LEG;So;0;ON;;;;;N;;;;;
+1F9B6;FOOT;So;0;ON;;;;;N;;;;;
+1F9B7;TOOTH;So;0;ON;;;;;N;;;;;
+1F9B8;SUPERHERO;So;0;ON;;;;;N;;;;;
+1F9B9;SUPERVILLAIN;So;0;ON;;;;;N;;;;;
 1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+1F9C1;CUPCAKE;So;0;ON;;;;;N;;;;;
+1F9C2;SALT SHAKER;So;0;ON;;;;;N;;;;;
 1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;;
 1F9D1;ADULT;So;0;ON;;;;;N;;;;;
 1F9D2;CHILD;So;0;ON;;;;;N;;;;;
@@ -30723,6 +31359,45 @@
 1F9E4;GLOVES;So;0;ON;;;;;N;;;;;
 1F9E5;COAT;So;0;ON;;;;;N;;;;;
 1F9E6;SOCKS;So;0;ON;;;;;N;;;;;
+1F9E7;RED GIFT ENVELOPE;So;0;ON;;;;;N;;;;;
+1F9E8;FIRECRACKER;So;0;ON;;;;;N;;;;;
+1F9E9;JIGSAW PUZZLE PIECE;So;0;ON;;;;;N;;;;;
+1F9EA;TEST TUBE;So;0;ON;;;;;N;;;;;
+1F9EB;PETRI DISH;So;0;ON;;;;;N;;;;;
+1F9EC;DNA DOUBLE HELIX;So;0;ON;;;;;N;;;;;
+1F9ED;COMPASS;So;0;ON;;;;;N;;;;;
+1F9EE;ABACUS;So;0;ON;;;;;N;;;;;
+1F9EF;FIRE EXTINGUISHER;So;0;ON;;;;;N;;;;;
+1F9F0;TOOLBOX;So;0;ON;;;;;N;;;;;
+1F9F1;BRICK;So;0;ON;;;;;N;;;;;
+1F9F2;MAGNET;So;0;ON;;;;;N;;;;;
+1F9F3;LUGGAGE;So;0;ON;;;;;N;;;;;
+1F9F4;LOTION BOTTLE;So;0;ON;;;;;N;;;;;
+1F9F5;SPOOL OF THREAD;So;0;ON;;;;;N;;;;;
+1F9F6;BALL OF YARN;So;0;ON;;;;;N;;;;;
+1F9F7;SAFETY PIN;So;0;ON;;;;;N;;;;;
+1F9F8;TEDDY BEAR;So;0;ON;;;;;N;;;;;
+1F9F9;BROOM;So;0;ON;;;;;N;;;;;
+1F9FA;BASKET;So;0;ON;;;;;N;;;;;
+1F9FB;ROLL OF PAPER;So;0;ON;;;;;N;;;;;
+1F9FC;BAR OF SOAP;So;0;ON;;;;;N;;;;;
+1F9FD;SPONGE;So;0;ON;;;;;N;;;;;
+1F9FE;RECEIPT;So;0;ON;;;;;N;;;;;
+1F9FF;NAZAR AMULET;So;0;ON;;;;;N;;;;;
+1FA60;XIANGQI RED GENERAL;So;0;ON;;;;;N;;;;;
+1FA61;XIANGQI RED MANDARIN;So;0;ON;;;;;N;;;;;
+1FA62;XIANGQI RED ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA63;XIANGQI RED HORSE;So;0;ON;;;;;N;;;;;
+1FA64;XIANGQI RED CHARIOT;So;0;ON;;;;;N;;;;;
+1FA65;XIANGQI RED CANNON;So;0;ON;;;;;N;;;;;
+1FA66;XIANGQI RED SOLDIER;So;0;ON;;;;;N;;;;;
+1FA67;XIANGQI BLACK GENERAL;So;0;ON;;;;;N;;;;;
+1FA68;XIANGQI BLACK MANDARIN;So;0;ON;;;;;N;;;;;
+1FA69;XIANGQI BLACK ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA6A;XIANGQI BLACK HORSE;So;0;ON;;;;;N;;;;;
+1FA6B;XIANGQI BLACK CHARIOT;So;0;ON;;;;;N;;;;;
+1FA6C;XIANGQI BLACK CANNON;So;0;ON;;;;;N;;;;;
+1FA6D;XIANGQI BLACK SOLDIER;So;0;ON;;;;;N;;;;;
 20000;;Lo;0;L;;;;;N;;;;;
 2A6D6;;Lo;0;L;;;;;N;;;;;
 2A700;;Lo;0;L;;;;;N;;;;;
diff -Nru emacs-26.1+1/admin/unidata/unidata-gen.el emacs-26.3+1/admin/unidata/unidata-gen.el
--- emacs-26.1+1/admin/unidata/unidata-gen.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/unidata-gen.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; unidata-gen.el -- Create files containing character property data.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/admin/unidata/uvs.el emacs-26.3+1/admin/unidata/uvs.el
--- emacs-26.1+1/admin/unidata/uvs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/unidata/uvs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts.
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: YAMAMOTO Mitsuharu 
 
diff -Nru emacs-26.1+1/admin/update_autogen emacs-26.3+1/admin/update_autogen
--- emacs-26.1+1/admin/update_autogen	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/update_autogen	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ### update_autogen - update some auto-generated files in the Emacs tree
 
-## Copyright (C) 2011-2018 Free Software Foundation, Inc.
+## Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris 
 
@@ -47,7 +47,7 @@
 cd ../
 [ -d admin ] || die "Could not locate admin directory"
 
-[ -d .git ] || die "No .git directory"
+[ -e .git ] || die "No .git"
 
 usage ()
 {
diff -Nru emacs-26.1+1/admin/update-copyright emacs-26.3+1/admin/update-copyright
--- emacs-26.1+1/admin/update-copyright	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/admin/update-copyright	2019-09-10 00:32:49.000000000 +0000
@@ -7,7 +7,7 @@
 # By default, this script uses the local-time calendar year.
 # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default.
 
-# Copyright 2013-2018 Free Software Foundation, Inc.
+# Copyright 2013-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/admin/upload-manuals emacs-26.3+1/admin/upload-manuals
--- emacs-26.1+1/admin/upload-manuals	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/admin/upload-manuals	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,376 @@
+#!/bin/bash
+
+### upload-manuals - upload the Emacs manuals to the gnu.org website
+
+## Copyright 2018-2019 Free Software Foundation, Inc.
+
+## Author: Glenn Morris 
+
+## 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 .
+
+### Commentary:
+
+## Run this on the output of make-manuals.
+
+## We assume you have already checked out a local copy of the website
+## following the instructions at
+## https://savannah.gnu.org/cvs/?group=emacs
+
+## Usage:
+## Call from the manual/ directory created by make-manual.
+## upload-manuals /path/to/cvs/checkout
+
+### Code:
+
+
+die ()                          # write error to stderr and exit
+{
+    [ $# -gt 0 ] && echo "$PN: $@" >&2
+    exit 1
+}
+
+PN=${0##*/}                     # basename of script
+
+usage ()
+{
+    cat 1>&2 < /dev/null | sed -n '0,/updated for Emacs version/s/.*updated for Emacs version \([0-9.]*\).*\.$/\1/p')
+
+## Defaults
+cvs=cvs
+message="Regenerate manuals for Emacs $version"
+umessage=
+
+while getopts ":hm:n" option ; do
+    case $option in
+        (h) usage ;;
+
+        (m) umessage=t ; message="$OPTARG" ;;
+
+        (n) cvs="echo $cvs" ;;
+
+        (\?) die "Bad option -$OPTARG" ;;
+
+        (:) die "Option -$OPTARG requires an argument" ;;
+
+        (*) die "getopts error" ;;
+    esac
+done
+shift $(( --OPTIND ))
+OPTIND=1
+
+[ $# -eq 1 ] || usage
+
+[ "$version$umessage" ] || \
+    die "Could not get version to use for commit message"
+
+webdir=$1
+
+[ -e $webdir/CVS/Entries ] && [ -e $webdir/refcards/pdf/refcard.pdf ] || \
+    die "$webdir does not look like a checkout of the Emacs webpages"
+
+[ -e html_mono/emacs.html ] && [ -e html_node/emacs/index.html ] || \
+    die "Current directory does not like the manual/ directory"
+
+
+echo "Doing refcards..."
+
+mv refcards/emacs-refcards.tar.gz $webdir/refcards/
+(
+    cd $webdir/refcards
+    $cvs commit -m "$message" emacs-refcards.tar.gz || die "commit error"
+)
+
+## For refcards, we assume a missing file is due to a tex failure,
+## rather than a refcard that should be deleted.
+for fmt in pdf ps.gz; do
+
+    clist=
+
+    for f in $webdir/refcards/${fmt%.gz}/*.$fmt; do
+
+        s=${f#$webdir/}
+
+        if [ -e $s ]; then
+            mv $s $f
+            clist="$clist ${f##*/}"
+        else
+            echo "$s seems to be missing"
+        fi
+    done
+
+
+    ## Check for new files.
+    new=
+    for f in refcards/${fmt%.gz}/*.$fmt; do
+        [ -e $f ] || break
+        new="$new $f"
+        clist="$clist ${f##*/}"
+    done
+
+    [ "$new" ] && mv $new $webdir/refcards/${fmt%.gz}/
+
+    [ "$clist" ] && (
+        cd $webdir
+        [ "$new" ] && {
+            echo "Adding new files: $new"
+            $cvs add -kb $new || die "add error"
+            echo "Remember to add new refcards to refcards/index.html"
+        }
+        cd refcards/${fmt%.gz}
+        $cvs commit -m "$message" $clist || die "commit error"
+    )
+
+done                            # $fmt
+
+
+echo "Doing non-html manuals..."
+
+for fmt in info pdf ps texi; do
+
+    clist=
+
+    for f in $webdir/manual/$fmt/*; do
+
+        [ ${f##*/} = CVS ] && continue
+
+        s=$fmt/${f##*/}
+
+        if [ -e $s ]; then
+            mv $s $f
+            clist="$clist ${f##*/}"
+        else
+            case ${f##*/} in
+                *_7x9*.pdf) continue ;;
+            esac
+
+            echo "$s seems to be missing"
+        fi
+    done
+
+    ## Check for new files.
+    new=
+    for f in $fmt/*.$fmt*; do
+        [ -e $f ] || break
+        new="$new $f"
+        clist="$clist ${f##*/}"
+    done
+
+    [ "$new" ] && mv $new $webdir/manual/$fmt/
+
+    [ "$clist" ] && (
+        cd $webdir/manual
+        [ "$new" ] && {
+            echo "Adding new files: $new"
+            $cvs add $new || die "add error"
+            echo "Remember to add new files to the appropriate index pages"
+        }
+        cd $fmt
+        $cvs commit -m "$message" $clist || die "commit error"
+    )
+
+done
+
+
+echo "Doing tarred html..."
+
+clist=
+
+for f in $webdir/manual/*html*.tar*; do
+
+    s=${f##*/}
+
+    if [ -e $s ]; then
+        mv $s $f
+        clist="$clist ${f##*/}"
+    else
+        echo "$s seems to be missing"
+    fi
+done
+
+## Check for new files.
+new=
+for f in *html*.tar*; do
+    [ -e $f ] || break
+    new="$new $f"
+    clist="$clist ${f##*/}"
+done
+
+[ "$new" ] && mv $new $webdir/manual
+
+[ "$clist" ] && (
+    cd $webdir/manual
+    [ "$new" ] && {
+        echo "Adding new files: $new"
+        $cvs add -kb $new || die "add error"
+        echo "Remember to add new files to the appropriate index pages"
+    }
+    $cvs commit -m "$message" $clist || die "commit error"
+)
+
+
+## This happens so rarely it would be less effort to do by hand...
+new_manual () {
+    local t=eww
+    local i=$webdir/manual/$t.html # template
+
+    [ -r $i ] || die "Cannot read template $i"
+
+    local name o mono title
+
+    for name; do
+
+        name=${name##*/}
+        name=${name%.html}
+
+        o=$webdir/manual/$name.html
+
+        [ -e $o ] && die "$o already exists"
+
+        mono=$webdir/manual/html_mono/$name.html
+
+        [ -r $mono ] || die "Cannot read $mono"
+
+        title=$(sed -n 's|^\(.*\)|\1|p' $mono)
+
+        : ${title:?}
+
+        echo "$title" | grep -qi "Emacs" || title="Emacs $title"
+        echo "$title" | grep -qi "manual" || title="$title Manual"
+
+        ## It is a pain to extract and insert a good "documenting...".
+        ## Improve it by hand if you care.
+        sed -e "s|^.*\( - GNU Project\)|<title>$title\1|" \
+            -e "s|^<h2>.*|<h2>$title</h2>|" \
+            -e "s/^documenting.*/documenting \"$title\"./" \
+            -e "s/$t/$name/" \
+            -e "s/©.* Free/\© $(date +%Y) Free/" $i > $o
+
+        (
+            cd $webdir/manual
+            $cvs add ${o##*/} || die "add error for $o"
+        )
+    done
+
+    return 0
+}
+
+
+echo "Doing html_mono..."
+
+clist=
+
+for f in $webdir/manual/html_mono/*.html; do
+
+    s=${f##*manual/}
+
+    if [ -e $s ]; then
+        mv $s $f
+        clist="$clist ${f##*/}"
+    else
+        echo "$s seems to be missing"
+    fi
+done
+
+## Check for new files.
+new=
+for f in html_mono/*.html; do
+    [ -e $f ] || break
+    new="$new $f"
+    clist="$clist ${f##*/}"
+done
+
+[ "$new" ] && mv $new $webdir/manual/html_mono/
+
+## TODO: check for removed manuals.
+
+[ "$clist" ] && (
+    cd $webdir/manual/html_mono
+    [ "$new" ] && {
+        echo "Adding new files: $new"
+        $cvs add $new || die "add error"
+        new_manual $new || die
+        echo "Remember to add new entries to manual/index.html"
+    }
+    $cvs commit -m "$message" $clist || die "commit error"
+)
+
+
+echo "Doing html_node..."
+
+for d in html_node/*; do
+
+    [ -e $d ] || break
+
+    echo "Doing $d..."
+
+    [ -e $webdir/manual/$d ] || {
+        echo "New directory: $d"
+        mkdir $webdir/manual/$d
+        $cvs add $webdir/manual/$d || die "add error"
+    }
+
+    new=
+    for f in $d/*.html; do
+        [ -e $webdir/manual/$f ] || new="$new ${f##*/}"
+    done
+
+    stale=
+    for f in $webdir/manual/$d/*.html; do
+        [ -e ${f#$webdir/manual/} ] || stale="$stale ${f##*/}"
+    done
+
+    mv $d/*.html $webdir/manual/$d/
+
+    (
+        cd $webdir/manual/$d
+        [ "$new" ] && {
+            echo "Adding new files: $new"
+            $cvs add $new || die "add error"
+        }
+
+        [ "$stale" ] && {
+            echo "Removing stale files: $stale"
+            $cvs remove -f $stale || die "remove error"
+        }
+
+        ## -f: create a new revision even if no change.
+        $cvs commit -f -m "$message" *.html $stale || die "commit error"
+    )
+
+done
+
+
+echo "Checking for stray files..."
+find -type f
+
+
+echo "Finished"
+
+exit 0
diff -Nru emacs-26.1+1/autogen.sh emacs-26.3+1/autogen.sh
--- emacs-26.1+1/autogen.sh	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/autogen.sh	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### autogen.sh - tool to help build Emacs from a repository checkout
 
-## Copyright (C) 2011-2018 Free Software Foundation, Inc.
+## Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
@@ -323,7 +323,7 @@
 tailored_hooks=
 sample_hooks=
 
-for hook in commit-msg pre-commit; do
+for hook in commit-msg pre-commit prepare-commit-msg; do
     cmp -- build-aux/git-hooks/$hook "$hooks/$hook" >/dev/null 2>&1 ||
 	tailored_hooks="$tailored_hooks $hook"
 done
diff -Nru emacs-26.1+1/build-aux/config.guess emacs-26.3+1/build-aux/config.guess
--- emacs-26.1+1/build-aux/config.guess	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/config.guess	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
 timestamp='2018-01-01'
 
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff -Nru emacs-26.1+1/build-aux/config.sub emacs-26.3+1/build-aux/config.sub
--- emacs-26.1+1/build-aux/config.sub	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/config.sub	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
 timestamp='2018-01-01'
 
@@ -67,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff -Nru emacs-26.1+1/build-aux/git-hooks/commit-msg emacs-26.3+1/build-aux/git-hooks/commit-msg
--- emacs-26.1+1/build-aux/git-hooks/commit-msg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/git-hooks/commit-msg	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check the format of GNU Emacs change log entries.
 
-# Copyright 2014-2018 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/build-aux/git-hooks/pre-commit emacs-26.3+1/build-aux/git-hooks/pre-commit
--- emacs-26.1+1/build-aux/git-hooks/pre-commit	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/git-hooks/pre-commit	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check file names in git commits for GNU Emacs.
 
-# Copyright 2014-2018 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,7 +28,7 @@
 # When doing a two-way merge, ignore problems that came from the other
 # side of the merge.
 head=HEAD
-if test -r "$GIT_DIR"/MERGE_HEAD; then
+if test -r "$GIT_DIR"/MERGE_HEAD && test "$GIT_MERGE_CHECK_OTHER" != true; then
   merge_heads=`cat "$GIT_DIR"/MERGE_HEAD` || exit
   for merge_head in $merge_heads; do
     case $head in
@@ -42,15 +42,10 @@
 fi
 
 git_diff='git diff --cached --name-only --diff-filter=A'
-ok_chars='\0+[=-=]./0-9A-Z_a-z'
-nbadchars=`$git_diff -z $head | tr -d "$ok_chars" | wc -c`
 
-if test "$nbadchars" -ne 0; then
-  echo "File name does not consist of -+./_ or ASCII letters or digits."
-  exit 1
-fi
-
-for new_name in `$git_diff $head`; do
+# 'git diff' will backslash escape tabs and newlines, so we don't have
+# to worry about word splitting here.
+$git_diff $head | sane_egrep 'ChangeLog|^-|/-|[^-+./_0-9A-Z_a-z]' | while IFS= read -r new_name; do
   case $new_name in
     -* | */-*)
       echo "$new_name: File name component begins with '-'."
@@ -58,6 +53,9 @@
     ChangeLog | */ChangeLog)
       echo "$new_name: Please use git commit messages, not ChangeLog files."
       exit 1;;
+    *)
+      echo "$new_name: File name does not consist of -+./_ or ASCII letters or digits."
+      exit 1;;
   esac
 done
 
diff -Nru emacs-26.1+1/build-aux/git-hooks/prepare-commit-msg emacs-26.3+1/build-aux/git-hooks/prepare-commit-msg
--- emacs-26.1+1/build-aux/git-hooks/prepare-commit-msg	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/build-aux/git-hooks/prepare-commit-msg	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Check the format of GNU Emacs change log entries.
+
+# Copyright 2019 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/>.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+# Prefer gawk if available, as it handles NUL bytes properly.
+if type gawk >/dev/null 2>&1; then
+  awk=gawk
+else
+  awk=awk
+fi
+
+exec $awk '
+  # Catch the case when someone ran git-commit with -s option,
+  # which automatically adds Signed-off-by.
+  /^Signed-off-by: / {
+    print "'\''Signed-off-by:'\'' in commit message"
+    status = 1
+  }
+  END {
+    if (status != 0) {
+      print "Commit aborted; please see the file 'CONTRIBUTE'"
+    }
+    exit status
+  }
+' <"$COMMIT_MSG_FILE"
diff -Nru emacs-26.1+1/build-aux/gitlog-to-changelog emacs-26.3+1/build-aux/gitlog-to-changelog
--- emacs-26.1+1/build-aux/gitlog-to-changelog	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/gitlog-to-changelog	2019-09-10 00:32:49.000000000 +0000
@@ -9,7 +9,7 @@
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2018 Free Software Foundation, Inc.
+# Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/build-aux/gitlog-to-emacslog emacs-26.3+1/build-aux/gitlog-to-emacslog
--- emacs-26.1+1/build-aux/gitlog-to-emacslog	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/gitlog-to-emacslog	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Convert git log output to ChangeLog format for GNU Emacs.
 
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 # Author: Paul Eggert
 
diff -Nru emacs-26.1+1/build-aux/make-info-dir emacs-26.3+1/build-aux/make-info-dir
--- emacs-26.1+1/build-aux/make-info-dir	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/make-info-dir	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 ### make-info-dir - create info/dir, for systems without install-info
 
-## Copyright (C) 2013-2018 Free Software Foundation, Inc.
+## Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>
 ## Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/build-aux/move-if-change emacs-26.3+1/build-aux/move-if-change
--- emacs-26.1+1/build-aux/move-if-change	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/move-if-change	2019-09-10 00:32:49.000000000 +0000
@@ -8,7 +8,7 @@
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/build-aux/msys-to-w32 emacs-26.3+1/build-aux/msys-to-w32
--- emacs-26.1+1/build-aux/msys-to-w32	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/msys-to-w32	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Convert a MSYS path list to Windows-native format.
 # Status is zero if successful, nonzero otherwise.
 
-# Copyright (C) 2013-2018 Free Software Foundation, Inc.
+# Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/build-aux/update-copyright emacs-26.3+1/build-aux/update-copyright
--- emacs-26.1+1/build-aux/update-copyright	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/update-copyright	2019-09-10 00:32:49.000000000 +0000
@@ -5,7 +5,7 @@
 
 my $VERSION = '2018-01-04.14:48'; # UTC
 
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/build-aux/update-subdirs emacs-26.3+1/build-aux/update-subdirs
--- emacs-26.1+1/build-aux/update-subdirs	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/build-aux/update-subdirs	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
 
-# Copyright (C) 1994-1995, 1997, 1999, 2001-2018 Free Software
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2019 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/ChangeLog.1 emacs-26.3+1/ChangeLog.1
--- emacs-26.1+1/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -14700,7 +14700,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/ChangeLog.2 emacs-26.3+1/ChangeLog.2
--- emacs-26.1+1/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -35787,7 +35787,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015-2018 Free Software Foundation, Inc.
+  Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/ChangeLog.3 emacs-26.3+1/ChangeLog.3
--- emacs-26.1+1/ChangeLog.3	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/ChangeLog.3	2019-09-10 00:32:49.000000000 +0000
@@ -1,3 +1,6787 @@
+2019-08-22  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2019-08-21  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/NEWS: Delete temporary markup.
+
+2019-08-20  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix process filter documentation (Bug#13400)
+
+	* doc/lispref/processes.texi (Asynchronous Processes): Note that input
+	may read when sending data as well.
+	(Output from Processes): Note that functions which send data may also
+	trigger reading from processes.
+	(Input to Processes, Filter Functions): Note that filter functions may
+	be called recursively.
+
+2019-08-19  Tino Calancha  <tino.calancha@gmail.com>
+
+	Fix query-replace-regexp undo feature
+
+	Ensure that non-regexp strings used with `looking-at' are quoted.
+	* lisp/replace.el (perform-replace): Quote regexp (Bug#37073).
+	* test/lisp/replace-tests.el (replace-tests-perform-replace-regexp-flag):
+	New variable.
+	(replace-tests-with-undo): Use it.
+	(query-replace-undo-bug37073): Add tests.
+
+2019-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Support the new Japanese era name
+
+	* admin/unidata/NormalizationTest.txt:
+	* admin/unidata/UnicodeData.txt: Add U+32FF SQUARE ERA NAME REIWA.
+	Do not merge to master.
+
+	* test/lisp/international/ucs-normalize-tests.el
+	(ucs-normalize-tests--failing-lines-part1)
+	(ucs-normalize-tests--failing-lines-part2): Update.  Do not
+	merge to master.
+
+	* etc/NEWS: Mention the change.
+
+2019-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in char-width-table
+
+	* lisp/international/characters.el (char-width-table): Fix a
+	typo in zero-width characters.
+
+2019-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor update in admin/notes/unicode
+
+	* admin/notes/unicode: Mention changes to be done in
+	setup-default-fontset in fontset.el.  (Bug#14461)
+
+2019-08-17  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix lisp indent infloop on unfinished strings (Bug#37045)
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-indent-calc-next): Stop trying to
+	skip over strings if we've hit the end of buffer.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(lisp-indent-unfinished-string): New test.
+
+2019-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in composite.el
+
+	* lisp/composite.el (compose-gstring-for-graphic)
+	(compose-gstring-for-terminal): Add comments that explain
+	Unicode General Category mnemonics in human-readable terms.
+	(Bug#14461)
+
+2019-08-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix markup in dired-x.texi
+
+	* doc/misc/dired-x.texi (Omitting Variables)
+	(Local Variables, Shell Command Guessing)
+	(Advanced Cleaning Variables, Special Marking Function): Fix
+	markup and indexing.  (Bug#14212)
+
+2019-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/callproc.c (Fcall_process): Doc fix.
+
+2019-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of features that use the fringes
+
+	* doc/emacs/display.texi (Fringes): Add cross-reference to
+	where indicate-empty-lines is described.
+	(Useless Whitespace): Add an @anchor for a more accurate
+	cross-reference in "Fringes".
+
+2019-08-10  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix docstrings in pong
+
+	* lisp/play/pong.el (pong-move-left pong-move-right): Refer to the
+	right bats and directions of movement.  (Bug#36959)
+
+2019-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc strings of 'append-to-buffer' and friends
+
+	* lisp/simple.el (append-to-buffer, prepend-to-buffer)
+	(copy-to-buffer): Doc fixes.
+
+2019-08-08  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix octave-mode ElDoc support
+
+	* lisp/progmodes/octave.el (octave-eldoc-function-signatures): Fix the
+	regexp used, so no match happens when there is no defined function FN.
+	Also, tweak the regexp to support GNU Octave 4.2.x and newer.  (Bug#36459)
+
+2019-08-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid Groff hanging on MS-Windows when invoked by "M-x man"
+
+	* lisp/man.el (Man-build-man-command): On MS-Windows, redirect
+	stdin of 'man' to the null device, to make sure Groff exits
+	immediately after formatting the man page.
+
+2019-08-07  Philipp Stephani  <p.stephani2@gmail.com>
+
+	Ignore pending_signals when checking for quits.
+
+	pending_signals is often set if no quit is pending.  This results in
+	bugs in module code if the module returns but no quit is actually
+	pending.
+
+	* src/emacs-module.c (module_should_quit): Use QUITP macro to check
+	whether the caller should quit.
+
+	* src/eval.c: Remove obsolete comment.
+
+2019-08-03  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix nnmail-expiry-wait docs and custom :types
+
+	* doc/misc/gnus.texi (Group Parameters, Expiring Mail):
+	* lisp/gnus/gnus-cus.el (gnus-group-parameters): Clarify
+	descriptions of nnmail-expiry, nnmail-expiry-wait, and
+	nnmail-expiry-wait-function.
+	* lisp/gnus/nnmail.el (nnmail-expiry-wait)
+	(nnmail-expiry-wait-function): Clarify docstrings and fix custom
+	:types (bug#36850).
+
+2019-08-03  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/simple.el (kill-do-not-save-duplicates): Doc fix.  (Bug#36827)
+
+2019-08-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of debugging Lisp syntax error
+
+	* doc/lispref/debugging.texi (Syntax Errors, Excess Open)
+	(Excess Close): Name the commands invoked by the key
+	sequences.  Add cross-references to appropriate sections of
+	the Emacs manual.  (Bug#21385)
+
+	(cherry picked from commit faafd467a374c9398ee4668cdc173611d35693ed)
+
+2019-07-30  Noam Postavsky  <npostavs@gmail.com>
+
+	Add index for "\( in strings" (Bug#25195)
+
+	* doc/emacs/programs.texi (Left Margin Paren): Add index for "\( in
+	strings".
+	* doc/lispref/positions.texi (List Motion): Add index, and cross
+	reference.
+
+2019-07-30  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix doc-string of 'fit-window-to-buffer' (Bug#36848)
+
+	* lisp/window.el (fit-window-to-buffer): Fix doc-string.
+
+	Suggested by Drew Adams <drew.adams@oracle.com>
+
+2019-07-26  Tino Calancha  <tino.calancha@gmail.com>
+
+	Update view-mode docstring
+
+	Not all the kill commands save the text in the kill ring
+	by default (e.g. `kill-rectangle').
+	It is more precise to just say that the kill commands save
+	the text and do not change the buffer (Bug#36741).
+	* lisp/view.el (view-mode): Update docstring.
+
+2019-07-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix subproc listening when setting filter to non-t (Bug#36591)
+
+	* src/process.c (Fset_process_filter): Call add_process_read_fd
+	according to the state of process filter before it's updated.  This
+	restores the correct functioning as it was before 2016-02-16 "Allow
+	setting the filter masks later".  Inline the set_process_filter_masks
+	call instead of fixing it that function, because it is also called
+	from connect_network_socket, and we don't want to change the behavior
+	of that function so close to release.
+	* test/src/process-tests.el (set-process-filter-t): New test.
+
+2019-07-26  Noam Postavsky  <npostavs@gmail.com>
+
+	* etc/NEWS.25: Belatedly announce rcirc-reconnect-delay.
+
+2019-07-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Mention term.el's \032 dir tracking in commentary (Bug#19524)
+
+	* lisp/term.el: Mention both forms of directory tracking in
+	commentary.  Remove obsolete ChangeLog comments.  Move more relevant
+	summary comments to the top.
+
+2019-07-26  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove upload functionality of package-x from the elisp manual
+
+	Suggested by Stefan Monnier.
+	Ref: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19537#8
+
+	* doc/lispref/package.texi (Package Archives): Don't document
+	package-x upload functions in the elisp manual, since they are not
+	very commonly used.  (Bug#19537)
+	* lisp/emacs-lisp/package-x.el (package-archive-upload-base)
+	(package-upload-buffer, package-upload-file): Add to the doc strings
+	any details removed from the elisp manual that would otherwise be
+	missing.
+
+2019-07-25  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2019-07-23  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Clarify Gravatar docs
+
+	For discussion, see the following thread:
+	https://lists.gnu.org/archive/html/emacs-devel/2019-07/msg00528.html
+	* doc/misc/gnus.texi (X-Face): Fix cross-reference.
+	(Gravatars):
+	* lisp/gnus/gnus-gravatar.el (gnus-gravatar-too-ugly):
+	* lisp/image/gravatar.el (gravatar-cache-ttl, gravatar-rating)
+	(gravatar-size): Clarify user option descriptions.
+	(gravatar-retrieve, gravatar-retrieve-synchronously): Document
+	return value.
+
+2019-07-22  Alan Mackenzie  <acm@muc.de>
+
+	* doc/lispref/display.texi (Defining Faces): Say a face can't be undefined.
+
+2019-07-21  Noam Postavsky  <npostavs@gmail.com>
+
+	Handle completely undecoded input in term (Bug#29918)
+
+	* lisp/term.el (term-emulate-terminal): Avoid errors if the whole
+	decoded string is eight-bit characters.  Don't attempt to save the
+	string for next iteration in that case.
+	* test/lisp/term-tests.el (term-decode-partial)
+	(term-undecodable-input): New tests.
+
+2019-07-20  N. Jackson  <nljlistbox2@gmail.com>  (tiny change)
+
+	* doc/misc/forms.texi (Control File Format): Fix a doc error.
+
+	(Bug#36693)
+
+2019-07-17  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix typo in package-alist docstring
+
+	Pointed out by Michael Heerdegen <michael_heerdegen@web.de>.
+	* lisp/emacs-lisp/package.el (package-alist): Fix docstring
+	grammar (bug#17403).
+
+2019-07-14  Markus Triska  <triska@metalevel.at>
+
+	* doc/lispref/text.texi (Mode-Specific Indent): Fix a typo (bug#36646).
+
+2019-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc string of 'bidi-display-reordering'
+
+	* src/buffer.c (syms_of_buffer) <bidi-display-reordering>:
+	Further doc fix.
+
+2019-07-13  Stefan Kangas  <stefankangas@gmail.com>
+
+	Add warning to bidi-display-reordering doc string
+
+	This explanation was given by Eli Zaretskii on emacs-devel.
+	For discussion, see:
+	https://lists.gnu.org/archive/html/emacs-devel/2019-07/msg00294.html
+
+	* src/buffer.c (syms_of_buffer): Add warning to doc string of
+	bidi-display-reordering to explain that it should only be used for
+	debugging.
+
+2019-07-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	Raise required librsvg version so as to match the current use
+
+	* configure.ac: Set RSVG_REQUIRED to 2.14.0 as rsvg_handle_get_dimensions
+	needs it.
+
+2019-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-sh.el (tramp-inline-compress-start-size): Set nil on w32.
+
+2019-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/progmodes/verilog-mode.el: One more ELPA Version:
+
+2019-07-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/svg.el, lisp/progmodes/ada-mode.el: Fix bug#36360.
+
+	Tell package.el their version number, for better behavior w.r.t the
+	versions available in GNU ELPA
+
+2019-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor copyedit of "Font Lock" in user manual
+
+	* doc/emacs/display.texi (Font Lock): Make the wording about
+	"enabling Font Lock" crystal clear.  (Bug#36529)
+
+2019-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve description of image descriptors
+
+	* doc/lispref/display.texi (Image Descriptors): More accurate
+	description of where image files are looked up.  (Bug#36523)
+
+2019-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of secondary selections
+
+	* doc/emacs/killing.texi (Secondary Selection): Improve
+	wording.  Mention that 'M-mouse-1' can be used to cancel
+	secondary selections.  (Bug#36365)
+
+2019-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/fns.c (Fmapconcat): Doc fix.  (Bug#36418)
+
+2019-07-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	Avoid crash inside CFCharacterSetIsLongCharacterMember (Bug#36507)
+
+	* src/macfont.m (macfont_supports_charset_and_languages_p)
+	(macfont_has_char): Don't pass integers outside the Unicode codespace to
+	CFCharacterSetIsLongCharacterMember.  Do not merge to master.
+
+2019-07-06  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix python.el docstring (Bug#36458)
+
+	* lisp/progmodes/python.el (python-shell--prompt-calculated-output-regexp):
+	python-shell-set-prompt-regexp doesn't exist, presumably
+	python-shell-prompt-set-calculated-regexps was meant.
+
+2019-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix.  (Bug36448)
+
+2019-06-29  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix typo in doc string of file-exists-p (bug#36408)
+
+	* src/fileio.c (Ffile_exists_p): Fix typo in doc string.
+
+2019-06-28  Juanma Barranquero  <lekktu@gmail.com>
+
+	* test/lisp/url/url-file-tests.el (url-file): Fix for POSIX filenames.
+
+2019-06-28  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix typo in windows.texi
+
+	* doc/lispref/windows.texi (Window History): Fix typo.  (Bug#36412)
+
+2019-06-26  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Clarify & update (elisp) Writing Emacs Primitives
+
+	* doc/lispref/internals.texi (Writing Emacs Primitives): Update some
+	of the sample code listings, fixing argument lists and parentheses.
+	Replace ... with @dots{}.  Describe UNEVALLED special forms as
+	taking a single argument. (bug#36392)
+
+2019-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify a subtle issue in the Internals chapter of lispref
+
+	* doc/lispref/internals.texi (Writing Emacs Primitives):
+	Clarify the issue with relocation of buffer or string text as
+	side effect of Lisp evaluation.  (Bug#36392)
+
+2019-06-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix sgml-mode handling of quotes within parens (Bug#36347)
+
+	* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize): Use
+	syntax-ppss-table if set.  This is only needed on the release branch,
+	on master the caller (syntax-propertize) already does this.
+	(sgml-mode): Set syntax-ppss-table to sgml-tag-syntax-table.  This
+	correctly classifies parens as punctuation, so they won't confuse the
+	parser.
+	* test/lisp/textmodes/sgml-mode-tests.el (sgml-tests--quotes-syntax):
+	New test copied from master, with two cases added for this bug.
+
+2019-06-21  Juanma Barranquero  <lekktu@gmail.com>
+
+	Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
+
+	* src/fileio.c (Fmake_symbolic_link): Fix docstring.
+	* doc/lispref/files.texi (Changing Files): Doc fix.
+
+2019-06-20  Robert Pluim  <rpluim@gmail.com>
+
+	Check that length of data returned by sysctl is non-zero
+
+	The length of the data returned by sysctl can be zero, which was not
+	checked for.  This could cause crashes, e.g. when querying
+	non-existent processes.  (Bug#36279)
+
+	* src/sysdep.c (list_system_processes) [DARWIN_OS || __FreeBSD__]:
+	(system_process_attributes) [__FreeBSD__]:
+	(system_process_attributes) [DARWIN_OS]:
+	* src/filelock.c (get_boot_time) [CTL_KERN && KERN_BOOTTIME]: Check
+	  for zero length data returned by sysctl.
+
+2019-06-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	* test/lisp/progmodes/python-tests.el (python-virt-bin): Doc fix.
+
+2019-06-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	Fix Python tests depending on system-type
+
+	* test/lisp/progmodes/python-tests.el (python-virt-bin): New function.
+	(python-shell-calculate-exec-path-2)
+	(python-shell-calculate-exec-path-3)
+	(python-shell-calculate-exec-path-4)
+	(python-shell-with-environment-1, python-shell-with-environment-2):
+	Use it.
+
+2019-06-16  Juanma Barranquero  <lekktu@gmail.com>
+
+	Fix problem with wdired test when symlinks cannot be created.
+
+	* test/lisp/wdired-tests.el (wdired-test-symlink-name):
+	Skip test if 'make-symbolic-link' fails for whatever reason;
+	that's not what's being tested.
+
+2019-06-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve wording of documentation of click events
+
+	* doc/lispref/commands.texi (Click Events, Accessing Mouse):
+	Improve and clarify wording.  (Bug#36232)
+
+2019-06-16  Mattias Engdegård  <mattiase@acm.org>
+
+	Backport: Fix typo in regexp-opt example code
+
+	* doc/lispref/searching.texi (Regexp Functions):
+	Fix typo in example code (Bug#34596).
+
+2019-06-15  Stefan Kangas  <stefankangas@gmail.com>
+
+	Remove outdated comment in winner.el (Bug#36185)
+
+	* lisp/winner.el: Remove outdated comment.
+
+2019-06-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix accidential change in tramp-tests; do not merge with master
+
+	* lisp/net/trampver.el: Change version to "2.3.5.26.3".
+	(customize-package-emacs-version-alist): Add Tramp version
+	integrated in Emacs 26.3.
+
+	* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
+	Add skip for w32.
+
+2019-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	tramp-test42-auto-load: Add expected-result.
+
+	* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
+	Expect a failed result if remote file access is not enabled,
+	as it happens while doing the test on Windows.
+
+2019-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	* test/lisp/url/url-file-tests.el (url-file): Use file:///, not file://.
+
+2019-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	Fix doc of srecompile-compile-split-code (Bug#36200)
+
+	* lisp/cedet/srecode/compile.el (srecode-compile-split-code):
+	Remove leftover text from docstring.
+
+2019-06-14  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Make sure Gnus imap group names are decoded before searching
+
+	do not merge (fix unnecessary in Emacs 27)
+
+	* lisp/gnus/nnir.el (nnir-run-imap): Ensure that non-ascii group names
+	  have been fully decoded before passing them to imap search.
+
+2019-06-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove failing test erroneously added in backport
+
+	* test/src/thread-tests.el (threads-test-bug33073): Remove
+	test which cannot work on the emacs-26 branch.  Do not merge
+	to master.  Reported by Juanma Barranquero <lekktu@gmail.com>.
+
+2019-06-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* lisp/net/sieve-manage.el (sieve-manage-parse-capability): Doc fix.
+
+2019-06-12  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.2.90
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version.
+
+2019-06-12  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2019-06-12  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix description of 'display-buffer-in-previous-window' again (Bug#36161)
+
+	* lisp/window.el (display-buffer-in-previous-window): Make
+	doc-string more explicit (Bug#36161).
+	* doc/lispref/windows.texi (Buffer Display Action Functions):
+	Make description of 'display-buffer-in-previous-window' more
+	explicit.
+	(Buffer Display Action Alists): Mention
+	'display-buffer-in-previous-window' in description of
+	'reusable-frames' entry.
+
+2019-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Consistently use @minus{} for negative arguments
+
+	* doc/emacs/mark.texi (Marking Objects):
+	* doc/misc/gnus.texi (Selecting a Group):
+	* doc/emacs/programs.texi (Comment Commands):
+	* doc/emacs/killing.texi (Deletion):
+	* doc/emacs/display.texi (Recentering):
+	* doc/lispref/display.texi (Face Attributes):
+	* doc/lispref/searching.texi (String Search, Regexp Search):
+	Make the markup of "-N" use @minus{} uniformly.  (Bug#35885)
+
+2019-06-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix doc of 'display-buffer-in-previous-window' (Bug#36161)
+
+	* doc/lispref/windows.texi (Buffer Display Action Functions):
+	* lisp/window.el (display-buffer-in-previous-window): Tell
+	that 'display-buffer-in-previous-window' prefers
+	non-selected windows (Bug#36161).
+
+2019-06-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	lisp/*.el: Minor docstring fixes
+
+	* lisp/subr.el (definition-prefixes): Reflow docstring.
+
+	* lisp/svg.el (svg-create): Doc fix to allow arg higlighting.
+	(svg-gradient, svg-rectangle): Improve docstring formatting.
+
+2019-06-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violation when comparing with main-thread
+
+	* src/thread.c (unmark_main_thread): New function.
+	* src/lisp.h (unmark_main_thread): Prototype it.
+	* src/alloc.c (garbage_collect_1): Call it after sweeping.
+	(Bug#33073)
+
+	* test/src/thread-tests.el (threads-test-bug33073): New test.
+
+2019-06-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+	Revert "Don't mark main_thread (Bug#36155)"
+
+	This reverts commit 1877b7b4d79b3434379fd5a4abd85906c25df00c.
+
+2019-06-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+	Don't mark main_thread (Bug#36155)
+
+	* src/thread.c (mark_threads_callback): Don't mark main_thread.
+
+2019-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	More quotation fixes (Bug#35885)
+
+	* doc/emacs/text.texi (Quotation Marks): Fix a typo.
+	* doc/emacs/modes.texi (Minor Modes): Fix another case of
+	showing quotations.
+
+2019-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor copyedits in efaq-w32
+
+	* doc/misc/efaq-w32.texi (Grep, Recursive grep): More accurate
+	description of using 'findstr' as a poor-man's replacement for
+	'grep'.  Reported by 范凯 <m_pupil@163.com>
+
+2019-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Tiny improvement of documentation of major mode conventions
+
+	* doc/lispref/modes.texi (Major Mode Conventions): More
+	accurate advice regarding customization of 'C-M-a' by major
+	modes.
+
+2019-06-08  Juanma Barranquero  <lekktu@gmail.com>
+
+	* nt/addpm.c (main): Fix buffer overflow
+
+2019-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Resurrect display-line-number-mode in client frames
+
+	* lisp/linum.el (linum-on): Mention bug#35726 in a comment.
+	* lisp/display-line-numbers.el
+	(display-line-numbers--turn-on): Don't check for daemon.
+	(Bug#35726)
+
+2019-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/fns.c (Fmapconcat): Doc fix.  (Bug#35710)
+
+2019-06-07  Phillip Lord  <phillip.lord@russet.org.uk>
+
+	Fix typo
+
+	* nt/README.W32:
+
+2019-06-06  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/term/w32-win.el ([noname]): Bind to 'ignore'.  (Bug#36083)
+
+2019-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix styling of Unicode codepoints in manuals
+
+	* doc/lispref/nonascii.texi (Character Properties):
+	* doc/lispref/display.texi (Glyphless Chars)
+	(Bidirectional Display):
+	* doc/emacs/search.texi (Lax Search):
+	* doc/emacs/text.texi (Quotation Marks):
+	* doc/emacs/basic.texi (Inserting Text): Canonicalize the
+	style of "U+NNNN CHARACTER NAME".  (Bug#35885)
+
+2019-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a few uses of quotes in user manual
+
+	* doc/emacs/text.texi (Quotation Marks):
+	* doc/emacs/display.texi (Text Display):
+	* doc/emacs/basic.texi (Inserting Text): Fix some more
+	quotes.  (Bug#35885)
+
+2019-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+	More minor copyedits in the Emacs manual
+
+	* doc/emacs/basic.texi (Arguments):
+	* doc/emacs/display.texi (Recentering, Text Display):
+	* doc/emacs/regs.texi (Text Registers, Rectangle Registers):
+	* doc/emacs/mark.texi (Disabled Transient Mark): Fix
+	inaccuracies and typos.  (Bug#35885)
+
+2019-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix minor issues in the Emacs manual
+
+	* doc/emacs/search.texi (Regexp Replace, Regexps):
+	* doc/emacs/kmacro.texi (Keyboard Macro Query)
+	(Save Keyboard Macro): Fix inaccuracies and typos.
+	(Bug#35885)
+
+2019-06-03  Martin Rudalics  <rudalics@gmx.at>
+
+	Try to improve text on atomic windows in Elisp manual
+
+	* doc/lispref/windows.texi (Deleting Windows): Mention how
+	'delete-window' and 'delete-other-windows' handle atomic
+	windows.  Minor rewrite.
+	(Quitting Windows): Mention how 'quit-restore-window' handles
+	atomic windows and that it tries to avoid raising an error.
+	(Atomic Windows): Tell how to dissolve atomic windows.
+
+2019-06-01  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't recommend insert-before-markers in process filters
+
+	See <https://lists.gnu.org/r/emacs-devel/2019-05/msg00062.html> and
+	Bug#35334.
+	* doc/lispref/processes.texi (Filter Functions): Go back to using
+	plain insert in the example filter.  Add note about updating window
+	point.
+
+2019-06-01  Noam Postavsky  <npostavs@gmail.com>
+
+	Disable byte-compile-cond-use-jump-table (Bug#35770)
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-cond-use-jump-table): Set
+	to nil by default.
+
+	Don't merge to master, the bug is already fixed there.
+
+2019-06-01  Noam Postavsky  <npostavs@gmail.com>
+
+	Allow macros autoloaded as functions during bytecomp (Bug#36022)
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Don't pass
+	symbols which don't have a known definition to
+	byte-compile--function-signature, it fails to compile code which
+	previously compiled successfully (for example, gnus.el until
+	2019-06-01 "* lisp/gnus/gnus.el: Mark autoloaded macros as such" which
+	autoloads some macros as if they were functions).
+
+2019-06-01  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/gnus/gnus.el: Mark autoloaded macros as such.
+
+	This avoids a build failure.
+
+2019-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Speed up redisplay of HELLO
+
+	* etc/HELLO: Set 'inhibit-compacting-font-caches' non-nil
+	locally.  (Bug#36032)
+
+	* lisp/files.el: Add 'inhibit-compacting-font-caches' to the
+	list of built-in variables for which we set up
+	'safe-local-variable' properties.
+
+2019-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'safe-local-variable' property
+
+	* doc/lispref/variables.texi (File Local Variables): Document
+	how to define 'safe-local-variable' properties for built-in
+	variables.
+
+2019-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/package.el: Obey buffer-file-coding-system (bug#35739)
+
+	`url-insert-file-contents` saves in buffer-file-coding-system
+	the coding-system used to decode the contents.  Preserve this
+	as the contents is moved from buffer to string to buffer, and use
+	it when saving the contents to file, so as to try and better preserve
+	the original byte sequence.
+
+	(package--buffer-string, package--cs): New functions.
+	(package--check-signature): Encode `string` if a coding-system
+	was specified in buffer-file-coding-system.
+	(package--download-one-archive, package-install-from-archive):
+	Obey and preserve the buffer-file-coding-system if specified.
+
+	Do not merge.
+
+2019-05-31  Noam Postavsky  <npostavs@gmail.com>
+
+	Warn about wrong number of args for subrs (Bug#35767)
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Don't
+	assume byte-compile-fdefinition will return non-nil.
+	* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-warn-wrong-args)
+	(bytecomp-warn-wrong-args-subr): New tests.
+
+2019-05-31  Noam Postavsky  <npostavs@gmail.com>
+
+	Use plain symbols for eieio type descriptors (Bug#29220)
+
+	Since Emacs 26, eieio objects use a class record (with circular
+	references) as the type descriptor of the object record.  This causes
+	problems when reading back an object from a string, because the class
+	record is not `eq' to the canonical one (which means that read objects
+	don't satisfy the foo-p predicate).
+	* lisp/emacs-lisp/eieio.el (make-instance): As a (partial) fix, set
+	the record's type descriptor to a plain symbol for the type descriptor
+	when eieio-backward-compatibility is non-nil (the default).
+	* lisp/emacs-lisp/eieio-core.el (eieio--object-class): Call
+	eieio--class-object on the type tag when eieio-backward-compatibility
+	is non-nil.
+	(eieio-object-p): Use eieio--object-class instead of
+	eieio--object-class-tag.
+	* test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+	(eieio-test-persist-hash-and-vector)
+	(eieio-test-persist-interior-lists): Make into functions.
+	(eieio-persist-hash-and-vector-backward-compatibility)
+	(eieio-persist-hash-and-vector-no-backward-compatibility)
+	(eieio-test-persist-interior-lists-backward-compatibility)
+	(eieio-test-persist-interior-lists-no-backward-compatibility): New
+	tests which call them, eieio-backward-compatibility let-bound.
+
+2019-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC 9 -Wredundant-decls
+
+	* src/gmalloc.c (_fraghead) [!HYBRID_MALLOC]:
+	Make it static in this case, too.  This avoids having both
+	‘extern struct list _fraghead[];’ and
+	‘static struct list _fraghead[BLOCKLOG];’, which
+	GCC 9 complains about.
+
+2019-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify librsvg 2.45.1 and later
+
+	* src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later,
+	and add a FIXME comment about the deprecated librsvg functions.
+	Backport from master.
+
+2019-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Simplify xd_signature to pacify GCC 9
+
+	* src/dbusbind.c (xd_signature): Use simpler way to set up
+	the subsignature.  This also pacifies GCC 9 on Fedora 30 x86-64.
+	Backport from master.
+
+2019-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Pacify GCC when compiling unexelf.c on Fedora 30
+
+	* src/unexelf.c (unexec): Pacify GCC 9.
+
+2019-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Suppress GCC 9 “no longer supported” messages
+
+	* m4/manywarnings.m4 (gl_MANYWARN_ALL_GCC): Remove -Wchkp.
+	This suppresses a boatload of warnings of the form
+	“gcc: warning: switch ‘-Wchkp’ is no longer supported”.
+	when using GCC 9.  Do not merge to master.
+
+2019-05-30  Stefan Kangas  <stefankangas@gmail.com>
+
+	Fix docstring of bookmark-get-bookmark
+
+	* lisp/bookmark.el (bookmark-get-bookmark): Document optional
+	argument NOERROR. (bug#20148)
+
+2019-05-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Avoid infloop in read-multiple-choice (Bug#32257)
+
+	* lisp/emacs-lisp/rmc.el (read-multiple-choice): When `read-char'
+	signals an error "Non-character input-event", call `read-event' to
+	take the non-character event out of the queue.  Don't merge to master,
+	we just use `read-event' directly there, rather than this solution
+	which relies a particular error message.
+
+2019-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of decoding into a unibyte buffer
+
+	* doc/lispref/nonascii.texi (Explicit Encoding): Document what
+	happens when DESTINATION of decoding is a unibyte buffer.
+
+	* src/coding.c (Fdecode_coding_region)
+	(Fdecode_coding_string): Document what happens if DESTINATION
+	is a unibyte buffer.
+
+2019-05-25  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Remove redundants "See" before @xref or @pxref (Bug#35793)
+
+	* doc/lispref/control.texi (Control Structures):
+	* doc/lispref/modes.texi (Search-based Fontification):
+	* doc/misc/cc-mode.texi (Filling and Line Breaking Commands)
+	(Auto-newline Insertion, Other Special Indentations):
+	* doc/misc/dbus.texi (Errors and Events):
+	* doc/misc/dired-x.texi (Find File At Point):
+	* doc/misc/eudc.texi (Display of Query Results, Inline Query Expansion):
+	* doc/misc/gnus-faq.texi (FAQ 3-11):
+	* doc/misc/gnus.texi (Group Parameters, Posting Styles)
+	(Spam Package Introduction):
+	* doc/misc/org.texi (LaTeX fragments, Previewing LaTeX fragments):
+	* doc/misc/reftex.texi (Commands):
+	Remove redundant "See" before cross references.
+	* doc/lispref/functions.texi (Function Safety): Redundant "see" is in
+	ignored text, but remove it anyway.
+	* doc/lispref/positions.texi (Skipping Characters): Remove redundant
+	"See" before cross references.  Change @xref to @pxref, which is
+	more suitable when at the end of a sentence.
+
+	Most of the redundants "See" found by Noam Postavsky.
+
+2019-05-23  Dario Gjorgjevski  <dario.gjorgjevski@gmail.com>
+
+	Fix customization type of recentf-max-saved-items
+
+	Change the customization type of recentf-max-saved-items to include
+	nil, as it is an allowed value (Bug#35771).
+	* lisp/recentf.el (recentf-max-saved-items): Change the customization
+	type in the defcustom.
+
+2019-05-22  Tom Levy  <tomlevy93@gmail.com>  (tiny change)
+
+	Fix a typo in ELisp manual
+
+	* doc/lispref/sequences.texi (Sequence Functions): Fix a typo.
+	(Bug#35817)
+
+2019-05-21  Noam Postavsky  <npostavs@gmail.com>
+
+	Add option to disable help completion autoloading (Bug#28607)
+
+	* lisp/help-fns.el (help-enable-completion-auto-load): New option.
+	(help--symbol-completion-table): Consult it.
+	* doc/emacs/building.texi (Lisp Libraries): Document it.
+	* etc/NEWS: Announce it.
+	* doc/lispref/loading.texi (Autoload by Prefix): New section.
+	(Autoload): Reference it.
+
+2019-05-20  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't segfault on force-window-update of deleted window
+
+	* src/window.c (Fforce_window_update): Do nothing for deleted
+	windows (Bug#35784).
+
+2019-05-20  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix typo in ELisp manual
+
+	* doc/lispref/variables.texi (Directory Local Variables): Fix typo in
+	dir-locals-set-class-variables description.  (Bug#35799)
+
+2019-05-20  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Remove repeated function call in picture.el
+
+	* lisp/textmodes/picture.el (picture-mode-map):  Remove repeated
+	define-key call.  (Bug#35772)
+
+2019-05-19  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix Hideshow key binding typo in Emacs manual
+
+	* doc/emacs/programs.texi (Hideshow): Add missing function and key
+	index entries.  Fix hs-toggle-hiding binding typo. (bug#35798)
+
+2019-05-17  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Backport: Fix name of gnus-summary-sort-by-mark(s)
+
+	* lisp/gnus/gnus-sum.el (gnus-summary-sort-by-marks): Needs the
+	  "s", according to docs and keymap both. (bug#35765)
+
+	(cherry picked from commit 13248f7444630508cfc3b78a07e8d96613af11c8)
+
+2019-05-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Remove from docs references to obsolete MULE variables
+
+	* src/search.c (search_buffer): Remove obsolete text from a
+	comment.
+	* src/fns.c (Fstring_make_unibyte): Remove obsolete text from
+	a doc string.
+
+2019-05-17  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+	Do potentially destructive operations in prepare-commit-msg
+
+	* build-aux/git-hooks/prepare-commit-msg: If someone occasionally puts
+	Signed-off line, it will likely get there through -s option of git.
+	Exploit this fact to abort before a user got a chance to type commit
+	message.  (Bug#35368)
+
+2019-05-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Backport: fix broken build on m68k
+
+	The GCC + valgrind fix caused the m68k build to fail (Bug#35711).
+	Simplify string allocation a bit to make similar problems less
+	likely in the future.
+	* src/alloc.c (sdata, SDATA_NBYTES, SDATA_DATA) [GC_CHECK_STRING_BYTES]:
+	Use the same implementation as with !GC_CHECK_STRING_BYTES,
+	as the special case is no longer needed.
+	(SDATA_ALIGN): New constant.
+	(SDATA_SIZE): Remove this macro, replacing with ...
+	(sdata_size): ... this new function.  All uses changed.
+	Properly account for sizes and alignments even in the m68k case,
+	and even if GC_CHECK_STRING_BYTES is not defined.
+
+2019-05-14  Noam Postavsky  <npostavs@gmail.com>
+
+	Handle GNUTLS_E_AGAIN in emacs_gnutls_read (Bug#34341)
+
+	Don't merge to master, this has already been fixed there by 2019-01-15
+	"Fix unlikely races with GnuTLS, datagrams".
+	* src/gnutls.c (emacs_gnutls_read): Similar to emacs_gnutls_write,
+	when gnutls_record_recv returns GNUTLS_E_AGAIN set errno to EGAIN.
+
+2019-05-12  Neil Roberts  <bpeeluk@yahoo.co.uk>
+
+	Let dir locals for more specific modes override those from less
+
+	The list of dir local variables to apply is now sorted by the number
+	of parent modes of the mode used as the key in the association list.
+	That way when the variables are applied in order the variables from
+	more specific modes will override those from less specific modes.
+
+	If there are directory entries in the list then they are sorted in
+	order of name length.  The list of modes for that dir is then
+	recursively sorted with the same mechanism.  That way variables tied
+	to a particular subdirectory override those in in a parent directory.
+
+	Previously the behaviour didn’t seem to be well defined anyway and was
+	dependent on the order they appeared in the file.  However this order
+	was changed in version 26.1 and it probably also depended on the
+	number of dir-local files that are merged.
+
+	Bug#33400
+
+	* lisp/files.el (dir-locals-get-sort-score, dir-locals-sort-variables)
+	(dir-locals-read-from-dir): Sort the dir locals so that more precise
+	modes and directory-specific entries have override lesser ones.
+	* doc/emacs/custom.texi (Directory Variables): Document the priority.
+
+2019-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of Hexl mode
+
+	* doc/emacs/misc.texi (Editing Binary Files): Clarify
+	"insertion".  Improve wording.  Add a few Hexl commands.
+	(Bug#35580)
+
+2019-05-09  Alan Mackenzie  <acm@muc.de>
+
+	Fix description of (move-to-column <n> t) when column <n> is inside a tab
+
+	This fixes bug #35647.  State that when indent-tabs-mode is non-nil, spaces
+	are inserted before the tab rather than the tab being replaced by spaces.
+
+	* doc/lispref/text.texi (columns)
+	* src/indent.c (move-to-column): Make the above documentation amendment.
+
+2019-05-09  Noam Postavsky  <npostavs@gmail.com>
+
+	Recognize single quote attribute values in nxml and sgml (Bug#35381)
+
+	* lisp/textmodes/sgml-mode.el (sgml-specials): Add single quote.
+	(sgml-syntax-propertize-rules): Handle single quote.
+	* test/lisp/nxml/nxml-mode-tests.el (nxml-mode-font-lock-quotes): New
+	test.
+	* test/lisp/textmodes/sgml-mode-tests.el
+	(sgml-delete-tag-bug-8203-should-not-delete-apostrophe): Now passes.
+
+2019-05-09  Noam Postavsky  <npostavs@gmail.com>
+
+	Disable extra display of 
 in nxml-mode (Bug#32897)
+
+	* lisp/nxml/nxml-mode.el (nxml-char-ref-display-extra): Don't put
+	display for the newline, it makes the indentation look wrong.
+
+2019-05-09  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix nxml-get-inside (Bug#32003)
+
+	The change from 2016-01-16 "lisp/nxml: Use syntax-tables for comments"
+	made nxml-get-inside return non-nil for any string or comment,
+	including attribute strings.  This caused incorrect and therefore
+	indentation.
+	* lisp/nxml/nxml-rap.el: Update commentary to reflect changes to
+	nxml-mode parsing.
+	(nxml-get-inside): Only return non-nil when inside comments and
+	generic strings, not normal quote-delimited strings.
+	* test/lisp/nxml/nxml-mode-tests.el: New tests.
+
+2019-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix positioning client buffer as instructed by emacsclient
+
+	* lisp/server.el (server-switch-buffer): Let-bind
+	switch-to-buffer-preserve-window-point to nil when switching
+	to the client buffer, when the client requested a specific
+	position.  (Bug#35602)
+
+2019-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* etc/package-keyring.gpg: Add the 2019 key (backport)
+
+2019-05-08  Vitalie Spinu  <spinuvit@gmail.com>
+
+	Fix incorrect cloning of eieio-instance-inheritor objects (Bug#34840)
+
+	* lisp/emacs-lisp/eieio-base.el (clone): Unbound slots of
+	  eieio-instance-inheritor objects as documented in the docs string
+	  and implemented in the original eieio implementation.
+
+2019-05-07  Vitalie Spinu  <spinuvit@gmail.com>
+
+	Fix cloning of eieio-named objects (Bug#22840)
+
+	* lisp/emacs-lisp/eieio-base.el (clone): Correctly set the name of the
+	  cloned objects from eieio-named instances.
+
+2019-05-07  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix ibuffer-unmark-backward synopsis (bug#35572)
+
+	* lisp/ibuffer.el (ibuffer-mode): Fix synopsis of
+	ibuffer-unmark-backward along with other minor copy-edits.
+
+2019-05-05  Noam Postavsky  <npostavs@gmail.com>
+
+	Clarify handling of long options (Bug#24949)
+
+	* doc/emacs/cmdargs.texi (Emacs Invocation): Note that space can be
+	used instead of "=" only if an option requires an argument.
+
+2019-05-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of the daemon and emacsclient
+
+	* doc/emacs/misc.texi (emacsclient Options):
+	* doc/emacs/cmdargs.texi (Initial Options): Document that
+	using --daemon=NAME will need to specify the same NAME when
+	invoking 'emacscilent'.  (Bug#35547)
+
+2019-05-02  Noam Postavsky  <npostavs@gmail.com>
+
+	* etc/NEWS.24: Belatedly announce delete-consecutive-dups.
+
+2019-05-01  Glenn Morris  <rgm@gnu.org>
+
+	* admin/update_autogen: Handle git worktree.
+
+2019-05-01  Noam Postavsky  <npostavs@gmail.com>
+
+	Update process filter example (Bug#35044)
+
+	* doc/lispref/processes.texi (Filter Functions): Use
+	insert-before-markers in the "ordinary" filter example, like
+	internal-default-process-filter does.
+
+2019-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* src/macfont.m (macfont_shape): Use convenient LGLYPH_NEW.
+
+2019-04-28  Noam Postavsky  <npostavs@gmail.com>
+
+	Recommend using font-lock-face over face (Bug#35044)
+
+	* doc/lispref/modes.texi (Precalculated Fontification): Explain
+	advantages of using font-lock-face over face.
+
+2019-04-28  Noam Postavsky  <npostavs@gmail.com>
+
+	Check if mouse_face_overlay was deleted (Bug#35273)
+
+	* src/xdisp.c (note_mouse_highlight): Check if the mouse_face_overlay
+	actually points to a buffer, before calling
+	mouse_face_overlay_overlaps on it.
+
+2019-04-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port to platforms where tputs is in libtinfow
+
+	* configure.ac (tputs_library): Also try tinfow, ncursesw (Bug#33977).
+
+	(cherry picked from commit a3d52b3057c98bce581bc94912ef3ced6fad6f14)
+
+2019-04-23  Glenn Morris  <rgm@gnu.org>
+
+	* admin/admin.el (set-version): Check for increase in version length,
+	rather than a .50 version.
+
+2019-04-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Be more careful about indent-sexp going over eol (Bug#35286)
+
+	* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple
+	sexps if the end of line is within a sexp.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(indent-sexp-stop-before-eol-comment)
+	(indent-sexp-stop-before-eol-non-lisp): New tests.
+
+2019-04-22  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Backport: Improve pure and side-effect-free docs
+
+	For discussion, see thread starting at:
+	https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00316.html
+	* doc/lispref/customize.texi (Composite Types): Do not overspecify
+	:match-alternatives predicates.
+	* doc/lispref/eval.texi (Intro Eval): Anchor definition of "side
+	effect" for cross-referencing...
+	* doc/lispref/functions.texi (What Is a Function): ...from here.
+	Define what a pure function is.
+	* doc/lispref/internals.texi (Writing Emacs Primitives): Describe
+	currently preferred approach to marking primitives as pure and
+	side-effect-free.
+	* doc/lispref/symbols.texi (Standard Properties): Expand description
+	of pure and side-effect-free properties.
+
+	(cherry picked from commit 4430a9b54fca266e48d0eb8b72d83706910f10b8)
+
+2019-04-22  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Backport: Avoid using obsolete indent-relative-maybe
+
+	* lisp/electric.el (electric-indent-functions-without-reindent):
+	* lisp/indent.el (indent-according-to-mode): Check for
+	indent-relative-first-indent-point in addition to its obsolete alias
+	indent-relative-maybe.
+	* lisp/obsolete/vi.el (vi-com-map): Use
+	indent-relative-first-indent-point in place of its obsolete alias
+	indent-relative-maybe.
+
+	(cherry picked from commit 0e468a620458fecd003c396050aa6deb722982c1)
+
+2019-04-21  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Avoid false positives and false negatives of Info-quoted face
+
+	* lisp/info.el (Info-mode-font-lock-keywords): Modify the regexp, for
+	matching single quotes of opening single quote and closing single
+	quote, and avoid matching text followed by a curly quote when it is
+	not quoting. (Bug#35202)
+
+2019-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix markup related to quoting in Info
+
+	* doc/misc/sc.texi (Citations): Fix markup of '>'.
+	* doc/misc/mh-e.texi (Speedbar): Fix markup in a @table.
+	* doc/misc/calc.texi (Yacas Language Mode): Fix a typo.
+	* doc/emacs/mark.texi (Setting Mark): Remove duplicate
+	quoting.  (Bug#35202)
+
+2019-04-21  Noam Postavsky  <npostavs@gmail.com>
+
+	Use pkg-config to find lcms2 CFLAGS and LIBS (Bug#30346)
+
+	* configure.ac: Use EMACS_CHECK_MODULES fors LCMS2 rather than
+	AC_SEARCH_LIBS.
+	* src/Makefile.in: Get LCMS2_LIBS and LCMS2_CFLAGS from configure,
+	instead of just LIBLCMS2.
+
+	(cherry picked from commit cb3863370cbe574810f796726faa39ba0de0a429)
+
+2019-04-20  Glenn Morris  <rgm@gnu.org>
+
+	Add a package: line to c-submit-bug-report.
+
+	* lisp/progmodes/cc-mode.el (c-submit-bug-report):
+	Add a Package: line for mail clients that do not support X- headers.
+
+2019-04-20  Glenn Morris  <rgm@gnu.org>
+
+	* admin/admin.el (set-version): Add NEWS headers for a .50 version.
+
+2019-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Backport doc improvement in ELisp manual
+
+	* doc/lispref/processes.texi (Accepting Output): Backport:
+	document how do avoid race conditions while waiting for all of
+	the process's output to arrive.
+
+2019-04-19  Noam Postavsky  <npostavs@gmail.com>
+
+	Document insert-image-file's return value (Bug#32978)
+
+	* lisp/image-file.el (insert-image-file): Document return value.
+
+2019-04-19  Braun Gábor  <braungb88@gmail.com>  (tiny change)
+
+	Autoload cua-toggle-rectangle-mark (Bug#34947)
+
+	* lisp/emulation/cua-base.el (cua-toggle-rectangle-mark): Autoload it.
+	Library cua-base.el binds cua-toggle-rectangle-mark to a key in the
+	:set function in (defcustom cua-rectangle-mark-key ...), so it should
+	ensure that the command is defined.
+
+2019-04-19  Noam Postavsky  <npostavs@gmail.com>
+
+	Tell xclip not to expect job-control under eshell (Bug#35257)
+
+	* lisp/eshell/esh-proc.el (eshell-needs-pipe): Add "xclip" and other
+	programs that xclip.el (in GNU ELPA) calls with
+	`process-connection-type' bound to nil.
+
+2019-04-18  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix off-by-one-link error in image--set-property
+
+	* lisp/image.el (image--set-property): Ensure new value is set even
+	in the unlikely case that the plist is empty.  Fix off-by-one-link
+	error when deleting a property. (bug#35285)
+	* test/lisp/image-tests.el: New file.
+	(image--set-property): New test.
+
+2019-04-16  Glenn Morris  <rgm@gnu.org>
+
+	* admin/admin.el (make-manuals-dist--1):
+	Update for incompatible copy-file change re "directories".
+
+2019-04-16  Robert Pluim  <rpluim@gmail.com>
+
+	Document some compilation-mode faces
+
+	* doc/emacs/building.texi (Compilation Mode): Describe faces
+	available to affect appearance of compilation-mode buffers.
+
+2019-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Mention the assignment form in "Copyright Assignment"
+
+	* doc/emacs/trouble.texi (Copyright Assignment): Mention the
+	copyright assignment form explicitly.  Suggested by Konstantin
+	Kharlamov <hi-angel@yandex.ru>.
+
+2019-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix confusing wording in the user manual
+
+	* doc/emacs/maintaining.texi (VC Undo): Remove a potentially
+	inaccurate, outdated, and/or confusing sentence.  (Bug#35290)
+
+2019-04-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix the MSDOS build when running under CWSDPMI
+
+	* src/msdos.c (the_only_tty_output): Define.
+	* src/msdos.h (the_only_tty_output): Declare.
+	* src/frame.c (make_terminal_frame) [MSDOS]:
+	* src/dispnew.c (init_display) [MSDOS]: Set up
+	f->output_data.tty pointer using the_only_tty_output, before
+	dereferencing the pointer.  This prevents crashes with DPMI
+	servers that provide NULL pointer protection.
+
+2019-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/progmodes/python.el: Be more careful about temp file removal
+
+	(python-shell-prompt-detect): Use unwind-protect to try and not leave
+	file behind in case of error.
+
+2019-04-14  Alexander Gramiak  <agrambot@gmail.com>
+
+	Backport: Plug memory leak in GTK x-display-monitor-attributes-list
+
+	* src/frame.c (free_monitors) [USE_GTK]: Define in the GTK case as
+	well.
+
+	* src/xfns.c (x-display-monitor-attributes-list) [USE_GTK]: Plug
+	memory leak. Use dupstring over xstrdup as gdk_monitor_get_model may
+	return NULL.
+
+2019-04-14  Alexander Gramiak  <agrambot@gmail.com>
+
+	Backport: * lisp/frame.el (frame--size-history): Fix infloop. (Bug#35272)
+
+2019-04-14  Robert Pluim  <rpluim@gmail.com>
+
+	Downcase charset
+
+	RFC 2046 specifies that the charset parameter is case-insensitive.
+
+	* lisp/gnus/gnus-icalendar.el (gnus-icalendar-with-decoded-handle):
+	Downcase charset.  Suggested by Christophe TROESTLER
+	<Christophe.TROESTLER@umons.ac.be>.  (Bug#35265).
+
+2019-04-14  Phillip Lord  <phillip.lord@russet.org.uk>
+
+	Update for Emacs-26
+
+	* nt/README.W32: Update details about packaging which changed for
+	  Emacs-26.
+
+2019-04-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/lispref/display.texi (Showing Images): Fix a typo.  (Bug#35240
+
+2019-04-11  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.2
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version to 26.2.
+
+2019-04-11  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/HISTORY: Update for Emacs 26.2 release.
+
+	* etc/AUTHORS: Update.
+
+2019-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'read-command'
+
+	* src/minibuf.c (Fread_command): Document the return value
+	when DEFAULT-VALUE is nil and the user enters nothing.
+	* doc/lispref/minibuf.texi (High-Level Completion): Document
+	the printed representation of a symbol whose name is empty.
+	(Bug#3522)
+
+2019-04-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix an outdated URL in a comment
+
+	* src/emacs.c: Fix reference to Cocoa CoreFoundation Release
+	Notes.  (Bug#35225)
+
+2019-04-11  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Backport: Fix comment-empty-lines docstring (bug#35152)
+
+	* lisp/newcomment.el (comment-empty-lines): Consistently use US
+	commas in docstring.  Fix indentation of and typo in custom :type.
+
+	(cherry picked from commit 690c678fb6c1fb5b2f828f9bb90782bd0b01c399)
+
+2019-04-11  Alex Branham  <alex.branham@gmail.com>
+
+	Backport: Update documentation for indent-relative functions
+
+	* lisp/indent.el (indent-relative): Document what happens when there
+	  is no previous nonblank line.
+	* doc/lispref/text.texi (Relative Indent): Document
+	  indent-relative-first-indent-point instead of obsolete
+	  indent-relative-maybe. Fix documentation of which argument from
+	  'indent-relative' is used.
+
+	Bug#34858
+
+	(cherry picked from commit 10cd65878c741d2a22a1f2c36c54fcad4e516f72)
+
+2019-04-11  Noam Postavsky  <npostavs@gmail.com>
+
+	Update nxml-mode.texi: completion now gives xmlns="-!-"
+
+	* doc/misc/nxml-mode.texi (Completion): As of 2016-01-16 "* lisp/nxml:
+	Use standard completion; it also works for company-mode", completing
+	an attribute when there is only one candidate inserts both quotes.
+	Update the example accordingly.
+
+2019-04-10  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Note that choose-completion-string-functions funcs take four args
+
+	* lisp/simple.el (choose-completion-string-functions): Functions in
+	  this list actually need to accept four arguments, though the fourth
+	  should be ignored.
+
+2019-04-10  Gemini Lasswell  <gazally@runbox.com>
+
+	Address name conflicts in EIEIO documentation (bug#31660)
+
+	* doc/misc/eieio.texi (Quick Start): Rename the class used in the
+	example from 'record' to 'person'.
+	(Building Classes): Advise user to check for name conflicts before
+	naming a class.  Add a missing apostrophe.
+	(Making New Objects): Correct grammar.  Rename the class used in the
+	example from 'record' to 'my-class'.
+
+2019-04-09  Mattias Engdegård  <mattiase@acm.org>
+
+	Clarify the TESTFN argument to `alist-get'
+
+	* lisp/subr.el (alist-get):
+	Rephrase the initial text to clarify the meaning of the TESTFN argument.
+	It's an equality predicate, not a look-up function (Bug#35206).
+
+	(cherry picked from commit c81465580fe262f28ce47502c00f4afcbe3b8f8d)
+
+2019-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/editfns.c (Fnarrow_to_region): Doc fix.  (Bug#35163)
+
+2019-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
+
+	* lisp/vc/vc.el (vc-version-diff, vc-version-ediff): Describe
+	arguments in the doc strings.  (Bug#35019)
+
+2019-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of set-window-start
+
+	* doc/lispref/windows.texi (Window Start and End):
+	* src/window.c (Fset_window_start): Document that reliable
+	setting of a window start position requires to adjust point to
+	be visible.  (Bug#34038)
+
+2019-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of window parameters
+
+	* doc/lispref/windows.texi (Cyclic Window Ordering): Describe
+	the effect of the 'other-window' window parameter.
+	(Window Parameters): Improve the descriptions of window
+	parameters.  Move the detailed description of the
+	'quit-restore' window parameter from here...
+	(Quitting Windows): ...to here.  (Bug#35063)
+
+2019-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in frame.el
+
+	* lisp/frame.el: Improve commentary for display-* functions.
+	(Bug#35058)
+
+2019-04-06  Mauro Aranda  <maurooaranda@gmail.com>
+
+	Fix typo in a doc string
+
+	* lisp/autorevert.el (global-auto-revert-mode): Fix a typo.
+	(Bug#35165)
+
+2019-03-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Say which regexp ranges should be avoided
+
+	* doc/lispref/searching.texi (Regexp Special): Say that
+	regular expressions like "[a-m-z]" and "[[:alpha:]-~]" should
+	be avoided, for the same reason that regular expressions like
+	"+" and "*" should be avoided: POSIX says their behavior is
+	undefined, and they are confusing anyway.  Also, explain
+	better what happens when the bound of a range is a raw 8-bit
+	byte; the old explanation appears to have been obsolete
+	anyway.  Finally, say that ranges like "[\u00FF-\xFF]" that
+	mix non-ASCII characters and raw 8-bit bytes should be
+	avoided, since it’s not clear what they should mean.
+
+2019-03-20  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+	* ; ChangeLog.3 update
+
+2019-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve indexing of the user manual
+
+	* doc/emacs/search.texi (Word Search): Improve indexing of
+	"M-s M-w".
+
+2019-03-19  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix url-copy-file arglist
+
+	* lisp/url/url-handlers.el: Silence byte-compiler.
+	(url-copy-file): Add 6th argument following change to copy-file in
+	2012-12-16T19:22:27+01:00!romain@orebokech.com. (bug#4410)
+
+2019-03-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix downloading updates for packages with non-ASCII descriptions
+
+	* lisp/emacs-lisp/package.el (package--download-one-archive):
+	Make sure archive contents are written using UTF-8 encoding.
+	(Bug#34909)
+	(list-packages): Set buffer's encoding to UTF-8.
+
+2019-03-18  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/NEWS: Remove temporary markers.
+
+2019-03-15  Alan Mackenzie  <acm@muc.de>
+
+	* doc/misc/cc-mode.texi (Config Basics): in @itemize, @asis -> @w{}
+
+2019-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't clobber 'comint-input-autoexpand' in 'read-shell-command'
+
+	* lisp/shell.el (shell-completion-vars): Set only the
+	buffer-local value of 'comint-input-autoexpand'.  (Bug#34815)
+
+2019-03-13  Martin Rudalics  <rudalics@gmx.at>
+
+	Document restrictions when setting window margins, fringes or scroll bars
+
+	* src/window.c (Fset_window_margins, Fset_window_fringes)
+	(Fset_window_scroll_bars): In doc-strings tell that a window
+	must be large enough to accommodate fringes, sroll bars and
+	margins of the desired size.
+	* doc/lispref/display.texi (Fringe Size/Pos, Scroll Bars)
+	(Display Margins): Tell that windows must be large enough to
+	accommodate fringes, sroll bars and margins of the desired
+	size.
+
+2019-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+	More improvements for 'read-buffer's doc string
+
+	* src/minibuf.c (Fread_buffer): Further improve the doc
+	string.  (Bug#347694)
+
+2019-03-10  Alan Mackenzie  <acm@muc.de>
+
+	* lisp/progmodes/cc-defs.el: Update c-version to 5.33.2 for Emacs 26.2
+
+2019-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/minibuf.c (Fread_buffer): Minor doc fixes.  (Bug#34749)
+
+2019-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix markup of fake keys in the ELisp manual
+
+	* doc/lispref/keymaps.texi (Menu Bar, Tool Bar): Fix markup of
+	fake keys.  (Bug#34785)
+
+2019-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid errors in Auto Revert mode
+
+	* lisp/autorevert.el (auto-revert-buffers): Cancel
+	auto-revert-timer only if it is non-nil.  This avoids errors
+	on first invocation of Auto-Revert mode.
+
+2019-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Mention empty strings in file name expansion, emacs lisp reference
+
+	* doc/lispref/files.texi (Files, File Name Expansion):
+	Mention also empty strings.
+
+2019-03-08  Alan Mackenzie  <acm@muc.de>
+
+	cc-mode.texi: Work around makeinfo alignment bug.  Fix problem with ss index
+
+	* doc/misc/cc-mode.texi (top level): Using txicommandconditionals to
+	differentiate between the C and perl versions of Texinfo, create an "ss
+	index" unless we are both using the C Texinfo and are building the .dvi output
+	format.
+	(Config Basics): Work around a perl Texinfo alignment bug by writing a
+	separate version of an item list structure for this version, simplifying it
+	considerably.
+
+2019-03-08  Martin Rudalics  <rudalics@gmx.at>
+
+	Warn against recursive invocations of 'buffer-list-update-hook' (Bug#34765)
+
+	* src/buffer.c (Vbuffer_list_update_hook):
+	* doc/lispref/buffers.texi (Buffer List): Warn against
+	recursive invocations of 'buffer-list-update-hook' (Bug#34765).
+
+2019-03-08  Martin Rudalics  <rudalics@gmx.at>
+
+	Provide more details in doc-string of 'delete-windows-on' (Bug#34749)
+
+	* lisp/window.el (delete-windows-on): Provide more details in
+	doc-string (Bug#34749).
+
+2019-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'delete-windows-on'
+
+	* doc/emacs/windows.texi (Change Window): Document
+	'delete-windows-on'.
+
+	* lisp/window.el (delete-windows-on): Doc fix.  (Bug#34749)
+
+2019-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/frame.el (make-frame-command): Doc fix.  (Bug#34715)
+
+2019-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid undefined behavior in gdb-mi.el
+
+	* lisp/progmodes/gdb-mi.el (gdb-send): Don't call match-string
+	if this is not a control command.  (Bug#34769)
+
+2019-03-06  Martin Rudalics  <rudalics@gmx.at>
+
+	* lisp/window.el (fit-frame-to-buffer): Make doc-string more accurate.
+
+2019-03-05  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Minor spelling and grammar fixes (bug#34756)
+
+	doc/misc/cc-mode.texi (Style Variables, Customizing Indentation):
+	doc/misc/ede.texi (Extending EDE, ede-project-placeholder)
+	(ede-target, ede-proj-target, ede-compilation-program, ede-compiler)
+	(ede-linker): Remove apostrophe from possessive "it's".
+	doc/lispintro/emacs-lisp-intro.texi (Find a File):
+	doc/misc/gnus-faq.texi (FAQ 2-2): Write "an other" as a single word.
+	doc/misc/gnus.texi (Article Buttons):
+	lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist)
+	(gnus-button-mid-or-mail-heuristic): Write singular number of
+	Message-IDs, rather than plural.
+	lisp/gnus/message.el (message-user-fqdn): Capitalize initialism.
+
+2019-03-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvement of documentation of '(when CONDITION . SPEC)'
+
+	* doc/lispref/display.texi (Other Display Specs): Add a caveat
+	to using the '(when CONDITION . SPEC)' display specs.
+
+2019-03-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'auto-coding-functions'
+
+	* doc/lispref/nonascii.texi (Default Coding Systems): Clarify
+	that the functions in 'auto-coding-functions' are called both
+	for decoding and for encoding.
+
+	* lisp/international/mule.el (auto-coding-functions): Doc fix.
+
+2019-03-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix visiting XML files with non-Unix EOL format
+
+	* lisp/international/mule.el (sgml-xml-auto-coding-function)
+	(sgml-html-meta-auto-coding-function): Don't use
+	'buffer-file-coding-system' if the buffer is unibyte.
+	(Bug#34704)
+
+2019-03-02  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Update example major mode code in Elisp manual
+
+	* doc/lispref/modes.texi (Example Major Modes): Update code examples
+	to reflect current state of lisp/textmodes/text-mode.el and
+	lisp/emacs-lisp/lisp-mode.el. (bug#34671)
+
+2019-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in the Calc manual
+
+	* doc/misc/calc.texi (Algebraic Tutorial): Fix parentheses in
+	@example.  (Bug#34689)
+
+2019-03-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvement in cross-references of the ELisp manual
+
+	* doc/lispref/modes.texi (Minor Mode Conventions): Add
+	cross-references to related major-mode descriptions.  (Bug#34678)
+
+2019-03-01  Tobias Bading  <tbading@web.de>  (tiny change)
+
+	Fix last change on 'compilation-parse-errors'
+
+	* lisp/progmodes/compile.el (compilation-parse-errors): Fix
+	previous change in this function.  (Bug#34479)
+
+2019-02-25  Dmitry Gutov  <dgutov@yandex.ru>
+
+	Backport: js--re-search-backward-inner: Fix infloop
+
+	Fix JS indentation infloop reported in
+	https://github.com/mooz/js2-mode/issues/513.
+
+	* lisp/progmodes/js.el (js--re-search-backward-inner): Account for
+	multiline string literals.
+	* test/manual/indent/js.js: New test example.
+
+	(cherry picked from commit b01a4295c2f9bb58858880e4e28b05cc8396791c)
+
+2019-02-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvement for docs of completion
+
+	* doc/lispref/minibuf.texi (Completion Commands)
+	(Completion in Buffers, Programmed Completion): Add to text
+	that references completion tables a cross-reference to where
+	"completion table" is described.
+	(Programmed Completion): Fix the description of
+	'completion-table-dynamic'.  Add more cross-references.
+
+2019-02-22  Ken Brown  <kbrown@cornell.edu>
+
+	Disable the timerfd interface on Cygwin
+
+	* configure.ac (emacs_cv_have_timerfd): Set to "no" on Cygwin.
+
+2019-02-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in the doc string of 'regex-opt'
+
+	* lisp/emacs-lisp/regexp-opt.el (regexp-opt): Fix example in
+	the doc string.  (Bug#34596)
+
+2019-02-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192)
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Warn about
+	bash 5.0.0 and HISTSIZE=0.  (Bug#34192)
+
+2019-02-20  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.1.92
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version to 26.1.92.
+
+2019-02-20  Nicolas Petton  <nicolas@petton.fr>
+
+	* ; ChangeLog.3 update
+
+	* etc/AUTHORS: Update.
+
+2019-02-20  Glenn Morris  <rgm@gnu.org>
+
+	Remove .art from the default list of ImageMagick extensions
+
+	It seems that .art files can be non-image files that
+	ImageMagick mistakenly treats as extremely large images.
+	Real .art images seem rare.
+	* lisp/image.el (imagemagick-enabled-types): Remove ART.  (Bug#22289)
+
+2019-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix input after setting x-wait-for-event-timeout nil
+
+	* src/w32term.c (x_make_frame_visible): Call unblock_input
+	before returning early.  (Bug#34575)
+
+2019-02-19  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix two warnings in eshell.texi
+
+	* doc/misc/eshell.texi (Built-ins, Globbing): Fix `.' or `,'
+	must follow @xref, not `f' warnings.
+
+2019-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/minibuffer.el (completion-table-dynamic): Improve docstring
+
+2019-02-18  David Pathakjee  <dpathakjee@gmail.com>  (tiny change)
+
+	* lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fix.  (Bug#34518)
+
+2019-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in ELisp manual
+
+	* doc/lispref/abbrevs.texi (Abbrev Table Properties): Fix a
+	typo.  (Bug#34508)
+
+2019-02-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update citations of Internet RFCs
+
+	For example, RFC 822 has been obsoleted by RFC 2822, which in
+	turn has been obsoleted by RFC 5322.
+	* doc/emacs/ack.texi, doc/lispref/os.texi:
+	* doc/misc/emacs-mime.texi, doc/misc/gnus-coding.texi:
+	* doc/misc/gnus.texi, doc/misc/sc.texi:
+	* lisp/calendar/parse-time.el, lisp/gnus/gnus-cite.el:
+	* lisp/gnus/gnus-util.el, lisp/gnus/message.el:
+	* lisp/gnus/mm-bodies.el, lisp/gnus/nnrss.el:
+	* lisp/mail/feedmail.el, lisp/mail/ietf-drums.el:
+	* lisp/mail/mail-extr.el, lisp/mail/mail-utils.el:
+	* lisp/mail/mailclient.el, lisp/mail/mailheader.el:
+	* lisp/mail/rfc2047.el, lisp/mail/rfc822.el, lisp/mail/rmail.el:
+	* lisp/mail/sendmail.el, lisp/mail/smtpmail.el:
+	* lisp/mail/supercite.el, lisp/mh-e/mh-e.el:
+	* lisp/mh-e/mh-utils.el, lisp/net/imap.el:
+	* lisp/net/newst-backend.el, lisp/org/org-id.el:
+	* lisp/ps-samp.el, lisp/simple.el, lisp/url/url-util.el:
+	Update RFC citations.
+
+2019-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix handling of manpage references divided by hyphenation
+
+	* lisp/man.el (Man-reference-regexp): Accept a newline as part
+	of a manpage name only if it's preceded by a hyphen.  (Bug#34286)
+	(Man-translate-references): Adapt to change in
+	'Man-reference-regexp'.
+	(Man-default-man-entry): Support references divided between
+	two lines by an ASCII hyphen.  This is a left-over from fixing
+	bug#6289.
+
+2019-02-16  Gregor Zattler  <telegraph@gmx.net>  (tiny change)
+
+	* doc/misc/eshell.texi: Fix some @ref's.
+
+2019-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in lispref/syntax.texi
+
+	* doc/lispref/syntax.texi (Syntax Table Internals): Fix a
+	typo.  (Bug#34495)
+
+2019-02-15  Victor J. Orlikowski  <vjo@duke.edu>  (tiny change)
+
+	Avoid errors in erc-dcc.el when erc-dcc-verbose is non-nil
+
+	* lisp/erc/erc-dcc.el (erc-dcc-get-filter): Don't assume STR
+	is always a string.  Use 'buffer-name' to get the DCC file
+	name, as buffer-file-name is not set in the process buffer.
+
+2019-02-15  Daniel Lopez  <daniel.lopez999@gmail.com>  (tiny change)
+
+	Fix faces in compilation messages
+
+	* lisp/progmodes/compile.el (compilation-parse-errors): Don't
+	clobber the value of TYPE inside the loop.  (Bug#34479)
+
+2019-02-15  Gregor Zattler  <telegraph@gmx.net>
+
+	* doc/misc/eshell.texi (Built-ins): Fix alias description
+
+	Dear eamcs developers, eshells current documentation first states
+	that alias definitions are not saved to an alias file, later that
+	they are saved to an alias file.  I tested it and the latter is
+	correct.
+
+	Please find attached a patch which fixes this.
+
+	Thanks for working on emacs which is really great, Gregor
+
+	>From 1fe51cc769ab7a30d0896fb3d6105c0561243fa7 Mon Sep 17 00:00:00 2001
+	From: Gregor Zattler <telegraph@gmx.net>
+	Date: Wed, 13 Feb 2019 20:19:38 +0100
+	Subject: * doc/misc/eshell.texi (Built-ins): Fix alias description.
+
+	Bring description of built-in 'alias' in line with (info "(eshell) Aliases"),
+	which describes the actual behaviur.
+
+	(cherry picked from commit a48099ce7ff63cda416a870766fe61f5b8ac7c2c)
+
+2019-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	Work for empty MIME attachments (related to bug#34387)
+
+	* lisp/gnus/mm-view.el (mm-inline-text):
+	Make undisplayer do nothing if the part is empty.
+
+	* lisp/gnus/mm-decode.el (mm-copy-to-buffer): Work for empty MIME part.
+	* lisp/gnus/mml.el (mime-to-mml): Ditto.
+
+2019-02-14  Jackson Ray Hamilton  <jackson@jacksonrayhamilton.com>
+
+	Backport: js-indent-align-list-continuation: Make variable safe
+
+	* lisp/progmodes/js.el (js-indent-align-list-continuation): Indicate
+	variable is safe as a file-local variable.  This fixes the
+	js-indent-align-list-continuation-nil test when run with make.
+
+	(cherry picked from commit dd319f2711f895eec87c1017b82cd9d88d9ecd0a)
+
+2019-02-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid crashes upon C-g in nested invocations of 'read_char'
+
+	* src/keyboard.c (read_char, read_event_from_main_queue):
+	Ensure the global value of getcjmp is restored when the stack
+	is unwound by the likes of 'throw', by calling
+	record_unwind_protect_ptr instead of restoring the value
+	manually.  (Bug#34394)
+	(restore_getcjmp): Argument is now 'void *', to match the
+	signature of record_unwind_protect_ptr.
+
+	(cherry picked from commit 10527fca66e39d7067986904161fa33741abcd26)
+
+2019-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* src/data.c (Fmake_local_variable): Fix bug#34318
+
+	Revert part of ed962f2b8a.
+
+	* test/src/data-tests.el (data-tests-make-local-forwarded-var):
+	Add corresponding test.
+
+2019-02-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor fixes in ELisp manual wrt syntax-table properties
+
+	* doc/lispref/syntax.texi (Syntax Properties): Fix reference
+	to syntax-table properties.  (Bug#34455)
+	(Control Parsing): Remove redundant @vindex entry.
+
+2019-02-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/notes/emba: New file.
+
+2019-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Hunspell invocation for discovering its dictionaries
+
+	* lisp/textmodes/ispell.el
+	(ispell-find-hunspell-dictionaries): Invoke Hunspell with the
+	-a switch, to prevent it from initializing its curses UI.
+	(Bug#34272)
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvements to do strings in callproc.c
+
+	* src/callproc.c (Fcall_process, Fcall_process_region): Minor
+	fixes to doc strings.  Suggested by Nicholas Drozd
+	<nicholasdrozd@gmail.com>.  (Bug#34274)
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'date-to-time' and 'parse-time-string'
+
+	* doc/lispref/os.texi (Time Parsing): Document
+	'parse-time-string', and refer to it for the description of
+	the argument of 'date-to-time'.
+
+	* lisp/calendar/time-date.el (date-to-time): Refer in the doc
+	string to 'parse-time-string' for more information about the
+	format of the DATE argument.  (Bug#34303)
+
+2019-02-08  Nick Drozd  <nicholasdrozd@gmail.com>
+
+	Fix downloading of URLs that end in a slash
+
+	* lisp/net/eww.el (eww-download-callback): Fix download URL
+	file name.  Previously this wasn't handling download URLs
+	correctly, resulting in all downloaded pages being named
+	"!", "!(1)", etc.  (Bug#34291)
+
+2019-02-08  Nick Drozd  <nicholasdrozd@gmail.com>
+
+	* doc/misc/eww.texi (Basics): Fix eww keybindings.  (Bug#34291)
+
+2019-02-08  Robert Pluim  <rpluim@gmail.com>
+
+	Fix process-thread docstring
+
+	* src/process.c (Fprocess_thread): Correct docstring.
+
+2019-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix failures of vc-find-revision with non-ASCII file names
+
+	* lisp/vc/vc.el (vc-find-revision): Instead of binding
+	coding-system-for-write, make the buffer-file-coding-system of
+	the temporary buffer be no-conversion.  This avoids the
+	unwanted side effect of not encoding the command-line
+	arguments of the VCS commands invoked by the backend.
+	(Bug#34350)
+
+2019-02-07  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/lispref/tips.texi (Documentation Tips): Fix quotes.  (Bug#34372)
+
+2019-02-05  Alex Branham  <alex.branham@gmail.com>
+
+	Add documentation for tabulated-list functions in the elisp manual
+
+	* doc/lispref/modes.texi: Add documentation for
+	  'tabulated-list-delete-entry', 'tabulated-list-get-id',
+	  'tabulated-list-get-entry', 'tabulated-list-header-overlay-p',
+	  'tabulated-list-put-tag', and 'tabulated-list-set-col'.
+
+	Bug#21074
+
+2019-02-03  Jean-Christophe Helary  <brandelune@gmail.com>
+
+	Fix URL in ucs-normalize.el
+
+	* lisp/international/ucs-normalize.el: Fix URL of the HFS
+	normalization reference.  (Bug#34300)
+
+2019-02-03  Alan Mackenzie  <acm@muc.de>
+
+	* etc/PROBLEMS: Amend entry for profiler bug #34235 to mention kernel 4.14.97
+
+2019-02-02  Glenn Morris  <rgm@gnu.org>
+
+	* make-dist: Remove references to src/stamp-h.in.
+
+	This file was removed two years ago in 2f89350.
+	No need to merge to master.
+
+2019-02-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* etc/PROBLEMS: Mention profiler-report bug (Bug#34235).
+
+2019-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Correct the docs of inserting kmacro counter
+
+	* doc/emacs/kmacro.texi (Keyboard Macro Counter): Correct the
+	description of the affect "C-u" has on inserting the macro
+	counter.  Define "previous counter value".
+
+	* lisp/kmacro.el (kmacro-insert-counter)
+	(kmacro-start-macro-or-insert-counter): Fix the doc strings
+	regarding the effect of "C-u".  (Bug#34263)
+
+2019-02-01  Nicholas Drozd  <nicholasdrozd@gmail.com>
+
+	* doc/misc/calc.texi (Algebraic Tutorial): Fix a typo.  (Bug#34273)
+
+2019-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid errors in 'rmail-get-new-mail'
+
+	* lisp/mail/rmail.el (rmail-insert-inbox-text): Don't assume
+	the Rmail protocol is always a string when calling
+	'rmail-remote-proto-p'.  (Bug#34252)
+
+2019-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix process-contact bug with TCP connections
+
+	This fixes a regression from Emacs 25.3 (Bug#34134).
+	* src/process.c (server_accept_connection):
+	Set host correctly, fixing a bug introduced in
+	2017-09-16T21:29:18Z!eggert@cs.ucla.edu
+	when working around a GCC bug.
+
+2019-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor copyedits in last manual change
+
+	* doc/emacs/custom.texi (Authentication): Improve markup,
+	indexing, and wording.
+
+2019-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of face numbers
+
+	* doc/lispref/display.texi (Face Functions): Mention where the
+	face number is used and that it depends on the 'face' property
+	of the face symbol.  Improve indexing.
+
+2019-01-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/emacs/custom.texi (Authentication): Refer to the "Help for users" node.
+
+2019-01-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	New node Authentication in the Emacs manual
+
+	* doc/emacs/custom.texi (Customization):
+	* doc/emacs/emacs.texi (Top): Add node Authentication.
+
+2019-01-25  Alan Mackenzie  <acm@muc.de>
+
+	Fix a loop in c-fl-decl-start.  This fixes bug #34186.
+
+	* lisp/progmodes/cc-mode.el (c-fl-decl-start) In the pair of operations
+	c-syntactic-skip-backward and c-forward-syntactic-ws, ensure the latter
+	doesn't come back to the position before the former, and break out of the
+	enclosing loop if it does.
+
+2019-01-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix LaTeX output of month and day from cal-tex.el
+
+	* lisp/calendar/cal-tex.el (cal-tex-cursor-week-iso)
+	(cal-tex-week-hours): Escape a lone blank, to make it through
+	LaTeX.  (Bug#34148)
+
+2019-01-25  Daniel Kahn Gillmor  <dkg@fifthhorseman.net>  (tiny change)
+
+	Avoid elisp crash for OpenPGP User IDs with no e-mail address
+
+	* lisp/gnus/mml-sec.el (mml-secure-check-user-id): Verify that
+	there is an e-mail address in the current User ID before trying
+	to downcase it.  (Bug#34121)
+
+2019-01-25  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
+
+	image-mode: Do not use default scaling (bug#33990)
+
+	* lisp/image-mode.el (image-toggle-display-image): Set :scale == 1 so
+	that create-image does not apply additional scaling.
+
+2019-01-25  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
+
+	create-image: Expand documentation (bug#33990)
+
+	* lisp/image.el (create-image): Discuss default for :scale in the doc
+	string.
+
+2019-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'isearch-filter-predicate'
+
+	* lisp/isearch.el (isearch-filter-predicate)
+	(isearch-filter-visible): Doc fixes.  (Bug#34150)
+
+2019-01-19  Trevor Spiteri  <tspiteri@ieee.org>  (tiny change)
+
+	Fix cursor column positioning on Grep hits
+
+	* lisp/progmodes/grep.el (grep-match-face): Move before first
+	use, to avoid byte-compilation warning.
+	(grep-regexp-alist): Don't quote grep-match-face.  (Bug#34068)
+
+2019-01-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in ELisp manual
+
+	* doc/lispref/nonascii.texi (Converting Representations): Fix
+	inconsistency between @defun and the argument description of
+	'byte-to-string'.  (Bug#34119)
+
+2019-01-15  Alan Third  <alan@idiocy.org>
+
+	Prevent redrawing if frame is garbaged
+
+	* src/nsterm.m ([EmacsView viewWillDraw]): Cancel drawing if the frame
+	has been garbaged.
+	* src/xdisp.c (expose_window_tree, expose_frame): Remove NS only
+	exceptions.
+
+2019-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Attempt to fix hangs on MS-Windows due to C-g
+
+	* src/w32uniscribe.c (uniscribe_otf_capability): Set
+	inhibit-quit around calls to otf_features, because the latter
+	cons Lisp data structures while we are in a critical section.
+	* src/xdisp.c (ALLOCATE_HDC) [HAVE_NTGUI]: Set inhibit-quit.
+	(RELEASE_HDC) [HAVE_NTGUI]: Restore inhibit-quit.
+	(OPTIONAL_HDC, DECLARE_HDC): Remove macros, their job is now
+	done by ALLOCATE_HDC and by a single #ifdef.
+	(draw_glyphs): Adapt to the above changes in macros.
+	(Bug#34059)
+
+2019-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Calc graph output on MS-Windows
+
+	The previous code relied on "pgnuplot" executable, which is
+	no longer provided with Gnuplot 5.x.
+	* lisp/calc/calc.el (calc-gnuplot-name): Set to "pgnuplot" on
+	MS-Windows only if such an executable exists.
+	* lisp/calc/calc-graph.el (calc-graph-w32-p): New defsubst.
+	(calc-graph-plot, calc-graph-command, calc-gnuplot-command)
+	(calc-graph-init): Call calc-graph-w32-p wherever we need to
+	do something special for invoking gnuplot on MS-Windows,
+	instead of comparing against calc-gnuplot-name.
+	(calc-graph-plot): Set the terminal to "qt" on MS-Windows when
+	pgnuplot.exe is not available.
+	(calc-graph-kill): Delete the temporary files only after
+	killing the gnuplot process, otherwise the deletion might fail
+	on MS-Windows because the files are still in use.
+
+2019-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a minor mistake in ELisp manual
+
+	* doc/lispref/buffers.texi (Modification Time): Fix
+	documentation of 'visited-file-modtime'.  (Bug#34055)
+
+2019-01-12  Stephen Berman  <stephen.berman@gmx.net>
+
+	* etc/tutorials/TUTORIAL: Fix typo (bug#34049)
+
+2019-01-12  Devon Sean McCullough  <Emacs-Hacker2018@jovi.net>
+
+	Fix UI of Buffer-menu
+
+	* lisp/buff-menu.el (Buffer-menu-execute): Don't remove
+	entries of buffers whose killing the user didn't confirm.
+	(Bug#33669)
+
+2019-01-12  Philip K  <philip@warpmail.net>  (tiny change)
+
+	Reinitialize ispell-really-enchant when changing the speller
+
+	* lisp/textmodes/ispell.el (ispell-check-version): Reset also
+	ispell-really-enchant.  (Bug#34019)
+
+2019-01-07  Leo Liu  <sdl.web@gmail.com>
+
+	Speed up loading css-mode
+
+	lisp/textmodes/css-mode.el: Remove (require 'eww) which is redundant
+	and slow.  (Bug#33939)
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt filenotify-tests for emba
+
+	* .gitlab-ci.yml (test): Add EMACS_EMBA_CI variable.
+
+	* test/lisp/filenotify-tests.el (file-notify-test03-events)
+	(file-notify-test05-file-validity)
+	(file-notify-test06-dir-validity)
+	(file-notify-test07-many-events)
+	(file-notify-test09-watched-file-in-watched-dir): Adapt tests for emba.
+
+2019-01-07  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.1.91
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version to 26.1.91.
+
+2019-01-07  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2019-01-07  Leo Liu  <sdl.web@gmail.com>
+
+	* lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug#33939)
+
+2019-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve GC+Cairo workaround
+
+	Suggested by Eli Zaretskii (Bug#20890#31).
+	* src/font.h (font_data_structures_may_be_ill_formed): New function.
+	* src/ftfont.c (ftfont_close):
+	* src/ftcrfont.c (ftcrfont_close): Use it.
+
+	(cherry picked from commit d02fd482fbeaf6ed551e78223b538495cb0c3541)
+
+2019-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around GC+Cairo bug
+
+	Workaround suggested by Robert Pluim (Bug#20890#13).
+	* src/ftfont.c (ftfont_close) [USE_CAIRO]:
+	Do nothing if GC is in progress.
+
+2019-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in font.h
+
+	* src/font.h (struct font, struct font_driver): Fix typos and
+	wording in comments.  Document all driver methods.
+
+2019-01-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix definition of Qwindow_point_insertion_type (Bug#33871)
+
+	* src/window.c (Qwindow_point_insertion_type): Fix definition
+	(Bug#33871).
+
+2019-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'server-name'
+
+	* doc/emacs/misc.texi (Emacs Server, TCP Emacs server)
+	(emacsclient Options):
+	* lisp/server.el (server-name):  Document the usage of
+	'server-name' to specify the server file as an absolute file
+	name.  Do not merge to master.  (Bug#33934)
+
+2019-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Unicode copyright notice
+
+	* admin/unidata/copyright.html: Updated version from the
+	Unicode Consortium's site.
+
+2019-01-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Handle quoted file names in filenotify.el
+
+	* lisp/filenotify.el (file-notify-add-watch): Do not save
+	quoted file names in `file-notify-descriptors'.
+
+	* test/lisp/files-tests.el
+	(files-file-name-non-special-notify-handlers): Do not expect
+	to fail.
+
+2019-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix copyright years by hand
+
+	These are dates that admin/update-copyright did not update, or
+	updated incorrectly.
+
+2019-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Update copyright year to 2019
+
+	Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
+
+2018-12-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/man/emacs.1.in: Fix value of default frame height.  (Bug#33921)
+
+2018-12-30  Martin Rudalics  <rudalics@gmx.at>
+
+	In user manual fix value of default frame height (Bug#33921)
+
+	* doc/emacs/cmdargs.texi (Window Size X): Fix value of default
+	frame height (Bug#33921).
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'file-local-name' and related APIs
+
+	* doc/lispref/files.texi (Unique File Names)
+	(Magic File Names, File Name Expansion): Improve documentation
+	of the "local part" of a remote file name.
+	* doc/lispref/processes.texi (Synchronous Processes)
+	(Asynchronous Processes): State explicitly that program and
+	file names passed to functions that start remote processes
+	need to be relative or obtained by 'file-local-name'.
+
+	* lisp/files.el (file-local-name):
+	* lisp/simple.el (start-file-process, process-file): Improve
+	the documentation of the "local part" of a remote file name,
+	and its use in APIs that start remote processes.
+
+2018-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31704.  Do not merge
+
+	* lisp/net/tramp.el (tramp-eshell-directory-change):
+	Use `path-separator' as it does eshell.  (Bug#31704)
+
+2018-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31704.  Do not merge
+
+	* lisp/eshell/esh-proc.el (eshell-gather-process-output): Do not
+	let `expand-file-name' prefix remote file names with MS Windows
+	volume letter.
+
+	* lisp/net/tramp.el (tramp-eshell-directory-change):
+	Use `path-separator' as it does eshell.  (Bug#31704)
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/files.el (cd): Fix last change.  (Bug#33791)
+
+2018-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix remote directories in Eshell on MS-Windows
+
+	* lisp/files.el (cd): Support remote directory names on
+	MS-Windows.  (Bug#33791)
+
+2018-12-29  Drew Adams  <drew.adams@oracle.com>
+
+	Fix :type 'group' in defcustom
+
+	* lisp/wid-edit.el (group): Fix the :format spec.  (Bug#33566)
+
+2018-12-28  Alan Third  <alan@idiocy.org>
+
+	Fix NS fringe bitmap drawing bug (bug#33864)
+
+	* src/nsterm.m (ns_draw_fringe_bitmap): Check the rectangle to clear
+	correctly.
+
+2018-12-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix commentary in dispnew.c
+
+	* src/dispnew.c (buffer_posn_from_coords): Fix inaccuracies in
+	the commentary.
+
+2018-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Improve accept-process-process doc
+
+	* doc/lispref/processes.texi (Accepting Output):
+	* src/process.c (Faccept_process_output):
+	Document that (accept-process-output P) can return non-nil
+	even after P has exited, and that it can return nil even if P
+	is still running (Bug#33839).
+
+2018-12-23  Stephen Leake  <stephen_leake@stephe-leake.org>
+
+	Fix a simple bug in display-buffer-use-some-frame
+
+	* lisp/window.el (display-buffer-use-some-frame): Simplify the
+	predicate, fix TYPE arg to window--display-buffer.
+
+2018-12-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	Clarify thread switching while waiting for process output
+
+	* doc/lispref/threads.texi (Threads): Clarify, that thread
+	switching happens when waiting for process output from
+	asynchronous processes.
+
+2018-12-22  Charles A. Roelli  <charles@aurox.ch>
+
+	Improve process doc. with respect to handling of large input (Bug#33191)
+
+	* src/process.c (Fprocess_send_region, Fprocess_send_string):
+	Document that process input longer than the process input
+	buffer may be split into bunches.  Remove an outdated
+	reference to a 500 character split boundary.
+	* doc/lispref/processes.texi (Asynchronous Processes): Remove
+	mention of "stray character injections" in PTY processes.  See
+	also the comment about ICANON in src/sysdep.c, function
+	child_setup_tty.
+
+2018-12-22  Terrence Brannon  <metaperl@gmail.com>
+
+	Minor copyedits in landmark.el
+
+	* lisp/obsolete/landmark.el: Fix author's email and commentary.
+
+2018-12-20  Alan Mackenzie  <acm@muc.de>
+
+	Check result from c-backward-token-2 to avoid infinite loop
+
+	This fixes bug #33784.
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context): While moving back
+	over enclosing parentheses, check that c-backward-token-2 actually moves.
+
+2018-12-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+	cl-make-random-state was not copying its arg
+
+	Problem reported by Xu Chunyang (Bug#33731).
+	* lisp/emacs-lisp/cl-extra.el (cl-make-random-state):
+	Use copy-sequence, not copy-tree, so that the record is copied.
+	* test/lisp/emacs-lisp/cl-extra-tests.el:
+	(cl-extra-test-cl-make-random-state): New test.
+
+2018-12-19  Glenn Morris  <rgm@gnu.org>
+
+	Skip a vc-bzr test if run as root
+
+	* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads):
+	Skip this test when run as root.  This works around a race
+	condition in root-specific code in vc-mode-line when deleting a file.
+
+2018-12-19  Chris Feng  <chris.w.feng@gmail.com>
+
+	Backport: Handle unread-command-events consistently (bug#23980)
+
+	* src/keyboard.c (read_char): Events put into `unread-command-events'
+	with the form (t . EVENT) should always have the t stripped when read
+	out.
+	* test/src/keyboard-tests.el: New tests for `unread-command-events'.
+
+	(cherry picked from commit 1f3f4b1296613b8cdc0632a68fde86e86ddad866)
+
+2018-12-19  Glenn Morris  <rgm@gnu.org>
+
+	Restrict downcasing in elisp xref tests (bug#25534)
+
+	The tests happen to not fail at the moment because find-library-name
+	now has an extra feature, find-library--from-load-history, which
+	happens to do a case-insensitive regexp match; but still it seems
+	better not to rely on this.
+
+	* test/lisp/progmodes/elisp-mode-tests.el (xref--case-insensitive):
+	New variable.
+	(xref-elisp-test-run, emacs-test-dir): Only downcase if the
+	filesystem seems to be case-insensitive.
+
+2018-12-18  Rob Browning  <rlb@defaultvalue.org>
+
+	Avoid test failures if directory name looks like a regexp
+
+	Taken from <https://sources.debian.org/patches/emacs/1:26.1+1-1>
+	* test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3):
+	* test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path):
+	Regexp-quote file names to avoid failures with directory names
+	of the form "build/emacs-i87jK3/emacs-26.1+1/...".
+
+2018-12-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#33524
+
+	* lisp/progmodes/flymake-proc.el
+	(flymake-proc-create-temp-with-folder-structure):
+	Unquote file-name.  (Bug#33524)
+
+2018-12-17  Glenn Morris  <rgm@gnu.org>
+
+	* doc/lispintro/emacs-lisp-intro.texi (Finding More): Fix xref.
+
+2018-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	More porting to GCC 8 of --enable-gcc-warnings
+
+	Backport from master.
+	I ran into this when building Emacs 26 with GCC 8 on Fedora 29 x86.
+	* lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu):
+	* lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance):
+	* lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]:
+	No longer const.
+	* src/emacs-module.c: Ignore -Wcast-function-type.
+
+2018-12-15  Glenn Morris  <rgm@gnu.org>
+
+	Fix an epg test for recent GnuPG versions (bug#33439)
+
+	* test/lisp/epg-tests.el (epg-decrypt-1):
+	Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.
+
+2018-12-14  Robert Pluim  <rpluim@gmail.com>
+
+	Document font structure layout constraints
+
+	This has to be the same as in src/ftcrfont.c and src/ftfont.c
+
+	* src/xftfont.c (struct xftfont_info): Document layout constraints.
+
+2018-12-14  Robert Pluim  <rpluim@gmail.com>
+
+	Document font structure layout constraints
+
+	The layout of the initial members of ftcrfont_info must match
+	ftfont_info
+
+	* src/ftcrfont.c (struct ftcrfont_info): Likewise.
+
+	* src/ftfont.c (struct ftfont_info): Document layout constraints.
+
+2018-12-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of line numbers in empty lines beyond EOB
+
+	* src/xdisp.c (maybe_produce_line_number): When the current
+	line is at EOB, use the 'line-number-current-line' face only
+	on that single line, but not on the rest of empty lines beyond
+	EOB.  (Bug#33732)
+
+2018-12-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix redisplay when a window's scroll bar or fringes are changed
+
+	* src/window.c (set_window_fringes, set_window_scroll_bars):
+	Set windows_or_buffers_changed flag to cause immediate
+	thorough redisplay of a window when scroll bars or fringes are
+	changed.  (Bug#33694)
+
+2018-12-11  Martin Rudalics  <rudalics@gmx.at>
+
+	Tiny markup fix in Elisp manual
+
+	* doc/lispref/lists.texi (Building Lists): Use '@var' instead
+	of '@code' for argument.
+
+2018-12-10  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: stop extra parens on expression causing false fontification as type
+
+	* lisp/progmodes/cc-fonts.el (c-get-fontification-context): recognize
+	arithmetic operator followed by several open parentheses, not just one, as not
+	being an argument list.
+
+2018-12-10  Ari Roponen  <ari.roponen@gmail.com>
+
+	Fix cairo scrolling for side-by-side windows
+
+	Backport: Fixes Bug#33442.
+
+	* src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for
+	side-by-side split windows.  (Bug#31288)
+
+	(cherry picked from commit 6e362a32bc9d21f73a0f29ca6f45481edeea6f29)
+
+2018-12-10  Alan Mackenzie  <acm@muc.de>
+
+	CC Mode: stop wrongly recognizing "func(a * 9)" as "pointer to type a"
+
+	* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): When testing for an
+	identifier after "a *", on failure additionally check for a digit, setting a
+	new flag variable got-number if one is found.  In the test for CASE 18, check
+	this flag.
+
+2018-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/cursor-sensor.el: Add motivation
+
+2018-12-10  Raimon Grau  <raimonster@gmail.com>
+
+	Guard occur against an undefined orig-line
+
+	* lisp/replace.el (occur-engine): Avoid inserting the current line if
+	orig-line is nil.  This happens, for example, when reverting an occur
+	buffer with `list-matching-lines-jump-to-current-line' set to t.
+	(Bug#33476)
+
+2018-12-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Indexing followup to recent changes
+
+	* doc/lispref/text.texi (Special Properties): Index
+	'cursor-sensor-inhibit'.  (Bug#33664)
+
+2018-12-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Improve documentation of cursor-sensor.el (bug#33664)
+
+	* doc/lispref/text.texi (Special Properties): Mention cursor-sensor-inhibit.
+	* lisp/emacs-lisp/cursor-sensor.el (Commentary): Add cursor-sensor-mode.
+	(cursor-sensor-inhibit): Add docstring.
+
+2018-12-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc/lispref/commands.texi (Adjusting Point): Bug#33662
+
+	Tweak text to clarify intangibility.
+
+2018-12-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp multi-hop methods must be inline
+
+	* doc/misc/tramp.texi (Ad-hoc multi-hops): Involved methods must
+	be inline methods.
+
+2018-12-08  Ari Roponen  <ari.roponen@gmail.com>
+
+	Fix scaling problem in Cairo builds
+
+	* src/xterm.c (x_begin_cr_clip) [USE_GTK]:
+	(x_update_begin) [USE_CAIRO && USE_GTK]: Support scaling.
+	(Bug#33442)
+
+2018-12-06  Juri Linkov  <juri@linkov.net>
+
+	* lisp/simple.el (next-line-or-history-element): Use current-column
+
+	in all position calculations.
+	(previous-line-or-history-element): Idem.  (Bug#33640)
+
+2018-12-03  Martin Rudalics  <rudalics@gmx.at>
+
+	A few further fixes of window internals description
+
+	* doc/lispref/internals.texi (Window Internals): Add a few
+	more items and clarify description of some others.
+
+2018-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Revert "Fix infloop in GC mark_kboards""
+
+	This reverts commit c418c85617babbe7b63730fefb71e2c87a0141af.
+	This reinstates the original fix, as it had nothing to do
+	with the behavior reported in bug#33571, which seems to be
+	the expected behavior.
+
+2018-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Revert "Fix infloop in GC mark_kboards"
+
+	This reverts commit af914fc26db273d8788e7efa57c569f0f778d037,
+	since it caused unintended adverse effects on echoing of keys.
+	(Bug#33571)
+
+2018-12-02  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/emacs-lisp/subr-x.el (if-let, when-let): Doc fix: active voice.
+
+2018-12-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix infloop in GC mark_kboards
+
+	Do not merge to master, as I have a more systematic fix there.
+	* src/keyboard.c (mark_kboards): Fix infloop (Bug#33547).
+
+2018-12-01  Alan Third  <alan@idiocy.org>
+
+	Fix macOS run-time feature check
+
+	* src/nsterm.m (x_set_parent_frame) [NS_IMPL_COCOA]: Fix run-time
+	feature check.
+
+2018-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* etc/NEWS-*: Fix capitalization of "Emacs"
+
+2018-12-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix "M-x man" when there's no 'man' program on PATH
+
+	* lisp/man.el (Man-bgproc-sentinel): Make sure the process
+	buffer is not read-only when inserting a message into it.
+	(Bug#33510)
+
+2018-11-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix core dump in dbus-message-internal
+
+	Backport from master.
+	* src/dbusbind.c (Fdbus_message_internal):
+	Don’t go past array end (Bug#33530).
+
+2018-11-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/dbus.texi (Type Conversion): Fix typo.  (Bug#33551)
+
+2018-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of gdb-mi.el
+
+	* lisp/progmodes/gdb-mi.el (gdb-show-changed-values)
+	(gdb-max-children): Doc fixes.
+
+	* doc/emacs/building.texi (Source Buffers, Stack Buffer)
+	(GDB User Interface Layout): Mention some additional
+	customizable variables.  (Bug#33548)
+
+2018-11-29  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	LDAP: Set process-connection-type to t on Darwin
+
+	* lisp/net/ldap.el (ldap-search-internal): Set
+	process-connection-type to t on Darwin.  Do not merge to
+	master.  (Bug#33050)
+
+2018-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in a doc string
+
+	* lisp/emacs-lisp/map-ynp.el (read-answer-short): Fix typo.
+	(Bug#33528)
+
+2018-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor markup fix in frames.texi
+
+	* doc/lispref/frames.texi (Frame Layout): Fix markup of @table
+	entries.  (Bug#33531)
+
+2018-11-28  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/net/trampver.el (customize-package-emacs-version-alist):
+	Add 2.3.3.
+
+	* lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): Additions.
+
+2018-11-27  Glenn Morris  <rgm@gnu.org>
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to message.
+
+2018-11-27  Robert Pluim  <rpluim@gmail.com>
+
+	Don't call xwidget functions until GTK has been initialized
+
+	Follow up fix to Bug#33294.
+
+	* src/gtkutil.c: Define xg_gtk_initialized.
+	(xg_initialize): Set it when GTK has finished initializing.
+
+	* src/gtkutil.h: Declare xg_gtk_initialized.
+
+	* src/xwidget.c (Fmake_xwidget): Error out if GTK has not been
+	initialized.
+	(xwidget_init_view): Likewise.
+
+2018-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of Ediff wordwise commands
+
+	* lisp/vc/ediff.el (ediff-windows-wordwise)
+	(ediff-windows-linewise, ediff-regions-wordwise): Update and
+	clarify the doc strings.
+
+	* doc/misc/ediff.texi (Major Entry Points): Update and clarify
+	the documentation of 'ediff-windows-wordwise' and
+	'ediff-regions-wordwise'.  See the discussion starting at
+	https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html
+	for the details.
+
+2018-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Support Hunspell 1.7.0 in ispell.el
+
+	* lisp/textmodes/ispell.el
+	(ispell-find-hunspell-dictionaries): Invoke Hunspell with an
+	additional command-line argument, to work around a misfeature
+	in Hunspell 1.7.0 that prevents it from reporting the loaded
+	dictionary.  (Bug#33493)
+
+2018-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid clearing echo-area message by auto-save-visited-file-name
+
+	* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Record the
+	previous echo-area message, if any, and restore it before
+	exiting.  (Bug#33490)
+
+2018-11-25  Alan Third  <alan@idiocy.org>
+
+	Set tooltip text color (bug#33452)
+
+
+	* src/nsmenu.m: ([EmacsTooltip init]): Set text color to black.
+
+2018-11-25  Alan Third  <alan@idiocy.org>
+
+	Fix more drawing bugs in NS port (bug#32932)
+
+	* src/nsterm.m (ns_row_rect): New function.
+	(ns_clip_to_row): Remove function.
+	(ns_copy_bits): Fix mistake.
+	(ns_shift_glyphs_for_insert): Mark the frame as dirty instead of
+	directly copying.
+	(ns_draw_fringe_bitmap): Stop using ns_clip_to_row.
+	(ns_draw_window_cursor): Stop using ns_clip_to_row and perform a
+	display when not in redisplay.
+	(ns_update_window_begin): Remove redundant code that never executes.
+	([EmacsView drawRect:]): Show the rectangle being exposed in NSTRACE.
+	* src/xdisp.c (expose_window_tree) [HAVE_NS]:
+	(expose_frame) [HAVE_NS]: Redraw even if the frame is garbaged.
+
+2018-11-24  Alan Mackenzie  <acm@muc.de>
+
+	Fix bug #33416, where typing a ) in a comment at EOB caused a loop (CC Mode).
+
+	* lisp/progmodes/cc-mode.el (c-fl-decl-start): A c-forward-syntactic-ws leaves
+	point inside whitespace when moving over a comment at EOB which has no
+	terminating LF.  Check this possibility and correct for it.
+
+2018-11-24  Ulrich Müller  <ulm@gentoo.org>
+
+	Update the calc units table
+
+	On 2018-11-16, the 26th meeting of the General Conference on Weights
+	and Measures (CGPM) has redefined the International System of Units by
+	adopting fixed values for the Planck constant, the elementary charge,
+	the Boltzmann constant, and the Avogadro constant:
+	https://www.bipm.org/utils/en/pdf/CGPM/Draft-Resolution-A-EN.pdf
+
+	* lisp/calc/calc-units.el (math-standard-units): Update according
+	to redefinition of the SI in 2018.  (Bug#33412)
+
+2018-11-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve indexing in the ELisp manual
+
+	* doc/lispref/control.texi (Control Structures, Sequencing)
+	(Conditionals, Iteration, Catch and Throw, Handling Errors)
+	(Cleanups):
+	* doc/lispref/eval.texi (Self-Evaluating Forms)
+	(Symbol Forms, Function Forms, Macro Forms, Special Forms)
+	(Quoting, Backquote): Add index entries that begin with
+	"forms".  (Bug#33440)
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	More Symbola-related extensions for default fontset
+
+	* lisp/international/fontset.el (setup-default-fontset): Add
+	few more blocks of symbols and punctuation supported by	latest
+	Symbola.
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Better support for display of U+1F900..U+1F9FF block
+
+	* lisp/international/fontset.el (setup-default-fontset): Add
+	the [#x1F900..#x1F9FF] block to those supported by Symbola.
+
+2018-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'edit-abbrevs-mode'
+
+	* lisp/abbrev.el (edit-abbrevs-mode): Refer to 'edit-abbrevs'
+	for more detailed usage information.  (Bug#33443)
+	(edit-abbrevs): Doc fix.
+
+2018-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'dired-do-compress'
+
+	* lisp/dired-aux.el (dired-do-compress): Describe in the doc
+	string the effect on directories and on compressed archive.
+	(Bug#33450)
+
+2018-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc string and display of 'describe-character'
+
+	* lisp/descr-text.el (describe-char): Explain how does the
+	function obtain the various data about the character.  Don't
+	display "preferred" before "charset": it tends to confuse
+	people.
+
+2018-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+	* etc/NEWS: Clarify what 'Z' does in Dired.  (Bug#33450)
+
+2018-11-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the docs of object internals
+
+	* doc/lispref/internals.texi (Buffer Internals)
+	(Window Internals, Process Internals): Update the descriptions
+	of Lisp objects.
+
+2018-11-19  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix two Edebug defcustoms (bug#33428)
+
+	* lisp/emacs-lisp/edebug.el (edebug-print-length)
+	(edebug-print-level): Fix customization type to allow setting
+	the documented valid value nil via the Customize interface.
+
+2018-11-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#33141
+
+	* lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
+	empty method with simplified `tramp-syntax'.  (Bug#33141)
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of the window tree
+
+	* doc/lispref/windows.texi (Windows and Frames): More accurate
+	wording regarding the relation of a mini-window to its frame's
+	window tree.
+
+	* src/window.h (struct window): Improve commentary to some
+	fields.
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix window scrolling on TTY frames when there's no mode line
+
+	* src/window.c (window_internal_height): Remove tests for
+	next, prev, and parent pointers, as they are unrelated to
+	whether a window has a mode line.  (Bug#33363)
+
+2018-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix decoding XML files encoded in ISO-8859
+
+	* lisp/international/mule.el (sgml-xml-auto-coding-function):
+	Avoid signaling an error from coding-system-equal when the XML
+	encoding tag specifies an encoding whose type is 'charset'.
+	(Bug#33429)
+
+2018-11-19  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2018-11-18  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix description of some window hooks
+
+	* doc/lispref/windows.texi (Window Hooks): Remove text that
+	warns against using 'save-window-excursion' while running
+	'window-size-change-functions', it's no more relevant.
+	Clarify description of 'window-configuration-change-hook'.
+
+2018-11-18  Gary Fredericks  <fredericksgary@gmail.com>  (tiny change)
+
+	Run 'window--adjust-process-windows' when frame size changes (Bug#32720)
+
+	* lisp/window.el (window-size-change-functions): Run
+	'window--adjust-process-windows' from
+	'window-size-change-functions' too (Bug#32720, "another issue"
+	in Bug#33230).
+
+2018-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid errors in zone.el when there's overlay at EOB
+
+	* lisp/play/zone.el (zone): Make sure the window-end position
+	is calculated accurately, to avoid errors from
+	buffer-substring.  (Bug#33384)
+
+2018-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Document Emacs 26 behavior of Dired's 'Z' on directories
+
+	* doc/emacs/dired.texi (Operating on Files): Document behavior
+	of 'Z' on directories.
+
+	* etc/NEWS: Belatedly announce the new behavior of Dired's 'Z'
+	on directory names and on .tar.gz archives.
+
+2018-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in the Emacs manual
+
+	* doc/emacs/rmail.texi (Rmail Deletion): Fix a typo.
+	Reported by Jorge P. de Morais Neto <jorge+list@disroot.org>
+	in emacs-manual-bugs@gnu.org
+
+2018-11-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix tempfile creation when byte compiling
+
+	This improves on the recent fix for master failing to build
+	on FreeBSD.  Suggested by Stefan Monnier in:
+	https://lists.gnu.org/r/emacs-devel/2018-01/msg00600.html
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file):
+	Put tempfile next to the target file, as was the original intent.
+
+	(cherry picked from commit 64c846738617d1d037eac0cefb6586c04317b0a1)
+
+2018-11-14  Markus Triska  <triska@metalevel.at>
+
+	Small documentation correction.
+
+	* doc/lispref/windows.texi (Textual Scrolling): In the description of
+	scroll-up-aggressively, refer to scroll-down-aggressively instead of
+	a recursive reference to scroll-up-aggressively.  (Bug#33369)
+
+2018-11-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/coding.c (Fcheck_coding_systems_region): Doc fix.  (Bug#33372)
+
+2018-11-14  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#33364
+
+	* lisp/net/tramp.el (tramp-parse-sconfig-group): Support also
+	"Host host1 host2 ..." syntax.  (Bug#33364)
+
+2018-11-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* test/README: Explain $REMOTE_TEMPORARY_FILE_DIRECTORY.
+
+2018-11-12  Glenn Morris  <rgm@gnu.org>
+
+	Avoid kill-emacs-hook errors hanging batch mode
+
+	* src/emacs.c (Fkill_emacs): Prevent errors from kill-emacs-hook
+	hanging Emacs in batch mode.  (Bug#29955)
+
+	(cherry picked from commit 109da684c5124e22505917fe0255ca66f2a6bfc9)
+
+2018-11-12  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 26.1.90
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp:
+	* nt/README.W32: Bump Emacs version to 26.1.90.
+
+2018-11-12  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update.
+
+2018-11-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Work around dumping bug on GNU/Linux ppc64le
+
+	Problem reported by Thomas Fitzsimmons (Bug#33174).
+	Do not merge to master, as we have a better fix there.
+	* src/Makefile.in (emacs$(EXEEXT)):
+	(bootstrap-emacs$(EXEEXT)):
+	Unset EMACS_HEAP_EXEC before invoking temacs.
+
+2018-11-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/files.el (write-file): Clarify the doc string.  (Bug#33339)
+
+2018-11-11  Simen Heggestøyl  <simenheg@gmail.com>
+
+	Fix typos in midnight.el
+
+	* lisp/midnight.el (clean-buffer-list-delay-general)
+	(clean-buffer-list-kill-regexps)
+	(clean-buffer-list-kill-buffer-names): Fix docstring typos.
+
+2018-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'move-file-to-trash'
+
+	* doc/emacs/files.texi (Misc File Ops): Index
+	move-file-to-trash.  State that the way to restore trashed
+	files is system-dependent.
+
+2018-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* src/data.c (Ftype_of): xwidget objects are possible! (bug#33294)
+
+	(syms_of_data): Define Qwidget here.
+	* src/xwidget.c (syms_of_xwidget): Instead of here.
+
+2018-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of Diff mode
+
+	* doc/emacs/files.texi (Diff Mode): Document the effect of
+	prefix argument on the Diff mode's commands.  Document
+	'diff-jump-to-old-file'.
+
+2018-11-09  Noam Postavsky  <npostavs@gmail.com>
+
+	Note that lex bound lambda forms are not self-quoting (Bug#33199)
+
+	* doc/lispref/functions.texi (Anonymous Functions):
+	* lisp/subr.el (lambda): Note that under lexical binding a lambda form
+	yields a closure object (Bug#33199).
+
+2018-11-08  Martin Rudalics  <rudalics@gmx.at>
+
+	Rewrite buffer display related doc-strings and doc
+
+	* lisp/window.el (display-buffer-overriding-action)
+	(display-buffer-alist, display-buffer-base-action)
+	(display-buffer-fallback-action, display-buffer-assq-regexp)
+	(display-buffer): Rewrite doc-strings using suggestions by
+	Alan Mackenzie <acm@muc.de>.
+	(display-buffer-use-some-frame): Adjust doc-string and
+	reformat code.
+	* doc/lispref/windows.texi (Buffer Display Action Alists):
+	Make docs on 'window-height', 'window-width' and
+	'preserve-size' entries more accurate.
+
+2018-11-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix call to GlobalMemoryStatusEx in w32.c
+
+	* src/w32.c (system_process_attributes): Initialize the size
+	of the data structure passed to GlobalMemoryStatusEx,
+	otherwise it fails.
+
+2018-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve recent changes in documentation of window handling
+
+	* doc/lispref/windows.texi (Displaying Buffers)
+	(Choosing Window, Buffer Display Action Functions)
+	(Buffer Display Action Alists, Choosing Window Options)
+	(Precedence of Action Functions, The Zen of Buffer Display):
+	Fix wording, punctuation, and markup.  Remove redundant
+	cross-references.
+
+	* doc/emacs/windows.texi (Window Choice, Temporary Displays):
+	Fix wording and punctuation.
+
+2018-11-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Rewrite documentation of buffer display
+
+	* doc/emacs/windows.texi (Window Choice): Rewrite, replacing
+	references to older buffer display options with references to
+	and examples of buffer display actions.
+	(Temporary Displays): Rewrite display of *Completions*
+	example.
+
+	* doc/lispref/elisp.texi (Top): New Windows section
+	'Displaying Buffers'.
+	* doc/lispref/frames.texi (Child Frames): Adjust cross
+	reference.
+	* doc/lispref/windows.texi (Windows): New section 'Displaying
+	Buffers'.  Move sections 'Choosing Window', 'Display Action
+	Functions' and 'Choosing Window Options' there and adjust
+	namings.  Preferably write 'Buffer Display Action' instead of
+	'Display Action'.  More consistently use @w{} to make key
+	binding specifications unsplittable.
+	(Displaying Buffers): New section.
+	(Choosing Window): Make it a subsection of 'Displaying
+	Buffers'.  More explicitly describe how 'display-buffer'
+	compiles its list of action functions and the action alist.
+	(Buffer Display Action Functions): Rename from 'Display Action
+	Functions', make it a subsection of 'Displaying Buffers' and
+	rewrite it.  Elide more detailed descriptions of action alist
+	entries; these are now in the new section 'Buffer Display
+	Action Functions'.  Remove example.
+	(Buffer Display Action Alists): New subsection of 'Displaying
+	Buffers' giving a comprehensive description of recognized
+	action alist entries with appropriate indexing.  Contents were
+	partially moved here from the old 'Display Action Functions'
+	section.
+	(Choosing Window Options): Make it a subsection of 'Displaying
+	Buffers'.  Add examples of how to rewrite old buffer display
+	options with the help of buffer display actions.
+	(Precedence of Action Functions): New subsection of
+	'Displaying Buffers' explaining the execution order of action
+	functions with the help of a detailed example.
+	(The Zen of Buffer Display): New subsection of 'Displaying
+	Buffers' supplying guidelines on how to write and use buffer
+	display actions with examples.
+	(Side Windows, Displaying Buffers in Side Windows)
+	(Frame Layouts with Side Windows, Atomic Windows): Update
+	references to the 'Displaying Buffers' subsections.
+
+2018-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of destructuring-binding macros
+
+	* lisp/emacs-lisp/pcase.el (pcase-dolist, pcase-let)
+	(pcase-let*): Improve the doc strings.
+
+	* doc/lispref/sequences.texi (Sequence Functions): Improve
+	wording and rename arguments of seq-let to be more
+	descriptive.  Add a cross-reference to "Destructuring with
+	pcase Patterns".
+	* doc/lispref/control.texi (Pattern-Matching Conditional):
+	Improve wording and the menu.
+	(pcase Macro): Incorporate patch suggested by Paul Eggert
+	<eggert@cs.ucla.edu>.  Reformat text.
+	(Destructuring with pcase Patterns): Rename from
+	"Destructuring patterns", and improve wording and indexing.
+
+2018-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid byte compilation warning in rcirc.el
+
+	* lisp/net/rcirc.el (rcirc-prompt-start-marker): Move
+	definition before 1st use to avoild byte-compiler warning.
+
+2018-11-03  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Avoid race in rcirc process filter (bug#33145)
+
+	* lisp/net/rcirc.el (rcirc-filter): Clear rcirc-process-output
+	before processing its constituent lines.  Otherwise, if rcirc-filter
+	runs again before the last rcirc-process-server-response is
+	finished, the contents of rcirc-process-output could be duplicated.
+
+2018-11-03  Jordan Wilson  <jordan.t.wilson@gmx.com>  (tiny change)
+
+	Avoid file-name errors when viewing PDF from Gnus
+
+	* lisp/doc-view.el (doc-view-mode): Run the output file name
+	through 'convert-standard-filename', to avoid problems with
+	characters that are not allowed in file names on some
+	systems.  (Bug#32989)
+
+2018-11-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid crashes with remapped default face in Org mode
+
+	* src/xfaces.c (face_at_buffer_position): Look up BASE_FACE_ID
+	anew if it is not in the frame's face cache.  This avoids
+	crashes when Org mode sets up for a new major mode in embedded
+	code fragment, and the default face is remapped.  (Bug#33222)
+
+2018-11-01  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Doc fix for checkdoc-continue
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-continue): There is no second
+	  optional argument, and the function always starts from point.
+
+2018-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in autoload.el
+
+	* lisp/emacs-lisp/autoload.el (update-directory-autoloads):
+	Remove stray backslashes.  (Bug#33231)
+
+2018-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc/lispref/control.texi (Destructuring patterns): New subsection.
+
+2018-10-31  Gemini Lasswell  <gazally@runbox.com>
+
+	Add regression test for Bug#33014
+
+	Backport from master.
+	* test/src/eval-tests.el:
+	(eval-tests-byte-code-being-evaluated-is-protected-from-gc): New test.
+	(eval-tests-33014-var): New variable.
+	(eval-tests-33014-func, eval-tests-33014-redefine): New functions.
+
+2018-10-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Refer to bytecode constant vectors (Bug#33014)
+
+	Backport from master.
+	* src/bytecode.c (exec_byte_code): Save VECTOR into stack slot
+	so that it survives GC.  The stack slot was otherwise unused,
+	so this doesn’t cost us memory, only a store insn.
+
+2018-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/pcase.el: Improve docstrings.
+
+2018-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/emacs-lisp/rx.el (rx): Fix typo in doc string.  (Bug#33205)
+
+2018-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc string of 'call-process'
+
+	* src/callproc.c (Fcall_process): Clarify DESTINATION in the
+	doc string.
+
+2018-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Document that generic functions cannot be commands
+
+	* doc/lispref/commands.texi (Defining Commands):
+	* doc/lispref/functions.texi (Generic Functions): Document
+	that generic functions cannot be turned into commands.
+	(Bug#33170)
+
+2018-10-28  Charles A. Roelli  <charles@aurox.ch>
+
+	* lisp/mail/rmailsum.el (rmail-summary-output): Add lost word to doc.
+
+2018-10-28  Charles A. Roelli  <charles@aurox.ch>
+
+	Add index entries for more isearch commands/bindings (Bug#32990)
+
+	* doc/emacs/search.texi (Basic Isearch): Index isearch-exit,
+	isearch-abort, isearch-cancel, isearch-repeat-forward,
+	isearch-repeat-backward and their bindings.
+	(Repeat Isearch): Index isearch-ring-advance,
+	isearch-ring-retreat and isearch-edit-string.
+	(Special Isearch): Index isearch-quote-char,
+	isearch-char-by-name and their bindings.  Index
+	isearch-query-replace and isearch-query-replace-regexp, and
+	the latter's binding.  Explain what
+	isearch-query-replace-regexp does.  Index isearch-complete.
+	(Word Search): Index isearch-toggle-word.
+
+2018-10-27  Noam Postavsky  <npostavs@gmail.com>
+
+	* lisp/simple.el (filter-buffer-substring): Clarify doc (Bug#33179).
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix recent change in lispref/processes.texi.
+
+	* doc/lispref/processes.texi (Asynchronous Processes): Clarify
+	wording.  Suggested by Thomas Fitzsimmons <fitzsim@fitzsim.org>.
+	(Bug#33050)
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/simple.el (region-extract-function): Doc fix.  (Bug#33167)
+
+	* lisp/simple.el (region-bounds): Doc fix.  (Bug#33168)
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'process-connection-type'
+
+	* doc/lispref/processes.texi (Asynchronous Processes): Clarify
+	better when it is advisable to use pipes for communicating
+	with subprocesses.  (Bug#33050)
+
+2018-10-27  Pierre Téchoueyres  <pierre.techoueyres@free.fr>
+
+	Unify prompt for gnupg passphrase between GNU/Linux and MS-Windows.
+
+	* lisp/epg.el (epg--start): Use 'raw-text' for coding system instead
+	of 'binary', in order to avoid spurious carriage return on Microsoft
+	Windows and MS-DOS when prompting for a password.  (Bug#33040)
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Doc fix of 'gnus-fetch-old-headers'
+
+	* lisp/gnus/gnus-sum.el (gnus-fetch-old-headers): Avoid
+	treating 'some' and 'invisible' as symbols that need to be
+	hyperlinked.  Reported by Robert Pluim <rpluim@gmail.com>.
+	(Bug#33090)
+
+2018-10-27  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Deactivate incorrect hyperlinking in gnus-build-sparse-threads doc
+
+	* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads): Add the word
+	"symbol" so it doesn't link to the `some' function.  (Bug#33090)
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor copyedits in cmdargs.texi
+
+	* doc/emacs/cmdargs.texi (Initial Options): Document '-nsl'.
+	Add a cross-reference to "Writing Dynamic Modules".
+
+2018-10-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of X resource loading
+
+	* doc/emacs/cmdargs.texi (Initial Options):
+	* doc/emacs/frames.texi (Frame Parameters):
+	* doc/emacs/xresources.texi (Resources): Document the
+	'--no-x-resources' command-line option and the fact that X
+	resources override .emacs settings of frame parameters.
+	(Bug#32975)
+
+2018-10-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* lisp/net/tramp-sh.el (tramp-inline-compress-commands):
+
+	Suppress warnings about obsolete environment variable GZIP.
+
+2018-10-25  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't error when indenting malformed Lisp (Bug#30891)
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-indent-calc-next): If we run out
+	of indent stack, reset the parse state.
+
+2018-10-25  Charles A. Roelli  <charles@aurox.ch>
+
+	Improve 'isearch-delete-char' documentation (Bug#32990)
+
+	* doc/emacs/search.texi (Basic Isearch): Index
+	'isearch-delete-char', its keybinding and the isearch "input
+	item" concept, and define the latter.
+	(Error in Isearch): Clarify the different uses of DEL and
+	C-M-w during isearch.
+
+	* lisp/isearch.el (isearch-delete-char): Correct its
+	documentation and link to the Info node '(emacs)Basic Isearch'
+	which explains less technically how this function works in
+	everyday usage.
+
+2018-10-25  Alan Third  <alan@idiocy.org>
+
+	Improve XPM load failure message (bug#33126)
+
+	* src/image.c (xpm_load_image): Only XPM3 is supported, so make that
+	explicit.
+
+2018-10-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid infloop in CPerl mode fontification
+
+	* lisp/progmodes/cperl-mode.el
+	(cperl-font-lock-fontify-region-function): Stop the loop at
+	EOB, to avoid inflooping there.  (Bug#33114)
+
+2018-10-25  Andreas Schwab  <schwab@suse.de>
+
+	Fix minibuffer-help-form for lexical binding
+
+	* lisp/simple.el (set-variable): Substitute var into
+	minibuffer-help-form.
+	* lisp/cus-edit.el (custom-prompt-variable): Likewise.
+
+2018-10-24  Alan Third  <alan@idiocy.org>
+
+	Fix some NS drawing issues (bug#32932)
+
+	* src/nsterm.m (ns_clip_to_rect):
+	(ns_reset_clipping): Remove gsaved variable and associated code.
+	(ns_flush_display): Remove function.
+	(ns_copy_bits): use translateRectsNeedingDisplayInRect:by: to copy any
+	pending drawing actions along with the image.
+	([EmacsView windowWillResize:toSize:]): Remove unneeded call.
+	([EmacsView drawRect:]): Remove redundant call to ns_clear_frame_area,
+	and optimize the exposed rectangles.
+	(ns_draw_window_cursor): Remove unneeded disabling of screen updates.
+
+2018-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/gnus/mm-util.el (mm-decompress-buffer): Fix split-string args.
+
+2018-10-24  Noam Postavsky  <npostavs@gmail.com>
+
+	* doc/misc/calc.texi (Summary): The +/- key is 'p', not 'P'.
+
+2018-10-23  Robert Pluim  <rpluim@gmail.com>
+
+	Correct typo in GNU ELPA url
+
+	* doc/misc/efaq.texi (Packages that do not come with Emacs):
+	Correct typo in GNU ELPA url (Bug#33072).  Change other url
+	references to use https scheme.
+
+2018-10-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/misc/dired-x.texi (Omitting Variables): Fix wording. (Bug#33112)
+
+2018-10-20  Michael Heerdegen  <michael_heerdegen@web.de>
+
+	Fix help-form binding in dired-create-files
+
+	This fixes Bug#32630: since "dired-aux" moved to lexical binding mode,
+	the free variable TO in the constructed HELP-FORM got out of scope of
+	the surrounding 'let'.
+
+	* lisp/dired-aux.el (dired-create-files): Make the binding of
+	HELP-FORM a string.
+
+2018-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a pasto in a Gnus doc string
+
+	* lisp/gnus/gnus-art.el (gnus-article-treat-fold-newsgroups):
+	Doc string fix.  (Bug#33081)
+
+2018-10-19  Mauro Aranda  <maurooaranda@gmail.com>  (tiny change)
+
+	Update revert-buffer documentation
+
+	* doc/emacs/files.texi (Reverting): Document that revert-buffer
+	does keep undo history.  (Bug#33084)
+
+2018-10-18  Juri Linkov  <juri@linkov.net>
+
+	* lisp/mail/smtpmail.el (smtpmail-send-queued-mail): Load file with .el suffix.
+
+	For the case when load-prefer-newer is t, ensure loading the right file
+	by explicitly adding the .el suffix.  Use the same variable names
+	as in the function smtpmail-send-it.  (Bug#33055)
+
+2018-10-16  Glenn Morris  <rgm@gnu.org>
+
+	Tweak Makefile emacs-module.h handling
+
+	* Makefile.in (install-arch-indep, uninstall): Respect DESTDIR.
+	Handle whitespace.  Remove non-portable mkdir argument.
+
+	(cherry picked from commit c1d0dbd6ca92cb221024382b19654e4fbf1d1ed3)
+
+2018-10-16  Philipp Stephani  <phst@google.com>
+
+	Install emacs-module.h (Bug#31929)
+
+	* Makefile.in (includedir): New variable.
+	(install-arch-indep): Install emacs-module.h.
+	(uninstall): Uninstall emacs-module.h.
+
+	(cherry picked from commit 00ea749f2af44bff6ea8c1259477fbf0ead8a306)
+
+2018-10-15  Alan Mackenzie  <acm@muc.de>
+
+	Clarify documentation of fractional vertical scrolling and some doc strings
+
+	* doc/lispref/windows.texi (vertical scrolling): Clarify the meaning of
+	vertical scrolling by referring to tall screen lines, images, and the display
+	action.  Clarify an ambiguous English tense.
+
+	* src/window.c (window-vscroll, set-window-vscroll): Amend doc strings to
+	refer to display.
+
+2018-10-15  Charles A. Roelli  <charles@aurox.ch>
+
+	* lisp/isearch.el (isearch-cmds): Recall absent isearch--state slot.
+
+2018-10-14  Alan Mackenzie  <acm@muc.de>
+
+	doc/lispref/edebug.texi (Specification List) Remove obstrusive blank line
+
+2018-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix wording in module API documentation
+
+	* doc/lispref/internals.texi (Module Functions): Fix confusing
+	wording.  Reported by Basil L. Contovounesios <contovob@tcd.ie>.
+
+2018-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix redisplay of glyphless characters
+
+	* src/conf_post.h (bool_bf): Use 'unsigned int' in the MinGW
+	builds.  Suggested by Tom Tromey <tom@tromey.com>.  (Bug#33017)
+	* src/dispnew.c (scrolling_window): Update commentary
+	regarding xwidget builds.
+
+2018-10-13  Robert Pluim  <rpluim@gmail.com>
+
+	Update --without-toolkit-scroll-bars doc
+
+	* configure.ac (--without-toolkit-scroll-bars): Update list of
+	affected toolkits.
+
+2018-10-13  Robert Pluim  <rpluim@gmail.com>
+
+	Call GTK functions only on GTK scrollbars
+
+	* src/gtkutil.c (xg_set_background_color) [USE_TOOLKIT_SCROLL_BARS]:
+	Don't call GTK functions on non-GTK scrollbars (Bug#32975).
+
+2018-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the description of startup in ELisp manual
+
+	* doc/lispref/os.texi (Startup Summary): Remove stale
+	reference to window-system-initialization-alist.  Reported by
+	Zhang Haijun <ccsmile2008@outlook.com>.
+
+2018-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+	Use the 'line-number' face for line-number fields past EOB
+
+	* src/xdisp.c (get_phys_cursor_geometry): Treat rows at and
+	beyond ZV specially.  Don't let the cursor exceed the
+	vertical dimensions of the row.
+	(maybe_produce_line_number): Use the 'line-number' face
+	instead of 'default' for blank fields beyond ZV.  Don't update
+	the IT metrics when displaying blank line-number fields beyond
+	ZV.  (Bug#32337)
+
+2018-10-12  Alan Third  <alan@idiocy.org>
+
+	Ensure NS frame is redrawn correctly  after scroll
+
+	* src/nsterm.m (ns_copy_bits): Set needsDisplay so the previous cursor
+	position is redrawn.
+
+2018-10-12  Alex Branham  <alex.branham@gmail.com>
+
+	Avoid byte-compiler warning in em-rebind.el
+
+	* lisp/eshell/em-rebind.el (eshell-delete-backward-char): Use
+	'delete-char' instead of delete-backward-char.  (Bug#32945)
+
+2018-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve indexing of 'C-SPC C-SPC'
+
+	* doc/emacs/mark.texi (Disabled Transient Mark): Fix
+	indexing.  (Bug#32959)
+
+2018-10-11  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Fix bug with precious entries in Gnus registry
+
+	* lisp/registry.el (registry-collect-prune-candidates): This `cdr' was
+	  an error: it meant that the last key in the precious list, would be
+	  considered a nil. Since the precious list only contains the symbol
+	  'mark by default, marks were never considered precious.
+	* doc/misc/gnus.texi (Store arbitrary data): Fix typo: "marks" should
+	  be "mark".
+
+2018-10-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Document in the ELisp manual how to write loadable modules
+
+	* doc/lispref/internals.texi (Writing Dynamic Modules)
+	(Module Initialization, Module Functions, Module Values)
+	(Module Misc, Module Nonlocal): New nodes.
+	* doc/lispref/loading.texi (Dynamic Modules): Add
+	cross-reference to the new node.
+	* doc/lispref/internals.texi (GNU Emacs Internals):
+	* doc/lispref/elisp.texi (Top): Update menus for the new nodes.
+
+2018-10-11  Tino Calancha  <tino.calancha@gmail.com>
+
+	dired-do-shell-command: Notify users after abort the command
+
+	* lisp/dired-aux.el (dired-do-shell-command):  Notify users that
+	the command have aborted when they answer 'n' to the prompt (Bug#32969).
+
+2018-10-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt Tramp version.  Do not merge with master
+
+	* lisp/net/trampver.el: Change version to "2.3.5.26.2".
+	(customize-package-emacs-version-alist): Add Tramp version
+	integrated in Emacs 26.2.
+
+2018-10-10  Alan Third  <alan@idiocy.org>
+
+	Fix Apple Script permissions error
+
+	* nextstep/templates/Info.plist.in: Add NSAppleEventsUsageDescription
+	message to enable AppleEvents usage.
+
+2018-10-10  Mauro Aranda  <maurooaranda@gmail.com>  (tiny change)
+
+	Fix typo in 'timerp' documentation
+
+	* doc/lispref/os.texi (Timers): Fix typo in 'timerp' documentation.
+	(Bug#32999)
+
+2018-10-08  Charles A. Roelli  <charles@aurox.ch>
+
+	* doc/emacs/mark.texi (Mark): Index "(de)activating the mark".
+
+	(Bug#32956)
+
+2018-10-08  Scott Corley  <scott@scorley.com>  (tiny change)
+
+	Fix overflow lockup with frames > 255 lines
+
+	Backport from master.
+	* src/scroll.c (struct matrix_elt): Change unsigned char fields to
+	int to handle frames with more than 255 lines (Bug#32951).
+
+2018-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in nonsensical calls to 'signal'
+
+	* src/eval.c (Fsignal): If both arguments are nil, replace the
+	first one with 'error', to avoid assertion violations further
+	down the line.  (Bug#32961)
+
+2018-10-06  Charles A. Roelli  <charles@aurox.ch>
+
+	* lisp/simple.el (transient-mark-mode): Correct documentation.  (Bug#32956)
+
+2018-10-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the locale and language database
+
+	* lisp/international/mule-cmds.el (locale-language-names):
+	Update the list of supported locales.  Use existing language
+	names where available.
+
+2018-10-05  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in a doc string.
+
+	* lisp/window.el (display-buffer-alist): Fix a typo in a doc string.
+	Reported by Michael Heerdegen <michael_heerdegen@web.de>.
+
+2018-10-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	Make nneething allow CRLF-encoded files (bug#32940)
+
+	* lisp/gnus/nneething.el (nneething-request-article):
+	Bind coding system to raw-text instead of binary when reading a file,
+	that may be CRLF-encoded (bug#32940).
+
+2018-10-04  Eric Abrahamsen  <eric@ericabrahamsen.net>
+
+	Further fix to eieio-persistent
+
+	* lisp/emacs-lisp/eieio-base.el (eieio-persistent-validate/fix-slot-value):
+	  Make handling of hash tables and vectors recursive. This is
+	  necessary because the write process, in `eieio-override-prin1' is
+	  also recursive. With any luck, this will be the last fix of its
+	  kind. If that's true, cherry-pick to Emacs 26.2 later on.
+
+2018-10-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid ridiculously high stack limit requests on macOS
+
+	* src/emacs.c (main): Avoid wraparound in subtraction of
+	rlim_t values, in case rlim_t is an unsigned type.  (Bug#32338)
+
+2018-10-03  Charles A. Roelli  <charles@aurox.ch>
+
+	Improve documentation of 'read-hide-char'
+
+	* src/minibuf.c (syms_of_minibuf) <Vread_hide_char>: Clarify
+	documentation and mention where else the variable is used.
+	* doc/lispref/minibuf.texi (Reading a Password): Add an index
+	entry for 'read-hide-char'.
+
+2018-10-03  Alan Mackenzie  <acm@muc.de>
+
+	In follow mode, prevent the cursor resting on a partially displayed line
+
+	Don't merge to master.  This fixes bug #32848
+
+	* lisp/follow.el (follow-adjust-window): If point ends up in a partially
+	displayed line in a left hand or middle window, move it one line
+	forward, to
+	prevent unwanted scrolling should make-cursor-line-fully-visible be
+	non-nil.
+
+2018-10-03  Alan Mackenzie  <acm@muc.de>
+
+	Revert "Temporary workaround for bug #32848 for branch emacs-26"
+
+	This reverts commit 6650751ce73413d05599df07a9c5bc70744260f3.
+
+2018-10-03  Alan Mackenzie  <acm@muc.de>
+
+	Revert "* etc/NEWS: Note setting make-cursor-line-fully-visible to nil in follow-mode"
+
+	This reverts commit f3c8f4bde2de2b9d42c44f5e44f34c427bebdc58.
+
+2018-10-03  Alan Mackenzie  <acm@muc.de>
+
+	* etc/NEWS: Note setting make-cursor-line-fully-visible to nil in follow-mode
+
+	Also re-insert the "temporary note" explaining --- and +++.
+
+2018-10-03  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix note about interactive advice (Bug#32905)
+
+	* doc/lispref/functions.texi (Core Advising Primitives): Add missing
+	':', and finish the sentence fragment.
+
+2018-10-01  Michael Albinus  <michael.albinus@gmx.de>
+
+	Comple fix for Bug#32550
+
+	* lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay):
+	Use `save-excursion'.  This completes the fix of Bug#32550.
+
+2018-10-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/savehist.el (savehist-mode): Doc fix.  (Bug#32889)
+
+2018-09-30  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+
+	Org manual: Rewrite the Org Mobile section
+
+	* doc/misc/org.texi (Org Mobile): Rewritten from "MobileOrg" section.
+	Remove all references to non-free software.
+	Moved into "Miscellaneous", much like Org Crypt library. No longer an
+	appendix.
+	(Footnotes): Remove a reference to "MobileOrg".
+	(Bug#32722)
+
+2018-09-30  Alan Mackenzie  <acm@muc.de>
+
+	Temporary workaround for bug #32848 for branch emacs-26
+
+	Do not merge with master.
+
+	* lisp/follow.el (follow-mode): Set make-cursor-line-fully-visible to nil
+	buffer locally whilst follow-mode is active.
+
+2018-09-29  Tino Calancha  <tino.calancha@gmail.com>
+
+	Improve cl-do, cl-do* docstrings
+
+	* lisp/emacs-lisp/cl-macs.el(cl-do, cl-do*):
+	Improve docstring (Bug#32803).
+
+2018-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid returning early in 'while-no-input' due to subprocesses
+
+	* src/keyboard.c (kbd_buffer_store_buffered_event): Support
+	also the internal buffer-switch events.
+	(syms_of_keyboard) <Qbuffer_switch>: New DEFSYM.
+
+	* lisp/subr.el (while-no-input-ignore-events): Ignore
+	'buffer-switch' events.  Reported by Michael Heerdegen
+	<michael_heerdegen@web.de>.
+
+	* etc/NEWS: Mention the change in behavior of 'while-no-input'
+
+2018-09-29  John Shahid  <jvshahid@gmail.com>
+
+	Cleanup when opening a new terminal fails. (Bug#32794)
+
+	* src/term.c (init_tty): Call delete_terminal_internal if emacs_open
+	fail.
+	* src/terminal.c (delete_terminal): Move some code into
+	delete_terminal_internal and call it.
+	(delete_terminal_internal): New function.
+	* src/termhooks.h: Prototype for delete_terminal_internal.
+
+2018-09-28  Alan Third  <alan@idiocy.org>
+
+	Fix deprecation warning
+
+	* src/nsterm.m (ns_term_init): Use writeToFile or writeToURL as
+	required.
+
+2018-09-28  Alan Third  <alan@idiocy.org>
+
+	Make all NS drawing be done from drawRect
+
+	See bug#31904 and bug#32812.
+
+	* src/nsterm.m (ns_update_begin): Don't lock focus, only clip if there
+	is already a view focused.
+	(ns_update_end): Don't mess with view focusing any more.
+	(ns_focus): Only clip drawing if there is already a focused view,
+	otherwise mark area dirty for later drawing.  Renamed ns_clip_to_rect.
+	All callers changed.
+	(ns_unfocus): Don't unfocus the view any more.  Renamed
+	ns_reset_clipping. All callers changed.
+	(ns_clip_to_row): Update to match ns_clip_to_rect.
+	(ns_clear_frame):
+	(ns_clear_frame_area):
+	(ns_draw_fringe_bitmap):
+	(ns_draw_window_cursor):
+	(ns_draw_vertical_window_border):
+	(ns_draw_window_divider):
+	(ns_dumpglyphs_stretch):
+	(ns_draw_glyph_string): Only draw if ns_focus or ns_clip_to_row
+	return YES.
+	(ns_copy_bits): Remove superfluous calls to ns_(un)focus.
+	(ns_flush_display): New function.
+
+2018-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32828
+
+	* lisp/net/dbus.el (dbus-init-bus): Return number of connections,
+	as promised by the docstring.  (Bug#32828)
+
+2018-09-28  Noam Postavsky  <npostavs@gmail.com>
+
+	* lisp/net/shr.el (shr-copy-url): Fix docstring.
+
+2018-09-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix typos in documentation
+
+	* doc/misc/vhdl-mode.texi (Custom Indentation Functions):
+	* doc/misc/url.texi (Customization):
+	* doc/misc/tramp.texi (Overview):
+	* doc/misc/srecode.texi (Developing Template Functions):
+	* doc/misc/sieve.texi (Sieve Mode):
+	* doc/misc/reftex.texi (Options - Creating Citations):
+	* doc/misc/org.texi (Cooperation, Conflicts):
+	* doc/misc/gnus.texi (Misc Group Stuff):
+	* doc/misc/eshell.texi (Bugs and ideas):
+	* doc/misc/calc.texi (Summary):
+	* doc/man/emacsclient.1:
+	* doc/lispref/os.texi (Security Considerations):
+	* doc/lispref/control.texi (pcase Macro):
+	* CONTRIBUTE: Fix typos.  Reported by Mak Kolybabi
+	<mak@kolybabi.com>  (Bug#32853)
+
+2018-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* doc/emacs/kmacro.texi (Basic Keyboard Macro): Mention old bindings
+
+	According to Apple gospel, function keys are partly going the way of the dodo
+	so F3/F4 can, like in the good old days, be hard to reach for some users.
+
+2018-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve docs of functions/variables related to 'display-buffer'
+
+	* lisp/window.el (display-buffer, pop-to-buffer-same-window)
+	(display-buffer-same-window, display-buffer-in-side-window)
+	(same-window-p, display-buffer-overriding-action)
+	(display-buffer-base-action)
+	(display-buffer--same-window-action)
+	(display-buffer--other-frame-action)
+	(with-current-buffer-window, with-displayed-buffer-window)
+	(display-buffer-alist, display-buffer-assq-regexp)
+	(display-buffer-other-frame): Clarify and improve the doc
+	strings.  (Bug#32798)
+
+2018-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/mouse.el (tear-off-window): Fix non-mouse use (bug#32799)
+
+2018-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of directory-local variables
+
+	* lisp/files.el (hack-local-variables, normal-mode)
+	(after-find-file, find-file-hook): Mention directory-local
+	variables in the doc strings.  Suggested by Marcin Borkowski
+	<mbork@mbork.pl>.
+
+	* doc/emacs/custom.texi (File Variables, Directory Variables):
+	Clarify that directory-local variables are overridden by
+	file-local ones.
+
+2018-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't use obsolete variable 'save-place' in documentation
+
+	* doc/lispref/customize.texi (Variable Definitions): Replace
+	example of saveplace defcustom with a fictitious one, which
+	will not bit-rot with time.  (Bug#32741)
+
+2018-09-22  Mark A. Hershberger  <mah@everybody.org>
+
+	Use save-place-mode instead of save-place
+
+	* lisp/menu-bar.el (menu-bar-options-save, menu-bar-options-menu):
+	* lisp/saveplace.el (save-place-to-alist, save-places-to-alist)
+	(save-place-find-file-hook, save-place-dired-hook): Use
+	save-place-mode instead of the obsolete save-place.
+
+2018-09-20  Eli Zaretskii  <eliz@gnu.org>
+
+	More accurate docs for 'text-char-description'
+
+	* src/keymap.c (Ftext_char_description):
+	* doc/lispref/help.texi (Describing Characters): More accurate
+	description of 'text-char-description'.  Remove incorrect
+	examples from the ELisp manual.  (Bug#32743)
+
+2018-09-20  Noam Postavsky  <npostavs@gmail.com>
+
+	Document synchronous behavior of eshell/make (Bug#32513)
+
+	* doc/misc/eshell.texi (Built-ins):
+	* lisp/eshell/em-unix.el (eshell/make): Mention that it falls back to
+	the external 'make' command when called synchronously.
+
+2018-09-20  Shigeru Fukaya  <shigeru.fukaya@gmail.com>
+
+	Fix bs-show with wide characters (Bug#17822)
+
+	* lisp/bs.el (bs--insert-one-entry, bs-show-in-buffer): Use
+	string-width instead of length.
+
+2018-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve Custom menu labels for 2 options
+
+	* lisp/dired.el (dired-use-ls-dired):
+	* lisp/progmodes/xref.el (xref-prompt-for-identifier): Improve
+	the doc string and the defcustom menu/tags text.  (Bug#32756)
+
+2018-09-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve wording of last change in dired-x.texi
+
+	* doc/misc/dired-x.texi (Shell Command Guessing): Clarify
+	wording in description of 'dired-guess-shell-alist-user'.
+	Avoid passive tense.  (Bug#32733)
+
+2018-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix GnuTLS test suite with GnuTLS versions 3.4.x
+
+	* src/gnutls.c (gnutls_cipher_get_tag_size): Make it return
+	zero only for versions of GnuTLS < 3.2.2, where
+	gnutls_cipher_get_tag_size was introduced.  This fixes the
+	GnuTLS test suite, which assumes that any cipher whose tag
+	size is non-zero is AEAD-capable, and doesn't test such ciphers
+	if AEAD is not available, i.e. for GnuTLS < 3.5.1.  (Bug#32446)
+
+2018-09-17  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix build with gnutls versions 3.0 to 3.2 (Bug#32446)
+
+	We previously used functions available only in 3.2+ for all 3.x
+	versions.
+	* src/gnutls.c [GNUTLS_VERSION_NUMBER < 0x030501]: Replace calls to
+	gnutls_cipher_get_tag_size with 0.
+	[GNUTLS_VERSION_NUMBER < 0x030200]: Alias gnutls_cipher_get_iv_size
+	to gnutls_cipher_get_block_size, gnutls_digest_list to
+	gnutls_mac_list, and gnutls_digest_get_name to gnutls_mac_get_name.
+	[WINDOWSNT]: Adjust DLL function definitions and declarations
+	accordingly.
+
+2018-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix the Bubbles game on TTY frames
+
+	* lisp/play/bubbles.el (bubbles--col-offset)
+	(bubbles--row-offset): Doc fixes.
+	(bubbles--compute-offsets): Conflate the GUI and TTY code into
+	a single common version.  Set the offsets to simple numbers,
+	not to lists.
+	(bubbles--initialize, bubbles--show-scores): Wrap offset
+	values in a list, so that they are interpreted as pixel
+	values, not as units of character width.  This fixes the game
+	on TTY frames.  (Bug#32744)
+
+2018-09-17  Allen Li  <darkfeline@felesatra.moe>
+
+	Add choice to reshow certificate information (Bug#31877)
+
+	In various situations, the window displaying the certificate
+	information can be hidden (such as if the user accidentally presses ?,
+	which causes the read-multiple-choice help window to replace it).
+	Instead of leaving the user to make a choice blindly, add a choice to
+	reshow the certification information.
+
+	* lisp/net/nsm.el (nsm-query-user): Add reshow choice.
+
+2018-09-16  Glenn Morris  <rgm@gnu.org>
+
+	* src/alloc.c (Fbool_vector, Flist, Fvector): Doc tweak.
+
+	Use a simpler, consistent form.
+
+2018-09-15  Alan Mackenzie  <acm@muc.de>
+
+	* src/alloc.c (vector): Fix grammatical error in doc string: "are" -> "is".
+
+2018-09-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid adverse side effects of fixing bug#21824
+
+	* test/src/buffer-tests.el
+	(overlay-modification-hooks-deleted-overlay): New test.
+
+	* src/buffer.c (report_overlay_modification): Don't bypass all
+	the overlay-modification hooks; instead, invoke each function
+	only if the buffer associated with the overlay is the current
+	buffer.  (Bug#30823)
+
+2018-09-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Document changes called out in NEWS
+
+	* doc/lispref/lists.texi (Association Lists): Document
+	'assoc-delete-all'.
+	* doc/lispref/minibuf.texi (Minibuffers): Adapt menu.
+	(Multiple Queries): Document 'read-answer'.
+
+	* etc/NEWS: Reflect the above documentation in the respective
+	entries.
+
+2018-09-14  Glenn Morris  <rgm@gnu.org>
+
+	Tiny doc updates re yum/dnf etc
+
+	* INSTALL: Mention dnf and Debian unversioned emacs package.
+	* doc/misc/efaq.texi (Installing Emacs): Mention dnf.
+
+2018-09-14  Leo Liu  <sdl.web@gmail.com>
+
+	Remove unused variable
+
+	* lisp/progmodes/prolog.el (prolog-hungry-delete-key-flag): Remove.
+
+2018-09-14  Leo Liu  <sdl.web@gmail.com>
+
+	Fix (thing-at-point 'list) regression (Bug#31772)
+
+	* lisp/thingatpt.el (thing-at-point-bounds-of-list-at-point): Revert
+	  to pre 26.1 behavior.  Return whole sexp at point if no enclosing
+	  list.
+	  (list-at-point): New optional arg to ignore comments and strings.
+
+	* test/lisp/thingatpt-tests.el
+	  (thing-at-point-bounds-of-list-at-point): Fix and augment tests.
+
+2018-09-14  Robert Pluim  <rpluim@gmail.com>
+
+	Clarify meaning of '*'
+
+	* doc/misc/dired-x.texi (Shell Command Guessing): Clarify meaning
+	of '*'. (Bug#32733)
+
+2018-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* etc/PROBLEMS: Document Ubuntu 16.04 issue.
+
+2018-09-12  Alex Branham  <alex.branham@gmail.com>  (tiny change)
+
+	Increase default value for imenu-auto-rescan-maxout
+
+	* lisp/imenu.el (imenu-auto-rescan-maxout): Increase default value to
+	  600000.  (Bug#18426)
+	* doc/emacs/programs.texi (imenu-auto-rescan-maxout): Add
+	  documentation for imenu-auto-rescan-maxout.
+
+2018-09-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve recent change to ELisp manual
+
+	* doc/lispref/commands.texi (Keyboard Events): Add index entry
+	for "character event".  (Bug#32562)
+
+2018-09-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/lispref/display.texi (SVG Images): Improve wording.
+
+	* doc/lispref/display.texi (SVG Images): Fix a typo.  (Bug#32690)
+
+2018-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify completion text in the ELisp manual
+
+	* doc/lispref/minibuf.texi (Programmed Completion): Clarify
+	text.  Suggested by Stefan Monnier <monnier@iro.umontreal.ca>.
+
+2018-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix handling of abbreviated control command in gdb-mi.el
+
+	* lisp/progmodes/gdb-mi.el (gdb-control-commands-regexp):
+	Support unambiguous abbreviations of commands.  (Bug#32576)
+
+2018-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify documentation of functions reading character events
+
+	* doc/lispref/help.texi (Describing Characters):
+	* doc/lispref/commands.texi (Keyboard Events)
+	(Reading One Event, Classifying Events): Make the distinction
+	between characters and character events more explicit.
+
+	* src/keymap.c (Ftext_char_description)
+	(Fsingle_key_description):
+	* src/lread.c (Fread_char, Fread_char_exclusive): Doc fixes,
+	to make a clear distinction between a character input event
+	and a character code.  (Bug#32562)
+
+2018-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Record :version for built-in variables while dumping
+
+	* lisp/cus-start.el (standard): Record the ':version; of the
+	symbols when dumping, so that 'describe-variable' could tell
+	which built-in variables were added/changed in recent
+	versions.
+
+2018-09-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* src/process.c (connect_network_socket): Fix memory leak.  (Bug#32604)
+
+2018-09-05  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (appdatadir): Use the non-obsolete location "metainfo".
+
+2018-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Better fix for bug#32550
+
+	* lisp/rfn-eshadow.el (rfn-eshadow-overlay): Give it a global default.
+
+	* lisp/net/tramp.el (rfn-eshadow-overlay): Declare it as dynamically scoped.
+	(tramp-rfn-eshadow-update-overlay): Revert the corresponding part of
+	last change.
+
+2018-09-04  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32550
+
+	* lisp/net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not
+	use `symbol-value'.
+	(tramp-rfn-eshadow-update-overlay): Do not use `symbol-value'.  Do
+	not let-bind `rfn-eshadow-overlay', assign it directly (due to
+	lexical binding).  (Bug#32550)
+
+2018-09-04  Martin Rudalics  <rudalics@gmx.at>
+
+	Don't call XGetGeometry for frames without outer X window (Bug#32615)
+
+	* src/xfns.c (frame_geometry): Don't call XGetGeometry when
+	FRAME has no outer X window; return nil instead.  (Bug#32615)
+
+2018-09-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lisp/calculator.el: Fix doc typo.
+
+2018-09-03  Glenn Morris  <rgm@gnu.org>
+
+	Standardize calc bug reporting instructions
+
+	* doc/misc/calc.texi (Reporting Bugs): Use standard commands.
+	* lisp/calc/calc-misc.el (report-calc-bug, calc-report-bug):
+	* lisp/calc/calc.el (calc-bug-address): Change to be
+	obsolete aliases for standard Emacs bug reporting items.
+
+2018-08-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	Rename thread-alive-p to thread-live-p
+
+	* doc/lispref/threads.texi (Basic Thread Functions): Use thread-live-p.
+
+	* etc/NEWS: 'thread-alive-p' has been renamed to 'thread-live-p'.
+
+	* src/thread.c (thread_live_p): Rename from thread_alive_p.  Adapt
+	all callees.
+	(Fthread_live_p): Rename from Fthread_alive_p.
+	(syms_of_threads): Make thread-alive-p an alias of thread-live-p.
+
+	* test/src/thread-tests.el (all): Replace `thread-alive-p' by
+	`thread-live-p'.
+	(threads-live): Rename from `threads-alive'.
+
+2018-08-30  Miciah Masters  <miciah.masters@gmail.com>  (tiny change)
+
+	rcirc: Document /reconnect as a built-in command (Bug#29656)
+
+	The change "New command rcirc-cmd-reconnect" from 2014-04-09 (shipped
+	in Emacs 25.1) added a /reconnect command to rcirc but did not
+	document it and did not delete the example /reconnect command
+	definition in the manual.
+	* doc/misc/rcirc.texi (rcirc commands): Document the built-in /reconnect
+	command.
+	(Hacking and Tweaking): Delete example reconnect command.
+
+2018-08-30  Noam Postavsky  <npostavs@gmail.com>
+
+	* test/lisp/calc/calc-tests.el (calc-imaginary-i): New test.
+
+2018-08-28  Glenn Morris  <rgm@gnu.org>
+
+	admin.el: respect environment settings for makeinfo etc
+
+	* admin/admin.el (manual-makeinfo, manual-texi2pdf, manual-texi2dvi):
+	New variables.
+	(manual-html-mono, manual-html-node, manual-pdf, manual-ps): Use them.
+
+2018-08-28  Glenn Morris  <rgm@gnu.org>
+
+	* etc/PROBLEMS: New entry about GTK+ 3 crash with some X servers.
+
+2018-08-28  Noam Postavsky  <npostavs@gmail.com>
+
+	Index profiler commands in elisp manual
+
+	* doc/lispref/debugging.texi (Profiling): Add index entries for
+	profiler-start, profiler-report, profiler-stop.
+
+2018-08-28  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix math-imaginary-i check
+
+	Reported by Bastian Erdnüß at
+	<https://lists.gnu.org/archive/html/emacs-devel/2018-08/msg00300.html>.
+	* lisp/calc/calc-cplx.el (math-imaginary-i): Check for a value
+	of (polar 1 <quarter-circle>).
+
+2018-08-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid infinite hscrolling loops when line numbers are displayed
+
+	* src/xdisp.c (maybe_produce_line_number): Don't produce line
+	numbers if we don't have enough screen estate.  (Bug#32351)
+
+2018-08-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid crashes in malformed defvar
+
+	* src/eval.c (Fdefvar): Don't call XSYMBOL on something that
+	might not be a symbol.  This avoids crashes due to malformed
+	'defvar' forms.  (Bug#32552)
+
+2018-08-28  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac (emacs_config_features): Add GLIB, XDBE, XIM.
+
+	* configure.ac: Doc fixes related to --with-xim.
+
+2018-08-28  Glenn Morris  <rgm@gnu.org>
+
+	Small checkdoc quoting fix (bug#32546)
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+	Fix quoting thinko.
+
+2018-08-26  Sergey Vinokurov  <serg.foo@gmail.com>
+
+	Fix detection of freed emacs_values (Bug#32479)
+
+	* src/emacs-module.c (module_free_global_ref): Compare a value to be
+	freed with all entries of the list.
+
+	* test/data/emacs-module/mod-test.c (Fmod_test_globref_free): New
+	function.
+	(emacs_module_init): Make it accessible from Lisp.
+	* test/src/emacs-module-tests.el (mod-test-globref-free-test): New
+	test which uses it.
+
+2018-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid crashes with very wide TTY frames on MS-Windows
+
+	* src/w32console.c <glyph_base>: Reduce the number of elements
+	to 80.
+	<glyphs, glyphs_len>: New static variables.
+	(w32con_clear_end_of_line): If the line is wider than the
+	current size of the "empty row" in 'glyphs', reallocate
+	'glyphs' to support the full width of the frame.  This
+	avoids segfaults when the frame is wider than 256 columns.
+	(Bug#32445)
+
+2018-08-25  Wenjamin Petrenko  <wenjamin.petrenko@yandex.ru>  (tiny change)
+
+	Prevent `modify-file-local-variable-prop-line' from adding extra ';'
+
+	* lisp/files-x.el (modify-file-local-variable-prop-line): Handle
+	whitespace when checking if there's already a ';' before the
+	variable (Bug#23294).
+
+2018-08-24  Glenn Morris  <rgm@gnu.org>
+
+	Update GNOME bugtracker URLs
+
+	* configure.ac, admin/notes/multi-tty, etc/PROBLEMS:
+	* src/emacs.c (main):
+	* src/xterm.c (x_connection_closed): Update GNOME bugtracker URLs.
+
+2018-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify in the Emacs manual that ChangeLog files are not used
+
+	* doc/emacs/trouble.texi (Sending Patches): Use "commit log"
+	instead of "change log", to avoid the interpretation that we
+	are talking about literal ChangeLog files.  (Bug#32359)
+
+2018-08-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Recognize codepage 65001 as a valid encoding
+
+	* lisp/international/mule-conf.el (cp65001): Define it as an
+	alias for UTF-8.
+
+2018-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid compilation warning in nt/addpm.c
+
+	* nt/addpm.c [!MINGW_W64]: Undefine _WIN32_IE before
+	redefining it, to avoid compilation warnings.
+
+2018-08-17  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix duplicate custom group names in bibtex.el
+
+	* lisp/textmodes/bibtex.el (bibtex-BibTeX-entry-alist):
+	Change :group from BibTeX to bibtex.  (bug#32436)
+
+2018-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix outdated text in the Calc manual
+
+	* doc/misc/calc.texi (Internals): Don't advertise
+	'calc-extensions' which no longer exists.  Reported by Francis
+	Wright <francis.j.wright@gmail.com>.
+
+2018-08-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port better to x86 -fexcess-precision=fast
+
+	Problem reported by Eli Zaretskii in:
+	https://lists.gnu.org/r/emacs-devel/2018-08/msg00380.html
+	* src/data.c (arithcompare): Work around incompatibility
+	between gcc -fexcess-precision=fast and the C standard on x86,
+	by capturing the results of floating-point comparisons before
+	the excess precision spontaneously decays.  Although this fix
+	might not work in general, it does work here and is probably
+	good enough for the platforms we care about.
+
+	(cherry picked from commit a84cef90957f2379cc0df6bd908317fc441971ce)
+
+2018-08-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add comment about floating point test
+
+	* test/src/data-tests.el (data-tests--float-greater-than-fixnums):
+	New constant.
+	(data-tests-=, data-tests-<, data-tests->, data-tests-<=)
+	(data-tests->=, data-tests-min): Use it.
+
+2018-08-13  Tino Calancha  <tino.calancha@gmail.com>
+
+	Ibuffer: Add toggle ibuffer-do-toggle-lock
+
+	Toggle the locked status in marked buffers or the buffer
+	at point (Bug#32421).
+	* lisp/ibuffer.el (ibuffer-do-toggle-lock): New command.
+	(ibuffer-mode-map): Bind it to 'L'.
+	(ibuffer-mode-operate-map): Add entries for
+	`ibuffer-do-toggle-read-only' and `ibuffer-do-toggle-lock'.
+	* etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.2):
+	Announce the change.
+
+2018-08-13  Tino Calancha  <tino.calancha@gmail.com>
+
+	Ibuffer: Detect correctly the buffers running a process
+
+	* lisp/ibuffer.el (filename-and-process): Store the process buffer
+	as a text property; check for such property to detect a buffer
+	with a process (Bug#32420).
+
+2018-08-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Backport fix for Bug#32226
+
+	* test/lisp/shadowfile-tests.el: Set Tramp variables for hydra.
+	(shadow-test06-literal-groups, shadow-test07-regexp-groups)
+	(shadow-test08-shadow-todo, shadow-test09-shadow-copy-files):
+	Use `set-visited-file-name' instead of setting the value in
+	`buffer-file-name' directly.
+	(shadow-test08-shadow-todo, shadow-test09-shadow-copy-files):
+	Test for writable temporary directory.  Suppress errors in
+	cleanup.  (Bug#32226)
+
+2018-08-12  Yuri D'Elia  <wavexx@thregr.org>
+
+	Do not consider external packages to be removable (Bug#27822)
+
+	Packages which are not directly user-installed shouldn't be autoremoved,
+	since they can be setup through a different path (via
+	`package-directory-list') where we have no authority over.
+	* lisp/emacs-lisp/package.el (package--user-installed-p): New
+	function.
+	(package--removable-packages): Use it.
+
+2018-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* src/alloc.c: Remove obsolete comments.
+
+2018-08-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Better support utf-8-with-signature and utf-8-hfs in HTML
+
+	* lisp/international/mule.el (sgml-html-meta-auto-coding-function):
+	Support UTF-8 with BOM and utf-8-hfs as variants of UTF-8, and
+	obey the buffer's encoding if it is one of these variants, instead
+	of re-encoding in UTF-8 proper.  (Bug#20623)
+
+2018-08-11  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't use -Wabi compiler option
+
+	* configure.ac: Add -Wabi to the list of disabled warning
+	options.  For the details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2018-08/msg00123.html.
+
+2018-08-10  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+	Fix bugs in `auth-source-netrc-parse-one'.
+
+	* lisp/auth-source.el (auth-source-netrc-parse-one): Ensure that match
+	  data is not overwritten in `auth-source-netrc-parse-next-interesting'.
+	  Ensure that blanks are skipped before and after going over comments
+	  and eols.
+	* test/lisp/auth-source-tests.el (auth-source-test-netrc-parse-one): New test.
+
+	(cherry picked from commit 60ff8101449eea3a5ca4961299501efd83d011bd)
+
+2018-08-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix copying text properties by 'format'
+
+	* src/editfns.c (styled_format): Add the spec beginning index
+	to the info recorded for each format spec, and use it to
+	detect the case that a format spec and its text property end
+	where the next spec with another property begins.  (Bug#32404)
+
+	* test/src/editfns-tests.el (format-properties): Add tests for
+	bug#32404.
+
+2018-08-09  Alexander Gramiak  <agrambot@gmail.com>
+
+	Improve error messages regarding initial-buffer-choice (Bug#29098)
+
+	* lisp/startup.el (command-line-1) <initial-buffer-choice>: Make the
+	messages conform to Emacs conventions, and show the invalid return
+	value in the message.
+
+2018-08-09  Glenn Morris  <rgm@gnu.org>
+
+	* test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01): Fix typo.
+
+2018-08-09  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	Make async :family 'local failures fail correctly again
+
+	* src/fileio.c (get_file_errno_data): Refactor out into its own
+	function so that we can reuse the error handling from an async
+	context (bug#31901).
+
+	* src/process.c (connect_network_socket): When an async :family
+	'local client fails (with a file error, for instance), mark the
+	process as failed.
+
+	(cherry picked from commit 92ba34d89ac4f5b5bbb818e1c39a3cc12a405790)
+
+2018-08-09  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix emacsclient check for term.el buffer (Bug#21041)
+
+	* lib-src/emacsclient.c (find_tty): Check for any TERM value with
+	prefix of "eterm", not just "eterm" itself.  Also check for ",term:"
+	in INSIDE_EMACS value.
+
+2018-08-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'set-fontset-font'
+
+	* doc/lispref/display.texi (Fontsets): Fix description of
+	'set-fontset-font'.
+	* src/fontset.c (Fset_fontset_font): Doc fix.  (Bug#32401)
+
+2018-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of M-?
+
+	* doc/emacs/maintaining.texi (Identifier Search):
+	* lisp/progmodes/xref.el (xref-find-references): Improve
+	documentation of xref-find-references and
+	xref-prompt-for-identifier.  (Bug#32389)
+
+2018-08-07  Ivan Shmakov  <ivan@siamics.net>
+
+	Reinterpret Esperanto characters in iso-transl as iso-8859-3.
+
+	* lisp/international/iso-transl.el (iso-transl-language-alist):
+	Reinterpret Esperanto characters as iso-8859-3 (were: iso-8859-1).
+	(Bug#32371)
+
+2018-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix Flyspell mode when several languages are mixed in a buffer
+
+	* lisp/textmodes/flyspell.el (flyspell-external-point-words):
+	Handle "misspelled" words that actually belong to a language
+	unsupported by the current dictionary.  (Bug#32280)  Fix the test
+	for Ispell the program.
+
+2018-08-04  Juri Linkov  <juri@linkov.net>
+
+	New function read-answer (Bug#31782)
+
+	* lisp/emacs-lisp/map-ynp.el (read-answer-short): New defcustom.
+	(read-answer): New function.
+	* lisp/subr.el (assoc-delete-all): New function.
+	* etc/NEWS: Announce them.
+
+	* lisp/dired.el (dired-delete-file): Use read-answer.
+	(dired--yes-no-all-quit-help): Remove function.
+	(dired-delete-help): Remove defconst.
+
+	(backported from master, "New function read-answer (bug#30073)" and
+	"Respect non-saved value of `read-short-answer' (Bug#31782)")
+
+2018-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in maybe_produce_line_number
+
+	* src/xdisp.c (redisplay_window): Make sure desired_matrix is
+	cleared before calling try_window.  This is important when
+	display-line-numbers is non-nil, because line-number display code
+	assumes each glyph row is completely cleared when it is called to
+	produce a line number.  (Bug#32358)
+
+2018-08-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in set_text_properties_1
+
+	* src/textprop.c (set_text_properties): If the call to
+	modify_text_properties modifies the interval tree as side effect,
+	recalculate the correct interval for START and END.  (Bug#32265)
+
+2018-07-31  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix wdired test failure when byte compiled (bug#32318)
+
+	* test/lisp/wdired-tests.el: Require wdired.  Defvar dired-query
+	to silence byte-compiler.
+
+2018-07-30  Stephen Berman  <stephen.berman@gmx.net>
+
+	* test/lisp/wdired-tests.el (wdired-test-symlink-name): New test.
+
+2018-07-29  Raimon Grau  <raimonster@gmail.com>
+
+	Fix url's thing-at-point beginning-op (Bug#32028)
+
+	* lisp/thingatpt.el (url): Fix beginning-op making.
+
+2018-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change in 'char_width'
+
+	* src/character.c (char_width): Make sure variable C is always
+	initialized.  (Bug#32276)
+
+2018-07-29  Stephen Berman  <stephen.berman@gmx.net>
+
+	Add initial tests for wdired.el
+
+	* test/lisp/wdired-tests.el: New file.
+
+2018-07-28  Stephen Berman  <stephen.berman@gmx.net>
+
+	Fix use of non-nil wdired-use-interactive-rename
+
+	This is a fairly minimal fix for the release branch; a more
+	comprehensive fix is on master, so do not merge this to master.
+
+	* lisp/wdired.el (wdired-search-and-rename): Remove dired-filename
+	text property in order to find new filename when it only partially
+	replaces old filename (bug#32173).  If user quits before renaming
+	succeeds, restore the dired-filename text property.
+
+2018-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix compilation with mingw.org's MinGW 5.x headers
+
+2018-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Update the list of special forms in the ELisp manual
+
+	* doc/lispref/eval.texi (Special Forms):
+	* doc/lispref/frames.texi (Mouse Tracking): 'track-mouse' is
+	nowadays a macro.  (Bug#32284)
+
+2018-07-28  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't fail to indent-sexp before a full sexp (Bug#31984)
+
+	* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only signal error if the
+	initial forward-sexp fails.  Suppress scan-error forn any of the
+	forward-sexp calls after that.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-cant-go): New
+	test.
+
+2018-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix calls to modifications hooks in replace-buffer-contents
+
+	* src/editfns.c (Freplace_buffer_contents): Call the modification
+	hooks on the entire region where replacements could have taken
+	place.  The previous attempts of being more accurate just
+	introduced bugs.  (Bug#32278)
+
+2018-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/character.c (char_width): Support glyphs with faces.  (Bug#32276)
+
+2018-07-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Display raw bytes as belonging to 'eight-bit' charset
+
+	* lisp/descr-text.el (describe-char):
+	* lisp/simple.el (what-cursor-position): Display characters in the
+	range #x3FFF80..#x3FFF9F as belonging to charset 'eight-bit', not
+	'tis620-2533'.
+	* lisp/international/mule-diag.el (describe-character-set):
+	Improve description of :supplementary-p.
+
+2018-07-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix inaccurate text in the user manual
+
+	* doc/emacs/mule.texi (International Chars): Correct inaccurate
+	description of raw bytes display by "C-x =".
+
+2018-07-26  Michael Albinus  <michael.albinus@gmx.de>
+
+	Copyedits in tramp.texi, improved example with bash's readline
+
+	* doc/misc/tramp.texi (all): Unify some wordings.
+	(Frequently Asked Questions): Update example with bash's readline.
+
+2018-07-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Minor Tramp doc update
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Disable bash's
+	INPUTRC.
+
+2018-07-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	File Shadowing is not available on MS Windows
+
+	* doc/emacs/files.texi (File Shadowing): File Shadowing is not
+	available on MS Windows.
+
+	* test/lisp/shadowfile-tests.el (shadow-test00-clusters)
+	(shadow-test01-sites, shadow-test02-files)
+	(shadow-test03-expand-cluster-in-file-name)
+	(shadow-test04-contract-file-name, shadow-test05-file-match)
+	(shadow-test06-literal-groups, shadow-test07-regexp-groups)
+	(shadow-test08-shadow-todo, shadow-test09-shadow-copy-files):
+	Skip under MS Windows.
+
+2018-07-24  Noam Postavsky  <npostavs@gmail.com>
+
+	Let bookmark-jump override window-point (Bug#31751)
+
+	* lisp/bookmark.el (bookmark-jump): Use pop-to-buffer-same-window
+	instead of switch-to-buffer, the latter obeys
+	switch-to-buffer-preserve-window-point and so loses the bookmark's
+	point.
+
+2018-07-23  Noam Postavsky  <npostavs@gmail.com>
+
+	Omit keymap from subword-mode docstring (Bug#32212)
+
+	* lisp/progmodes/subword.el (subword-mode): Remove listing of
+	subword-mode-map bindings, since it is empty as of 2014-03-23 "Merge
+	capitalized-words-mode and subword-mode".
+
+2018-07-23  Tino Calancha  <tino.calancha@gmail.com>
+	    Noam Postavsky  <npostavs@gmail.com>
+
+	Prevent line-mode term from showing user passwords
+
+	For buffers whose mode derive from comint-mode, the user password is
+	read from the minibuffer and it's hidden.  A buffer in term-mode and
+	line submode, instead shows the passwords.  Make buffers in line
+	term-mode to hide passwords too (Bug#30190).
+
+	* lisp/term.el (term-send-invisible): Prefer the more robust
+	`read-passwd' instead of `term-read-noecho'.
+	(term-watch-for-password-prompt): New function.
+	(term-emulate-terminal): Call it each time we receive non-escape
+	sequence output.
+
+2018-07-22  Jonathan Kyle Mitchell  <kyle@jonathanmitchell.org>
+
+	Check for special filenames in eshell (Bug#30724)
+
+	* lisp/eshell/esh-cmd.el (eshell-lisp-command): Check for "~"
+	in lisp commands with the eshell-filename-arguments property
+	(Bug#30724).
+
+	* lisp/eshell/em-dirs.el (eshell/cd, eshell/pushd, eshell/popd):
+	* lisp/eshell/em-ls.el (eshell/ls):
+	* lisp/eshell/em-unix.el (eshell/rm, eshell/mkdir, eshell/rmdir)
+	(eshell/mv, eshell/cp, eshell/ln, eshell/cat, eshell/du, eshell/diff):
+	* lisp/eshell/esh-ext.el (eshell/addpath): Add
+	eshell-filename-arguments to symbol plist.
+
+2018-07-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix indent-sexp of #s(...) (Bug#31984)
+
+	* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Look for a sexp that
+	ends after the current line.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-go): New test.
+
+2018-07-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Add save-match-data to abbreviate-file-name (Bug#32201)
+
+	* lisp/files.el (abbreviate-file-name): Save match-data around
+	expand-file-name; it is not guaranteed to preserve match-data, and may
+	well do so depending on what file handlers and hooks are in effect.
+
+2018-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix last change in editfns.c
+
+	* src/editfns.c (Freplace_buffer_contents): Fix last change: always
+	call buffer modification hooks, even if nothing was deleted/inserted.
+	(bug#32237)
+
+2018-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix calls to buffer modification hooks from replace-buffer-contents
+
+	* src/editfns.c (Freplace_buffer_contents): Don't call buffer
+	modification hooks if nothing was deleted/inserted.  (Bug#32237)
+
+2018-07-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32226
+
+	* lisp/shadowfile.el (shadow-site-name, shadow-name-site):
+	Use "[-.[:word:]]+" as hostname regexp.  (Bug#32226)
+
+	* test/lisp/shadowfile-tests.el (shadow-test06-literal-groups)
+	(shadow-test07-regexp-groups, shadow-test08-shadow-todo)
+	(shadow-test09-shadow-copy-files): Skip if needed.
+
+2018-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc strings of several variables in keyboard.c
+
+	* src/keyboard.c (syms_of_keyboard) <debug-on-event>
+	<attempt-stack-overflow-recovery>
+	<attempt-orderly-shutdown-on-fatal-signal>: Make sure the first
+	sentence of the doc string fits on a single line.
+
+2018-07-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix (Bug#32218).  Do not merge with master
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el: Change version to "2.3.4.26.2".
+	(customize-package-emacs-version-alist): Add Tramp version
+	integrated in Emacs 26.2.
+
+	* lisp/net/tramp.el (tramp-handle-file-truename):
+	* lisp/net/tramp-adb.el (tramp-adb-handle-file-truename):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename): Fix problem
+	with trailing slash.  (Bug#32218)
+
+	* test/lisp/net/tramp-tests.el (tramp-test21-file-links):
+	Remove `tramp--test-emacs27-p' check.
+
+2018-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'pcase-defmacro rx'
+
+	* lisp/emacs-lisp/rx.el (rx): Clarify and improve the doc string.
+	For the details, see the discussion starting at
+	http://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00399.html.
+
+2018-07-19  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix TTY colors breakage by 'clear-face-cache'
+
+	Without examining the right frame, 'tty-color-24bit' was erroneously
+	treating a GUI frame as a 24-bit TTY frame.
+	* lisp/term/tty-colors.el (tty-color-24bit): Accept optional
+	argument DISPLAY and pass it to display-color-cells.  Doc fix.
+	(tty-color-define, tty-color-desc): Pass the FRAME argument to
+	tty-color-24bit.  (Bug#32072)
+
+2018-07-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	* admin/MAINTAINERS: Add files maintained by me (Michael Albinus).
+
+2018-07-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	Adapt shadowfile.el for Tramp  (Bug#4526, Bug#4846)
+
+	* etc/NEWS: Mention changes in shadowfile.el.
+
+	* lisp/shadowfile.el (top): Require 'tramp instead of 'ange-ftp.
+	(shadow-cluster): New defstruct.
+	(shadow-make-cluster, shadow-cluster-name, shadow-cluster-primary)
+	(shadow-cluster-regexp, shadow-get-user)
+	(shadow-parse-fullname): Remove.
+	(shadow-info-file, shadow-todo-file, shadow-system-name)
+	(shadow-homedir, shadow-regexp-superquote, shadow-suffix)
+	(shadow-set-cluster, shadow-get-cluster, shadow-site-name)
+	(shadow-name-site, shadow-site-primary, shadow-site-cluster)
+	(shadow-read-site, shadow-parse-name, shadow-make-fullname)
+	(shadow-replace-name-component, shadow-local-file)
+	(shadow-expand-cluster-in-file-name, shadow-contract-file-name)
+	(shadow-same-site, shadow-file-match, shadow-define-cluster)
+	(shadow-define-literal-group, shadow-define-regexp-group)
+	(shadow-make-group, shadow-shadows-of-1, shadow-read-files)
+	(shadow-write-info-file, shadow-write-todo-file)
+	(shadow-initialize): Adapt variables and functions.
+
+	* test/lisp/shadowfile-tests.el: New file.
+
+2018-07-18  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix auth-source-delete (Bug#26184)
+
+	* lisp/auth-source.el (auth-source-delete): Fix `auth-source-search'
+	call.
+	* test/lisp/auth-source-tests.el (auth-source-delete): New test.
+
+2018-07-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid assertion violations in gnutls.c
+
+	* src/gnutls.c (Fgnutls_hash_digest, gnutls_symmetric)
+	(Fgnutls_hash_mac): Check CONSP before invoking XCDR.  (Bug#32187)
+	Report values of invalid arguments when signaling an error.
+
+2018-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't use a literal "C-u" in ispell.el  help message text
+
+	* lisp/textmodes/ispell.el (ispell-command-loop): Use
+	"\\[universal-argument]" instead of a literal "C-u".  (Bug#32142)
+
+2018-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'seqp'
+
+	* doc/lispref/sequences.texi (Sequence Functions): Add text to
+	explain the relation between 'seqp' and 'sequencep'.  (Bug#32125)
+
+2018-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify usage and dependencies between several Flyspell features
+
+	* lisp/textmodes/flyspell.el (flyspell-region)
+	(flyspell-small-region, flyspell-persistent-highlight):
+	Documentation improvements.  (Bug#32142)
+
+2018-07-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Use consistent function names in thread-tests.el
+
+	* test/src/thread-tests.el (threads-call-error, threads-custom)
+	(threads-errors, threads-sticky-point, threads-signal-early):
+	Rename, using naming convention to prefix with "threads-".
+
+2018-07-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix format error in Faccept_process_output
+
+	* src/process.c (Faccept_process_output): Do not use format spec
+	"%p", it isn't valid for error().
+
+2018-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Lessen stack consumption in recursive read1
+
+	* src/lread.c (read1): Shrink local buffer size from
+	MAX_ALLOCA to 128 (Bug#31995).
+
+2018-07-13  Noam Postavsky  <npostavs@gmail.com>
+
+	Match w32 paths in grep sans --null hits (Bug#32051)
+
+	* lisp/progmodes/grep.el (grep-regexp-alist): Add an optional part to
+	match paths starting with C: (other drive letters).
+	* test/lisp/progmodes/compile-tests.el
+	(compile-tests--grep-regexp-testcases)
+	(compile-tests--grep-regexp-tricky-testcases)
+	(compile-test-grep-regexps): New tests.
+	(compile--test-error-line): Return `compilation-message'.
+
+2018-07-13  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix previous make-network-process change
+
+	* src/process.c (Fmake_network_process): On 2018-07-09 "Explicitly
+	reject :server and :nowait (Bug#31903)", the sense of the SERVER check
+	was accidentally reversed so that we ended up looking for the wrong
+	ADDRESS.  Reported by T.V Raman in
+	<https://lists.gnu.org/archive/html/emacs-devel/2018-07/msg00437.html>.
+
+2018-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Another documentation improvement in flyspell.el
+
+	* lisp/textmodes/flyspell.el (flyspell-persistent-highlight): Doc
+	fix.
+
+2018-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of Flyspell
+
+	For the background, see
+	http://lists.gnu.org/archive/html/help-gnu-emacs/2018-07/msg00099.html.
+
+	* doc/emacs/fixit.texi (Spelling): Add a couple of caveats.
+	* lisp/textmodes/flyspell.el: Update commentary.
+
+2018-07-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	Provide feature 'threads
+
+	* src/thread.c (syms_of_threads): Provide feature "threads".
+
+	* test/src/thread-tests.el (top): Declare the functions.
+	(all): Use (featurep 'threads) check.
+
+2018-07-11  Miciah Masters  <miciah.masters@gmail.com>  (tiny change)
+
+	Save the server alias on reconnect (Bug#29657)
+
+	rcirc does not retain the server alias on reconnect.  As a result, rcirc
+	fails to re-use server and channel buffers when an alias is used.  Further
+	problems may ensue when aliases are used to differentiate multiple
+	connections to the same host, for example when using a single IRC bouncer
+	or proxy to connect to multiple IRC networks.
+
+	Save the server alias when connecting to a server so that reconnect will
+	retain the alias.
+	* lisp/net/rcirc.el (rcirc-connect): Include server-alias when setting
+	rcirc-connection-info.
+
+2018-07-11  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Refer to "proper lists" instead of "true lists"
+
+	* doc/lispref/lists.texi (Cons Cells, Building Lists):
+	* doc/lispref/sequences.texi (Vector Functions): Use the more
+	popular term "proper", rather than "true", to qualify nil-terminated
+	lists.
+
+	For discussion, see the following emacs-devel subthreads:
+	https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00112.html
+	https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00138.html
+
+2018-07-10  John Shahid  <jvshahid@gmail.com>
+
+	Avoid turning on the global-minor-mode recursively
+
+	* lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Clear
+	the buffer-list inside MODE-enable-in-buffers to avoid enabling the
+	mode recursively.  (Bug#31793)
+
+2018-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32085
+
+	* doc/misc/tramp.texi (GVFS based methods): `dav' and `davs' do
+	not support paths in the volume name.  (Bug#32085)
+
+2018-07-10  Noam Postavsky  <npostavs@gmail.com>
+
+	Stop using indent-line-to in lisp-indent-line (Bug#32014)
+
+	This is partial revert of "Remove ignored argument from
+	lisp-indent-line", because `indent-line-to' doesn't respect field
+	boundaries.
+	* lisp/emacs-lisp/lisp-mode.el (lisp-indent-line): Use delete-region
+	and indent-to instead of `indent-line-to'.
+	* test/lisp/emacs-lisp/lisp-mode-tests.el
+	(lisp-indent-with-read-only-field): Expect to pass.
+
+	Don't merge to master, we will fix indent-line-to there instead.
+
+2018-07-10  Noam Postavsky  <npostavs@gmail.com>
+
+	Explicitly reject :server and :nowait (Bug#31903)
+
+	* src/process.c (Fmake_network_process): Explicitly check for and
+	signal an error when passed both :server and :nowait non-nil.  In
+	Emacs 25, :nowait would be ignored in this case, but as of Emacs 26.1
+	this gives an error, albeit an unclear one.  Also remove obsolete
+	comment regarding configurations lacking non-blocking mode, the
+	corresponding code was removed in 2012-11-17 "Assume POSIX 1003.1-1988
+	or later for fcntl.h."
+
+2018-07-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32090
+
+	* lisp/files-x.el (connection-local-normalize-criteria): Do not
+	use PROPERTIES anymore.
+	(connection-local-get-profiles): Rewrite, in order to accept any
+	property as optional.  (Bug#32090)
+	(connection-local-set-profiles):
+	Adapt ´connection-local-normalize-criteria' call.
+
+	* test/lisp/files-x-tests.el
+	(files-x-test-connection-local-set-profiles)
+	(files-x-test-hack-connection-local-variables-apply): Extend tests.
+
+2018-07-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix floating point exceptions on Alpha (Bug#32086)
+
+	Backport from master.
+	* admin/merge-gnulib (GNULIB_MODULES): Add fpieee.
+	* m4/fpieee.m4: New file, copied from Gnulib.
+	* m4/gnulib-comp.m4: Regenerate.
+
+2018-07-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix bootstrap infloop in GNU/Linux alpha
+
+	* src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC
+	is already set (Bug#32083).
+
+2018-07-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor fix of a recent documentation change
+
+	* lisp/net/gnutls.el (gnutls-algorithm-priority): Clarify the doc
+	string.
+
+2018-07-08  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	Mention the NSM in the gnutls variable doc strings
+
+	* lisp/net/gnutls.el (gnutls-algorithm-priority): Mention the Network
+	Security Manager here since this variable is an obvious place
+	for people concerned about network security to look.
+	(gnutls-verify-error): Ditto.
+	(gnutls-min-prime-bits): Ditto.
+
+2018-07-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Remove test code from last commit
+
+2018-07-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#32084
+
+	* test/lisp/net/dbus-tests.el (dbus-test02-register-service-own-bus):
+	Unset $DISPLAY when calling dbus-launch, in order to avoid
+	possible X11 authentication errors.  (Bug#32084)
+
+2018-07-07  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Fix (length NON-SEQUENCE) documentation
+
+	Suggested by Eli Zaretskii <eliz@gnu.org> in the following threads:
+	https://lists.gnu.org/archive/html/emacs-devel/2018-07/msg00171.html
+	https://lists.gnu.org/archive/html/emacs-devel/2018-07/msg00206.html
+
+	* doc/lispref/sequences.texi (Sequence Functions): Mention that
+	'length' signals a 'wrong-type-argument' also when given a
+	non-sequencep argument.
+
+2018-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix bug #11732
+
+	* src/w32fns.c (w32_wnd_proc): Fix handling of Windows input
+	methods.  (Bug#11732)
+
+2018-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'emacs-lock-mode'
+
+	* lisp/emacs-lock.el (emacs-lock-mode): Mention in the doc string
+	the special handling of some major modes due to
+	'emacs-lock-unlockable-modes'.
+
+2018-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/imenu.el (imenu-generic-expression): Doc fix.  (Bug#32016)
+
+2018-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve indexing of 'eval-defun' in ELisp manual
+
+	* doc/lispref/display.texi (Defining Faces):
+	* doc/lispref/debugging.texi (Explicit Debug):
+	* doc/lispref/customize.texi (Variable Definitions):
+	* doc/lispref/variables.texi (Defining Variables): Add index
+	entries for 'eval-defun'.  (Bug#32066)
+
+2018-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix (length CIRCULAR) documentation
+
+	* doc/lispref/sequences.texi (Sequence Functions):
+	Correct documentation of what (length X) does when
+	X is a circular list.
+
+2018-07-06  Michael Albinus  <michael.albinus@gmx.de>
+
+	Tramp editorials
+
+	* doc/misc/tramp.texi (Android shell setup): Mention Termux.
+
+	* lisp/net/tramp-sh.el (tramp-remote-process-environment):
+	Use proper spelling "Tramp" in docstring.
+
+2018-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify and improve doc strings of 'eval-last-sexp' and friends
+
+	* lisp/simple.el (eval-expression, eval-expression-print-format):
+	* lisp/progmodes/elisp-mode.el (eval-last-sexp): Doc fixes.
+	(Bug#32064)
+
+2018-07-06  Glenn Morris  <rgm@gnu.org>
+
+	Automate upload of Emacs manuals to gnu.org
+
+	* admin/make-manuals, admin/upload-manuals: New scripts.
+	* admin/admin.el (make-manuals, make-manuals-dist): Handle batch mode.
+	* admin/make-tarball.txt: Update web-page details.
+
+2018-07-05  Mike Kupfer  <mkupfer@alum.berkeley.edu>
+
+	Fix MH-E mail composition with GNU Mailutils (SF#485)
+
+	* lisp/mh-e/mh-comp.el (mh-bare-components): Recursively delete
+	the temporary folder.
+
+2018-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Speed up 'replace-buffer-contents' some more
+
+	* src/editfns.c (EXTRA_CONTEXT_FIELDS): New members beg_a and beg_b.
+	(Freplace_buffer_contents): Set up ctx.beg_a and ctx.beg_b.
+	(buffer_chars_equal): Use ctx->beg_a and ctx->beg_b instead of
+	calling BUF_BEGV, which is expensive.  This speeds up the recipe
+	in bug#31888 by 30%.
+
+2018-07-03  Glenn Morris  <rgm@gnu.org>
+
+	* doc/emacs/docstyle.texi: Avoid messing up the html output.
+
+	Previously the @hyphenation commands somehow caused the <head>
+	section to go missing, with makeinfo 4.13 at least.
+
+2018-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* etc/HISTORY: Cite Brinkhoff on early history.
+
+2018-07-01  Martin Rudalics  <rudalics@gmx.at>
+
+	Document internal use of 'above-suspended' z-group frame parameter
+
+	* src/w32fns.c (w32_dialog_in_progress, x_set_z_group):
+	* src/xterm.c (x_set_z_group): Clarify the internal use of
+	'above-suspended' when setting a frame's 'z-group' parameter.
+
+2018-06-30  Gemini Lasswell  <gazally@runbox.com>
+
+	Increase max-lisp-eval-depth adjustment while in debugger (bug#31919)
+
+	* src/eval.c (call_debugger): Increase the amount of extra Lisp
+	evaluation depth given to the debugger to allow it to call cl-print.
+	* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Add a comment
+	to suggest updating call_debugger when changing print-level.
+
+2018-06-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve on last change in replace-buffer-contents
+
+	* src/editfns.c (Freplace_buffer_contents): Call modification
+	hooks only for the actual region where changes are made.
+	(Bug#31888)
+
+2018-06-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a factual error in Introduction to Emacs Lisp
+
+	* doc/lispintro/emacs-lisp-intro.texi (Buffer Names): Update the
+	key that exits the splash screen.  (Bug#32019)
+
+2018-06-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor improvements in documentation of imenu.el
+
+	* lisp/imenu.el (imenu-generic-skip-comments-and-strings)
+	(imenu--generic-function): Doc fixes.  (Bug#31962)
+
+2018-06-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid errors with recentering in 'skeleton-insert'
+
+	* lisp/skeleton.el (skeleton-insert): Don't recenter if we are
+	running in a buffer other than the one displayed in the selected
+	window.  (Bug#31950)
+
+2018-06-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* src/lisp.h: Omit obsolete comment re bytecode stack.
+
+2018-06-29  Eli Zaretskii  <eliz@gnu.org>
+
+	Speed up replace-buffer-contents
+
+	* src/editfns.c (EXTRA_CONTEXT_FIELDS): Add a_unibyte and
+	b_unibyte members.
+	(rbc_quitcounter): New static variable.
+	(Freplace_buffer_contents): Initialize a_unibyte, b_unibyte, and
+	rbc_quitcounter.  Inhibit modification hooks if they were not
+	already inhibited.  Use rarely_quit to allow user to quit, to
+	avoid calling maybe_quit too frequently (which hurts performance).
+	Remove redundant assertions (which hurt performance too much).
+	Call signal_after_change and update_compositions after all the
+	changes are done.
+	(buffer_chars_equal): Remove redundant assertions (which hurt
+	performance).  Avoid using BUF_FETCH_CHAR_AS_MULTIBYTE, which
+	hurts performance by referencing Lisp symbols; instead, use
+	lower-level macros with explicit tests to select which macro to
+	use.  (Bug#31888)
+
+2018-06-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+	Remove extra process call from vc-git-find-file-hook
+
+	* lisp/vc/vc-git.el (vc-git-find-file-hook): Resolve FIXMEs.
+
+2018-06-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+	Speed up vc-git-dir-status-files
+
+	* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Call 'git
+	ls-files -u' for the ls-files-conflict stage
+	(https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00885.html).
+
+2018-06-27  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid compiler warning using coding.h
+
+	* src/coding.h: Add INLINE_HEADER_BEGIN..INLINE_HEADER_END, since
+	this header now has an extern INLINE function.
+
+2018-06-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.3.4.  Do not merge with master
+
+	* doc/misc/trampver.texi:
+	* lisp/net/trampver.el: Change version to "2.3.4".
+
+	* lisp/net/tramp-smb.el (tramp-smb-handle-delete-directory):
+	Check, that the directory has been removed indeed.
+
+	* test/lisp/net/tramp-tests.el (tramp-test21-file-links): Adapt test.
+	(tramp--test-emacs25-p): New defun.
+	(tramp-test34-vc-registered): Use it.
+
+2018-06-27  Martin Rudalics  <rudalics@gmx.at>
+
+	* src/xdisp.c (Vmouse_autoselect_window): Clarify doc-string (Bug#31975)
+
+2018-06-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Detect a non-list package archive content properly (Bug#22311)
+
+	* lisp/emacs-lisp/package.el (package--download-one-archive): Use
+	`read' instead of `read-from-string'; the latter always returns a
+	cons, so the `listp' check on its return value doesn't make sense.  It
+	was changed from `read' to `read-from-string' in 2015-04-01 "*
+	emacs-lisp/package.el: Implement asynchronous refreshing", but that
+	change was not needed because `read' works fine on strings as well as
+	buffers.
+
+2018-06-25  Christophe Junke  <junke.christophe@gmail.com>  (tiny change)
+
+	Add ido-fallback special variable (Bug#31707)
+
+	Before ido.el switch to lexical-binding, it was possible for other
+	packages to modify the 'fallback' variables declared inside
+	'ido-file-internal' and 'ido-buffer-internal'.
+	* lisp/ido.el (ido-fallback): New variable.
+	(ido-buffer-internal, ido-file-internal): Reset ido-fallback to nil
+	before prompting user.  Use ido-fallback when ido-exit is 'fallback'.
+	(ido-fallback-command): Add optional FALLBACK-COMMAND argument.
+
+2018-06-25  Karl Fogel  <kfogel@red-bean.com>
+
+	Tighten a cross-reference in documentation
+
+	* doc/lispref/internals.texi (Writing Emacs Primitives): Switch to
+	  a simple parenthetical cross-reference, following up to my
+	  commit 9a53b6d426 of 2018-06-24.
+
+	See discussion:
+
+	  https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00826.html
+	  From: Eli Zaretskii
+	  Subject: Re: [Emacs-diffs] \
+	           emacs-26 9a53b6d: Say how to override a primitive interactive spec
+	  To: Karl Fogel
+	  CC: Stefan Monnier, Emacs Devel
+	  Date: Mon, 25 Jun 2018 17:41:53 +0300
+	  Message-Id: <83r2kvrkr2.fsf@gnu.org>
+
+2018-06-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix last change in tramp-sh.el
+
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-directly):
+	Use "-R" rather than "-r" for recursive copy of directories.
+
+2018-06-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Revert previous patch; comment was OK after all.
+
+2018-06-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix lead comment for count_trailing_zero_bits
+
+	* src/data.c (count_trailing_zero_bits): Fix comment to match code.
+
+2018-06-24  Noam Postavsky  <npostavs@gmail.com>
+
+	* lisp/emacs-lisp/regexp-opt.el (regexp-opt): Fix docstring quotes.
+
+2018-06-24  Simen Heggestøyl  <simenheg@gmail.com>
+
+	Make a minor update to the CSS mode docstring
+
+	* lisp/textmodes/css-mode.el (css-mode): Mention 'fill-paragraph'.
+
+2018-06-24  Karl Fogel  <kfogel@red-bean.com>
+
+	Say how to override a primitive interactive spec
+
+	* doc/lispref/internals.texi (Writing Emacs Primitives): Mention that
+	  the `interactive-form' property can be used to override a primitive
+	  interactive specification, and refer to the detailed documentation
+	  for setting that property.
+
+	From this thread on Emacs Devel:
+
+	  https://lists.gnu.org/archive/html/emacs-devel/2018-03/msg00923.html
+	  From: Eli Zaretskii
+	  To: Karl Fogel
+	  CC: Juri Linkov, Emacs Devel
+	  Subject: Re: [Emacs-diffs] \
+	           master b88e7c8: Make transpose-regions interactive (Bug#30343)
+	  Date: Thu, 29 Mar 2018 14:38:15 +0300
+	  Message-Id: <834lkzdsd4.fsf@gnu.org>
+
+2018-06-24  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31941
+
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file): In case of
+	FILENAME being a directory, check whether `copy-directory' could
+	be avoided.  Suggested by Stephen Nutt <stnutt@gmail.com>.  (Bug#31941)
+	(tramp-do-copy-or-rename-file-directly): Call "cp" with "-r".
+
+2018-06-23  Leo Liu  <sdl.web@gmail.com>
+
+	Fix previous change in minibuffer-default-add-dired-shell-commands
+
+	The mailcap minibuffer completion used dynamic binding.  Locally set
+	a dynamic variable.
+	* lisp/dired-aux.el (minibuffer-default-add-dired-shell-commands):
+	Store list of files in 'minibuffer-completion-table'.  (Bug#31794)
+
+2018-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/editfns.c (Fformat): Make %x easier to spot in doc string.  (Bug#31945)
+
+2018-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve responsiveness while in 'replace-buffer-contents'
+
+	* src/editfns.c (buffer_chars_equal): Avoid calling
+	buf_charpos_to_bytepos when the buffer is plain-ASCII.
+	Suggested by Milan Stanojević <mstanojevic@janestreet.com>.
+	Call maybe_quit to improve responsiveness.
+	(Freplace_buffer_contents): Call maybe_quit.  Warn in the doc
+	string that the function could be slow.  (Bug#31888)
+
+2018-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'server-start' and friends
+
+	* lisp/server.el (server-start, server-running-p): Document how to
+	reliably check that the current Emacs process started the server.
+	(Bug#31859)
+
+2018-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify wording about functions' argument lists
+
+	* doc/lispref/functions.texi (Argument List): Clarify the
+	wording.  (Bug#31872)
+
+2018-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/doc-view.el: Fix typos in the commentary.  (Bug#31937)
+
+2018-06-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix a typo in emacs-lisp-intro.texi
+
+	* doc/lispintro/emacs-lisp-intro.texi (kill-ring-yank-pointer):
+	Add a missing quote.  Reported by Jean-Christophe Helary
+	<brandelune@gmail.com> in emacs-devel.
+
+2018-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix doc typo: missing double-quote
+
+2018-06-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults in replace-buffer-contents with large buffers
+
+	* src/editfns.c (Freplace_buffer_contents): Don't release
+	malloc'ed memory as long as we are using it.  (Bug#31888)
+
+2018-06-22  Robert Pluim  <rpluim@gmail.com>
+
+	Adjust for scaling for mode-line popup menus (Bug#31880)
+
+	* src/xmenu.c (menu_position_func) [HAVE_GTK3]: Take scaling
+	into account when calculating screen size.
+
+2018-06-21  Simen Heggestøyl  <simenheg@gmail.com>
+
+	Change name of `seqp' argument (Bug#26411)
+
+	* lisp/emacs-lisp/seq.el (seqp): Change argument name.
+
+	* doc/lispref/sequences.texi: Update the documentation for seqp.
+
+2018-06-20  Noam Postavsky  <npostavs@gmail.com>
+
+	Change index of ";" to better reflect it's usage (Bug#31623)
+
+	* doc/lispref/objects.texi (Comments): "; for commenting" fits better
+	with the following text about how a semicolon begins a comment.  Also
+	mention that only unescaped semicolons start a comment.
+
+2018-06-20  Tak Kunihiro  <tkk@misasa.okayama-u.ac.jp>
+
+	Fix bug of 'mouse-drag-and-drop-region' to detect edges of region (Bug#31905)
+
+	* lisp/mouse.el (mouse-drag-and-drop-region): Detect both the
+	beginning and the end of character of region during dragging
+	text.
+
+2018-06-19  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix #'fun handling inside `labels' (Bug#31792)
+
+	* lisp/emacs-lisp/cl.el (labels): Apply the equivalent of the
+	cl-labels change from 2015-01-16 "* lisp/emacs-lisp/cl-macs.el: Fix
+	last change".
+	* test/lisp/emacs-lisp/cl-tests.el (labels-function-quoting): New
+	test.
+	* lisp/emacs-lisp/cl-macs.el (cl-flet, cl-labels): Improve docstring,
+	link to relevant manual page.
+	* doc/misc/cl.texi (Function Bindings): Don't imply that function
+	cells of symbols are modified by cl-flet.  Don't claim that cl-flet or
+	cl-labels affect references of the form (quote FUNC).
+
+2018-06-18  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix vertical-motion with 'visual' line-number display
+
+	* src/indent.c (Fvertical_motion): Don't exempt 'visual' sty;e of
+	line-number display from X coordinate adjustments.  (Bug#31875)
+
+2018-06-17  Alan Third  <alan@idiocy.org>
+
+	Handle NSAttributedString inputs (bug#29837)
+
+
+	* src/nsterm.m (EmacsView::insertText): Handle NSAttributedString.
+
+2018-06-17  Philipp Stephani  <phst@google.com>
+
+	Allow inserting non-BMP characters
+
+	* src/coding.h (UTF_16_HIGH_SURROGATE_P, UTF_16_LOW_SURROGATE_P): Move
+	from coding.c and document.
+	(surrogates_to_codepoint): New function.
+
+	* src/nsterm.m (insertText:): Properly handle surrogate pairs.
+
+	(cherry picked from commit 703ac3ea1c1ce381f385469a0e88bc29d3fe83c2)
+
+2018-06-17  Aaron Jensen  <aaronjensen@gmail.com>
+
+	Prevent errant scroll on mouse click (Bug#31546)
+
+	* src/nsterm.m (ns_mouse_position): Use correct frame when determining
+	  mouse position.
+	* lisp/mouse.el (mouse-drag-track): Only account for mode-line height
+	  if `mode-line-format' is non-nil.
+
+2018-06-17  Eli Zaretskii  <eliz@gnu.org>
+
+	Minor documentation fix
+
+	* doc/lispref/windows.texi (Window Start and End): Improve
+	documentation and indexing of window-end.
+
+2018-06-16  Eli Zaretskii  <eliz@gnu.org>
+
+	* lisp/window.el (window-toggle-side-windows): Doc fix.  (Bug#31858)
+
+2018-06-16  Paul Eggert  <eggert@Penguin.CS.UCLA.EDU>
+
+	Fix byte compilation of (eq foo 'default)
+
+	Backport from master.
+	Do not use the symbol ‘default’ as a special marker.
+	Instead, use a value that cannot appear in the program,
+	improving on a patch proposed by Robert Cochran (Bug#31718#14).
+	* lisp/emacs-lisp/bytecomp.el (byte-compile--default-val):
+	New constant.
+	(byte-compile-cond-jump-table-info)
+	(byte-compile-cond-jump-table): Use it instead of 'default.
+	* test/lisp/emacs-lisp/bytecomp-tests.el:
+	(byte-opt-testsuite-arith-data): Add a test for the bug.
+
+2018-06-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31846.  Do not merge with master
+
+	* lisp/net/secrets.el (secrets-search-items)
+	(secrets-create-item): Fix format of :dict-entry values.  (Bug#31846)
+
+2018-06-16  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix documentation of ':propertize' in mode-line-format
+
+	* doc/lispref/modes.texi (Mode Line Data): Make the description of
+	':propertize' more accurate.  (Bug#26291)
+
+2018-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Reject invalid 5-byte sequences when detecting UTF-8 encoding
+
+	* src/coding.c (detect_coding_utf_8): Reject multibyte sequences
+	whose leading byte is greater than MAX_MULTIBYTE_LEADING_CODE.
+	(Bug#31829)
+	* src/character.h (MAX_MULTIBYTE_LEADING_CODE): Add commentary
+	about the connection between the value of this macro and MAX_CHAR.
+
+2018-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'replace-buffer-contents' in multibyte buffers
+
+	* src/editfns.c (buffer_chars_equal): Pass a byte position to
+	BUF_FETCH_CHAR_AS_MULTIBYTE, not a character position.
+	(Bug#31837)
+
+	* test/src/editfns-tests.el (replace-buffer-contents-bug31837):
+	New test.
+
+2018-06-15  Robert Pluim  <rpluim@gmail.com>
+
+	Update etc/NEWS for mail-source-movemail-program change
+
+	* etc/NEWS: Describe change in how we search for
+	mail-source-movemail-program.
+
+2018-06-15  Robert Pluim  <rpluim@gmail.com>
+
+	Improve movemail default
+
+	* lisp/gnus/mail-source.el (mail-source-movemail-program):
+	Change default to "movemail".
+	(mail-source-movemail): Pass just mail-source-movemail-program to
+	call-process instead of fully specifying it relative to
+	exec-directory.  Ensures that we will find Mailutils movemail if
+	it is installed.  (Bug#31737)
+
+2018-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+	Delete description of deleted Customize functions
+
+	* doc/lispref/customize.texi (Variable Definitions): Remove the
+	description of 'custom-initialize-safe-set' and
+	'custom-initialize-safe-default', which were deleted in Emacs
+	23.2, and replace with the description of
+	'custom-initialize-delay'.
+
+2018-06-14  Noam Postavsky  <npostavs@gmail.com>
+
+	Keep vc-print-log from putting point at buffer end (Bug#31764)
+
+	* lisp/vc/vc.el (vc-print-log-internal): Use `save-excursion' around
+	`vc-print-log-setup-buttons'.
+
+2018-06-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don’t set EMACS=t if Bash is 4.4 or newer
+
+	(Backport from master.)
+	(Thanks to Stefan Monnier for improvements to this patch.)
+	* lisp/term.el (term--bash-needs-EMACS-status): New var.
+	(term--bash-needs-EMACSp): New function.
+	(term-exec-1): Use it instead of always setting EMACS.
+
+2018-06-14  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in info.el
+
+	* lisp/info.el: Explain in commentary why some commands start with
+	"info-" and others with "Info-".  See also
+	http://lists.gnu.org/archive/html/emacs-devel/2017-11/msg00482.html.
+
+2018-06-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix wording in tramp.texi
+
+	* doc/misc/tramp.texi (Frequently Asked Questions):
+	Fix wording for abbreviations.
+
+2018-06-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Remote shell setup): Fix typo.
+
+2018-06-12  Sam Steingold  <sds@gnu.org>
+
+	Finish the Bug#11728 work: hg & git
+
+	* lisp/vc/vc-git.el (vc-git--pushpull): Make `extra-args' a list.
+	Do not set `compilation-error-regexp-alist', this is done in
+	`vc-compilation-mode'.
+	(vc-git-error-regexp-alist): Tweak the regexp.
+	* lisp/vc/vc-hg.el (vc-hg-error-regexp-alist): Make non-trivial.
+	(vc-hg--pushpull): Accept `post-processing' argument.
+	Call them after the `command'.
+	(vc-hg-pull): Pass the `post-processing' commands that show which
+	are to be modified by the `update', and then run `update'.
+
+2018-06-12  Sam Steingold  <sds@gnu.org>
+
+	Fix Bug#11728: show files updated by git
+
+	* lisp/vc/vc-git.el (vc-git--pushpull): Accept extra-args and set
+	`compilation-error-regexp-alist' to `vc-git-error-regexp-alist'.
+	(vc-git-pull): Pass "--stat" as `extra-args' to `vc-git--pushpull'.
+	(vc-git-push): Pass "" as `extra-args' to `vc-git--pushpull'.
+
+2018-06-12  Noam Postavsky  <npostavs@gmail.com>
+
+	Make 'tags' targets respect --with-silent-rules (Bug#31744)
+
+	* lwlib/Makefile.in (TAGS):
+	* lisp/Makefile.in (TAGS):
+	* src/Makefile.in (TAGS): Use AM_V_GEN and AM_V_at.
+	* src/Makefile.in: Note that TAGS are generated in build dir.
+
+2018-06-11  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+	    Noam Postavsky  <npostavs@gmail.com>
+
+	soap-client: Add byte-code compatibility function (Bug#31742)
+
+	* lisp/net/soap-client.el: Bump version to 3.1.4.
+	(soap-type-of): New function.
+	(soap-resolve-references, soap-decode-type)
+	(soap-encode-attributes, soap-encode-value): Replace aref
+	calls with calls to soap-type-of.
+
+	* lisp/net/soap-inspect.el (soap-sample-value, soap-inspect):
+	Replace aref calls with calls to soap-type-of.
+
+
+	Backport: (cherry picked from commit
+	1feb2e221349f26ec26bc684e0cce2acecbed3ca)
+
+2018-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/lispref/files.texi (Unique File Names): Fix a typo.  (Bug#31784)
+
+2018-06-10  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix term.el cursor movement at bottom margin (Bug#31690)
+
+	* lisp/term.el (term-handle-ansi-escape) <\E[B cud>: Allow moving the
+	cursor to the bottom margin line, rather than stopping one line
+	before.
+
+2018-06-10  Reuben Thomas  <rrt@sc3d.org>
+
+	Call enchant-lsmod correctly when Enchant is installed with a suffix
+
+	* lisp/textmodes/ispell.el (ispell--call-enchant-lsmod): Cope with a
+	version suffix on the binary name, so enchant-2 is converted to
+	enchant-lsmod-2, not enchant-2-lsmod.  (Bug#31761)
+
+	(cherry picked from commit a402d9aacbecf4bf0b9afde592a3b90c71f96832)
+
+2018-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Enlarge DUMPED_HEAP_SIZE for 64-bit Windows builds
+
+	* src/w32heap.c (DUMPED_HEAP_SIZE): Bump to 23MB.  Reported by
+	Andy Moreton <andrewjmoreton@gmail.com>.
+
+2018-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Unicode data files to version 11.0.0 of Unicode
+
+	* admin/unidata/UnicodeData.txt:
+	* admin/unidata/SpecialCasing.txt:
+	* admin/unidata/NormalizationTest.txt:
+	* admin/unidata/copyright.html:
+	* admin/unidata/BidiMirroring.txt:
+	* admin/unidata/BidiBrackets.txt: Import from Unicode 11.0.
+	* admin/notes/unicode: Update the URL for OTF script tags.
+
+	* lisp/international/mule-cmds.el (ucs-names): Update unused ranges.
+	* lisp/international/fontset.el (script-representative-chars): Add
+	hanifi-rohingya, old-sogdian, sogdian, dogra, gunjala-gondi,
+	makasar, and medefaidrin.
+	(otf-script-alist): Add old-hungarian.
+	* lisp/international/characters.el (tbl): Add syntax entries for
+	Supplemental Mathematical Operators, Miscellaneous Symbols and
+	Arrows, and Supplemental Punctuation.
+	Update the list of wide characters.
+
+	* test/lisp/international/ucs-normalize-tests.el
+	(ucs-normalize-tests--failing-lines-part2): Update to match
+	admin/unidata/NormalizationTest.txt.
+
+	* doc/lispref/nonascii.texi (Character Properties): Update the
+	reference to the Unicode Standard.
+	* doc/misc/efaq.texi (New in Emacs 26):
+	* etc/NEWS: Mention compatibility with Unicode 11.0.
+
+2018-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* etc/NEWS: Belatedly call out vc-hg changes in v26.1.  (Bug#31759)
+
+2018-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify the documentation of 'dired-recursive-deletes'
+
+	* doc/emacs/dired.texi (Dired Deletion): Clarify text regarding
+	recursive deletion of non-empty directories.  (Bug#31529)
+
+2018-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify doc string of 'update-glyphless-char-display'
+
+	* lisp/international/characters.el
+	(update-glyphless-char-display): Doc fix.  (Bug#31730)
+
+2018-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify subtle issues with 'eq' in byte-compiled code
+
+	* doc/lispref/objects.texi (Equality Predicates): Explain why
+	byte-compiled code might compare literal objects with identical
+	contents as 'eq'.  (Bug#31688)
+
+2018-06-07  Gemini Lasswell  <gazally@runbox.com>
+
+	Make cl-print respect print-quoted (bug#31649)
+
+	* lisp/emacs-lisp/cl-print.el (cl-print-object) <cons>: Observe
+	print-quoted when printing quote and its relatives.  Add printing of
+	'function' as #'.
+
+2018-06-07  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix unexpected jumps of window-point in 'set-window-configuration' (Bug#31695)
+
+	* src/window.c (Fset_window_configuration): Prevent that the
+	fix for Bug#12208 affects restoration of window points when
+	using separate minibuffer frames (Bug#31695).
+
+2018-06-06  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/emacs.appdata.xml: Update Emacs screenshot.
+
+2018-06-06  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix cursor movement by 'next-logical-line' after 'next-line'
+
+	* src/indent.c (Fvertical_motion): Adjust TO_X when line-numbers
+	are being displayed.  Remove unneeded "correction" of TO_X at the
+	goal line.
+
+	* lisp/simple.el (last--line-number-width): Remove unneeded
+	variable.
+	(line-move-visual): Account for line-number display width by
+	adjusting the pixel X coordinate that gets converted into
+	canonical columns passed to vertical-motion, instead of adjusting
+	temporary-goal-column (which then affects next commands, including
+	next-logical-line).  (Bug#31723)
+
+2018-06-05  Allen Li  <darkfeline@felesatra.moe>
+
+	Fix prompt in bookmark.el (Bug#24726)
+
+	* lisp/bookmark.el (bookmark-set-internal): Conform to the standard
+	default prompt format (per `minibuffer-electric-default-mode') which
+	does not use a colon.
+
+2018-06-05  Basil L. Contovounesios  <contovob@tcd.ie>
+
+	Improve documentation of 'empty' whitespace-style
+
+	* doc/emacs/display.texi (Useless Whitespace): Clarify that the
+	'empty' whitespace-style option highlights empty lines only at
+	BOB/EOB, as per the docstring of whitespace-style. (bug#31713)
+
+2018-06-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Port FC_COLOR change to older fontconfig
+
+	Problem reported by John ff in:
+	https://lists.gnu.org/r/emacs-devel/2018-04/msg00058.html
+	* src/ftfont.c (ftfont_spec_pattern) [!FC_COLOR]:
+	Don’t use FC_COLOR on older fontconfigs that don’t have it.
+
+2018-06-05  Robert Pluim  <rpluim@gmail.com>
+
+	Ignore color fonts when using Xft
+
+	* src/font.c (syms_of_font): New configuration variable
+	xft-ignore-color-fonts, default t.
+	* src/ftfont.c (ftfont_spec_pattern): Tell fontconfig to ignore
+	color fonts if xft-ignore-color-fonts is t.  (Bug#30874, Bug#30045)
+	* etc/NEWS: Document xft-ignore-color-fonts.
+
+2018-06-04  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix comint-get-old-input-default for output field case (Bug#25028)
+
+	* lisp/comint.el (comint-get-old-input-default): Don't return whole
+	field when point was on an output field.
+
+2018-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+	Prevent infloop in 'delete-trailing-whitespace'
+
+	* lisp/simple.el (delete-trailing-whitespace): Avoid inflooping
+	when some region of trailing whitespace is unmodifiable.
+	(Bug#31557)
+
+2018-06-04  Gemini Lasswell  <gazally@runbox.com>
+
+	Make cl-print respect print-level and print-length (bug#31559)
+
+	* lisp/emacs-lisp/cl-print.el (cl-print--depth): New variable.
+	(cl-print-object) <cons>: Print ellipsis if printing depth greater
+	than 'print-level' or length of list greater than 'print-length'.
+	(cl-print-object) <vector>: Truncate printing with ellipsis if
+	vector is longer than 'print-length'.
+	(cl-print-object) <cl-structure-object>: Truncate printing with
+	ellipsis if structure has more slots than 'print-length'.
+	(cl-print-object) <:around>: Bind 'cl-print--depth'.
+	* test/lisp/emacs-lisp/cl-print-tests.el
+	(cl-print-tests-3, cl-print-tests-4): New tests.
+
+	(cherry picked from commit 0f48d18fd2a30f29cc3592a835d2a2254c9b0afb)
+
+2018-06-03  Phil Sainty  <psainty@orcon.net.nz>
+
+	Fix remote-host directory tracking for shells in `term' buffers
+
+	* lisp/term.el (term-handle-ansi-terminal-messages): Use an explicit
+	tramp method when constructing the tramp path for a non-local host,
+	as this is now mandatory.  "-" is a pseudo-method for the user's
+	`tramp-default-method'.  (Bug#31355)
+
+	Specify the remote username explicitly in all cases, as
+	`tramp-default-user' and `tramp-default-user-alist' could cause the
+	previous logic to fail.
+
+	Minor related improvements to the commentary.
+
+2018-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+	Update doc string of 'rx'
+
+	* lisp/emacs-lisp/rx.el (rx): Update the description of some
+	character classes.
+
+2018-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fix bug#30846, along with misc cleanups found along the way
+
+	* test/src/data-tests.el (data-tests-kill-all-local-variables): New test.
+
+	* src/buffer.c (swap_out_buffer_local_variables): Remove.
+	Fuse the body of its loop into that of reset_buffer_local_variables.
+	(Fkill_buffer, Fkill_all_local_variables): Don't call it any more.
+	(reset_buffer_local_variables): Make sure the buffer's local binding
+	is swapped out before removing it from the alist (bug#30846).
+	Call watchers before actually killing the var.
+
+	* src/data.c (Fmake_local_variable): Simplify.
+	Use swap_in_global_binding to swap out any local binding, instead of
+	a mix of find_symbol_value followed by messing with where&found.
+	Don't call swap_in_symval_forwarding since the currently swapped
+	binding is never one we've modified.
+	(Fkill_local_variable): Use swap_in_global_binding rather than messing
+	with where&found to try and trick find_symbol_value into doing the same.
+
+	* src/alloc.c (mark_localized_symbol): 'where' can't be a frame any more.
+
+	(cherry picked from commit 3ddff080341580eb6fc18d907181e9cc2301f62d)
+
+2018-06-03  Jay Kamat  <jaygkamat@gmail.com>
+
+	esh-opt.el: Fix improper parsing of first argument (Bug#28323)
+
+	Examples of broken behavior:
+
+	    sudo -u root whoami
+	    Outputs: -u
+	    ls -I '*.txt' /dev/null
+	    Errors with: *.txt: No such file or directory
+
+	* lisp/eshell/esh-opt.el (eshell--process-args): Refactor usage of
+	args to eshell--args, as we rely on modifications from
+	eshell--process-option and vice versa.  These modifications were not
+	being propogated in the (if (= ai 0)) case, since popping the first
+	element of a list doesn't destructively modify the underlying list
+	object.
+
+	(cherry picked from commit 92a8230e49a65be48442ee95cf50c90514e48f99)
+
+2018-06-03  Noam Postavsky  <npostavs@gmail.com>
+
+	* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
+
+	(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)
+
+2018-06-03  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix cl-print for circular sublists (Bug#31146)
+
+	* lisp/emacs-lisp/cl-print.el (cl-print-object) <cons>: Push each
+	element of list being printed onto cl-print--currently-printing.
+	* test/lisp/emacs-lisp/cl-print-tests.el (cl-print-circle-2): New
+	test.
+
+	(cherry picked from commit b8aa7ecf54c9b164a59f1b0e9f9fe90531dadd20)
+
+2018-06-03  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	Revert "Make mail-extract-address-components return the user name more"
+
+	This reverts commit 8b50ae8b2284b5652c2843a9d0d076f4f657be28.
+
+	According to tests in bug#27656 by OGAWA Hirofumi, this patch
+	led to wrong results when binding
+
+	(dolist (addr '("Rasmus <rasmus@gmx.us>" "Rasmus <mbox@gmx.us>"))
+	  (dolist (ignore-single '(t nil))
+	    (dolist (ignore-same '(t nil))
+	      (let ((mail-extr-ignore-single-names ignore-single)
+		    (mail-extr-ignore-realname-equals-mailbox-name ignore-same))
+		(message "%s" (mail-extract-address-components addr))))))
+
+	in combination.
+
+	(cherry picked from commit a3a9d5434d56f8736cc47e379a1d011d4c779b7c)
+
+2018-06-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Centralize Bug#30931 fix
+
+	* src/marker.c (detach_marker): New function.
+	* src/editfns.c (save_restriction_restore):
+	* src/insdel.c (signal_before_change): Use it.
+
+	(cherry picked from commit 6f66a43d7ad6cada2b7dbb6d07efe36be1dc7ecb)
+
+2018-06-03  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix another case of freed markers in the undo-list (Bug#30931)
+
+	* src/alloc.c (free_marker): Remove.
+	* src/editfns.c (save_restriction_restore):
+	* src/insdel.c (signal_before_change): Detach the markers from the
+	buffer when we're done with them instead of calling free_marker on
+	them.
+	* test/src/editfns-tests.el (delete-region-undo-markers-1)
+	(delete-region-undo-markers-2): New tests.
+
+	(cherry picked from commit 96b8747d5c5d747af13fd84d8fe0308ef2a0ea7a)
+
+2018-06-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix CHECK_ALLOCATED_AND_LIVE abort during GC
+
+	* src/editfns.c (save_restriction_restore):
+	Wait for the GC to free the temporary markers (Bug#30931).
+
+	(cherry picked from commit 670f2ffae718046c0fb37313965a51c040ed096f)
+
+2018-06-03  Noam Postavsky  <npostavs@gmail.com>
+
+	Don't wait for visible frames to become visible
+
+	For discussion, see thread starting at
+	https://lists.gnu.org/archive/html/emacs-devel/2018-03/msg00807.html.
+	* src/xterm.c (x_make_frame_visible): Check FRAME_VISIBLE_P before
+	calling x_wait_for_event.
+
+	(cherry picked from commits 2a192e21cf3b04b7f830b4971c1508c611e13a3c
+	and 00c1f771f2a51ffa675ec5a07ea330f2605cd302)
+
+2018-06-03  Tino Calancha  <tino.calancha@gmail.com>
+
+	query-replace undo: Handle when user edits the replacement string
+
+	* lisp/replace.el (perform-replace): Update the replacement string
+	after the user edit it (Fix Bug#31538).
+
+	* test/lisp/replace-tests.el (query-replace-undo-bug31538): New test.
+
+	Backport: (cherry picked from commits
+	ea133e04f49afa7928e49a3ac4a85b47f6f13f01
+	and
+	7dcfdf5b14325ae7996f272f14c72810d7c84944)
+
+2018-06-03  Tino Calancha  <tino.calancha@gmail.com>
+
+	Backport: Fix corner case in query-replace-regexp undo
+
+	This commit fixes Bug#31492.
+	* lisp/replace.el (replace-match-maybe-edit): Preserve match data.
+
+	* test/lisp/replace-tests.el (query-replace-undo-bug31492): Add test.
+
+	(cherry picked from commit bab73230d1be1fe394b7269c1365ef6fb1a5d9b3)
+
+2018-06-03  Tino Calancha  <tino.calancha@gmail.com>
+
+	Backport: Preserve case in query-replace undo
+
+	If the user query and replaces 'foo' with 'BAR', then
+	undo must comeback to 'foo', not to 'FOO' (Bug#31073).
+	* lisp/replace.el (perform-replace): Bind nocasify to non-nil
+	value during undo/undo-all actions.
+	* test/lisp/replace-tests.el (query-replace-undo-bug31073): Add test.
+
+	(cherry picked from commit 32dc0cb1b5ae895d237c7118ccaeb084715934fd)
+
+2018-06-02  Alan Third  <alan@idiocy.org>
+
+	Set accessibility subroles for child frame (bug#31324)
+
+
+	* src/nsterm.m (x_set_parent_frame): Set subrole depending on whether
+	frame is a child or not.
+
+2018-06-02  Alan Third  <alan@idiocy.org>
+
+	Fix redefinition of child frames on NS
+
+	* src/nsterm.m (x_set_parent_frame): If the NSWindow has an existing
+	parent frame, remove it.
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve ELisp documentation of 'clone-indirect-buffer'
+
+	* doc/lispref/buffers.texi (Indirect Buffers): Be more explicit
+	about the value of DISPLAY-FLAG in interactive usage.  (Bug#31648)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'inhibit-message'
+
+	* src/xdisp.c (syms_of_xdisp) <inhibit-message>: Warn against
+	setting it non-nil globally.  (Bug#31627)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of comment styles
+
+	* doc/lispref/syntax.texi (Syntax Flags): Define the "a" style.
+	(Bug#31624)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Documentation improvements in newcomment.el
+
+	* lisp/newcomment.el (uncomment-region)
+	(uncomment-region-default): Doc fixes.  (Bug#31615)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Imp[rove documentation of 'with-silent-modifications'
+
+	* doc/lispref/buffers.texi (Buffer Modification): Document
+	'with-silent-modifications'.  (Bug#31613)
+	* doc/lispref/text.texi (Changing Properties): Add a
+	cross-reference to "Buffer Modification".  Improve wording.
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix decoding of directories when "~" includes non-ASCII chars
+
+	* src/fileio.c (Fexpand_file_name): Don't build multibyte strings
+	from unibyte non-ASCII strings when NAME and DEFAULT_DIRECTORY
+	have different multibyteness, as this adds bytes to the byte
+	sequence, and in some situations, e.g., when the home directory
+	includes non-ASCII characters, can fail file APIs.  (Bug#30755)
+
+	* lisp/startup.el (normal-top-level): Make sure default-directory
+	is set to a multibyte string when decoded on MS-Windows.
+
+	(cherry picked from commit 3aab8626ba5080bb04d0fdae52d99c850a842a52)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Don't remove highlight of misspelled word on pdict save
+
+	* lisp/textmodes/ispell.el (ispell-pdict-save): Don't restart
+	flyspell-mode, as bug#11963, which this was supposed to fix, is
+	fixed better by ispell-command-loop, when the user types 'i' or
+	'a'.  Restarting Flyspell mode when the personal dictionary is
+	saved caused bug#31372 as side effect.
+	(ispell-command-loop): Test 'flyspell-mode', not whether
+	flyspell-unhighlight-at is fboundp, to determine whether Flyspell
+	mode is turned on in the current buffer.
+	(flyspell-unhighlight-at): Add declare-function form for it.
+
+	(cherry picked from commit 91e582a31ada28fab5ae55bdbf959a9d30796587)
+
+2018-06-02  Ari Roponen  <ari.roponen@gmail.com>
+
+	Fix some problems in the Cairo build
+
+	* src/xterm.c (x_begin_cr_clip): Create image surface.
+	(x_update_end) [USE_CAIRO]: Remove GTK3-specific code.
+	(x_scroll_run) [USE_CAIRO]: Implement scrolling.
+	* src/image.c (lookup_rgb_color) [USE_CAIRO]: Support Cairo.
+	(jpeg_load_body) [USE_CAIRO]: Support Cairo.  Use USE_CAIRO
+	instead of CAIRO for #ifdef's.
+	(imagemagick_load_image) [USE_CAIRO]: Support Cairo.
+	(Bug#31288)
+
+	(cherry picked from commit 2d0eff42b8f1122e00f948759ed01a3be1a8c3fc)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid infloops in font_open_entity
+
+	* src/font.c (font_open_entity): Fail after 15 iterations through
+	the loop that looks for a font whose average_width and height are
+	both positive.  This avoids infinite loops for fonts that, e.g.,
+	report average_width of zero for any possible size we try.
+	(Bug#31316)
+
+	(cherry picked from commit e2879c1f837059335af89022b2a9ac9bc861e96d)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix encoding of characters when using GB18030 fonts
+
+	* lisp/international/fontset.el (font-encoding-alist): Fix the
+	GB18030 entry to encode characters correctly when passing them to
+	the xfont back-end.  (Bug#31315)  See also
+	http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00754.html.
+
+	(cherry picked from commit bbe2cadc544e63e9378350621887f8fb9bbcc236)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix C-p and C-n when wrap-prefix is too wide
+
+	* src/xdisp.c (move_it_in_display_line_to): Avoid looping in
+	previous/next-line when wrap-prefix is set to a too-wide
+	stretch of whitespace.  (Bug#30432)
+
+	(cherry picked from commit 842b3d7412eaed6b2c9f90c3361abb4932ec0b1d)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid redisplay problems with too wide wrap-prefix
+
+	* src/xdisp.c (display_line): Avoid looping in redisplay when
+	wrap-prefix is set to a too-wide stretch of whitespace.
+	(Bug#30432)
+
+	(cherry picked from commit 2a1fe08307402d6217d073f8ab7737750d253dd4)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'posn-at-point' when line numbers are displayed
+
+	* src/xdisp.c (pos_visible_p): For the leftmost glyph, adjust the X
+	coordinate due to line-number display.  (Bug#30834)
+
+	(cherry picked from commit 4a20174d7949028f66b18a92a75d6b74194242a8)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Another followup to fixing 'window-text-pixel-width'
+
+	* src/xdisp.c (Fwindow_text_pixel_size): Adjust the return value
+	when we stop one buffer position short of TO.  (Bug#30746)
+
+	(cherry picked from commit 33cba5405c724566673cf023513bfb1faa963bea)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix mouse-set-point when line numbers are displayed
+
+	* src/xdisp.c (move_it_to): Initialize the line_number_produced_p
+	flag before iterating on a new line.  (Bug#30818)
+
+	(cherry picked from commit 5c585b8b994aad4e6844f8eed80bdfbb396e91bf)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/xdisp.c (Fwindow_text_pixel_size): Fix last change.
+
+	(cherry picked from commit 06911714ef66ea81380b1eda75a9f7cfbc9e0b65)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix 'window-text-pixel-size' when display properties are around
+
+	* src/xdisp.c (Fwindow_text_pixel_size): Correct the result when
+	there's a display property at the  TO position, and the call to
+	move_it_to overshoots.  (Bug#30746)
+
+	(cherry picked from commit 50e2c0fb5180a757d8d533518f68837ffe5909be)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix display of TABs in hscrolled windows with line numbers
+
+	* src/dispextern.h (struct it): New members tab_offset and
+	line_number_produced_p.
+	* src/xdisp.c (display_line): Don't set row->x to a negative value
+	if line numbers are being displayed.  (Bug#30582)
+	Reset the line_number_produced_p flag before laying out the glyph
+	row.
+	(x_produce_glyphs): Use the line_number_produced_p flag to decide
+	whether to offset the X coordinate due to line-number display.
+	Use the tab_offset member to restore the original TAB width for
+	alignment purposes.
+	(move_it_in_display_line_to): Don't produce line numbers when moving
+	in hscrolled window to the left of first_visible_x.
+	(maybe_produce_line_number): Set the line_number_produced_p flag.
+	(Bug#30584)
+	* src/term.c (produce_glyphs): Correct TAB width only when
+	line_number_produced_p flag is set.
+
+	(cherry picked from commit 1ac190553886ff20817d3dd218464e2fc6f9e42a)
+
+2018-06-02  Matthias Dahl  <matthias.dahl@binary-island.eu>
+
+	Fix wait_reading_process_output wait_proc hang
+
+	* src/process.c (read_process_output): Track bytes read from
+	a process.
+	(wait_reading_process_output): If called recursively through
+	timers and/or process filters via accept-process-output, it is
+	possible that the output of wait_proc has already been read by
+	one of those recursive calls, leaving the original call hanging
+	forever if no further output arrives through that fd and no
+	timeout has been set.  Fix that by using the process read
+	accounting to keep track of how many bytes have been read and
+	use that as a condition to break out of the infinite loop and
+	return to the caller as well as to calculate the proper return
+	value (if a wait_proc is given that is).
+
+	* src/process.h (struct Lisp_Process): Add nbytes_read to track
+	bytes read from a process.
+
+	(cherry picked from commit 4ba32858d61eee16f17b51aca01c15211a0912f8)
+
+2018-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix posn-at-point in Flycheck buffers
+
+	* src/dispnew.c (buffer_posn_from_coords): Improve commentary.
+
+	* src/xdisp.c (move_it_in_display_line_to): Don't exit the loop
+	under truncate-lines if the glyph at TO_CHARPOS was not yet
+	produced.  This avoids bailing out too early when we are at
+	TO_CHARPOS, but didn't yet produce glyphs for that buffer
+	position, because the last call to PRODUCE_GLYPHS at this position
+	was for an object other than the buffer.  For further details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00537.html.
+
+	(cherry picked from commit c0154ac7c3423f68d8f3a2e85a756c9759219039)
+
+2018-06-02  Martin Rudalics  <rudalics@gmx.at>
+
+	* etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31650)
+
+2018-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Emacs Lisp Intro to match current behavior
+
+	* doc/lispintro/emacs-lisp-intro.texi (Wrong Type of Argument)
+	(debug, debug-on-entry, Void Function, Void Variable): Update the
+	*Backtrace* buffer display to current Emacs.  (Bug#31654)
+
+2018-06-01  Robert Pluim  <rpluim@gmail.com>
+
+	Fix previous commit
+
+	* doc/emacs/files.texi (Interlocking): Two spaces at end of sentence
+
+2018-06-01  Ville Skyttä  <ville.skytta@iki.fi>  (tiny change)
+
+	Fix typos in several manuals (Bug#31610)
+
+2018-06-01  Robert Pluim  <rpluim@gmail.com>
+
+	Add detailed documentation about lock files
+
+	* doc/emacs/files.texi (Interlocking): Point user at detailed
+	file locking description in lisp reference manual.  Add index
+	entry for '.#' to improve disoverability of information about locking.
+
+	* doc/lispref/files.texi (File Locks): Describe in detail what
+	the form of the lock file is.  Add index entry for '.#' to
+	improve disoverability of information about locking.
+
+	* src/filelock.c (create-lockfiles): Add cross reference to
+	file locking in user manual and to 'lock-buffer'.  Add string
+	'.#' to help users find the doc string.
+
+2018-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Add commentary for subtle aspect of frame.el
+
+	* lisp/frame.el: Explain why we use symbol-function when adding
+	watchers for certain variables that need to trigger redisplay.
+
+2018-06-01  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve documentation of 'directory-files-and-attributes'
+
+	* doc/lispref/files.texi (Contents of Directories): Fix inaccurate
+	description of the return value of directory-files-and-attributes.
+
+	* src/dired.c (Fdirectory_files_and_attributes): Describe the
+	function's value in more detail.
+
+2018-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/gnus/message.el (message-remove-header): Don't remove things
+	not looking like header (bug#31651).
+
+2018-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+	Adapt hexl-mode to native line-number display
+
+	* lisp/hexl.el (hexl-mode-ruler): When display-line-numbers is in
+	effect, adjust offsets and columns to account for the line-number
+	display.  (Bug#31595)
+
+2018-05-30  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix example in Tramp manual
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Fix wording
+	for the zsh example.
+
+2018-05-29  Robert Pluim  <rpluim@gmail.com>
+
+	Handle case where Xft is found but not XRender
+
+	* configure.ac (XFT_LIBS): Ensure that HAVE_XFT is no if
+	XRender is not found.  (Bug#31634)
+
+2018-05-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh example.
+
+2018-05-29  Damien Cassou  <damien@cassou.me>
+
+	Improve read-multiple-choice docstring (Bug#31628)
+
+	* lisp/emacs-lisp/rmc.el (read-multiple-choice): Improve docstring.
+
+2018-05-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	* doc/misc/tramp.texi (All): Use @code instead of @option for user options.
+
+2018-05-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Fix Bug#31605
+
+	* doc/misc/tramp.texi (All): Add @vindex entries for
+	environment variables.
+	(Remote shell setup): New items `tramp-terminal-type' and
+	"Determining a Tramp session".
+	(Frequently Asked Questions): Adapt zsh example.  (Bug#31605)
+
+2018-05-29  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.3.4-pre
+
+	* doc/misc/trampver.texi: Change version to "2.3.4-pre
+
+	* lisp/net/tramp.el (tramp-mode, tramp-verbose)
+	(tramp-backup-directory-alist, tramp-auto-save-directory)
+	(tramp-encoding-shell, tramp-encoding-command-switch)
+	(tramp-encoding-command-interactive, tramp-default-method)
+	(tramp-default-method-alist, tramp-default-user)
+	(tramp-default-user-alist, tramp-default-host)
+	(tramp-default-host-alist, tramp-default-proxies-alist)
+	(tramp-save-ad-hoc-proxies, tramp-restricted-shell-hosts-alist)
+	(tramp-local-end-of-line, tramp-rsh-end-of-line)
+	(tramp-login-prompt-regexp, tramp-shell-prompt-pattern)
+	(tramp-password-prompt-regexp, tramp-wrong-passwd-regexp)
+	(tramp-yesno-prompt-regexp, tramp-yn-prompt-regexp)
+	(tramp-terminal-prompt-regexp)
+	(tramp-operation-not-permitted-regexp, tramp-copy-failed-regexp)
+	(tramp-process-alive-regexp, tramp-chunksize)
+	(tramp-process-connection-type, tramp-connection-timeout)
+	(tramp-connection-min-time-diff)
+	(tramp-completion-reread-directory-timeout):
+	* lisp/net/tramp-adb.el (tramp-adb-program)
+	(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
+	* lisp/net/tramp-cache.el (tramp-connection-properties)
+	(tramp-persistency-file-name):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-methods)
+	(tramp-gvfs-zeroconf-domain, tramp-bluez-discover-devices-timeout):
+	* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
+	(tramp-copy-size-limit, tramp-terminal-type)
+	(tramp-histfile-override, tramp-use-ssh-controlmaster-options)
+	(tramp-remote-path, tramp-remote-process-environment)
+	(tramp-sh-extra-args):
+	* lisp/net/tramp-smb.el (tramp-smb-program, tramp-smb-acl-program)
+	(tramp-smb-conf, tramp-smb-winexe-program)
+	(tramp-smb-winexe-shell-command)
+	(tramp-smb-winexe-shell-command-switch):
+	Dont't require 'tramp.  (Bug#31558)
+
+	* lisp/net/tramp.el (tramp-accept-process-output):
+	* lisp/net/tramp-adb.el (tramp-adb-handle-start-file-process):
+	* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-sh-handle-start-file-process):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
+	(tramp-smb-handle-file-acl, tramp-smb-handle-process-file)
+	(tramp-smb-handle-set-file-acl)
+	(tramp-smb-handle-start-file-process): Suppress timers.
+
+	* lisp/net/tramp-adb.el (tramp-adb-handle-write-region):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-write-region):
+	* lisp/net/tramp-smb.el (tramp-smb-handle-write-region):
+	Write proper message.
+
+	* lisp/net/tramp-cmds.el (tramp-change-syntax):
+	Use `customize-set-variable'.
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Ensure proper EOL handling for Darwin.
+	(tramp-find-inline-compress): Improve command quoting for w32.
+	Reported by Chris Zheng <chriszheng99@gmail.com>.
+	(tramp-open-connection-setup-interactive-shell): Wrap both echo
+	calls in parentheses, in order to avoid double prompt.
+
+	* lisp/net/tramp-smb.el (tramp-smb-errors):
+	Add "NT_STATUS_RESOURCE_NAME_NOT_FOUND".
+
+	* lisp/net/tramp.el (tramp-default-user-alist)
+	(tramp-default-host-alist): Fix docstring.
+	(tramp-dissect-file-name): Adapt docstring.  (Bug#30904)
+	(tramp-make-tramp-file-name): Check, that method is
+	not empty.  (Bug#30038)
+	(tramp-message-show-message): Change default.
+
+	* lisp/net/trampver.el: Change version to "2.3.4-pre".
+
+	* test/lisp/net/tramp-tests.el (ert-x): Require it.
+	(tramp-test10-write-region): Extend test.
+	(tramp--test-emacs27-p, tramp--test-windows-nt): New defuns.
+	(tramp-test11-copy-file, tramp-test12-rename-file)
+	(tramp-test21-file-links, tramp-test24-file-acl)
+	(tramp-test25-file-selinux, tramp--test-check-files): Use them.
+	(tramp-test21-file-links): Do not call `make-symbolic-link' on w32.
+	Fix file name quoting test.
+	(tramp-test32-environment-variables-and-port-numbers):
+	Adapt check for systems which do not support "echo -n".  (Bug#29712)
+	(tramp-test36-find-backup-file-name): Call also
+	`convert-standard-filename' due to w32.
+	(tramp-test41-asynchronous-requests):
+	Use $REMOTE_PARALLEL_PROCESSES.  Flush cache prior file operations.
+	(tramp-test42-auto-load, tramp-test42-delay-load)
+	(tramp-test42-recursive-load, tramp-test42-remote-load-path):
+	Quote command due to w32.
+
+2018-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+	Bump Emacs version to 26.1.50
+
+	* msdos/sed2v2.inp:
+	* nt/README.W32:
+	* configure.ac:
+	* README: Bump Emacs version to 26.1.50.
+
+2018-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	Mention pcase as a fifth conditional form
+
+	* doc/lispref/control.texi (Conditionals): ...here,
+	in first para, w/ xref to "Pattern-Matching Conditional".
+
+2018-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	Overhaul pcase documentation
+
+	Suggested by Drew Adams (Bug#31311).
+
+	* doc/lispref/control.texi (Control Structures):
+	Add "Pattern-Matching Conditional" to menu, before "Iteration".
+	(Conditionals): Delete menu.
+	(Pattern matching case statement): Delete node/subsection,
+	by actually moving, renaming, and overhauling it to...
+	(Pattern-Matching Conditional): ...new node/section.
+	(pcase Macro): New node/subsection.
+	(Extending pcase): Likewise.
+	(Backquote Patterns): Likewise.
+	* doc/lispref/elisp.texi (Top) In @detailmenu, add
+	"Pattern-Matching Conditional" under "Control Structures"
+	section and delete "Conditionals" section.
+	* lisp/emacs-lisp/pcase.el (pcase): Rewrite docstring.
+	(pcase-defmacro \` (qpat) ...): Likewise.
+
+2018-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	Use EXPVAL in docstrings of patterns defined using pcase-defmacro
+
+	Suggested by Drew Adams (Bug#31311).
+
+	* lisp/emacs-lisp/cl-macs.el (cl-struct): ...here.
+	* lisp/emacs-lisp/eieio.el (eieio): Likewise.
+	* lisp/emacs-lisp/radix-tree.el (radix-tree-leaf): Likewise.
+	* lisp/emacs-lisp/rx.el (rx): Likewise.
+
+2018-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	Introduce EXPVAL for pcase, pcase-defmacro docstrings
+
+	Suggested by Drew Adams (Bug#31311).
+
+	* lisp/emacs-lisp/pcase.el (pcase): Use EXPVAL in
+	docstring to stand for the result of evaluating EXP.
+	(pcase-defmacro): Add (fn ...) form in docstring
+	that includes [DOC], and the EXPVAL convention.
+
+2018-05-27  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	Ensure pcase doc shows `QPAT first among extensions
+
+	* lisp/emacs-lisp/pcase.el (pcase--make-docstring):
+	Split extensions display into two phases, collection
+	and display, separated by a reordering step that
+	ensures backquote is the first.
+
+2018-05-25  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/HISTORY: Update for Emacs 26.1 release.
+
+	* etc/AUTHORS: Update.
+
 2018-05-25  Noam Postavsky  <npostavs@gmail.com>
 
 	Note caveat for backward regexp searching in docstring (Bug#31584)
@@ -37197,7 +43981,7 @@
 	delete-trailing-whitespace: handle read-only text in buffer
 
 	* lisp/simple.el (region-modifiable-p): New function.
-	(delete-trailing-whitespace): Us it to avoid trying to delete read-only text.
+	(delete-trailing-whitespace): Use it to avoid trying to delete read-only text.
 
 2016-12-07  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -43575,8 +50359,6 @@
 	* src/bytecode.c (exec_byte_code): Remove MAX_ALLOCA-based limit
 	on bytecode maxdepth, by using SAFE_ALLOCA_LISP instead of alloca.
 
-	pipeline is fuller.
-
 2016-08-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Tune bytecode quitting
@@ -59732,14 +66514,14 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 35574609dd09e2eab0301309b0e3bf831f627fcc (inclusive).
+commit a6d0172e8330a5683517eba78356d4c70ad979d7 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015-2018 Free Software Foundation, Inc.
+  Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/config.bat emacs-26.3+1/config.bat
--- emacs-26.1+1/config.bat	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/config.bat	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MSDOS
-rem   Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc.
+rem   Copyright (C) 1994-1999, 2001-2019 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/configure.ac emacs-26.3+1/configure.ac
--- emacs-26.1+1/configure.ac	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/configure.ac	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 dnl in the directory containing this script.
 dnl If you changed any AC_DEFINES, also run autoheader.
 dnl
-dnl Copyright (C) 1994-1996, 1999-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 1994-1996, 1999-2019 Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
 dnl
@@ -23,7 +23,7 @@
 
 AC_PREREQ(2.65)
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT(GNU Emacs, 26.1, bug-gnu-emacs@gnu.org)
+AC_INIT(GNU Emacs, 26.3, bug-gnu-emacs@gnu.org)
 
 dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
 dnl and then quoted again for a C string.  Separate options with spaces.
@@ -360,9 +360,9 @@
 OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
 OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
 
-OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
+OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif/Xaw3d/GTK toolkit scroll bars])
 OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
-OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
+OPTION_DEFAULT_ON([xim],[at runtime, default X11 XIM to off])
 AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
 [use Nextstep (macOS Cocoa or GNUstep) windowing system.
 On by default on macOS.])],[],[with_ns=maybe])
@@ -961,6 +961,7 @@
   nw="$nw -Wsync-nand"              # irrelevant here, and provokes ObjC warning
   nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations
   nw="$nw -Wbad-function-cast"      # These casts are no worse than others.
+  nw="$nw -Wabi"                    # Not useful, perceived as noise
 
   # Emacs doesn't care about shadowing; see
   # <https://lists.gnu.org/r/emacs-diffs/2011-11/msg00265.html>.
@@ -1574,7 +1575,6 @@
     LIB_MATH=
     SYSTEM_TYPE=windows-nt
     ;;
-  dnl NB this may be adjusted below.
   netbsd | openbsd )
     SYSTEM_TYPE=berkeley-unix
     ;;
@@ -2500,7 +2500,7 @@
 HAVE_RSVG=no
 if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then
   if test "${with_rsvg}" != "no"; then
-    RSVG_REQUIRED=2.11.0
+    RSVG_REQUIRED=2.14.0
     RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
 
     EMACS_CHECK_MODULES([RSVG], [$RSVG_MODULE])
@@ -2658,7 +2658,7 @@
        closing open displays.  This is no problem if you just use
        one display, but if you use more than one and close one of them
        Emacs may crash.
-       See https://bugzilla.gnome.org/show_bug.cgi?id=85715]])
+       See https://gitlab.gnome.org/GNOME/gtk/issues/221]])
   fi
 
 fi
@@ -3148,11 +3148,12 @@
 	 AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
 	 HAVE_XIM=no)
 
-dnl '--with-xim' now controls only the initial value of use_xim at run time.
-
+dnl Note this is non-standard.  --with-xim does not control whether
+dnl XIM support is compiled in, it only affects the runtime default of
+dnl use_xim in xterm.c.
 if test "${with_xim}" != "no"; then
   AC_DEFINE(USE_XIM, 1,
-	    [Define to 1 if we should use XIM, if it is available.])
+	    [Define to 1 to default runtime use of XIM to on.])
 fi
 
 
@@ -3210,8 +3211,8 @@
     if test "x${with_xft}" != "xno"; then
 
       EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no])
-      ## Because xftfont.c uses XRenderQueryExtension, we also
-      ## need to link to -lXrender.
+      ## Because xterm.c uses XRenderQueryExtension when XFT is
+      ## enabled, we also need to link to -lXrender.
       HAVE_XRENDER=no
       AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
       if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
@@ -3234,6 +3235,9 @@
 	CPPFLAGS=$OLD_CPPFLAGS
 	CFLAGS=$OLD_CFLAGS
 	LIBS=$OLD_LIBS
+      else
+      # Make sure XFT is disabled if we found XFT but not XRender
+	HAVE_XFT=no
       fi                          # "$HAVE_XFT" != no
     fi                            # "x${with_xft}" != "xno"
 
@@ -3467,23 +3471,20 @@
 AC_SUBST(LIBJPEG)
 
 HAVE_LCMS2=no
-LIBLCMS2=
+LCMS2_CFLAGS=
+LCMS2_LIBS=
 if test "${with_lcms2}" != "no"; then
-  OLIBS=$LIBS
-  AC_SEARCH_LIBS([cmsCreateTransform], [lcms2], [HAVE_LCMS2=yes])
-  LIBS=$OLIBS
-  case $ac_cv_search_cmsCreateTransform in
-    -*) LIBLCMS2=$ac_cv_search_cmsCreateTransform ;;
-  esac
+  EMACS_CHECK_MODULES([LCMS2], [lcms2])
 fi
 if test "${HAVE_LCMS2}" = "yes"; then
   AC_DEFINE([HAVE_LCMS2], 1, [Define to 1 if you have the lcms2 library (-llcms2).])
   ### mingw32 doesn't use -llcms2, since it loads the library dynamically.
   if test "${opsys}" = "mingw32"; then
-     LIBLCMS2=
+     LCMS2_LIBS=
   fi
 fi
-AC_SUBST(LIBLCMS2)
+AC_SUBST(LCMS2_CFLAGS)
+AC_SUBST(LCMS2_LIBS)
 
 HAVE_ZLIB=no
 LIBZ=
@@ -4045,7 +4046,8 @@
   emacs_cv_tputs_lib='none required'
 else
   # curses precedes termcap because of AIX (Bug#9736#35) and OpenIndiana.
-  for tputs_library in '' tinfo ncurses terminfo curses termcap; do
+  tputs_libraries='tinfo ncurses terminfo curses termcap tinfow ncursesw'
+  for tputs_library in '' $tputs_libraries; do
     OLIBS=$LIBS
     if test -z "$tputs_library"; then
       emacs_cv_tputs_lib='none required'
@@ -4141,6 +4143,10 @@
 AC_SUBST(TERMCAP_OBJ)
 
 # GNU/Linux-specific timer functions.
+# Bug#34618.
+if test "$opsys" = "cygwin"; then
+  emacs_cv_have_timerfd=no
+fi
 AC_CACHE_CHECK([for timerfd interface], [emacs_cv_have_timerfd],
   [AC_COMPILE_IFELSE(
      [AC_LANG_PROGRAM([[#include <sys/timerfd.h>
@@ -4961,7 +4967,7 @@
 
 version=$PACKAGE_VERSION
 
-copyright="Copyright (C) 2018 Free Software Foundation, Inc."
+copyright="Copyright (C) 2019 Free Software Foundation, Inc."
 AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
   [Short copyright string for this version of Emacs.])
 AC_SUBST(copyright)
@@ -5294,7 +5300,7 @@
 
 AH_TOP([/* GNU Emacs site configuration template file.
 
-Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2018
+Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2019
   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -5362,12 +5368,13 @@
 optsep=
 emacs_config_features=
 for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
-  GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
-  LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 NS MODULES \
-  THREADS XWIDGETS LIBSYSTEMD CANNOT_DUMP LCMS2; do
+  GCONF GSETTINGS GLIB NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
+  LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 XDBE XIM \
+  NS MODULES THREADS XWIDGETS LIBSYSTEMD CANNOT_DUMP LCMS2; do
 
     case $opt in
       CANNOT_DUMP) eval val=\${$opt} ;;
+      GLIB) val=${emacs_cv_links_glib} ;;
       NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;;
       TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;;
       THREADS) val=${threads_enabled} ;;
diff -Nru emacs-26.1+1/CONTRIBUTE emacs-26.3+1/CONTRIBUTE
--- emacs-26.1+1/CONTRIBUTE	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/CONTRIBUTE	2019-09-10 00:32:49.000000000 +0000
@@ -54,6 +54,12 @@
 such patch without additional remarks, you can use a command like
 'git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
 
+Once the cumulative amount of your submissions exceeds about 15 lines
+of non-trivial changes, we will need you to assign to the FSF the
+copyright for your contributions.  Ask on emacs-devel@gnu.org, and we
+will send you the necessary form together with the instructions to
+fill and email it, in order to start this legal paperwork.
+
 ** Issue tracker (a.k.a. "bug tracker")
 
 The Emacs issue tracker at https://debbugs.gnu.org lets you view bug
@@ -78,9 +84,16 @@
 ** Documenting your changes
 
 Any change that matters to end-users should have an entry in etc/NEWS.
+Try to start each NEWS entry with a sentence that summarizes the entry
+and takes just one line -- this will allow to read NEWS in Outline
+mode after hiding the body of each entry.
 
 Doc-strings should be updated together with the code.
 
+New defcustom's should always have a ':version' tag stating the first
+Emacs version in which they will appear.  Likewise with defcustom's
+whose value is changed -- update their ':version' tag.
+
 Think about whether your change requires updating the manuals.  If you
 know it does not, mark the NEWS entry with "---".  If you know
 that *all* the necessary documentation updates have been made as part
@@ -90,7 +103,7 @@
 If your change requires updating the manuals to document new
 functions/commands/variables/faces, then use the proper Texinfo
 command to index them; for instance, use @vindex for variables and
-@findex for functions/commands.  For the full list of predefine indices, see
+@findex for functions/commands.  For the full list of predefined indices, see
 https://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
 or run the shell command 'info "(texinfo)Predefined Indices"'.
 
@@ -280,15 +293,23 @@
 is merged into the master, using the gitmerge function described in
 admin/notes/git-workflow.
 
-If you are fixing a bug that exists in the current release, be sure to
-commit it to the release branch; it will be merged to the master
-branch later by the gitmerge function.
-
-Documentation fixes (in doc strings, in manuals, and in comments)
-should always go to the release branch, if the documentation to be
-fixed exists and is relevant to the release-branch codebase.  Doc
-fixes are always considered "safe" -- even when a release branch is in
-feature freeze, it can still receive doc fixes.
+If you are fixing a bug that exists in the current release, you should
+generally commit it to the release branch; it will be merged to the
+master branch later by the gitmerge function.  However, when the
+release branch is for Emacs version NN.2 and later, or when it is for
+Emacs version NN.1 that is in the very last stages of its pretest,
+that branch is considered to be in a feature freeze: only bug fixes
+that are "safe" or are fixing major problems should go to the release
+branch, the rest should be committed to the master branch.  This is so
+to avoid destabilizing the next Emacs release.  If you are unsure
+whether your bug fix is "safe" enough for the release branch, ask on
+the emacs-devel mailing list.
+
+Documentation fixes (in doc strings, in manuals, in NEWS, and in
+comments) should always go to the release branch, if the documentation
+to be fixed exists and is relevant to the release-branch codebase.
+Doc fixes are always considered "safe" -- even when a release branch
+is in feature freeze, it can still receive doc fixes.
 
 When you know that the change will be difficult to merge to the
 master (e.g., because the code on master has changed a lot), you can
diff -Nru emacs-26.1+1/debian/changelog emacs-26.3+1/debian/changelog
--- emacs-26.1+1/debian/changelog	2019-09-09 06:34:21.000000000 +0000
+++ emacs-26.3+1/debian/changelog	2019-09-23 07:25:41.000000000 +0000
@@ -1,3 +1,25 @@
+emacs (1:26.3+1-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Demote mailutils Recommends to a Suggests, as it's in
+      universe, pulls in an MTA, and is nutty to require for a text editor.
+    - Limit optimization on ppc64el to fix test failure.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 23 Sep 2019 09:25:41 +0200
+
+emacs (1:26.3+1-1) unstable; urgency=medium
+
+  * Merge upstream version 26.3. (Closes: 939737)
+
+  * Update debian/copyright for 26.3.
+
+  * Update debian/control for 26.3.
+
+  * Don't override the upstream EPLA packaging key anymore.  Emacs 26.3
+    has the correct version.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Mon, 09 Sep 2019 20:17:48 -0500
+
 emacs (1:26.1+1-4ubuntu1) eoan; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru emacs-26.1+1/debian/control emacs-26.3+1/debian/control
--- emacs-26.1+1/debian/control	2019-09-09 06:34:21.000000000 +0000
+++ emacs-26.3+1/debian/control	2019-09-22 22:12:32.000000000 +0000
@@ -35,7 +35,7 @@
 Package: emacs
 Architecture: all
 Depends:
-  emacs-gtk (>= 1:26.1) | emacs-lucid (>= 1:26.1) | emacs-nox (>= 1:26.1),
+  emacs-gtk (>= 1:26.3) | emacs-lucid (>= 1:26.3) | emacs-nox (>= 1:26.3),
   ${misc:Depends}
 Description: GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
diff -Nru emacs-26.1+1/debian/copyright emacs-26.3+1/debian/copyright
--- emacs-26.1+1/debian/copyright	2019-09-09 06:34:21.000000000 +0000
+++ emacs-26.3+1/debian/copyright	2019-09-23 07:25:41.000000000 +0000
@@ -9,8 +9,8 @@
 
   The original source for this package can be found at
   git://git.savannah.gnu.org/emacs.git under the
-  emacs-26.1 tag.  That tag was used to create the
-  Debian upstream archive (emacs_1:26.1+1.orig.tar.xz)
+  emacs-26.3 tag.  That tag was used to create the
+  Debian upstream archive (emacs_1:26.3+1.orig.tar.xz)
   after making adjustments to comply with the DFSG (see below).
 
   Please see /usr/share/doc/emacs-common/README.Debian.gz for a
Binary files /tmp/tmpObusoH/HLe_YkQyfd/emacs-26.1+1/debian/etc-package-keyring-new.gpg and /tmp/tmpObusoH/fznpRJRV7m/emacs-26.3+1/debian/etc-package-keyring-new.gpg differ
Binary files /tmp/tmpObusoH/HLe_YkQyfd/emacs-26.1+1/debian/etc-package-keyring-old.gpg and /tmp/tmpObusoH/fznpRJRV7m/emacs-26.3+1/debian/etc-package-keyring-old.gpg differ
diff -Nru emacs-26.1+1/debian/.git-dpm emacs-26.3+1/debian/.git-dpm
--- emacs-26.1+1/debian/.git-dpm	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/.git-dpm	2019-09-22 22:12:32.000000000 +0000
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-3cd4b72717032b17e596fce6f475f4a4029fa236
-3cd4b72717032b17e596fce6f475f4a4029fa236
-511a2cebd6df0f71ec24b5939564fb58726ead84
-511a2cebd6df0f71ec24b5939564fb58726ead84
-emacs_26.1+1.orig.tar.xz
-9318da32923e8a4a17ee23113302ff509c0d4056
-24259708
+ea69030e0a64234bd6e459bfdbc737e744b42762
+ea69030e0a64234bd6e459bfdbc737e744b42762
+b820e6781829e25468113a01b4310907740ffe06
+b820e6781829e25468113a01b4310907740ffe06
+emacs_26.3+1.orig.tar.xz
+0cd09244355fe10f8db19707cceeaa75e8dde3b2
+24346116
diff -Nru emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch emacs-26.3+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch
--- emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From 888dd6f8381aea7c01ea578b3357b9edb9bf988d Mon Sep 17 00:00:00 2001
+From b5e23aef8d95f3a028312f12c983df6075483463 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Sun, 7 Apr 2013 15:03:05 -0500
 Subject: Prefer /usr/share/info/emacs/
@@ -12,10 +12,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lisp/info.el b/lisp/info.el
-index 8743b449976..14d62f7f1cb 100644
+index 94b0ef6ce75..785f92ab57f 100644
 --- a/lisp/info.el
 +++ b/lisp/info.el
-@@ -213,7 +213,8 @@ A header-line does not scroll with the rest of the buffer."
+@@ -222,7 +222,8 @@ Info-default-directory-list
  	      (nconc standard-info-dirs (list config-dir))
  	    (cons config-dir standard-info-dirs))))
      (if (not (eq system-type 'windows-nt))
diff -Nru emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch emacs-26.3+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
--- emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From 381dc48e4f31a00726f44f3723b913aea4485cca Mon Sep 17 00:00:00 2001
+From 1626a4d516125deca5eb8d0f7a63b6d48d6ab63d Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Mon, 4 Apr 2011 22:46:22 -0500
 Subject: Run debian-startup and set debian-emacs-flavor
@@ -16,10 +16,10 @@
  1 file changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/lisp/startup.el b/lisp/startup.el
-index 9d16b59defd..d20431492a7 100644
+index 32051c232ca..6ee20ccf597 100644
 --- a/lisp/startup.el
 +++ b/lisp/startup.el
-@@ -434,6 +434,10 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
+@@ -434,6 +434,10 @@ tutorial-directory
    :type 'directory
    :initialize #'custom-initialize-delay)
  
@@ -30,7 +30,7 @@
  (defun normal-top-level-add-subdirs-to-load-path ()
    "Recursively add all subdirectories of `default-directory' to `load-path'.
  More precisely, this uses only the subdirectories whose names
-@@ -1121,8 +1125,21 @@ please check its value")
+@@ -1129,8 +1133,21 @@ command-line
      ;; be loaded from site-run-file and wants to test if -q was given
      ;; should check init-file-user instead, since that is already set.
      ;; See cus-edit.el for an example.
diff -Nru emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch emacs-26.3+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
--- emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From d641a7c62e38661b1d786adc846b73b2e40595d1 Mon Sep 17 00:00:00 2001
+From ab940f42b7ca0208b7c734fe3a9bce4209add168 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Mon, 4 Apr 2011 22:46:24 -0500
 Subject: Remove files that appear to be incompatible with the DFSG
@@ -30,10 +30,10 @@
  5 files changed, 37 insertions(+), 76 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 238df40ded8..baed5771863 100644
+index 364deeae226..0e0931bd626 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -159,7 +159,9 @@ man1dir=$(mandir)/man1
+@@ -162,7 +162,9 @@ man1dir=$(mandir)/man1
  # Where to install and expect the info files describing Emacs.
  infodir=@infodir@
  # Info files not in the doc/misc directory (we get those via make echo-info).
@@ -44,7 +44,7 @@
  
  # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
  HAVE_MAKEINFO=@HAVE_MAKEINFO@
-@@ -814,8 +816,7 @@ endef
+@@ -820,8 +822,7 @@ endef
  ###      normally don't want to recompile.  For example, the 'mostlyclean'
  ###      target for GCC does not delete 'libgcc.a', because recompiling it
  ###      is rarely necessary and takes a lot of time.
@@ -54,7 +54,7 @@
  
  $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean)))
  
-@@ -947,11 +948,11 @@ check check-maybe check-expensive check-all: have-tests all
+@@ -953,11 +954,11 @@ check check-maybe check-expensive check-all: have-tests all
  dist:
  	cd ${srcdir}; ./make-dist
  
@@ -71,7 +71,7 @@
  
  DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
  $(DOCS):
-@@ -972,9 +973,6 @@ info-dir: ${srcdir}/info/dir
+@@ -978,9 +979,6 @@ info-dir: ${srcdir}/info/dir
  
  ## Hopefully doc/misc/*.texi is not too long for some systems?
  srcdir_doc_info_dir_inputs = \
@@ -81,7 +81,7 @@
    $(sort $(wildcard ${srcdir}/doc/misc/*.texi))
  info_dir_inputs = \
    ../build-aux/dir_top \
-@@ -996,14 +994,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
+@@ -1002,14 +1000,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
  	 AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
  	) >$@.tmp && mv $@.tmp $@
  
@@ -100,7 +100,7 @@
  INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS)
  
  ## Install non .info forms of the documentation.
-@@ -1021,14 +1015,10 @@ install-pdf: $(INSTALL_PDF)
+@@ -1027,14 +1021,10 @@ install-pdf: $(INSTALL_PDF)
  install-ps: $(INSTALL_PS)
  
  
@@ -120,7 +120,7 @@
  
  $(UNINSTALL_DOC):
 diff --git a/admin/update_autogen b/admin/update_autogen
-index d2118674792..7708b3fa03c 100755
+index 651d35beafb..a767b541fc7 100755
 --- a/admin/update_autogen
 +++ b/admin/update_autogen
 @@ -259,8 +259,7 @@ info_dir ()
@@ -134,10 +134,10 @@
              ## FIXME do not ignore w32 if OS is w32.
              case $file in
 diff --git a/configure.ac b/configure.ac
-index 256b954a89c..976667caf32 100644
+index ebf24c8657e..4561ef7f868 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5480,7 +5480,7 @@ dnl config.status treats $srcdir specially, so I think this is ok...
+@@ -5487,7 +5487,7 @@ dnl config.status treats $srcdir specially, so I think this is ok...
  AC_CONFIG_FILES([$srcdir/doc/man/emacs.1])
  
  m4_define([subdir_makefiles],
@@ -146,7 +146,7 @@
  SUBDIR_MAKEFILES="subdir_makefiles"
  AC_CONFIG_FILES(subdir_makefiles)
  
-@@ -5533,14 +5533,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
+@@ -5540,14 +5540,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
  fi
  ])
  
@@ -167,7 +167,7 @@
  dnl If we give this the more natural name, etc/refcards/emacsver.texi,
  dnl then a directory etc/refcards is created in the build directory,
 diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
-index 11086b33037..76fca3ff416 100644
+index d02f42bbeb9..b5447f6ba10 100644
 --- a/doc/misc/Makefile.in
 +++ b/doc/misc/Makefile.in
 @@ -61,18 +61,14 @@ INSTALL_DATA = @INSTALL_DATA@
@@ -250,10 +250,10 @@
  .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
  
 diff --git a/lisp/help.el b/lisp/help.el
-index 77e32848318..22516310692 100644
+index c23d4d8fe54..a081d13f5d0 100644
 --- a/lisp/help.el
 +++ b/lisp/help.el
-@@ -292,6 +292,14 @@ If that doesn't give a function, return nil."
+@@ -292,6 +292,14 @@ view-help-file
    (goto-address-mode 1)
    (goto-char (point-min)))
  
diff -Nru emacs-26.1+1/debian/patches/0004-Adjust-documentation-references-for-Debian.patch emacs-26.3+1/debian/patches/0004-Adjust-documentation-references-for-Debian.patch
--- emacs-26.1+1/debian/patches/0004-Adjust-documentation-references-for-Debian.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0004-Adjust-documentation-references-for-Debian.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From 2ea6063c2c43ae7816e387548dbb3ba1800293ad Mon Sep 17 00:00:00 2001
+From 8aa3059b73a8704207dc6d75a186c3bbb96005a6 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Mon, 4 Apr 2011 22:46:25 -0500
 Subject: Adjust documentation references for Debian
@@ -12,12 +12,12 @@
  1 file changed, 5 insertions(+)
 
 diff --git a/etc/NEWS b/etc/NEWS
-index 10afb7b4202..a866194bfea 100644
+index d672d057bb3..fc63a563d28 100644
 --- a/etc/NEWS
 +++ b/etc/NEWS
-@@ -15,6 +15,11 @@ in older Emacs versions.
- You can narrow news to a specific version by calling 'view-emacs-news'
- with a prefix argument or by typing C-u C-h C-n.
+@@ -192,6 +192,11 @@ build-time.  See nextstep/INSTALL for details.
+ (This change was actually made in Emacs 26.1, but was undocumented and
+ not called out in its NEWS.)
  
 + 
 +* Debian specific changes to Emacs
diff -Nru emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch emacs-26.3+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
--- emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From d69466776a75671d6d818b3b4a0be73c54876c3d Mon Sep 17 00:00:00 2001
+From 580b54df0b8bb5d3076830d7ea0b3cbe03bc2065 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Mon, 4 Apr 2011 22:46:28 -0500
 Subject: Modify the output of (version) to indicate Debian modifications
@@ -12,10 +12,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lisp/version.el b/lisp/version.el
-index 3a38b1d83c8..5d1248ac581 100644
+index cb9d0442ccf..11ce4e475db 100644
 --- a/lisp/version.el
 +++ b/lisp/version.el
-@@ -62,7 +62,7 @@ Don't use this function in programs to choose actions according
+@@ -62,7 +62,7 @@ emacs-version
  to the system configuration; look at `system-configuration' instead."
    (interactive "P")
    (let ((version-string
diff -Nru emacs-26.1+1/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch emacs-26.3+1/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
--- emacs-26.1+1/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From 598ff07f7cee81ffe382d37a3d134599a63d5a90 Mon Sep 17 00:00:00 2001
+From a7b79cf9cbb2cb4c8a84935231106ffe07274f33 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Tue, 21 Oct 2014 19:10:17 -0500
 Subject: Don't try to build src/macuvs.h (via IVD_Sequences.txt)
@@ -10,7 +10,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
-index 818404f8baf..bb1223248b9 100644
+index 31efba0227a..3a23f796f70 100644
 --- a/admin/unidata/Makefile.in
 +++ b/admin/unidata/Makefile.in
 @@ -56,7 +56,7 @@ am__v_at_1 =
diff -Nru emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch emacs-26.3+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
--- emacs-26.1+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From 106dcf98d829f04606674df728bb95f99f5298c0 Mon Sep 17 00:00:00 2001
+From cf13a10435f407dc71e2d82558794a0e1a6748ae Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Mon, 10 Oct 2016 17:35:56 -0500
 Subject: Kill gpg agent in package-test.el to avoid a race
@@ -20,10 +20,10 @@
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
-index 62fba58919f..e4aa519a4c6 100644
+index 212e73f4726..c28c8077ac7 100644
 --- a/test/lisp/emacs-lisp/package-tests.el
 +++ b/test/lisp/emacs-lisp/package-tests.el
-@@ -150,7 +150,14 @@
+@@ -150,7 +150,14 @@ package-test-fake-contents-file
                 ,@body)))
  
         (when (file-directory-p package-test-user-dir)
diff -Nru emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch emacs-26.3+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
--- emacs-26.1+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch	2019-09-22 22:12:32.000000000 +0000
@@ -1,4 +1,4 @@
-From bda90e2ab5203feb938188cbd8e029c9b2a467db Mon Sep 17 00:00:00 2001
+From 411e4cc35d58d3b02dffa6fa83a350666d17f6d9 Mon Sep 17 00:00:00 2001
 From: Rob Browning <rlb@defaultvalue.org>
 Date: Sat, 29 Jul 2017 11:50:27 -0500
 Subject: Don't downcase real xref in elisp-mode-tests
@@ -13,10 +13,10 @@
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
-index 941e85bc890..faf45b88ff7 100644
+index bc2d14b9498..26db1cbc102 100644
 --- a/test/lisp/progmodes/elisp-mode-tests.el
 +++ b/test/lisp/progmodes/elisp-mode-tests.el
-@@ -301,11 +301,15 @@
+@@ -311,11 +311,15 @@ xref--case-insensitive
  (defun xref-elisp-test-run (xrefs expected-xrefs)
    (should (= (length xrefs) (length expected-xrefs)))
    (while xrefs
@@ -31,9 +31,9 @@
 +            (copy-xref-elisp-location (oref xref location)))
 +
        ;; Downcase the filenames for case-insensitive file systems.
-       (setf (xref-elisp-location-file (oref xref location))
-             (downcase (xref-elisp-location-file (oref xref location))))
-@@ -315,7 +319,7 @@
+       (when xref--case-insensitive
+         (setf (xref-elisp-location-file (oref xref location))
+@@ -327,7 +331,7 @@ xref-elisp-test-run
  
        (should (equal xref expected-xref))
  
diff -Nru emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch emacs-26.3+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
--- emacs-26.1+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-From d13836843d9f34fa308d83bf3dd09ee9d00e142d Mon Sep 17 00:00:00 2001
-From: Glenn Morris <rgm@gnu.org>
-Date: Fri, 14 Dec 2018 20:09:02 -0500
-Subject: An epg test failure with recent GnuPG versions has been fixed
-
-This patch has been backported from upstream to fix m68k build
-failures:
-
-  Fix an epg test for recent GnuPG versions (bug#33439)
-
-  * test/lisp/epg-tests.el (epg-decrypt-1):
-  Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.
-
-Origin: backport, commit: fa953b58afd39d396dab4d76a6ff0b8ba4040eb8)
-Bug: https://debbugs.gnu.org/33439
-Forwarded: not-needed
----
- test/lisp/epg-tests.el | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
-index 0fe15017dd0..f2cc351d70b 100644
---- a/test/lisp/epg-tests.el
-+++ b/test/lisp/epg-tests.el
-@@ -87,6 +87,8 @@
- (ert-deftest epg-decrypt-1 ()
-   (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
-   (with-epg-tests (:require-passphrase t)
-+    (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
-+      (insert "ignore-mdc-error"))
-     (should (equal "test"
- 		   (epg-decrypt-string epg-tests-context "\
- -----BEGIN PGP MESSAGE-----
diff -Nru emacs-26.1+1/debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch emacs-26.3+1/debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
--- emacs-26.1+1/debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch	2019-09-10 01:17:48.000000000 +0000
@@ -0,0 +1,74 @@
+From dea7c2e140df4e0aa87f7e557cca7057885632ff Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 16 Dec 2018 17:13:36 -0600
+Subject: Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now
+
+Currently the test fails like this:
+
+  Running 3 tests (2018-12-17 12:17:43-0600)
+     passed  1/3  vc-bzr-test-bug9726
+  Mark set
+  Press C-c C-c when you are done editing.
+  Enter a change comment.  Type C-c C-c when done
+     passed  2/3  vc-bzr-test-bug9781
+  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
+  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
+  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
+
+  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
+  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
+
+  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
+    logand(nil 128)
+    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
+    vc-refresh-state()
+    run-hooks(find-file-hook)
+    after-find-file(t t)
+    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
+    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
+    autoload-find-generated-file()
+    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
+    (progn (update-directory-autoloads default-directory) t)
+    (setq value-35 (progn (update-directory-autoloads default-directory)
+    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
+    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
+    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
+    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
+    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
+    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
+    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
+    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
+    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
+    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
+    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
+    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
+    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
+    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
+    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
+    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
+    command-line()
+    normal-top-level()
+  Test vc-bzr-test-faulty-bzr-autoloads condition:
+      (wrong-type-argument number-or-marker-p nil)
+     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads
+
+  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)
+
+  1 unexpected results:
+     FAILED  vc-bzr-test-faulty-bzr-autoloads
+---
+ test/lisp/vc/vc-bzr-tests.el | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
+index af65cd1c205..96282e0f7ad 100644
+--- a/test/lisp/vc/vc-bzr-tests.el
++++ b/test/lisp/vc/vc-bzr-tests.el
+@@ -111,6 +111,7 @@
+ ;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html
+ (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
+   "Test we can generate autoloads in a bzr directory when bzr is faulty."
++  :tags '(:unstable)
+   (skip-unless (executable-find vc-bzr-program))
+   ;; Avoid vc-mode-line bug;
+   ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html
diff -Nru emacs-26.1+1/debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch emacs-26.3+1/debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
--- emacs-26.1+1/debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	2019-09-10 01:17:48.000000000 +0000
@@ -0,0 +1,22 @@
+From 2ad9737023c999e593dba4a98b6b8e394317d960 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 17 Dec 2018 15:27:30 -0600
+Subject: Mark echo-server-with-dns test as :unstable for now
+
+It fails inside a Debian sbuild chroot.
+---
+ test/lisp/net/network-stream-tests.el | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
+index 29b92da3de0..478b1bb823f 100644
+--- a/test/lisp/net/network-stream-tests.el
++++ b/test/lisp/net/network-stream-tests.el
+@@ -100,6 +100,7 @@ server-process-filter
+       ))))
+ 
+ (ert-deftest echo-server-with-dns ()
++  :tags '(:unstable) ;; This doesn't work in an sbuild chroot (at least)
+   (let* ((server (make-server (system-name)))
+          (port (aref (process-contact server :local) 4))
+          (proc (make-network-process :name "foo"
diff -Nru emacs-26.1+1/debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch emacs-26.3+1/debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
--- emacs-26.1+1/debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-From 884f1267851cd7de56d81b69cac10041988cc007 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Sun, 16 Dec 2018 17:13:36 -0600
-Subject: Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now
-
-Currently the test fails like this:
-
-  Running 3 tests (2018-12-17 12:17:43-0600)
-     passed  1/3  vc-bzr-test-bug9726
-  Mark set
-  Press C-c C-c when you are done editing.
-  Enter a change comment.  Type C-c C-c when done
-     passed  2/3  vc-bzr-test-bug9781
-  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
-  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
-  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
-
-  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
-  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''
-
-  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
-    logand(nil 128)
-    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
-    vc-refresh-state()
-    run-hooks(find-file-hook)
-    after-find-file(t t)
-    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
-    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
-    autoload-find-generated-file()
-    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
-    (progn (update-directory-autoloads default-directory) t)
-    (setq value-35 (progn (update-directory-autoloads default-directory)
-    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
-    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
-    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
-    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
-    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
-    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
-    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
-    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
-    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
-    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
-    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
-    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
-    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
-    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
-    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
-    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
-    command-line()
-    normal-top-level()
-  Test vc-bzr-test-faulty-bzr-autoloads condition:
-      (wrong-type-argument number-or-marker-p nil)
-     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads
-
-  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)
-
-  1 unexpected results:
-     FAILED  vc-bzr-test-faulty-bzr-autoloads
----
- test/lisp/vc/vc-bzr-tests.el | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
-index 6b96f3b928d..a7c81025f45 100644
---- a/test/lisp/vc/vc-bzr-tests.el
-+++ b/test/lisp/vc/vc-bzr-tests.el
-@@ -111,6 +111,7 @@
- ;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html
- (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
-   "Test we can generate autoloads in a bzr directory when bzr is faulty."
-+  :tags '(:unstable)
-   (skip-unless (executable-find vc-bzr-program))
-   (let* ((homedir (make-temp-file "vc-bzr-test" t))
-          (bzrdir (expand-file-name "bzr" homedir))
diff -Nru emacs-26.1+1/debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch emacs-26.3+1/debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
--- emacs-26.1+1/debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch	2019-09-10 01:17:48.000000000 +0000
@@ -0,0 +1,31 @@
+From ea69030e0a64234bd6e459bfdbc737e744b42762 Mon Sep 17 00:00:00 2001
+From: Glenn Morris <rgm@gnu.org>
+Date: Sat, 15 Dec 2018 14:49:46 -0800
+Subject: Fix an eshell ls dired test for non-recent files
+
+* test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844):
+Work around an eshell issue with non-recent files.  (Bug#33734)
+---
+ test/lisp/eshell/em-ls-tests.el | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el
+index a2072d6b392..4ee51b4f4c2 100644
+--- a/test/lisp/eshell/em-ls-tests.el
++++ b/test/lisp/eshell/em-ls-tests.el
+@@ -87,7 +87,14 @@
+           (dired-toggle-marks)
+           (should (cdr (dired-get-marked-files)))
+           (kill-buffer buf)
+-          (setq buf (dired (expand-file-name "lisp/subr.el" source-directory)))
++          ;; Eshell's default format duplicates the year for non-recent files,
++          ;; eg "2015-05-06  2015", which doesn't make a lot of sense,
++          ;; and causes this portion of the test to fail if subr.el
++          ;; is non-recent (eg if building from a tarfile unpacked
++          ;; with a fixed early timestamp for reproducibility).  Bug#33734.
++          (let ((eshell-ls-date-format "%b %e"))
++            (setq buf (dired (expand-file-name "lisp/subr.el"
++                                               source-directory))))
+           (should (looking-at "subr\\.el")))
+       (customize-set-variable 'eshell-ls-use-in-dired orig)
+       (and (buffer-live-p buf) (kill-buffer)))))
diff -Nru emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch emacs-26.3+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
--- emacs-26.1+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0011-tramp-test42-remote-load-path-regexp-quote-directory.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-From ef1a7ddf208a19da9d2dc265b8027fc4f589fccf Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Mon, 17 Dec 2018 15:09:12 -0600
-Subject: tramp-test42-remote-load-path: regexp-quote directory
-
-Otherwise the test may fail for some paths like those seen in a Debian
-sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...
----
- test/lisp/net/tramp-tests.el | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
-index 996a31d375f..60f2aaf034b 100644
---- a/test/lisp/net/tramp-tests.el
-+++ b/test/lisp/net/tramp-tests.el
-@@ -4702,8 +4702,9 @@ process sentinels.  They shall not disturb each other."
-      (string-match
-       (format
-        "Loading %s"
--       (expand-file-name
--	"tramp-cmds" (file-name-directory (locate-library "tramp"))))
-+       (regexp-quote
-+        (expand-file-name
-+         "tramp-cmds" (file-name-directory (locate-library "tramp")))))
-       (shell-command-to-string
-        (format
- 	"%s -batch -Q -L %s -l tramp-sh --eval %s"
diff -Nru emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch emacs-26.3+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
--- emacs-26.1+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From f36102cf4af82593dd08c28de140863868b98b2b Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Mon, 17 Dec 2018 15:15:25 -0600
-Subject: ibuffer-filter-inclusion-3: regexp-quote directory
-
-Otherwise the test may fail for some paths like those seen in a Debian
-sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...
----
- test/lisp/ibuffer-tests.el | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el
-index ff5162fefa5..c1d9ed9fc3b 100644
---- a/test/lisp/ibuffer-tests.el
-+++ b/test/lisp/ibuffer-tests.el
-@@ -312,8 +312,8 @@
-                 (funcall create-non-file-buffer "ibuf-test-3.b" :size 50
-                          :mode #'text-mode
-                          :include-content "...but a multitude of drops?\n"))
--               (dirA (with-current-buffer bufA default-directory))
--               (dirB (with-current-buffer bufB default-directory)))
-+               (dirA (regexp-quote (with-current-buffer bufA default-directory)))
-+               (dirB (regexp-quote (with-current-buffer bufB default-directory))))
-           (should (ibuffer-included-in-filters-p
-                    bufA '((basename . "ibuf-test-3"))))
-           (should (ibuffer-included-in-filters-p
diff -Nru emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch emacs-26.3+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
--- emacs-26.1+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From 50583dfa0a2d83a65848bf93c39f14fe3bcf7d10 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Mon, 17 Dec 2018 15:27:30 -0600
-Subject: Mark echo-server-with-dns test as :unstable for now
-
-It fails inside a Debian sbuild chroot.
----
- test/lisp/net/network-stream-tests.el | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
-index ddb8f9ea6f5..42515025df8 100644
---- a/test/lisp/net/network-stream-tests.el
-+++ b/test/lisp/net/network-stream-tests.el
-@@ -100,6 +100,7 @@
-       ))))
- 
- (ert-deftest echo-server-with-dns ()
-+  :tags '(:unstable) ;; This doesn't work in an sbuild chroot (at least)
-   (let* ((server (make-server (system-name)))
-          (port (aref (process-contact server :local) 4))
-          (proc (make-network-process :name "foo"
diff -Nru emacs-26.1+1/debian/patches/0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch emacs-26.3+1/debian/patches/0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
--- emacs-26.1+1/debian/patches/0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-From face2676a9d5a13b40eaeecfb09a16e81364e916 Mon Sep 17 00:00:00 2001
-From: Glenn Morris <rgm@gnu.org>
-Date: Sat, 15 Dec 2018 14:49:46 -0800
-Subject: Fix an eshell ls dired test for non-recent files
-
-* test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844):
-Work around an eshell issue with non-recent files.  (Bug#33734)
----
- test/lisp/eshell/em-ls-tests.el | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el
-index 1ce832f1dcc..ab73bc427a5 100644
---- a/test/lisp/eshell/em-ls-tests.el
-+++ b/test/lisp/eshell/em-ls-tests.el
-@@ -87,7 +87,14 @@
-           (dired-toggle-marks)
-           (should (cdr (dired-get-marked-files)))
-           (kill-buffer buf)
--          (setq buf (dired (expand-file-name "lisp/subr.el" source-directory)))
-+          ;; Eshell's default format duplicates the year for non-recent files,
-+          ;; eg "2015-05-06  2015", which doesn't make a lot of sense,
-+          ;; and causes this portion of the test to fail if subr.el
-+          ;; is non-recent (eg if building from a tarfile unpacked
-+          ;; with a fixed early timestamp for reproducibility).  Bug#33734.
-+          (let ((eshell-ls-date-format "%b %e"))
-+            (setq buf (dired (expand-file-name "lisp/subr.el"
-+                                               source-directory))))
-           (should (looking-at "subr\\.el")))
-       (customize-set-variable 'eshell-ls-use-in-dired orig)
-       (and (buffer-live-p buf) (kill-buffer)))))
diff -Nru emacs-26.1+1/debian/patches/0015-Ignore-color-fonts-when-using-Xft.patch emacs-26.3+1/debian/patches/0015-Ignore-color-fonts-when-using-Xft.patch
--- emacs-26.1+1/debian/patches/0015-Ignore-color-fonts-when-using-Xft.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0015-Ignore-color-fonts-when-using-Xft.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-From 77f3313d9159759126188903933884b2d308c0f3 Mon Sep 17 00:00:00 2001
-From: Robert Pluim <rpluim@gmail.com>
-Date: Tue, 3 Apr 2018 11:06:01 +0200
-Subject: Ignore color fonts when using Xft
-
-* src/font.c (syms_of_font): New configuration variable
-xft-ignore-color-fonts, default t.
-* src/ftfont.c (ftfont_spec_pattern): Tell fontconfig to ignore
-color fonts if xft-ignore-color-fonts is t.  (Bug#30874, Bug#30045)
-* etc/NEWS: Document xft-ignore-color-fonts.
----
- src/font.c   | 7 +++++++
- src/ftfont.c | 7 +++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/src/font.c b/src/font.c
-index a6d3f5d4798..ef3f92b5949 100644
---- a/src/font.c
-+++ b/src/font.c
-@@ -5473,6 +5473,13 @@ Disabling compaction of font caches might enlarge the Emacs memory
- footprint in sessions that use lots of different fonts.  */);
-   inhibit_compacting_font_caches = 0;
- 
-+  DEFVAR_BOOL ("xft-ignore-color-fonts",
-+	       Vxft_ignore_color_fonts,
-+	       doc: /*
-+Non-nil means don't query fontconfig for color fonts, since they often
-+cause Xft crashes.  Only has an effect in Xft builds.  */);
-+  Vxft_ignore_color_fonts = 1;
-+
- #ifdef HAVE_WINDOW_SYSTEM
- #ifdef HAVE_FREETYPE
-   syms_of_ftfont ();
-diff --git a/src/ftfont.c b/src/ftfont.c
-index c2e093e633d..24a92dd52e8 100644
---- a/src/ftfont.c
-+++ b/src/ftfont.c
-@@ -764,6 +764,13 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
-   if (scalable >= 0
-       && ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse))
-     goto err;
-+#ifdef HAVE_XFT
-+  /* We really don't like color fonts, they cause Xft crashes.  See
-+     Bug#30874.  */
-+  if (Vxft_ignore_color_fonts
-+      && ! FcPatternAddBool(pattern, FC_COLOR, FcFalse))
-+    goto err;
-+#endif
- 
-   goto finish;
- 
diff -Nru emacs-26.1+1/debian/patches/0016-Port-FC_COLOR-change-to-older-fontconfig.patch emacs-26.3+1/debian/patches/0016-Port-FC_COLOR-change-to-older-fontconfig.patch
--- emacs-26.1+1/debian/patches/0016-Port-FC_COLOR-change-to-older-fontconfig.patch	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/0016-Port-FC_COLOR-change-to-older-fontconfig.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-From 3cd4b72717032b17e596fce6f475f4a4029fa236 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 3 Apr 2018 08:12:41 -0700
-Subject: Port FC_COLOR change to older fontconfig
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by John ff in:
-https://lists.gnu.org/r/emacs-devel/2018-04/msg00058.html
-* src/ftfont.c (ftfont_spec_pattern) [!FC_COLOR]:
-Don’t use FC_COLOR on older fontconfigs that don’t have it.
----
- src/ftfont.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ftfont.c b/src/ftfont.c
-index 24a92dd52e8..84e4a303899 100644
---- a/src/ftfont.c
-+++ b/src/ftfont.c
-@@ -764,7 +764,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
-   if (scalable >= 0
-       && ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse))
-     goto err;
--#ifdef HAVE_XFT
-+#if defined HAVE_XFT && defined FC_COLOR
-   /* We really don't like color fonts, they cause Xft crashes.  See
-      Bug#30874.  */
-   if (Vxft_ignore_color_fonts
diff -Nru emacs-26.1+1/debian/patches/series emacs-26.3+1/debian/patches/series
--- emacs-26.1+1/debian/patches/series	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/patches/series	2019-09-22 22:12:32.000000000 +0000
@@ -6,11 +6,6 @@
 0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
-0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
-0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
-0011-tramp-test42-remote-load-path-regexp-quote-directory.patch
-0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch
-0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
-0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
-0015-Ignore-color-fonts-when-using-Xft.patch
-0016-Port-FC_COLOR-change-to-older-fontconfig.patch
+0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
+0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
+0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
diff -Nru emacs-26.1+1/debian/rules emacs-26.3+1/debian/rules
--- emacs-26.1+1/debian/rules	2019-09-09 04:47:33.000000000 +0000
+++ emacs-26.3+1/debian/rules	2019-09-22 22:12:32.000000000 +0000
@@ -318,15 +318,7 @@
 override_dh_auto_configure:
 
 debian/stamp-configured: $(autogen_build_files)
-        # If the deps for this target change, start over.
-        # When the "new" keyring is obsolete, update
-        # debian/source/include-binaries.
-	if test "$$(sha1sum etc/package-keyring.gpg | cut -f 1 -d ' ')" \
-	  != 5eda21f010a2d246359efc6450830ac3d500760e; then \
-	  echo 'Unexpected keyring hash - is it obsolete?'; \
-	  false; \
-	fi
-	cp -a debian/etc-package-keyring-new.gpg etc/package-keyring.gpg
+        # If the deps for this target change, start over
 	rm -rf debian/build-src debian/build-gtk debian/build-lucid debian/build-nox
 	mkdir debian/build-src
 	cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src
@@ -571,8 +563,6 @@
 
 override_dh_clean: $(persistent_autogen_files)
 	dh_clean
-	cp -a debian/etc-package-keyring-old.gpg \
-	  etc/package-keyring.gpg
 	rm -rf \
 	  debian/stamp-* \
 	  debian/build-lucid \
diff -Nru emacs-26.1+1/debian/source/include-binaries emacs-26.3+1/debian/source/include-binaries
--- emacs-26.1+1/debian/source/include-binaries	2019-09-08 20:01:29.000000000 +0000
+++ emacs-26.3+1/debian/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/etc-package-keyring-new.gpg
-debian/etc-package-keyring-old.gpg
diff -Nru emacs-26.1+1/doc/emacs/ChangeLog.1 emacs-26.3+1/doc/emacs/ChangeLog.1
--- emacs-26.1+1/doc/emacs/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/emacs/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -83,7 +83,7 @@
 
 2014-12-08  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-	* maintaining.texi: Suopport fo Arch has been moved to obosolete,
+	* maintaining.texi: Support for Arch has been moved to obsolete,
 	remove references that imply otherwise.
 
 2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
@@ -10919,7 +10919,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/doc/emacs/docstyle.texi emacs-26.3+1/doc/emacs/docstyle.texi
--- emacs-26.1+1/doc/emacs/docstyle.texi	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/emacs/docstyle.texi	2019-09-10 00:32:49.000000000 +0000
@@ -8,9 +8,11 @@
 @end ignore
 @set txicodequoteundirected
 @set txicodequotebacktick
+@iftex
 @c It turns out TeX sometimes fails to hyphenate, so we help it here
 @hyphenation{au-to-mat-i-cal-ly}
 @hyphenation{spec-i-fied}
 @hyphenation{work-a-round}
 @hyphenation{work-a-rounds}
 @hyphenation{un-marked}
+@end iftex
diff -Nru emacs-26.1+1/doc/man/ChangeLog.1 emacs-26.3+1/doc/man/ChangeLog.1
--- emacs-26.1+1/doc/man/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/man/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -176,7 +176,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2018 Free Software Foundation, Inc.
+  Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/doc/man/ebrowse.1 emacs-26.3+1/doc/man/ebrowse.1
--- emacs-26.1+1/doc/man/ebrowse.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/man/ebrowse.1	2019-09-10 00:32:49.000000000 +0000
@@ -82,7 +82,7 @@
 was written by Gerd Moellmann.
 .
 .SH COPYING
-Copyright 2008-2018 Free Software Foundation, Inc.
+Copyright 2008-2019 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff -Nru emacs-26.1+1/doc/man/emacs.1.in emacs-26.3+1/doc/man/emacs.1.in
--- emacs-26.1+1/doc/man/emacs.1.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/man/emacs.1.in	2019-09-10 00:32:49.000000000 +0000
@@ -279,8 +279,8 @@
 The geometry specification is in the standard X format; see
 .BR X (7)
 for more information.
-The width and height are specified in characters; the default is
-80 by 24.
+The width and height are specified in characters; the default for GUI
+frames is 80 by 36.
 See the Emacs manual, section "Options for Window Size and Position",
 for information on how window sizes interact
 with selecting or deselecting the tool bar and menu bar.
@@ -653,7 +653,7 @@
 .
 .
 .SH COPYING
-Copyright 1995, 1999-2018 Free Software Foundation, Inc.
+Copyright 1995, 1999-2019 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff -Nru emacs-26.1+1/doc/man/emacsclient.1 emacs-26.3+1/doc/man/emacsclient.1
--- emacs-26.1+1/doc/man/emacsclient.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/man/emacsclient.1	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 .\" See section COPYING for conditions for redistribution.
 .TH EMACSCLIENT 1
 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
+.\" other params are allowed: see man(7), man(1)
 .SH NAME
 emacsclient \- tells a running Emacs to visit a file
 .SH SYNOPSIS
diff -Nru emacs-26.1+1/doc/man/etags.1 emacs-26.3+1/doc/man/etags.1
--- emacs-26.1+1/doc/man/etags.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/man/etags.1	2019-09-10 00:32:49.000000000 +0000
@@ -281,7 +281,7 @@
 .BR vi ( 1 ).
 
 .SH COPYING
-Copyright 1992, 1999, 2001-2018 Free Software Foundation, Inc.
+Copyright 1992, 1999, 2001-2019 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff -Nru emacs-26.1+1/doc/misc/ChangeLog.1 emacs-26.3+1/doc/misc/ChangeLog.1
--- emacs-26.1+1/doc/misc/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -12116,7 +12116,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/doc/misc/efaq.texi emacs-26.3+1/doc/misc/efaq.texi
--- emacs-26.1+1/doc/misc/efaq.texi	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/efaq.texi	2019-09-10 00:32:49.000000000 +0000
@@ -12,7 +12,7 @@
 @c appreciate a notice if you do).
 
 @copying
-Copyright @copyright{} 2001--2018 Free Software Foundation, Inc.@*
+Copyright @copyright{} 2001--2019 Free Software Foundation, Inc.@*
 Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
 Reuven M. Lerner@*
 Copyright @copyright{} 1992, 1993 Steven Byrnes@*
@@ -1068,6 +1068,11 @@
 from external sources.  Execution of arbitrary Lisp forms in
 @code{display} properties decoded by Enriched Text mode is now
 disabled by default.
+
+@cindex Unicode 11.0.0
+@item
+Emacs 26.2 comes with data files imported from the latest Unicode
+Standard version 11.0.0.
 @end itemize
 
 Consult the Emacs @file{NEWS} file (@kbd{C-h n}) for the full list of
@@ -3357,8 +3362,9 @@
 
 Most GNU/Linux distributions provide pre-built Emacs packages.
 If Emacs is not installed already, you can install it by running (as
-root) a command such as @samp{yum install emacs} (Red Hat and
-derivatives) or @samp{apt-get install emacs} (Debian and derivatives).
+root) a command such as @samp{dnf install emacs} (Red Hat and
+derivatives; use @samp{yum} in older distributions) or
+@samp{apt-get install emacs} (Debian and derivatives).
 
 If you want to compile Emacs yourself, read the file @file{INSTALL} in
 the source distribution.  In brief:
@@ -3500,7 +3506,7 @@
 
 The easiest way to add more features to your Emacs is to use the
 command @kbd{M-x list-packages}.  This contacts the
-@uref{https:///elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'')
+@uref{https://elpa.gnu.org, GNU ELPA} (``Emacs Lisp Package Archive'')
 server and fetches the list of additional packages that it offers.
 These are GNU packages that are available for use with Emacs, but are
 distributed separately from Emacs itself, for reasons of space, etc.
@@ -3509,8 +3515,8 @@
 packages that you select.  @xref{Packages,,, emacs, The GNU Emacs Manual}.
 
 There are other, non-GNU, Emacs Lisp package servers, including:
-@uref{http://melpa.org/, MELPA}; and
-@uref{https://marmalade-repo.org/, Marmalade}.  To use additional
+@uref{https://melpa.org, MELPA}; and
+@uref{https://marmalade-repo.org, Marmalade}.  To use additional
 package servers, customize the @code{package-archives} variable.  Be
 aware that installing a package can run arbitrary code, so only add
 sources that you trust.
@@ -3521,8 +3527,8 @@
 connection between the two can be unreliable) is an official place
 where people can post or announce their extensions to Emacs.
 
-The @uref{http://emacswiki.org, Emacs Wiki} contains pointers to some
-additional extensions.  @uref{http://wikemacs.org, WikEmacs} is an
+The @uref{https://emacswiki.org, Emacs Wiki} contains pointers to some
+additional extensions.  @uref{https://wikemacs.org, WikEmacs} is an
 alternative wiki for Emacs.
 
 @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs
diff -Nru emacs-26.1+1/doc/misc/efaq-w32.texi emacs-26.3+1/doc/misc/efaq-w32.texi
--- emacs-26.1+1/doc/misc/efaq-w32.texi	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/efaq-w32.texi	2019-09-10 00:32:49.000000000 +0000
@@ -15,7 +15,7 @@
 @include emacsver.texi
 
 @copying
-Copyright @copyright{} 2008, 2010-2018 Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2010-2019 Free Software Foundation, Inc.
 
 @quotation
 This list of frequently asked questions about GNU Emacs on MS Windows
@@ -1820,7 +1820,8 @@
 substitute that works for simple text searches is to specify the built
 in Windows command @command{findstr} as the command to run at the
 @kbd{M-x grep} prompt.  Normally you will want to use the @option{/n}
-argument to @command{findstr}.
+argument to @command{findstr}, to have it print the line numbers for
+each hit.
 
 @menu
 * Recursive grep::
@@ -1860,7 +1861,8 @@
 An alternative if you have a recent version of grep is to customize
 @code{grep-find-command} to use @samp{grep -r} instead of both find
 and grep.  Another alternative if you don't need the full capabilities
-of grep is to use @samp{findstr /n /r}.
+of grep is to use @samp{findstr /n /r}; add the @samp{/s} option if
+you want a recursive search.
 
 @c ------------------------------------------------------------
 @node Developing with Emacs
diff -Nru emacs-26.1+1/doc/misc/gnus-news.el emacs-26.3+1/doc/misc/gnus-news.el
--- emacs-26.1+1/doc/misc/gnus-news.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/gnus-news.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib  <Reiner.Steib@gmx.de>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 (defvar gnus-news-header-disclaimer
 "GNUS NEWS -- history of user-visible changes.
 
-Copyright (C) 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
diff -Nru emacs-26.1+1/doc/misc/Makefile.in emacs-26.3+1/doc/misc/Makefile.in
--- emacs-26.1+1/doc/misc/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1994, 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/doc/misc/texinfo.tex emacs-26.3+1/doc/misc/texinfo.tex
--- emacs-26.1+1/doc/misc/texinfo.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/doc/misc/texinfo.tex	2019-09-10 00:32:49.000000000 +0000
@@ -5,10 +5,8 @@
 %
 \def\texinfoversion{2017-12-26.21}
 %
-% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
-% Free Software Foundation, Inc.
+% Copyright 1985-1986, 1988, 1990-2017, 2019 Free Software Foundation,
+% Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
diff -Nru emacs-26.1+1/etc/AUTHORS emacs-26.3+1/etc/AUTHORS
--- emacs-26.1+1/etc/AUTHORS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/AUTHORS	2019-09-10 00:32:49.000000000 +0000
@@ -9,7 +9,7 @@
   ob-awk.el ob-exp.el ob-python.el ob-tangle.el org-bibtex.el org-id.el
   org.el org.texi package.el paren.el
 
-Aaron Jensen: changed frameset.el Info.plist.in nsterm.m
+Aaron Jensen: changed frameset.el nsterm.m Info.plist.in mouse.el
 
 Aaron Larson: co-wrote bibtex.el
 
@@ -93,10 +93,10 @@
 Alan Mackenzie: wrote cc-awk.el
 and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
   cc-langs.el cc-mode.el cc-styles.el cc-vars.el
-and changed cc-mode.texi bytecomp.el subr.el edebug.el modes.texi
-  syntax.texi display.texi font-lock.el isearch.el programs.texi
-  follow.el help.el ispell.el lread.c control.texi cus-start.el doc.c
-  eval.c frames.texi help-fns.el lisp.el and 133 other files
+and changed cc-mode.texi bytecomp.el subr.el display.texi edebug.el
+  follow.el modes.texi syntax.texi font-lock.el isearch.el programs.texi
+  help.el ispell.el lread.c windows.texi control.texi cus-start.el doc.c
+  eval.c frames.texi help-fns.el and 134 other files
 
 Alan Modra: changed unexelf.c
 
@@ -108,9 +108,9 @@
 
 Alan Third: wrote dabbrev-tests.el
 and changed nsterm.m nsfns.m nsterm.h nsmenu.m frame.el macfont.m
-  nsimage.m ns-win.el conf_post.h frame.c frame.h frames.texi keyboard.c
-  macfont.h macos.texi picture.el rect.el Info.plist.in battery.el
-  callproc.c configure.ac and 11 other files
+  nsimage.m ns-win.el xdisp.c Info.plist.in conf_post.h frame.c frame.h
+  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el
+  battery.el callproc.c and 12 other files
 
 Alastair Burt: changed gnus-art.el smiley.el
 
@@ -128,7 +128,7 @@
   CTAGS.good ETAGS.good_1 ETAGS.good_2 ETAGS.good_3 ETAGS.good_4
   ETAGS.good_5 ETAGS.good_6 Makefile TAGTEST.EL cl-lib-tests.el
   cl-macs-tests.el cus-start.el custom.texi display.texi erc-list.el
-  ert-tests.el ert.el etags.c and 15 other files
+  ert-tests.el ert.el etags.c and 18 other files
 
 Alexander Haeckel: changed getset.el
 
@@ -162,7 +162,8 @@
 Alexandru Harsanyi: wrote soap-client.el soap-inspect.el
 and changed emacs3.py vc-hooks.el vc.el xml.el
 
-Alex Branham: changed bibtex.el dired-x.el dired.el eww.el
+Alex Branham: changed bibtex.el dired-x.el dired.el em-rebind.el eww.el
+  imenu.el indent.el modes.texi programs.texi text.texi
 
 Alex Coventry: changed files.el
 
@@ -203,8 +204,8 @@
 
 Alin C. Soare: changed lisp-mode.el hexl.el
 
-Allen Li: changed abbrev.el comint.el dired-x.el misc.texi
-  progmodes/compile.el subr.el
+Allen Li: changed abbrev.el bookmark.el comint.el dired-x.el misc.texi
+  nsm.el progmodes/compile.el subr.el
 
 Allen S. Rout: changed org-capture.el
 
@@ -268,7 +269,7 @@
 Andreas Schwab: changed configure.ac lisp.h process.c xdisp.c alloc.c
   coding.c Makefile.in files.el fileio.c keyboard.c lread.c xterm.c fns.c
   editfns.c emacs.c src/Makefile.in print.c eval.c font.c xfns.c sysdep.c
-  and 639 other files
+  and 640 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el
   gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el
@@ -365,8 +366,8 @@
 Arash Esbati: changed reftex-vars.el reftex.el reftex-auc.el
   reftex-ref.el
 
-Ari Roponen: changed atimer.c doc.c hash.texi mule.texi package.el
-  startup.el subr.el svg.el time-date.el woman.el
+Ari Roponen: changed xterm.c atimer.c doc.c hash.texi image.c mule.texi
+  package.el startup.el subr.el svg.el time-date.el woman.el
 
 Arisawa Akihiro: changed characters.el coding.c epa-file.el japan-util.el
   language/tibetan.el message.el mm-decode.el mm-view.el ps-print.el
@@ -439,9 +440,11 @@
   sendmail.el ses.el simple.el verilog-mode.el vi.el vip.el viper-cmd.el
   xscheme.el
 
-Basil L. Contovounesios: changed simple.el message.el css-mode-tests.el
-  css-mode.el customize.texi gnus-art.el json-tests.el json.el man.el
-  shr-color.el text.texi
+Basil L. Contovounesios: changed simple.el message.el customize.texi
+  gnus.texi internals.texi sequences.texi bibtex.el css-mode-tests.el
+  css-mode.el display.texi electric.el eval.texi functions.texi
+  gnus-art.el gnus-cus.el gnus-gravatar.el gravatar.el ibuffer.el
+  image-tests.el image.el indent.el and 16 other files
 
 Bastian Beischer: changed include.el mru-bookmark.el refs.el
   semantic/complete.el senator.el
@@ -469,8 +472,9 @@
 Benjamin Drieu: wrote pong.el
 and changed org-clock.el org.el
 
-Benjamin Riefenstahl: changed w32select.c emacs.c inc/ms-w32.h lisp.h
-  mac-win.el macterm.c mule-cmds.el runemacs.c tcl.el w32.c w32.h
+Benjamin Riefenstahl: changed w32select.c emacs.c image-mode.el image.el
+  inc/ms-w32.h lisp.h mac-win.el macterm.c mule-cmds.el runemacs.c tcl.el
+  w32.c w32.h
 
 Benjamin Rutt: co-wrote gnus-dired.el
 and changed vc.el gnus-msg.el message.el diff-mode.el ffap.el nnimap.el
@@ -574,6 +578,8 @@
 
 Brandon Craig Rhodes: changed flyspell.el
 
+Braun Gábor: changed cua-base.el
+
 Brendan Kehoe: changed hpux9.h
 
 Brent Goodrick: changed abbrev.el
@@ -668,10 +674,10 @@
 
 Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 
-Charles A. Roelli: changed nsterm.m display.texi nsfns.m nsterm.h
-  org-clock.el DEBUG INSTALL add-log.el anti.texi buffers.texi comint.el
-  data.c diff-mode.el eldoc.el files.el fill.el find-func.el flymake.el
-  frame.el internals.texi macfont.m and 13 other files
+Charles A. Roelli: changed nsterm.m display.texi isearch.el nsfns.m
+  nsterm.h org-clock.el search.texi simple.el DEBUG INSTALL add-log.el
+  anti.texi buffers.texi comint.el data.c diff-mode.el eldoc.el files.el
+  fill.el find-func.el flymake.el and 21 other files
 
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
@@ -701,7 +707,8 @@
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
-Chris Feng: changed dispnew.c autoload.el frame.c process.c
+Chris Feng: changed dispnew.c autoload.el frame.c keyboard-tests.el
+  keyboard.c process.c
 
 Chris Foote: changed progmodes/python.el
 
@@ -778,7 +785,7 @@
 
 Christoph Egger: changed configure.ac
 
-Christophe Junke: changed org-agenda.el org.el
+Christophe Junke: changed ido.el org-agenda.el org.el
 
 Christopher Allan Webber: changed gamegrid.el org-agenda.el tetris.el
 
@@ -872,7 +879,8 @@
 Damien Cassou: wrote auth-source-pass-tests.el
 and co-wrote auth-source-pass.el auth-source-tests.el
 and changed seq-tests.el seq.el simple-tests.el simple.el auth-source.el
-  auth.texi imenu-tests.el imenu.el info.el isearch.el sequences.texi
+  auth.texi imenu-tests.el imenu.el info.el isearch.el rmc.el
+  sequences.texi
 
 Damien Elmes: changed erc.el erc-dcc.el erc-track.el erc-log.el
   erc-pcomplete.el README erc-button.el erc-nets.el erc-ring.el Makefile
@@ -928,12 +936,16 @@
 
 Daniel Jensen: changed apropos.el
 
+Daniel Kahn Gillmor: changed mml-sec.el
+
 Daniel Koning: changed artist.el commands.texi subr.el
 
 Daniel LaLiberte: wrote cust-print.el edebug.el isearch.el
 and co-wrote hideif.el
 and changed mlconvert.el eval-region.el
 
+Daniel Lopez: changed progmodes/compile.el
+
 Daniel Lublin: changed dns-mode.el
 
 Daniel McClanahan: changed lisp-mode.el
@@ -981,6 +993,8 @@
 
 Dan Rosenberg: changed movemail.c
 
+Dario Gjorgjevski: changed recentf.el
+
 Darren Hoo: changed db-find.el db.el gnus-art.el isearch.el man.el
   nsmenu.m startup.el
 
@@ -1129,7 +1143,7 @@
 David O'Toole: wrote ox-publish.el
 and co-wrote ob-lisp.el
 
-David Pathakjee: changed minibuf.c
+David Pathakjee: changed emacs-lisp/debug.el minibuf.c
 
 David Ponce: wrote bovine/grammar.el cedet.el comp.el java-tags.el
   mode-local.el recentf.el ruler-mode.el semantic/grammar.el
@@ -1205,7 +1219,8 @@
 Detlev Zundel: wrote re-builder.el
 and changed buffer.c
 
-Devon Sean McCullough: changed url-http.el comint.el ns-win.el
+Devon Sean McCullough: changed url-http.el buff-menu.el comint.el
+  ns-win.el
 
 Dhruva Krishnamurthy: changed emacsclient.c fontset.c sound.c w32proc.c
 
@@ -1290,7 +1305,7 @@
 and changed cus-edit.el dired.el faces.el files.el help-mode.el imenu.el
   info.el isearch.el ls-lisp.el menu-bar.el modes.texi mouse.el
   ange-ftp.el apropos.el bindings.el bookmark.el custom.el descr-text.el
-  dired.texi etags.el finder.el and 14 other files
+  dired.texi etags.el finder.el and 15 other files
 
 E. Choroba: changed simple.el
 
@@ -1343,9 +1358,9 @@
   chartab-tests.el coding-tests.el doc-tests.el etags-tests.el rxvt.el
   tty-colors.el
 and changed xdisp.c msdos.c w32.c display.texi w32fns.c simple.el
-  files.el fileio.c w32proc.c keyboard.c w32term.c files.texi text.texi
-  dispnew.c emacs.c frames.texi lisp.h dispextern.h process.c term.c
-  window.c and 1111 other files
+  files.el fileio.c keyboard.c w32proc.c files.texi w32term.c text.texi
+  dispnew.c emacs.c frames.texi lisp.h dispextern.h window.c process.c
+  term.c and 1126 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1366,11 +1381,11 @@
 Era Eriksson: changed bibtex.el dired.el json.el ses.el ses.texi shell.el
   tramp.el tramp.texi
 
-Eric Abrahamsen: changed eieio-base.el nnimap.el registry.el
-  gnus-registry.el files.el files.texi windows.texi eieio-test-persist.el
-  eieio.el gnus-start.el nnir.el buffers.texi files-tests.el
-  gnus-bcklg.el gnus-group.el gnus-sum.el gnus.texi nnmairix.el org.el
-  org.texi ox-html.el ox-latex.el
+Eric Abrahamsen: changed eieio-base.el registry.el nnimap.el
+  gnus-registry.el files.el files.texi gnus-sum.el nnir.el windows.texi
+  eieio-test-persist.el eieio.el gnus-start.el gnus.texi buffers.texi
+  checkdoc.el files-tests.el gnus-bcklg.el gnus-group.el nnmairix.el
+  org.el org.texi and 4 other files
 
 Eric Bélanger: changed image.c
 
@@ -1548,8 +1563,8 @@
 
 Filipe Cabecinhas: changed nsterm.m
 
-Filipp Gunbin: changed autorevert.el shell.el cc-menus.el dired-aux.el
-  info.el info.texi
+Filipp Gunbin: changed autorevert.el shell.el auth-source-tests.el
+  auth-source.el cc-menus.el dired-aux.el info.el info.texi
 
 Flemming Hoejstrup Hansen: changed forms.el
 
@@ -1655,6 +1670,8 @@
 Gary D. Foster: wrote crisp.el scroll-all.el
 and changed gnus-group.el gnus-topic.el
 
+Gary Fredericks: changed window.el
+
 Gary Howell: changed server.el
 
 Gary Oberbrunner: changed gud.el
@@ -1668,11 +1685,11 @@
 Geert Kloosterman: changed which-func.el
 
 Gemini Lasswell: wrote edebug-tests.el kmacro-tests.el testcover-tests.el
-and changed edebug.el cl-macs.el cl-generic.el ert-x.el
+and changed edebug.el cl-macs.el cl-generic.el ert-x.el cl-print.el
   edebug-test-code.el edebug.texi eieio-compat.el generator.el subr.el
-  autorevert-tests.el filenotify-tests.el generator-tests.el kmacro.el
-  lread.c map-tests.el map.el pcase.el rst.el ses.el subr-tests.el
-  subr-x-tests.el and 4 other files
+  autorevert-tests.el cl-print-tests.el eieio.texi emacs-lisp/debug.el
+  eval-tests.el eval.c filenotify-tests.el generator-tests.el kmacro.el
+  lread.c map-tests.el and 10 other files
 
 Geoff Gole: changed align.el ibuffer.el whitespace.el
 
@@ -1727,9 +1744,9 @@
 Glenn Morris: wrote check-declare.el f90-tests.el vc-bzr-tests.el
 and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
-  progmodes/f90.el bytecomp.el simple.el authors.el emacs.texi
-  misc/Makefile.in admin.el startup.el lib-src/Makefile.in ack.texi
-  display.texi cal-menu.el and 1675 other files
+  progmodes/f90.el bytecomp.el simple.el authors.el admin.el emacs.texi
+  misc/Makefile.in startup.el lib-src/Makefile.in ack.texi display.texi
+  cal-menu.el and 1681 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1775,7 +1792,7 @@
 
 Gregory Neil Shapiro: changed mailabbrev.el
 
-Gregor Zattler: changed emacs-lisp-intro.texi
+Gregor Zattler: changed eshell.texi emacs-lisp-intro.texi
 
 Greg Stark: changed gnus-ems.el timezone.el
 
@@ -1974,8 +1991,8 @@
 
 Ivan Shmakov: changed eww.el shr.el desktop.el eww.texi faces.el files.el
   cus-dep.el descr-text.el diff-mode.el enriched.el erc-track.el
-  facemenu.el files.texi misearch.el nndoc.el simple.el tar-mode.el
-  tcl.el tex-mode.el url-cookie.el
+  facemenu.el files.texi iso-transl.el misearch.el nndoc.el simple.el
+  tar-mode.el tcl.el tex-mode.el url-cookie.el
 
 Ivan Vilata i Balaguer: changed org-clock.el org.texi
 
@@ -2122,7 +2139,7 @@
 
 Jay K. Adams: wrote jka-cmpr-hook.el jka-compr.el
 
-Jay Kamat: changed erc-goodies.el
+Jay Kamat: changed erc-goodies.el esh-opt.el
 
 Jay McCarthy: changed org-colview.el
 
@@ -2134,6 +2151,7 @@
   mouse.el
 
 Jean-Christophe Helary: changed ns-win.el strings.texi subr-x.el
+  ucs-normalize.el
 
 Jean Haidouk: changed latin-alt.el latin-post.el latin-pre.el
 
@@ -2376,6 +2394,8 @@
   bytecomp.el cus-theme.el font-lock.el hexl.el ibuf-macs.el info.el
   minibuf.c re-builder.el simple.el startup.el and 135 other files
 
+John Shahid: changed easy-mmode.el term.c termhooks.h terminal.c
+
 John Sullivan: changed window.c
 
 John Tobey: changed gud.el
@@ -2415,6 +2435,9 @@
   vc.el gnus-sum.el jka-compr.el rmailout.el rnewspost.el sendmail.el
   simple.el timezone.el vc-hooks.el
 
+Jonathan Kyle Mitchell: changed em-dirs.el em-ls.el em-unix.el esh-cmd.el
+  esh-ext.el
+
 Jonathan Leech-Pepin: wrote ox-texinfo.el
 
 Jonathan Marchand: changed cpp-root.el
@@ -2438,6 +2461,8 @@
 
 Joost Kremers: changed reftex-toc.el
 
+Jordan Wilson: changed doc-view.el
+
 Jorge A. Alfaro-Murillo: changed message.el
 
 Jorgen Schäfer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el
@@ -2488,7 +2513,7 @@
 and changed subr.el desktop.el w32fns.c server.el emacsclient.c simple.el
   faces.el files.el bs.el help-fns.el w32term.c org.el xdisp.c keyboard.c
   w32.c buffer.c ido.el image.c window.c allout.el process.c
-  and 1134 other files
+  and 1140 other files
 
 Juan Pechiar: wrote ob-mscgen.el
 and changed ob-octave.el
@@ -2531,9 +2556,9 @@
 
 Juri Linkov: wrote files-x.el misearch.el replace-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
-  dired-aux.el dired.el progmodes/compile.el startup.el faces.el files.el
+  dired.el dired-aux.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 357 other files
+  image-mode.el ispell.el man.el cus-edit.el and 359 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -2590,9 +2615,10 @@
 Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
 and co-wrote pcvs.el
 and changed simple.el files.el doc-view.el image-mode.el info.el
-  vc-svn.el CONTRIBUTE INSTALL autogen.sh isearch.el menu-bar.el
-  simple-test.el subr.el tex-mode.el thingatpt.el INSTALL.REPO comint.el
-  configure configure.ac editfns.c electric-tests.el and 17 other files
+  vc-svn.el CONTRIBUTE INSTALL autogen.sh internals.texi isearch.el
+  menu-bar.el simple-test.el subr.el tex-mode.el thingatpt.el
+  INSTALL.REPO comint.el configure configure.ac editfns.c
+  and 18 other files
 
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
   alloc.c files.el frame.c configure.ac window.c data.c minibuf.c
@@ -2622,9 +2648,9 @@
 Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el
 
 Katsumi Yamaoka: wrote canlock.el
-and changed gnus-art.el gnus-sum.el message.el mm-decode.el gnus.texi
-  mm-util.el mm-view.el gnus-util.el gnus-group.el gnus-msg.el shr.el
-  mml.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
+and changed gnus-art.el message.el gnus-sum.el mm-decode.el gnus.texi
+  mm-util.el mm-view.el gnus-util.el gnus-group.el gnus-msg.el mml.el
+  shr.el rfc2047.el gnus-start.el gnus.el nntp.el gnus-agent.el nnrss.el
   mm-uu.el nnmail.el emacs-mime.texi and 160 other files
 
 Kaushal Modi: changed files.el isearch.el apropos.el calc-yank.el
@@ -2783,6 +2809,8 @@
 Konrad Hinsen: wrote org-eshell.el
 and changed ob-python.el
 
+Konstantin Kharlamov: changed prepare-commit-msg
+
 Konstantin Kliakhandler: changed org-agenda.el
 
 Konstantin Novitsky: changed progmodes/python.el
@@ -2858,7 +2886,7 @@
   rfc2047.el time-date.el
 and changed gnus.texi process.c gnus-ems.el subr.el gnutls.c gnus-cite.el
   pop3.el smtpmail.el display.texi files.el url-http.el gnus-xmas.el
-  simple.el auth-source.el image.c proto-stream.el gnutls.el dired.el
+  simple.el auth-source.el image.c gnutls.el proto-stream.el dired.el
   image.el text.texi nnrss.el and 318 other files
 
 Lars Rasmusson: changed ebrowse.c
@@ -2901,8 +2929,8 @@
 and changed octave.el ido.el rcirc.el files.el subr.el lisp-mode.el
   eldoc.el simple.el flymake.el smie.el abbrev.el progmodes/python.el
   cfengine.el cl-extra.el cl-macs.el emacs-lisp/cl-lib.el fns.c
-  progmodes/compile.el register.el rng-valid.el window.el
-  and 164 other files
+  progmodes/compile.el register.el rng-valid.el thingatpt.el
+  and 166 other files
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el sendmail.el
@@ -3040,9 +3068,9 @@
 
 Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el
   isearch.el vc-bzr.el  NXML-NEWS cc-mode.texi compilation.txt ede.texi
-  eieio.texi esh-mode.el flymake.el gnus-group.el misc/Makefile.in
-  nxml-mode.texi progmodes/compile.el progmodes/python.el programs.texi
-  schema and 6 other files
+  eieio.texi esh-mode.el flymake.el gnus-group.el menu-bar.el
+  misc/Makefile.in nxml-mode.texi progmodes/compile.el
+  progmodes/python.el programs.texi and 8 other files
 
 Mark Davies: changed amdx86-64.h configure configure.ac hp800.h
   lib-src/Makefile.in netbsd.h ralloc.c sh3el.h sort.el
@@ -3113,7 +3141,7 @@
 and changed bytecomp.el byte-opt.el doctor.el image-mode.el
   processes.texi calc-math.el emacs.c expand.el flymake.el flymake.texi
   flyspell.el handwrite.el internals.texi proced.el prolog.el ps-mode.el
-  speedbar.el subr.el tumme.el widget.texi xterm.c
+  speedbar.el subr.el text.texi tumme.el widget.texi and 3 other files
 
 Mark W. Eichin: changed keyboard.c xterm.c
 
@@ -3146,7 +3174,7 @@
 Martin Rudalics: changed window.el window.c windows.texi frame.c
   frames.texi w32fns.c xdisp.c xterm.c w32term.c frame.el xfns.c help.el
   buffer.c display.texi cus-start.el dispnew.c frame.h mouse.el nsfns.m
-  window.h gtkutil.c and 201 other files
+  window.h gtkutil.c and 203 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
@@ -3217,7 +3245,7 @@
   objects.texi os.texi positions.texi searching.texi subr.el text.texi
   and 3 other files
 
-Matthias Dahl: changed faces.el
+Matthias Dahl: changed faces.el process.c process.h
 
 Matthias Förste: changed files.el
 
@@ -3237,6 +3265,8 @@
   edebug.texi eldoc.el em-hist.el em-pred.el fixit.texi icon.el ido.el
   locate.el paragraphs.el pcomplete.el repeat.el and 3 other files
 
+Mattias Engdegård: changed searching.texi subr.el
+
 Matt Lundin: changed org-agenda.el org.el org-bibtex.el org-footnote.el
   ox-publish.el org-bbdb.el org-datetree.el org-gnus.el
 
@@ -3249,6 +3279,11 @@
 Matt Swift: changed dired.el editfns.c lisp-mode.el mm-decode.el
   outline.el progmodes/compile.el rx.el simple.el startup.el
 
+Mauro Aranda: changed autorevert.el cc-mode.texi control.texi dbus.texi
+  dired-x.texi eudc.texi files.texi functions.texi gnus-faq.texi
+  gnus.texi info.el modes.texi octave.el org.texi os.texi picture.el
+  pong.el positions.texi reftex.texi variables.texi
+
 Maxime Edouard Robert Froumentin: changed gnus-art.el mml.el
 
 Max Mikhanosha: changed org-agenda.el org-habit.el org.el
@@ -3259,15 +3294,15 @@
 
 Michael Albinus: wrote autorevert-tests.el dbus-tests.el dbus.el
   filenotify-tests.el filenotify.el files-x-tests.el secrets.el
-  tramp-cmds.el tramp-compat.el tramp-ftp.el tramp-gvfs.el tramp-smb.el
-  tramp-tests.el url-tramp-tests.el url-tramp.el vc-tests.el xesam.el
-  zeroconf.el
+  shadowfile-tests.el tramp-cmds.el tramp-compat.el tramp-ftp.el
+  tramp-gvfs.el tramp-smb.el tramp-tests.el url-tramp-tests.el
+  url-tramp.el vc-tests.el xesam.el zeroconf.el
 and co-wrote tramp-cache.el tramp-sh.el tramp.el
 and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   file-notify-tests.el ange-ftp.el files.el dbus.texi files.texi
   autorevert.el tramp-fish.el kqueue.c tramp-gw.el tramp-imap.el os.texi
   configure.ac lisp.h gfilenotify.c inotify.c keyboard.c
-  and 217 other files
+  and 224 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -3300,8 +3335,8 @@
 
 Michael Harnois: changed nnimap.el
 
-Michael Heerdegen: changed subr-x.el control.texi dired.el easy-mmode.el
-  eldoc.el pcase.el shr.el subr-x-tests.el wdired.el
+Michael Heerdegen: changed subr-x.el control.texi dired-aux.el dired.el
+  easy-mmode.el eldoc.el pcase.el shr.el subr-x-tests.el wdired.el
 
 Michael Hoffman: changed term.el xterm.el
 
@@ -3387,6 +3422,8 @@
 
 Michihito Shigemura: changed sh-script.el
 
+Miciah Masters: changed rcirc.el rcirc.texi
+
 Microelectronics and Computer Technology Corporation: changed
   emacsclient.c etags.c lisp.h movemail.c rmail.el rmailedit.el
   rmailkwd.el rmailmsc.el rmailout.el rmailsum.el scribe.el server.el
@@ -3410,8 +3447,8 @@
 
 Mike Kazantsev: changed erc-dcc.el
 
-Mike Kupfer: changed mh-e.el emacs-mime.texi gnus-mh.el gnus.texi
-  mh-acros.el mh-comp.el mh-compat.el mh-e.texi mh-mime.el mh-utils.el
+Mike Kupfer: changed mh-comp.el mh-e.el emacs-mime.texi gnus-mh.el
+  gnus.texi mh-acros.el mh-compat.el mh-e.texi mh-mime.el mh-utils.el
 
 Mike Lamb: changed em-unix.el esh-util.el pcmpl-unix.el
 
@@ -3512,6 +3549,8 @@
 
 Neil Mager: wrote appt.el
 
+Neil Roberts: changed custom.texi files.el
+
 Neil W. Van Dyke: wrote webjump.el
 
 Nelson H. F. Beebe: changed configure.ac
@@ -3529,6 +3568,8 @@
 
 Nic Ferrier: changed ert.el tramp.el
 
+Nicholas Drozd: changed calc.texi
+
 Nicholas Maniscalco: changed term.el
 
 Nick Alcock: changed control.texi customize.texi display.texi files.el
@@ -3538,6 +3579,8 @@
 Nick Dokos: changed org-table.el ox.el icalendar.el mh-search.el
   org-mobile.el org.el ox-ascii.el url-cache.el
 
+Nick Drozd: changed eww.el eww.texi
+
 Nick Helm: changed eldoc.el help.el help.texi whitespace-tests.el
   whitespace.el
 
@@ -3569,11 +3612,11 @@
 Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
   thunk-tests.el thunk.el
 and co-wrote auth-source-pass.el auth-source-tests.el subr-tests.el
-and changed sequences.texi README configure.ac sed2v2.inp authors.el
-  emacs.png README.W32 emacs23.png arc-mode.el cl-extra.el emacs.svg
-  manoj-dark-theme.el Emacs.icns Makefile.in auth-source.el emacs.ico
-  fns.c make-tarball.txt obarray-tests.el obarray.el HISTORY
-  and 34 other files
+and changed README configure.ac sed2v2.inp sequences.texi authors.el
+  README.W32 emacs.png emacs23.png HISTORY arc-mode.el cl-extra.el
+  emacs.svg manoj-dark-theme.el Emacs.icns Makefile.in auth-source.el
+  emacs.ico fns.c make-tarball.txt obarray-tests.el obarray.el
+  and 35 other files
 
 Nicolas Richard: wrote cl-seq-tests.el cmds-tests.el replace-tests.el
 and changed ffap.el package.el byte-run.el help.el keyboard.c landmark.el
@@ -3605,7 +3648,7 @@
 
 Nitish Chandra: changed simple.el
 
-N. Jackson: changed emacs.texi
+N. Jackson: changed emacs.texi forms.texi
 
 Noah Friedman: wrote eldoc.el rlogin.el type-break.el
 and co-wrote erc-dcc.el
@@ -3616,11 +3659,11 @@
 
 Noah Lavine: changed tramp.el
 
-Noam Postavsky: changed progmodes/python.el lisp-mode.el xdisp.c
-  cl-macs.el emacs-lisp/debug.el data.c ert.el lisp-mode-tests.el
-  simple.el help-fns.el subr.el term.el bytecomp.el elisp-mode.el eval.c
-  ffap.el modes.texi search.c sh-script.el cl-preloaded.el cl-print.el
-  and 223 other files
+Noam Postavsky: changed lisp-mode.el progmodes/python.el
+  lisp-mode-tests.el xdisp.c cl-macs.el term.el emacs-lisp/debug.el
+  bytecomp.el data.c simple.el ert.el help-fns.el processes.texi subr.el
+  modes.texi cl-print.el elisp-mode.el eval.c ffap.el search.c
+  sh-script.el and 259 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el
 
@@ -3721,10 +3764,10 @@
 
 Paul Eggert: wrote rcs2log
 and co-wrote cal-dst.el
-and changed lisp.h configure.ac alloc.c process.c fileio.c xdisp.c
-  editfns.c sysdep.c image.c keyboard.c emacs.c xterm.c data.c lread.c
+and changed lisp.h configure.ac alloc.c process.c fileio.c editfns.c
+  xdisp.c sysdep.c image.c keyboard.c emacs.c xterm.c data.c lread.c
   fns.c callproc.c Makefile.in gnulib.mk eval.c buffer.c frame.c
-  and 1596 other files
+  and 1608 other files
 
 Paul Fisher: changed fns.c
 
@@ -3883,6 +3926,8 @@
 
 Philip Jackson: wrote find-cmd.el org-irc.el
 
+Philip K: changed ispell.el
+
 Philippe Schnoebelen: wrote gomoku.el mpuz.el
 
 Philippe Vaucher: changed callint.c composite.el debugging.texi
@@ -3898,21 +3943,21 @@
 Philipp Stephani: wrote checkdoc-tests.el ediff-diff-tests.el
   eval-tests.el ido-tests.el lread-tests.el mouse-tests.el
   xt-mouse-tests.el
-and changed emacs-module.c eval.c bytecomp.el emacs-module-tests.el
-  files.el lread.c nsterm.m configure.ac editfns.c mod-test.c alloc.c
-  electric.el gtkutil.c lisp.h electric-tests.el emacs.c macfont.m
-  test/Makefile.in xt-mouse.el Makefile bytecomp-tests.el
-  and 95 other files
+and changed emacs-module.c eval.c bytecomp.el nsterm.m
+  emacs-module-tests.el files.el lread.c configure.ac editfns.c
+  mod-test.c alloc.c electric.el gtkutil.c lisp.h electric-tests.el
+  emacs.c macfont.m test/Makefile.in xt-mouse.el Makefile
+  bytecomp-tests.el and 96 other files
 
 Phillip Lord: wrote ps-print-tests.el
 and changed lisp/Makefile.in undo.c simple.el test/Makefile.in Makefile
-  Makefile.in viper-cmd.el elisp-mode-tests.el keyboard.c ldefs-clean.el
-  loadup.el autoload.el automated/Makefile.in build-zips.sh cmds.c
-  dired.el eieio-tests.el fileio.c htmlfontify.el
-  make-test-deps.emacs-lisp reftex-tests.el and 168 other files
+  Makefile.in viper-cmd.el README.W32 elisp-mode-tests.el keyboard.c
+  ldefs-clean.el loadup.el autoload.el automated/Makefile.in
+  build-zips.sh cmds.c dired.el eieio-tests.el fileio.c htmlfontify.el
+  make-test-deps.emacs-lisp and 168 other files
 
-Phil Sainty: changed derived.el easy-mmode.el lisp.el package.el
-  progmodes/grep.el simple.el subword.el term.el
+Phil Sainty: changed term.el derived.el easy-mmode.el lisp.el package.el
+  progmodes/grep.el simple.el subword.el
 
 Phil Sung: changed wdired.el dired.texi follow.el progmodes/python.el
 
@@ -3920,7 +3965,7 @@
 
 Pierre Poissinger: changed charset.c
 
-Pierre Téchoueyres: changed eieio-test-persist.el tramp-cmds.el
+Pierre Téchoueyres: changed eieio-test-persist.el epg.el tramp-cmds.el
 
 Pieter E.J. Pareit: wrote mixal-mode.el
 
@@ -3959,6 +4004,8 @@
 
 Raffael Mancini: changed misc.el
 
+Raimon Grau: changed replace.el thingatpt.el
+
 Rainer Orth: changed gtkutil.c lisp/Makefile.in
 
 Rainer Schöpf: changed osf1.h unexalpha.c alloc.c alpha.h buffer.c
@@ -4096,7 +4143,7 @@
 Rick Sladkey: wrote backquote.el
 and changed gud.el intervals.c intervals.h simple.el
 
-Rob Browning: changed tls.el configure.ac
+Rob Browning: changed tls.el configure.ac ibuffer-tests.el tramp-tests.el
 
 Rob Christie: changed nsmenu.m
 
@@ -4125,10 +4172,11 @@
 
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
-Robert Pluim: changed gtkutil.c misc.texi vc-git.el xfns.c xterm.c
-  bindings.el configure.ac desktop.el dired-x.texi epa.texi gnus-agent.el
-  gnus-demon.el gnus.texi ido.el image-mode.el minibuf.c minibuf.texi
-  org-agenda.el process.c progmodes/grep.el project.el and 8 other files
+Robert Pluim: changed gtkutil.c configure.ac files.texi dired-x.texi
+  filelock.c ftfont.c misc.texi process.c vc-git.el xfns.c xterm.c
+  bindings.el building.texi desktop.el efaq.texi epa.texi font.c
+  ftcrfont.c gnus-agent.el gnus-demon.el gnus-icalendar.el
+  and 22 other files
 
 Robert Thorpe: changed cus-start.el indent.el
 
@@ -4245,7 +4293,7 @@
 
 Sam Steingold: wrote gulp.el midnight.el
 and changed progmodes/compile.el cl-indent.el simple.el vc-cvs.el vc.el
-  mouse.el files.el font-lock.el tex-mode.el vc-hg.el ange-ftp.el
+  mouse.el vc-hg.el files.el font-lock.el tex-mode.el ange-ftp.el
   sgml-mode.el window.el add-log.el bindings.el bookmark.el
   bug-reference.el calendar.el cperl-mode.el diary-lib.el dired.el
   and 152 other files
@@ -4293,6 +4341,8 @@
 Scott Byer: co-wrote nnfolder.el
 and changed gnus-sum.el
 
+Scott Corley: changed scroll.c
+
 Scott Draves: wrote tq.el
 
 Scott Evans: changed rect.el
@@ -4354,6 +4404,8 @@
 
 Sergey Poznyakoff: changed rmail.el mh-mime.el rmail.texi smtpmail.el
 
+Sergey Vinokurov: changed emacs-module-tests.el emacs-module.c mod-test.c
+
 Sergio Durigan Junior: changed eudcb-bbdb.el gdb-mi.el
 
 Sergio Martinez: changed nnimap.el
@@ -4381,8 +4433,8 @@
   and 93 other files
 
 Shigeru Fukaya: wrote bytecomp-tests.el
-and changed apropos.el byte-opt.el bytecomp.el elint.el rx-new.el ses.el
-  subr.el texinfmt.el
+and changed apropos.el bs.el byte-opt.el bytecomp.el elint.el rx-new.el
+  ses.el subr.el texinfmt.el
 
 Shinichirou Sugou: changed etags.c
 
@@ -4407,7 +4459,8 @@
   ring-tests.el rot13-tests.el sql-tests.el
 and changed css-mode.el json-tests.el json.el sgml-mode.el css-mode.css
   scss-mode.scss ring.el rot13.el scheme.el sql.el color.el files.el
-  js.el less-css-mode.el less-css-mode.less maintaining.texi
+  js.el less-css-mode.el less-css-mode.less maintaining.texi midnight.el
+  seq.el sequences.texi
 
 Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
   mml-sec.el mml-smime.el password-cache.el rfc2104.el sieve-mode.el
@@ -4459,6 +4512,9 @@
 
 Stefan Guath: changed find-dired.el
 
+Stefan Kangas: changed bookmark.el buffer.c fileio.c package-x.el
+  package.texi windows.texi winner.el
+
 Stefan Merten: co-wrote rst.el
 
 Stefan Monnier: wrote bibtex-style.el bytecomp-tests.el bzrmerge.el
@@ -4471,8 +4527,8 @@
 and co-wrote font-lock.el gitmerge.el pcvs.el
 and changed subr.el simple.el keyboard.c lisp.h bytecomp.el files.el
   vc.el cl-macs.el xdisp.c alloc.c eval.c sh-script.el
-  progmodes/compile.el keymap.c tex-mode.el newcomment.el window.c
-  buffer.c lisp-mode.el lread.c vc-hooks.el and 1280 other files
+  progmodes/compile.el keymap.c tex-mode.el newcomment.el buffer.c
+  window.c lisp-mode.el lread.c vc-hooks.el and 1283 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -4503,10 +4559,10 @@
 Stephen Berman: wrote todo-mode-tests.el
 and co-wrote todo-mode.el
 and changed todo-mode.texi diary-lib.el dired-tests.el doc-view.el
-  files.el minibuffer.el dired.el frames.texi hl-line.el info.el
-  menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes allout.el
-  artist.el compile.texi cus-start.el descr-text.el dframe.el
-  and 39 other files
+  files.el minibuffer.el wdired-tests.el dired.el frames.texi hl-line.el
+  info.el menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes
+  TUTORIAL allout.el artist.el compile.texi cus-start.el
+  and 43 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -4527,8 +4583,8 @@
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: wrote elisp-mode-tests.el
-and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el xref.el
-  CONTRIBUTE vc-mtn.el window.el ada-mode.texi ada-prj.el cedet-global.el
+and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el window.el
+  xref.el CONTRIBUTE vc-mtn.el ada-mode.texi ada-prj.el cedet-global.el
   ede/generic.el ada-stmt.el cl-generic.el ede/locate.el files.texi
   project.el windows.texi INSTALL.REPO INSTALL.W64 align.el
   and 21 other files
@@ -4702,7 +4758,7 @@
 and changed ewoc.el vc.el info.el processes.texi zone.el lisp-mode.el
   scheme.el text.texi vc-rcs.el display.texi fileio.c files.el vc-git.el
   MORE.STUFF TUTORIAL.it bindat.el cc-vars.el configure.ac dcl-mode.el
-  diff-mode.el dired.el and 163 other files
+  diff-mode.el dired.el and 169 other files
 
 Thierry Banel: co-wrote ob-C.el
 and changed calc-arith.el
@@ -4801,13 +4857,15 @@
   em-ls-tests.el ffap-tests.el hi-lock-tests.el ls-lisp-tests.el
   register-tests.el rmc-tests.el
 and changed ibuffer.el dired-tests.el ibuf-ext.el dired.el dired-aux.el
-  simple.el ibuffer-tests.el ls-lisp.el diff-mode.el ibuf-macs.el
-  cl-seq.el dired-x.el dired.texi ediff-ptch.el em-ls.el files.el
-  replace.el buff-menu.el cl.texi ediff-init.el files-tests.el
-  and 82 other files
+  replace.el simple.el ibuffer-tests.el ls-lisp.el diff-mode.el
+  ibuf-macs.el replace-tests.el cl-seq.el dired-x.el dired.texi
+  ediff-ptch.el em-ls.el files.el buff-menu.el cl.texi ediff-init.el
+  and 83 other files
 
 Titus von der Malsburg: changed simple.el window.el
 
+Tobias Bading: changed progmodes/compile.el
+
 Tobias C. Rittweiler: changed font-lock.el searching.texi sendmail.el
 
 Tobias Ringström: changed etags.c
@@ -4835,6 +4893,8 @@
 
 Tom Houlder: wrote mantemp.el
 
+Tom Levy: changed sequences.texi
+
 Tommi Vainikainen: changed gnus-sum.el message.el mml-sec.el
 
 Tomohiko Morioka: co-wrote mm-bodies.el mm-decode.el mm-encode.el
@@ -4890,6 +4950,8 @@
 
 Trevor Murphy: changed gnus.texi nnimap.el org.el
 
+Trevor Spiteri: changed progmodes/grep.el
+
 Trey Jackson: changed spam-stat.el
 
 Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el
@@ -4932,9 +4994,9 @@
 Ulrich Leodolter: changed w32proc.c
 
 Ulrich Müller: changed configure.ac lib-src/Makefile.in src/Makefile.in
-  version.el doctor.el emacs.1 files.el gamegrid.el gud.el server.el
-  ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c authors.el
-  bytecomp.el calc-units.el case-table.el configure and 39 other files
+  version.el calc-units.el doctor.el emacs.1 files.el gamegrid.el gud.el
+  server.el ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c
+  authors.el bytecomp.el case-table.el configure and 39 other files
 
 Ulrich Neumerkel: changed xterm.c
 
@@ -4973,6 +5035,8 @@
   emacs-module.c erc-backend.el erc.el eshell.texi fns.c hangul.el
   image.c lisp.h lread.c print.c profiler.c xterm.c
 
+Victor J. Orlikowski: changed erc-dcc.el
+
 Victor Zandy: wrote zone.el
 
 Viktor Rosenfeld: changed ob-sql.el org.el
@@ -4999,8 +5063,8 @@
   easymenu.el loading.texi menu-bar.el misc.texi progmodes/compile.el
   ps-print-def.el ps-vars.el
 
-Vitalie Spinu: changed comint.el message.el ob-R.el ob-core.el
-  ob-tangle.el subr.el
+Vitalie Spinu: changed comint.el eieio-base.el message.el ob-R.el
+  ob-core.el ob-tangle.el subr.el
 
 Vitaly Takmazov: changed emacs-x64.manifest emacs-x86.manifest
 
@@ -5032,6 +5096,8 @@
 
 Wei-Wei Guo: co-wrote rst.el
 
+Wenjamin Petrenko: changed files-x.el
+
 Werner Benger: changed keyboard.c
 
 Werner Lemberg: wrote sisheng.el vntelex.el
@@ -5142,7 +5208,7 @@
 Yamamoto Mitsuharu: wrote uvs.el
 and changed macterm.c macfns.c mac-win.el mac.c macterm.h macmenu.c
   xterm.c macgui.h image.c xdisp.c keyboard.c macselect.c w32term.c
-  src/Makefile.in unexmacosx.c xfns.c configure.ac emacs.c macfont.m
+  macfont.m configure.ac src/Makefile.in unexmacosx.c xfns.c emacs.c
   darwin.h dispnew.c and 97 other files
 
 Yann Dirson: changed imenu.el
@@ -5179,7 +5245,7 @@
 
 Yukihiro Matsumoto: co-wrote ruby-mode.el
 
-Yuri D'elia: changed message.el
+Yuri D'elia: changed message.el package.el
 
 Yuri Karaban: changed pop3.el
 
diff -Nru emacs-26.1+1/etc/CALC-NEWS emacs-26.3+1/etc/CALC-NEWS
--- emacs-26.1+1/etc/CALC-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/CALC-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Calc is an advanced desk calculator for GNU Emacs.
diff -Nru emacs-26.1+1/etc/ChangeLog.1 emacs-26.3+1/etc/ChangeLog.1
--- emacs-26.1+1/etc/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -6891,7 +6891,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/charsets/README emacs-26.3+1/etc/charsets/README
--- emacs-26.1+1/etc/charsets/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/charsets/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # README file for charset mapping files in this directory.
 
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
diff -Nru emacs-26.1+1/etc/compilation.txt emacs-26.3+1/etc/compilation.txt
--- emacs-26.1+1/etc/compilation.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/compilation.txt	2019-09-10 00:32:49.000000000 +0000
@@ -625,7 +625,7 @@
 Compilation finished at Thu Jul 21 15:02:15
 
 
-Copyright (C) 2004-2018 Free Software Foundation, Inc.
+Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff -Nru emacs-26.1+1/etc/DEBUG emacs-26.3+1/etc/DEBUG
--- emacs-26.1+1/etc/DEBUG	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/DEBUG	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 Debugging GNU Emacs
 
-Copyright (C) 1985, 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 2000-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 ** Preliminaries
@@ -647,10 +647,18 @@
 protocol errors from subsequent invocations of emacsclient in a GUI
 frame.  In that case calling the initial Emacs via
 
-emacs -nw --eval '(setq x-command-line-resources "emacs.synchronous: true")'
+  emacs -nw --eval '(setq x-command-line-resources "emacs.synchronous: true")'
 
 should give more reliable results.
 
+For X protocol errors related to displaying unusual characters or to
+font-related customizations, try invoking Emacs like this:
+
+  XFT_DEBUG=16 emacs -xrm "emacs.synchronous: true"
+
+This should produce information from the libXft library which could
+give useful hints regarding font-related problems in that library.
+
 Some bugs related to the X protocol disappear when Emacs runs in a
 synchronous mode.  To track down those bugs, we suggest the following
 procedure:
diff -Nru emacs-26.1+1/etc/DISTRIB emacs-26.3+1/etc/DISTRIB
--- emacs-26.1+1/etc/DISTRIB	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/DISTRIB	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 						-*- text -*-
             GNU Emacs availability information
 
-Copyright (C) 1986-1993, 1995, 1998, 2000-2018 Free Software Foundation,
+Copyright (C) 1986-1993, 1995, 1998, 2000-2019 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
diff -Nru emacs-26.1+1/etc/edt-user.el emacs-26.3+1/etc/edt-user.el
--- emacs-26.1+1/etc/edt-user.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/edt-user.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation
 
-;; Copyright (C) 1986, 1992-1993, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1986, 1992-1993, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/etc/emacs.appdata.xml emacs-26.3+1/etc/emacs.appdata.xml
--- emacs-26.1+1/etc/emacs.appdata.xml	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/emacs.appdata.xml	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014-2018 Free Software Foundation, Inc. -->
+<!-- Copyright (C) 2014-2019 Free Software Foundation, Inc. -->
 <component type="desktop-application">
  <id>org.gnu.emacs</id>
  <metadata_license>GFDL-1.3+</metadata_license>
@@ -25,7 +25,7 @@
  </description>
  <screenshots>
   <screenshot type="default">
-  <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata.png</image>
+  <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image>
  </screenshot>
  </screenshots>
  <launchable type="desktop-id">emacs</launchable>
diff -Nru emacs-26.1+1/etc/emacs-buffer.gdb emacs-26.3+1/etc/emacs-buffer.gdb
--- emacs-26.1+1/etc/emacs-buffer.gdb	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/emacs-buffer.gdb	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps
 
-# Copyright (C) 2005-2018 Free Software Foundation, Inc.
+# Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 # Author: Noah Friedman <friedman@splode.com>
 # Created: 2005-04-28
diff -Nru emacs-26.1+1/etc/enriched.txt emacs-26.3+1/etc/enriched.txt
--- emacs-26.1+1/etc/enriched.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/enriched.txt	2019-09-10 00:32:49.000000000 +0000
@@ -175,7 +175,7 @@
 
 
 The text/enriched standard is defined in </indent>Internet<indent> RFC 1896
-(<<http://www.ietf.org/rfc/rfc1896.txt>).</indent></indent>
+(<<http://www.ietf.org/rfc/rfc1896.txt>).</indent>
 
 
 <x-bg-color><param>blue</param><x-color><param>white</param><bold>CUSTOMIZATION</bold></x-color></x-bg-color><bold>
@@ -239,7 +239,7 @@
 
 
 
-Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff -Nru emacs-26.1+1/etc/ERC-NEWS emacs-26.3+1/etc/ERC-NEWS
--- emacs-26.1+1/etc/ERC-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ERC-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-Copyright (C) 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 2006-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 * For changes after ERC 5.3, see the main Emacs NEWS file
diff -Nru emacs-26.1+1/etc/ETAGS.EBNF emacs-26.3+1/etc/ETAGS.EBNF
--- emacs-26.1+1/etc/ETAGS.EBNF	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ETAGS.EBNF	2019-09-10 00:32:49.000000000 +0000
@@ -94,7 +94,7 @@
 
 ===================== end of discussion of tag names =====================
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff -Nru emacs-26.1+1/etc/ETAGS.README emacs-26.3+1/etc/ETAGS.README
--- emacs-26.1+1/etc/ETAGS.README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ETAGS.README	2019-09-10 00:32:49.000000000 +0000
@@ -28,7 +28,7 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2018 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2019 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff -Nru emacs-26.1+1/etc/forms/forms-d2.el emacs-26.3+1/etc/forms/forms-d2.el
--- emacs-26.1+1/etc/forms/forms-d2.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/forms/forms-d2.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; forms-d2.el --- demo forms-mode
 
-;; Copyright (C) 1991, 1994-1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1991, 1994-1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
diff -Nru emacs-26.1+1/etc/GNUS-NEWS emacs-26.3+1/etc/GNUS-NEWS
--- emacs-26.1+1/etc/GNUS-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/GNUS-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNUS NEWS -- history of user-visible changes.
 
-Copyright (C) 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
diff -Nru emacs-26.1+1/etc/gnus-tut.txt emacs-26.3+1/etc/gnus-tut.txt
--- emacs-26.1+1/etc/gnus-tut.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/gnus-tut.txt	2019-09-10 00:32:49.000000000 +0000
@@ -24,7 +24,7 @@
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
 heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
diff -Nru emacs-26.1+1/etc/grep.txt emacs-26.3+1/etc/grep.txt
--- emacs-26.1+1/etc/grep.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/grep.txt	2019-09-10 00:32:49.000000000 +0000
@@ -97,7 +97,7 @@
 
 
 
-Copyright (C) 2005-2018 Free Software Foundation, Inc.
+Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff -Nru emacs-26.1+1/etc/HELLO emacs-26.3+1/etc/HELLO
--- emacs-26.1+1/etc/HELLO	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/HELLO	2019-09-10 00:32:49.000000000 +0000
@@ -75,7 +75,7 @@
 
 
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -96,4 +96,5 @@
 ;;; tab-width: 32
 ;;; bidi-display-reordering: t
 ;;; coding: iso-2022-7bit
+;;; inhibit-compacting-font-caches: t
 ;;; End:
diff -Nru emacs-26.1+1/etc/HISTORY emacs-26.3+1/etc/HISTORY
--- emacs-26.1+1/etc/HISTORY	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/HISTORY	2019-09-10 00:32:49.000000000 +0000
@@ -12,10 +12,11 @@
 EMACS started out as a set of macros atop the TECO text editor, and
 was first operational in late 1976.  It was inspired by earlier work
 such as the E editor of Stanford, and was based on older TECO macro
-sets.  EMACS in turn inspired several similar editors.  See:
-Stallman RM. EMACS: The Extensible, Customizable Self-Documenting
-Display Editor.  AI Memo 519a, MIT, 1981-03-26
+sets.  See: Stallman RM. EMACS: The Extensible, Customizable
+Self-Documenting Display Editor.  AI Memo 519a, MIT, 1981-03-26
 <http://dspace.mit.edu/bitstream/handle/1721.1/5736/AIM-519A.pdf>.
+EMACS in turn inspired several similar editors.  For a summary of
+this history, see <https://github.com/larsbrinkhoff/emacs-history>.
 
 In 1984, work began on GNU Emacs, a fresh implementation designed to
 run on GNU and GNU-like systems, with a full-featured Lisp at its
@@ -215,6 +216,10 @@
 
 GNU Emacs 26.1 (2018-05-28) emacs-26.1
 
+GNU Emacs 26.2 (2019-04-12) emacs-26.2
+
+GNU Emacs 26.3 (2019-08-28) emacs-26.3
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/etc/images/checked.xpm emacs-26.3+1/etc/images/checked.xpm
--- emacs-26.1+1/etc/images/checked.xpm	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/checked.xpm	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-/* Copyright (C) 2010-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2019 Free Software Foundation, Inc.
  *
  * Author: Chong Yidong <cyd@stupidchicken.com>
  *
diff -Nru emacs-26.1+1/etc/images/custom/README emacs-26.3+1/etc/images/custom/README
--- emacs-26.1+1/etc/images/custom/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/custom/README	2019-09-10 00:32:49.000000000 +0000
@@ -6,5 +6,5 @@
 
 Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm
 Author: Juri Linkov
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/ezimage/README emacs-26.3+1/etc/images/ezimage/README
--- emacs-26.1+1/etc/images/ezimage/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/ezimage/README	2019-09-10 00:32:49.000000000 +0000
@@ -7,5 +7,5 @@
        tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm
        tag.xpm unlock.xpm
 Author: Eric M. Ludlam
-Copyright (C) 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/gnus/gnus.svg emacs-26.3+1/etc/images/gnus/gnus.svg
--- emacs-26.1+1/etc/images/gnus/gnus.svg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/gnus/gnus.svg	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    Author: Francesc Rocher <f.rocher@member.fsf.org>
 
diff -Nru emacs-26.1+1/etc/images/gnus/README emacs-26.3+1/etc/images/gnus/README
--- emacs-26.1+1/etc/images/gnus/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/gnus/README	2019-09-10 00:32:49.000000000 +0000
@@ -7,7 +7,7 @@
 
 Files: important.xpm, unimportant.xpm
 Author: Simon Josefsson <simon@josefsson.org>
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
   describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm
@@ -21,11 +21,11 @@
   unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
   uu-post.pbm uu-post.xpm
 Author: Luis Fernandes <elf@ee.ryerson.ca>
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 Files: gnus.png, gnus.svg
   Author: Francesc Rocher <rocher@member.fsf.org>
-  Copyright (C) 2008-2018 Free Software Foundation, Inc.
+  Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 
 * The following icons are from GNOME 2.x. They are not part of Emacs,
diff -Nru emacs-26.1+1/etc/images/gud/README emacs-26.3+1/etc/images/gud/README
--- emacs-26.1+1/etc/images/gud/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/gud/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 The following icons were created by Nick Roberts <nickrob@snap.net.nz>.
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm
@@ -31,7 +31,7 @@
 The following icons are converted from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   cont.pbm and cont.xpm were converted from continue.gif
@@ -47,7 +47,7 @@
 The following icons are created from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   rcont.xpm rfinish.xpm
diff -Nru emacs-26.1+1/etc/images/icons/hicolor/scalable/apps/emacs23.svg emacs-26.3+1/etc/images/icons/hicolor/scalable/apps/emacs23.svg
--- emacs-26.1+1/etc/images/icons/hicolor/scalable/apps/emacs23.svg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/icons/hicolor/scalable/apps/emacs23.svg	2019-09-10 00:32:49.000000000 +0000
@@ -10,7 +10,7 @@
    id="svg4768"
    xml:space="preserve">
 <!-- Gnu Emacs Icon
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/images/icons/hicolor/scalable/apps/emacs.svg emacs-26.3+1/etc/images/icons/hicolor/scalable/apps/emacs.svg
--- emacs-26.1+1/etc/images/icons/hicolor/scalable/apps/emacs.svg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/icons/hicolor/scalable/apps/emacs.svg	2019-09-10 00:32:49.000000000 +0000
@@ -15,7 +15,7 @@
      id="metadata70"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><!-- Gnu Emacs Icon
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    Author: Nicolas Petton <nicolas@petton.fr>
 
diff -Nru emacs-26.1+1/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg emacs-26.3+1/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg
--- emacs-26.1+1/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/icons/hicolor/scalable/mimetypes/emacs-document23.svg	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Document Icon
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/images/icons/README emacs-26.3+1/etc/images/icons/README
--- emacs-26.1+1/etc/images/icons/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/icons/README	2019-09-10 00:32:49.000000000 +0000
@@ -6,7 +6,7 @@
        hicolor/scalable/mimetypes/emacs-document.svg
 
 Author: Nicolas Petton <nicolas@petton.fr>
-Copyright (C) 2015-2018 Free Software Foundation, Inc.
+Copyright (C) 2015-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
@@ -14,7 +14,7 @@
        hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
 
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2007-2018 Free Software Foundation, Inc.
+Copyright (C) 2007-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
@@ -22,7 +22,7 @@
        hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
 
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2005-2018 Free Software Foundation, Inc.
+Copyright (C) 2005-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 Files: allout-widgets-dark-bg/closed.png
@@ -71,5 +71,5 @@
        allout-widgets-light-bg/through-descender.xpm
 
 Author: Ken Manheimer <ken.manheimer@gmail.com>
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/mh-logo.xpm emacs-26.3+1/etc/images/mh-logo.xpm
--- emacs-26.1+1/etc/images/mh-logo.xpm	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/mh-logo.xpm	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* XPM */
 /* MH-E Logo
  *
- * Copyright (C) 2003-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2019 Free Software Foundation, Inc.
  *
  * Author: Satyaki Das
  *
diff -Nru emacs-26.1+1/etc/images/mpc/README emacs-26.3+1/etc/images/mpc/README
--- emacs-26.1+1/etc/images/mpc/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/mpc/README	2019-09-10 00:32:49.000000000 +0000
@@ -2,5 +2,5 @@
 
 Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm
 Author: Stefan Monnier <monnier@iro.umontreal.ca>
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
+Copyright (C) 2009-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/newsticker/README emacs-26.3+1/etc/images/newsticker/README
--- emacs-26.1+1/etc/images/newsticker/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/newsticker/README	2019-09-10 00:32:49.000000000 +0000
@@ -4,5 +4,5 @@
        narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm
        prev-item.xpm rss-feed.png rss-feed.svg update.xpm
 Author: Ulf Jasper
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/README emacs-26.3+1/etc/images/README
--- emacs-26.1+1/etc/images/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/README	2019-09-10 00:32:49.000000000 +0000
@@ -27,19 +27,19 @@
 
 File: mh-logo.xpm
   Author: Satyaki Das
-  Copyright (C) 2003-2018 Free Software Foundation, Inc.
+  Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 Files: gnus.pbm
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 Files: splash.png, splash.svg, splash.pbm, splash.xpm
   Author: Francesc Rocher <francesc.rocher@gmail.com>
-  Copyright (C) 2008-2018 Free Software Foundation, Inc.
+  Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 Files: checked.xpm, unchecked.xpm
   Author: Chong Yidong <cyd@stupidchicken.com>
-  Copyright (C) 2010-2018 Free Software Foundation, Inc.
+  Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 
 * The following icons are from GTK+ 2.x. They are not part of Emacs, but
diff -Nru emacs-26.1+1/etc/images/smilies/grayscale/README emacs-26.3+1/etc/images/smilies/grayscale/README
--- emacs-26.1+1/etc/images/smilies/grayscale/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/smilies/grayscale/README	2019-09-10 00:32:49.000000000 +0000
@@ -3,5 +3,5 @@
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm
 Author: Adam Sjøgren
-Copyright (C) 2007-2018 Free Software Foundation, Inc.
+Copyright (C) 2007-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/smilies/medium/README emacs-26.3+1/etc/images/smilies/medium/README
--- emacs-26.1+1/etc/images/smilies/medium/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/smilies/medium/README	2019-09-10 00:32:49.000000000 +0000
@@ -3,5 +3,5 @@
        frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
        smile.xpm wry.xpm
 Author: Adam Sjøgren
-Copyright (C) 2007-2018 Free Software Foundation, Inc.
+Copyright (C) 2007-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/smilies/README emacs-26.3+1/etc/images/smilies/README
--- emacs-26.1+1/etc/images/smilies/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/smilies/README	2019-09-10 00:32:49.000000000 +0000
@@ -3,5 +3,5 @@
        sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm
 Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex
          Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm.
-Copyright (C) 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/splash.svg emacs-26.3+1/etc/images/splash.svg
--- emacs-26.1+1/etc/images/splash.svg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/splash.svg	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    Author: Francesc Rocher <francesc.rocher@gmail.com>
    Based on the original work by Luis Fernandes <elf@ee.ryerson.ca>
diff -Nru emacs-26.1+1/etc/images/tree-widget/default/README emacs-26.3+1/etc/images/tree-widget/default/README
--- emacs-26.1+1/etc/images/tree-widget/default/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/tree-widget/default/README	2019-09-10 00:32:49.000000000 +0000
@@ -5,5 +5,5 @@
        no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png
        open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2018 Free Software Foundation, Inc.
+Copyright (C) 2004-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/tree-widget/folder/README emacs-26.3+1/etc/images/tree-widget/folder/README
--- emacs-26.1+1/etc/images/tree-widget/folder/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/tree-widget/folder/README	2019-09-10 00:32:49.000000000 +0000
@@ -5,5 +5,5 @@
         leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png
         no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2018 Free Software Foundation, Inc.
+Copyright (C) 2004-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/images/unchecked.xpm emacs-26.3+1/etc/images/unchecked.xpm
--- emacs-26.1+1/etc/images/unchecked.xpm	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/images/unchecked.xpm	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* XPM */
-/* Copyright (C) 2010-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2019 Free Software Foundation, Inc.
  *
  * Author: Chong Yidong <cyd@stupidchicken.com>
  *
diff -Nru emacs-26.1+1/etc/MACHINES emacs-26.3+1/etc/MACHINES
--- emacs-26.1+1/etc/MACHINES	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/MACHINES	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 Emacs machines list
 
-Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2018 Free Software
+Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2019 Free Software
 Foundation, Inc.
 See the end of the file for license conditions.
 
diff -Nru emacs-26.1+1/etc/MH-E-NEWS emacs-26.3+1/etc/MH-E-NEWS
--- emacs-26.1+1/etc/MH-E-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/MH-E-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 * COPYRIGHT
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 * Changes in MH-E 8.6
diff -Nru emacs-26.1+1/etc/NEWS emacs-26.3+1/etc/NEWS
--- emacs-26.1+1/etc/NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,10 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2016-2018 Free Software Foundation, Inc.
+Copyright (C) 2016-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
-If possible, use M-x report-emacs-bug.
+Please send Emacs bug reports to 'bug-gnu-emacs@gnu.org'.
+If possible, use 'M-x report-emacs-bug'.
 
 This file is about changes in Emacs version 26.
 
@@ -13,7 +13,184 @@
 in older Emacs versions.
 
 You can narrow news to a specific version by calling 'view-emacs-news'
-with a prefix argument or by typing C-u C-h C-n.
+with a prefix argument or by typing 'C-u C-h C-n'.
+
+
+* Installation Changes in Emacs 26.3
+
+
+* Startup Changes in Emacs 26.3
+
+
+* Changes in Emacs 26.3
+
+** New option 'help-enable-completion-auto-load'.
+This allows disabling the new feature introduced in Emacs 26.1 which
+loads files during completion of 'C-h f' and 'C-h v' according to
+'definition-prefixes'.
+
+** Emacs now supports the new Japanese Era name.
+The newly assigned codepoint U+32FF was added to the Unicode Character
+Database compiled into Emacs.
+
+
+* Editing Changes in Emacs 26.3
+
+
+* Changes in Specialized Modes and Packages in Emacs 26.3
+
+
+* New Modes and Packages in Emacs 26.3
+
+
+* Incompatible Lisp Changes in Emacs 26.3
+
+
+* Lisp Changes in Emacs 26.3
+
+
+* Changes in Emacs 26.3 on Non-Free Operating Systems
+
+
+* Installation Changes in Emacs 26.2
+
+** Building Emacs with the '--with-xwidgets' option now requires WebKit2.
+To build Emacs with xwidgets support, you will need to install the
+webkit2gtk-4.0 package; version 2.12 or later is required.
+(This change was actually made in Emacs 26.1, but was not called out
+in its NEWS.)
+
+** Installing Emacs now installs the emacs-module.h file.
+The emacs-module.h file is now installed in the system-wide include
+directory as part of the Emacs installation.  This allows to build
+Emacs modules outside of the Emacs source tree.
+
+
+* Changes in Emacs 26.2
+
+** Emacs is now compliant with the latest version 11.0 of the Unicode Standard.
+
+** New variable 'xft-ignore-color-fonts'.
+Default t means don't try to load color fonts when using Xft, as they
+often cause crashes.  Set it to nil if you really need those fonts.
+
+
+* Changes in Specialized Modes and Packages in Emacs 26.2
+
+** Dired
+
+*** The 'Z' command on a directory name compresses all of its files.
+It produces a compressed '.tar.gz' archive with all the files in the
+directory and all of its subdirectories.  For symmetry, 'Z' on a
+'.tar.gz' or a '.tgz' archive extracts all the archived files into the
+current directory; thus, typing 'Z' on a '.tar.gz' archive created by
+a previous 'Z' command will extract the archived files into a
+directory whose name is the archive name sans the '.tar.gz' extension.
+(This change was actually made in Emacs 25.1 but was only
+partially called out in its NEWS; 'tgz' handling was added in 26.1.)
+
+** Ibuffer
+
+*** New toggle 'ibuffer-do-toggle-lock', bound to 'L'.
+
+** Imenu
+
+*** The value for 'imenu-auto-rescan-maxout' has been increased to 600000.
+
+** Gnus
+
+*** Mailutils movemail will now be used if found at runtime.
+The default value of 'mail-source-movemail-program' is now "movemail".
+This ensures that the movemail program from GNU Mailutils will be used
+if found in 'exec-path', even if it was not found at build time.  To
+use a different program, customize 'mail-source-movemail-program' to the
+absolute file name of the desired executable.
+
+** Shadowfile
+
+*** shadowfile.el has been rewritten to support Tramp file names.
+
+** Shell mode
+
+*** Shell mode buffers now have 'scroll-conservatively' set to 101.
+This is so as to better emulate the scrolling behavior of a text
+terminal when new output is added to the screen buffer.  To get back
+the previous behavior, reset 'scroll-conservatively' to zero (or any
+other value you like) in a function and add it to 'shell-mode-hook'.
+(This change was actually made in Emacs 26.1, but was not called out
+in its NEWS.)
+
+** VC
+
+*** VC support for Mercurial was improved.
+Emacs now avoids invoking 'hg' as much as possible, for faster operation.
+(This and the following changes were actually made in Emacs 26.1, but
+were not called out in its NEWS.)
+
+**** New vc-hg options.
+The new option 'vc-hg-parse-hg-data-structures' controls whether vc-hg
+will try parsing the Mercurial data structures directly instead of
+running 'hg'; it defaults to t (set to nil if you want the pre-26.1
+behavior).
+The new option 'vc-hg-symbolic-revision-styles' controls how versions
+in a Mercurial repository are presented symbolically on the mode line.
+The new option 'vc-hg-use-file-version-for-mode-line-version' controls
+whether the version shown on the mode line is that of the visited file
+or of the repository working copy.
+
+**** Display of Mercurial revisions in the mode line has changed.
+Previously, the mode line displayed the local number (1, 2, 3, ...) of
+the revision.  Starting with Emacs 26.1, the default has changed, and
+it now shows the global revision number, in the form of its changeset
+hash value.  To get back the previous behavior, customize the new
+option 'vc-hg-symbolic-revision-styles' to the value '("{rev}")'.
+
+
+* Incompatible Lisp Changes in Emacs 26.2
+
+** shadowfile config files have changed their syntax.
+Existing files "~/.emacs.d/shadows" and "~/.emacs.d/shadow_todo" must
+be removed prior using the changed 'shadow-*' commands.
+
+** 'thread-alive-p' has been renamed to 'thread-live-p'.
+The old name is an alias of the new name.  Future Emacs version will
+obsolete it.
+
+** 'while-no-input' does not return due to input from subprocesses.
+Input that arrived from subprocesses while some code executed inside
+the 'while-no-input' form injected an internal buffer-switch event
+that counted as input and would cause 'while-no-input' to return,
+perhaps prematurely.  These buffer-switch events are now by default
+ignored by 'while-no-input'; if you need to get the old behavior,
+remove 'buffer-switch' from the list of events in
+'while-no-input-ignore-events'.
+
+
+* Lisp Changes in Emacs 26.2
+
+** The new function 'read-answer' accepts either long or short answers
+depending on the new customizable variable 'read-answer-short'.
+
+** New function 'assoc-delete-all'.
+Like 'assq-delete-all', but uses 'equal' for comparison.
+
+** The function 'thing-at-point' behaves as before Emacs 26.1.
+The behavior of 'thing-at-point' when called with argument 'list' has
+changed in Emacs 26.1, in that it didn't consider text inside comments
+and strings as a potential list.  This change is now reverted, and
+'thing-at-point' behaves like it did before Emacs 26.1.
+
+** To cater to use cases where comments and strings are to be ignored
+when looking for a list, the function 'list-at-point' now takes an
+optional argument to do so.
+
+
+* Changes in Emacs 26.2 on Non-Free Operating Systems
+
+** macOS features can now be detected at run-time as well as at
+build-time.  See nextstep/INSTALL for details.
+(This change was actually made in Emacs 26.1, but was undocumented and
+not called out in its NEWS.)
 
 
 * Installation Changes in Emacs 26.1
@@ -26,11 +203,11 @@
 
 ** The new option 'configure --with-mailutils' causes Emacs to rely on
 GNU Mailutils to retrieve email.  It is recommended, and is the
-default if GNU Mailutils is installed.  When --with-mailutils is not
+default if GNU Mailutils is installed.  When '--with-mailutils' is not
 in effect, the Emacs build procedure by default continues to build and
 install a limited 'movemail' substitute that retrieves POP3 email only
 via insecure channels.  To avoid this problem, use either
---with-mailutils or --without-pop when configuring; --without-pop
+'--with-mailutils' or '--without-pop' when configuring; '--without-pop'
 is the default on platforms other than native MS-Windows.
 
 ** The new option 'configure --enable-gcc-warnings=warn-only' causes
@@ -42,17 +219,17 @@
 ** When GCC warnings are enabled, '--enable-check-lisp-object-type' is
 now enabled by default when configuring.
 
-** The Emacs server now has socket-launching support.  This allows
-socket based activation, where an external process like systemd can
-invoke the Emacs server process upon a socket connection event and
-hand the socket over to Emacs.  Emacs uses this socket to service
-emacsclient commands.  This new functionality can be disabled with the
-configure option '--disable-libsystemd'.
-
-** A systemd user unit file is provided.  Use it in the standard way:
-'systemctl --user enable emacs'.
-(If your Emacs is installed in a non-standard location, you may
-need to copy the emacs.service file to eg ~/.config/systemd/user/)
+** The Emacs server now has socket-launching support.
+This allows socket based activation, where an external process like
+systemd can invoke the Emacs server process upon a socket connection
+event and hand the socket over to Emacs.  Emacs uses this socket to
+service emacsclient commands.  This new functionality can be disabled
+with the configure option '--disable-libsystemd'.
+
+** A systemd user unit file is provided.
+Use it in the standard way: 'systemctl --user enable emacs'.  (If your
+Emacs is installed in a non-standard location, you may need to copy
+the emacs.service file to eg ~/.config/systemd/user/)
 
 ** New configure option '--disable-build-details' attempts to build an
 Emacs that is more likely to be reproducible; that is, if you build
@@ -63,7 +240,6 @@
 'erc-emacs-build-time'.
 
 ** Emacs can now be built with support for Little CMS.
-
 If the lcms2 library is installed, Emacs will enable features built on
 top of that library.  The new configure option '--without-lcms2' can
 be used to build without lcms2 support even if it is installed.  Emacs
@@ -106,9 +282,9 @@
 
 * Changes in Emacs 26.1
 
-** Option 'buffer-offer-save' can be set to new value, 'always'.  When
-set to 'always', the command 'save-some-buffers' will always offer
-this buffer for saving.
+** Option 'buffer-offer-save' can be set to new value, 'always'.
+When set to 'always', the command 'save-some-buffers' will always
+offer this buffer for saving.
 
 ** Security vulnerability related to Enriched Text mode is removed.
 
@@ -594,7 +770,7 @@
 A new option 'ediff-show-ancestor' and a new toggle
 'ediff-toggle-show-ancestor'.
 
-** TeX: Add luatex and xetex as alternatives to pdftex
+** TeX: Add luatex and xetex as alternatives to pdftex.
 
 ** Electric-Buffer-menu
 
@@ -998,7 +1174,6 @@
 ** Ispell
 
 *** Enchant is now supported as a spell-checker.
-
 Enchant is a meta-spell-checker that uses providers such as Hunspell
 to do the actual checking.  With it, users can use spell-checkers not
 directly supported by Emacs, such as Voikko, Hspell and AppleSpell,
@@ -1008,8 +1183,7 @@
 
 ** Flymake
 
-*** Flymake has been completely redesigned
-
+*** Flymake has been completely redesigned.
 Flymake now annotates arbitrary buffer regions, not just lines.  It
 supports arbitrary diagnostic types, not just errors and warnings (see
 variable 'flymake-diagnostic-types-alist').
@@ -1025,7 +1199,6 @@
 ** Term
 
 *** 'term-char-mode' now makes its buffer read-only.
-
 The buffer is made read-only to prevent changes from being made by
 anything other than the process filter; and movements of point away
 from the process mark are counter-acted so that the cursor is in the
@@ -1041,7 +1214,6 @@
 ** Xref
 
 *** When an *xref* buffer is needed, 'TAB' quits and jumps to an xref.
-
 A new command 'xref-quit-and-goto-xref', bound to 'TAB' in *xref*
 buffers, quits the window before jumping to the destination.  In many
 situations, the intended window configuration is restored, just as if
@@ -1137,11 +1309,11 @@
 
 *** Many variables obsoleted in 22.1 referring to face symbols.
 
-** The variable 'text-quoting-style' is now a customizable option.  It
-controls whether to and how to translate ASCII quotes in messages and
-help output.  Its possible values and their semantics remain unchanged
-from Emacs 25.  In particular, when this variable's value is 'grave',
-all quotes in formats are output as-is.
+** The variable 'text-quoting-style' is now a customizable option.
+It controls whether to and how to translate ASCII quotes in messages
+and help output.  Its possible values and their semantics remain
+unchanged from Emacs 25.  In particular, when this variable's value is
+'grave', all quotes in formats are output as-is.
 
 ** Functions like 'check-declare-file' and 'check-declare-directory'
 now generate less chatter and more-compact diagnostics.  The auxiliary
@@ -1412,10 +1584,11 @@
 to an interactively callable function as a single argument instead of
 two separate arguments 'region-beginning' and 'region-end'.
 
-** 'parse-partial-sexp' state has a new element.  Element 10 is
-non-nil when the last character scanned might be the first character
-of a two character construct, i.e., a comment delimiter or escaped
-character.  Its value is the syntax of that last character.
+** 'parse-partial-sexp' state has a new element.
+Element 10 is non-nil when the last character scanned might be the
+first character of a two character construct, i.e., a comment
+delimiter or escaped character.  Its value is the syntax of that last
+character.
 
 ** 'parse-partial-sexp's state, element 9, has now been confirmed as
 permanent and documented, and may be used by Lisp programs.  Its value
@@ -1679,8 +1852,9 @@
 *** 'select-frame-by-name' now may return a frame on another display
 if it does not find a suitable one on the current display.
 
-** 'tcl-auto-fill-mode' is now declared obsolete.  Its functionality
-can be replicated simply by setting 'comment-auto-fill-only-comments'.
+** 'tcl-auto-fill-mode' is now declared obsolete.
+Its functionality can be replicated simply by setting
+'comment-auto-fill-only-comments'.
 
 ** New pcase pattern 'rx' to match against an rx-style regular expression.
 For details, see the doc string of 'rx--pcase-macroexpander'.
diff -Nru emacs-26.1+1/etc/NEWS.1-17 emacs-26.3+1/etc/NEWS.1-17
--- emacs-26.1+1/etc/NEWS.1-17	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.1-17	2019-09-10 00:32:49.000000000 +0000
@@ -1,10 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
 
-Copyright (C) 1985-1986, 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2006-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs versions 1 through 17.
+This file is about changes in Emacs versions 1 through 17.
 
 
 
diff -Nru emacs-26.1+1/etc/NEWS.18 emacs-26.3+1/etc/NEWS.18
--- emacs-26.1+1/etc/NEWS.18	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.18	2019-09-10 00:32:49.000000000 +0000
@@ -1,10 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
 
-Copyright (C) 1988, 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs version 18.
+This file is about changes in Emacs version 18.
 
 
 
diff -Nru emacs-26.1+1/etc/NEWS.19 emacs-26.3+1/etc/NEWS.19
--- emacs-26.1+1/etc/NEWS.19	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.19	2019-09-10 00:32:49.000000000 +0000
@@ -1,10 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
 
-Copyright (C) 1993-1995, 2001, 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001, 2006-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs versions 19.
+This file is about changes in Emacs versions 19.
 
 
 
diff -Nru emacs-26.1+1/etc/NEWS.20 emacs-26.3+1/etc/NEWS.20
--- emacs-26.1+1/etc/NEWS.20	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.20	2019-09-10 00:32:49.000000000 +0000
@@ -1,13 +1,13 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
 
-Copyright (C) 1999-2001, 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2001, 2006-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
 
-This file is about changes in emacs version 20.
+This file is about changes in Emacs version 20.
 
 
 
diff -Nru emacs-26.1+1/etc/NEWS.21 emacs-26.3+1/etc/NEWS.21
--- emacs-26.1+1/etc/NEWS.21	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.21	2019-09-10 00:32:49.000000000 +0000
@@ -1,10 +1,10 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
 
-Copyright (C) 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 2000-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs version 21.
+This file is about changes in Emacs version 21.
 
 
 
diff -Nru emacs-26.1+1/etc/NEWS.22 emacs-26.3+1/etc/NEWS.22
--- emacs-26.1+1/etc/NEWS.22	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.22	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff -Nru emacs-26.1+1/etc/NEWS.23 emacs-26.3+1/etc/NEWS.23
--- emacs-26.1+1/etc/NEWS.23	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.23	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2007-2018 Free Software Foundation, Inc.
+Copyright (C) 2007-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
diff -Nru emacs-26.1+1/etc/NEWS.24 emacs-26.3+1/etc/NEWS.24
--- emacs-26.1+1/etc/NEWS.24	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.24	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2010-2018 Free Software Foundation, Inc.
+Copyright (C) 2010-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -1117,6 +1117,8 @@
 The value, if non-nil, is a regexp that specifies what to trim from
 the start and end of each substring.
 
+** New function `delete-consecutive-dups'.
+
 ** Completion
 
 *** The separator used by `completing-read-multiple' is now a regexp.
diff -Nru emacs-26.1+1/etc/NEWS.25 emacs-26.3+1/etc/NEWS.25
--- emacs-26.1+1/etc/NEWS.25	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEWS.25	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2014-2018 Free Software Foundation, Inc.
+Copyright (C) 2014-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -452,6 +452,11 @@
 *** Nick completion is now case-insensitive again after inadvertently
 being made case-sensitive in Emacs 24.2.
 
+** Rcirc
+
+*** Rcirc now supports automatic reconnection.
+Set new user option 'rcirc-reconnect-delay' to non-zero to enable it.
+
 ** MPC
 
 *** New commands, key binds, and menu items.
diff -Nru emacs-26.1+1/etc/NEXTSTEP emacs-26.3+1/etc/NEXTSTEP
--- emacs-26.1+1/etc/NEXTSTEP	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NEXTSTEP	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This file contains information about GNU Emacs on "Nextstep" platforms.
diff -Nru emacs-26.1+1/etc/NXML-NEWS emacs-26.3+1/etc/NXML-NEWS
--- emacs-26.1+1/etc/NXML-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/NXML-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2018 Free Software Foundation, Inc.
+Copyright (C) 2007-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff -Nru emacs-26.1+1/etc/org/README emacs-26.3+1/etc/org/README
--- emacs-26.1+1/etc/org/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/org/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
 following copyright information:
 
-Copyright (C) 2010-2018 Free Software Foundation, Inc.
+Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 These files are part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/ORG-NEWS emacs-26.3+1/etc/ORG-NEWS
--- emacs-26.1+1/etc/ORG-NEWS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ORG-NEWS	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 #+LINK: doc https://orgmode.org/worg/doc.html#%s
 #+LINK: git https://code.orgmode.org/bzg/org-mode/commit/%s
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
Binary files /tmp/tmpObusoH/HLe_YkQyfd/emacs-26.1+1/etc/package-keyring.gpg and /tmp/tmpObusoH/fznpRJRV7m/emacs-26.3+1/etc/package-keyring.gpg differ
diff -Nru emacs-26.1+1/etc/PROBLEMS emacs-26.3+1/etc/PROBLEMS
--- emacs-26.1+1/etc/PROBLEMS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/PROBLEMS	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 Known Problems with GNU Emacs
 
-Copyright (C) 1987-1989, 1993-1999, 2001-2018 Free Software Foundation,
+Copyright (C) 1987-1989, 1993-1999, 2001-2019 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
@@ -207,7 +207,7 @@
 ** When Emacs is compiled with Gtk+, closing a display kills Emacs.
 
 There is a long-standing bug in GTK that prevents it from recovering
-from disconnects: http://bugzilla.gnome.org/show_bug.cgi?id=85715.
+from disconnects: https://gitlab.gnome.org/GNOME/gtk/issues/221.
 
 Thus, for instance, when Emacs is run as a server on a text terminal,
 and an X frame is created, and the X server for that frame crashes or
@@ -217,6 +217,26 @@
 If you need Emacs to be able to recover from closing displays, compile
 it with the Lucid toolkit instead of GTK.
 
+** Emacs compiled with GTK+ 3 crashes when run under some X servers.
+This happens when the X server does not provide certain display
+features that the underlying GTK+ 3 toolkit assumes.  For example, this
+issue has been seen with remote X servers like X2Go.  The symptoms
+are an Emacs crash, possibly triggered by the mouse entering the Emacs
+window, or an attempt to resize the Emacs window.  The crash backtrace
+contains a call to XQueryPointer.
+
+This issue was fixed in the GTK+ 3 toolkit in commit 4b1c0256 in February 2018.
+
+If your GTK+ 3 is still affected, you can avoid the issue by recompiling
+Emacs with a different X toolkit, eg --with-toolkit=gtk2.
+
+References:
+https://gitlab.gnome.org/GNOME/gtk/commit/4b1c02560f0d8097bf5a11932e52fb72f3e9e94b
+https://debbugs.gnu.org/24280
+https://bugs.debian.org/901038
+https://bugzilla.redhat.com/1483942
+https://access.redhat.com/solutions/3410101
+
 ** Emacs compiled with GTK crashes at startup due to X protocol error.
 
 This is known to happen on elementary OS GNU/Linux systems.
@@ -225,7 +245,7 @@
 
   X protocol error: BadMatch (invalid parameter attributes) on protocol request 140
   When compiled with GTK, Emacs cannot recover from X disconnects.
-  This is a GTK bug: https://bugzilla.gnome.org/show_bug.cgi?id=85715
+  This is a GTK bug: https://gitlab.gnome.org/GNOME/gtk/issues/221
   For details, see etc/PROBLEMS.
   Fatal error 6: Aborted
 
@@ -1164,7 +1184,7 @@
 input through XIM without any problem.  Furthermore, this seems only
 to happen in *.UTF-8 locales; zh_CN.GB2312 and zh_CN.GBK locales, for
 example, work fine.  A bug report has been filed in the Gnome
-bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=357032
+bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=357032
 
 *** Gnome: GPaste clipboard manager causes erratic behavior of 'yank'
 
@@ -1288,6 +1308,14 @@
 explain what the bug is so we can fix it.  In the mean time, removing
 the resource prevents the problem.
 
+*** FVWM: Some versions of FVWM incorrectly set the 'sticky' frame parameter.
+
+Version 2.6.4 of the FVWM can make a frame sticky (appear on all user
+desktops) when setting the 'sticky' frame parameter to nil.  This may
+happen without any special user interaction, for example, when Emacs
+restores a saved desktop.  A fix is to install version 2.6.8 of FVWM,
+see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31650.
+
 ** General X problems
 
 *** Redisplay using X is much slower than previous Emacs versions.
@@ -1822,6 +1850,12 @@
 
 ** GNU/Linux
 
+*** GNU/Linux: profiler-report outputs nothing.
+
+A few versions of the Linux kernel have timer bugs that break CPU
+profiling; see Bug#34235.  To fix the problem, upgrade to one of the
+kernel versions 4.14.97, 4.19.19, or 4.20.6, or later.
+
 *** GNU/Linux: Process output is corrupted.
 
 There is a bug in Linux kernel 2.6.10 PTYs that can cause emacs to
@@ -2588,6 +2622,13 @@
 If you do, please send it to bug-gnu-emacs@gnu.org so we can list it here.
 
 
+* Runtime problems specific to macOS
+
+** macOS doesn't come with libxpm, so only XPM3 is supported.
+
+Libxpm is available for macOS as part of the XQuartz project.
+
+
 * Build-time problems
 
 ** Configuration
@@ -2958,6 +2999,15 @@
 it can cause problems like this.  You might be able to find the correct
 value in the man page for a.out(5).
 
+* 'make check' failures
+
+** emacs-module-tests fail on Ubuntu 16.04
+
+This is due to a bug in GCC that was fixed in 2015; see
+<https://lists.gnu.org/r/emacs-devel/2018-09/msg00548.html>.
+You can work around the problem by using a later version of GCC or of
+Ubuntu, or by configuring without modules.
+
 * Problems on legacy systems
 
 This section covers bugs reported on very old hardware or software.
diff -Nru emacs-26.1+1/etc/ps-prin0.ps emacs-26.3+1/etc/ps-prin0.ps
--- emacs-26.1+1/etc/ps-prin0.ps	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ps-prin0.ps	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/ps-prin1.ps emacs-26.3+1/etc/ps-prin1.ps
--- emacs-26.1+1/etc/ps-prin1.ps	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ps-prin1.ps	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 % === BEGIN ps-print prologue 1
 % version: 6.1
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/README emacs-26.3+1/etc/README
--- emacs-26.1+1/etc/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/README	2019-09-10 00:32:49.000000000 +0000
@@ -7,5 +7,5 @@
 
 File: emacs.icon
   Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff -Nru emacs-26.1+1/etc/refcards/calccard.tex emacs-26.3+1/etc/refcards/calccard.tex
--- emacs-26.1+1/etc/refcards/calccard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/calccard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -20,7 +20,7 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
-% Copyright (C) 1987, 1992, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1992, 2001-2019 Free Software Foundation, Inc.
 
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/etc/refcards/cs-dired-ref.tex emacs-26.3+1/etc/refcards/cs-dired-ref.tex
--- emacs-26.1+1/etc/refcards/cs-dired-ref.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/cs-dired-ref.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff -Nru emacs-26.1+1/etc/refcards/cs-refcard.tex emacs-26.3+1/etc/refcards/cs-refcard.tex
--- emacs-26.1+1/etc/refcards/cs-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/cs-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2018 Free Software
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/cs-survival.tex emacs-26.3+1/etc/refcards/cs-survival.tex
--- emacs-26.1+1/etc/refcards/cs-survival.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/cs-survival.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff -Nru emacs-26.1+1/etc/refcards/de-refcard.tex emacs-26.3+1/etc/refcards/de-refcard.tex
--- emacs-26.1+1/etc/refcards/de-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/de-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996, 2000-2018 Free Software Foundation,
+% Copyright (C) 1987, 1993, 1996, 2000-2019 Free Software Foundation,
 % Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/dired-ref.tex emacs-26.3+1/etc/refcards/dired-ref.tex
--- emacs-26.1+1/etc/refcards/dired-ref.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/dired-ref.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for Dired
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 
diff -Nru emacs-26.1+1/etc/refcards/emacsver.tex.in emacs-26.3+1/etc/refcards/emacsver.tex.in
--- emacs-26.1+1/etc/refcards/emacsver.tex.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/emacsver.tex.in	2019-09-10 00:32:49.000000000 +0000
@@ -2,4 +2,4 @@
 \def\versionemacs{@majorversion@}           % major version of emacs
 %% This one should not be automatically updated;
 %% M-x set-copyright in admin.el handles it.
-\def\year{2018}                             % latest copyright year
+\def\year{2019}                             % latest copyright year
diff -Nru emacs-26.1+1/etc/refcards/fr-dired-ref.tex emacs-26.3+1/etc/refcards/fr-dired-ref.tex
--- emacs-26.1+1/etc/refcards/fr-dired-ref.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/fr-dired-ref.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % French translation: Eric Jacoboni
diff -Nru emacs-26.1+1/etc/refcards/fr-refcard.tex emacs-26.3+1/etc/refcards/fr-refcard.tex
--- emacs-26.1+1/etc/refcards/fr-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/fr-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2018 Free Software
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/fr-survival.tex emacs-26.3+1/etc/refcards/fr-survival.tex
--- emacs-26.1+1/etc/refcards/fr-survival.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/fr-survival.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
diff -Nru emacs-26.1+1/etc/refcards/gnus-logo.eps emacs-26.3+1/etc/refcards/gnus-logo.eps
--- emacs-26.1+1/etc/refcards/gnus-logo.eps	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/gnus-logo.eps	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0 EPSF-2.0
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 %
 % Author: Luis Fernandes <elf@ee.ryerson.ca>
 %
diff -Nru emacs-26.1+1/etc/refcards/gnus-refcard.tex emacs-26.3+1/etc/refcards/gnus-refcard.tex
--- emacs-26.1+1/etc/refcards/gnus-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/gnus-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -120,7 +120,7 @@
 %% Gnus logo by Luis Fernandes.
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995, 2000, 2002--2018 Free Software Foundation, Inc.\\*
+    Copyright \copyright\ 1995, 2000, 2002--2019 Free Software Foundation, Inc.\\*
   \end{center}
 
   Released under the terms of the GNU General Public License version 3 or later.
diff -Nru emacs-26.1+1/etc/refcards/Makefile emacs-26.3+1/etc/refcards/Makefile
--- emacs-26.1+1/etc/refcards/Makefile	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/Makefile	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### Makefile for Emacs refcards
 
-## Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+## Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/etc/refcards/orgcard.tex emacs-26.3+1/etc/refcards/orgcard.tex
--- emacs-26.1+1/etc/refcards/orgcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/orgcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -17,7 +17,7 @@
 \pdflayout=(0l)
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2018 Free Software
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
 % This document is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/etc/refcards/pdflayout.sty emacs-26.3+1/etc/refcards/pdflayout.sty
--- emacs-26.1+1/etc/refcards/pdflayout.sty	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/pdflayout.sty	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-% Copyright (C) 2007-2018 Free Software Foundation, Inc.
+% Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/refcards/pl-refcard.tex emacs-26.3+1/etc/refcards/pl-refcard.tex
--- emacs-26.1+1/etc/refcards/pl-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/pl-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 %&mex
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
diff -Nru emacs-26.1+1/etc/refcards/pt-br-refcard.tex emacs-26.3+1/etc/refcards/pt-br-refcard.tex
--- emacs-26.1+1/etc/refcards/pt-br-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/pt-br-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2018 Free
+% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2019 Free
 % Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/README emacs-26.3+1/etc/refcards/README
--- emacs-26.1+1/etc/refcards/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2013-2018 Free Software Foundation, Inc.
+Copyright (C) 2013-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -32,7 +32,7 @@
 
 File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
 
 
diff -Nru emacs-26.1+1/etc/refcards/refcard.tex emacs-26.3+1/etc/refcards/refcard.tex
--- emacs-26.1+1/etc/refcards/refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2018 Free Software
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/ru-refcard.tex emacs-26.3+1/etc/refcards/ru-refcard.tex
--- emacs-26.1+1/etc/refcards/ru-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/ru-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-% Copyright (C) 1997, 2002-2018 Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002-2019 Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Russian translation: Alex Ott <alexott@gmail.com>
@@ -41,7 +41,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{26} % version of Emacs this is for
-\newcommand{\cyear}[0]{2018}       % copyright year
+\newcommand{\cyear}[0]{2019}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff -Nru emacs-26.1+1/etc/refcards/sk-dired-ref.tex emacs-26.3+1/etc/refcards/sk-dired-ref.tex
--- emacs-26.1+1/etc/refcards/sk-dired-ref.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/sk-dired-ref.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for Dired -*- coding: utf-8 -*-
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff -Nru emacs-26.1+1/etc/refcards/sk-refcard.tex emacs-26.3+1/etc/refcards/sk-refcard.tex
--- emacs-26.1+1/etc/refcards/sk-refcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/sk-refcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Reference Card for GNU Emacs -*- coding: utf-8 -*-
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2018 Free Software
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff -Nru emacs-26.1+1/etc/refcards/sk-survival.tex emacs-26.3+1/etc/refcards/sk-survival.tex
--- emacs-26.1+1/etc/refcards/sk-survival.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/sk-survival.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Title:  GNU Emacs Survival Card -*- coding: utf-8 -*-
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff -Nru emacs-26.1+1/etc/refcards/survival.tex emacs-26.3+1/etc/refcards/survival.tex
--- emacs-26.1+1/etc/refcards/survival.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/survival.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
 
-% Copyright (C) 2000-2018 Free Software Foundation, Inc.
+% Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 
diff -Nru emacs-26.1+1/etc/refcards/vipcard.tex emacs-26.3+1/etc/refcards/vipcard.tex
--- emacs-26.1+1/etc/refcards/vipcard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/vipcard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % Quick Reference Card for VIP
 
-% Copyright (C) 1987, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2001-2019 Free Software Foundation, Inc.
 
 % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet>
 
diff -Nru emacs-26.1+1/etc/refcards/viperCard.tex emacs-26.3+1/etc/refcards/viperCard.tex
--- emacs-26.1+1/etc/refcards/viperCard.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/refcards/viperCard.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 % ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs
 
-% Copyright (C) 1995-1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc.
 
 % Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper)
 %	Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
diff -Nru emacs-26.1+1/etc/schema/locate.rnc emacs-26.3+1/etc/schema/locate.rnc
--- emacs-26.1+1/etc/schema/locate.rnc	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/schema/locate.rnc	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/schema/relaxng.rnc emacs-26.3+1/etc/schema/relaxng.rnc
--- emacs-26.1+1/etc/schema/relaxng.rnc	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/schema/relaxng.rnc	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # RELAX NG XML syntax expressed in RELAX NG Compact syntax.
 
-# Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/schema/schemas.xml emacs-26.3+1/etc/schema/schemas.xml
--- emacs-26.1+1/etc/schema/schemas.xml	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/schema/schemas.xml	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+<!-- Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/ses-example.ses emacs-26.3+1/etc/ses-example.ses
--- emacs-26.1+1/etc/ses-example.ses	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/ses-example.ses	2019-09-10 00:32:49.000000000 +0000
@@ -205,7 +205,7 @@
 ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
 
-;;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;;; COPYING PERMISSIONS:
 ;;; 
diff -Nru emacs-26.1+1/etc/srecode/cpp.srt emacs-26.3+1/etc/srecode/cpp.srt
--- emacs-26.1+1/etc/srecode/cpp.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/cpp.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cpp.srt --- SRecode templates for c++-mode
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/c.srt emacs-26.3+1/etc/srecode/c.srt
--- emacs-26.1+1/etc/srecode/c.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/c.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; c.srt --- SRecode templates for c-mode
 
-;; Copyright (C) 2007-2010, 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2010, 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/default.srt emacs-26.3+1/etc/srecode/default.srt
--- emacs-26.1+1/etc/srecode/default.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/default.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; default.srt --- SRecode templates for srecode-template-mode
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/doc-cpp.srt emacs-26.3+1/etc/srecode/doc-cpp.srt
--- emacs-26.1+1/etc/srecode/doc-cpp.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/doc-cpp.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; doc-c.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/doc-default.srt emacs-26.3+1/etc/srecode/doc-default.srt
--- emacs-26.1+1/etc/srecode/doc-default.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/doc-default.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; doc-default.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/doc-java.srt emacs-26.3+1/etc/srecode/doc-java.srt
--- emacs-26.1+1/etc/srecode/doc-java.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/doc-java.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; doc-java.srt --- SRecode templates for "document" applications
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/ede-autoconf.srt emacs-26.3+1/etc/srecode/ede-autoconf.srt
--- emacs-26.1+1/etc/srecode/ede-autoconf.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/ede-autoconf.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE
 
-;; Copyright (C) 2010, 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/ede-make.srt emacs-26.3+1/etc/srecode/ede-make.srt
--- emacs-26.1+1/etc/srecode/ede-make.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/ede-make.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/el.srt emacs-26.3+1/etc/srecode/el.srt
--- emacs-26.1+1/etc/srecode/el.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/el.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; el.srt --- SRecode templates for Emacs Lisp mode
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/etc/srecode/getset-cpp.srt emacs-26.3+1/etc/srecode/getset-cpp.srt
--- emacs-26.1+1/etc/srecode/getset-cpp.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/getset-cpp.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/java.srt emacs-26.3+1/etc/srecode/java.srt
--- emacs-26.1+1/etc/srecode/java.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/java.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; java.srt
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/make.srt emacs-26.3+1/etc/srecode/make.srt
--- emacs-26.1+1/etc/srecode/make.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/make.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; make.srt
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/template.srt emacs-26.3+1/etc/srecode/template.srt
--- emacs-26.1+1/etc/srecode/template.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/template.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; template.srt --- Templates for Semantic Recoders
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/etc/srecode/test.srt emacs-26.3+1/etc/srecode/test.srt
--- emacs-26.1+1/etc/srecode/test.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/test.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; test.srt --- SRecode templates for testing
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/texi.srt emacs-26.3+1/etc/srecode/texi.srt
--- emacs-26.1+1/etc/srecode/texi.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/texi.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; texi.srt --- SRecode templates for Texinfo
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/srecode/wisent.srt emacs-26.3+1/etc/srecode/wisent.srt
--- emacs-26.1+1/etc/srecode/wisent.srt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/srecode/wisent.srt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/etc/TERMS emacs-26.3+1/etc/TERMS
--- emacs-26.1+1/etc/TERMS	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/TERMS	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This file describes what you must or might want to do to termcap entries
diff -Nru emacs-26.1+1/etc/themes/adwaita-theme.el emacs-26.3+1/etc/themes/adwaita-theme.el
--- emacs-26.1+1/etc/themes/adwaita-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/adwaita-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; adwaita-theme.el --- Tango-based custom theme for faces
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: William Stevenson <yhvh2000@gmail.com>
 
diff -Nru emacs-26.1+1/etc/themes/deeper-blue-theme.el emacs-26.3+1/etc/themes/deeper-blue-theme.el
--- emacs-26.1+1/etc/themes/deeper-blue-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/deeper-blue-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; deeper-blue-theme.el --- Custom theme for faces
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Scott Frazer <frazer.scott@gmail.com>
 
diff -Nru emacs-26.1+1/etc/themes/dichromacy-theme.el emacs-26.3+1/etc/themes/dichromacy-theme.el
--- emacs-26.1+1/etc/themes/dichromacy-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/dichromacy-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dichromacy-theme.el --- color theme suitable for color-blind users
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken>
 
diff -Nru emacs-26.1+1/etc/themes/leuven-theme.el emacs-26.3+1/etc/themes/leuven-theme.el
--- emacs-26.1+1/etc/themes/leuven-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/leuven-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; leuven-theme.el --- Awesome Emacs color theme on white background
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
 ;; URL: https://github.com/fniessen/emacs-leuven-theme
diff -Nru emacs-26.1+1/etc/themes/light-blue-theme.el emacs-26.3+1/etc/themes/light-blue-theme.el
--- emacs-26.1+1/etc/themes/light-blue-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/light-blue-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; light-blue-theme.el --- Custom theme for faces
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Drew Adams <drew.adams@oracle.com>
 
diff -Nru emacs-26.1+1/etc/themes/manoj-dark-theme.el emacs-26.3+1/etc/themes/manoj-dark-theme.el
--- emacs-26.1+1/etc/themes/manoj-dark-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/manoj-dark-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; manoj-dark.el --- A dark theme from Manoj
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Manoj Srivastava <srivasta@ieee.org>
 ;; Keywords: lisp, faces
diff -Nru emacs-26.1+1/etc/themes/misterioso-theme.el emacs-26.3+1/etc/themes/misterioso-theme.el
--- emacs-26.1+1/etc/themes/misterioso-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/misterioso-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; misterioso-theme.el --- Custom face theme for Emacs
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Hermida
 
diff -Nru emacs-26.1+1/etc/themes/tango-dark-theme.el emacs-26.3+1/etc/themes/tango-dark-theme.el
--- emacs-26.1+1/etc/themes/tango-dark-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/tango-dark-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tango-dark-theme.el --- Tango-based custom theme for faces
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Chong Yidong <cyd@stupidchicken>
 ;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
diff -Nru emacs-26.1+1/etc/themes/tango-theme.el emacs-26.3+1/etc/themes/tango-theme.el
--- emacs-26.1+1/etc/themes/tango-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/tango-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tango-theme.el --- Tango-based custom theme for faces
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Chong Yidong <cyd@stupidchicken>
 ;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
diff -Nru emacs-26.1+1/etc/themes/tsdh-dark-theme.el emacs-26.3+1/etc/themes/tsdh-dark-theme.el
--- emacs-26.1+1/etc/themes/tsdh-dark-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/tsdh-dark-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tsdh-dark-theme.el --- Tassilo's dark custom theme
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/themes/tsdh-light-theme.el emacs-26.3+1/etc/themes/tsdh-light-theme.el
--- emacs-26.1+1/etc/themes/tsdh-light-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/tsdh-light-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tsdh-light-theme.el --- Tassilo's light custom theme
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/themes/wheatgrass-theme.el emacs-26.3+1/etc/themes/wheatgrass-theme.el
--- emacs-26.1+1/etc/themes/wheatgrass-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/wheatgrass-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wheatgrass-theme.el --- custom theme for faces
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/themes/whiteboard-theme.el emacs-26.3+1/etc/themes/whiteboard-theme.el
--- emacs-26.1+1/etc/themes/whiteboard-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/whiteboard-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; whiteboard-theme.el --- Custom theme for faces
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Scott Frazer <frazer.scott@gmail.com>
 
diff -Nru emacs-26.1+1/etc/themes/wombat-theme.el emacs-26.3+1/etc/themes/wombat-theme.el
--- emacs-26.1+1/etc/themes/wombat-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/themes/wombat-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wombat-theme.el --- Custom face theme for Emacs
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Kristoffer Grönlund <krig@koru.se>
 
diff -Nru emacs-26.1+1/etc/TODO emacs-26.3+1/etc/TODO
--- emacs-26.1+1/etc/TODO	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/TODO	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 Emacs TODO List                                                   -*-outline-*-
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL emacs-26.3+1/etc/tutorials/TUTORIAL
--- emacs-26.1+1/etc/tutorials/TUTORIAL	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL	2019-09-10 00:32:49.000000000 +0000
@@ -704,7 +704,7 @@
 If the computer crashes, you can recover your auto-saved editing by
 finding the file normally (the file you were editing, not the auto
 save file) and then typing M-x recover-this-file <Return>.  When it
-asks fo confirmation, type yes<Return> to go ahead and recover the
+asks for confirmation, type yes<Return> to go ahead and recover the
 auto-save data.
 
 
@@ -1116,7 +1116,7 @@
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.bg emacs-26.3+1/etc/tutorials/TUTORIAL.bg
--- emacs-26.1+1/etc/tutorials/TUTORIAL.bg	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.bg	2019-09-10 00:32:49.000000000 +0000
@@ -1162,7 +1162,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.cn emacs-26.3+1/etc/tutorials/TUTORIAL.cn
--- emacs-26.1+1/etc/tutorials/TUTORIAL.cn	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.cn	2019-09-10 00:32:49.000000000 +0000
@@ -997,7 +997,7 @@
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
@@ -1026,7 +1026,7 @@
 
 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝：
 
-   Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation,
    Inc.
 
    本文件为 GNU Emacs 的一部分。
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.cs emacs-26.3+1/etc/tutorials/TUTORIAL.cs
--- emacs-26.1+1/etc/tutorials/TUTORIAL.cs	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.cs	2019-09-10 00:32:49.000000000 +0000
@@ -1015,7 +1015,7 @@
 Tato verze tutoriálu je, podobně jako GNU Emacs, chráněna copyrightem a
 je šířena se svolením distribuovat kopie za jistých podmínek:
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Každému je zaručeno právo vytvářet a distribuovat přesné kopie tohoto
    dokumentu tak, jak jej obdržel, na jakémkoliv médiu, s tím, že bude
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.de emacs-26.3+1/etc/tutorials/TUTORIAL.de
--- emacs-26.1+1/etc/tutorials/TUTORIAL.de	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.de	2019-09-10 00:32:49.000000000 +0000
@@ -1458,7 +1458,7 @@
 dieser Urheberrechtsnotiz gültig ist (zu finden in der Datei
 TUTORIAL).
 
-   Copyright (C) 1985, 1996-1997, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985, 1996-1997, 2001-2019 Free Software Foundation,
    Inc.
 
    Diese Datei ist ein Bestandteil von GNU Emacs.
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.eo emacs-26.3+1/etc/tutorials/TUTORIAL.eo
--- emacs-26.1+1/etc/tutorials/TUTORIAL.eo	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.eo	2019-09-10 00:32:49.000000000 +0000
@@ -1081,7 +1081,7 @@
 kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj
 kondiĉoj estas observataj:
 
-   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2018 Free Software
+   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2019 Free Software
    Foundation, Inc.
 
    Ĉi tiu dosiero estas parto de "GNU Emacs".
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.es emacs-26.3+1/etc/tutorials/TUTORIAL.es
--- emacs-26.1+1/etc/tutorials/TUTORIAL.es	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.es	2019-09-10 00:32:49.000000000 +0000
@@ -1204,7 +1204,7 @@
 siguiente nota de derechos de reproducción (que puede encontrar en el
 archivo TUTORIAL).
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Se permite a cualquiera hacer o distribuir copias literales de este
    documento como se recibe, en cualquier medio, siempre que la nota
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.fr emacs-26.3+1/etc/tutorials/TUTORIAL.fr
--- emacs-26.1+1/etc/tutorials/TUTORIAL.fr	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.fr	2019-09-10 00:32:49.000000000 +0000
@@ -1202,7 +1202,7 @@
 droit d'auteur, et vous pouvez en distribuer des copies sous certaines
 conditions :
 
-Copyright (C) 1985, 1996, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2019 Free Software Foundation, Inc.
 
    Chacun peut créer ou distribuer des copies de ce document tel qu'il
    l'a reçu, sur n'importe quel support, pourvu que la note de
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.he emacs-26.3+1/etc/tutorials/TUTORIAL.he
--- emacs-26.1+1/etc/tutorials/TUTORIAL.he	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.he	2019-09-10 00:32:49.000000000 +0000
@@ -1004,7 +1004,7 @@
 גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
 וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
 
-                       Copyright (C) 2010-2018 Free Software Foundation, Inc.
+                       Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
 הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.it emacs-26.3+1/etc/tutorials/TUTORIAL.it
--- emacs-26.1+1/etc/tutorials/TUTORIAL.it	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.it	2019-09-10 00:32:49.000000000 +0000
@@ -1203,7 +1203,7 @@
    indicativo, restando comunque inteso il fatto che è quella
    originale a fare fede.
 
-Copyright (C) 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
    È permesso a chiunque copiare e distribuire attraverso ogni mezzo
    copie fedeli di questo documento così come viene ricevuto, a
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.ja emacs-26.3+1/etc/tutorials/TUTORIAL.ja
--- emacs-26.1+1/etc/tutorials/TUTORIAL.ja	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.ja	2019-09-10 00:32:49.000000000 +0000
@@ -1062,7 +1062,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.ko emacs-26.3+1/etc/tutorials/TUTORIAL.ko
--- emacs-26.1+1/etc/tutorials/TUTORIAL.ko	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.ko	2019-09-10 00:32:49.000000000 +0000
@@ -981,7 +981,7 @@
 GNU 이맥스와 같이 이 지침서 판은 저작권이 있으며 특정한 조건을 만족할
 때에 복사본을 배포할 수 있는 허가를 갖고 나온 것이다:
 
-Copyright (C) 1985, 1996, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2019 Free Software Foundation, Inc.
 
    이 문서는 이 저작권 공고와 허용 공고가 그대로 유지되고, 배포자가
    수취자에게 이 공고에 따라 허용되는 것처럼 또 재분배하는 것을
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.nl emacs-26.3+1/etc/tutorials/TUTORIAL.nl
--- emacs-26.1+1/etc/tutorials/TUTORIAL.nl	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.nl	2019-09-10 00:32:49.000000000 +0000
@@ -1209,7 +1209,7 @@
 onder copyright.  Je mag deze inleiding verspreiden onder bepaalde
 voorwaarden:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation,
+  Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation,
   Inc.
 
   Dit bestand is onderdeel van GNU Emacs.
@@ -1239,7 +1239,7 @@
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
-  Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.pl emacs-26.3+1/etc/tutorials/TUTORIAL.pl
--- emacs-26.1+1/etc/tutorials/TUTORIAL.pl	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.pl	2019-09-10 00:32:49.000000000 +0000
@@ -1209,7 +1209,7 @@
 Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
 autorskim, ale wolno ją kopiować pod następującymi warunkami:
 
-Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 Zezwala się na wykonywanie lub rozpowszechnianie
 wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.pt_BR emacs-26.3+1/etc/tutorials/TUTORIAL.pt_BR
--- emacs-26.1+1/etc/tutorials/TUTORIAL.pt_BR	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.pt_BR	2019-09-10 00:32:49.000000000 +0000
@@ -1056,7 +1056,7 @@
 <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
 com uma permissão de distribuição de cópias nas seguintes condições:
 
-Copyright (C) 2004-2018 Free Software Foundation, Inc.
+Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
    Permissão é garantida a qualquer um para fazer ou distribuir cópias
    integrais deste documento como recebido, em qualquer meio, deixando
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.ro emacs-26.3+1/etc/tutorials/TUTORIAL.ro
--- emacs-26.1+1/etc/tutorials/TUTORIAL.ro	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.ro	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 
 Această versiune a fost produsă plecând de la versiunea în limba
 engleză, care este
-Copyright (c) 1985, 2013-2018 Free Software Foundation, Inc.
+Copyright (c) 1985, 2013-2019 Free Software Foundation, Inc.
 
 Citiţi acum versiunea românească a tutorialului de Emacs.
 
@@ -1082,7 +1082,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.ru emacs-26.3+1/etc/tutorials/TUTORIAL.ru
--- emacs-26.1+1/etc/tutorials/TUTORIAL.ru	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.ru	2019-09-10 00:32:49.000000000 +0000
@@ -1105,7 +1105,7 @@
 (copyrighted) и приходит с ограничениями распространения копий со
 следующими соглашениями:
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.sk emacs-26.3+1/etc/tutorials/TUTORIAL.sk
--- emacs-26.1+1/etc/tutorials/TUTORIAL.sk	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.sk	2019-09-10 00:32:49.000000000 +0000
@@ -1074,7 +1074,7 @@
 Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
 a je šírená s povolením distribuovať kópie za istých podmienok:
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Každému je zaručené právo vytvárať a distribuovať presné kópie tohto
    dokumentu tak, ako ho dostal, na akomkoľvek médiu, s tým, že bude
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.sl emacs-26.3+1/etc/tutorials/TUTORIAL.sl
--- emacs-26.1+1/etc/tutorials/TUTORIAL.sl	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.sl	2019-09-10 00:32:49.000000000 +0000
@@ -1119,7 +1119,7 @@
 To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
 razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji:
 
-Copyright © 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright © 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
   Ta datoteka je del paketa GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.sv emacs-26.3+1/etc/tutorials/TUTORIAL.sv
--- emacs-26.1+1/etc/tutorials/TUTORIAL.sv	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.sv	2019-09-10 00:32:49.000000000 +0000
@@ -1140,7 +1140,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.th emacs-26.3+1/etc/tutorials/TUTORIAL.th
--- emacs-26.1+1/etc/tutorials/TUTORIAL.th	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.th	2019-09-10 00:32:49.000000000 +0000
@@ -964,7 +964,7 @@
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2019 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff -Nru emacs-26.1+1/etc/tutorials/TUTORIAL.zh emacs-26.3+1/etc/tutorials/TUTORIAL.zh
--- emacs-26.1+1/etc/tutorials/TUTORIAL.zh	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/etc/tutorials/TUTORIAL.zh	2019-09-10 00:32:49.000000000 +0000
@@ -1049,7 +1049,7 @@
 這個版本的快速指南和 GNU Emacs 一樣都是版權化的，並且允許在某些條件下
 散佈其拷貝：
 
-Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff -Nru emacs-26.1+1/.gitattributes emacs-26.3+1/.gitattributes
--- emacs-26.1+1/.gitattributes	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/.gitattributes	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Attributes of Emacs files in the Git repository.
 
-# Copyright 2015-2018 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/.gitignore emacs-26.3+1/.gitignore
--- emacs-26.1+1/.gitignore	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/.gitignore	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2018 Free Software Foundation, Inc.
+# Copyright 2009-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/.gitlab-ci.yml emacs-26.3+1/.gitlab-ci.yml
--- emacs-26.1+1/.gitlab-ci.yml	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/.gitlab-ci.yml	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -35,6 +35,8 @@
 
 test:
   stage: test
+  variables:
+    EMACS_EMBA_CI: 1
   script:
     - ./autogen.sh autoconf
     - ./configure --without-makeinfo
diff -Nru emacs-26.1+1/GNUmakefile emacs-26.3+1/GNUmakefile
--- emacs-26.1+1/GNUmakefile	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/GNUmakefile	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Build Emacs from a fresh tarball or version-control checkout.
 
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/INSTALL emacs-26.3+1/INSTALL
--- emacs-26.1+1/INSTALL	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/INSTALL	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2018 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2019 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
@@ -202,8 +202,9 @@
 GNU/Linux distribution that you use, and the options that you want to
 configure Emacs with.  On Debian-based systems, you can install all the
 packages needed to build the installed version of Emacs with a command
-like 'apt-get build-dep emacs24'.  On Red Hat systems, the
-corresponding command is 'yum-builddep emacs'.
+like 'apt-get build-dep emacs' (on older systems, replace 'emacs' with
+eg 'emacs25').  On Red Hat-based systems, the corresponding command is
+'dnf builddep emacs' (on older systems, use 'yum-builddep' instead).
 
 
 DETAILED BUILDING AND INSTALLATION:
diff -Nru emacs-26.1+1/INSTALL.REPO emacs-26.3+1/INSTALL.REPO
--- emacs-26.1+1/INSTALL.REPO	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/INSTALL.REPO	2019-09-10 00:32:49.000000000 +0000
@@ -76,7 +76,7 @@
 
 
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/leim/ChangeLog.1 emacs-26.3+1/leim/ChangeLog.1
--- emacs-26.1+1/leim/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/leim/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -2578,7 +2578,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1997-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1997-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/leim/leim-ext.el emacs-26.3+1/leim/leim-ext.el
--- emacs-26.1+1/leim/leim-ext.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/leim/leim-ext.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; leim-ext.el -- extra leim configuration	-*- coding:utf-8; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff -Nru emacs-26.1+1/leim/Makefile.in emacs-26.3+1/leim/Makefile.in
--- emacs-26.1+1/leim/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/leim/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2019 Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/leim/README emacs-26.3+1/leim/README
--- emacs-26.1+1/leim/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/leim/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff -Nru emacs-26.1+1/lib/acl_entries.c emacs-26.3+1/lib/acl_entries.c
--- emacs-26.1+1/lib/acl_entries.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/acl_entries.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Return the number of entries in an ACL.
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/acl-errno-valid.c emacs-26.3+1/lib/acl-errno-valid.c
--- emacs-26.1+1/lib/acl-errno-valid.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/acl-errno-valid.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test whether ACLs are well supported on this system.
 
-   Copyright 2013-2018 Free Software Foundation, Inc.
+   Copyright 2013-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/acl.h emacs-26.3+1/lib/acl.h
--- emacs-26.1+1/lib/acl.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/acl.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/acl-internal.c emacs-26.3+1/lib/acl-internal.c
--- emacs-26.1+1/lib/acl-internal.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/acl-internal.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test whether a file has a nontrivial ACL.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/acl-internal.h emacs-26.3+1/lib/acl-internal.h
--- emacs-26.1+1/lib/acl-internal.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/acl-internal.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Internal implementation of access control lists.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/alloca.in.h emacs-26.3+1/lib/alloca.in.h
--- emacs-26.1+1/lib/alloca.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/alloca.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff -Nru emacs-26.1+1/lib/allocator.h emacs-26.3+1/lib/allocator.h
--- emacs-26.1+1/lib/allocator.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/allocator.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/arg-nonnull.h emacs-26.3+1/lib/arg-nonnull.h
--- emacs-26.1+1/lib/arg-nonnull.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/arg-nonnull.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff -Nru emacs-26.1+1/lib/at-func.c emacs-26.3+1/lib/at-func.c
--- emacs-26.1+1/lib/at-func.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/at-func.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Define at-style functions like fstatat, unlinkat, fchownat, etc.
-   Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/binary-io.c emacs-26.3+1/lib/binary-io.c
--- emacs-26.1+1/lib/binary-io.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/binary-io.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright 2017-2018 Free Software Foundation, Inc.
+   Copyright 2017-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/binary-io.h emacs-26.3+1/lib/binary-io.h
--- emacs-26.1+1/lib/binary-io.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/binary-io.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/byteswap.in.h emacs-26.3+1/lib/byteswap.in.h
--- emacs-26.1+1/lib/byteswap.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/byteswap.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc.
    Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/careadlinkat.c emacs-26.3+1/lib/careadlinkat.c
--- emacs-26.1+1/lib/careadlinkat.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/careadlinkat.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/careadlinkat.h emacs-26.3+1/lib/careadlinkat.h
--- emacs-26.1+1/lib/careadlinkat.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/careadlinkat.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/c-ctype.h emacs-26.3+1/lib/c-ctype.h
--- emacs-26.1+1/lib/c-ctype.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/c-ctype.h	2019-09-10 00:32:49.000000000 +0000
@@ -5,7 +5,8 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2019 Free Software Foundation,
+   Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/c++defs.h emacs-26.3+1/lib/c++defs.h
--- emacs-26.1+1/lib/c++defs.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/c++defs.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff -Nru emacs-26.1+1/lib/cloexec.c emacs-26.3+1/lib/cloexec.c
--- emacs-26.1+1/lib/cloexec.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/cloexec.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/cloexec.h emacs-26.3+1/lib/cloexec.h
--- emacs-26.1+1/lib/cloexec.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/cloexec.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/close-stream.c emacs-26.3+1/lib/close-stream.c
--- emacs-26.1+1/lib/close-stream.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/close-stream.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Close a stream, with nicer error checking than fclose's.
 
-   Copyright (C) 1998-2002, 2004, 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/count-leading-zeros.h emacs-26.3+1/lib/count-leading-zeros.h
--- emacs-26.1+1/lib/count-leading-zeros.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/count-leading-zeros.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* count-leading-zeros.h -- counts the number of leading 0 bits in a word.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/count-one-bits.h emacs-26.3+1/lib/count-one-bits.h
--- emacs-26.1+1/lib/count-one-bits.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/count-one-bits.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* count-one-bits.h -- counts the number of 1-bits in a word.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/count-trailing-zeros.h emacs-26.3+1/lib/count-trailing-zeros.h
--- emacs-26.1+1/lib/count-trailing-zeros.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/count-trailing-zeros.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* count-trailing-zeros.h -- counts the number of trailing 0 bits in a word.
-   Copyright 2013-2018 Free Software Foundation, Inc.
+   Copyright 2013-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/c-strcasecmp.c emacs-26.3+1/lib/c-strcasecmp.c
--- emacs-26.1+1/lib/c-strcasecmp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/c-strcasecmp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/c-strcase.h emacs-26.3+1/lib/c-strcase.h
--- emacs-26.1+1/lib/c-strcase.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/c-strcase.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2018 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/c-strncasecmp.c emacs-26.3+1/lib/c-strncasecmp.c
--- emacs-26.1+1/lib/c-strncasecmp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/c-strncasecmp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/diffseq.h emacs-26.3+1/lib/diffseq.h
--- emacs-26.1+1/lib/diffseq.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/diffseq.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2019 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/dirent.in.h emacs-26.3+1/lib/dirent.in.h
--- emacs-26.1+1/lib/dirent.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/dirent.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* A GNU-like <dirent.h>.
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/dirfd.c emacs-26.3+1/lib/dirfd.c
--- emacs-26.1+1/lib/dirfd.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/dirfd.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* dirfd.c -- return the file descriptor associated with an open DIR*
 
-   Copyright (C) 2001, 2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/dosname.h emacs-26.3+1/lib/dosname.h
--- emacs-26.1+1/lib/dosname.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/dosname.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/dtotimespec.c emacs-26.3+1/lib/dtotimespec.c
--- emacs-26.1+1/lib/dtotimespec.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/dtotimespec.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Convert double to timespec.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/dup2.c emacs-26.3+1/lib/dup2.c
--- emacs-26.1+1/lib/dup2.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/dup2.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/errno.in.h emacs-26.3+1/lib/errno.in.h
--- emacs-26.1+1/lib/errno.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/errno.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/euidaccess.c emacs-26.3+1/lib/euidaccess.c
--- emacs-26.1+1/lib/euidaccess.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/euidaccess.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* euidaccess -- check if effective user id can access file
 
-   Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2018 Free
+   Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2019 Free
    Software Foundation, Inc.
 
    This file is part of the GNU C Library.
diff -Nru emacs-26.1+1/lib/execinfo.in.h emacs-26.3+1/lib/execinfo.in.h
--- emacs-26.1+1/lib/execinfo.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/execinfo.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Information about executables.
 
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/explicit_bzero.c emacs-26.3+1/lib/explicit_bzero.c
--- emacs-26.1+1/lib/explicit_bzero.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/explicit_bzero.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Erasure of sensitive data, generic implementation.
-   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+   Copyright (C) 2016-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/lib/faccessat.c emacs-26.3+1/lib/faccessat.c
--- emacs-26.1+1/lib/faccessat.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/faccessat.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Check the access rights of a file relative to an open directory.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fcntl.c emacs-26.3+1/lib/fcntl.c
--- emacs-26.1+1/lib/fcntl.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fcntl.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fcntl.in.h emacs-26.3+1/lib/fcntl.in.h
--- emacs-26.1+1/lib/fcntl.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fcntl.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fdatasync.c emacs-26.3+1/lib/fdatasync.c
--- emacs-26.1+1/lib/fdatasync.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fdatasync.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Emulate fdatasync on platforms that lack it.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
diff -Nru emacs-26.1+1/lib/fdopendir.c emacs-26.3+1/lib/fdopendir.c
--- emacs-26.1+1/lib/fdopendir.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fdopendir.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* provide a replacement fdopendir function
-   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/filemode.c emacs-26.3+1/lib/filemode.c
--- emacs-26.1+1/lib/filemode.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/filemode.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* filemode.c -- make a string describing file modes
 
-   Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2018 Free
+   Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2019 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/filemode.h emacs-26.3+1/lib/filemode.h
--- emacs-26.1+1/lib/filemode.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/filemode.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Make a string describing file modes.
 
-   Copyright (C) 1998-1999, 2003, 2006, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998-1999, 2003, 2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/filevercmp.c emacs-26.3+1/lib/filevercmp.c
--- emacs-26.1+1/lib/filevercmp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/filevercmp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/filevercmp.h emacs-26.3+1/lib/filevercmp.h
--- emacs-26.1+1/lib/filevercmp.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/filevercmp.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/flexmember.h emacs-26.3+1/lib/flexmember.h
--- emacs-26.1+1/lib/flexmember.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/flexmember.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Sizes of structs with flexible array members.
 
-   Copyright 2016-2018 Free Software Foundation, Inc.
+   Copyright 2016-2019 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
diff -Nru emacs-26.1+1/lib/fpending.c emacs-26.3+1/lib/fpending.c
--- emacs-26.1+1/lib/fpending.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fpending.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fpending.h emacs-26.3+1/lib/fpending.h
--- emacs-26.1+1/lib/fpending.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fpending.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2003, 2005-2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fstatat.c emacs-26.3+1/lib/fstatat.c
--- emacs-26.1+1/lib/fstatat.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fstatat.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Work around an fstatat bug on Solaris 9.
 
-   Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/fsync.c emacs-26.3+1/lib/fsync.c
--- emacs-26.1+1/lib/fsync.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/fsync.c	2019-09-10 00:32:49.000000000 +0000
@@ -7,7 +7,7 @@
 
    Written by Richard W.M. Jones <rjones.at.redhat.com>
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
diff -Nru emacs-26.1+1/lib/ftoastr.c emacs-26.3+1/lib/ftoastr.c
--- emacs-26.1+1/lib/ftoastr.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/ftoastr.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* floating point to accurate string
 
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/ftoastr.h emacs-26.3+1/lib/ftoastr.h
--- emacs-26.1+1/lib/ftoastr.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/ftoastr.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* floating point to accurate string
 
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/getdtablesize.c emacs-26.3+1/lib/getdtablesize.c
--- emacs-26.1+1/lib/getdtablesize.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getdtablesize.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* getdtablesize() function: Return maximum possible file descriptor value + 1.
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/getgroups.c emacs-26.3+1/lib/getgroups.c
--- emacs-26.1+1/lib/getgroups.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getgroups.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
 
-   Copyright (C) 1996, 1999, 2003, 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2003, 2006-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/getloadavg.c emacs-26.3+1/lib/getloadavg.c
--- emacs-26.1+1/lib/getloadavg.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getloadavg.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Get the system load averages.
 
-   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2019 Free
+   Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff -Nru emacs-26.1+1/lib/getopt1.c emacs-26.3+1/lib/getopt1.c
--- emacs-26.1+1/lib/getopt1.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt1.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2018 Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff -Nru emacs-26.1+1/lib/getopt.c emacs-26.3+1/lib/getopt.c
--- emacs-26.1+1/lib/getopt.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2018 Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff -Nru emacs-26.1+1/lib/getopt-cdefs.in.h emacs-26.3+1/lib/getopt-cdefs.in.h
--- emacs-26.1+1/lib/getopt-cdefs.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt-cdefs.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* getopt-on-non-glibc compatibility macros.
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
diff -Nru emacs-26.1+1/lib/getopt-core.h emacs-26.3+1/lib/getopt-core.h
--- emacs-26.1+1/lib/getopt-core.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt-core.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt (basic, portable features only).
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff -Nru emacs-26.1+1/lib/getopt-ext.h emacs-26.3+1/lib/getopt-ext.h
--- emacs-26.1+1/lib/getopt-ext.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt-ext.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt (GNU extensions).
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff -Nru emacs-26.1+1/lib/getopt.in.h emacs-26.3+1/lib/getopt.in.h
--- emacs-26.1+1/lib/getopt.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library, which supplies a different version of
diff -Nru emacs-26.1+1/lib/getopt_int.h emacs-26.3+1/lib/getopt_int.h
--- emacs-26.1+1/lib/getopt_int.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt_int.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff -Nru emacs-26.1+1/lib/getopt-pfx-core.h emacs-26.3+1/lib/getopt-pfx-core.h
--- emacs-26.1+1/lib/getopt-pfx-core.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt-pfx-core.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* getopt (basic, portable features) gnulib wrapper header.
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
diff -Nru emacs-26.1+1/lib/getopt-pfx-ext.h emacs-26.3+1/lib/getopt-pfx-ext.h
--- emacs-26.1+1/lib/getopt-pfx-ext.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/getopt-pfx-ext.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* getopt (GNU extensions) gnulib wrapper header.
-   Copyright (C) 1989-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
diff -Nru emacs-26.1+1/lib/get-permissions.c emacs-26.3+1/lib/get-permissions.c
--- emacs-26.1+1/lib/get-permissions.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/get-permissions.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Get permissions of a file.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/gettext.h emacs-26.3+1/lib/gettext.h
--- emacs-26.1+1/lib/gettext.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/gettext.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2019 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/gettime.c emacs-26.3+1/lib/gettime.c
--- emacs-26.1+1/lib/gettime.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/gettime.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* gettime -- get the system clock
 
-   Copyright (C) 2002, 2004-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2007, 2009-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/gettimeofday.c emacs-26.3+1/lib/gettimeofday.c
--- emacs-26.1+1/lib/gettimeofday.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/gettimeofday.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/gnulib.mk.in emacs-26.3+1/lib/gnulib.mk.in
--- emacs-26.1+1/lib/gnulib.mk.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/gnulib.mk.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stat --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=tzset --avoid=unsetenv --avoid=utime --avoid=utime-h --gnu-make --makefile-name=gnulib.mk.in --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-leading-zeros count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 d-type diffseq dtoastr dtotimespec dup2 environ execinfo explicit_bzero faccessat fcntl fcntl-h fdatasync fdopendir filemode filevercmp flexmember fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog ignore-value intprops largefile lstat manywarnings memrchr minmax mkostemp mktime nstrftime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time std-gnu11 stdalign stddef stdio stpcpy strtoimax symlink sys_stat sys_time tempname time time_r time_rz timegm timer-time timespec-add timespec-sub unlocked-io update-copyright utimens vla warnings
+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stat --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=tzset --avoid=unsetenv --avoid=utime --avoid=utime-h --gnu-make --makefile-name=gnulib.mk.in --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-leading-zeros count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 d-type diffseq dtoastr dtotimespec dup2 environ execinfo explicit_bzero faccessat fcntl fcntl-h fdatasync fdopendir filemode filevercmp flexmember fpieee fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog ignore-value intprops largefile lstat manywarnings memrchr minmax mkostemp mktime nstrftime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time std-gnu11 stdalign stddef stdio stpcpy strtoimax symlink sys_stat sys_time tempname time time_r time_rz timegm timer-time timespec-add timespec-sub unlocked-io update-copyright utimens vla warnings
 
 
 MOSTLYCLEANFILES += core *.stackdump
diff -Nru emacs-26.1+1/lib/group-member.c emacs-26.3+1/lib/group-member.c
--- emacs-26.1+1/lib/group-member.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/group-member.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* group-member.c -- determine whether group id is in calling user's group list
 
-   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2019 Free
+   Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/ignore-value.h emacs-26.3+1/lib/ignore-value.h
--- emacs-26.1+1/lib/ignore-value.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/ignore-value.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* ignore a function return without a compiler warning.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/intprops.h emacs-26.3+1/lib/intprops.h
--- emacs-26.1+1/lib/intprops.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/intprops.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff -Nru emacs-26.1+1/lib/inttypes.in.h emacs-26.3+1/lib/inttypes.in.h
--- emacs-26.1+1/lib/inttypes.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/inttypes.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
diff -Nru emacs-26.1+1/lib/limits.in.h emacs-26.3+1/lib/limits.in.h
--- emacs-26.1+1/lib/limits.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/limits.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <limits.h>.
 
-   Copyright 2016-2018 Free Software Foundation, Inc.
+   Copyright 2016-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff -Nru emacs-26.1+1/lib/localtime-buffer.c emacs-26.3+1/lib/localtime-buffer.c
--- emacs-26.1+1/lib/localtime-buffer.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/localtime-buffer.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Provide access to the last buffer returned by localtime() or gmtime().
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/localtime-buffer.h emacs-26.3+1/lib/localtime-buffer.h
--- emacs-26.1+1/lib/localtime-buffer.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/localtime-buffer.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Provide access to the last buffer returned by localtime() or gmtime().
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/lstat.c emacs-26.3+1/lib/lstat.c
--- emacs-26.1+1/lib/lstat.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/lstat.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/Makefile.in emacs-26.3+1/lib/Makefile.in
--- emacs-26.1+1/lib/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright 2017-2018 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lib/md5.c emacs-26.3+1/lib/md5.c
--- emacs-26.1+1/lib/md5.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/md5.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2019 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify it
diff -Nru emacs-26.1+1/lib/md5.h emacs-26.3+1/lib/md5.h
--- emacs-26.1+1/lib/md5.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/md5.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2019 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify it
diff -Nru emacs-26.1+1/lib/memrchr.c emacs-26.3+1/lib/memrchr.c
--- emacs-26.1+1/lib/memrchr.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/memrchr.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2019 Free
+   Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
    with help from Dan Sahlin (dan@sics.se) and
diff -Nru emacs-26.1+1/lib/minmax.h emacs-26.3+1/lib/minmax.h
--- emacs-26.1+1/lib/minmax.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/minmax.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2018 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/mkostemp.c emacs-26.3+1/lib/mkostemp.c
--- emacs-26.1+1/lib/mkostemp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/mkostemp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2018 Free Software
+/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2019 Free Software
    Foundation, Inc.
    This file is derived from the one in the GNU C Library.
 
diff -Nru emacs-26.1+1/lib/mktime.c emacs-26.3+1/lib/mktime.c
--- emacs-26.1+1/lib/mktime.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/mktime.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert a 'struct tm' to a time_t value.
-   Copyright (C) 1993-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.
 
diff -Nru emacs-26.1+1/lib/mktime-internal.h emacs-26.3+1/lib/mktime-internal.h
--- emacs-26.1+1/lib/mktime-internal.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/mktime-internal.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* mktime variant that also uses an offset guess
 
-   Copyright 2016-2018 Free Software Foundation, Inc.
+   Copyright 2016-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
diff -Nru emacs-26.1+1/lib/nstrftime.c emacs-26.3+1/lib/nstrftime.c
--- emacs-26.1+1/lib/nstrftime.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/nstrftime.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/lib/openat.h emacs-26.3+1/lib/openat.h
--- emacs-26.1+1/lib/openat.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/openat.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* provide a replacement openat function
-   Copyright (C) 2004-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/openat-priv.h emacs-26.3+1/lib/openat-priv.h
--- emacs-26.1+1/lib/openat-priv.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/openat-priv.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Internals for openat-like functions.
 
-   Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/openat-proc.c emacs-26.3+1/lib/openat-proc.c
--- emacs-26.1+1/lib/openat-proc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/openat-proc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Create /proc/self/fd-related names for subfiles of open directories.
 
-   Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/open.c emacs-26.3+1/lib/open.c
--- emacs-26.1+1/lib/open.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/open.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/pipe2.c emacs-26.3+1/lib/pipe2.c
--- emacs-26.1+1/lib/pipe2.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/pipe2.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Create a pipe, with specific opening flags.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/pselect.c emacs-26.3+1/lib/pselect.c
--- emacs-26.1+1/lib/pselect.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/pselect.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* pselect - synchronous I/O multiplexing
 
-   Copyright 2011-2018 Free Software Foundation, Inc.
+   Copyright 2011-2019 Free Software Foundation, Inc.
 
    This file is part of gnulib.
 
diff -Nru emacs-26.1+1/lib/pthread_sigmask.c emacs-26.3+1/lib/pthread_sigmask.c
--- emacs-26.1+1/lib/pthread_sigmask.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/pthread_sigmask.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking for threads.
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/putenv.c emacs-26.3+1/lib/putenv.c
--- emacs-26.1+1/lib/putenv.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/putenv.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2018 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2019 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff -Nru emacs-26.1+1/lib/qcopy-acl.c emacs-26.3+1/lib/qcopy-acl.c
--- emacs-26.1+1/lib/qcopy-acl.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/qcopy-acl.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Copy access control list from one file to another.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/readlinkat.c emacs-26.3+1/lib/readlinkat.c
--- emacs-26.1+1/lib/readlinkat.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/readlinkat.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Read a symlink relative to an open directory.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/readlink.c emacs-26.3+1/lib/readlink.c
--- emacs-26.1+1/lib/readlink.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/readlink.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/root-uid.h emacs-26.3+1/lib/root-uid.h
--- emacs-26.1+1/lib/root-uid.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/root-uid.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* The user ID that always has appropriate privileges in the POSIX sense.
 
-   Copyright 2012-2018 Free Software Foundation, Inc.
+   Copyright 2012-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/save-cwd.c emacs-26.3+1/lib/save-cwd.c
--- emacs-26.1+1/lib/save-cwd.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/save-cwd.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* save-cwd.c -- Save and restore current working directory.
 
-   Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2018 Free Software
+   Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2019 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/save-cwd.h emacs-26.3+1/lib/save-cwd.h
--- emacs-26.1+1/lib/save-cwd.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/save-cwd.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Save and restore current working directory.
 
-   Copyright (C) 1995, 1997-1998, 2003, 2009-2018 Free Software
+   Copyright (C) 1995, 1997-1998, 2003, 2009-2019 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/set-permissions.c emacs-26.3+1/lib/set-permissions.c
--- emacs-26.1+1/lib/set-permissions.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/set-permissions.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Set permissions of a file.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sha1.c emacs-26.3+1/lib/sha1.c
--- emacs-26.1+1/lib/sha1.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha1.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,8 @@
 /* sha1.c - Functions to compute SHA1 message digest of files or
    memory blocks according to the NIST specification FIPS-180-1.
 
-   Copyright (C) 2000-2001, 2003-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003-2006, 2008-2019 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff -Nru emacs-26.1+1/lib/sha1.h emacs-26.3+1/lib/sha1.h
--- emacs-26.1+1/lib/sha1.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha1.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA1 sum
    library functions.
-   Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2018 Free Software
+   Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff -Nru emacs-26.1+1/lib/sha256.c emacs-26.3+1/lib/sha256.c
--- emacs-26.1+1/lib/sha256.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha256.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sha256.h emacs-26.3+1/lib/sha256.h
--- emacs-26.1+1/lib/sha256.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha256.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA256 and SHA224 sum
    library functions.
-   Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sha512.c emacs-26.3+1/lib/sha512.c
--- emacs-26.1+1/lib/sha512.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha512.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* sha512.c - Functions to compute SHA512 and SHA384 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sha512.h emacs-26.3+1/lib/sha512.h
--- emacs-26.1+1/lib/sha512.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sha512.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA512 and SHA384 sum
    library functions.
-   Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sig2str.c emacs-26.3+1/lib/sig2str.c
--- emacs-26.1+1/lib/sig2str.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sig2str.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* sig2str.c -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2004, 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2009-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sig2str.h emacs-26.3+1/lib/sig2str.h
--- emacs-26.1+1/lib/sig2str.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sig2str.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* sig2str.h -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2005, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/signal.in.h emacs-26.3+1/lib/signal.in.h
--- emacs-26.1+1/lib/signal.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/signal.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stat-time.h emacs-26.3+1/lib/stat-time.h
--- emacs-26.1+1/lib/stat-time.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stat-time.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stdalign.in.h emacs-26.3+1/lib/stdalign.in.h
--- emacs-26.1+1/lib/stdalign.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stdalign.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for ISO C11 <stdalign.h>.
 
-   Copyright 2011-2018 Free Software Foundation, Inc.
+   Copyright 2011-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stddef.in.h emacs-26.3+1/lib/stddef.in.h
--- emacs-26.1+1/lib/stddef.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stddef.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stdint.in.h emacs-26.3+1/lib/stdint.in.h
--- emacs-26.1+1/lib/stdint.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stdint.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
diff -Nru emacs-26.1+1/lib/stdio-impl.h emacs-26.3+1/lib/stdio-impl.h
--- emacs-26.1+1/lib/stdio-impl.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stdio-impl.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stdio.in.h emacs-26.3+1/lib/stdio.in.h
--- emacs-26.1+1/lib/stdio.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stdio.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stdlib.in.h emacs-26.3+1/lib/stdlib.in.h
--- emacs-26.1+1/lib/stdlib.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stdlib.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/stpcpy.c emacs-26.3+1/lib/stpcpy.c
--- emacs-26.1+1/lib/stpcpy.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/stpcpy.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2018 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2019 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff -Nru emacs-26.1+1/lib/strftime.h emacs-26.3+1/lib/strftime.h
--- emacs-26.1+1/lib/strftime.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/strftime.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* declarations for strftime.c
 
-   Copyright (C) 2002, 2004, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2008-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/string.in.h emacs-26.3+1/lib/string.in.h
--- emacs-26.1+1/lib/string.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/string.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/strtoimax.c emacs-26.3+1/lib/strtoimax.c
--- emacs-26.1+1/lib/strtoimax.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/strtoimax.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001-2004, 2006, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 1999, 2001-2004, 2006, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/strtol.c emacs-26.3+1/lib/strtol.c
--- emacs-26.1+1/lib/strtol.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/strtol.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2018 Free Software
-   Foundation, Inc.
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2019 Free
+   Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
diff -Nru emacs-26.1+1/lib/strtoll.c emacs-26.3+1/lib/strtoll.c
--- emacs-26.1+1/lib/strtoll.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/strtoll.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Function to parse a 'long long int' from text.
-   Copyright (C) 1995-1997, 1999, 2001, 2009-2018 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1997, 1999, 2001, 2009-2019 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/symlink.c emacs-26.3+1/lib/symlink.c
--- emacs-26.1+1/lib/symlink.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/symlink.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sys_select.in.h emacs-26.3+1/lib/sys_select.in.h
--- emacs-26.1+1/lib/sys_select.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sys_select.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for <sys/select.h>.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sys_stat.in.h emacs-26.3+1/lib/sys_stat.in.h
--- emacs-26.1+1/lib/sys_stat.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sys_stat.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat.h header file.
-   Copyright (C) 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sys_time.in.h emacs-26.3+1/lib/sys_time.in.h
--- emacs-26.1+1/lib/sys_time.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sys_time.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/sys_types.in.h emacs-26.3+1/lib/sys_types.in.h
--- emacs-26.1+1/lib/sys_types.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/sys_types.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/tempname.c emacs-26.3+1/lib/tempname.c
--- emacs-26.1+1/lib/tempname.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/tempname.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* tempname.c - generate the name of a temporary file.
 
-   Copyright (C) 1991-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991-2003, 2005-2007, 2009-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/tempname.h emacs-26.3+1/lib/tempname.h
--- emacs-26.1+1/lib/tempname.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/tempname.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Create a temporary file or directory.
 
-   Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/timegm.c emacs-26.3+1/lib/timegm.c
--- emacs-26.1+1/lib/timegm.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/timegm.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Convert UTC calendar time to simple time.  Like mktime but assumes UTC.
 
-   Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2018 Free Software
-   Foundation, Inc.  This file is part of the GNU C Library.
+   Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2019 Free
+   Software Foundation, Inc.  This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/time.in.h emacs-26.3+1/lib/time.in.h
--- emacs-26.1+1/lib/time.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/time.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/time-internal.h emacs-26.3+1/lib/time-internal.h
--- emacs-26.1+1/lib/time-internal.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/time-internal.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Time internal interface
 
-   Copyright 2015-2018 Free Software Foundation, Inc.
+   Copyright 2015-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/time_r.c emacs-26.3+1/lib/time_r.c
--- emacs-26.1+1/lib/time_r.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/time_r.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003, 2006-2007, 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2010-2019 Free Software Foundation,
+   Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/time_rz.c emacs-26.3+1/lib/time_rz.c
--- emacs-26.1+1/lib/time_rz.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/time_rz.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Time zone functions such as tzalloc and localtime_rz
 
-   Copyright 2015-2018 Free Software Foundation, Inc.
+   Copyright 2015-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/timespec-add.c emacs-26.3+1/lib/timespec-add.c
--- emacs-26.1+1/lib/timespec-add.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/timespec-add.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Add two struct timespec values.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/timespec.h emacs-26.3+1/lib/timespec.h
--- emacs-26.1+1/lib/timespec.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/timespec.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* timespec -- System time interface
 
-   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2018 Free Software
+   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2019 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff -Nru emacs-26.1+1/lib/timespec-sub.c emacs-26.3+1/lib/timespec-sub.c
--- emacs-26.1+1/lib/timespec-sub.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/timespec-sub.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Subtract two struct timespec values.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/u64.h emacs-26.3+1/lib/u64.h
--- emacs-26.1+1/lib/u64.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/u64.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* uint64_t-like operations that work even on hosts lacking uint64_t
 
-   Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/unistd.in.h emacs-26.3+1/lib/unistd.in.h
--- emacs-26.1+1/lib/unistd.in.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/unistd.in.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2018 Free Software Foundation, Inc.
+   Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/unlocked-io.h emacs-26.3+1/lib/unlocked-io.h
--- emacs-26.1+1/lib/unlocked-io.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/unlocked-io.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/utimens.c emacs-26.3+1/lib/utimens.c
--- emacs-26.1+1/lib/utimens.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/utimens.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Set file access and modification times.
 
-   Copyright (C) 2003-2018 Free Software Foundation, Inc.
+   Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff -Nru emacs-26.1+1/lib/utimens.h emacs-26.3+1/lib/utimens.h
--- emacs-26.1+1/lib/utimens.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/utimens.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Set file access and modification times.
 
-   Copyright 2012-2018 Free Software Foundation, Inc.
+   Copyright 2012-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff -Nru emacs-26.1+1/lib/verify.h emacs-26.3+1/lib/verify.h
--- emacs-26.1+1/lib/verify.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/verify.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/vla.h emacs-26.3+1/lib/vla.h
--- emacs-26.1+1/lib/vla.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/vla.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* vla.h - variable length arrays
 
-   Copyright 2014-2018 Free Software Foundation, Inc.
+   Copyright 2014-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib/warn-on-use.h emacs-26.3+1/lib/warn-on-use.h
--- emacs-26.1+1/lib/warn-on-use.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/warn-on-use.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff -Nru emacs-26.1+1/lib/xalloc-oversized.h emacs-26.3+1/lib/xalloc-oversized.h
--- emacs-26.1+1/lib/xalloc-oversized.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib/xalloc-oversized.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 /* xalloc-oversized.h -- memory allocation size checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/lib-src/ChangeLog.1 emacs-26.3+1/lib-src/ChangeLog.1
--- emacs-26.1+1/lib-src/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -8609,7 +8609,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1988-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lib-src/ebrowse.c emacs-26.3+1/lib-src/ebrowse.c
--- emacs-26.1+1/lib-src/ebrowse.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/ebrowse.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-Copyright (C) 1992-2018 Free Software Foundation, Inc.
+Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lib-src/emacsclient.c emacs-26.3+1/lib-src/emacsclient.c
--- emacs-26.1+1/lib-src/emacsclient.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/emacsclient.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
 
-Copyright (C) 1986-1987, 1994, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1986-1987, 1994, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1114,7 +1114,9 @@
 	}
     }
 
-  if (strcmp (type, "eterm") == 0)
+  const char *inside_emacs = egetenv ("INSIDE_EMACS");
+  if (inside_emacs && strstr (inside_emacs, ",term:")
+      && strprefix ("eterm", type))
     {
       if (noabort)
 	return 0;
diff -Nru emacs-26.1+1/lib-src/etags.c emacs-26.3+1/lib-src/etags.c
--- emacs-26.1+1/lib-src/etags.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/etags.c	2019-09-10 00:32:49.000000000 +0000
@@ -28,7 +28,7 @@
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2018 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2019 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff -Nru emacs-26.1+1/lib-src/hexl.c emacs-26.3+1/lib-src/hexl.c
--- emacs-26.1+1/lib-src/hexl.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/hexl.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 
 Author: Keith Gabryelski (according to authors.el)
 
diff -Nru emacs-26.1+1/lib-src/make-docfile.c emacs-26.3+1/lib-src/make-docfile.c
--- emacs-26.1+1/lib-src/make-docfile.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/make-docfile.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
 
-Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2018 Free Software
+Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lib-src/Makefile.in emacs-26.3+1/lib-src/Makefile.in
--- emacs-26.1+1/lib-src/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2018 Free Software
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2019 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lib-src/movemail.c emacs-26.3+1/lib-src/movemail.c
--- emacs-26.1+1/lib-src/movemail.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/movemail.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
 
-Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2018 Free Software
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lib-src/ntlib.c emacs-26.3+1/lib-src/ntlib.c
--- emacs-26.1+1/lib-src/ntlib.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/ntlib.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
 
-Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 Author: Geoff Voelker (voelker@cs.washington.edu)
 Created: 10-8-94
diff -Nru emacs-26.1+1/lib-src/ntlib.h emacs-26.3+1/lib-src/ntlib.h
--- emacs-26.1+1/lib-src/ntlib.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/ntlib.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lib-src/pop.c emacs-26.3+1/lib-src/pop.c
--- emacs-26.1+1/lib-src/pop.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/pop.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
 
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2018 Free Software
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2019 Free Software
 Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
@@ -30,8 +30,12 @@
 #include "ntlib.h"
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501	/* for getaddrinfo stuff */
-#include <winsock2.h>
-#include <ws2tcpip.h>
+#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L
+# include <windows.h>
+#else
+# include <winsock2.h>
+#endif
+# include <ws2tcpip.h>
 #undef getaddrinfo
 #define getaddrinfo  sys_getaddrinfo
 #undef freeaddrinfo
diff -Nru emacs-26.1+1/lib-src/pop.h emacs-26.3+1/lib-src/pop.h
--- emacs-26.1+1/lib-src/pop.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/pop.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001-2019 Free Software Foundation, Inc.
 
 Author:  Jonathan Kamens <jik@security.ov.com>
 
diff -Nru emacs-26.1+1/lib-src/profile.c emacs-26.3+1/lib-src/profile.c
--- emacs-26.1+1/lib-src/profile.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/profile.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001-2018 Free Software Foundation,
+   Copyright (C) 1992, 1994, 1999, 2001-2019 Free Software Foundation,
    Inc.
 
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
diff -Nru emacs-26.1+1/lib-src/rcs2log emacs-26.3+1/lib-src/rcs2log
--- emacs-26.1+1/lib-src/rcs2log	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/rcs2log	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 # RCS to ChangeLog generator
 
-# Copyright (C) 1992-1998, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2019 Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
 
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2018 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2019 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
diff -Nru emacs-26.1+1/lib-src/update-game-score.c emacs-26.3+1/lib-src/update-game-score.c
--- emacs-26.1+1/lib-src/update-game-score.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lib-src/update-game-score.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 Author: Colin Walters <walters@debian.org>
 
diff -Nru emacs-26.1+1/lisp/abbrev.el emacs-26.3+1/lisp/abbrev.el
--- emacs-26.1+1/lisp/abbrev.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/abbrev.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1987, 1992, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -150,11 +150,12 @@
 (defun edit-abbrevs ()
   "Alter abbrev definitions by editing a list of them.
 Selects a buffer containing a list of abbrev definitions with
-point located in the abbrev table of current buffer.
+point located in the abbrev table for the current buffer, and
+turns on `edit-abbrevs-mode' in that buffer.
 You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs
 according to your editing.
-Buffer contains a header line for each abbrev table,
- which is the abbrev table name in parentheses.
+The abbrevs editing buffer contains a header line for each
+abbrev table, which is the abbrev table name in parentheses.
 This is followed by one line per abbrev in that table:
 NAME   USECOUNT   EXPANSION   HOOK
 where NAME and EXPANSION are strings with quotes,
@@ -1022,7 +1023,9 @@
 ;; Keep it after define-abbrev-table, since define-derived-mode uses
 ;; define-abbrev-table.
 (define-derived-mode edit-abbrevs-mode fundamental-mode "Edit-Abbrevs"
-  "Major mode for editing the list of abbrev definitions.")
+  "Major mode for editing the list of abbrev definitions.
+This mode is for editing abbrevs in a buffer prepared by `edit-abbrevs',
+which see.")
 
 (provide 'abbrev)
 
diff -Nru emacs-26.1+1/lisp/align.el emacs-26.3+1/lisp/align.el
--- emacs-26.1+1/lisp/align.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/align.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; align.el --- align text to a specific column, by regexp -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/allout.el emacs-26.3+1/lisp/allout.el
--- emacs-26.1+1/lisp/allout.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/allout.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
-;; Copyright (C) 1992-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
diff -Nru emacs-26.1+1/lisp/allout-widgets.el emacs-26.3+1/lisp/allout-widgets.el
--- emacs-26.1+1/lisp/allout-widgets.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/allout-widgets.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; allout-widgets.el --- Visually highlight allout outline structure.
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
diff -Nru emacs-26.1+1/lisp/ansi-color.el emacs-26.3+1/lisp/ansi-color.el
--- emacs-26.1+1/lisp/ansi-color.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ansi-color.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ansi-color.el --- translate ANSI escape sequences into faces -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff -Nru emacs-26.1+1/lisp/apropos.el emacs-26.3+1/lisp/apropos.el
--- emacs-26.1+1/lisp/apropos.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/apropos.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; apropos.el --- apropos commands for users and programmers
 
-;; Copyright (C) 1989, 1994-1995, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1989, 1994-1995, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
diff -Nru emacs-26.1+1/lisp/arc-mode.el emacs-26.3+1/lisp/arc-mode.el
--- emacs-26.1+1/lisp/arc-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/arc-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; arc-mode.el --- simple editing of archives
 
-;; Copyright (C) 1995, 1997-1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1995, 1997-1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Morten Welinder <terra@gnu.org>
diff -Nru emacs-26.1+1/lisp/array.el emacs-26.3+1/lisp/array.el
--- emacs-26.1+1/lisp/array.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/array.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; array.el --- array editing commands for GNU Emacs
 
-;; Copyright (C) 1987, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: David M. Brown
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/auth-source.el emacs-26.3+1/lisp/auth-source.el
--- emacs-26.1+1/lisp/auth-source.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/auth-source.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; auth-source.el --- authentication sources for Gnus and Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: news
@@ -763,7 +763,7 @@
 The backend may not actually delete the entries.
 
 Returns the deleted entries."
-  (auth-source-search (plist-put spec :delete t)))
+  (apply #'auth-source-search (plist-put spec :delete t)))
 
 (defun auth-source-search-collection (collection value)
   "Returns t is VALUE is t or COLLECTION is t or COLLECTION contains VALUE."
@@ -984,12 +984,13 @@
 
 (defun auth-source-netrc-parse-next-interesting ()
   "Advance to the next interesting position in the current buffer."
+  (skip-chars-forward "\t ")
   ;; If we're looking at a comment or are at the end of the line, move forward
-  (while (or (looking-at "#")
+  (while (or (eq (char-after) ?#)
              (and (eolp)
                   (not (eobp))))
-    (forward-line 1))
-  (skip-chars-forward "\t "))
+    (forward-line 1)
+    (skip-chars-forward "\t ")))
 
 (defun auth-source-netrc-parse-one ()
   "Read one thing from the current buffer."
@@ -999,8 +1000,9 @@
             (looking-at "\"\\([^\"]*\\)\"")
             (looking-at "\\([^ \t\n]+\\)"))
     (forward-char (length (match-string 0)))
-    (auth-source-netrc-parse-next-interesting)
-    (match-string-no-properties 1)))
+    (prog1
+        (match-string-no-properties 1)
+      (auth-source-netrc-parse-next-interesting))))
 
 ;; with thanks to org-mode
 (defsubst auth-source-current-line (&optional pos)
diff -Nru emacs-26.1+1/lisp/auth-source-pass.el emacs-26.3+1/lisp/auth-source-pass.el
--- emacs-26.1+1/lisp/auth-source-pass.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/auth-source-pass.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; auth-source-pass.el --- Integrate auth-source with password-store -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015, 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Damien Cassou <damien@cassou.me>,
 ;;         Nicolas Petton <nicolas@petton.fr>
diff -Nru emacs-26.1+1/lisp/autoarg.el emacs-26.3+1/lisp/autoarg.el
--- emacs-26.1+1/lisp/autoarg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/autoarg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; autoarg.el --- make digit keys supply prefix args
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Created: 1998-09-04
diff -Nru emacs-26.1+1/lisp/autoinsert.el emacs-26.3+1/lisp/autoinsert.el
--- emacs-26.1+1/lisp/autoinsert.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/autoinsert.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
-;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Charlie Martin <crm@cs.duke.edu>
diff -Nru emacs-26.1+1/lisp/autorevert.el emacs-26.3+1/lisp/autorevert.el
--- emacs-26.1+1/lisp/autorevert.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/autorevert.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; autorevert.el --- revert buffers when files on disk change  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren
 ;; Keywords: convenience
@@ -472,7 +472,7 @@
 may also revert some non-file buffers, as described in the
 documentation of that variable.  It ignores buffers with modes
 matching `global-auto-revert-ignore-modes', and buffers with a
-non-nil vale of `global-auto-revert-ignore-buffer'.
+non-nil value of `global-auto-revert-ignore-buffer'.
 
 When a buffer is reverted, a message is generated.  This can be
 suppressed by setting `auto-revert-verbose' to nil.
@@ -813,7 +813,8 @@
       ;; Check if we should cancel the timer.
       (when (and (not global-auto-revert-mode)
 		 (null auto-revert-buffer-list))
-	(cancel-timer auto-revert-timer)
+        (if (timerp auto-revert-timer)
+            (cancel-timer auto-revert-timer))
 	(setq auto-revert-timer nil)))))
 
 
diff -Nru emacs-26.1+1/lisp/avoid.el emacs-26.3+1/lisp/avoid.el
--- emacs-26.1+1/lisp/avoid.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/avoid.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; avoid.el --- make mouse pointer stay out of the way of editing
 
-;; Copyright (C) 1993-1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
diff -Nru emacs-26.1+1/lisp/battery.el emacs-26.3+1/lisp/battery.el
--- emacs-26.1+1/lisp/battery.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/battery.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; battery.el --- display battery status information
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
diff -Nru emacs-26.1+1/lisp/bindings.el emacs-26.3+1/lisp/bindings.el
--- emacs-26.1+1/lisp/bindings.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/bindings.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bindings.el --- define standard key bindings and some variables
 
-;; Copyright (C) 1985-1987, 1992-1996, 1999-2018 Free Software
+;; Copyright (C) 1985-1987, 1992-1996, 1999-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -265,7 +265,10 @@
 (make-variable-buffer-local 'mode-line-process)
 
 (defun bindings--define-key (map key item)
-  "Make as much as possible of the menus pure."
+  "Define KEY in keymap MAP according to ITEM from a menu.
+This is like `define-key', but it takes the definition from the
+specified menu item, and makes pure copies of as much as possible
+of the menu's data."
   (declare (indent 2))
   (define-key map key
     (cond
diff -Nru emacs-26.1+1/lisp/bookmark.el emacs-26.3+1/lisp/bookmark.el
--- emacs-26.1+1/lisp/bookmark.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/bookmark.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
-;; Copyright (C) 1993-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@ -333,8 +333,9 @@
   "Return the bookmark record corresponding to BOOKMARK-NAME-OR-RECORD.
 If BOOKMARK-NAME-OR-RECORD is a string, look for the corresponding
 bookmark record in `bookmark-alist'; return it if found, otherwise
-error.  Else if BOOKMARK-NAME-OR-RECORD is already a bookmark record,
-just return it."
+error.  If optional argument NOERROR is non-nil, return nil
+instead of signaling an error.  Else if BOOKMARK-NAME-OR-RECORD
+is already a bookmark record, just return it."
   (cond
    ((consp bookmark-name-or-record) bookmark-name-or-record)
    ((stringp bookmark-name-or-record)
@@ -802,7 +803,7 @@
          (let ((str
                 (or name
                     (read-from-minibuffer
-                     (format "%s (default: \"%s\"): " prompt default)
+                     (format "%s (default \"%s\"): " prompt default)
                      nil
                      bookmark-minibuffer-read-name-map
                      nil nil defaults))))
@@ -1102,7 +1103,7 @@
 bookmark record, but this is usually only done by programmatic callers.
 
 If DISPLAY-FUNC is non-nil, it is a function to invoke to display the
-bookmark.  It defaults to `switch-to-buffer'.  A typical value for
+bookmark.  It defaults to `pop-to-buffer-same-window'.  A typical value for
 DISPLAY-FUNC would be `switch-to-buffer-other-window'."
   (interactive
    (list (bookmark-completing-read "Jump to bookmark"
@@ -1110,7 +1111,10 @@
   (unless bookmark
     (error "No bookmark specified"))
   (bookmark-maybe-historicize-string bookmark)
-  (bookmark--jump-via bookmark (or display-func 'switch-to-buffer)))
+  ;; Don't use `switch-to-buffer' because it would let the
+  ;; window-point override the bookmark's point when
+  ;; `switch-to-buffer-preserve-window-point' is non-nil.
+  (bookmark--jump-via bookmark (or display-func 'pop-to-buffer-same-window)))
 
 
 ;;;###autoload
diff -Nru emacs-26.1+1/lisp/bs.el emacs-26.3+1/lisp/bs.el
--- emacs-26.1+1/lisp/bs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/bs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
@@ -1159,7 +1159,7 @@
   (bs-mode)
   (let* ((inhibit-read-only t)
 	 (map-fun (lambda (entry)
-		    (length (buffer-name entry))))
+		    (string-width (buffer-name entry))))
 	 (max-length-of-names (apply 'max
 				     (cons 0 (mapcar map-fun list))))
 	 (name-entry-length (min bs-maximal-buffer-name-column
@@ -1371,7 +1371,7 @@
 							  apply-args)
 					   (nth 3 column)                ; align
 					   (- min to-much)))
-	       (len (length new-string)))
+	       (len (string-width new-string)))
 	  (setq string (concat string new-string))
 	  (when (> len min)
 	    (setq to-much (- len min))))))
diff -Nru emacs-26.1+1/lisp/buff-menu.el emacs-26.3+1/lisp/buff-menu.el
--- emacs-26.1+1/lisp/buff-menu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/buff-menu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; buff-menu.el --- Interface for viewing and manipulating buffers -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1993-1995, 2000-2018 Free Software
+;; Copyright (C) 1985-1987, 1993-1995, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -475,10 +475,10 @@
 			   (save-buffer))
 			 (tabulated-list-set-col 2 " " t))
 		     (error (warn "Error saving %s" buffer))))
-		 (if delete
-		     (unless (eq buffer (current-buffer))
-		       (kill-buffer buffer)
-		       (tabulated-list-delete-entry))
+		 (if (and delete
+			  (not (eq buffer (current-buffer)))
+                          (kill-buffer buffer))
+                     (tabulated-list-delete-entry)
 		   (forward-line 1)))))))))
 
 (defun Buffer-menu-select ()
diff -Nru emacs-26.1+1/lisp/button.el emacs-26.3+1/lisp/button.el
--- emacs-26.1+1/lisp/button.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/button.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; button.el --- clickable buttons
 ;;
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: extensions
diff -Nru emacs-26.1+1/lisp/calc/calc-aent.el emacs-26.3+1/lisp/calc/calc-aent.el
--- emacs-26.1+1/lisp/calc/calc-aent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-aent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-aent.el --- algebraic entry functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calcalg2.el emacs-26.3+1/lisp/calc/calcalg2.el
--- emacs-26.1+1/lisp/calc/calcalg2.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calcalg2.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calcalg2.el --- more algebraic functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calcalg3.el emacs-26.3+1/lisp/calc/calcalg3.el
--- emacs-26.1+1/lisp/calc/calcalg3.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calcalg3.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calcalg3.el --- more algebraic functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-alg.el emacs-26.3+1/lisp/calc/calc-alg.el
--- emacs-26.1+1/lisp/calc/calc-alg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-alg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-alg.el --- algebraic functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-arith.el emacs-26.3+1/lisp/calc/calc-arith.el
--- emacs-26.1+1/lisp/calc/calc-arith.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-arith.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-arith.el --- arithmetic functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-bin.el emacs-26.3+1/lisp/calc/calc-bin.el
--- emacs-26.1+1/lisp/calc/calc-bin.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-bin.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-bin.el --- binary functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-comb.el emacs-26.3+1/lisp/calc/calc-comb.el
--- emacs-26.1+1/lisp/calc/calc-comb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-comb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-comb.el --- combinatoric functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calccomp.el emacs-26.3+1/lisp/calc/calccomp.el
--- emacs-26.1+1/lisp/calc/calccomp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calccomp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calccomp.el --- composition functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-cplx.el emacs-26.3+1/lisp/calc/calc-cplx.el
--- emacs-26.1+1/lisp/calc/calc-cplx.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-cplx.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-cplx.el --- Complex number functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
@@ -273,8 +273,8 @@
     (or (eq (car-safe val) 'special-const)
 	(equal val '(cplx 0 1))
 	(and (eq (car-safe val) 'polar)
-	     (eq (nth 1 val) 0)
-	     (Math-equal (nth 1 val) (math-quarter-circle nil))))))
+	     (eq (nth 1 val) 1)
+	     (Math-equal (nth 2 val) (math-quarter-circle nil))))))
 
 ;;; Extract the real or complex part of a complex number.  [R N] [Public]
 ;;; Also extracts the real part of a modulo form.
diff -Nru emacs-26.1+1/lisp/calc/calc.el emacs-26.3+1/lisp/calc/calc.el
--- emacs-26.1+1/lisp/calc/calc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc.el --- the GNU Emacs calculator
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Keywords: convenience, extensions
@@ -395,10 +395,17 @@
                                   (string :tag "Closing annotation delimiter"))))
 
 (defcustom calc-gnuplot-name
-  (if (eq system-type 'windows-nt) "pgnuplot" "gnuplot")
+  (if (and (eq system-type 'windows-nt)
+           ;; Gnuplot v4.x on MS-Windows came with a special
+           ;; pipe-enabled gnuplot executable for batch-mode
+           ;; execution; newer versions allow using gnuplot.exe.
+           (executable-find "pgnuplot"))
+      "pgnuplot"
+    "gnuplot")
   "Name of GNUPLOT program, for calc-graph features."
   :group 'calc
-  :type '(string))
+  :type '(string)
+  :version "26.2")
 
 (defcustom calc-gnuplot-plot-command
   nil
@@ -486,8 +493,8 @@
   "Face used to show the selected portion of a formula."
   :group 'calc)
 
-(defvar calc-bug-address "emacs-devel@gnu.org"
-  "Address of the maintainer of Calc, for use by `report-calc-bug'.")
+(define-obsolete-variable-alias 'calc-bug-address 'report-emacs-bug-address
+  "26.2")
 
 (defvar calc-scan-for-dels t
   "If t, scan keymaps to find all DEL-like keys.
diff -Nru emacs-26.1+1/lisp/calc/calc-embed.el emacs-26.3+1/lisp/calc/calc-embed.el
--- emacs-26.1+1/lisp/calc/calc-embed.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-embed.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-embed.el --- embed Calc in a buffer
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-ext.el emacs-26.3+1/lisp/calc/calc-ext.el
--- emacs-26.1+1/lisp/calc/calc-ext.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-ext.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-ext.el --- various extension functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-fin.el emacs-26.3+1/lisp/calc/calc-fin.el
--- emacs-26.1+1/lisp/calc/calc-fin.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-fin.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-fin.el --- financial functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-forms.el emacs-26.3+1/lisp/calc/calc-forms.el
--- emacs-26.1+1/lisp/calc/calc-forms.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-forms.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-forms.el --- data format conversion functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-frac.el emacs-26.3+1/lisp/calc/calc-frac.el
--- emacs-26.1+1/lisp/calc/calc-frac.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-frac.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-frac.el --- fraction functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-funcs.el emacs-26.3+1/lisp/calc/calc-funcs.el
--- emacs-26.1+1/lisp/calc/calc-funcs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-funcs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-funcs.el --- well-known functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-graph.el emacs-26.3+1/lisp/calc/calc-graph.el
--- emacs-26.1+1/lisp/calc/calc-graph.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-graph.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-graph.el --- graph output functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
@@ -65,6 +65,9 @@
 (defvar calc-graph-no-wait nil)
 (defvar calc-gnuplot-trail-mark)
 
+(defsubst calc-graph-w32-p ()
+  (eq system-type 'windows-nt))
+
 (defun calc-graph-fast (many)
   (interactive "P")
   (let ((calc-graph-no-auto-view t))
@@ -376,8 +379,13 @@
 		    ;; Check MS-Windows before X, in case they have
 		    ;; $DISPLAY set for some reason (e.g., Cygwin or
 		    ;; whatever)
-		    ((string= calc-gnuplot-name "pgnuplot")
-		     "windows")
+                    ((string= calc-gnuplot-name "pgnuplot")
+                     "windows")
+                    ;; Versions of gnuplot that come without pgnuplot
+                    ;; only work on MS-Windows with "qt" as the
+                    ;; terminal, for some reason.
+		    ((calc-graph-w32-p)
+		     "qt")
 		    ((or (eq window-system 'x) (getenv "DISPLAY"))
 		     "x11")
 		    ((>= calc-gnuplot-version 3)
@@ -1321,14 +1329,13 @@
    (calc-graph-init)
    (calc-graph-view-trail)
    (calc-gnuplot-command cmd)
-   (or (string= calc-gnuplot-name "pgnuplot")
+   (or (calc-graph-w32-p)
        (progn
 	 (accept-process-output)
 	 (calc-graph-view-trail)))))
 
 (defun calc-graph-kill (&optional no-view)
   (interactive)
-  (calc-graph-delete-temps)
   (if (calc-gnuplot-alive)
       (calc-wrapper
        (or no-view (calc-graph-view-trail))
@@ -1337,7 +1344,8 @@
        (sit-for 1)
        (if (process-status calc-gnuplot-process)
 	   (delete-process calc-gnuplot-process))
-       (setq calc-gnuplot-process nil))))
+       (setq calc-gnuplot-process nil)))
+  (calc-graph-delete-temps))
 
 (defun calc-graph-quit ()
   (interactive)
@@ -1404,7 +1412,7 @@
 (defun calc-gnuplot-command (&rest args)
   (calc-graph-init)
   (let ((cmd (concat (mapconcat 'identity args " ") "\n")))
-    (or (string= calc-gnuplot-name "pgnuplot")
+    (or (calc-graph-w32-p)
 	(accept-process-output))
     (with-current-buffer calc-gnuplot-buffer
       (calc-gnuplot-check-for-errors)
@@ -1416,7 +1424,7 @@
       (process-send-string calc-gnuplot-process cmd)
       (if (get-buffer-window calc-gnuplot-buffer)
 	  (calc-graph-view-trail))
-      (or (string= calc-gnuplot-name "pgnuplot")
+      (or (calc-graph-w32-p)
 	  (accept-process-output (and (not calc-graph-no-wait)
 				      calc-gnuplot-process)))
       (calc-gnuplot-check-for-errors)
@@ -1445,8 +1453,9 @@
 	  (setq origin (point)))
 	(setq calc-graph-last-device nil)
 	(setq calc-graph-last-output nil)
-	(if (string= calc-gnuplot-name "pgnuplot")
-	    (let ((version-str (shell-command-to-string "pgnuplot -V")))
+	(if (calc-graph-w32-p)
+	    (let ((version-str
+                   (shell-command-to-string (concat calc-gnuplot-name " -V"))))
 	      (if (string-match "gnuplot \\([0-9]+\\)\\." version-str)
 		  (setq calc-gnuplot-version (string-to-number
 					      (substring version-str
@@ -1457,11 +1466,11 @@
 	    (let ((args (append (and calc-gnuplot-display
 				     (not (equal calc-gnuplot-display
 						 (getenv "DISPLAY")))
-				     (not (string= calc-gnuplot-name "pgnuplot"))
+                                     (not (calc-graph-w32-p))
 				     (list "-display"
 					   calc-gnuplot-display))
 				(and calc-gnuplot-geometry
-				     (not (string= calc-gnuplot-name "pgnuplot"))
+				     (not (calc-graph-w32-p))
 				     (list "-geometry"
 					   calc-gnuplot-geometry)))))
 	      (setq calc-gnuplot-process
@@ -1475,7 +1484,7 @@
 	   (error "Sorry, can't find \"%s\" on your system"
 		  calc-gnuplot-name)))
 	(with-current-buffer calc-gnuplot-buffer
-	  (while (and (not (string= calc-gnuplot-name "pgnuplot"))
+	  (while (and (not (calc-graph-w32-p))
 		      (not (save-excursion
 			     (goto-char origin)
 			     (search-forward "gnuplot> " nil t)))
@@ -1483,7 +1492,7 @@
 	    (accept-process-output calc-gnuplot-process))
 	  (or (memq (process-status calc-gnuplot-process) '(run stop))
 	      (error "Unable to start GNUPLOT process"))
-	  (if (not (string= calc-gnuplot-name "pgnuplot"))
+	  (if (not (calc-graph-w32-p))
 	      (if (save-excursion
 		    (goto-char origin)
 		    (re-search-forward
diff -Nru emacs-26.1+1/lisp/calc/calc-help.el emacs-26.3+1/lisp/calc/calc-help.el
--- emacs-26.1+1/lisp/calc/calc-help.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-help.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-help.el --- help display functions for Calc,
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-incom.el emacs-26.3+1/lisp/calc/calc-incom.el
--- emacs-26.1+1/lisp/calc/calc-incom.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-incom.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-incom.el --- complex data type input functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-keypd.el emacs-26.3+1/lisp/calc/calc-keypd.el
--- emacs-26.1+1/lisp/calc/calc-keypd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-keypd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-keypd.el --- mouse-capable keypad input for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-lang.el emacs-26.3+1/lisp/calc/calc-lang.el
--- emacs-26.1+1/lisp/calc/calc-lang.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-lang.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-lang.el --- calc language functions
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-macs.el emacs-26.3+1/lisp/calc/calc-macs.el
--- emacs-26.1+1/lisp/calc/calc-macs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-macs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-macs.el --- important macros for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-map.el emacs-26.3+1/lisp/calc/calc-map.el
--- emacs-26.1+1/lisp/calc/calc-map.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-map.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-map.el --- higher-order functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-math.el emacs-26.3+1/lisp/calc/calc-math.el
--- emacs-26.1+1/lisp/calc/calc-math.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-math.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-math.el --- mathematical functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-menu.el emacs-26.3+1/lisp/calc/calc-menu.el
--- emacs-26.1+1/lisp/calc/calc-menu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-menu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-menu.el --- a menu for Calc
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/calc/calc-misc.el emacs-26.3+1/lisp/calc/calc-misc.el
--- emacs-26.1+1/lisp/calc/calc-misc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-misc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-misc.el --- miscellaneous functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
@@ -943,19 +943,9 @@
 ;;; Bug reporting
 
 ;;;###autoload
-(defun report-calc-bug ()
-  "Report a bug in Calc, the GNU Emacs calculator.
-Prompts for bug subject.  Leaves you in a mail buffer."
-  (interactive)
-  (let ((reporter-prompt-for-summary-p t))
-    (reporter-submit-bug-report calc-bug-address "Calc"
-				nil nil nil
-				"Please describe exactly what actions triggered the bug and the
-precise symptoms of the bug.  If possible, include a backtrace by
-doing `\\[toggle-debug-on-error]', then reproducing the bug.
-" )))
+(define-obsolete-function-alias 'report-calc-bug 'report-emacs-bug "26.2")
 ;;;###autoload
-(defalias 'calc-report-bug 'report-calc-bug)
+(define-obsolete-function-alias 'calc-report-bug 'report-emacs-bug "26.2")
 
 (provide 'calc-misc)
 
diff -Nru emacs-26.1+1/lisp/calc/calc-mode.el emacs-26.3+1/lisp/calc/calc-mode.el
--- emacs-26.1+1/lisp/calc/calc-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-mode.el --- calculator modes for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-mtx.el emacs-26.3+1/lisp/calc/calc-mtx.el
--- emacs-26.1+1/lisp/calc/calc-mtx.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-mtx.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-mtx.el --- matrix functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-nlfit.el emacs-26.3+1/lisp/calc/calc-nlfit.el
--- emacs-26.1+1/lisp/calc/calc-nlfit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-nlfit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-nlfit.el --- nonlinear curve fitting for Calc
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/calc/calc-poly.el emacs-26.3+1/lisp/calc/calc-poly.el
--- emacs-26.1+1/lisp/calc/calc-poly.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-poly.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-poly.el --- polynomial functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-prog.el emacs-26.3+1/lisp/calc/calc-prog.el
--- emacs-26.1+1/lisp/calc/calc-prog.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-prog.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-prog.el --- user programmability functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-rewr.el emacs-26.3+1/lisp/calc/calc-rewr.el
--- emacs-26.1+1/lisp/calc/calc-rewr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-rewr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-rewr.el --- rewriting functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-rules.el emacs-26.3+1/lisp/calc/calc-rules.el
--- emacs-26.1+1/lisp/calc/calc-rules.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-rules.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calcsel2.el emacs-26.3+1/lisp/calc/calcsel2.el
--- emacs-26.1+1/lisp/calc/calcsel2.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calcsel2.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calcsel2.el --- selection functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-sel.el emacs-26.3+1/lisp/calc/calc-sel.el
--- emacs-26.1+1/lisp/calc/calc-sel.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-sel.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-sel.el --- data selection functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-stat.el emacs-26.3+1/lisp/calc/calc-stat.el
--- emacs-26.1+1/lisp/calc/calc-stat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-stat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-stat.el --- statistical functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-store.el emacs-26.3+1/lisp/calc/calc-store.el
--- emacs-26.1+1/lisp/calc/calc-store.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-store.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-store.el --- value storage functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-stuff.el emacs-26.3+1/lisp/calc/calc-stuff.el
--- emacs-26.1+1/lisp/calc/calc-stuff.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-stuff.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-stuff.el --- miscellaneous functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-trail.el emacs-26.3+1/lisp/calc/calc-trail.el
--- emacs-26.1+1/lisp/calc/calc-trail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-trail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-trail.el --- functions for manipulating the Calc "trail"
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-undo.el emacs-26.3+1/lisp/calc/calc-undo.el
--- emacs-26.1+1/lisp/calc/calc-undo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-undo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-undo.el --- undo functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-units.el emacs-26.3+1/lisp/calc/calc-units.el
--- emacs-26.1+1/lisp/calc/calc-units.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-units.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-units.el --- unit conversion functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
@@ -46,6 +46,9 @@
 ;; CODATA values updated February 2016, using 2014 adjustment
 ;; http://arxiv.org/pdf/1507.07956.pdf
 
+;; Updated November 2018 for the redefinition of the SI
+;; https://www.bipm.org/utils/en/pdf/CGPM/Draft-Resolution-A-EN.pdf
+
 (defvar math-standard-units
   '( ;; Length
     ( m       nil                    "*Meter" )
@@ -118,7 +121,7 @@
     ( mph     "mi/hr"                "*Miles per hour" )
     ( kph     "km/hr"                "Kilometers per hour" )
     ( knot    "nmi/hr"               "Knot" )
-    ( c       "299792458 m/s"        "Speed of light" ) ;;; CODATA
+    ( c       "299792458 m/s"        "Speed of light" ) ;; SI definition
 
     ;; Acceleration
     ( ga      "980665*10^(-5) m/s^2" "*\"g\" acceleration" nil
@@ -207,8 +210,8 @@
     ( C       "A s"                   "Coulomb" )
     ( Fdy     "ech Nav"               "Faraday" )
     ( e       "ech"                   "Elementary charge" )
-    ( ech     "1.6021766208*10^(-19) C"     "Elementary charge" nil
-              "1.6021766208 10^-19 C (*)") ;;(approx) CODATA
+    ( ech     "1.602176634*10^(-19) C"    "Elementary charge" nil
+              "1.602176634 10^-19 C")     ;; SI definition
     ( V       "W/A"                   "Volt" )
     ( ohm     "V/A"                   "Ohm" )
     ( Ω       "ohm"                   "Ohm" )
@@ -256,18 +259,21 @@
     ( sr      nil                      "*Steradian" )
 
     ;; Other physical quantities
-    ;; The values are from CODATA, and are approximate.
-    ( h       "6.626070040*10^(-34) J s"     "*Planck's constant" nil
-              "6.626070040 10^-34 J s (*)")
+    ;; Unless otherwise mentioned, the values are from CODATA,
+    ;; and are approximate.
+    ( h       "6.62607015*10^(-34) J s"     "*Planck's constant" nil
+              "6.62607015 10^-34 J s")      ;; SI definition
     ( hbar    "h / (2 pi)"                  "Planck's constant" ) ;; Exact
-    ( mu0     "4 pi 10^(-7) H/m"            "Permeability of vacuum") ;; Exact
-    ( μ0      "mu0"                         "Permeability of vacuum") ;; Exact
-    ( eps0    "1 / (mu0 c^2)"               "Permittivity of vacuum" )
+    ;; After the 2018 SI redefinition, eps0 and mu0 are measured quantities,
+    ;; and mu0 no longer has the previous exact value of 4 pi 10^(-7) H/m.
+    ( eps0    "ech^2 / (2 alpha h c)"       "Permittivity of vacuum" )
     ( ε0      "eps0"                        "Permittivity of vacuum" )
+    ( mu0     "1 / (eps0 c^2)"              "Permeability of vacuum") ;; Exact
+    ( μ0      "mu0"                         "Permeability of vacuum") ;; Exact
     ( G       "6.67408*10^(-11) m^3/(kg s^2)"    "Gravitational constant" nil
               "6.67408 10^-11 m^3/(kg s^2) (*)")
-    ( Nav     "6.022140857*10^(23) / mol"    "Avogadro's constant" nil
-              "6.022140857 10^23 / mol (*)")
+    ( Nav     "6.02214076*10^(23) / mol"    "Avogadro's constant" nil
+              "6.02214076 10^23 / mol")     ;; SI definition
     ( me      "9.10938356*10^(-31) kg"      "Electron rest mass" nil
               "9.10938356 10^-31 kg (*)")
     ( mp      "1.672621898*10^(-27) kg"     "Proton rest mass" nil
@@ -280,12 +286,10 @@
               "1.883531594 10^-28 kg (*)")
     ( Ryd     "10973731.568508 /m"          "Rydberg's constant" nil
               "10973731.568508 /m (*)")
-    ( k       "1.38064852*10^(-23) J/K"      "Boltzmann's constant" nil
-              "1.38064852 10^-23 J/K (*)")
-    ( sigma   "5.670367*10^(-8) W/(m^2 K^4)" "Stefan-Boltzmann constant" nil
-              "5.670367 10^-8 W/(m^2 K^4) (*)")
-    ( σ       "sigma" "Stefan-Boltzmann constant" nil
-              "5.670367 10^-8 W/(m^2 K^4) (*)")
+    ( k       "1.380649*10^(-23) J/K"       "Boltzmann's constant" nil
+              "1.380649 10^-23 J/K")        ;; SI definition
+    ( sigma   "2 pi^5 k^4 / (15 h^3 c^2)"   "Stefan-Boltzmann constant")
+    ( σ       "sigma"                       "Stefan-Boltzmann constant")
     ( alpha   "7.2973525664*10^(-3)"        "Fine structure constant" nil
               "7.2973525664 10^-3 (*)")
     ( α       "alpha"                        "Fine structure constant" nil
@@ -298,8 +302,7 @@
               "-928.4764620 10^-26 J/T (*)")
     ( mup     "1.4106067873*10^(-26) J/T"    "Proton magnetic moment" nil
               "1.4106067873 10^-26 J/T (*)")
-    ( R0      "8.3144598 J/(mol K)"          "Molar gas constant" nil
-              "8.3144598 J/(mol K) (*)")
+    ( R0      "Nav k"                       "Molar gas constant") ;; Exact
     ( V0      "22.710947*10^(-3) m^3/mol"   "Standard volume of ideal gas" nil
               "22.710947 10^-3 m^3/mol (*)")
     ;; Logarithmic units
diff -Nru emacs-26.1+1/lisp/calc/calc-vec.el emacs-26.3+1/lisp/calc/calc-vec.el
--- emacs-26.1+1/lisp/calc/calc-vec.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-vec.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-vec.el --- vector functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calc/calc-yank.el emacs-26.3+1/lisp/calc/calc-yank.el
--- emacs-26.1+1/lisp/calc/calc-yank.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calc/calc-yank.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-yank.el --- kill-ring functionality for Calc
 
-;; Copyright (C) 1990-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 
diff -Nru emacs-26.1+1/lisp/calculator.el emacs-26.3+1/lisp/calculator.el
--- emacs-26.1+1/lisp/calculator.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calculator.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calculator.el --- a calculator for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Barzilay <eli@barzilay.org>
 ;; Keywords: tools, convenience
@@ -627,7 +627,7 @@
 
 These operators are pre-defined:
 * `+' `-' `*' `/' the common binary operators
-* `\\' `%'         integer division and reminder
+* `\\' `%'         integer division and remainder
 * `_' `;'         postfix unary negation and reciprocal
 * `^' `L'         binary operators for x^y and log(x) in base y
 * `Q' `!'         unary square root and factorial
diff -Nru emacs-26.1+1/lisp/calendar/appt.el emacs-26.3+1/lisp/calendar/appt.el
--- emacs-26.1+1/lisp/calendar/appt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/appt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; appt.el --- appointment notification functions
 
-;; Copyright (C) 1989-1990, 1994, 1998, 2001-2018 Free Software
+;; Copyright (C) 1989-1990, 1994, 1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-bahai.el emacs-26.3+1/lisp/calendar/cal-bahai.el
--- emacs-26.1+1/lisp/calendar/cal-bahai.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-bahai.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-bahai.el --- calendar functions for the Bahá’í calendar.
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: calendar
diff -Nru emacs-26.1+1/lisp/calendar/cal-china.el emacs-26.3+1/lisp/calendar/cal-china.el
--- emacs-26.1+1/lisp/calendar/cal-china.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-china.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-coptic.el emacs-26.3+1/lisp/calendar/cal-coptic.el
--- emacs-26.1+1/lisp/calendar/cal-coptic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-coptic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-dst.el emacs-26.3+1/lisp/calendar/cal-dst.el
--- emacs-26.1+1/lisp/calendar/cal-dst.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-dst.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-dst.el --- calendar functions for daylight saving rules
 
-;; Copyright (C) 1993-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Paul Eggert <eggert@twinsun.com>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/calendar.el emacs-26.3+1/lisp/calendar/calendar.el
--- emacs-26.1+1/lisp/calendar/calendar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/calendar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calendar.el --- calendar functions
 
-;; Copyright (C) 1988-1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1988-1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-french.el emacs-26.3+1/lisp/calendar/cal-french.el
--- emacs-26.1+1/lisp/calendar/cal-french.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-french.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
 
-;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2018 Free
+;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-hebrew.el emacs-26.3+1/lisp/calendar/cal-hebrew.el
--- emacs-26.1+1/lisp/calendar/cal-hebrew.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-hebrew.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-html.el emacs-26.3+1/lisp/calendar/cal-html.el
--- emacs-26.1+1/lisp/calendar/cal-html.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-html.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-html.el --- functions for printing HTML calendars
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Anna M. Bigatti <bigatti@dima.unige.it>
 ;; Keywords: calendar
diff -Nru emacs-26.1+1/lisp/calendar/cal-islam.el emacs-26.3+1/lisp/calendar/cal-islam.el
--- emacs-26.1+1/lisp/calendar/cal-islam.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-islam.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-islam.el --- calendar functions for the Islamic calendar
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-iso.el emacs-26.3+1/lisp/calendar/cal-iso.el
--- emacs-26.1+1/lisp/calendar/cal-iso.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-iso.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-iso.el --- calendar functions for the ISO calendar
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-julian.el emacs-26.3+1/lisp/calendar/cal-julian.el
--- emacs-26.1+1/lisp/calendar/cal-julian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-julian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-julian.el --- calendar functions for the Julian calendar
 
-;; Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-mayan.el emacs-26.3+1/lisp/calendar/cal-mayan.el
--- emacs-26.1+1/lisp/calendar/cal-mayan.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-mayan.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
 
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2018 Free Software
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-menu.el emacs-26.3+1/lisp/calendar/cal-menu.el
--- emacs-26.1+1/lisp/calendar/cal-menu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-menu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-menu.el --- calendar functions for menu bar and popup menu support
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;         Lara Rios <lrios@coewl.cen.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/cal-move.el emacs-26.3+1/lisp/calendar/cal-move.el
--- emacs-26.1+1/lisp/calendar/cal-move.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-move.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-move.el --- calendar functions for movement in the calendar
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-persia.el emacs-26.3+1/lisp/calendar/cal-persia.el
--- emacs-26.1+1/lisp/calendar/cal-persia.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-persia.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-persia.el --- calendar functions for the Persian calendar
 
-;; Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/calendar/cal-tex.el emacs-26.3+1/lisp/calendar/cal-tex.el
--- emacs-26.1+1/lisp/calendar/cal-tex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-tex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -927,7 +927,7 @@
         (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
         (insert ", ")
         (cal-tex-large-bf (cal-tex-month-name month))
-        (insert " ")
+        (insert "\\ ")
         (cal-tex-large-bf (number-to-string day))
         (unless (string-equal "" (setq s (cal-tex-latexify-list
                                           holidays date "; ")))
@@ -978,7 +978,7 @@
   (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
   (insert ", ")
   (cal-tex-large-bf (cal-tex-month-name month))
-  (insert " ")
+  (insert "\\ ")
   (cal-tex-large-bf (number-to-string day))
   (unless (string-equal "" (setq s (cal-tex-latexify-list
                                     holidays date "; ")))
diff -Nru emacs-26.1+1/lisp/calendar/cal-x.el emacs-26.3+1/lisp/calendar/cal-x.el
--- emacs-26.1+1/lisp/calendar/cal-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/cal-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cal-x.el --- calendar windows in dedicated frames
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/diary-lib.el emacs-26.3+1/lisp/calendar/diary-lib.el
--- emacs-26.1+1/lisp/calendar/diary-lib.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/diary-lib.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; diary-lib.el --- diary functions
 
-;; Copyright (C) 1989-1990, 1992-1995, 2001-2018 Free Software
+;; Copyright (C) 1989-1990, 1992-1995, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/holidays.el emacs-26.3+1/lisp/calendar/holidays.el
--- emacs-26.1+1/lisp/calendar/holidays.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/holidays.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; holidays.el --- holiday functions for the calendar package
 
-;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2018 Free Software
+;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/icalendar.el emacs-26.3+1/lisp/calendar/icalendar.el
--- emacs-26.1+1/lisp/calendar/icalendar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/icalendar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; icalendar.el --- iCalendar implementation -*- lexical-binding: t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        August 2002
diff -Nru emacs-26.1+1/lisp/calendar/lunar.el emacs-26.3+1/lisp/calendar/lunar.el
--- emacs-26.1+1/lisp/calendar/lunar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/lunar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lunar.el --- calendar functions for phases of the moon
 
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2018 Free Software
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/parse-time.el emacs-26.3+1/lisp/calendar/parse-time.el
--- emacs-26.1+1/lisp/calendar/parse-time.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/parse-time.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; parse-time.el --- parsing time strings -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: util
@@ -146,7 +146,7 @@
 ;;;###autoload
 (defun parse-time-string (string)
   "Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
-STRING should be on something resembling an RFC2822 string, a la
+STRING should be something resembling an RFC 822 (or later) date-time, e.g.,
 \"Fri, 25 Mar 2016 16:24:56 +0100\", but this function is
 somewhat liberal in what format it accepts, and will attempt to
 return a \"likely\" value even for somewhat malformed strings.
diff -Nru emacs-26.1+1/lisp/calendar/solar.el emacs-26.3+1/lisp/calendar/solar.el
--- emacs-26.1+1/lisp/calendar/solar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/solar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; solar.el --- calendar functions for solar events
 
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2018 Free Software
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff -Nru emacs-26.1+1/lisp/calendar/timeclock.el emacs-26.3+1/lisp/calendar/timeclock.el
--- emacs-26.1+1/lisp/calendar/timeclock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/timeclock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Created: 25 Mar 1999
diff -Nru emacs-26.1+1/lisp/calendar/time-date.el emacs-26.3+1/lisp/calendar/time-date.el
--- emacs-26.1+1/lisp/calendar/time-date.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/time-date.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu Umeda <umerin@mse.kyutech.ac.jp>
@@ -148,6 +148,7 @@
 ;; values.  timezone-make-date-arpa-standard should help.
 (defun date-to-time (date)
   "Parse a string DATE that represents a date-time and return a time value.
+DATE should be in one of the forms recognized by `parse-time-string'.
 If DATE lacks timezone information, GMT is assumed."
   (condition-case err
       (apply 'encode-time (parse-time-string date))
diff -Nru emacs-26.1+1/lisp/calendar/todo-mode.el emacs-26.3+1/lisp/calendar/todo-mode.el
--- emacs-26.1+1/lisp/calendar/todo-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/calendar/todo-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; todo-mode.el --- facilities for making and maintaining todo lists  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <privat@os10000.net>
 ;;	Stephen Berman <stephen.berman@gmx.net>
diff -Nru emacs-26.1+1/lisp/case-table.el emacs-26.3+1/lisp/case-table.el
--- emacs-26.1+1/lisp/case-table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/case-table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; case-table.el --- code to extend the character set and support case tables  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/cdl.el emacs-26.3+1/lisp/cdl.el
--- emacs-26.1+1/lisp/cdl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cdl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ata Etemadi <ATAE@spva.physics.imperial.ac.uk>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/cedet/cedet-cscope.el emacs-26.3+1/lisp/cedet/cedet-cscope.el
--- emacs-26.1+1/lisp/cedet/cedet-cscope.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/cedet-cscope.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet-cscope.el --- CScope support for CEDET
 
-;;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Package: cedet
diff -Nru emacs-26.1+1/lisp/cedet/cedet.el emacs-26.3+1/lisp/cedet/cedet.el
--- emacs-26.1+1/lisp/cedet/cedet.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/cedet.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet.el --- Setup CEDET environment
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/cedet-files.el emacs-26.3+1/lisp/cedet/cedet-files.el
--- emacs-26.1+1/lisp/cedet/cedet-files.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/cedet-files.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet-files.el --- Common routines dealing with file names.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;; Package: cedet
diff -Nru emacs-26.1+1/lisp/cedet/cedet-global.el emacs-26.3+1/lisp/cedet/cedet-global.el
--- emacs-26.1+1/lisp/cedet/cedet-global.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/cedet-global.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet-global.el --- GNU Global support for CEDET.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;; Package: cedet
diff -Nru emacs-26.1+1/lisp/cedet/cedet-idutils.el emacs-26.3+1/lisp/cedet/cedet-idutils.el
--- emacs-26.1+1/lisp/cedet/cedet-idutils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/cedet-idutils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet-idutils.el --- ID Utils support for CEDET.
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;; Old-Version: 0.2
diff -Nru emacs-26.1+1/lisp/cedet/ChangeLog.1 emacs-26.3+1/lisp/cedet/ChangeLog.1
--- emacs-26.1+1/lisp/cedet/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3460,7 +3460,7 @@
 ;; coding: utf-8
 ;; End:
 
-	Copyright (C) 2009-2018 Free Software Foundation, Inc.
+	Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/cedet/data-debug.el emacs-26.3+1/lisp/cedet/data-debug.el
--- emacs-26.1+1/lisp/cedet/data-debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/data-debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; data-debug.el --- Data structure debugger
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
 ;; Old-Version: 0.2
diff -Nru emacs-26.1+1/lisp/cedet/ede/autoconf-edit.el emacs-26.3+1/lisp/cedet/ede/autoconf-edit.el
--- emacs-26.1+1/lisp/cedet/ede/autoconf-edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/autoconf-edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/autoconf-edit.el --- Keymap for autoconf
 
-;; Copyright (C) 1998-2000, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2000, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project
diff -Nru emacs-26.1+1/lisp/cedet/ede/auto.el emacs-26.3+1/lisp/cedet/ede/auto.el
--- emacs-26.1+1/lisp/cedet/ede/auto.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/auto.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/auto.el --- Autoload features for EDE
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/base.el emacs-26.3+1/lisp/cedet/ede/base.el
--- emacs-26.1+1/lisp/cedet/ede/base.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/base.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/base.el --- Baseclasses for EDE.
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/config.el emacs-26.3+1/lisp/cedet/ede/config.el
--- emacs-26.1+1/lisp/cedet/ede/config.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/config.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/config.el --- Configuration Handler baseclass
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/cpp-root.el emacs-26.3+1/lisp/cedet/ede/cpp-root.el
--- emacs-26.1+1/lisp/cedet/ede/cpp-root.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/cpp-root.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/cpp-root.el --- A simple way to wrap a C++ project with a single root
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/custom.el emacs-26.3+1/lisp/cedet/ede/custom.el
--- emacs-26.1+1/lisp/cedet/ede/custom.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/custom.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/custom.el --- customization of EDE projects.
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/detect.el emacs-26.3+1/lisp/cedet/ede/detect.el
--- emacs-26.1+1/lisp/cedet/ede/detect.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/detect.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/detect.el --- EDE project detection and file associations
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/dired.el emacs-26.3+1/lisp/cedet/ede/dired.el
--- emacs-26.1+1/lisp/cedet/ede/dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/dired.el --- EDE extensions to dired.
 
-;; Copyright (C) 1998-2000, 2003, 2009-2018 Free Software Foundation,
+;; Copyright (C) 1998-2000, 2003, 2009-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/emacs.el emacs-26.3+1/lisp/cedet/ede/emacs.el
--- emacs-26.1+1/lisp/cedet/ede/emacs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/emacs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/emacs.el --- Special project for Emacs
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/files.el emacs-26.3+1/lisp/cedet/ede/files.el
--- emacs-26.1+1/lisp/cedet/ede/files.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/files.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/files.el --- Associate projects with files and directories.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/generic.el emacs-26.3+1/lisp/cedet/ede/generic.el
--- emacs-26.1+1/lisp/cedet/ede/generic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/generic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/generic.el --- Base Support for generic build systems
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/linux.el emacs-26.3+1/lisp/cedet/ede/linux.el
--- emacs-26.1+1/lisp/cedet/ede/linux.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/linux.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/linux.el --- Special project for Linux
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/locate.el emacs-26.3+1/lisp/cedet/ede/locate.el
--- emacs-26.1+1/lisp/cedet/ede/locate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/locate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/locate.el --- Locate support
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/make.el emacs-26.3+1/lisp/cedet/ede/make.el
--- emacs-26.1+1/lisp/cedet/ede/make.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/make.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/make.el --- General information about "make"
 
-;;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/makefile-edit.el emacs-26.3+1/lisp/cedet/ede/makefile-edit.el
--- emacs-26.1+1/lisp/cedet/ede/makefile-edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/makefile-edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; makefile-edit.el --- Makefile editing/scanning commands.
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/pconf.el emacs-26.3+1/lisp/cedet/ede/pconf.el
--- emacs-26.1+1/lisp/cedet/ede/pconf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/pconf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/pconf.el --- configure.ac maintenance for EDE
 
-;;; Copyright (C) 1998-2000, 2005, 2008-2018 Free Software Foundation,
+;;; Copyright (C) 1998-2000, 2005, 2008-2019 Free Software Foundation,
 ;;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/pmake.el emacs-26.3+1/lisp/cedet/ede/pmake.el
--- emacs-26.1+1/lisp/cedet/ede/pmake.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/pmake.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-pmake.el --- EDE Generic Project Makefile code generator.
 
-;; Copyright (C) 1998-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-archive.el emacs-26.3+1/lisp/cedet/ede/proj-archive.el
--- emacs-26.1+1/lisp/cedet/ede/proj-archive.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-archive.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj-archive.el --- EDE Generic Project archive support
 
-;;  Copyright (C) 1998-2001, 2009-2018 Free Software Foundation, Inc.
+;;  Copyright (C) 1998-2001, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-aux.el emacs-26.3+1/lisp/cedet/ede/proj-aux.el
--- emacs-26.1+1/lisp/cedet/ede/proj-aux.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-aux.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj-aux.el --- EDE Generic Project auxiliary file support
 
-;; Copyright (C) 1998-2000, 2007, 2009-2018 Free Software Foundation,
+;; Copyright (C) 1998-2000, 2007, 2009-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-comp.el emacs-26.3+1/lisp/cedet/ede/proj-comp.el
--- emacs-26.1+1/lisp/cedet/ede/proj-comp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-comp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj-comp.el --- EDE Generic Project compiler/rule driver
 
-;; Copyright (C) 1999-2001, 2004-2005, 2007, 2009-2018 Free Software
+;; Copyright (C) 1999-2001, 2004-2005, 2007, 2009-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/project-am.el emacs-26.3+1/lisp/cedet/ede/project-am.el
--- emacs-26.1+1/lisp/cedet/ede/project-am.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/project-am.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; project-am.el --- A project management scheme based on automake files.
 
-;; Copyright (C) 1998-2000, 2003, 2005, 2007-2018 Free Software
+;; Copyright (C) 1998-2000, 2003, 2005, 2007-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -532,7 +532,7 @@
 		     (project-rescan tmp)
 		     (setq ntargets (cons tmp ntargets)))
 		   (makefile-macro-file-list macro))
-	   ;; Non-indirect will have a target whos sources
+	   ;; Non-indirect will have a target whose sources
 	   ;; are actual files, not names of other targets.
 	   (let ((files (makefile-macro-file-list macro)))
 	     (when files
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj.el emacs-26.3+1/lisp/cedet/ede/proj.el
--- emacs-26.1+1/lisp/cedet/ede/proj.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj.el --- EDE Generic Project file driver
 
-;; Copyright (C) 1998-2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-elisp.el emacs-26.3+1/lisp/cedet/ede/proj-elisp.el
--- emacs-26.1+1/lisp/cedet/ede/proj-elisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-elisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support
 
-;; Copyright (C) 1998-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-info.el emacs-26.3+1/lisp/cedet/ede/proj-info.el
--- emacs-26.1+1/lisp/cedet/ede/proj-info.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-info.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-proj-info.el --- EDE Generic Project texinfo support
 
-;;; Copyright (C) 1998-2001, 2004, 2007-2018 Free Software Foundation,
+;;; Copyright (C) 1998-2001, 2004, 2007-2019 Free Software Foundation,
 ;;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-misc.el emacs-26.3+1/lisp/cedet/ede/proj-misc.el
--- emacs-26.1+1/lisp/cedet/ede/proj-misc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-misc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-proj-misc.el --- EDE Generic Project Emacs Lisp support
 
-;; Copyright (C) 1998-2001, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2001, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-obj.el emacs-26.3+1/lisp/cedet/ede/proj-obj.el
--- emacs-26.1+1/lisp/cedet/ede/proj-obj.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-obj.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj-obj.el --- EDE Generic Project Object code generation support
 
-;;; Copyright (C) 1998-2000, 2005, 2008-2018 Free Software Foundation,
+;;; Copyright (C) 1998-2000, 2005, 2008-2019 Free Software Foundation,
 ;;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-prog.el emacs-26.3+1/lisp/cedet/ede/proj-prog.el
--- emacs-26.1+1/lisp/cedet/ede/proj-prog.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-prog.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-proj-prog.el --- EDE Generic Project program support
 
-;; Copyright (C) 1998-2001, 2005, 2008-2018 Free Software Foundation,
+;; Copyright (C) 1998-2001, 2005, 2008-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-scheme.el emacs-26.3+1/lisp/cedet/ede/proj-scheme.el
--- emacs-26.1+1/lisp/cedet/ede/proj-scheme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-scheme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/proj-scheme.el --- EDE Generic Project scheme (guile) support
 
-;; Copyright (C) 1998-2000, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2000, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, scheme
diff -Nru emacs-26.1+1/lisp/cedet/ede/proj-shared.el emacs-26.3+1/lisp/cedet/ede/proj-shared.el
--- emacs-26.1+1/lisp/cedet/ede/proj-shared.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/proj-shared.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-proj-shared.el --- EDE Generic Project shared library support
 
-;;; Copyright (C) 1998-2000, 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 1998-2000, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/shell.el emacs-26.3+1/lisp/cedet/ede/shell.el
--- emacs-26.1+1/lisp/cedet/ede/shell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/shell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/shell.el --- A shell controlled by EDE.
 ;;
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/simple.el emacs-26.3+1/lisp/cedet/ede/simple.el
--- emacs-26.1+1/lisp/cedet/ede/simple.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/simple.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/simple.el --- Overlay an EDE structure on an existing project
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/source.el emacs-26.3+1/lisp/cedet/ede/source.el
--- emacs-26.1+1/lisp/cedet/ede/source.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/source.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; ede/source.el --- EDE source code object
 
-;; Copyright (C) 2000, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede/speedbar.el emacs-26.3+1/lisp/cedet/ede/speedbar.el
--- emacs-26.1+1/lisp/cedet/ede/speedbar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/speedbar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/speedbar.el --- Speedbar viewing of EDE projects
 
-;; Copyright (C) 1998-2001, 2003, 2005, 2007-2018 Free Software
+;; Copyright (C) 1998-2001, 2003, 2005, 2007-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/ede/srecode.el emacs-26.3+1/lisp/cedet/ede/srecode.el
--- emacs-26.1+1/lisp/cedet/ede/srecode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/srecode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/srecode.el --- EDE utilities on top of SRecoder
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/ede/system.el emacs-26.3+1/lisp/cedet/ede/system.el
--- emacs-26.1+1/lisp/cedet/ede/system.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/system.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-system.el --- EDE working with the system (VC, FTP, ETC)
 
-;; Copyright (C) 2001-2003, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2003, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, vc
diff -Nru emacs-26.1+1/lisp/cedet/ede/util.el emacs-26.3+1/lisp/cedet/ede/util.el
--- emacs-26.1+1/lisp/cedet/ede/util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede/util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede/util.el --- EDE utilities
 
-;; Copyright (C) 2000, 2005, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2005, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/ede.el emacs-26.3+1/lisp/cedet/ede.el
--- emacs-26.1+1/lisp/cedet/ede.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/ede.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede.el --- Emacs Development Environment gloss
 
-;; Copyright (C) 1998-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/inversion.el emacs-26.3+1/lisp/cedet/inversion.el
--- emacs-26.1+1/lisp/cedet/inversion.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/inversion.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; inversion.el --- When you need something in version XX.XX
 
-;;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 1.3
diff -Nru emacs-26.1+1/lisp/cedet/mode-local.el emacs-26.3+1/lisp/cedet/mode-local.el
--- emacs-26.1+1/lisp/cedet/mode-local.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/mode-local.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mode-local.el --- Support for mode local facilities
 ;;
-;; Copyright (C) 2004-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2005, 2007-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/pulse.el emacs-26.3+1/lisp/cedet/pulse.el
--- emacs-26.1+1/lisp/cedet/pulse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/pulse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pulse.el --- Pulsing Overlays
 
-;;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;; Version: 1.0
diff -Nru emacs-26.1+1/lisp/cedet/semantic/analyze/complete.el emacs-26.3+1/lisp/cedet/semantic/analyze/complete.el
--- emacs-26.1+1/lisp/cedet/semantic/analyze/complete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/analyze/complete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/analyze/complete.el --- Smart Completions
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/analyze/debug.el emacs-26.3+1/lisp/cedet/semantic/analyze/debug.el
--- emacs-26.1+1/lisp/cedet/semantic/analyze/debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/analyze/debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/analyze/debug.el --- Debug the analyzer
 
-;;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/analyze/fcn.el emacs-26.3+1/lisp/cedet/semantic/analyze/fcn.el
--- emacs-26.1+1/lisp/cedet/semantic/analyze/fcn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/analyze/fcn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/analyze/fcn.el --- Analyzer support functions.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/analyze/refs.el emacs-26.3+1/lisp/cedet/semantic/analyze/refs.el
--- emacs-26.1+1/lisp/cedet/semantic/analyze/refs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/analyze/refs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/analyze/refs.el --- Analysis of the references between tags.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/analyze.el emacs-26.3+1/lisp/cedet/semantic/analyze.el
--- emacs-26.1+1/lisp/cedet/semantic/analyze.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/analyze.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/analyze.el --- Analyze semantic tags against local context
 
-;; Copyright (C) 2000-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/c.el emacs-26.3+1/lisp/cedet/semantic/bovine/c.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/c.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/c.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/c.el --- Semantic details for C
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/debug.el emacs-26.3+1/lisp/cedet/semantic/bovine/debug.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/debug.el --- Debugger support for bovinator
 
-;; Copyright (C) 2003, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/el.el emacs-26.3+1/lisp/cedet/semantic/bovine/el.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/el.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/el.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/el.el --- Semantic details for Emacs Lisp
 
-;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/gcc.el emacs-26.3+1/lisp/cedet/semantic/bovine/gcc.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/gcc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/gcc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/gcc.el --- gcc querying special code for the C parser
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/grammar.el emacs-26.3+1/lisp/cedet/semantic/bovine/grammar.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/grammar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/grammar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/grammar.el --- Bovine's input grammar mode
 ;;
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/make.el emacs-26.3+1/lisp/cedet/semantic/bovine/make.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/make.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/make.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/make.el --- Makefile parsing rules.
 
-;; Copyright (C) 2000-2004, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2004, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine/scm.el emacs-26.3+1/lisp/cedet/semantic/bovine/scm.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine/scm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine/scm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/scm.el --- Semantic details for Scheme (guile)
 
-;;; Copyright (C) 2001-2004, 2008-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2001-2004, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/bovine.el emacs-26.3+1/lisp/cedet/semantic/bovine.el
--- emacs-26.1+1/lisp/cedet/semantic/bovine.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/bovine.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/bovine.el --- LL Parser/Analyzer core.
 
-;; Copyright (C) 1999-2004, 2006-2007, 2009-2018 Free Software
+;; Copyright (C) 1999-2004, 2006-2007, 2009-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/chart.el emacs-26.3+1/lisp/cedet/semantic/chart.el
--- emacs-26.1+1/lisp/cedet/semantic/chart.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/chart.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/chart.el --- Utilities for use with semantic tag tables
 
-;; Copyright (C) 1999-2001, 2003, 2005, 2008-2018 Free Software
+;; Copyright (C) 1999-2001, 2003, 2005, 2008-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/complete.el emacs-26.3+1/lisp/cedet/semantic/complete.el
--- emacs-26.1+1/lisp/cedet/semantic/complete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/complete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/complete.el --- Routines for performing tag completion
 
-;; Copyright (C) 2003-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/ctxt.el emacs-26.3+1/lisp/cedet/semantic/ctxt.el
--- emacs-26.1+1/lisp/cedet/semantic/ctxt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/ctxt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/ctxt.el --- Context calculations for Semantic tools.
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-debug.el emacs-26.3+1/lisp/cedet/semantic/db-debug.el
--- emacs-26.1+1/lisp/cedet/semantic/db-debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-debug.el --- Extra level debugging routines for Semantic
 
-;;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-ebrowse.el emacs-26.3+1/lisp/cedet/semantic/db-ebrowse.el
--- emacs-26.1+1/lisp/cedet/semantic/db-ebrowse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-ebrowse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-ebrowse.el --- Semanticdb backend using ebrowse.
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric M. Ludlam <zappo@gnu.org>
 ;;	Joakim Verona
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db.el emacs-26.3+1/lisp/cedet/semantic/db.el
--- emacs-26.1+1/lisp/cedet/semantic/db.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db.el --- Semantic tag database manager
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-el.el emacs-26.3+1/lisp/cedet/semantic/db-el.el
--- emacs-26.1+1/lisp/cedet/semantic/db-el.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-el.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp
 
-;;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-file.el emacs-26.3+1/lisp/cedet/semantic/db-file.el
--- emacs-26.1+1/lisp/cedet/semantic/db-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-file.el --- Save a semanticdb to a cache file.
 
-;;; Copyright (C) 2000-2005, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2000-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-find.el emacs-26.3+1/lisp/cedet/semantic/db-find.el
--- emacs-26.1+1/lisp/cedet/semantic/db-find.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-find.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-find.el --- Searching through semantic databases.
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-global.el emacs-26.3+1/lisp/cedet/semantic/db-global.el
--- emacs-26.1+1/lisp/cedet/semantic/db-global.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-global.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-global.el --- Semantic database extensions for GLOBAL
 
-;; Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-javascript.el emacs-26.3+1/lisp/cedet/semantic/db-javascript.el
--- emacs-26.1+1/lisp/cedet/semantic/db-javascript.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-javascript.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-javascript.el --- Semantic database extensions for javascript
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Joakim Verona
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-mode.el emacs-26.3+1/lisp/cedet/semantic/db-mode.el
--- emacs-26.1+1/lisp/cedet/semantic/db-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-mode.el --- Semanticdb Minor Mode
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-ref.el emacs-26.3+1/lisp/cedet/semantic/db-ref.el
--- emacs-26.1+1/lisp/cedet/semantic/db-ref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-ref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-ref.el --- Handle cross-db file references
 
-;;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -80,7 +80,7 @@
 
 (cl-defmethod semanticdb-check-references ((dbt semanticdb-table))
   "Check and cleanup references in the database DBT.
-Any reference to a file that cannot be found, or whos file no longer
+Any reference to a file that cannot be found, or whose file no longer
 refers to DBT will be removed."
   (let ((refs (oref dbt db-refs))
 	(myexpr (concat "\\<" (oref dbt file)))
diff -Nru emacs-26.1+1/lisp/cedet/semantic/db-typecache.el emacs-26.3+1/lisp/cedet/semantic/db-typecache.el
--- emacs-26.1+1/lisp/cedet/semantic/db-typecache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/db-typecache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/db-typecache.el --- Manage Datatypes
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/debug.el emacs-26.3+1/lisp/cedet/semantic/debug.el
--- emacs-26.1+1/lisp/cedet/semantic/debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/debug.el --- Language Debugger framework
 
-;; Copyright (C) 2003-2005, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/decorate/include.el emacs-26.3+1/lisp/cedet/semantic/decorate/include.el
--- emacs-26.1+1/lisp/cedet/semantic/decorate/include.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/decorate/include.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/decorate/include.el --- Decoration modes for include statements
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/decorate/mode.el emacs-26.3+1/lisp/cedet/semantic/decorate/mode.el
--- emacs-26.1+1/lisp/cedet/semantic/decorate/mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/decorate/mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/decorate/mode.el --- Minor mode for decorating tags
 
-;; Copyright (C) 2000-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/decorate.el emacs-26.3+1/lisp/cedet/semantic/decorate.el
--- emacs-26.1+1/lisp/cedet/semantic/decorate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/decorate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/decorate.el --- Utilities for decorating/highlighting tokens.
 
-;;; Copyright (C) 1999-2003, 2005-2007, 2009-2018 Free Software
+;;; Copyright (C) 1999-2003, 2005-2007, 2009-2019 Free Software
 ;;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/dep.el emacs-26.3+1/lisp/cedet/semantic/dep.el
--- emacs-26.1+1/lisp/cedet/semantic/dep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/dep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/dep.el --- Methods for tracking dependencies (include files)
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/doc.el emacs-26.3+1/lisp/cedet/semantic/doc.el
--- emacs-26.1+1/lisp/cedet/semantic/doc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/doc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/doc.el --- Routines for documentation strings
 
-;; Copyright (C) 1999-2003, 2005, 2008-2018 Free Software Foundation,
+;; Copyright (C) 1999-2003, 2005, 2008-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/ede-grammar.el emacs-26.3+1/lisp/cedet/semantic/ede-grammar.el
--- emacs-26.1+1/lisp/cedet/semantic/ede-grammar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/ede-grammar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files
 
-;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff -Nru emacs-26.1+1/lisp/cedet/semantic/edit.el emacs-26.3+1/lisp/cedet/semantic/edit.el
--- emacs-26.1+1/lisp/cedet/semantic/edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/edit.el --- Edit Management for Semantic
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/find.el emacs-26.3+1/lisp/cedet/semantic/find.el
--- emacs-26.1+1/lisp/cedet/semantic/find.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/find.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/find.el --- Search routines for Semantic
 
-;; Copyright (C) 1999-2005, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/format.el emacs-26.3+1/lisp/cedet/semantic/format.el
--- emacs-26.1+1/lisp/cedet/semantic/format.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/format.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/format.el --- Routines for formatting tags
 
-;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/fw.el emacs-26.3+1/lisp/cedet/semantic/fw.el
--- emacs-26.1+1/lisp/cedet/semantic/fw.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/fw.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/fw.el --- Framework for Semantic
 
-;;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/grammar.el emacs-26.3+1/lisp/cedet/semantic/grammar.el
--- emacs-26.1+1/lisp/cedet/semantic/grammar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/grammar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/grammar.el --- Major mode framework for Semantic grammars
 
-;; Copyright (C) 2002-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/grammar-wy.el emacs-26.3+1/lisp/cedet/semantic/grammar-wy.el
--- emacs-26.1+1/lisp/cedet/semantic/grammar-wy.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/grammar-wy.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/grammar-wy.el --- Generated parser support file
 
-;; Copyright (C) 2002-2004, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2009-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/html.el emacs-26.3+1/lisp/cedet/semantic/html.el
--- emacs-26.1+1/lisp/cedet/semantic/html.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/html.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/html.el --- Semantic details for html files
 
-;; Copyright (C) 2004-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/ia.el emacs-26.3+1/lisp/cedet/semantic/ia.el
--- emacs-26.1+1/lisp/cedet/semantic/ia.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/ia.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/ia.el --- Interactive Analysis functions
 
-;;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/ia-sb.el emacs-26.3+1/lisp/cedet/semantic/ia-sb.el
--- emacs-26.1+1/lisp/cedet/semantic/ia-sb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/ia-sb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/ia-sb.el --- Speedbar analysis display interactor
 
-;;; Copyright (C) 2002-2004, 2006, 2008-2018 Free Software Foundation,
+;;; Copyright (C) 2002-2004, 2006, 2008-2019 Free Software Foundation,
 ;;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/idle.el emacs-26.3+1/lisp/cedet/semantic/idle.el
--- emacs-26.1+1/lisp/cedet/semantic/idle.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/idle.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; idle.el --- Schedule parsing tasks in idle time
 
-;; Copyright (C) 2003-2006, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2006, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/imenu.el emacs-26.3+1/lisp/cedet/semantic/imenu.el
--- emacs-26.1+1/lisp/cedet/semantic/imenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/imenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/imenu.el --- Use Semantic as an imenu tag generator
 
-;; Copyright (C) 2000-2005, 2007-2008, 2010-2018 Free Software
+;; Copyright (C) 2000-2005, 2007-2008, 2010-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/java.el emacs-26.3+1/lisp/cedet/semantic/java.el
--- emacs-26.1+1/lisp/cedet/semantic/java.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/java.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/java.el --- Semantic functions for Java
 
-;;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/lex.el emacs-26.3+1/lisp/cedet/semantic/lex.el
--- emacs-26.1+1/lisp/cedet/semantic/lex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/lex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/lex.el --- Lexical Analyzer builder  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/lex-spp.el emacs-26.3+1/lisp/cedet/semantic/lex-spp.el
--- emacs-26.1+1/lisp/cedet/semantic/lex-spp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/lex-spp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/mru-bookmark.el emacs-26.3+1/lisp/cedet/semantic/mru-bookmark.el
--- emacs-26.1+1/lisp/cedet/semantic/mru-bookmark.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/mru-bookmark.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/mru-bookmark.el --- Automatic bookmark tracking
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/sb.el emacs-26.3+1/lisp/cedet/semantic/sb.el
--- emacs-26.1+1/lisp/cedet/semantic/sb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/sb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/sb.el --- Semantic tag display for speedbar
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/scope.el emacs-26.3+1/lisp/cedet/semantic/scope.el
--- emacs-26.1+1/lisp/cedet/semantic/scope.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/scope.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/scope.el --- Analyzer Scope Calculations
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -140,7 +140,7 @@
 (cl-defmethod semantic-scope-set-typecache ((cache semantic-scope-cache)
 					 types-in-scope)
   "Set the :typescope property on CACHE to some types.
-TYPES-IN-SCOPE is a list of type tags whos members are
+TYPES-IN-SCOPE is a list of type tags whose members are
 currently in scope.  For each type in TYPES-IN-SCOPE,
 add those members to the types list.
 If nil, then the typescope is reset."
diff -Nru emacs-26.1+1/lisp/cedet/semantic/senator.el emacs-26.3+1/lisp/cedet/semantic/senator.el
--- emacs-26.1+1/lisp/cedet/semantic/senator.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/senator.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/senator.el --- SEmantic NAvigaTOR
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/cedet/semantic/sort.el emacs-26.3+1/lisp/cedet/semantic/sort.el
--- emacs-26.1+1/lisp/cedet/semantic/sort.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/sort.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables.
 
-;;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/cscope.el emacs-26.3+1/lisp/cedet/semantic/symref/cscope.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/cscope.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/cscope.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/cscope.el --- Semantic-symref support via cscope.
 
-;;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/filter.el emacs-26.3+1/lisp/cedet/semantic/symref/filter.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/filter.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/filter.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/filter.el --- Filter symbol reference hits for accuracy.
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/global.el emacs-26.3+1/lisp/cedet/semantic/symref/global.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/global.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/global.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/global.el --- Use GNU Global for symbol references
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/grep.el emacs-26.3+1/lisp/cedet/semantic/symref/grep.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/grep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/grep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/grep.el --- Symref implementation using find/grep
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/idutils.el emacs-26.3+1/lisp/cedet/semantic/symref/idutils.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/idutils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/idutils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/idutils.el --- Symref implementation for idutils
 
-;;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref/list.el emacs-26.3+1/lisp/cedet/semantic/symref/list.el
--- emacs-26.1+1/lisp/cedet/semantic/symref/list.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref/list.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref/list.el --- Symref Output List UI.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/symref.el emacs-26.3+1/lisp/cedet/semantic/symref.el
--- emacs-26.1+1/lisp/cedet/semantic/symref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/symref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/symref.el --- Symbol Reference API
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/tag.el emacs-26.3+1/lisp/cedet/semantic/tag.el
--- emacs-26.1+1/lisp/cedet/semantic/tag.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/tag.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/tag.el --- tag creation and access
 
-;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/tag-file.el emacs-26.3+1/lisp/cedet/semantic/tag-file.el
--- emacs-26.1+1/lisp/cedet/semantic/tag-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/tag-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/tag-file.el --- Routines that find files based on tags.
 
-;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/tag-ls.el emacs-26.3+1/lisp/cedet/semantic/tag-ls.el
--- emacs-26.1+1/lisp/cedet/semantic/tag-ls.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/tag-ls.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/tag-ls.el --- Language Specific override functions for tags
 
-;; Copyright (C) 1999-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/tag-write.el emacs-26.3+1/lisp/cedet/semantic/tag-write.el
--- emacs-26.1+1/lisp/cedet/semantic/tag-write.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/tag-write.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/tag-write.el --- Write tags to a text stream
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/texi.el emacs-26.3+1/lisp/cedet/semantic/texi.el
--- emacs-26.1+1/lisp/cedet/semantic/texi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/texi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/texi.el --- Semantic details for Texinfo files
 
-;; Copyright (C) 2001-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/semantic/util.el emacs-26.3+1/lisp/cedet/semantic/util.el
--- emacs-26.1+1/lisp/cedet/semantic/util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/util.el --- Utilities for use with semantic tag tables
 
-;;; Copyright (C) 1999-2005, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 1999-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/util-modes.el emacs-26.3+1/lisp/cedet/semantic/util-modes.el
--- emacs-26.1+1/lisp/cedet/semantic/util-modes.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/util-modes.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/util-modes.el --- Semantic minor modes
 
-;; Copyright (C) 2000-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric M. Ludlam <zappo@gnu.org>
 ;;          David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/comp.el emacs-26.3+1/lisp/cedet/semantic/wisent/comp.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/comp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/comp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/comp.el --- GNU Bison for Emacs - Grammar compiler
 
-;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2007, 2009-2018 Free
+;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2007, 2009-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/grammar.el emacs-26.3+1/lisp/cedet/semantic/wisent/grammar.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/grammar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/grammar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/grammar.el --- Wisent's input grammar mode
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/javascript.el emacs-26.3+1/lisp/cedet/semantic/wisent/javascript.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/javascript.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/javascript.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/javascript.el --- javascript parser support
 
-;; Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/java-tags.el emacs-26.3+1/lisp/cedet/semantic/wisent/java-tags.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/java-tags.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/java-tags.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/java-tags.el --- Java LALR parser for Emacs
 
-;; Copyright (C) 2001-2006, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2006, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/python.el emacs-26.3+1/lisp/cedet/semantic/wisent/python.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/python.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/python.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wisent-python.el --- Semantic support for Python
 
-;; Copyright (C) 2002, 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard Kim  <emacs18@gmail.com>
 ;; Maintainer: Richard Kim  <emacs18@gmail.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent/wisent.el emacs-26.3+1/lisp/cedet/semantic/wisent/wisent.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent/wisent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent/wisent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/wisent.el --- GNU Bison for Emacs - Runtime
 
-;;; Copyright (C) 2002-2007, 2009-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic/wisent.el emacs-26.3+1/lisp/cedet/semantic/wisent.el
--- emacs-26.1+1/lisp/cedet/semantic/wisent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic/wisent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent.el --- Wisent - Semantic gateway
 
-;; Copyright (C) 2001-2007, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/cedet/semantic.el emacs-26.3+1/lisp/cedet/semantic.el
--- emacs-26.1+1/lisp/cedet/semantic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/semantic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic.el --- Semantic buffer evaluator.
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
diff -Nru emacs-26.1+1/lisp/cedet/srecode/args.el emacs-26.3+1/lisp/cedet/srecode/args.el
--- emacs-26.1+1/lisp/cedet/srecode/args.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/args.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/args.el --- Provide some simple template arguments
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/compile.el emacs-26.3+1/lisp/cedet/srecode/compile.el
--- emacs-26.1+1/lisp/cedet/srecode/compile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/compile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/compile --- Compilation of srecode template files.
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: codegeneration
@@ -398,8 +398,7 @@
 escape character, and end escape character pattern for expandable
 macro names.
 Optional argument END-NAME specifies the name of a token upon which
-parsing should stop.
-If END-NAME is specified, and the input string"
+parsing should stop."
   (let* ((what str)
 	 (end-token nil)
 	 (comp nil)
diff -Nru emacs-26.1+1/lisp/cedet/srecode/cpp.el emacs-26.3+1/lisp/cedet/srecode/cpp.el
--- emacs-26.1+1/lisp/cedet/srecode/cpp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/cpp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/cpp.el --- C++ specific handlers for Semantic Recoder
 
-;; Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;;         Jan Moringen <scymtym@users.sourceforge.net>
diff -Nru emacs-26.1+1/lisp/cedet/srecode/ctxt.el emacs-26.3+1/lisp/cedet/srecode/ctxt.el
--- emacs-26.1+1/lisp/cedet/srecode/ctxt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/ctxt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/ctxt.el --- Derive a context from the source buffer.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/dictionary.el emacs-26.3+1/lisp/cedet/srecode/dictionary.el
--- emacs-26.1+1/lisp/cedet/srecode/dictionary.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/dictionary.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/dictionary.el --- Dictionary code for the semantic recoder.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/document.el emacs-26.3+1/lisp/cedet/srecode/document.el
--- emacs-26.1+1/lisp/cedet/srecode/document.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/document.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/document.el --- Documentation (comment) generation
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/el.el emacs-26.3+1/lisp/cedet/srecode/el.el
--- emacs-26.1+1/lisp/cedet/srecode/el.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/el.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/el.el --- Emacs Lisp specific arguments
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/expandproto.el emacs-26.3+1/lisp/cedet/srecode/expandproto.el
--- emacs-26.1+1/lisp/cedet/srecode/expandproto.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/expandproto.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/expandproto.el --- Expanding prototypes.
 
-;; Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/extract.el emacs-26.3+1/lisp/cedet/srecode/extract.el
--- emacs-26.1+1/lisp/cedet/srecode/extract.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/extract.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/extract.el --- Extract content from previously inserted macro.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/fields.el emacs-26.3+1/lisp/cedet/srecode/fields.el
--- emacs-26.1+1/lisp/cedet/srecode/fields.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/fields.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/fields.el --- Handling type-in fields in a buffer.
 ;;
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/filters.el emacs-26.3+1/lisp/cedet/srecode/filters.el
--- emacs-26.1+1/lisp/cedet/srecode/filters.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/filters.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/filters.el --- Filters for use in template variables.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/find.el emacs-26.3+1/lisp/cedet/srecode/find.el
--- emacs-26.1+1/lisp/cedet/srecode/find.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/find.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; srecode/find.el --- Tools for finding templates in the database.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/getset.el emacs-26.3+1/lisp/cedet/srecode/getset.el
--- emacs-26.1+1/lisp/cedet/srecode/getset.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/getset.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/getset.el --- Package for inserting new get/set methods.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/insert.el emacs-26.3+1/lisp/cedet/srecode/insert.el
--- emacs-26.1+1/lisp/cedet/srecode/insert.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/insert.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/insert.el --- Insert srecode templates to an output stream.
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/java.el emacs-26.3+1/lisp/cedet/srecode/java.el
--- emacs-26.1+1/lisp/cedet/srecode/java.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/java.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/java.el --- Srecode Java support
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/map.el emacs-26.3+1/lisp/cedet/srecode/map.el
--- emacs-26.1+1/lisp/cedet/srecode/map.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/map.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/map.el --- Manage a template file map
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/mode.el emacs-26.3+1/lisp/cedet/srecode/mode.el
--- emacs-26.1+1/lisp/cedet/srecode/mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/mode.el --- Minor mode for managing and using SRecode templates
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/semantic.el emacs-26.3+1/lisp/cedet/srecode/semantic.el
--- emacs-26.1+1/lisp/cedet/srecode/semantic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/semantic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/semantic.el --- Semantic specific extensions to SRecode.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/srt.el emacs-26.3+1/lisp/cedet/srecode/srt.el
--- emacs-26.1+1/lisp/cedet/srecode/srt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/srt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/srt.el --- argument handlers for SRT files
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/srt-mode.el emacs-26.3+1/lisp/cedet/srecode/srt-mode.el
--- emacs-26.1+1/lisp/cedet/srecode/srt-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/srt-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/srt-mode.el --- Major mode for writing screcode macros
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/table.el emacs-26.3+1/lisp/cedet/srecode/table.el
--- emacs-26.1+1/lisp/cedet/srecode/table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/table.el --- Tables of Semantic Recoders
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/template.el emacs-26.3+1/lisp/cedet/srecode/template.el
--- emacs-26.1+1/lisp/cedet/srecode/template.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/template.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/template.el --- SRecoder template language parser support.
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode/texi.el emacs-26.3+1/lisp/cedet/srecode/texi.el
--- emacs-26.1+1/lisp/cedet/srecode/texi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode/texi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode/texi.el --- Srecode texinfo support.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff -Nru emacs-26.1+1/lisp/cedet/srecode.el emacs-26.3+1/lisp/cedet/srecode.el
--- emacs-26.1+1/lisp/cedet/srecode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cedet/srecode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode.el --- Semantic buffer evaluator.
 
-;;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: codegeneration
diff -Nru emacs-26.1+1/lisp/ChangeLog.1 emacs-26.3+1/lisp/ChangeLog.1
--- emacs-26.1+1/lisp/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3244,7 +3244,7 @@
 		Set current buffer variables from defaults
 		in case user's init file has changed them.
 
-  Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.10 emacs-26.3+1/lisp/ChangeLog.10
--- emacs-26.1+1/lisp/ChangeLog.10	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.10	2019-09-10 00:32:49.000000000 +0000
@@ -23541,7 +23541,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.11 emacs-26.3+1/lisp/ChangeLog.11
--- emacs-26.1+1/lisp/ChangeLog.11	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.11	2019-09-10 00:32:49.000000000 +0000
@@ -14321,7 +14321,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2003-2011, 2013-2018 Free Software Foundation, Inc.
+  Copyright (C) 2003-2011, 2013-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.12 emacs-26.3+1/lisp/ChangeLog.12
--- emacs-26.1+1/lisp/ChangeLog.12	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.12	2019-09-10 00:32:49.000000000 +0000
@@ -8873,7 +8873,7 @@
 2006-06-06  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gud.el (gud-running): Fix doc string.
-	(gud-menu-map): Use :visible instead fo :enable for debugger test.
+	(gud-menu-map): Use :visible instead of :enable for debugger test.
 	(gud-tooltip-modes): Add python-mode.
 	(gud-tooltip-print-command): Add pdb.  Remove perldb.
 
@@ -33334,7 +33334,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2005-2018 Free Software Foundation, Inc.
+    Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.13 emacs-26.3+1/lisp/ChangeLog.13
--- emacs-26.1+1/lisp/ChangeLog.13	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.13	2019-09-10 00:32:49.000000000 +0000
@@ -16697,7 +16697,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2018 Free Software Foundation, Inc.
+  Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.14 emacs-26.3+1/lisp/ChangeLog.14
--- emacs-26.1+1/lisp/ChangeLog.14	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.14	2019-09-10 00:32:49.000000000 +0000
@@ -20547,7 +20547,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2008-2018 Free Software Foundation, Inc.
+    Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.15 emacs-26.3+1/lisp/ChangeLog.15
--- emacs-26.1+1/lisp/ChangeLog.15	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.15	2019-09-10 00:32:49.000000000 +0000
@@ -22802,7 +22802,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2009-2018 Free Software Foundation, Inc.
+  Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.16 emacs-26.3+1/lisp/ChangeLog.16
--- emacs-26.1+1/lisp/ChangeLog.16	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.16	2019-09-10 00:32:49.000000000 +0000
@@ -25223,7 +25223,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2018 Free Software Foundation, Inc.
+  Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.17 emacs-26.3+1/lisp/ChangeLog.17
--- emacs-26.1+1/lisp/ChangeLog.17	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.17	2019-09-10 00:32:49.000000000 +0000
@@ -26294,7 +26294,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2018 Free Software Foundation, Inc.
+  Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.2 emacs-26.3+1/lisp/ChangeLog.2
--- emacs-26.1+1/lisp/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -3992,7 +3992,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986-1988, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1986-1988, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.3 emacs-26.3+1/lisp/ChangeLog.3
--- emacs-26.1+1/lisp/ChangeLog.3	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.3	2019-09-10 00:32:49.000000000 +0000
@@ -7321,7 +7321,7 @@
 
 	(fortran-setup-tab-format-style): Set `fortran-comment-line-column' and
 	`fortran-minimum-statement-indent' to (max tab-width 6) instead of 8.
-	The minimum 6 insures legal indenting for lines with line numbers.
+	The minimum 6 ensures legal indenting for lines with line numbers.
 
 1991-07-13  Jim Blandy  (jimb@churchy.gnu.ai.mit.edu)
 
@@ -11436,7 +11436,7 @@
 
 1989-04-19  Richard Stallman  (rms@mole.ai.mit.edu)
 
-	* replace.el (occur-mode-goto-occurrence): Insure arg to
+	* replace.el (occur-mode-goto-occurrence): Ensure arg to
 	count-lines is@start of line.
 
 	* replace.el (occur): Remove an extraneous save-excursion.
@@ -12433,7 +12433,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.4 emacs-26.3+1/lisp/ChangeLog.4
--- emacs-26.1+1/lisp/ChangeLog.4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.4	2019-09-10 00:32:49.000000000 +0000
@@ -8934,7 +8934,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.5 emacs-26.3+1/lisp/ChangeLog.5
--- emacs-26.1+1/lisp/ChangeLog.5	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.5	2019-09-10 00:32:49.000000000 +0000
@@ -2676,7 +2676,7 @@
 1995-03-10  Karl Fogel  <kfogel@floss.life.uiuc.edu>
 
 	* bookmark.el:
-	Insure that all entry points call `bookmark-maybe-load-default-file'.
+	Ensure that all entry points call `bookmark-maybe-load-default-file'.
 	Changed format of bookmark-alist and therefore of bookmark files.
 	Have version stamps in bookmark files.
 	Automatically upgrade old bookmark files to new format.
@@ -9268,7 +9268,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.6 emacs-26.3+1/lisp/ChangeLog.6
--- emacs-26.1+1/lisp/ChangeLog.6	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.6	2019-09-10 00:32:49.000000000 +0000
@@ -8021,7 +8021,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.7 emacs-26.3+1/lisp/ChangeLog.7
--- emacs-26.1+1/lisp/ChangeLog.7	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.7	2019-09-10 00:32:49.000000000 +0000
@@ -12376,7 +12376,7 @@
 	when turning on Encoded-kbd mode, and recover it when turning off
 	Encoded-kbd mode.  Set encoded-kbd-iso2022-designations correctly.
 	(encoded-kbd-self-insert-iso2022-7bit): Call charset-dimension
-	instead fo charset-bytes.
+	instead of charset-bytes.
 	(encoded-kbd-self-insert-iso2022-8bit): Likewise.
 
 	* language/china-util.el (setup-chinese-gb-environment): Do not
@@ -23110,7 +23110,7 @@
 ;; coding: utf-8
 ;; End:
 
-	Copyright (C) 1997-1998, 2001-2018 Free Software Foundation,
+	Copyright (C) 1997-1998, 2001-2019 Free Software Foundation,
 	Inc.
 
   This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/ChangeLog.8 emacs-26.3+1/lisp/ChangeLog.8
--- emacs-26.1+1/lisp/ChangeLog.8	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.8	2019-09-10 00:32:49.000000000 +0000
@@ -9992,7 +9992,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/ChangeLog.9 emacs-26.3+1/lisp/ChangeLog.9
--- emacs-26.1+1/lisp/ChangeLog.9	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ChangeLog.9	2019-09-10 00:32:49.000000000 +0000
@@ -20685,7 +20685,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2000-2011, 2013-2018 Free Software Foundation, Inc.
+    Copyright (C) 2000-2011, 2013-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/char-fold.el emacs-26.3+1/lisp/char-fold.el
--- emacs-26.1+1/lisp/char-fold.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/char-fold.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; char-fold.el --- match unicode to similar ASCII -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: matching
diff -Nru emacs-26.1+1/lisp/chistory.el emacs-26.3+1/lisp/chistory.el
--- emacs-26.1+1/lisp/chistory.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/chistory.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; chistory.el --- list command history
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/cmuscheme.el emacs-26.3+1/lisp/cmuscheme.el
--- emacs-26.1+1/lisp/cmuscheme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cmuscheme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el
 
-;; Copyright (C) 1988, 1994, 1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1994, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
diff -Nru emacs-26.1+1/lisp/color.el emacs-26.3+1/lisp/color.el
--- emacs-26.1+1/lisp/color.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/color.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; color.el --- Color manipulation library -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Julien Danjou <julien@danjou.info>
 ;;          Drew Adams <drew.adams@oracle.com>
diff -Nru emacs-26.1+1/lisp/comint.el emacs-26.3+1/lisp/comint.el
--- emacs-26.1+1/lisp/comint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/comint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; comint.el --- general command interpreter in a window stuff -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 1990, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1990, 1992-2019 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
@@ -2248,14 +2248,16 @@
 If `comint-use-prompt-regexp' is non-nil, then return
 the current line with any initial string matching the regexp
 `comint-prompt-regexp' removed."
-  (let (bof)
+  (let (field-prop bof)
     (if (and (not comint-use-prompt-regexp)
              ;; Make sure we're in an input rather than output field.
-             (null (get-char-property (setq bof (field-beginning)) 'field)))
+             (not (setq field-prop (get-char-property
+                                    (setq bof (field-beginning)) 'field))))
 	(field-string-no-properties bof)
       (comint-bol)
       (buffer-substring-no-properties (point)
-				      (if comint-use-prompt-regexp
+                                      (if (or comint-use-prompt-regexp
+                                              (eq field-prop 'output))
 					  (line-end-position)
 					(field-end))))))
 
diff -Nru emacs-26.1+1/lisp/completion.el emacs-26.3+1/lisp/completion.el
--- emacs-26.1+1/lisp/completion.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/completion.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; completion.el --- dynamic word-completion code
 
-;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2018 Free Software
+;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/composite.el emacs-26.3+1/lisp/composite.el
--- emacs-26.1+1/lisp/composite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/composite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; composite.el --- support character composition
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
@@ -554,6 +554,11 @@
      ;; This sequence doesn't start with a proper base character.
      ((memq (get-char-code-property (lgstring-char gstring 0)
 				    'general-category)
+            ;; "Improper" base characters are of the following general
+            ;; categories:
+            ;;   Mark (nonspacing, combining, enclosing)
+            ;;   Separator (space, line, paragraph)
+            ;;   Other (control, format, surrogate)
 	    '(Mn Mc Me Zs Zl Zp Cc Cf Cs))
       nil)
 
@@ -646,6 +651,7 @@
 			  de (+ de yoff)))
 		   ((and (= class 0)
 			 (eq (get-char-code-property (lglyph-char glyph)
+                                                     ;; Me = enclosing mark
 						     'general-category) 'Me))
 		    ;; Artificially laying out glyphs in an enclosing
 		    ;; mark is difficult.  All we can do is to adjust
@@ -771,7 +777,8 @@
 					    'general-category)
 		    'Cf)
 		(progn
-		  ;; Compose by replacing with a space.
+		  ;; Compose Cf (format) control characters by
+		  ;; replacing with a space.
 		  (lglyph-set-char glyph 32)
 		  (lglyph-set-width glyph 1)
 		  (setq i (1+ i)))
diff -Nru emacs-26.1+1/lisp/cus-dep.el emacs-26.3+1/lisp/cus-dep.el
--- emacs-26.1+1/lisp/cus-dep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cus-dep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cus-dep.el --- find customization dependencies
 ;;
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/cus-edit.el emacs-26.3+1/lisp/cus-edit.el
--- emacs-26.1+1/lisp/cus-edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cus-edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages -*- lexical-binding:t -*-
 ;;
-;; Copyright (C) 1996-1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: emacs-devel@gnu.org
@@ -917,7 +917,7 @@
 If optional COMMENT argument is non-nil, also prompt for a comment and return
 it as the third element in the list."
   (let* ((var (read-variable prompt-var))
-	 (minibuffer-help-form '(describe-variable var))
+	 (minibuffer-help-form `(describe-variable ',var))
 	 (val
 	  (let ((prop (get var 'variable-interactive))
 		(type (get var 'custom-type))
diff -Nru emacs-26.1+1/lisp/cus-face.el emacs-26.3+1/lisp/cus-face.el
--- emacs-26.1+1/lisp/cus-face.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cus-face.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cus-face.el --- customization support for faces
 ;;
-;; Copyright (C) 1996-1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
diff -Nru emacs-26.1+1/lisp/cus-start.el emacs-26.3+1/lisp/cus-start.el
--- emacs-26.1+1/lisp/cus-start.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cus-start.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -706,6 +706,8 @@
 	  (put symbol 'risky-local-variable (cadr prop)))
       (if (setq prop (memq :set rest))
 	  (put symbol 'custom-set (cadr prop)))
+      ;; This is used by describe-variable.
+      (if version (put symbol 'custom-version version))
       ;; Note this is the _only_ initialize property we handle.
       (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
           ;; These vars are defined early and should hence be initialized
@@ -724,7 +726,6 @@
 	  (custom-add-to-group group symbol 'custom-variable))
 	;; Set the type.
 	(put symbol 'custom-type type)
-	(if version (put symbol 'custom-version version))
 	(while rest
 	  (setq prop (car rest)
 		propval (cadr rest)
diff -Nru emacs-26.1+1/lisp/cus-theme.el emacs-26.3+1/lisp/cus-theme.el
--- emacs-26.1+1/lisp/cus-theme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/cus-theme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cus-theme.el -- custom theme creation user interface
 ;;
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/custom.el emacs-26.3+1/lisp/custom.el
--- emacs-26.1+1/lisp/custom.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/custom.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
-;; Copyright (C) 1996-1997, 1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1996-1997, 1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
diff -Nru emacs-26.1+1/lisp/dabbrev.el emacs-26.3+1/lisp/dabbrev.el
--- emacs-26.1+1/lisp/dabbrev.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dabbrev.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dabbrev.el --- dynamic abbreviation package  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2018 Free
+;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Don Morrison
diff -Nru emacs-26.1+1/lisp/delim-col.el emacs-26.3+1/lisp/delim-col.el
--- emacs-26.1+1/lisp/delim-col.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/delim-col.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; delim-col.el --- prettify all columns in a region or rectangle
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/delsel.el emacs-26.3+1/lisp/delsel.el
--- emacs-26.1+1/lisp/delsel.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/delsel.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; delsel.el --- delete selection if you insert  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992, 1997-1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1997-1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
diff -Nru emacs-26.1+1/lisp/descr-text.el emacs-26.3+1/lisp/descr-text.el
--- emacs-26.1+1/lisp/descr-text.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/descr-text.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; descr-text.el --- describe text mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -386,13 +386,22 @@
 region limits, if narrowed; the column number; and the horizontal
 scroll amount, if the buffer is horizontally scrolled.
 
-The character information includes the character code; charset and
-code points in it; syntax; category; how the character is encoded in
-BUFFER and in BUFFER's file; character composition information (if
-relevant); the font and font glyphs used to display the character;
-the character's canonical name and other properties defined by the
-Unicode Data Base; and widgets, buttons, overlays, and text properties
-relevant to POS."
+The character information includes:
+ its codepoint;
+ its charset (see `char-charset'), overridden by the `charset' text
+   property at POS, if any;
+ the codepoint of the character in the above charset;
+ the character's script (as defined by `char-script-table')
+ the character's syntax, as produced by `syntax-after'
+   and `internal-describe-syntax-value';
+ its category (see `char-category-set' and `describe-char-categories');
+ how to input the character using the keyboard and input methods;
+ how the character is encoded in BUFFER and in BUFFER's file;
+ the font and font glyphs used to display the character;
+ the composition information for displaying the character (if relevant);
+ the character's canonical name and other properties defined by the
+   Unicode Data Base;
+ and widgets, buttons, overlays, and text properties relevant to POS."
   (interactive "d")
   (unless (buffer-live-p buffer) (setq buffer (current-buffer)))
   (let ((src-buf (current-buffer)))
@@ -404,6 +413,12 @@
            (charset (if eight-bit-p 'eight-bit
                       (or (get-text-property pos 'charset)
                           (char-charset char))))
+           ;; TIS620.2533 overlaps eight-bit-control, but we want to
+           ;; show eight-bit for raw bytes, not some obscure character
+           ;; set no one heard of.
+           (charset (if (eq charset 'tis620-2533)
+                        'eight-bit
+                      charset))
            (composition (find-composition pos nil nil t))
            (component-chars nil)
            (display-table (or (window-display-table)
@@ -556,7 +571,7 @@
                         (apply 'propertize char-description
                                (text-properties-at pos))
                         char char char))
-              ("preferred charset"
+              ("charset"
                ,`(insert-text-button
                   ,(symbol-name charset)
                   'type 'help-character-set 'help-args '(,charset))
diff -Nru emacs-26.1+1/lisp/desktop.el emacs-26.3+1/lisp/desktop.el
--- emacs-26.1+1/lisp/desktop.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/desktop.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993-1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
diff -Nru emacs-26.1+1/lisp/dframe.el emacs-26.3+1/lisp/dframe.el
--- emacs-26.1+1/lisp/dframe.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dframe.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dframe --- dedicate frame support modes  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff -Nru emacs-26.1+1/lisp/dired-aux.el emacs-26.3+1/lisp/dired-aux.el
--- emacs-26.1+1/lisp/dired-aux.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dired-aux.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired-aux.el --- less commonly used parts of dired -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
@@ -614,14 +614,16 @@
 
 (declare-function mailcap-file-default-commands "mailcap" (files))
 
+(defvar dired-aux-files)
+
 (defun minibuffer-default-add-dired-shell-commands ()
   "Return a list of all commands associated with current dired files.
 This function is used to add all related commands retrieved by `mailcap'
 to the end of the list of defaults just after the default value."
   (interactive)
-  (let* ((files minibuffer-completion-table)
-         (commands (and (require 'mailcap nil t)
-                        (mailcap-file-default-commands files))))
+  (let ((commands (and (boundp 'dired-aux-files)
+		       (require 'mailcap nil t)
+		       (mailcap-file-default-commands dired-aux-files))))
     (if (listp minibuffer-default)
 	(append minibuffer-default commands)
       (cons minibuffer-default commands))))
@@ -639,9 +641,9 @@
 offer a smarter default choice of shell command."
   (minibuffer-with-setup-hook
       (lambda ()
-        (set (make-local-variable 'minibuffer-completion-table) files)
-	(set (make-local-variable 'minibuffer-default-add-function)
-	     'minibuffer-default-add-dired-shell-commands))
+	(setq-local dired-aux-files files)
+	(setq-local minibuffer-default-add-function
+		    #'minibuffer-default-add-dired-shell-commands))
     (setq prompt (format prompt (dired-mark-prompt arg files)))
     (if (functionp 'dired-guess-shell-command)
 	(dired-mark-pop-up nil 'shell files
@@ -755,16 +757,17 @@
 	            (y-or-n-p (format-message
 			       "Confirm--do you mean to use `?' as a wildcard? ")))
 	           (t))))
-    (when ok
-      (if on-each
-	  (dired-bunch-files (- 10000 (length command))
-	                     (lambda (&rest files)
-	                       (dired-run-shell-command
-                                (dired-shell-stuff-it command files t arg)))
-	                     nil file-list)
-	;; execute the shell command
-	(dired-run-shell-command
-	 (dired-shell-stuff-it command file-list nil arg)))))))
+    (cond ((not ok) (message "Command canceled"))
+          (t
+           (if on-each
+	       (dired-bunch-files (- 10000 (length command))
+	                          (lambda (&rest files)
+	                            (dired-run-shell-command
+                                     (dired-shell-stuff-it command files t arg)))
+	                          nil file-list)
+	     ;; execute the shell command
+	     (dired-run-shell-command
+	      (dired-shell-stuff-it command file-list nil arg))))))))
 
 ;; Might use {,} for bash or csh:
 (defvar dired-mark-prefix ""
@@ -1222,7 +1225,12 @@
 
 ;;;###autoload
 (defun dired-do-compress (&optional arg)
-  "Compress or uncompress marked (or next ARG) files."
+  "Compress or uncompress marked (or next ARG) files.
+If invoked on a directory, compress all of the files in
+the directory and all of its subdirectories, recursively,
+into a .tar.gz archive.
+If invoked on a .tar.gz or a .tgz or a .zip or a .7z archive,
+uncompress and unpack all the files in the archive."
   (interactive "P")
   (dired-map-over-marks-check #'dired-compress arg 'compress t))
 
@@ -1709,7 +1717,7 @@
           (let* ((overwrite (file-exists-p to))
                  (dired-overwrite-confirmed ; for dired-handle-overwrite
                   (and overwrite
-                       (let ((help-form '(format-message "\
+                       (let ((help-form (format-message "\
 Type SPC or `y' to overwrite file `%s',
 DEL or `n' to skip to next,
 ESC or `q' to not overwrite any of the remaining files,
diff -Nru emacs-26.1+1/lisp/dired.el emacs-26.3+1/lisp/dired.el
--- emacs-26.1+1/lisp/dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992-1997, 2000-2018 Free Software
+;; Copyright (C) 1985-1986, 1992-1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
@@ -88,9 +88,11 @@
 
 (defcustom dired-use-ls-dired 'unspecified
   "Non-nil means Dired should pass the \"--dired\" option to \"ls\".
-The special value of `unspecified' means to check explicitly, and
-save the result in this variable.  This is performed the first
-time `dired-insert-directory' is called.
+If nil, don't pass \"--dired\" to \"ls\".
+The special value of `unspecified' means to check whether \"ls\"
+supports the \"--dired\" option, and save the result in this
+variable.  This is performed the first time `dired-insert-directory'
+is invoked.
 
 Note that if you set this option to nil, either through choice or
 because your \"ls\" program does not support \"--dired\", Dired
@@ -104,9 +106,10 @@
 Note that `ls-lisp' does not support as many options as GNU ls, though.
 For more details, see Info node `(emacs)ls in Lisp'."
   :group 'dired
-  :type '(choice (const :tag "Check for --dired support" unspecified)
+  :type '(choice (const :tag
+                        "Use --dired only if 'ls' supports it" unspecified)
                  (const :tag "Do not use --dired" nil)
-                 (other :tag "Use --dired" t)))
+                 (other :tag "Always use --dired" t)))
 
 (defcustom dired-chmod-program "chmod"
   "Name of chmod command (usually `chmod')."
@@ -1691,7 +1694,7 @@
 
     ;; Make menu bar items.
 
-    ;; No need to fo this, now that top-level items are fewer.
+    ;; No need to do this, now that top-level items are fewer.
     ;;;;
     ;; Get rid of the Edit menu bar item to save space.
     ;(define-key map [menu-bar edit] 'undefined)
@@ -2995,37 +2998,6 @@
 ;; Match anything but `.' and `..'.
 (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
 
-(defconst dired-delete-help
-  "Type:
-`yes' to delete recursively the current directory,
-`no' to skip to next,
-`all' to delete all remaining directories with no more questions,
-`quit' to exit,
-`help' to show this help message.")
-
-(defun dired--yes-no-all-quit-help (prompt &optional help-msg)
-  "Ask a question with valid answers: yes, no, all, quit, help.
-PROMPT must end with '? ', for instance, 'Delete it? '.
-If optional arg HELP-MSG is non-nil, then is a message to show when
-the user answers 'help'.  Otherwise, default to `dired-delete-help'."
-  (let ((valid-answers (list "yes" "no" "all" "quit"))
-        (answer "")
-        (input-fn (lambda ()
-                    (read-string
-	             (format "%s [yes, no, all, quit, help] " prompt)))))
-    (setq answer (funcall input-fn))
-    (when (string= answer "help")
-      (with-help-window "*Help*"
-        (with-current-buffer "*Help*"
-          (insert (or help-msg dired-delete-help)))))
-    (while (not (member answer valid-answers))
-      (unless (string= answer "help")
-        (beep)
-        (message "Please answer `yes' or `no' or `all' or `quit'")
-        (sleep-for 2))
-      (setq answer (funcall input-fn)))
-    answer))
-
 ;; Delete file, possibly delete a directory and all its files.
 ;; This function is useful outside of dired.  One could change its name
 ;; to e.g. recursive-delete-file and put it somewhere else.
@@ -3055,11 +3027,17 @@
 				    "trash"
 				  "delete")
 				(dired-make-relative file))))
-                   (pcase (dired--yes-no-all-quit-help prompt) ; Prompt user.
+                   (pcase (read-answer
+                           prompt
+                           '(("yes"  ?y "delete recursively the current directory")
+                             ("no"   ?n "skip to next")
+                             ("all"  ?! "delete all remaining directories with no more questions")
+                             ("quit" ?q "exit")))
                      ('"all" (setq recursive 'always dired-recursive-deletes recursive))
                      ('"yes" (if (eq recursive 'top) (setq recursive 'always)))
                      ('"no" (setq recursive nil))
-                     ('"quit" (keyboard-quit)))))
+                     ('"quit" (keyboard-quit))
+                     (_ (keyboard-quit))))) ; catch all unknown answers
              (setq recursive nil)) ; Empty dir or recursive is nil.
            (delete-directory file recursive trash))))
 
diff -Nru emacs-26.1+1/lisp/dired-x.el emacs-26.3+1/lisp/dired-x.el
--- emacs-26.1+1/lisp/dired-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dired-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired-x.el --- extra Dired functionality  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1994, 1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1993-1994, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
diff -Nru emacs-26.1+1/lisp/dirtrack.el emacs-26.3+1/lisp/dirtrack.el
--- emacs-26.1+1/lisp/dirtrack.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dirtrack.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dirtrack.el --- Directory Tracking by watching the prompt
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 17 1996
diff -Nru emacs-26.1+1/lisp/display-line-numbers.el emacs-26.3+1/lisp/display-line-numbers.el
--- emacs-26.1+1/lisp/display-line-numbers.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/display-line-numbers.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; display-line-numbers.el --- interface for display-line-numbers -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
@@ -92,9 +92,7 @@
 
 (defun display-line-numbers--turn-on ()
   "Turn on `display-line-numbers-mode'."
-  (unless (or (minibufferp)
-              ;; taken from linum.el
-              (and (daemonp) (null (frame-parameter nil 'client))))
+  (unless (minibufferp)
     (display-line-numbers-mode)))
 
 ;;;###autoload
diff -Nru emacs-26.1+1/lisp/disp-table.el emacs-26.3+1/lisp/disp-table.el
--- emacs-26.1+1/lisp/disp-table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/disp-table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; disp-table.el --- functions for dealing with char tables
 
-;; Copyright (C) 1987, 1994-1995, 1999, 2001-2018 Free Software
+;; Copyright (C) 1987, 1994-1995, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
diff -Nru emacs-26.1+1/lisp/dnd.el emacs-26.3+1/lisp/dnd.el
--- emacs-26.1+1/lisp/dnd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dnd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dnd.el --- drag and drop support
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/doc-view.el emacs-26.3+1/lisp/doc-view.el
--- emacs-26.1+1/lisp/doc-view.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/doc-view.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; doc-view.el --- View PDF/PostScript/DVI files in Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Tassilo Horn <tsdh@gnu.org>
 ;; Maintainer: Tassilo Horn <tsdh@gnu.org>
@@ -39,7 +39,7 @@
 ;;
 ;;     C-x C-f ~/path/to/document RET
 ;;
-;; and the document will be converted and displayed, if your emacs supports png
+;; and the document will be converted and displayed, if your emacs supports PNG
 ;; images.  With `C-c C-c' you can toggle between the rendered images
 ;; representation and the source text representation of the document.
 ;;
@@ -50,7 +50,7 @@
 ;; `doc-view-clear-cache'.  To open the cache with dired, so that you can tidy
 ;; it out use `doc-view-dired-cache'.
 ;;
-;; When conversion in underway the first page will be displayed as soon as it
+;; When conversion is underway the first page will be displayed as soon as it
 ;; is available and the available pages are refreshed every
 ;; `doc-view-conversion-refresh-interval' seconds.  If that variable is nil the
 ;; pages won't be displayed before conversion of the document finished
@@ -1772,27 +1772,28 @@
     (doc-view-make-safe-dir doc-view-cache-directory)
     ;; Handle compressed files, remote files, files inside archives
     (setq-local doc-view--buffer-file-name
-                (cond
-                 (jka-compr-really-do-compress
-                  ;; FIXME: there's a risk of name conflicts here.
-                  (expand-file-name
-                   (file-name-nondirectory
-                    (file-name-sans-extension buffer-file-name))
-                   doc-view-cache-directory))
-                 ;; Is the file readable by local processes?
-                 ;; We used to use `file-remote-p' but it's unclear what it's
-                 ;; supposed to return nil for things like local files accessed
-                 ;; via `su' or via file://...
-                 ((let ((file-name-handler-alist nil))
-                    (not (and buffer-file-name
-                              (file-readable-p buffer-file-name))))
-                  ;; FIXME: there's a risk of name conflicts here.
-                  (expand-file-name
-                   (if buffer-file-name
-                       (file-name-nondirectory buffer-file-name)
-                     (buffer-name))
-                   doc-view-cache-directory))
-                 (t buffer-file-name)))
+		(convert-standard-filename
+                 (cond
+                  (jka-compr-really-do-compress
+                   ;; FIXME: there's a risk of name conflicts here.
+                   (expand-file-name
+                    (file-name-nondirectory
+                     (file-name-sans-extension buffer-file-name))
+                    doc-view-cache-directory))
+                  ;; Is the file readable by local processes?
+                  ;; We used to use `file-remote-p' but it's unclear what it's
+                  ;; supposed to return nil for things like local files accessed
+                  ;; via `su' or via file://...
+                  ((let ((file-name-handler-alist nil))
+                     (not (and buffer-file-name
+                               (file-readable-p buffer-file-name))))
+                   ;; FIXME: there's a risk of name conflicts here.
+                   (expand-file-name
+                    (if buffer-file-name
+			(file-name-nondirectory buffer-file-name)
+                      (buffer-name))
+                    doc-view-cache-directory))
+                  (t buffer-file-name))))
     (when (not (string= doc-view--buffer-file-name buffer-file-name))
       (write-region nil nil doc-view--buffer-file-name))
 
diff -Nru emacs-26.1+1/lisp/dom.el emacs-26.3+1/lisp/dom.el
--- emacs-26.1+1/lisp/dom.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dom.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dom.el --- XML/HTML (etc.) DOM manipulation and searching functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: xml, html
diff -Nru emacs-26.1+1/lisp/dos-fns.el emacs-26.3+1/lisp/dos-fns.el
--- emacs-26.1+1/lisp/dos-fns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dos-fns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dos-fns.el --- MS-Dos specific functions
 
-;; Copyright (C) 1991, 1993, 1995-1996, 2001-2018 Free Software
+;; Copyright (C) 1991, 1993, 1995-1996, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/dos-vars.el emacs-26.3+1/lisp/dos-vars.el
--- emacs-26.1+1/lisp/dos-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dos-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dos-vars.el --- MS-Dos specific user options
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/dos-w32.el emacs-26.3+1/lisp/dos-w32.el
--- emacs-26.1+1/lisp/dos-w32.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dos-w32.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/double.el emacs-26.3+1/lisp/double.el
--- emacs-26.1+1/lisp/double.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/double.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; double.el --- support for keyboard remapping with double clicking
 
-;; Copyright (C) 1994, 1997-1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1994, 1997-1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
diff -Nru emacs-26.1+1/lisp/dynamic-setting.el emacs-26.3+1/lisp/dynamic-setting.el
--- emacs-26.1+1/lisp/dynamic-setting.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/dynamic-setting.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dynamic-setting.el --- Support dynamic changes
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/ebuff-menu.el emacs-26.3+1/lisp/ebuff-menu.el
--- emacs-26.1+1/lisp/ebuff-menu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ebuff-menu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
-;; Copyright (C) 1985-1986, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1986, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
diff -Nru emacs-26.1+1/lisp/echistory.el emacs-26.3+1/lisp/echistory.el
--- emacs-26.1+1/lisp/echistory.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/echistory.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; echistory.el --- Electric Command History Mode
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/ecomplete.el emacs-26.3+1/lisp/ecomplete.el
--- emacs-26.1+1/lisp/ecomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ecomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ecomplete.el --- electric completion of addresses and the like
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/edmacro.el emacs-26.3+1/lisp/edmacro.el
--- emacs-26.1+1/lisp/edmacro.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/edmacro.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edmacro.el --- keyboard macro editor
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
diff -Nru emacs-26.1+1/lisp/ehelp.el emacs-26.3+1/lisp/ehelp.el
--- emacs-26.1+1/lisp/ehelp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ehelp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ehelp.el --- bindings for electric-help mode -*- lexical-binding: t -*-
 
-;; Copyright (C) 1986, 1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik
 ;; (according to ack.texi and authors.el)
diff -Nru emacs-26.1+1/lisp/elec-pair.el emacs-26.3+1/lisp/elec-pair.el
--- emacs-26.1+1/lisp/elec-pair.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/elec-pair.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elec-pair.el --- Automatic parenthesis pairing  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: João Távora <joaotavora@gmail.com>
 
diff -Nru emacs-26.1+1/lisp/electric.el emacs-26.3+1/lisp/electric.el
--- emacs-26.1+1/lisp/electric.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/electric.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; electric.el --- window maker and Command loop for `electric' modes
 
-;; Copyright (C) 1985-1986, 1995, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1986, 1995, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: K. Shane Hartman
@@ -223,9 +223,9 @@
 
 (defvar electric-indent-functions-without-reindent
   '(indent-relative indent-to-left-margin indent-relative-maybe
-    py-indent-line coffee-indent-line org-indent-line yaml-indent-line
-    haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent
-    yaml-indent-line)
+    indent-relative-first-indent-point py-indent-line coffee-indent-line
+    org-indent-line yaml-indent-line haskell-indentation-indent-line
+    haskell-indent-cycle haskell-simple-indent yaml-indent-line)
   "List of indent functions that can't reindent.
 If `indent-line-function' is one of those, then `electric-indent-mode' will
 not try to reindent lines.  It is normally better to make the major
diff -Nru emacs-26.1+1/lisp/elide-head.el emacs-26.3+1/lisp/elide-head.el
--- emacs-26.1+1/lisp/elide-head.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/elide-head.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elide-head.el --- hide headers in files
 
-;; Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: outlines tools
diff -Nru emacs-26.1+1/lisp/emacs-lisp/advice.el emacs-26.3+1/lisp/emacs-lisp/advice.el
--- emacs-26.1+1/lisp/emacs-lisp/advice.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/advice.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; advice.el --- An overloading mechanism for Emacs Lisp functions  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/emacs-lisp/autoload.el emacs-26.3+1/lisp/emacs-lisp/autoload.el
--- emacs-26.1+1/lisp/emacs-lisp/autoload.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/autoload.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; autoload.el --- maintain autoloads in loaddefs.el  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1991-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Keywords: maint
@@ -1034,7 +1034,7 @@
                        ;; we don't want to depend on whether Emacs was
                        ;; built with or without modules support, nor
                        ;; what is the suffix for the underlying OS.
-		       (unless (string-match "\\.\\(elc\\|\\so\\|dll\\)" suf)
+		       (unless (string-match "\\.\\(elc\\|so\\|dll\\)" suf)
                          (push suf tmp)))
                      (concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
 	 (files (apply #'nconc
diff -Nru emacs-26.1+1/lisp/emacs-lisp/avl-tree.el emacs-26.3+1/lisp/emacs-lisp/avl-tree.el
--- emacs-26.1+1/lisp/emacs-lisp/avl-tree.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/avl-tree.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; avl-tree.el --- balanced binary trees, AVL-trees  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1995, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;         Inge Wallin <inge@lysator.liu.se>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/backquote.el emacs-26.3+1/lisp/emacs-lisp/backquote.el
--- emacs-26.1+1/lisp/emacs-lisp/backquote.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/backquote.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; backquote.el --- implement the ` Lisp construct
 
-;; Copyright (C) 1990, 1992, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1990, 1992, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Rick Sladkey <jrs@world.std.com>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/benchmark.el emacs-26.3+1/lisp/emacs-lisp/benchmark.el
--- emacs-26.1+1/lisp/emacs-lisp/benchmark.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/benchmark.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; benchmark.el --- support for benchmarking code  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love  <fx@gnu.org>
 ;; Keywords: lisp, extensions
diff -Nru emacs-26.1+1/lisp/emacs-lisp/bindat.el emacs-26.3+1/lisp/emacs-lisp/bindat.el
--- emacs-26.1+1/lisp/emacs-lisp/bindat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/bindat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bindat.el --- binary data structure packing and unpacking.
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Assignment name: struct.el
diff -Nru emacs-26.1+1/lisp/emacs-lisp/bytecomp.el emacs-26.3+1/lisp/emacs-lisp/bytecomp.el
--- emacs-26.1+1/lisp/emacs-lisp/bytecomp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/bytecomp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
@@ -234,9 +234,9 @@
   :group 'bytecomp
   :type 'boolean)
 
-(defcustom byte-compile-cond-use-jump-table t
+(defcustom byte-compile-cond-use-jump-table nil
   "Compile `cond' clauses to a jump table implementation (using a hash-table)."
-  :version "26.1"
+  :version "26.3" ;; Disabled due to Bug#35770.
   :group 'bytecomp
   :type 'boolean)
 
@@ -1379,7 +1379,9 @@
 (defun byte-compile-callargs-warn (form)
   (let* ((def (or (byte-compile-fdefinition (car form) nil)
 		  (byte-compile-fdefinition (car form) t)))
-	 (sig (byte-compile--function-signature def))
+         (sig (cond (def (byte-compile--function-signature def))
+                    ((subrp (symbol-function (car form)))
+                     (subr-arity (symbol-function (car form))))))
 	 (ncall (length (cdr form))))
     ;; Check many or unevalled from subr-arity.
     (if (and (cdr-safe sig)
@@ -1938,17 +1940,7 @@
 		       ;; parallel bootstrap), it does not risk getting a
 		       ;; half-finished file.  (Bug#4196)
 		       (tempfile
-                        (if (file-name-absolute-p target-file)
-                            (make-temp-file target-file)
-                          ;; If target-file is relative and includes
-                          ;; leading directories, make-temp-file will
-                          ;; assume those leading directories exist
-                          ;; under temporary-file-directory, which might
-                          ;; not be true.  So strip leading directories
-                          ;; from relative file names before calling
-                          ;; make-temp-file.
-                          (make-temp-file
-                           (file-name-nondirectory target-file))))
+			(make-temp-file (expand-file-name target-file)))
 		       (default-modes (default-file-modes))
 		       (temp-modes (logand default-modes #o600))
 		       (desired-modes (logand default-modes #o666))
@@ -4094,6 +4086,8 @@
    (and (symbolp obj1) (macroexp-const-p obj2) (cons obj1 obj2))
    (and (symbolp obj2) (macroexp-const-p obj1) (cons obj2 obj1))))
 
+(defconst byte-compile--default-val (cons nil nil) "A unique object.")
+
 (defun byte-compile-cond-jump-table-info (clauses)
   "If CLAUSES is a `cond' form where:
 The condition for each clause is of the form (TEST VAR VALUE).
@@ -4126,7 +4120,9 @@
                         (not (assq obj2 cases)))
                    (push (list (if (consp obj2) (eval obj2) obj2) body) cases)
                  (if (and (macroexp-const-p condition) condition)
-                     (progn (push (list 'default (or body `(,condition))) cases)
+		     (progn (push (list byte-compile--default-val
+					(or body `(,condition)))
+				  cases)
                             (throw 'break t))
                    (setq ok nil)
                    (throw 'break nil))))))
@@ -4141,11 +4137,12 @@
     (when (and cases (not (= (length cases) 1)))
       ;; TODO: Once :linear-search is implemented for `make-hash-table'
       ;; set it to `t' for cond forms with a small number of cases.
-      (setq jump-table (make-hash-table :test test
-                                        :purecopy t
-                                        :size (if (assq 'default cases)
-                                                  (1- (length cases))
-                                                (length cases)))
+      (setq jump-table (make-hash-table
+			:test test
+			:purecopy t
+			:size (if (assq byte-compile--default-val cases)
+				  (1- (length cases))
+				(length cases)))
             default-tag (byte-compile-make-tag)
             donetag (byte-compile-make-tag))
       ;; The structure of byte-switch code:
@@ -4177,9 +4174,10 @@
       (let ((byte-compile-depth byte-compile-depth))
         (byte-compile-goto 'byte-goto default-tag))
 
-      (when (assq 'default cases)
-        (setq default-case (cadr (assq 'default cases))
-              cases (butlast cases 1)))
+      (let ((default-match (assq byte-compile--default-val cases)))
+        (when default-match
+	  (setq default-case (cadr default-match)
+                cases (butlast cases))))
 
       (dolist (case cases)
         (setq tag (byte-compile-make-tag)
diff -Nru emacs-26.1+1/lisp/emacs-lisp/byte-opt.el emacs-26.3+1/lisp/emacs-lisp/byte-opt.el
--- emacs-26.1+1/lisp/emacs-lisp/byte-opt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/byte-opt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler -*- lexical-binding: t -*-
 
-;; Copyright (C) 1991, 1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/byte-run.el emacs-26.3+1/lisp/emacs-lisp/byte-run.el
--- emacs-26.1+1/lisp/emacs-lisp/byte-run.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/byte-run.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; byte-run.el --- byte-compiler support for inlining  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cconv.el emacs-26.3+1/lisp/emacs-lisp/cconv.el
--- emacs-26.1+1/lisp/emacs-lisp/cconv.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cconv.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Igor Kuzmin <kzuminig@iro.umontreal.ca>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/emacs-lisp/chart.el emacs-26.3+1/lisp/emacs-lisp/chart.el
--- emacs-26.1+1/lisp/emacs-lisp/chart.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/chart.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; chart.el --- Draw charts (bar charts, etc)  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2018 Free
+;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/check-declare.el emacs-26.3+1/lisp/emacs-lisp/check-declare.el
--- emacs-26.1+1/lisp/emacs-lisp/check-declare.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/check-declare.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; check-declare.el --- Check declare-function statements
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris <rgm@gnu.org>
 ;; Keywords: lisp, tools, maint
diff -Nru emacs-26.1+1/lisp/emacs-lisp/checkdoc.el emacs-26.3+1/lisp/emacs-lisp/checkdoc.el
--- emacs-26.1+1/lisp/emacs-lisp/checkdoc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/checkdoc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; checkdoc.el --- check documentation strings for style requirements  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.6.2
@@ -901,9 +901,8 @@
 ;;;###autoload
 (defun checkdoc-continue (&optional take-notes)
   "Find the next doc string in the current buffer which has a style error.
-Prefix argument TAKE-NOTES means to continue through the whole buffer and
-save warnings in a separate buffer.  Second optional argument START-POINT
-is the starting location.  If this is nil, `point-min' is used instead."
+Prefix argument TAKE-NOTES means to continue through the whole
+buffer and save warnings in a separate buffer."
   (interactive "P")
   (let ((wrong nil) (msg nil)
 	;; Assign a flag to spellcheck flag
@@ -1868,7 +1867,7 @@
 		 (if (checkdoc-autofix-ask-replace
 		      (match-beginning 1) (+ (match-beginning 1)
 					     (length ms))
-		      msg (format-message "`%s'" ms) t)
+		      msg (format "`%s'" ms) t)
 		     (setq msg nil)
 		   (setq msg
 			 (format-message
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl.el emacs-26.3+1/lisp/emacs-lisp/cl.el
--- emacs-26.1+1/lisp/emacs-lisp/cl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl.el --- Compatibility aliases for the old CL library.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: extensions
@@ -466,9 +466,12 @@
 	(push var sets)
 	(push (cons (car binding)
                     `(lambda (&rest cl-labels-args)
-                       (cl-list* 'funcall ',var
-                                 cl-labels-args)))
+                       (if (eq (car cl-labels-args) cl--labels-magic)
+                           (list cl--labels-magic ',var)
+                         (cl-list* 'funcall ',var cl-labels-args))))
               newenv)))
+    ;; `lexical-let' adds `cl--function-convert' (which calls
+    ;; `cl--labels-convert') as a macroexpander for `function'.
     (macroexpand-all `(lexical-let ,vars (setq ,@sets) ,@body) newenv)))
 
 ;; Generalized variables are provided by gv.el, but some details are
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-extra.el emacs-26.3+1/lisp/emacs-lisp/cl-extra.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-extra.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-extra.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-extra.el --- Common Lisp features, part 2  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: extensions
@@ -484,7 +484,7 @@
 If STATE is t, return a new state object seeded from the time of day."
   (unless state (setq state cl--random-state))
   (if (cl-random-state-p state)
-      (copy-tree state t)
+      (copy-sequence state)
     (cl--make-random-state (if (integerp state) state (cl--random-time)))))
 
 ;; Implementation limits.
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-generic.el emacs-26.3+1/lisp/emacs-lisp/cl-generic.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-generic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-generic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-generic.el --- CLOS-style generic functions for Elisp  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Version: 1.0
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-indent.el emacs-26.3+1/lisp/emacs-lisp/cl-indent.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-indent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-indent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-indent.el --- Enhanced lisp-indent mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1987, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-lib.el emacs-26.3+1/lisp/emacs-lisp/cl-lib.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-lib.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-lib.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-lib.el --- Common Lisp extensions for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 1.0
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-macs.el emacs-26.3+1/lisp/emacs-lisp/cl-macs.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-macs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-macs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-macs.el --- Common Lisp macros  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Old-Version: 2.02
@@ -1745,7 +1745,24 @@
 
 ;;;###autoload
 (defmacro cl-do (steps endtest &rest body)
-  "The Common Lisp `do' loop.
+  "Bind variables and run BODY forms until END-TEST returns non-nil.
+First, each VAR is bound to the associated INIT value as if by a `let' form.
+Then, in each iteration of the loop, the END-TEST is evaluated; if true,
+the loop is finished.  Otherwise, the BODY forms are evaluated, then each
+VAR is set to the associated STEP expression (as if by a `cl-psetq' form)
+and the next iteration begins.
+
+Once the END-TEST becomes true, the RESULT forms are evaluated (with
+the VARs still bound to their values) to produce the result
+returned by `cl-do'.
+
+Note that the entire loop is enclosed in an implicit `nil' block, so
+that you can use `cl-return' to exit at any time.
+
+Also note that END-TEST is checked before evaluating BODY.  If END-TEST
+is initially non-nil, `cl-do' will exit without running BODY.
+
+For more details, see `cl-do' description in Info node `(cl) Iteration'.
 
 \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
   (declare (indent 2)
@@ -1757,7 +1774,25 @@
 
 ;;;###autoload
 (defmacro cl-do* (steps endtest &rest body)
-  "The Common Lisp `do*' loop.
+  "Bind variables and run BODY forms until END-TEST returns non-nil.
+First, each VAR is bound to the associated INIT value as if by a `let*' form.
+Then, in each iteration of the loop, the END-TEST is evaluated; if true,
+the loop is finished.  Otherwise, the BODY forms are evaluated, then each
+VAR is set to the associated STEP expression (as if by a `setq'
+form) and the next iteration begins.
+
+Once the END-TEST becomes true, the RESULT forms are evaluated (with
+the VARs still bound to their values) to produce the result
+returned by `cl-do*'.
+
+Note that the entire loop is enclosed in an implicit `nil' block, so
+that you can use `cl-return' to exit at any time.
+
+Also note that END-TEST is checked before evaluating BODY.  If END-TEST
+is initially non-nil, `cl-do*' will exit without running BODY.
+
+This is to `cl-do' what `let*' is to `let'.
+For more details, see `cl-do*' description in Info node `(cl) Iteration'.
 
 \(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
   (declare (indent 2) (debug cl-do))
@@ -1964,13 +1999,16 @@
 ;;;###autoload
 (defmacro cl-flet (bindings &rest body)
   "Make local function definitions.
-Like `cl-labels' but the definitions are not recursive.
-Each binding can take the form (FUNC EXP) where
+Each definition can take the form (FUNC EXP) where
 FUNC is the function name, and EXP is an expression that returns the
 function value to which it should be bound, or it can take the more common
 form \(FUNC ARGLIST BODY...) which is a shorthand
 for (FUNC (lambda ARGLIST BODY)).
 
+FUNC is defined only within FORM, not BODY, so you can't write
+recursive function definitions.  Use `cl-labels' for that.  See
+info node `(cl) Function Bindings' for details.
+
 \(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
   (declare (indent 1) (debug ((&rest (cl-defun)) cl-declarations body)))
   (let ((binds ()) (newenv macroexpand-all-environment))
@@ -2012,9 +2050,13 @@
 
 ;;;###autoload
 (defmacro cl-labels (bindings &rest body)
-  "Make temporary function bindings.
-The bindings can be recursive and the scoping is lexical, but capturing them
-in closures will only work if `lexical-binding' is in use.
+    "Make local (recursive) function definitions.
+Each definition can take the form (FUNC ARGLIST BODY...) where
+FUNC is the function name, ARGLIST its arguments, and BODY the
+forms of the function body.  FUNC is defined in any BODY, as well
+as FORM, so you can write recursive and mutually recursive
+function definitions.  See info node `(cl) Function Bindings' for
+details.
 
 \(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
   (declare (indent 1) (debug cl-flet))
@@ -2887,10 +2929,10 @@
 
 ;;;###autoload
 (pcase-defmacro cl-struct (type &rest fields)
-  "Pcase patterns to match cl-structs.
-Elements of FIELDS can be of the form (NAME PAT) in which case the contents of
-field NAME is matched against PAT, or they can be of the form NAME which
-is a shorthand for (NAME NAME)."
+  "Pcase patterns that match cl-struct EXPVAL of type TYPE.
+Elements of FIELDS can be of the form (NAME PAT) in which case the
+contents of field NAME is matched against PAT, or they can be of
+the form NAME which is a shorthand for (NAME NAME)."
   (declare (debug (sexp &rest [&or (sexp pcase-PAT) sexp])))
   `(and (pred (pcase--flip cl-typep ',type))
         ,@(mapcar
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-preloaded.el emacs-26.3+1/lisp/emacs-lisp/cl-preloaded.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-preloaded.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-preloaded.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-preloaded.el --- Preloaded part of the CL library  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-print.el emacs-26.3+1/lisp/emacs-lisp/cl-print.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-print.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-print.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-print.el --- CL-style generic printing  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -40,6 +40,10 @@
 
 (defvar cl-print--number-table nil)
 (defvar cl-print--currently-printing nil)
+(defvar cl-print--depth nil
+  "Depth of recursion within cl-print functions.
+Compared to `print-level' to determine when to stop recursing.")
+
 
 ;;;###autoload
 (cl-defgeneric cl-print-object (object stream)
@@ -52,30 +56,50 @@
   (prin1 object stream))
 
 (cl-defmethod cl-print-object ((object cons) stream)
-  (let ((car (pop object)))
-    (if (and (memq car '(\, quote \` \,@ \,.))
-             (consp object)
-             (null (cdr object)))
-        (progn
-          (princ (if (eq car 'quote) '\' car) stream)
-          (cl-print-object (car object) stream))
-      (princ "(" stream)
-      (cl-print-object car stream)
-      (while (and (consp object)
-                  (not (if cl-print--number-table
-                           (numberp (gethash object cl-print--number-table))
-                         (memq object cl-print--currently-printing))))
-        (princ " " stream)
-        (cl-print-object (pop object) stream))
-      (when object
-        (princ " . " stream) (cl-print-object object stream))
-      (princ ")" stream))))
+  (if (and cl-print--depth (natnump print-level)
+           (> cl-print--depth print-level))
+      (princ "..." stream)
+    (let ((car (pop object))
+          (count 1))
+      (if (and print-quoted
+               (memq car '(\, quote function \` \,@ \,.))
+               (consp object)
+               (null (cdr object)))
+          (progn
+            (princ (cond
+                    ((eq car 'quote) '\')
+                    ((eq car 'function) "#'")
+                    (t car))
+                   stream)
+            (cl-print-object (car object) stream))
+        (princ "(" stream)
+        (cl-print-object car stream)
+        (while (and (consp object)
+                    (not (cond
+                          (cl-print--number-table
+                           (numberp (gethash object cl-print--number-table)))
+                          ((memq object cl-print--currently-printing))
+                          (t (push object cl-print--currently-printing)
+                             nil))))
+          (princ " " stream)
+          (if (or (not (natnump print-length)) (> print-length count))
+              (cl-print-object (pop object) stream)
+            (princ "..." stream)
+            (setq object nil))
+          (cl-incf count))
+        (when object
+          (princ " . " stream) (cl-print-object object stream))
+        (princ ")" stream)))))
 
 (cl-defmethod cl-print-object ((object vector) stream)
   (princ "[" stream)
-  (dotimes (i (length object))
-    (unless (zerop i) (princ " " stream))
-    (cl-print-object (aref object i) stream))
+  (let ((count (length object)))
+    (dotimes (i (if (natnump print-length)
+                    (min print-length count) count))
+      (unless (zerop i) (princ " " stream))
+      (cl-print-object (aref object i) stream))
+    (when (and (natnump print-length) (< print-length count))
+      (princ " ..." stream)))
   (princ "]" stream))
 
 (cl-defmethod cl-print-object ((object hash-table) stream)
@@ -177,14 +201,18 @@
 (cl-defmethod cl-print-object ((object cl-structure-object) stream)
   (princ "#s(" stream)
   (let* ((class (cl-find-class (type-of object)))
-         (slots (cl--struct-class-slots class)))
+         (slots (cl--struct-class-slots class))
+         (count (length slots)))
     (princ (cl--struct-class-name class) stream)
-    (dotimes (i (length slots))
+    (dotimes (i (if (natnump print-length)
+                    (min print-length count) count))
       (let ((slot (aref slots i)))
         (princ " :" stream)
         (princ (cl--slot-descriptor-name slot) stream)
         (princ " " stream)
-        (cl-print-object (aref object (1+ i)) stream))))
+        (cl-print-object (aref object (1+ i)) stream)))
+    (when (and (natnump print-length) (< print-length count))
+      (princ " ..." stream)))
   (princ ")" stream))
 
 ;;; Circularity and sharing.
@@ -195,26 +223,27 @@
 
 (cl-defmethod cl-print-object :around (object stream)
   ;; FIXME: Only put such an :around method on types where it's relevant.
-  (cond
-   (print-circle
-    (let ((n (gethash object cl-print--number-table)))
-      (if (not (numberp n))
-          (cl-call-next-method)
-        (if (> n 0)
-            ;; Already printed.  Just print a reference.
-            (progn (princ "#" stream) (princ n stream) (princ "#" stream))
-          (puthash object (- n) cl-print--number-table)
-          (princ "#" stream) (princ (- n) stream) (princ "=" stream)
-          (cl-call-next-method)))))
-   ((let ((already-printing (memq object cl-print--currently-printing)))
-      (when already-printing
-        ;; Currently printing, just print reference to avoid endless
-        ;; recursion.
-        (princ "#" stream)
-        (princ (length (cdr already-printing)) stream))))
-    (t (let ((cl-print--currently-printing
-              (cons object cl-print--currently-printing)))
-         (cl-call-next-method)))))
+  (let ((cl-print--depth (if cl-print--depth (1+ cl-print--depth) 1)))
+    (cond
+     (print-circle
+      (let ((n (gethash object cl-print--number-table)))
+        (if (not (numberp n))
+            (cl-call-next-method)
+          (if (> n 0)
+              ;; Already printed.  Just print a reference.
+              (progn (princ "#" stream) (princ n stream) (princ "#" stream))
+            (puthash object (- n) cl-print--number-table)
+            (princ "#" stream) (princ (- n) stream) (princ "=" stream)
+            (cl-call-next-method)))))
+     ((let ((already-printing (memq object cl-print--currently-printing)))
+        (when already-printing
+          ;; Currently printing, just print reference to avoid endless
+          ;; recursion.
+          (princ "#" stream)
+          (princ (length (cdr already-printing)) stream))))
+     (t (let ((cl-print--currently-printing
+               (cons object cl-print--currently-printing)))
+          (cl-call-next-method))))))
 
 (defvar cl-print--number-index nil)
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cl-seq.el emacs-26.3+1/lisp/emacs-lisp/cl-seq.el
--- emacs-26.1+1/lisp/emacs-lisp/cl-seq.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cl-seq.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-seq.el --- Common Lisp features, part 3  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Old-Version: 2.02
diff -Nru emacs-26.1+1/lisp/emacs-lisp/copyright.el emacs-26.3+1/lisp/emacs-lisp/copyright.el
--- emacs-26.1+1/lisp/emacs-lisp/copyright.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/copyright.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
-;; Copyright (C) 1991-1995, 1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1991-1995, 1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/crm.el emacs-26.3+1/lisp/emacs-lisp/crm.el
--- emacs-26.1+1/lisp/emacs-lisp/crm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/crm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; crm.el --- read multiple strings with completion
 
-;; Copyright (C) 1985-1986, 1993-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-2019 Free Software Foundation, Inc.
 
 ;; Author: Sen Nagata <sen@eccosys.com>
 ;; Keywords: completion, minibuffer, multiple elements
diff -Nru emacs-26.1+1/lisp/emacs-lisp/cursor-sensor.el emacs-26.3+1/lisp/emacs-lisp/cursor-sensor.el
--- emacs-26.1+1/lisp/emacs-lisp/cursor-sensor.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/cursor-sensor.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cursor-sensor.el --- React to cursor movement  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -22,17 +22,50 @@
 
 ;;; Commentary:
 
-;; This package implements the `cursor-intangible' property, which is
-;; meant to replace the old `intangible' property.  To use it, just enable the
-;; `cursor-intangible-mode', after which this package will move point away from
-;; any position that has a non-nil `cursor-intangible' property.  This is only
-;; done just before redisplay happens, contrary to the old `intangible'
-;; property which was done at a much lower level.
+;; This package implements the `cursor-intangible' and
+;; `cursor-sensor-functions' properties, which are meant to replace
+;; the old `intangible', `point-entered', and `point-left' properties.
+
+;; To use `cursor-intangible', just enable the
+;; `cursor-intangible-mode' minor mode, after which this package will
+;; move point away from any position that has a non-nil
+;; `cursor-intangible' property.  This is only done just before
+;; redisplay happens, contrary to the old `intangible' property which
+;; was done at a much lower level.
+
+;; To use `cursor-sensor-functions', enable the `cursor-sensor-mode'
+;; minor mode, after which the `cursor-sensor-functions' will be
+;; called just before redisplay happens, according to the movement of
+;; the cursor since the last redisplay.
+
+;;;; Motivation
+
+;; The old properties were very problematic in practice because they
+;; operate at a much lower level and hence affect all motion
+;; *functions* like goto-char, forward-char, ... hence breaking
+;; invariants like:
+;;
+;;    (forward-char N) == (progn (forward-char N1) (forward-char (- N N1)))
+;;    (point) == (progn (forward-char N) (forward-char -N) (point))
+;;    (+ N (point)) == (progn (forward-char N) (point))
+;;
+;; The problems would usually show up due to interaction between
+;; unrelated code working in the same buffer, where one code used those
+;; properties and the other (unknowingly) assumed those aren't used.
+;; In practice a *lot* of code assumes there's no such funny business.
+;;
+;; Worse: all(?) packages using those properties don't actually want those
+;; properties to affect motion at such a low-level, they only want to
+;; affect the overall effect of commands, but not the effect of every
+;; single point-motion that a given command happened to use internally.
 
 ;;; Code:
 
 ;;;###autoload
-(defvar cursor-sensor-inhibit nil)
+(defvar cursor-sensor-inhibit nil
+  "When non-nil, suspend `cursor-sensor-mode' and `cursor-intangible-mode'.
+By convention, this is a list of symbols where each symbol stands for the
+\"cause\" of the suspension.")
 
 (defun cursor-sensor--intangible-p (pos)
   (let ((p (get-pos-property pos 'cursor-intangible)))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/debug.el emacs-26.3+1/lisp/emacs-lisp/debug.el
--- emacs-26.1+1/lisp/emacs-lisp/debug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/debug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; debug.el --- debuggers and related commands for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1986, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -322,6 +322,7 @@
                  (backtrace-frames 'debug)))
         (print-escape-newlines t)
         (print-escape-control-characters t)
+        ;; If you increase print-level, add more depth in call_debugger.
         (print-level 8)
         (print-length 50)
         (pos (point)))
@@ -839,7 +840,7 @@
 
 When called interactively, prompt for VARIABLE in the minibuffer.
 
-This works by calling `add-variable-watch' on VARIABLE.  If you
+This works by calling `add-variable-watcher' on VARIABLE.  If you
 quit from the debugger, this will abort the change (unless the
 change is caused by the termination of a let-binding).
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/derived.el emacs-26.3+1/lisp/emacs-lisp/derived.el
--- emacs-26.1+1/lisp/emacs-lisp/derived.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/derived.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; derived.el --- allow inheritance of major modes
 ;; (formerly mode-clone.el)
 
-;; Copyright (C) 1993-1994, 1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1993-1994, 1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
diff -Nru emacs-26.1+1/lisp/emacs-lisp/disass.el emacs-26.3+1/lisp/emacs-lisp/disass.el
--- emacs-26.1+1/lisp/emacs-lisp/disass.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/disass.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; disass.el --- disassembler for compiled Emacs Lisp code  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1986, 1991, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1991, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;	Jamie Zawinski <jwz@lucid.com>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/easymenu.el emacs-26.3+1/lisp/emacs-lisp/easymenu.el
--- emacs-26.1+1/lisp/emacs-lisp/easymenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/easymenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994, 1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/easy-mmode.el emacs-26.3+1/lisp/emacs-lisp/easy-mmode.el
--- emacs-26.1+1/lisp/emacs-lisp/easy-mmode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/easy-mmode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
-;; Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -457,22 +457,26 @@
 
        ;; The function that calls TURN-ON in each buffer.
        (defun ,MODE-enable-in-buffers ()
-	 (dolist (buf ,MODE-buffers)
-	   (when (buffer-live-p buf)
-	     (with-current-buffer buf
-               (unless ,MODE-set-explicitly
-		 (unless (eq ,MODE-major-mode major-mode)
-		   (if ,mode
-		       (progn
-			 (,mode -1)
-			 (funcall #',turn-on))
-		     (funcall #',turn-on))))
-	       (setq ,MODE-major-mode major-mode)))))
+         (let ((buffers ,MODE-buffers))
+           ;; Clear MODE-buffers to avoid scanning the same list of
+           ;; buffers in recursive calls to MODE-enable-in-buffers.
+           ;; Otherwise it could lead to infinite recursion.
+           (setq ,MODE-buffers nil)
+           (dolist (buf buffers)
+             (when (buffer-live-p buf)
+               (with-current-buffer buf
+                 (unless ,MODE-set-explicitly
+                   (unless (eq ,MODE-major-mode major-mode)
+                     (if ,mode
+                         (progn
+                           (,mode -1)
+                           (funcall #',turn-on))
+                       (funcall #',turn-on))))
+                 (setq ,MODE-major-mode major-mode))))))
        (put ',MODE-enable-in-buffers 'definition-name ',global-mode)
 
        (defun ,MODE-check-buffers ()
 	 (,MODE-enable-in-buffers)
-	 (setq ,MODE-buffers nil)
 	 (remove-hook 'post-command-hook ',MODE-check-buffers))
        (put ',MODE-check-buffers 'definition-name ',global-mode)
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/edebug.el emacs-26.3+1/lisp/emacs-lisp/edebug.el
--- emacs-26.1+1/lisp/emacs-lisp/edebug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/edebug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988-1995, 1997, 1999-2018 Free Software Foundation,
+;; Copyright (C) 1988-1995, 1997, 1999-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
@@ -191,11 +191,11 @@
 
 (defcustom edebug-print-length 50
   "If non-nil, default value of `print-length' for printing results in Edebug."
-  :type 'integer
+  :type '(choice integer (const nil))
   :group 'edebug)
 (defcustom edebug-print-level 50
   "If non-nil, default value of `print-level' for printing results in Edebug."
-  :type 'integer
+  :type '(choice integer (const nil))
   :group 'edebug)
 (defcustom edebug-print-circle t
   "If non-nil, default value of `print-circle' for printing results in Edebug."
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-base.el emacs-26.3+1/lisp/emacs-lisp/eieio-base.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-base.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-base.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-base.el --- Base classes for EIEIO.  -*- lexical-binding:t -*-
 
-;;; Copyright (C) 2000-2002, 2004-2005, 2007-2018 Free Software
+;;; Copyright (C) 2000-2002, 2004-2005, 2007-2019 Free Software
 ;;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
@@ -64,10 +64,18 @@
     ;; Throw the regular signal.
     (cl-call-next-method)))
 
-(cl-defmethod clone ((obj eieio-instance-inheritor) &rest _params)
+(cl-defmethod clone ((obj eieio-instance-inheritor) &rest params)
   "Clone OBJ, initializing `:parent' to OBJ.
 All slots are unbound, except those initialized with PARAMS."
-  (let ((nobj (cl-call-next-method)))
+  ;; call next method without params as we makeunbound slots anyhow
+  (let ((nobj  (if (stringp (car params))
+                   (cl-call-next-method obj (pop params))
+                 (cl-call-next-method obj))))
+    (dolist (descriptor (eieio-class-slots (class-of nobj)))
+      (let ((slot (eieio-slot-descriptor-name descriptor)))
+        (slot-makeunbound nobj slot)))
+    (when params
+      (shared-initialize nobj params))
     (oset nobj parent-instance obj)
     nobj))
 
@@ -360,32 +368,30 @@
 		  proposed-value))))
         ;; For hash-tables and vectors, the top-level `read' will not
         ;; "look inside" member values, so we need to do that
-        ;; explicitly.
+        ;; explicitly.  Because `eieio-override-prin1' is recursive in
+        ;; the case of hash-tables and vectors, we recurse
+        ;; `eieio-persistent-validate/fix-slot-value' here as well.
         ((hash-table-p proposed-value)
          (maphash
           (lambda (key value)
-            (cond ((class-p (car-safe value))
-                   (setf (gethash key proposed-value)
-                         (eieio-persistent-convert-list-to-object
-                          value)))
-                  ((and (consp value)
-                        (eq (car value) 'quote))
-                   (setf (gethash key proposed-value)
-                         (cadr value)))))
+            (setf (gethash key proposed-value)
+                  (if (class-p (car-safe value))
+                      (eieio-persistent-convert-list-to-object
+                       value)
+                    (eieio-persistent-validate/fix-slot-value
+                     class slot value))))
           proposed-value)
          proposed-value)
 
         ((vectorp proposed-value)
          (dotimes (i (length proposed-value))
            (let ((val (aref proposed-value i)))
-            (cond ((class-p (car-safe val))
-                   (aset proposed-value i
-                         (eieio-persistent-convert-list-to-object
-                          (aref proposed-value i))))
-                  ((and (consp val)
-                        (eq (car val) 'quote))
-                   (aset proposed-value i
-                         (cadr val))))))
+             (aset proposed-value i
+                   (if (class-p (car-safe val))
+                       (eieio-persistent-convert-list-to-object
+                        val)
+                     (eieio-persistent-validate/fix-slot-value
+                      class slot val)))))
          proposed-value)
 
 	 ((stringp proposed-value)
@@ -512,16 +518,18 @@
 All slots are unbound, except those initialized with PARAMS."
   (let* ((newname (and (stringp (car params)) (pop params)))
          (nobj (apply #'cl-call-next-method obj params))
-         (nm (slot-value obj 'object-name)))
-    (eieio-oset obj 'object-name
+         (nm (slot-value nobj 'object-name)))
+    (eieio-oset nobj 'object-name
                 (or newname
-                    (save-match-data
-                      (if (and nm (string-match "-\\([0-9]+\\)" nm))
-                          (let ((num (1+ (string-to-number
-                                          (match-string 1 nm)))))
-                            (concat (substring nm 0 (match-beginning 0))
-                                    "-" (int-to-string num)))
-                        (concat nm "-1")))))
+                    (if (equal nm (slot-value obj 'object-name))
+                        (save-match-data
+                          (if (and nm (string-match "-\\([0-9]+\\)" nm))
+                              (let ((num (1+ (string-to-number
+                                              (match-string 1 nm)))))
+                                (concat (substring nm 0 (match-beginning 0))
+                                        "-" (int-to-string num)))
+                            (concat nm "-1")))
+                      nm)))
     nobj))
 
 (cl-defmethod make-instance ((class (subclass eieio-named)) &rest args)
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-compat.el emacs-26.3+1/lisp/emacs-lisp/eieio-compat.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-compat.el --- Compatibility with Older EIEIO versions  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1995-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: OO, lisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-core.el emacs-26.3+1/lisp/emacs-lisp/eieio-core.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-core.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-core.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-core.el --- Core implementation for eieio  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1995-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 1.4
@@ -117,9 +117,6 @@
 (defsubst eieio--object-class-tag (obj)
   (aref obj 0))
 
-(defsubst eieio--object-class (obj)
-  (eieio--object-class-tag obj))
-
 
 ;;; Important macros used internally in eieio.
 
@@ -132,6 +129,12 @@
       (or (cl--find-class class) class)
     class))
 
+(defsubst eieio--object-class (obj)
+  (let ((tag (eieio--object-class-tag obj)))
+    (if eieio-backward-compatibility
+        (eieio--class-object tag)
+      tag)))
+
 (defun class-p (x)
   "Return non-nil if X is a valid class vector.
 X can also be is a symbol."
@@ -163,7 +166,7 @@
 (defun eieio-object-p (obj)
   "Return non-nil if OBJ is an EIEIO object."
   (and (recordp obj)
-       (eieio--class-p (eieio--object-class-tag obj))))
+       (eieio--class-p (eieio--object-class obj))))
 
 (define-obsolete-function-alias 'object-p 'eieio-object-p "25.1")
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-custom.el emacs-26.3+1/lisp/emacs-lisp/eieio-custom.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-custom.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-custom.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-custom.el -- eieio object customization  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2001, 2005, 2007-2018 Free Software Foundation,
+;; Copyright (C) 1999-2001, 2005, 2007-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-datadebug.el emacs-26.3+1/lisp/emacs-lisp/eieio-datadebug.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-datadebug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-datadebug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-datadebug.el --- EIEIO extensions to the data debugger.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: OO, lisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio.el emacs-26.3+1/lisp/emacs-lisp/eieio.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects  -*- lexical-binding:t -*-
 ;;;              or maybe Eric's Implementation of Emacs Interpreted Objects
 
-;; Copyright (C) 1995-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 1.4
@@ -346,10 +346,10 @@
                  index))))
 
 (pcase-defmacro eieio (&rest fields)
-  "Pcase patterns to match EIEIO objects.
-Elements of FIELDS can be of the form (NAME PAT) in which case the contents of
-field NAME is matched against PAT, or they can be of the form NAME which
-is a shorthand for (NAME NAME)."
+  "Pcase patterns that match EIEIO object EXPVAL.
+Elements of FIELDS can be of the form (NAME PAT) in which case the
+contents of field NAME is matched against PAT, or they can be of
+ the form NAME which is a shorthand for (NAME NAME)."
   (declare (debug (&rest [&or (sexp pcase-PAT) sexp])))
   (let ((is (make-symbol "table")))
     ;; FIXME: This generates a horrendous mess of redundant let bindings.
@@ -710,6 +710,9 @@
     ;; Call the initialize method on the new object with the slots
     ;; that were passed down to us.
     (initialize-instance new-object slots)
+    (when eieio-backward-compatibility
+      ;; Use symbol as type descriptor, for backwards compatibility.
+      (aset new-object 0 class))
     ;; Return the created object.
     new-object))
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-opt.el emacs-26.3+1/lisp/emacs-lisp/eieio-opt.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-opt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-opt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar)
 
-;; Copyright (C) 1996, 1998-2003, 2005, 2008-2018 Free Software
+;; Copyright (C) 1996, 1998-2003, 2005, 2008-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eieio-speedbar.el emacs-26.3+1/lisp/emacs-lisp/eieio-speedbar.el
--- emacs-26.1+1/lisp/emacs-lisp/eieio-speedbar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eieio-speedbar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-speedbar.el -- Classes for managing speedbar displays.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2002, 2005, 2007-2018 Free Software Foundation,
+;; Copyright (C) 1999-2002, 2005, 2007-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/eldoc.el emacs-26.3+1/lisp/emacs-lisp/eldoc.el
--- emacs-26.1+1/lisp/emacs-lisp/eldoc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/eldoc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eldoc.el --- Show function arglist or variable docstring in echo area  -*- lexical-binding:t; -*-
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
 ;; Maintainer: friedman@splode.com
diff -Nru emacs-26.1+1/lisp/emacs-lisp/elint.el emacs-26.3+1/lisp/emacs-lisp/elint.el
--- emacs-26.1+1/lisp/emacs-lisp/elint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/elint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elint.el --- Lint Emacs Lisp -*- lexical-binding: t -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter Liljenberg <petli@lysator.liu.se>
 ;; Created: May 1997
diff -Nru emacs-26.1+1/lisp/emacs-lisp/elp.el emacs-26.3+1/lisp/emacs-lisp/elp.el
--- emacs-26.1+1/lisp/emacs-lisp/elp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/elp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elp.el --- Emacs Lisp Profiler  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-1995, 1997-1998, 2001-2018 Free Software
+;; Copyright (C) 1994-1995, 1997-1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Barry A. Warsaw
diff -Nru emacs-26.1+1/lisp/emacs-lisp/ert.el emacs-26.3+1/lisp/emacs-lisp/ert.el
--- emacs-26.1+1/lisp/emacs-lisp/ert.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/ert.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ert.el --- Emacs Lisp Regression Testing  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Christian Ohler <ohler@gnu.org>
 ;; Keywords: lisp, tools
diff -Nru emacs-26.1+1/lisp/emacs-lisp/ert-x.el emacs-26.3+1/lisp/emacs-lisp/ert-x.el
--- emacs-26.1+1/lisp/emacs-lisp/ert-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/ert-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ert-x.el --- Staging area for experimental extensions to ERT  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008, 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;;         Christian Ohler <ohler@gnu.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/ewoc.el emacs-26.3+1/lisp/emacs-lisp/ewoc.el
--- emacs-26.1+1/lisp/emacs-lisp/ewoc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/ewoc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;	Inge Wallin <inge@lysator.liu.se>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/find-func.el emacs-26.3+1/lisp/emacs-lisp/find-func.el
--- emacs-26.1+1/lisp/emacs-lisp/find-func.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/find-func.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; find-func.el --- find the definition of the Emacs Lisp function near point  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
 ;; Maintainer: petersen@kurims.kyoto-u.ac.jp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/float-sup.el emacs-26.3+1/lisp/emacs-lisp/float-sup.el
--- emacs-26.1+1/lisp/emacs-lisp/float-sup.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/float-sup.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; float-sup.el --- define some constants useful for floating point numbers.
 
-;; Copyright (C) 1985-1987, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/emacs-lisp/generator.el emacs-26.3+1/lisp/emacs-lisp/generator.el
--- emacs-26.1+1/lisp/emacs-lisp/generator.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/generator.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; generator.el --- generators  -*- lexical-binding: t -*-
 
-;;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Colascione <dancol@dancol.org>
 ;; Keywords: extensions, elisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/generic.el emacs-26.3+1/lisp/emacs-lisp/generic.el
--- emacs-26.1+1/lisp/emacs-lisp/generic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/generic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; generic.el --- defining simple major modes with comment and font-lock
 ;;
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Fri Sep 27 1996
diff -Nru emacs-26.1+1/lisp/emacs-lisp/gv.el emacs-26.3+1/lisp/emacs-lisp/gv.el
--- emacs-26.1+1/lisp/emacs-lisp/gv.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/gv.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gv.el --- generalized variables  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: extensions
diff -Nru emacs-26.1+1/lisp/emacs-lisp/helper.el emacs-26.3+1/lisp/emacs-lisp/helper.el
--- emacs-26.1+1/lisp/emacs-lisp/helper.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/helper.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/emacs-lisp/inline.el emacs-26.3+1/lisp/emacs-lisp/inline.el
--- emacs-26.1+1/lisp/emacs-lisp/inline.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/inline.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; inline.el --- Define functions by their inliner  -*- lexical-binding:t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
diff -Nru emacs-26.1+1/lisp/emacs-lisp/let-alist.el emacs-26.3+1/lisp/emacs-lisp/let-alist.el
--- emacs-26.1+1/lisp/emacs-lisp/let-alist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/let-alist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; let-alist.el --- Easily let-bind values of an assoc-list by their names -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
 ;; Package-Requires: ((emacs "24.1"))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/lisp.el emacs-26.3+1/lisp/emacs-lisp/lisp.el
--- emacs-26.1+1/lisp/emacs-lisp/lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lisp.el --- Lisp editing commands for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1994, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1985-1986, 1994, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/emacs-lisp/lisp-mnt.el emacs-26.3+1/lisp/emacs-lisp/lisp-mnt.el
--- emacs-26.1+1/lisp/emacs-lisp/lisp-mnt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/lisp-mnt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
 
-;; Copyright (C) 1992, 1994, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/lisp-mode.el emacs-26.3+1/lisp/emacs-lisp/lisp-mode.el
--- emacs-26.1+1/lisp/emacs-lisp/lisp-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/lisp-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, languages
@@ -810,7 +810,7 @@
                (setq last-sexp (nth 2 ppss)))
              (setq depth (car ppss))
              ;; Skip over newlines within strings.
-             (nth 3 ppss))
+             (and (not (eobp)) (nth 3 ppss)))
       (let ((string-start (nth 8 ppss)))
         (setq ppss (parse-partial-sexp (point) (point-max)
                                        nil nil ppss 'syntax-table))
@@ -826,13 +826,22 @@
                                        indent-stack)))))
     (prog1
         (let (indent)
-          (cond ((= (forward-line 1) 1) nil)
+          (cond ((= (forward-line 1) 1)
+                 ;; Can't move to the next line, apparently end of buffer.
+                 nil)
+                ((null indent-stack)
+                 ;; Negative depth, probably some kind of syntax
+                 ;; error.  Reset the state.
+                 (setq ppss (parse-partial-sexp (point) (point))))
                 ((car indent-stack))
                 ((integerp (setq indent (calculate-lisp-indent ppss)))
                  (setf (car indent-stack) indent))
                 ((consp indent)       ; (COLUMN CONTAINING-SEXP-START)
                  (car indent))
-                ;; This only happens if we're in a string.
+                ;; This only happens if we're in a string, but the
+                ;; loop should always skip over strings (unless we hit
+                ;; end of buffer, which is taken care of by the first
+                ;; clause).
                 (t (error "This shouldn't happen"))))
       (setf (lisp-indent-state-stack state) indent-stack)
       (setf (lisp-indent-state-ppss-point state) ppss-point)
@@ -867,7 +876,9 @@
   (interactive)
   (let ((pos (- (point-max) (point)))
         (indent (progn (beginning-of-line)
-                       (or indent (calculate-lisp-indent (lisp-ppss))))))
+                       (or indent (calculate-lisp-indent (lisp-ppss)))))
+	(shift-amt nil)
+	(beg (progn (beginning-of-line) (point))))
     (skip-chars-forward " \t")
     (if (or (null indent) (looking-at "\\s<\\s<\\s<"))
 	;; Don't alter indentation of a ;;; comment line
@@ -879,7 +890,11 @@
 	  ;; as comment lines, not as code.
 	  (progn (indent-for-comment) (forward-char -1))
 	(if (listp indent) (setq indent (car indent)))
-        (indent-line-to indent))
+	(setq shift-amt (- indent (current-column)))
+	(if (zerop shift-amt)
+	    nil
+	  (delete-region beg (point))
+	  (indent-to indent)))
       ;; If initial point was within line's indentation,
       ;; position after the indentation.  Else stay at same point in text.
       (if (> (- (point-max) pos) (point))
@@ -1194,7 +1209,27 @@
                   (if endpos endpos
                     ;; Get error now if we don't have a complete sexp
                     ;; after point.
-                    (save-excursion (forward-sexp 1) (point)))))
+                    (save-excursion
+                      (forward-sexp 1)
+                      (let ((eol (line-end-position)))
+                        ;; We actually look for a sexp which ends
+                        ;; after the current line so that we properly
+                        ;; indent things like #s(...).  This might not
+                        ;; be needed if Bug#15998 is fixed.
+                        (when (and (< (point) eol)
+                                   ;; Check if eol is within a sexp.
+                                   (> (nth 0 (save-excursion
+                                               (parse-partial-sexp
+                                                (point) eol)))
+                                      0))
+                          (condition-case ()
+                              (while (< (point) eol)
+                                (forward-sexp 1))
+                            ;; But don't signal an error for incomplete
+                            ;; sexps following the first complete sexp
+                            ;; after point.
+                            (scan-error nil))))
+                      (point)))))
     (save-excursion
       (while (let ((indent (lisp-indent-calc-next parse-state))
                    (ppss (lisp-indent-state-ppss parse-state)))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/macroexp.el emacs-26.3+1/lisp/emacs-lisp/macroexp.el
--- emacs-26.1+1/lisp/emacs-lisp/macroexp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/macroexp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: lisp, compiler, macros
diff -Nru emacs-26.1+1/lisp/emacs-lisp/map.el emacs-26.3+1/lisp/emacs-lisp/map.el
--- emacs-26.1+1/lisp/emacs-lisp/map.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/map.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; map.el --- Map manipulation functions  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Keywords: convenience, map, hash-table, alist, array
diff -Nru emacs-26.1+1/lisp/emacs-lisp/map-ynp.el emacs-26.3+1/lisp/emacs-lisp/map-ynp.el
--- emacs-26.1+1/lisp/emacs-lisp/map-ynp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/map-ynp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; map-ynp.el --- general-purpose boolean question-asker  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -79,6 +79,7 @@
 
 Returns the number of actions taken."
   (let* ((actions 0)
+         (msg (current-message))
 	 user-keys mouse-event map prompt char elt def
 	 ;; Non-nil means we should use mouse menus to ask.
 	 use-menus
@@ -250,10 +251,141 @@
       (if delayed-switch-frame
 	  (setq unread-command-events
 		(cons delayed-switch-frame unread-command-events))))
-    ;; Clear the last prompt from the minibuffer.
+    ;; Clear the last prompt from the minibuffer, and restore the
+    ;; previous echo-area message, if any.
     (let ((message-log-max nil))
-      (message ""))
+      (if msg
+          (message "%s" msg)
+        (message "")))
     ;; Return the number of actions that were taken.
     actions))
 
+
+;; read-answer is a general-purpose question-asker that supports
+;; either long or short answers.
+
+;; For backward compatibility check if short y/n answers are preferred.
+(defcustom read-answer-short 'auto
+  "If non-nil, `read-answer' accepts single-character answers.
+If t, accept short (single key-press) answers to the question.
+If nil, require long answers.  If `auto', accept short answers if
+the function cell of `yes-or-no-p' is set to `y-or-n-p'."
+  :type '(choice (const :tag "Accept short answers" t)
+                 (const :tag "Require long answer" nil)
+                 (const :tag "Guess preference" auto))
+  :version "26.2"
+  :group 'minibuffer)
+
+(defconst read-answer-map--memoize (make-hash-table :weakness 'key :test 'equal))
+
+(defun read-answer (question answers)
+  "Read an answer either as a complete word or its character abbreviation.
+Ask user a question and accept an answer from the list of possible answers.
+
+QUESTION should end in a space; this function adds a list of answers to it.
+
+ANSWERS is an alist with elements in the following format:
+  (LONG-ANSWER SHORT-ANSWER HELP-MESSAGE)
+where
+  LONG-ANSWER is a complete answer,
+  SHORT-ANSWER is an abbreviated one-character answer,
+  HELP-MESSAGE is a string describing the meaning of the answer.
+
+Example:
+  \\='((\"yes\"  ?y \"perform the action\")
+    (\"no\"   ?n \"skip to the next\")
+    (\"all\"  ?! \"accept all remaining without more questions\")
+    (\"help\" ?h \"show help\")
+    (\"quit\" ?q \"exit\"))
+
+When `read-answer-short' is non-nil, accept short answers.
+
+Return a long answer even in case of accepting short ones.
+
+When `use-dialog-box' is t, pop up a dialog window to get user input."
+  (let* ((short (if (eq read-answer-short 'auto)
+                    (eq (symbol-function 'yes-or-no-p) 'y-or-n-p)
+                  read-answer-short))
+         (answers-with-help
+          (if (assoc "help" answers)
+              answers
+            (append answers '(("help" ?? "show this help message")))))
+         (answers-without-help
+          (assoc-delete-all "help" (copy-alist answers-with-help)))
+         (prompt
+          (format "%s(%s) " question
+                  (mapconcat (lambda (a)
+                               (if short
+                                   (format "%c" (nth 1 a))
+                                 (nth 0 a)))
+                             answers-with-help ", ")))
+         (message
+          (format "Please answer %s."
+                  (mapconcat (lambda (a)
+                               (format "`%s'" (if short
+                                                  (string (nth 1 a))
+                                                (nth 0 a))))
+                             answers-with-help " or ")))
+         (short-answer-map
+          (when short
+            (or (gethash answers read-answer-map--memoize)
+                (puthash answers
+                         (let ((map (make-sparse-keymap)))
+                           (set-keymap-parent map minibuffer-local-map)
+                           (dolist (a answers-with-help)
+                             (define-key map (vector (nth 1 a))
+                               (lambda ()
+                                 (interactive)
+                                 (delete-minibuffer-contents)
+                                 (insert (nth 0 a))
+                                 (exit-minibuffer))))
+                           (define-key map [remap self-insert-command]
+                             (lambda ()
+                               (interactive)
+                               (delete-minibuffer-contents)
+                               (beep)
+                               (message message)
+                               (sleep-for 2)))
+                           map)
+                         read-answer-map--memoize))))
+         answer)
+    (while (not (assoc (setq answer (downcase
+                                     (cond
+                                      ((and (display-popup-menus-p)
+                                            last-input-event ; not during startup
+                                            (listp last-nonmenu-event)
+                                            use-dialog-box)
+                                       (x-popup-dialog
+                                        t
+                                        (cons question
+                                              (mapcar (lambda (a)
+                                                        (cons (capitalize (nth 0 a))
+                                                              (nth 0 a)))
+                                                      answers-with-help))))
+                                      (short
+                                       (read-from-minibuffer
+                                        prompt nil short-answer-map nil
+                                        'yes-or-no-p-history))
+                                      (t
+                                       (read-from-minibuffer
+                                        prompt nil nil nil
+                                        'yes-or-no-p-history)))))
+                       answers-without-help))
+      (if (string= answer "help")
+          (with-help-window "*Help*"
+            (with-current-buffer "*Help*"
+              (insert "Type:\n"
+                      (mapconcat
+                       (lambda (a)
+                         (format "`%s'%s to %s"
+                                 (if short (string (nth 1 a)) (nth 0 a))
+                                 (if short (format " (%s)" (nth 0 a)) "")
+                                 (nth 2 a)))
+                       answers-with-help ",\n")
+                      ".\n")))
+        (beep)
+        (message message)
+        (sleep-for 2)))
+    answer))
+
 ;;; map-ynp.el ends here
diff -Nru emacs-26.1+1/lisp/emacs-lisp/nadvice.el emacs-26.3+1/lisp/emacs-lisp/nadvice.el
--- emacs-26.1+1/lisp/emacs-lisp/nadvice.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/nadvice.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nadvice.el --- Light-weight advice primitives for Elisp functions  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: extensions, lisp, tools
diff -Nru emacs-26.1+1/lisp/emacs-lisp/package.el emacs-26.3+1/lisp/emacs-lisp/package.el
--- emacs-26.1+1/lisp/emacs-lisp/package.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/package.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; package.el --- Simple package system for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;;         Daniel Hackney <dan@haxney.org>
@@ -534,8 +534,8 @@
 (defvar package-alist nil
   "Alist of all packages available for activation.
 Each element has the form (PKG . DESCS), where PKG is a package
-name (a symbol) and DESCS is a non-empty list of `package-desc' structure,
-sorted by decreasing versions.
+name (a symbol) and DESCS is a non-empty list of `package-desc'
+structures, sorted by decreasing versions.
 
 This variable is set automatically by `package-load-descriptor',
 called via `package-initialize'.  To change which packages are
@@ -1241,6 +1241,17 @@
         (signal 'bad-signature (list sig-file)))
       good-signatures)))
 
+(defun package--buffer-string ()
+  (let ((string (buffer-string)))
+    (when (and buffer-file-coding-system
+               (> (length string) 0))
+      (put-text-property 0 1 'package--cs buffer-file-coding-system string))
+    string))
+
+(defun package--cs (string)
+  (and (> (length string) 0)
+       (get-text-property 0 'package--cs string)))
+
 (defun package--check-signature (location file &optional string async callback unwind)
   "Check signature of the current buffer.
 Download the signature file from LOCATION by appending \".sig\"
@@ -1260,8 +1271,12 @@
 
 UNWIND, if provided, is a function to be called after everything
 else, even if an error is signaled."
-  (let ((sig-file (concat file ".sig"))
-        (string (or string (buffer-string))))
+  (let* ((sig-file (concat file ".sig"))
+         (string (or string (package--buffer-string)))
+         (cs (package--cs string)))
+    ;; Re-encode the downloaded file with the coding-system with which
+    ;; it was decoded, so we (hopefully) get the exact same bytes back.
+    (when cs (setq string (encode-coding-string string cs)))
     (package--with-response-buffer location :file sig-file
       :async async :noerror t
       ;; Connection error is assumed to mean "no sig-file".
@@ -1529,23 +1544,26 @@
     :error-form (package--update-downloads-in-progress archive)
     (let* ((location (cdr archive))
            (name (car archive))
-           (content (buffer-string))
+           (content (package--buffer-string))
            (dir (expand-file-name (format "archives/%s" name) package-user-dir))
            (local-file (expand-file-name file dir)))
-      (when (listp (read-from-string content))
+      (when (listp (read content))
         (make-directory dir t)
         (if (or (not package-check-signature)
                 (member name package-unsigned-archives))
             ;; If we don't care about the signature, save the file and
             ;; we're done.
-            (progn (write-region content nil local-file nil 'silent)
+            (progn (let ((coding-system-for-write
+                          (or (package--cs content) 'utf-8)))
+                     (write-region content nil local-file nil 'silent))
                    (package--update-downloads-in-progress archive))
           ;; If we care, check it (perhaps async) and *then* write the file.
           (package--check-signature
            location file content async
            ;; This function will be called after signature checking.
            (lambda (&optional good-sigs)
-             (write-region content nil local-file nil 'silent)
+             (let ((coding-system-for-write (or (package--cs content) 'utf-8)))
+               (write-region content nil local-file nil 'silent))
              ;; Write out good signatures into archive-contents.signed file.
              (when good-sigs
                (write-region (mapconcat #'epg-signature-to-string good-sigs "\n")
@@ -1730,6 +1748,15 @@
       (indirect indirect-deps)
       (t        (delete-dups (append direct-deps indirect-deps))))))
 
+(defun package--user-installed-p (package)
+  "Return non-nil if PACKAGE is a user-installed package.
+PACKAGE is the package name, a symbol.  Check whether the package
+was installed into `package-user-dir' where we assume to have
+control over."
+  (let* ((pkg-desc (cadr (assq package package-alist)))
+         (dir (package-desc-dir pkg-desc)))
+    (file-in-directory-p dir package-user-dir)))
+
 (defun package--removable-packages ()
   "Return a list of names of packages no longer needed.
 These are packages which are neither contained in
@@ -1739,7 +1766,9 @@
                          ;; `p' and its dependencies are needed.
                          append (cons p (package--get-deps p)))))
     (cl-loop for p in (mapcar #'car package-alist)
-             unless (memq p needed)
+             unless (or (memq p needed)
+                        ;; Do not auto-remove external packages.
+                        (not (package--user-installed-p p)))
              collect p)))
 
 (defun package--used-elsewhere-p (pkg-desc &optional pkg-list all)
@@ -1825,15 +1854,17 @@
           (let ((save-silently t))
             (package-unpack pkg-desc))
         ;; If we care, check it and *then* write the file.
-        (let ((content (buffer-string)))
+        (let ((content (package--buffer-string)))
           (package--check-signature
            location file content nil
            ;; This function will be called after signature checking.
            (lambda (&optional good-sigs)
              ;; Signature checked, unpack now.
-             (with-temp-buffer (insert content)
-                               (let ((save-silently t))
-                                 (package-unpack pkg-desc)))
+             (with-temp-buffer
+               (insert content)
+               (setq buffer-file-coding-system (package--cs content))
+               (let ((save-silently t))
+                 (package-unpack pkg-desc)))
              ;; Here the package has been installed successfully, mark it as
              ;; signed if appropriate.
              (when good-sigs
@@ -3414,6 +3445,9 @@
   ;; Generate the Package Menu.
   (let ((buf (get-buffer-create "*Packages*")))
     (with-current-buffer buf
+      ;; Since some packages have their descriptions include non-ASCII
+      ;; characters...
+      (setq buffer-file-coding-system 'utf-8)
       (package-menu-mode)
 
       ;; Fetch the remote list of packages.
diff -Nru emacs-26.1+1/lisp/emacs-lisp/package-x.el emacs-26.3+1/lisp/emacs-lisp/package-x.el
--- emacs-26.1+1/lisp/emacs-lisp/package-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/package-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; package-x.el --- Package extras
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Created: 10 Mar 2007
@@ -47,6 +47,8 @@
 
 (defcustom package-archive-upload-base "/path/to/archive"
   "The base location of the archive to which packages are uploaded.
+The commands in the package-x library will use this as base
+location.
 This should be an absolute directory name.  If the archive is on
 another machine, you may specify a remote name in the usual way,
 e.g. \"/ssh:foo@example.com:/var/www/packages/\".
@@ -273,7 +275,9 @@
 (defun package-upload-buffer ()
   "Upload the current buffer as a single-file Emacs Lisp package.
 If `package-archive-upload-base' does not specify a valid upload
-destination, prompt for one."
+destination, prompt for one.
+Signal an error if the current buffer is not visiting a simple
+package (a \".el\" file)."
   (interactive)
   (save-excursion
     (save-restriction
@@ -286,8 +290,13 @@
 Interactively, prompt for FILE.  The package is considered a
 single-file package if FILE ends in \".el\", and a multi-file
 package if FILE ends in \".tar\".
+Automatically extract package attributes and update the archive's
+contents list with this information.
 If `package-archive-upload-base' does not specify a valid upload
-destination, prompt for one."
+destination, prompt for one.  If the directory does not exist, it
+is created.  The directory need not have any initial contents
+\(i.e., you can use this command to populate an initially empty
+archive)."
   (interactive "fPackage file name: ")
   (with-temp-buffer
     (insert-file-contents file)
diff -Nru emacs-26.1+1/lisp/emacs-lisp/pcase.el emacs-26.3+1/lisp/emacs-lisp/pcase.el
--- emacs-26.1+1/lisp/emacs-lisp/pcase.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/pcase.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -108,58 +108,43 @@
 
 ;;;###autoload
 (defmacro pcase (exp &rest cases)
-  "Evaluate EXP and attempt to match it against structural patterns.
+  "Evaluate EXP to get EXPVAL; try passing control to one of CASES.
 CASES is a list of elements of the form (PATTERN CODE...).
+For the first CASE whose PATTERN \"matches\" EXPVAL,
+evaluate its CODE..., and return the value of the last form.
+If no CASE has a PATTERN that matches, return nil.
+
+Each PATTERN expands, in essence, to a predicate to call
+on EXPVAL.  When the return value of that call is non-nil,
+PATTERN matches.  PATTERN can take one of the forms:
+
+  _                matches anything.
+  \\='VAL             matches if EXPVAL is `equal' to VAL.
+  KEYWORD          shorthand for \\='KEYWORD
+  INTEGER          shorthand for \\='INTEGER
+  STRING           shorthand for \\='STRING
+  SYMBOL           matches anything and binds it to SYMBOL.
+                   If a SYMBOL is used twice in the same pattern
+                   the second occurrence becomes an `eq'uality test.
+  (pred FUN)       matches if FUN called on EXPVAL returns non-nil.
+  (app FUN PAT)    matches if FUN called on EXPVAL matches PAT.
+  (guard BOOLEXP)  matches if BOOLEXP evaluates to non-nil.
+  (let PAT EXPR)   matches if EXPR matches PAT.
+  (and PAT...)     matches if all the patterns match.
+  (or PAT...)      matches if any of the patterns matches.
+
+FUN in `pred' and `app' can take one of the forms:
+  SYMBOL  or  (lambda ARGS BODY)
+     call it with one argument
+  (F ARG1 .. ARGn)
+     call F with ARG1..ARGn and EXPVAL as n+1'th argument
 
-A structural PATTERN describes a template that identifies a class
-of values.  For example, the pattern \\=`(,foo ,bar) matches any
-two element list, binding its elements to symbols named `foo' and
-`bar' -- in much the same way that `cl-destructuring-bind' would.
-
-A significant difference from `cl-destructuring-bind' is that, if
-a pattern match fails, the next case is tried until either a
-successful match is found or there are no more cases.  The CODE
-expression corresponding to the matching pattern determines the
-return value.  If there is no match the returned value is nil.
-
-Another difference is that pattern elements may be quoted,
-meaning they must match exactly: The pattern \\='(foo bar)
-matches only against two element lists containing the symbols
-`foo' and `bar' in that order.  (As a short-hand, atoms always
-match themselves, such as numbers or strings, and need not be
-quoted.)
-
-Lastly, a pattern can be logical, such as (pred numberp), that
-matches any number-like element; or the symbol `_', that matches
-anything.  Also, when patterns are backquoted, a comma may be
-used to introduce logical patterns inside backquoted patterns.
-
-The complete list of standard patterns is as follows:
-
-  _		matches anything.
-  SYMBOL	matches anything and binds it to SYMBOL.
-                If a SYMBOL is used twice in the same pattern
-                the second occurrence becomes an `eq'uality test.
-  (or PAT...)	matches if any of the patterns matches.
-  (and PAT...)	matches if all the patterns match.
-  \\='VAL		matches if the object is `equal' to VAL.
-  ATOM		is a shorthand for \\='ATOM.
-		   ATOM can be a keyword, an integer, or a string.
-  (pred FUN)	matches if FUN applied to the object returns non-nil.
-  (guard BOOLEXP)	matches if BOOLEXP evaluates to non-nil.
-  (let PAT EXP)	matches if EXP matches PAT.
-  (app FUN PAT)	matches if FUN applied to the object matches PAT.
+FUN, BOOLEXP, EXPR, and subsequent PAT can refer to variables
+bound earlier in the pattern by a SYMBOL pattern.
 
 Additional patterns can be defined using `pcase-defmacro'.
 
-The FUN argument in the `app' pattern may have the following forms:
-  SYMBOL or (lambda ARGS BODY)  in which case it's called with one argument.
-  (F ARG1 .. ARGn) in which case F gets called with an n+1'th argument
-                        which is the value being matched.
-So a FUN of the form SYMBOL is equivalent to (FUN).
-FUN can refer to variables bound earlier in the pattern.
-
-See Info node `(elisp) Pattern matching case statement' in the
+See Info node `(elisp) Pattern-Matching Conditional' in the
 Emacs Lisp manual for more information and examples."
   (declare (indent 1) (debug (form &rest (pcase-PAT body))))
   ;; We want to use a weak hash table as a cache, but the key will unavoidably
@@ -199,15 +184,30 @@
     (require 'help-fns)
     (with-temp-buffer
       (insert (or (cdr ud) main))
-      (mapatoms
-       (lambda (symbol)
-         (let ((me (get symbol 'pcase-macroexpander)))
-           (when me
-             (insert "\n\n-- ")
-             (let* ((doc (documentation me 'raw)))
-               (setq doc (help-fns--signature symbol doc me
-                                              (indirect-function me) nil))
-               (insert "\n" (or doc "Not documented.")))))))
+      ;; Presentation Note: For conceptual continuity, we guarantee
+      ;; that backquote doc immediately follows main pcase doc.
+      ;; (The order of the other extensions is unimportant.)
+      (let (more)
+        ;; Collect all the extensions.
+        (mapatoms (lambda (symbol)
+                    (let ((me (get symbol 'pcase-macroexpander)))
+                      (when me
+                        (push (cons symbol me)
+                              more)))))
+        ;; Ensure backquote is first.
+        (let ((x (assq '\` more)))
+          (setq more (cons x (delq x more))))
+        ;; Do the output.
+        (while more
+          (let* ((pair (pop more))
+                 (symbol (car pair))
+                 (me (cdr pair))
+                 (doc (documentation me 'raw)))
+            (insert "\n\n-- ")
+            (setq doc (help-fns--signature symbol doc me
+                                           (indirect-function me)
+                                           nil))
+            (insert "\n" (or doc "Not documented.")))))
       (let ((combined-doc (buffer-string)))
         (if ud (help-add-fundoc-usage combined-doc (car ud)) combined-doc)))))
 
@@ -264,9 +264,14 @@
 
 ;;;###autoload
 (defmacro pcase-let* (bindings &rest body)
-  "Like `let*' but where you can use `pcase' patterns for bindings.
-BODY should be an expression, and BINDINGS should be a list of bindings
-of the form (PAT EXP)."
+  "Like `let*', but supports destructuring BINDINGS using `pcase' patterns.
+As with `pcase-let', BINDINGS are of the form (PATTERN EXP), but the
+EXP in each binding in BINDINGS can use the results of the destructuring
+bindings that precede it in BINDINGS' order.
+
+Each EXP should match (i.e. be of compatible structure) to its
+respective PATTERN; a mismatch may signal an error or may go
+undetected, binding variables to arbitrary values, such as nil."
   (declare (indent 1)
            (debug ((&rest (pcase-PAT &optional form)) body)))
   (let ((cached (gethash bindings pcase--memoize)))
@@ -279,12 +284,16 @@
 
 ;;;###autoload
 (defmacro pcase-let (bindings &rest body)
-  "Like `let' but where you can use `pcase' patterns for bindings.
-BODY should be a list of expressions, and BINDINGS should be a list of bindings
-of the form (PAT EXP).
-The macro is expanded and optimized under the assumption that those
-patterns *will* match, so a mismatch may go undetected or may cause
-any kind of error."
+  "Like `let', but supports destructuring BINDINGS using `pcase' patterns.
+BODY should be a list of expressions, and BINDINGS should be a list of
+bindings of the form (PATTERN EXP).
+All EXPs are evaluated first, and then used to perform destructuring
+bindings by matching each EXP against its respective PATTERN.  Then
+BODY is evaluated with those bindings in effect.
+
+Each EXP should match (i.e. be of compatible structure) to its
+respective PATTERN; a mismatch may signal an error or may go
+undetected, binding variables to arbitrary values, such as nil."
   (declare (indent 1) (debug pcase-let*))
   (if (null (cdr bindings))
       `(pcase-let* ,bindings ,@body)
@@ -302,7 +311,15 @@
 
 ;;;###autoload
 (defmacro pcase-dolist (spec &rest body)
-  "Like `dolist' but where the binding can be a `pcase' pattern.
+  "Eval BODY once for each set of bindings defined by PATTERN and LIST elements.
+PATTERN should be a `pcase' pattern describing the structure of
+LIST elements, and LIST is a list of objects that match PATTERN,
+i.e. have a structure that is compatible with PATTERN.
+For each element of LIST, this macro binds the variables in
+PATTERN to the corresponding subfields of the LIST element, and
+then evaluates BODY with these bindings in effect.  The
+destructuring bindings of variables in PATTERN to the subfields
+of the elements of LIST is performed as if by `pcase-let'.
 \n(fn (PATTERN LIST) BODY...)"
   (declare (indent 1) (debug ((pcase-PAT form) body)))
   (if (pcase--trivial-upat-p (car spec))
@@ -412,7 +429,11 @@
 (defmacro pcase-defmacro (name args &rest body)
   "Define a new kind of pcase PATTERN, by macro expansion.
 Patterns of the form (NAME ...) will be expanded according
-to this macro."
+to this macro.
+
+By convention, DOC should use \"EXPVAL\" to stand
+for the result of evaluating EXP (first arg to `pcase').
+\n(fn NAME ARGS [DOC] &rest BODY...)"
   (declare (indent 2) (debug defun) (doc-string 3))
   ;; Add the function via `fsym', so that an autoload cookie placed
   ;; on a pcase-defmacro will cause the macro to be loaded on demand.
@@ -907,14 +928,29 @@
        sexp))
 
 (pcase-defmacro \` (qpat)
-  "Backquote-style pcase patterns.
+  "Backquote-style pcase patterns: \\=`QPAT
 QPAT can take the following forms:
   (QPAT1 . QPAT2)       matches if QPAT1 matches the car and QPAT2 the cdr.
   [QPAT1 QPAT2..QPATn]  matches a vector of length n and QPAT1..QPATn match
                            its 0..(n-1)th elements, respectively.
-  ,PAT                  matches if the pcase pattern PAT matches.
-  ATOM                  matches if the object is `equal' to ATOM.
-			   ATOM can be a symbol, an integer, or a string."
+  ,PAT                  matches if the `pcase' pattern PAT matches.
+  SYMBOL                matches if EXPVAL is `equal' to SYMBOL.
+  KEYWORD               likewise for KEYWORD.
+  INTEGER               likewise for INTEGER.
+  STRING                likewise for STRING.
+
+The list or vector QPAT is a template.  The predicate formed
+by a backquote-style pattern is a combination of those
+formed by any sub-patterns, wrapped in a top-level condition:
+EXPVAL must be \"congruent\" with the template.  For example:
+
+  \\=`(technical ,forum)
+
+The predicate is the logical-AND of:
+ - Is EXPVAL a list of two elements?
+ - Is the first element the symbol `technical'?
+ - True!  (The second element can be anything, and for the sake
+   of the body forms, its value is bound to the symbol `forum'.)"
   (declare (debug (pcase-QPAT)))
   (cond
    ((eq (car-safe qpat) '\,) (cadr qpat))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/pp.el emacs-26.3+1/lisp/emacs-lisp/pp.el
--- emacs-26.1+1/lisp/emacs-lisp/pp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/pp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pp.el --- pretty printer for Emacs Lisp  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Randal Schwartz <merlyn@stonehenge.com>
 ;; Keywords: lisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/radix-tree.el emacs-26.3+1/lisp/emacs-lisp/radix-tree.el
--- emacs-26.1+1/lisp/emacs-lisp/radix-tree.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/radix-tree.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; radix-tree.el --- A simple library of radix trees  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
@@ -196,6 +196,8 @@
 
 (eval-and-compile
   (pcase-defmacro radix-tree-leaf (vpat)
+    "Build a `pcase' pattern that matches radix-tree leaf EXPVAL.
+VPAT is a `pcase' pattern to extract the value."
     ;; FIXME: We'd like to use a negative pattern (not consp), but pcase
     ;; doesn't support it.  Using `atom' works but generates sub-optimal code.
     `(or `(t . ,,vpat) (and (pred atom) ,vpat))))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/re-builder.el emacs-26.3+1/lisp/emacs-lisp/re-builder.el
--- emacs-26.1+1/lisp/emacs-lisp/re-builder.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/re-builder.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; re-builder.el --- building Regexps with visual feedback -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Detlev Zundel <dzu@gnu.org>
 ;; Keywords: matching, lisp, tools
diff -Nru emacs-26.1+1/lisp/emacs-lisp/regexp-opt.el emacs-26.3+1/lisp/emacs-lisp/regexp-opt.el
--- emacs-26.1+1/lisp/emacs-lisp/regexp-opt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/regexp-opt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; regexp-opt.el --- generate efficient regexps to match strings -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -117,13 +117,13 @@
  (defun simplified-regexp-opt (strings &optional paren)
    (let ((parens
           (cond ((stringp paren)       (cons paren \"\\\\)\"))
-                ((eq paren 'words)    '(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
-                ((eq paren 'symbols) '(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
-                ((null paren)          '(\"\\\\(?:\" . \"\\\\)\"))
-                (t                       '(\"\\\\(\" . \"\\\\)\")))))
-     (concat (car paren)
-             (mapconcat 'regexp-quote strings \"\\\\|\")
-             (cdr paren))))"
+                ((eq paren \\='words)    \\='(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
+                ((eq paren \\='symbols) \\='(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
+                ((null paren)          \\='(\"\\\\(?:\" . \"\\\\)\"))
+                (t                       \\='(\"\\\\(\" . \"\\\\)\")))))
+     (concat (car parens)
+             (mapconcat \\='regexp-quote strings \"\\\\|\")
+             (cdr parens))))"
   (save-match-data
     ;; Recurse on the sorted list.
     (let* ((max-lisp-eval-depth 10000)
diff -Nru emacs-26.1+1/lisp/emacs-lisp/regi.el emacs-26.3+1/lisp/emacs-lisp/regi.el
--- emacs-26.1+1/lisp/emacs-lisp/regi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/regi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; regi.el --- REGular expression Interpreting engine
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
 ;; Maintainer:    bwarsaw@cen.com
diff -Nru emacs-26.1+1/lisp/emacs-lisp/ring.el emacs-26.3+1/lisp/emacs-lisp/ring.el
--- emacs-26.1+1/lisp/emacs-lisp/ring.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/ring.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ring.el --- handle rings of items   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: extensions
diff -Nru emacs-26.1+1/lisp/emacs-lisp/rmc.el emacs-26.3+1/lisp/emacs-lisp/rmc.el
--- emacs-26.1+1/lisp/emacs-lisp/rmc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/rmc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmc.el --- read from a multiple choice question -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
@@ -30,12 +30,12 @@
   "Ask user a multiple choice question.
 PROMPT should be a string that will be displayed as the prompt.
 
-CHOICES is an alist where the first element in each entry is a
-character to be entered, the second element is a short name for
-the entry to be displayed while prompting (if there's room, it
-might be shortened), and the third, optional entry is a longer
-explanation that will be displayed in a help buffer if the user
-requests more help.
+CHOICES is a list of (KEY NAME [DESCRIPTION]).  KEY is a
+character to be entered.  NAME is a short name for the entry to
+be displayed while prompting (if there's room, it might be
+shortened).  DESCRIPTION is an optional longer explanation that
+will be displayed in a help buffer if the user requests more
+help.
 
 This function translates user input into responses by consulting
 the bindings in `query-replace-map'; see the documentation of
@@ -46,9 +46,9 @@
 again.
 
 When `use-dialog-box' is t (the default), this function can pop
-up a dialog window to collect the user input. That functionality
-requires `display-popup-menus-p' to return t. Otherwise, a text
-dialog will be used.
+up a dialog window to collect the user input.  That functionality
+requires `display-popup-menus-p' to return t.  Otherwise, a
+text dialog will be used.
 
 The return value is the matching entry from the CHOICES list.
 
@@ -116,10 +116,15 @@
                               (cons (capitalize (cadr elem))
                                     (car elem)))
                             choices)))
-                  (condition-case nil
+                  (condition-case err
                       (let ((cursor-in-echo-area t))
                         (read-char))
-                    (error nil))))
+                    (error (when (equal (cadr err) "Non-character input-event")
+                             ;; Use up the non-character input-event.
+                             ;; Otherwise we'll just keep reading it
+                             ;; again and again (Bug#32257).
+                             (read-event))
+                           nil))))
           (setq answer (lookup-key query-replace-map (vector tchar) t))
           (setq tchar
                 (cond
diff -Nru emacs-26.1+1/lisp/emacs-lisp/rx.el emacs-26.3+1/lisp/emacs-lisp/rx.el
--- emacs-26.1+1/lisp/emacs-lisp/rx.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/rx.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rx.el --- sexp notation for regular expressions
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -976,12 +976,14 @@
      matches whitespace and graphic characters.
 
 `alphanumeric', `alnum'
-     matches alphabetic characters and digits.  (For multibyte characters,
-     it matches according to Unicode character properties.)
+     matches alphabetic characters and digits.  For multibyte characters,
+     it matches characters whose Unicode `general-category' property
+     indicates they are alphabetic or decimal number characters.
 
 `letter', `alphabetic', `alpha'
-     matches alphabetic characters.  (For multibyte characters,
-     it matches according to Unicode character properties.)
+     matches alphabetic characters.  For multibyte characters,
+     it matches characters whose Unicode `general-category' property
+     indicates they are alphabetic characters.
 
 `ascii'
      matches ASCII (unibyte) characters.
@@ -990,10 +992,14 @@
      matches non-ASCII (multibyte) characters.
 
 `lower', `lower-case'
-     matches anything lower-case.
+     matches anything lower-case, as determined by the current case
+     table.  If `case-fold-search' is non-nil, this also matches any
+     upper-case letter.
 
 `upper', `upper-case'
-     matches anything upper-case.
+     matches anything upper-case, as determined by the current case
+     table.  If `case-fold-search' is non-nil, this also matches any
+     lower-case letter.
 
 `punctuation', `punct'
      matches punctuation.  (But at present, for multibyte characters,
@@ -1052,7 +1058,7 @@
      `chinese-two-byte'			(\\cC)
      `greek-two-byte'			(\\cG)
      `japanese-hiragana-two-byte'	(\\cH)
-     `indian-tow-byte'			(\\cI)
+     `indian-two-byte'			(\\cI)
      `japanese-katakana-two-byte'	(\\cK)
      `korean-hangul-two-byte'		(\\cN)
      `cyrillic-two-byte'		(\\cY)
@@ -1175,24 +1181,28 @@
 
 
 (pcase-defmacro rx (&rest regexps)
-  "Build a `pcase' pattern matching `rx' regexps.
-The REGEXPS are interpreted as by `rx'.  The pattern matches if
-the regular expression so constructed matches the object, as if
-by `string-match'.
+  "Build a `pcase' pattern matching `rx' REGEXPS in sexp form.
+The REGEXPS are interpreted as in `rx'.  The pattern matches any
+string that is a match for the regular expression so constructed,
+as if by `string-match'.
 
 In addition to the usual `rx' constructs, REGEXPS can contain the
 following constructs:
 
-  (let VAR FORM...)  creates a new explicitly numbered submatch
-                     that matches FORM and binds the match to
-                     VAR.
-  (backref VAR)      creates a backreference to the submatch
-                     introduced by a previous (let VAR ...)
-                     construct.
-
-The VARs are associated with explicitly numbered submatches
-starting from 1.  Multiple occurrences of the same VAR refer to
-the same submatch.
+  (let REF SEXP...)  creates a new explicitly named reference to
+                     a submatch that matches regular expressions
+                     SEXP, and binds the match to REF.
+  (backref REF)      creates a backreference to the submatch
+                     introduced by a previous (let REF ...)
+                     construct.  REF can be the same symbol
+                     in the first argument of the corresponding
+                     (let REF ...) construct, or it can be a
+                     submatch number.  It matches the referenced
+                     submatch.
+
+The REFs are associated with explicitly named submatches starting
+from 1.  Multiple occurrences of the same REF refer to the same
+submatch.
 
 If a case matches, the match data is modified as usual so you can
 use it in the case body, but you still have to pass the correct
diff -Nru emacs-26.1+1/lisp/emacs-lisp/seq.el emacs-26.3+1/lisp/emacs-lisp/seq.el
--- emacs-26.1+1/lisp/emacs-lisp/seq.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/seq.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; seq.el --- Sequence manipulation functions  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Keywords: sequences
@@ -127,9 +127,9 @@
                (setq index (1+ index)))
              sequence)))
 
-(cl-defgeneric seqp (sequence)
-  "Return non-nil if SEQUENCE is a sequence, nil otherwise."
-  (sequencep sequence))
+(cl-defgeneric seqp (object)
+  "Return non-nil if OBJECT is a sequence, nil otherwise."
+  (sequencep object))
 
 (cl-defgeneric seq-copy (sequence)
   "Return a shallow copy of SEQUENCE."
diff -Nru emacs-26.1+1/lisp/emacs-lisp/shadow.el emacs-26.3+1/lisp/emacs-lisp/shadow.el
--- emacs-26.1+1/lisp/emacs-lisp/shadow.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/shadow.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shadow.el --- locate Emacs Lisp file shadowings
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Terry Jones <terry@santafe.edu>
 ;; Keywords: lisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/smie.el emacs-26.3+1/lisp/emacs-lisp/smie.el
--- emacs-26.1+1/lisp/emacs-lisp/smie.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/smie.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; smie.el --- Simple Minded Indentation Engine -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: languages, lisp, internal, parsing, indentation
diff -Nru emacs-26.1+1/lisp/emacs-lisp/subr-x.el emacs-26.3+1/lisp/emacs-lisp/subr-x.el
--- emacs-26.1+1/lisp/emacs-lisp/subr-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/subr-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subr-x.el --- extra Lisp functions  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
@@ -122,7 +122,7 @@
             bindings)))
 
 (defmacro if-let* (varlist then &rest else)
-  "Bind variables according to VARLIST and eval THEN or ELSE.
+  "Bind variables according to VARLIST and evaluate THEN or ELSE.
 This is like `if-let' but doesn't handle a VARLIST of the form
 \(SYMBOL SOMETHING) specially."
   (declare (indent 2)
@@ -136,14 +136,14 @@
     `(let* () ,then)))
 
 (defmacro when-let* (varlist &rest body)
-  "Bind variables according to VARLIST and conditionally eval BODY.
+  "Bind variables according to VARLIST and conditionally evaluate BODY.
 This is like `when-let' but doesn't handle a VARLIST of the form
 \(SYMBOL SOMETHING) specially."
   (declare (indent 1) (debug if-let*))
   (list 'if-let* varlist (macroexp-progn body)))
 
 (defmacro and-let* (varlist &rest body)
-  "Bind variables according to VARLIST and conditionally eval BODY.
+  "Bind variables according to VARLIST and conditionally evaluate BODY.
 Like `when-let*', except if BODY is empty and all the bindings
 are non-nil, then the result is non-nil."
   (declare (indent 1)
@@ -157,22 +157,20 @@
       `(let* () ,@(or body '(t))))))
 
 (defmacro if-let (spec then &rest else)
-  "Bind variables according to SPEC and eval THEN or ELSE.
-Each binding is evaluated in turn, and evaluation stops if a
-binding value is nil.  If all are non-nil, the value of THEN is
-returned, or the last form in ELSE is returned.
+  "Bind variables according to SPEC and evaluate THEN or ELSE.
+Evaluate each binding in turn, stopping if a binding value is nil.
+If all are non-nil return the value of THEN, otherwise the last form in ELSE.
 
-Each element of SPEC is a list (SYMBOL VALUEFORM) which binds
+Each element of SPEC is a list (SYMBOL VALUEFORM) that binds
 SYMBOL to the value of VALUEFORM.  An element can additionally be
 of the form (VALUEFORM), which is evaluated and checked for nil;
 i.e. SYMBOL can be omitted if only the test result is of
 interest.  It can also be of the form SYMBOL, then the binding of
 SYMBOL is checked for nil.
 
-As a special case, a SPEC of the form \(SYMBOL SOMETHING) is
-interpreted like \((SYMBOL SOMETHING)). This exists for backward
-compatibility with the old syntax that accepted only one
-binding."
+As a special case, interprets a SPEC of the form \(SYMBOL SOMETHING)
+like \((SYMBOL SOMETHING)).  This exists for backward compatibility
+with an old syntax that accepted only one binding."
   (declare (indent 2)
            (debug ([&or (&rest [&or symbolp (symbolp form) (form)])
                         (symbolp form)]
@@ -184,10 +182,9 @@
   (list 'if-let* spec then (macroexp-progn else)))
 
 (defmacro when-let (spec &rest body)
-  "Bind variables according to SPEC and conditionally eval BODY.
-Each binding is evaluated in turn, and evaluation stops if a
-binding value is nil.  If all are non-nil, the value of the last
-form in BODY is returned.
+  "Bind variables according to SPEC and conditionally evaluate BODY.
+Evaluate each binding in turn, stopping if a binding value is nil.
+If all are non-nil, return the value of the last form in BODY.
 
 The variable list SPEC is the same as in `if-let'."
   (declare (indent 1) (debug if-let))
diff -Nru emacs-26.1+1/lisp/emacs-lisp/syntax.el emacs-26.3+1/lisp/emacs-lisp/syntax.el
--- emacs-26.1+1/lisp/emacs-lisp/syntax.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/syntax.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; syntax.el --- helper functions to find syntactic context  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/emacs-lisp/tabulated-list.el emacs-26.3+1/lisp/emacs-lisp/tabulated-list.el
--- emacs-26.1+1/lisp/emacs-lisp/tabulated-list.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/tabulated-list.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tabulated-list.el --- generic major mode for tabulated lists -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords: extensions, lisp
diff -Nru emacs-26.1+1/lisp/emacs-lisp/tcover-ses.el emacs-26.3+1/lisp/emacs-lisp/tcover-ses.el
--- emacs-26.1+1/lisp/emacs-lisp/tcover-ses.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/tcover-ses.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover-ses.el -- Example use of `testcover' to test "SES"
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/tcover-unsafep.el emacs-26.3+1/lisp/emacs-lisp/tcover-unsafep.el
--- emacs-26.1+1/lisp/emacs-lisp/tcover-unsafep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/tcover-unsafep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/testcover.el emacs-26.3+1/lisp/emacs-lisp/testcover.el
--- emacs-26.1+1/lisp/emacs-lisp/testcover.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/testcover.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover.el -- Visual code-coverage tool  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/thunk.el emacs-26.3+1/lisp/emacs-lisp/thunk.el
--- emacs-26.1+1/lisp/emacs-lisp/thunk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/thunk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thunk.el --- Lazy form evaluation  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Keywords: sequences
diff -Nru emacs-26.1+1/lisp/emacs-lisp/timer.el emacs-26.3+1/lisp/emacs-lisp/timer.el
--- emacs-26.1+1/lisp/emacs-lisp/timer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/timer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; timer.el --- run a function with args at some time in future -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/emacs-lisp/timer-list.el emacs-26.3+1/lisp/emacs-lisp/timer-list.el
--- emacs-26.1+1/lisp/emacs-lisp/timer-list.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/timer-list.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; timer-list.el --- list active timers in a buffer
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/emacs-lisp/tq.el emacs-26.3+1/lisp/emacs-lisp/tq.el
--- emacs-26.1+1/lisp/emacs-lisp/tq.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/tq.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tq.el --- utility to maintain a transaction queue  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1987, 1992, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1987, 1992, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Scott Draves <spot@cs.cmu.edu>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/trace.el emacs-26.3+1/lisp/emacs-lisp/trace.el
--- emacs-26.1+1/lisp/emacs-lisp/trace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/trace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; trace.el --- tracing facility for Emacs Lisp functions  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/emacs-lisp/unsafep.el emacs-26.3+1/lisp/emacs-lisp/unsafep.el
--- emacs-26.1+1/lisp/emacs-lisp/unsafep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/unsafep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff -Nru emacs-26.1+1/lisp/emacs-lisp/warnings.el emacs-26.3+1/lisp/emacs-lisp/warnings.el
--- emacs-26.1+1/lisp/emacs-lisp/warnings.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lisp/warnings.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; warnings.el --- log and display warnings
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/emacs-lock.el emacs-26.3+1/lisp/emacs-lock.el
--- emacs-26.1+1/lisp/emacs-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emacs-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; emacs-lock.el --- protect buffers against killing or exiting -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
 ;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com>
@@ -94,7 +94,10 @@
  exit   -- Emacs cannot exit while the buffer is locked
  kill   -- the buffer cannot be killed, but Emacs can exit as usual
  all    -- the buffer is locked against both actions
- nil    -- the buffer is not locked")
+ nil    -- the buffer is not locked
+
+See also `emacs-lock-unlockable-modes', which exempts buffers under
+some major modes from being locked under some circumstances.")
 (put 'emacs-lock-mode 'permanent-local t)
 
 (defvar-local emacs-lock--old-mode nil
@@ -204,7 +207,10 @@
  kill   -- the buffer cannot be killed, but Emacs can exit as usual
  all    -- the buffer is locked against both actions
 
-Other values are interpreted as usual."
+Other values are interpreted as usual.
+
+See also `emacs-lock-unlockable-modes', which exempts buffers under
+some major modes from being locked under some circumstances."
   :init-value nil
   :lighter (""
             (emacs-lock--try-unlocking " locked:" " Locked:")
diff -Nru emacs-26.1+1/lisp/emulation/cua-base.el emacs-26.3+1/lisp/emulation/cua-base.el
--- emacs-26.1+1/lisp/emulation/cua-base.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/cua-base.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua
@@ -592,6 +592,7 @@
 
 (autoload 'cua-set-rectangle-mark "cua-rect"
   "Start rectangle at mouse click position." t nil)
+(autoload 'cua-toggle-rectangle-mark "cua-rect" nil t)
 
 ;; Stub definitions until it is loaded
 (defvar cua--rectangle)
diff -Nru emacs-26.1+1/lisp/emulation/cua-gmrk.el emacs-26.3+1/lisp/emulation/cua-gmrk.el
--- emacs-26.1+1/lisp/emulation/cua-gmrk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/cua-gmrk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cua-gmrk.el --- CUA unified global mark support
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua mark
diff -Nru emacs-26.1+1/lisp/emulation/cua-rect.el emacs-26.3+1/lisp/emulation/cua-rect.el
--- emacs-26.1+1/lisp/emulation/cua-rect.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/cua-rect.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cua-rect.el --- CUA unified rectangle support
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience CUA
diff -Nru emacs-26.1+1/lisp/emulation/edt.el emacs-26.3+1/lisp/emulation/edt.el
--- emacs-26.1+1/lisp/emulation/edt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/edt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs
 
-;; Copyright (C) 1986, 1992-1995, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1986, 1992-1995, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/lisp/emulation/edt-lk201.el emacs-26.3+1/lisp/emulation/edt-lk201.el
--- emacs-26.1+1/lisp/emulation/edt-lk201.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/edt-lk201.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
 
-;; Copyright (C) 1986, 1992-1993, 1995, 2001-2018 Free Software
+;; Copyright (C) 1986, 1992-1993, 1995, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/lisp/emulation/edt-mapper.el emacs-26.3+1/lisp/emulation/edt-mapper.el
--- emacs-26.1+1/lisp/emulation/edt-mapper.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/edt-mapper.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
 
-;; Copyright (C) 1994-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
 ;; Maintainer: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/lisp/emulation/edt-pc.el emacs-26.3+1/lisp/emulation/edt-pc.el
--- emacs-26.1+1/lisp/emulation/edt-pc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/edt-pc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
 
-;; Copyright (C) 1986, 1994-1995, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1986, 1994-1995, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/lisp/emulation/edt-vt100.el emacs-26.3+1/lisp/emulation/edt-vt100.el
--- emacs-26.1+1/lisp/emulation/edt-vt100.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/edt-vt100.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
 
-;; Copyright (C) 1986, 1992-1993, 1995, 2002-2018 Free Software
+;; Copyright (C) 1986, 1992-1993, 1995, 2002-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevin.gal@verizon.net>
diff -Nru emacs-26.1+1/lisp/emulation/keypad.el emacs-26.3+1/lisp/emulation/keypad.el
--- emacs-26.1+1/lisp/emulation/keypad.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/keypad.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; keypad.el --- simplified keypad bindings
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
diff -Nru emacs-26.1+1/lisp/emulation/viper-cmd.el emacs-26.3+1/lisp/emulation/viper-cmd.el
--- emacs-26.1+1/lisp/emulation/viper-cmd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-cmd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-cmd.el --- Vi command support for Viper  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper.el emacs-26.3+1/lisp/emulation/viper.el
--- emacs-26.1+1/lisp/emulation/viper.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper.el	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 ;;		 and a venomous VI PERil.
 ;;		 Viper Is also a Package for Emacs Rebels.
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
diff -Nru emacs-26.1+1/lisp/emulation/viper-ex.el emacs-26.3+1/lisp/emulation/viper-ex.el
--- emacs-26.1+1/lisp/emulation/viper-ex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-ex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-ex.el --- functions implementing the Ex commands for Viper
 
-;; Copyright (C) 1994-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper-init.el emacs-26.3+1/lisp/emulation/viper-init.el
--- emacs-26.1+1/lisp/emulation/viper-init.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-init.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-init.el --- some common definitions for Viper
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper-keym.el emacs-26.3+1/lisp/emulation/viper-keym.el
--- emacs-26.1+1/lisp/emulation/viper-keym.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-keym.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-keym.el --- Viper keymaps
 
-;; Copyright (C) 1994-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper-macs.el emacs-26.3+1/lisp/emulation/viper-macs.el
--- emacs-26.1+1/lisp/emulation/viper-macs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-macs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
-;; Copyright (C) 1994-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper-mous.el emacs-26.3+1/lisp/emulation/viper-mous.el
--- emacs-26.1+1/lisp/emulation/viper-mous.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-mous.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-mous.el --- mouse support for Viper
 
-;; Copyright (C) 1994-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/emulation/viper-util.el emacs-26.3+1/lisp/emulation/viper-util.el
--- emacs-26.1+1/lisp/emulation/viper-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/emulation/viper-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
-;; Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff -Nru emacs-26.1+1/lisp/env.el emacs-26.3+1/lisp/env.el
--- emacs-26.1+1/lisp/env.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/env.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; env.el --- functions to manipulate environment variables  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991, 1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes, unix
diff -Nru emacs-26.1+1/lisp/epa-dired.el emacs-26.3+1/lisp/epa-dired.el
--- emacs-26.1+1/lisp/epa-dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epa-dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; epa-dired.el --- the EasyPG Assistant, dired extension -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff -Nru emacs-26.1+1/lisp/epa.el emacs-26.3+1/lisp/epa.el
--- emacs-26.1+1/lisp/epa.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epa.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; epa.el --- the EasyPG Assistant -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -701,6 +701,7 @@
 					#'epa-progress-callback-function
 					(format "Decrypting %s..."
 						(file-name-nondirectory decrypt-file))))
+    (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
     (message "Decrypting %s..." (file-name-nondirectory decrypt-file))
     (condition-case error
 	(epg-decrypt-file context decrypt-file plain-file)
diff -Nru emacs-26.1+1/lisp/epa-file.el emacs-26.3+1/lisp/epa-file.el
--- emacs-26.1+1/lisp/epa-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epa-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff -Nru emacs-26.1+1/lisp/epa-hook.el emacs-26.3+1/lisp/epa-hook.el
--- emacs-26.1+1/lisp/epa-hook.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epa-hook.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; epa-hook.el --- preloaded code to enable epa-file.el -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff -Nru emacs-26.1+1/lisp/epa-mail.el emacs-26.3+1/lisp/epa-mail.el
--- emacs-26.1+1/lisp/epa-mail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epa-mail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG, mail, message
diff -Nru emacs-26.1+1/lisp/epg-config.el emacs-26.3+1/lisp/epg-config.el
--- emacs-26.1+1/lisp/epg-config.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epg-config.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; epg-config.el --- configuration of the EasyPG Library
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff -Nru emacs-26.1+1/lisp/epg.el emacs-26.3+1/lisp/epg.el
--- emacs-26.1+1/lisp/epg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/epg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; epg.el --- the EasyPG Library -*- lexical-binding: t -*-
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -657,7 +657,7 @@
 				  :command (cons (epg-context-program context)
 						 args)
 				  :connection-type 'pipe
-				  :coding '(binary . binary)
+				  :coding 'raw-text
 				  :filter #'epg--process-filter
 				  :stderr error-process
 				  :noquery t)))
diff -Nru emacs-26.1+1/lisp/erc/ChangeLog.1 emacs-26.3+1/lisp/erc/ChangeLog.1
--- emacs-26.1+1/lisp/erc/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -11443,7 +11443,7 @@
 	* erc.el: * Added command-names to completion (erc-command-table)
 	* New variable erc-auto-query. When set, every arriving message to you
 	will open a query buffer for that sender if not already open.
-	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
+	* Compatibility function for non-existing line-beginning|end-position functions in XEmacs.
 
 2001-10-03  Mario Lang  <mlang@delysid.org>
 
@@ -11702,7 +11702,7 @@
 
 	* erc-speak.el, erc.el: New file.
 
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/erc/ChangeLog.2 emacs-26.3+1/lisp/erc/ChangeLog.2
--- emacs-26.1+1/lisp/erc/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -757,7 +757,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-  Copyright (C) 2009-2018 Free Software Foundation, Inc.
+  Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/erc/erc-autoaway.el emacs-26.3+1/lisp/erc/erc-autoaway.el
--- emacs-26.1+1/lisp/erc/erc-autoaway.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-autoaway.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-autoaway.el --- Provides autoaway for ERC
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-backend.el emacs-26.3+1/lisp/erc/erc-backend.el
--- emacs-26.1+1/lisp/erc/erc-backend.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-backend.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-backend.el --- Backend network communication for ERC  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
diff -Nru emacs-26.1+1/lisp/erc/erc-button.el emacs-26.3+1/lisp/erc/erc-button.el
--- emacs-26.1+1/lisp/erc/erc-button.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-button.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-button.el --- A way of buttonizing certain things in ERC buffers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-capab.el emacs-26.3+1/lisp/erc/erc-capab.el
--- emacs-26.1+1/lisp/erc/erc-capab.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-capab.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/lisp/erc/erc-compat.el emacs-26.3+1/lisp/erc/erc-compat.el
--- emacs-26.1+1/lisp/erc/erc-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-dcc.el emacs-26.3+1/lisp/erc/erc-dcc.el
--- emacs-26.1+1/lisp/erc/erc-dcc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-dcc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
 
-;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2018 Free Software
+;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
@@ -989,17 +989,20 @@
     (let ((inhibit-read-only t)
           received-bytes)
       (goto-char (point-max))
-      (insert (string-make-unibyte str))
+      (if str
+          (insert (string-make-unibyte str)))
 
       (when (> (point-max) erc-dcc-receive-cache)
         (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
-      (setq received-bytes (+ (buffer-size) erc-dcc-byte-count))
+      (setq received-bytes (buffer-size))
+      (if erc-dcc-byte-count
+          (setq received-bytes (+ received-bytes erc-dcc-byte-count)))
 
       (and erc-dcc-verbose
            (erc-display-message
             nil 'notice erc-server-process
             'dcc-get-bytes-received
-            ?f (file-name-nondirectory buffer-file-name)
+            ?f (file-name-nondirectory (buffer-name))
             ?b (number-to-string received-bytes)))
       (cond
        ((and (> (plist-get erc-dcc-entry-data :size) 0)
@@ -1007,7 +1010,7 @@
         (erc-display-message
          nil '(notice error) 'active
          'dcc-get-file-too-long
-         ?f (file-name-nondirectory buffer-file-name))
+         ?f (file-name-nondirectory (buffer-name)))
         (delete-process proc))
        (t
         (process-send-string
diff -Nru emacs-26.1+1/lisp/erc/erc-desktop-notifications.el emacs-26.3+1/lisp/erc/erc-desktop-notifications.el
--- emacs-26.1+1/lisp/erc/erc-desktop-notifications.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-desktop-notifications.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: comm
diff -Nru emacs-26.1+1/lisp/erc/erc.el emacs-26.3+1/lisp/erc/erc.el
--- emacs-26.1+1/lisp/erc/erc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc.el --- An Emacs Internet Relay Chat client  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
diff -Nru emacs-26.1+1/lisp/erc/erc-ezbounce.el emacs-26.3+1/lisp/erc/erc-ezbounce.el
--- emacs-26.1+1/lisp/erc/erc-ezbounce.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-ezbounce.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
 
-;; Copyright (C) 2002, 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-fill.el emacs-26.3+1/lisp/erc/erc-fill.el
--- emacs-26.1+1/lisp/erc/erc-fill.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-fill.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
-;; Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
diff -Nru emacs-26.1+1/lisp/erc/erc-goodies.el emacs-26.3+1/lisp/erc/erc-goodies.el
--- emacs-26.1+1/lisp/erc/erc-goodies.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-goodies.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-ibuffer.el emacs-26.3+1/lisp/erc/erc-ibuffer.el
--- emacs-26.1+1/lisp/erc/erc-ibuffer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-ibuffer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-identd.el emacs-26.3+1/lisp/erc/erc-identd.el
--- emacs-26.1+1/lisp/erc/erc-identd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-identd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
 
-;; Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-imenu.el emacs-26.3+1/lisp/erc/erc-imenu.el
--- emacs-26.1+1/lisp/erc/erc-imenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-imenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-imenu.el -- Imenu support for ERC
 
-;; Copyright (C) 2001-2002, 2004, 2006-2018 Free Software Foundation,
+;; Copyright (C) 2001-2002, 2004, 2006-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
diff -Nru emacs-26.1+1/lisp/erc/erc-join.el emacs-26.3+1/lisp/erc/erc-join.el
--- emacs-26.1+1/lisp/erc/erc-join.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-join.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-lang.el emacs-26.3+1/lisp/erc/erc-lang.el
--- emacs-26.1+1/lisp/erc/erc-lang.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-lang.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-lang.el --- provide the LANG command to ERC
 
-;; Copyright (C) 2002, 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-list.el emacs-26.3+1/lisp/erc/erc-list.el
--- emacs-26.1+1/lisp/erc/erc-list.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-list.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-list.el --- /list support for ERC  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-log.el emacs-26.3+1/lisp/erc/erc-log.el
--- emacs-26.1+1/lisp/erc/erc-log.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-log.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-log.el --- Logging facilities for ERC.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-match.el emacs-26.3+1/lisp/erc/erc-match.el
--- emacs-26.1+1/lisp/erc/erc-match.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-match.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-menu.el emacs-26.3+1/lisp/erc/erc-menu.el
--- emacs-26.1+1/lisp/erc/erc-menu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-menu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001-2002, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-netsplit.el emacs-26.3+1/lisp/erc/erc-netsplit.el
--- emacs-26.1+1/lisp/erc/erc-netsplit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-netsplit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-networks.el emacs-26.3+1/lisp/erc/erc-networks.el
--- emacs-26.1+1/lisp/erc/erc-networks.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-networks.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-networks.el --- IRC networks
 
-;; Copyright (C) 2002, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-notify.el emacs-26.3+1/lisp/erc/erc-notify.el
--- emacs-26.1+1/lisp/erc/erc-notify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-notify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-notify.el --- Online status change notification  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-page.el emacs-26.3+1/lisp/erc/erc-page.el
--- emacs-26.1+1/lisp/erc/erc-page.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-page.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-page.el - CTCP PAGE support for ERC
 
-;; Copyright (C) 2002, 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/lisp/erc/erc-pcomplete.el emacs-26.3+1/lisp/erc/erc-pcomplete.el
--- emacs-26.1+1/lisp/erc/erc-pcomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-pcomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-pcomplete.el --- Provides programmable completion for ERC
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Sacha Chua <sacha@free.net.ph>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-replace.el emacs-26.3+1/lisp/erc/erc-replace.el
--- emacs-26.1+1/lisp/erc/erc-replace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-replace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001-2002, 2004, 2006-2018 Free Software Foundation,
+;; Copyright (C) 2001-2002, 2004, 2006-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
diff -Nru emacs-26.1+1/lisp/erc/erc-ring.el emacs-26.3+1/lisp/erc/erc-ring.el
--- emacs-26.1+1/lisp/erc/erc-ring.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-ring.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
-;; Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-services.el emacs-26.3+1/lisp/erc/erc-services.el
--- emacs-26.1+1/lisp/erc/erc-services.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-services.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/lisp/erc/erc-sound.el emacs-26.3+1/lisp/erc/erc-sound.el
--- emacs-26.1+1/lisp/erc/erc-sound.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-sound.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-sound.el --- CTCP SOUND support for ERC
 
-;; Copyright (C) 2002-2003, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/lisp/erc/erc-speedbar.el emacs-26.3+1/lisp/erc/erc-speedbar.el
--- emacs-26.1+1/lisp/erc/erc-speedbar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-speedbar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-speedbar.el --- Speedbar support for ERC
 
-;; Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
diff -Nru emacs-26.1+1/lisp/erc/erc-spelling.el emacs-26.3+1/lisp/erc/erc-spelling.el
--- emacs-26.1+1/lisp/erc/erc-spelling.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-spelling.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-stamp.el emacs-26.3+1/lisp/erc/erc-stamp.el
--- emacs-26.1+1/lisp/erc/erc-stamp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-stamp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-track.el emacs-26.3+1/lisp/erc/erc-track.el
--- emacs-26.1+1/lisp/erc/erc-track.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-track.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-track.el --- Track modified channel buffers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-truncate.el emacs-26.3+1/lisp/erc/erc-truncate.el
--- emacs-26.1+1/lisp/erc/erc-truncate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-truncate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-truncate.el --- Functions for truncating ERC buffers
 
-;; Copyright (C) 2003-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/erc/erc-xdcc.el emacs-26.3+1/lisp/erc/erc-xdcc.el
--- emacs-26.1+1/lisp/erc/erc-xdcc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/erc/erc-xdcc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/eshell/em-alias.el emacs-26.3+1/lisp/eshell/em-alias.el
--- emacs-26.1+1/lisp/eshell/em-alias.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-alias.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-alias.el --- creation and management of command aliases  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-banner.el emacs-26.3+1/lisp/eshell/em-banner.el
--- emacs-26.1+1/lisp/eshell/em-banner.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-banner.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-banner.el --- sample module that displays a login banner  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-basic.el emacs-26.3+1/lisp/eshell/em-basic.el
--- emacs-26.1+1/lisp/eshell/em-basic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-basic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-basic.el --- basic shell builtin commands  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-cmpl.el emacs-26.3+1/lisp/eshell/em-cmpl.el
--- emacs-26.1+1/lisp/eshell/em-cmpl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-cmpl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-cmpl.el --- completion using the TAB key  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-dirs.el emacs-26.3+1/lisp/eshell/em-dirs.el
--- emacs-26.1+1/lisp/eshell/em-dirs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-dirs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-dirs.el --- directory navigation commands  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -407,6 +407,7 @@
 	nil))))
 
 (put 'eshell/cd 'eshell-no-numeric-conversions t)
+(put 'eshell/cd 'eshell-filename-arguments t)
 
 (defun eshell-add-to-dir-ring (path)
   "Add PATH to the last-dir-ring, if applicable."
@@ -470,6 +471,7 @@
   nil)
 
 (put 'eshell/pushd 'eshell-no-numeric-conversions t)
+(put 'eshell/pushd 'eshell-filename-arguments t)
 
 ;;; popd [+n]
 (defun eshell/popd (&rest args)
@@ -500,6 +502,7 @@
   nil)
 
 (put 'eshell/popd 'eshell-no-numeric-conversions t)
+(put 'eshell/pop 'eshell-filename-arguments t)
 
 (defun eshell/dirs (&optional if-verbose)
   "Implementation of dirs in Lisp."
diff -Nru emacs-26.1+1/lisp/eshell/em-glob.el emacs-26.3+1/lisp/eshell/em-glob.el
--- emacs-26.1+1/lisp/eshell/em-glob.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-glob.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-glob.el --- extended file name globbing  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-hist.el emacs-26.3+1/lisp/eshell/em-hist.el
--- emacs-26.1+1/lisp/eshell/em-hist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-hist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-hist.el --- history list management  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-ls.el emacs-26.3+1/lisp/eshell/em-ls.el
--- emacs-26.1+1/lisp/eshell/em-ls.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-ls.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-ls.el --- implementation of ls in Lisp  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -334,6 +334,7 @@
     (apply 'eshell-do-ls args)))
 
 (put 'eshell/ls 'eshell-no-numeric-conversions t)
+(put 'eshell/ls 'eshell-filename-arguments t)
 
 (declare-function eshell-glob-regexp "em-glob" (pattern))
 
diff -Nru emacs-26.1+1/lisp/eshell/em-pred.el emacs-26.3+1/lisp/eshell/em-pred.el
--- emacs-26.1+1/lisp/eshell/em-pred.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-pred.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-prompt.el emacs-26.3+1/lisp/eshell/em-prompt.el
--- emacs-26.1+1/lisp/eshell/em-prompt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-prompt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-prompt.el --- command prompts  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-rebind.el emacs-26.3+1/lisp/eshell/em-rebind.el
--- emacs-26.1+1/lisp/eshell/em-rebind.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-rebind.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-rebind.el --- rebind keys when point is at current input  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -223,7 +223,7 @@
   (interactive "P")
   (let ((count (prefix-numeric-value n)))
     (if (eshell-point-within-input-p (- (point) count))
-	(delete-backward-char count n)
+	(delete-char (- count) n)
       (beep))))
 
 (defun eshell-delchar-or-maybe-eof (arg)
diff -Nru emacs-26.1+1/lisp/eshell/em-script.el emacs-26.3+1/lisp/eshell/em-script.el
--- emacs-26.1+1/lisp/eshell/em-script.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-script.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-script.el --- Eshell script files  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-smart.el emacs-26.3+1/lisp/eshell/em-smart.el
--- emacs-26.1+1/lisp/eshell/em-smart.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-smart.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-smart.el --- smart display of output  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-term.el emacs-26.3+1/lisp/eshell/em-term.el
--- emacs-26.1+1/lisp/eshell/em-term.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-term.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-term.el --- running visual commands  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-tramp.el emacs-26.3+1/lisp/eshell/em-tramp.el
--- emacs-26.1+1/lisp/eshell/em-tramp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-tramp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-tramp.el --- Eshell features that require TRAMP  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Aidan Gauland <aidalgol@no8wireless.co.nz>
 
diff -Nru emacs-26.1+1/lisp/eshell/em-unix.el emacs-26.3+1/lisp/eshell/em-unix.el
--- emacs-26.1+1/lisp/eshell/em-unix.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-unix.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-unix.el --- UNIX command aliases  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -307,6 +307,7 @@
    nil))
 
 (put 'eshell/rm 'eshell-no-numeric-conversions t)
+(put 'eshell/rm 'eshell-filename-arguments t)
 
 (defun eshell/mkdir (&rest args)
   "Implementation of mkdir in Lisp."
@@ -324,6 +325,7 @@
    nil))
 
 (put 'eshell/mkdir 'eshell-no-numeric-conversions t)
+(put 'eshell/mkdir 'eshell-filename-arguments t)
 
 (defun eshell/rmdir (&rest args)
   "Implementation of rmdir in Lisp."
@@ -340,6 +342,7 @@
    nil))
 
 (put 'eshell/rmdir 'eshell-no-numeric-conversions t)
+(put 'eshell/rmdir 'eshell-filename-arguments t)
 
 (defvar no-dereference)
 
@@ -524,6 +527,7 @@
 			     eshell-mv-overwrite-files))))
 
 (put 'eshell/mv 'eshell-no-numeric-conversions t)
+(put 'eshell/mv 'eshell-filename-arguments t)
 
 (defun eshell/cp (&rest args)
   "Implementation of cp in Lisp."
@@ -561,6 +565,7 @@
 			   eshell-cp-overwrite-files preserve)))
 
 (put 'eshell/cp 'eshell-no-numeric-conversions t)
+(put 'eshell/cp 'eshell-filename-arguments t)
 
 (defun eshell/ln (&rest args)
   "Implementation of ln in Lisp."
@@ -593,6 +598,7 @@
 			     eshell-ln-overwrite-files))))
 
 (put 'eshell/ln 'eshell-no-numeric-conversions t)
+(put 'eshell/ln 'eshell-filename-arguments t)
 
 (defun eshell/cat (&rest args)
   "Implementation of cat in Lisp.
@@ -645,11 +651,13 @@
      (setq eshell-ensure-newline-p nil))))
 
 (put 'eshell/cat 'eshell-no-numeric-conversions t)
+(put 'eshell/cat 'eshell-filename-arguments t)
 
 ;; special front-end functions for compilation-mode buffers
 
 (defun eshell/make (&rest args)
-  "Use `compile' to do background makes."
+  "Use `compile' to do background makes.
+Fallback to standard make when called synchronously."
   (if (and eshell-current-subjob-p
 	   (eshell-interactive-output-p))
       (let ((compilation-process-setup-function
@@ -927,6 +935,8 @@
 	     (eshell-print (concat (eshell-du-size-string size)
 				   "total\n"))))))))
 
+(put 'eshell/du 'eshell-filename-arguments t)
+
 (defvar eshell-time-start nil)
 
 (defun eshell-show-elapsed-time ()
@@ -1029,6 +1039,7 @@
   nil)
 
 (put 'eshell/diff 'eshell-no-numeric-conversions t)
+(put 'eshell/diff 'eshell-filename-arguments t)
 
 (defvar locate-history-list)
 
diff -Nru emacs-26.1+1/lisp/eshell/em-xtra.el emacs-26.3+1/lisp/eshell/em-xtra.el
--- emacs-26.1+1/lisp/eshell/em-xtra.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/em-xtra.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; em-xtra.el --- extra alias functions  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/esh-arg.el emacs-26.3+1/lisp/eshell/esh-arg.el
--- emacs-26.1+1/lisp/eshell/esh-arg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-arg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-arg.el --- argument processing  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/esh-cmd.el emacs-26.3+1/lisp/eshell/esh-cmd.el
--- emacs-26.1+1/lisp/eshell/esh-cmd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-cmd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-cmd.el --- command invocation  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -1304,27 +1304,36 @@
   "Insert Lisp OBJECT, using ARGS if a function."
   (catch 'eshell-external               ; deferred to an external command
     (let* ((eshell-ensure-newline-p (eshell-interactive-output-p))
-	   (result
-	    (if (functionp object)
-		(progn
-		  (setq eshell-last-arguments args
-			eshell-last-command-name
-			(concat "#<function " (symbol-name object) ">"))
-		  ;; if any of the arguments are flagged as numbers
-		  ;; waiting for conversion, convert them now
-		  (unless (get object 'eshell-no-numeric-conversions)
-		    (while args
-		      (let ((arg (car args)))
-			(if (and (stringp arg)
-				 (> (length arg) 0)
-				 (not (text-property-not-all
-				       0 (length arg) 'number t arg)))
-			    (setcar args (string-to-number arg))))
-		      (setq args (cdr args))))
-		  (eshell-apply object eshell-last-arguments))
-	      (setq eshell-last-arguments args
-		    eshell-last-command-name "#<Lisp object>")
-	      (eshell-eval object))))
+           (result
+            (if (functionp object)
+                (progn
+                  (setq eshell-last-arguments args
+                        eshell-last-command-name
+                        (concat "#<function " (symbol-name object) ">"))
+                  (let ((numeric (not (get object
+                                           'eshell-no-numeric-conversions)))
+                        (fname-args (get object 'eshell-filename-arguments)))
+                    (when (or numeric fname-args)
+                      (while args
+                        (let ((arg (car args)))
+                          (cond ((and numeric (stringp arg) (> (length arg) 0)
+                                      (text-property-any 0 (length arg)
+                                                         'number t arg))
+                                 ;; If any of the arguments are
+                                 ;; flagged as numbers waiting for
+                                 ;; conversion, convert them now.
+                                 (setcar args (string-to-number arg)))
+                                ((and fname-args (stringp arg)
+                                      (string-equal arg "~"))
+                                 ;; If any of the arguments match "~",
+                                 ;; prepend "./" to treat it as a
+                                 ;; regular file name.
+                                 (setcar args (concat "./" arg)))))
+                        (setq args (cdr args)))))
+                  (eshell-apply object eshell-last-arguments))
+              (setq eshell-last-arguments args
+                    eshell-last-command-name "#<Lisp object>")
+              (eshell-eval object))))
       (if (and eshell-ensure-newline-p
 	       (save-excursion
 		 (goto-char eshell-last-output-end)
diff -Nru emacs-26.1+1/lisp/eshell/eshell.el emacs-26.3+1/lisp/eshell/eshell.el
--- emacs-26.1+1/lisp/eshell/eshell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/eshell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eshell.el --- the Emacs command shell  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2
diff -Nru emacs-26.1+1/lisp/eshell/esh-ext.el emacs-26.3+1/lisp/eshell/esh-ext.el
--- emacs-26.1+1/lisp/eshell/esh-ext.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-ext.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-ext.el --- commands external to Eshell  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -259,6 +259,7 @@
        (eshell-printn dir)))))
 
 (put 'eshell/addpath 'eshell-no-numeric-conversions t)
+(put 'eshell/addpath 'eshell-filename-arguments t)
 
 (defun eshell-script-interpreter (file)
   "Extract the script to run from FILE, if it has #!<interp> in it.
diff -Nru emacs-26.1+1/lisp/eshell/esh-io.el emacs-26.3+1/lisp/eshell/esh-io.el
--- emacs-26.1+1/lisp/eshell/esh-io.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-io.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-io.el --- I/O management  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/esh-mode.el emacs-26.3+1/lisp/eshell/esh-mode.el
--- emacs-26.1+1/lisp/eshell/esh-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-mode.el --- user interface  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/esh-module.el emacs-26.3+1/lisp/eshell/esh-module.el
--- emacs-26.1+1/lisp/eshell/esh-module.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-module.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-module.el --- Eshell modules  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
diff -Nru emacs-26.1+1/lisp/eshell/esh-opt.el emacs-26.3+1/lisp/eshell/esh-opt.el
--- emacs-26.1+1/lisp/eshell/esh-opt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-opt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-opt.el --- command options processing  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -244,26 +244,27 @@
 				     options)))
          (ai 0) arg
          (eshell--args args))
-    (while (< ai (length args))
-      (setq arg (nth ai args))
+    (while (< ai (length eshell--args))
+      (setq arg (nth ai eshell--args))
       (if (not (and (stringp arg)
 		    (string-match "^-\\(-\\)?\\(.*\\)" arg)))
 	  (setq ai (1+ ai))
 	(let* ((dash (match-string 1 arg))
 	       (switch (match-string 2 arg)))
 	  (if (= ai 0)
-	      (setq args (cdr args))
-	    (setcdr (nthcdr (1- ai) args) (nthcdr (1+ ai) args)))
+	      (setq eshell--args (cdr eshell--args))
+	    (setcdr (nthcdr (1- ai) eshell--args)
+                    (nthcdr (1+ ai) eshell--args)))
 	  (if dash
 	      (if (> (length switch) 0)
 		  (eshell--process-option name switch 1 ai options opt-vals)
-		(setq ai (length args)))
+		(setq ai (length eshell--args)))
 	    (let ((len (length switch))
 		  (index 0))
 	      (while (< index len)
 		(eshell--process-option name (aref switch index)
                                         0 ai options opt-vals)
 		(setq index (1+ index))))))))
-    (nconc (mapcar #'cdr opt-vals) args)))
+    (nconc (mapcar #'cdr opt-vals) eshell--args)))
 
 ;;; esh-opt.el ends here
diff -Nru emacs-26.1+1/lisp/eshell/esh-proc.el emacs-26.3+1/lisp/eshell/esh-proc.el
--- emacs-26.1+1/lisp/eshell/esh-proc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-proc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-proc.el --- process management  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -242,7 +242,11 @@
   "A marker that tracks the beginning of output of the last subprocess.
 Used only on systems which do not support async subprocesses.")
 
-(defvar eshell-needs-pipe '("bc")
+(defvar eshell-needs-pipe
+  '("bc"
+    ;; xclip.el (in GNU ELPA) calls all of these with
+    ;; `process-connection-type' set to nil.
+    "pbpaste" "putclip" "xclip" "xsel" "wl-copy")
   "List of commands which need `process-connection-type' to be nil.
 Currently only affects commands in pipelines, and not those at
 the front.  If an element contains a directory part it must match
@@ -279,11 +283,9 @@
 	    (let ((process-connection-type
 		   (unless (eshell-needs-pipe-p command)
 		     process-connection-type))
-		  (command (file-local-name command)))
+		  (command (file-local-name (expand-file-name command))))
 	      (apply 'start-file-process
-		     (file-name-nondirectory command) nil
-		     ;; `start-process' can't deal with relative filenames.
-		     (append (list (expand-file-name command)) args))))
+		     (file-name-nondirectory command) nil command args)))
       (eshell-record-process-object proc)
       (set-process-buffer proc (current-buffer))
       (if (eshell-interactive-output-p)
diff -Nru emacs-26.1+1/lisp/eshell/esh-util.el emacs-26.3+1/lisp/eshell/esh-util.el
--- emacs-26.1+1/lisp/eshell/esh-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-util.el --- general utilities  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/eshell/esh-var.el emacs-26.3+1/lisp/eshell/esh-var.el
--- emacs-26.1+1/lisp/eshell/esh-var.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/eshell/esh-var.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; esh-var.el --- handling of variables  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/expand.el emacs-26.3+1/lisp/expand.el
--- emacs-26.1+1/lisp/expand.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/expand.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; expand.el --- make abbreviations more usable
 
-;; Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/ezimage.el emacs-26.3+1/lisp/ezimage.el
--- emacs-26.1+1/lisp/ezimage.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ezimage.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ezimage --- Generalized Image management
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff -Nru emacs-26.1+1/lisp/facemenu.el emacs-26.3+1/lisp/facemenu.el
--- emacs-26.1+1/lisp/facemenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/facemenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; facemenu.el --- create a face menu for interactively adding fonts to text
 
-;; Copyright (C) 1994-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: faces
diff -Nru emacs-26.1+1/lisp/face-remap.el emacs-26.3+1/lisp/face-remap.el
--- emacs-26.1+1/lisp/face-remap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/face-remap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; face-remap.el --- Functions for managing `face-remapping-alist'  -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: faces, face remapping, display, user commands
diff -Nru emacs-26.1+1/lisp/faces.el emacs-26.3+1/lisp/faces.el
--- emacs-26.1+1/lisp/faces.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/faces.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; faces.el --- Lisp faces -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/ffap.el emacs-26.3+1/lisp/ffap.el
--- emacs-26.1+1/lisp/ffap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ffap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ffap.el --- find file (or url) at point
 
-;; Copyright (C) 1995-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/filecache.el emacs-26.3+1/lisp/filecache.el
--- emacs-26.1+1/lisp/filecache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/filecache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; filecache.el --- find files using a pre-loaded cache
 
-;; Copyright (C) 1996, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 10 1996
diff -Nru emacs-26.1+1/lisp/filenotify.el emacs-26.3+1/lisp/filenotify.el
--- emacs-26.1+1/lisp/filenotify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/filenotify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; filenotify.el --- watch files for changes on disk  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
@@ -307,7 +307,10 @@
   (unless (functionp callback)
     (signal 'wrong-type-argument `(,callback)))
 
-  (let* ((handler (find-file-name-handler file 'file-notify-add-watch))
+  (let* ((quoted (file-name-quoted-p file))
+         (file (file-name-unquote file))
+         (file-name-handler-alist (if quoted nil file-name-handler-alist))
+         (handler (find-file-name-handler file 'file-notify-add-watch))
 	 (dir (directory-file-name
 	       (if (file-directory-p file)
 		   file
diff -Nru emacs-26.1+1/lisp/files.el emacs-26.3+1/lisp/files.el
--- emacs-26.1+1/lisp/files.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/files.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; files.el --- file input and output commands for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
@@ -148,12 +148,16 @@
 Called with an absolute file name as argument, it returns t to enable backup.")
 
 (defcustom buffer-offer-save nil
-  "Non-nil in a buffer means always offer to save buffer on exit.
+  "Non-nil in a buffer means always offer to save buffer on exiting Emacs.
 Do so even if the buffer is not visiting a file.
 Automatically local in all buffers.
 
 Set to the symbol `always' to offer to save buffer whenever
-`save-some-buffers' is called."
+`save-some-buffers' is called.
+
+Note that this option has no effect on `kill-buffer';
+if you want to control what happens when a buffer is killed,
+use `kill-buffer-query-functions'."
   :type '(choice (const :tag "Never" nil)
                  (const :tag "On Emacs exit" t)
                  (const :tag "Whenever save-some-buffers is called" always))
@@ -489,7 +493,8 @@
 (defcustom find-file-hook nil
   "List of functions to be called after a buffer is loaded from a file.
 The buffer's local variables (if any) will have been processed before the
-functions are called."
+functions are called.  This includes directory-local variables, if any,
+for the file's directory."
   :group 'find-file
   :type 'hook
   :options '(auto-insert)
@@ -796,9 +801,15 @@
     (setq cd-path (or (parse-colon-path (getenv "CDPATH"))
                       (list "./"))))
   (cd-absolute
-   (or (locate-file dir cd-path nil
-                    (lambda (f) (and (file-directory-p f) 'dir-ok)))
-       (error "No such directory found via CDPATH environment variable"))))
+   (or
+    ;; locate-file doesn't support remote file names, so detect them
+    ;; and support them here by hand.
+    (and (file-remote-p (expand-file-name dir))
+         (file-accessible-directory-p (expand-file-name dir))
+         (expand-file-name dir))
+    (locate-file dir cd-path nil
+                 (lambda (f) (and (file-directory-p f) 'dir-ok)))
+    (error "No such directory found via CDPATH environment variable"))))
 
 (defun directory-files-recursively (dir regexp &optional include-directories)
   "Return list of all files under DIR that have file names matching REGEXP.
@@ -1139,7 +1150,10 @@
 
 (defun file-local-name (file)
   "Return the local name component of FILE.
-It returns a file name which can be used directly as argument of
+This function removes from FILE the specification of the remote host
+and the method of accessing the host, leaving only the part that
+identifies FILE locally on the remote system.
+The returned file name can be used directly as argument of
 `process-file', `start-file-process', or `shell-command'."
   (or (file-remote-p file 'localname) file))
 
@@ -1925,7 +1939,7 @@
 			 (save-match-data
 			   (string-match "^[a-zA-`]:/$" filename))))
                (equal (get 'abbreviated-home-dir 'home)
-                      (expand-file-name "~")))
+                      (save-match-data (expand-file-name "~"))))
 	  (setq filename
 		(concat "~"
 			(match-string 1 filename)
@@ -2365,7 +2379,7 @@
 				  _after-find-file-from-revert-buffer
 				  nomodes)
   "Called after finding a file and by the default revert function.
-Sets buffer mode, parses local variables.
+Sets buffer mode, parses file-local and directory-local variables.
 Optional args ERROR, WARN, and NOAUTO: ERROR non-nil means there was an
 error in reading the file.  WARN non-nil means warn if there
 exists an auto-save file more recent than the visited file.
@@ -2450,7 +2464,7 @@
 
 (defun normal-mode (&optional find-file)
   "Choose the major mode for this buffer automatically.
-Also sets up any specified local variables of the file.
+Also sets up any specified local variables of the file or its directory.
 Uses the visited file name, the -*- line, and the local variables spec.
 
 This function is called automatically from `find-file'.  In that case,
@@ -3219,6 +3233,7 @@
 	   (fill-column             . integerp)	;; C source code
 	   (indent-tabs-mode        . booleanp)	;; C source code
 	   (left-margin             . integerp)	;; C source code
+	   (inhibit-compacting-font-caches . booleanp) ;; C source code
 	   (no-update-autoloads     . booleanp)
 	   (lexical-binding	 . booleanp)	  ;; C source code
 	   (tab-width               . integerp)	  ;; C source code
@@ -3481,6 +3496,8 @@
 
 (defun hack-local-variables (&optional handle-mode)
   "Parse and put into effect this buffer's local variables spec.
+For buffers visiting files, also puts into effect directory-local
+variables.
 Uses `hack-local-variables-apply' to apply the variables.
 
 If HANDLE-MODE is nil, we apply all the specified local
@@ -4010,6 +4027,52 @@
       ;; No cache entry.
       locals-dir)))
 
+(defun dir-locals--get-sort-score (node)
+  "Return a number used for sorting the definitions of dir locals.
+NODE is assumed to be a cons cell where the car is either a
+string or a symbol representing a mode name.
+
+If it is a mode then the the depth of the mode (ie, how many
+parents that mode has) will be returned.
+
+If it is a string then the length of the string plus 1000 will be
+returned.
+
+Otherwise it returns -1.
+
+That way the value can be used to sort the list such that deeper
+modes will be after the other modes.  This will be followed by
+directory entries in order of length.  If the entries are all
+applied in order then that means the more specific modes will
+override the values specified by the earlier modes and directory
+variables will override modes."
+  (let ((key (car node)))
+    (cond ((null key) -1)
+          ((symbolp key)
+           (let ((mode key)
+                 (depth 0))
+             (while (setq mode (get mode 'derived-mode-parent))
+               (setq depth (1+ depth)))
+             depth))
+          ((stringp key)
+           (+ 1000 (length key)))
+          (t -2))))
+
+(defun dir-locals--sort-variables (variables)
+  "Sorts VARIABLES so that applying them in order has the right effect.
+The variables are compared by dir-locals--get-sort-score.
+Directory entries are then recursively sorted using the same
+criteria."
+  (setq variables (sort variables
+                        (lambda (a b)
+                          (< (dir-locals--get-sort-score a)
+                             (dir-locals--get-sort-score b)))))
+  (dolist (n variables)
+    (when (stringp (car n))
+      (setcdr n (dir-locals--sort-variables (cdr n)))))
+
+  variables)
+
 (defun dir-locals-read-from-dir (dir)
   "Load all variables files in DIR and register a new class and instance.
 DIR is the absolute name of a directory which must contain at
@@ -4038,6 +4101,7 @@
                                     (read (current-buffer))))
             (end-of-file nil))))
       (setq success latest))
+    (setq variables (dir-locals--sort-variables variables))
     (dir-locals-set-class-variables class-name variables)
     (dir-locals-set-directory-class dir class-name success)
     class-name))
@@ -4239,12 +4303,15 @@
   "Write current buffer into file FILENAME.
 This makes the buffer visit that file, and marks it as not modified.
 
-If you specify just a directory name as FILENAME, that means to use
-the default file name but in that directory.  You can also yank
-the default file name into the minibuffer to edit it, using \\<minibuffer-local-map>\\[next-history-element].
+Interactively, prompt for FILENAME.
+If you specify just a directory name as FILENAME, that means to write
+to a file in that directory.  In this case, the base name of the file
+is the same as that of the file visited in the buffer, or the buffer
+name sans leading directories, if any, if the buffer is not already
+visiting a file.
 
-If the buffer is not already visiting a file, the default file name
-for the output file is the buffer name.
+You can also yank the file name into the minibuffer to edit it,
+using \\<minibuffer-local-map>\\[next-history-element].
 
 If optional second arg CONFIRM is non-nil, this function
 asks for confirmation before overwriting an existing file.
diff -Nru emacs-26.1+1/lisp/filesets.el emacs-26.3+1/lisp/filesets.el
--- emacs-26.1+1/lisp/filesets.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/filesets.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; filesets.el --- handle group of files
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/files-x.el emacs-26.3+1/lisp/files-x.el
--- emacs-26.1+1/lisp/files-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/files-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; files-x.el --- extended file handling commands
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Juri Linkov <juri@jurta.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -377,7 +377,9 @@
 	   ((eq variable 'mode) (goto-char beg))
 	   ((null replaced-pos) (goto-char end))
 	   (replaced-pos (goto-char replaced-pos)))
-	  (if (and (not (eq (char-before) ?\;))
+          (if (and (save-excursion
+                     (skip-chars-backward " \t")
+                     (not (eq (char-before) ?\;)))
 		   (not (equal (point) (marker-position beg)))
 		   ;; When existing `-*- -*-' is empty, beg > end.
 		   (not (> (marker-position beg) (marker-position end))))
@@ -578,31 +580,33 @@
 always applies.
 PROFILES is a list of connection profiles (symbols).")
 
-(defsubst connection-local-normalize-criteria (criteria &rest properties)
-  "Normalize plist CRITERIA according to PROPERTIES.
-Return a new ordered plist list containing only property names from PROPERTIES."
-  (delq
-   nil
+(defsubst connection-local-normalize-criteria (criteria)
+  "Normalize plist CRITERIA according to properties.
+Return a reordered plist."
+  (apply
+   'append
    (mapcar
     (lambda (property)
       (when (and (plist-member criteria property) (plist-get criteria property))
         (list property (plist-get criteria property))))
-    properties)))
+    '(:application :protocol :user :machine))))
 
 (defsubst connection-local-get-profiles (criteria)
   "Return the connection profiles list for CRITERIA.
 CRITERIA is a plist identifying a connection and the application
 using this connection, see `connection-local-criteria-alist'."
-  (or (cdr
-       (assoc
-        (connection-local-normalize-criteria
-         criteria :application :protocol :user :machine)
-        connection-local-criteria-alist))
-      ;; Try it without :application.
-      (cdr
-       (assoc
-        (connection-local-normalize-criteria criteria :protocol :user :machine)
-        connection-local-criteria-alist))))
+  (let (profiles)
+    (dolist (crit-alist connection-local-criteria-alist)
+      (let ((crit criteria)
+            (match t))
+        (while (and crit match)
+          (when (plist-member (car crit-alist) (car crit))
+            (setq match (equal (plist-get (car crit-alist) (car crit))
+                               (plist-get criteria (car crit)))))
+          (setq crit (cddr crit)))
+        (when match
+          (setq profiles (append profiles (cdr crit-alist))))))
+    (delete-dups profiles)))
 
 ;;;###autoload
 (defun connection-local-set-profiles (criteria &rest profiles)
@@ -621,8 +625,7 @@
   (dolist (profile profiles)
     (unless (assq profile connection-local-profile-alist)
       (error "No such connection profile `%s'" (symbol-name profile))))
-  (let* ((criteria (connection-local-normalize-criteria
-                    criteria :application :protocol :user :machine))
+  (let* ((criteria (connection-local-normalize-criteria criteria))
          (slot (assoc criteria connection-local-criteria-alist)))
     (if slot
         (setcdr slot (delete-dups (append (cdr slot) profiles)))
diff -Nru emacs-26.1+1/lisp/find-cmd.el emacs-26.3+1/lisp/find-cmd.el
--- emacs-26.1+1/lisp/find-cmd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/find-cmd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; find-cmd.el --- Build a valid find(1) command with sexps
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Philip Jackson <phil@shellarchive.co.uk>
 ;; Version: 0.6
diff -Nru emacs-26.1+1/lisp/find-dired.el emacs-26.3+1/lisp/find-dired.el
--- emacs-26.1+1/lisp/find-dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/find-dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; find-dired.el --- run a `find' command and dired the output  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994-1995, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994-1995, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
diff -Nru emacs-26.1+1/lisp/finder.el emacs-26.3+1/lisp/finder.el
--- emacs-26.1+1/lisp/finder.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/finder.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; finder.el --- topic & keyword-based code finder
 
-;; Copyright (C) 1992, 1997-1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1997-1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
diff -Nru emacs-26.1+1/lisp/find-file.el emacs-26.3+1/lisp/find-file.el
--- emacs-26.1+1/lisp/find-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/find-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: c, matching, tools
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/find-lisp.el emacs-26.3+1/lisp/find-lisp.el
--- emacs-26.1+1/lisp/find-lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/find-lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 ;; Created: Fri Mar 26 1999
 ;; Keywords: unix
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/flow-ctrl.el emacs-26.3+1/lisp/flow-ctrl.el
--- emacs-26.1+1/lisp/flow-ctrl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/flow-ctrl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
 
-;; Copyright (C) 1990-1991, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1990-1991, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Kevin Gallagher
diff -Nru emacs-26.1+1/lisp/foldout.el emacs-26.3+1/lisp/foldout.el
--- emacs-26.1+1/lisp/foldout.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/foldout.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/follow.el emacs-26.3+1/lisp/follow.el
--- emacs-26.1+1/lisp/follow.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/follow.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; follow.el --- synchronize windows showing the same buffer
 
-;; Copyright (C) 1995-1997, 1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1995-1997, 1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Anders Lindgren
@@ -1385,7 +1385,13 @@
 	  (unless (eq win (selected-window))
 	    (let ((p (window-point win)))
 	      (set-window-start win (window-start win) nil)
-	      (set-window-point win p))))
+              (if (nth 2 (pos-visible-in-window-p p win t))
+                  ;; p is in a partially visible line.  We can't leave
+                  ;; window-point there, because C-x o back into WIN
+                  ;; would then fail.
+                  (with-selected-window win
+                    (forward-line)) ; redisplay will recenter it in WIN.
+	        (set-window-point win p)))))
 
 	(unless visible
 	  ;; If point may not be visible in the selected window,
diff -Nru emacs-26.1+1/lisp/font-core.el emacs-26.3+1/lisp/font-core.el
--- emacs-26.1+1/lisp/font-core.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/font-core.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; font-core.el --- Core interface to font-lock
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages, faces
diff -Nru emacs-26.1+1/lisp/font-lock.el emacs-26.3+1/lisp/font-lock.el
--- emacs-26.1+1/lisp/font-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/font-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; font-lock.el --- Electric font lock mode
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski
 ;;	Richard Stallman
diff -Nru emacs-26.1+1/lisp/format.el emacs-26.3+1/lisp/format.el
--- emacs-26.1+1/lisp/format.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/format.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; format.el --- read and save files in multiple formats
 
-;; Copyright (C) 1994-1995, 1997, 1999, 2001-2018 Free Software
+;; Copyright (C) 1994-1995, 1997, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
diff -Nru emacs-26.1+1/lisp/format-spec.el emacs-26.3+1/lisp/format-spec.el
--- emacs-26.1+1/lisp/format-spec.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/format-spec.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; format-spec.el --- functions for formatting arbitrary formatting strings
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: tools
diff -Nru emacs-26.1+1/lisp/forms.el emacs-26.3+1/lisp/forms.el
--- emacs-26.1+1/lisp/forms.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/forms.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; forms.el --- Forms mode: edit a file as a form to fill in
 
-;; Copyright (C) 1991, 1994-1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1991, 1994-1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
diff -Nru emacs-26.1+1/lisp/frame.el emacs-26.3+1/lisp/frame.el
--- emacs-26.1+1/lisp/frame.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/frame.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; frame.el --- multi-frame management independent of window systems  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1994, 1996-1997, 2000-2018 Free Software
+;; Copyright (C) 1993-1994, 1996-1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -597,7 +597,9 @@
 (defun make-frame-command ()
   "Make a new frame, on the same terminal as the selected frame.
 If the terminal is a text-only terminal, this also selects the
-new frame."
+new frame.
+
+When called from Lisp, returns the new frame."
   (interactive)
   (if (display-graphic-p)
       (make-frame)
@@ -1444,14 +1446,16 @@
     (with-current-buffer (get-buffer-create "*frame-size-history*")
       (erase-buffer)
       (insert (format "Frame size history of %s\n" frame))
-      (while (listp (setq entry (pop history)))
+      (while (consp (setq entry (pop history)))
 	(when (eq (car entry) frame)
           (pop entry)
           (insert (format "%s" (pop entry)))
           (move-to-column 24 t)
           (while entry
             (insert (format " %s" (pop entry))))
-          (insert "\n"))))))
+          (insert "\n")))
+      (unless frame-size-history
+        (insert "Frame size history is nil.\n")))))
 
 (declare-function x-frame-edges "xfns.c" (&optional frame type))
 (declare-function w32-frame-edges "w32fns.c" (&optional frame type))
@@ -1689,6 +1693,14 @@
 
 ;;;; Frame/display capabilities.
 
+;; These functions should make the features they test explicit in
+;; their names, so that when capabilities or the corresponding Emacs
+;; features change, it will be easy to find all the tests for such
+;; capabilities by a simple text search.  See more about the history
+;; and the intent of these functions in
+;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2019-04/msg00004.html
+;; or in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35058#17.
+
 (declare-function msdos-mouse-p "dosfns.c")
 
 (defun display-mouse-p (&optional display)
@@ -2475,6 +2487,11 @@
 ;; F5 then produces the correct effect, the variable doesn't need
 ;; to be in this list; otherwise, it does.
 (mapc (lambda (var)
+        ;; Using symbol-function here tells the watcher machinery to
+        ;; call the C function set-buffer-redisplay directly, thus
+        ;; avoiding a potential GC.  This isn't strictly necessary,
+        ;; but it's a nice way to exercise the direct subr-calling
+        ;; machinery.
         (add-variable-watcher var (symbol-function 'set-buffer-redisplay)))
       '(line-spacing
         overline-margin
diff -Nru emacs-26.1+1/lisp/frameset.el emacs-26.3+1/lisp/frameset.el
--- emacs-26.1+1/lisp/frameset.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/frameset.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; frameset.el --- save and restore frame and window setup -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
 ;; Keywords: convenience
diff -Nru emacs-26.1+1/lisp/fringe.el emacs-26.3+1/lisp/fringe.el
--- emacs-26.1+1/lisp/fringe.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/fringe.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fringe.el --- fringe setup and control
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/generic-x.el emacs-26.3+1/lisp/generic-x.el
--- emacs-26.1+1/lisp/generic-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/generic-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; generic-x.el --- A collection of generic modes
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996
diff -Nru emacs-26.1+1/lisp/gnus/canlock.el emacs-26.3+1/lisp/gnus/canlock.el
--- emacs-26.1+1/lisp/gnus/canlock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/canlock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; canlock.el --- functions for Cancel-Lock feature
 
-;; Copyright (C) 1998-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
diff -Nru emacs-26.1+1/lisp/gnus/ChangeLog.1 emacs-26.3+1/lisp/gnus/ChangeLog.1
--- emacs-26.1+1/lisp/gnus/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3702,7 +3702,7 @@
 	* gnus.el: Quassia Gnus v0.1 is released.
 
 
-  Copyright (C) 1997-2018 Free Software Foundation, Inc.
+  Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/gnus/ChangeLog.2 emacs-26.3+1/lisp/gnus/ChangeLog.2
--- emacs-26.1+1/lisp/gnus/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -18538,7 +18538,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-  Copyright (C) 2000-2002, 2004-2018 Free Software Foundation, Inc.
+  Copyright (C) 2000-2002, 2004-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/gnus/ChangeLog.3 emacs-26.3+1/lisp/gnus/ChangeLog.3
--- emacs-26.1+1/lisp/gnus/ChangeLog.3	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/ChangeLog.3	2019-09-10 00:32:49.000000000 +0000
@@ -26325,7 +26325,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-  Copyright (C) 2004-2018 Free Software Foundation, Inc.
+  Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/gnus/deuglify.el emacs-26.3+1/lisp/gnus/deuglify.el
--- emacs-26.1+1/lisp/gnus/deuglify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/deuglify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
 ;;         Thomas Steffen
diff -Nru emacs-26.1+1/lisp/gnus/gmm-utils.el emacs-26.3+1/lisp/gnus/gmm-utils.el
--- emacs-26.1+1/lisp/gnus/gmm-utils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gmm-utils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib <reiner.steib@gmx.de>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-agent.el emacs-26.3+1/lisp/gnus/gnus-agent.el
--- emacs-26.1+1/lisp/gnus/gnus-agent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-agent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-agent.el --- unplugged support for Gnus
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/gnus/gnus-art.el emacs-26.3+1/lisp/gnus/gnus-art.el
--- emacs-26.1+1/lisp/gnus/gnus-art.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-art.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -2254,9 +2254,7 @@
 		     start end)))))))
 
 (defun gnus-article-treat-fold-newsgroups ()
-  "Unfold folded message headers.
-Only the headers that fit into the current window width will be
-unfolded."
+  "Fold the Newsgroups and Followup-To message headers."
   (interactive)
   (gnus-with-article-headers
     (while (gnus-article-goto-header "newsgroups\\|followup-to")
@@ -7506,7 +7504,7 @@
     (2.0   . "^[A-Z][a-z][A-Z][a-z][a-z][^a-z]")) ;; ^[A-Z][a-z]{4,4}
   "An alist of (RATE . REGEXP) pairs for `gnus-button-mid-or-mail-heuristic'.
 
-A negative RATE indicates a message IDs, whereas a positive indicates a mail
+A negative RATE indicates a message ID, whereas a positive indicates a mail
 address.  The REGEXP is processed with `case-fold-search' set to nil."
   :version "22.1"
   :group 'gnus-article-buttons
@@ -7515,7 +7513,7 @@
 
 (defun gnus-button-mid-or-mail-heuristic (mid-or-mail)
   "Guess whether MID-OR-MAIL is a message ID or a mail address.
-Returns `mid' if MID-OR-MAIL is a message IDs, `mail' if it's a mail
+Returns `mid' if MID-OR-MAIL is a message ID, `mail' if it's a mail
 address, `ask' if unsure and `invalid' if the string is invalid."
   (let ((case-fold-search nil)
 	(list gnus-button-mid-or-mail-heuristic-alist)
diff -Nru emacs-26.1+1/lisp/gnus/gnus-async.el emacs-26.3+1/lisp/gnus/gnus-async.el
--- emacs-26.1+1/lisp/gnus/gnus-async.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-async.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-async.el --- asynchronous support for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-bcklg.el emacs-26.3+1/lisp/gnus/gnus-bcklg.el
--- emacs-26.1+1/lisp/gnus/gnus-bcklg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-bcklg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-bcklg.el --- backlog functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-bookmark.el emacs-26.3+1/lisp/gnus/gnus-bookmark.el
--- emacs-26.1+1/lisp/gnus/gnus-bookmark.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-bookmark.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-bookmark.el --- Bookmarks in Gnus
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-cache.el emacs-26.3+1/lisp/gnus/gnus-cache.el
--- emacs-26.1+1/lisp/gnus/gnus-cache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-cache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-cache.el --- cache interface for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-cite.el emacs-26.3+1/lisp/gnus/gnus-cite.el
--- emacs-26.1+1/lisp/gnus/gnus-cite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-cite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
@@ -94,7 +94,7 @@
 ;;     -----Original Message-----
 ;;     From: ...
 ;;     To: ...
-;;     Sent: ...   [date, in non-RFC-2822 format]
+;;     Sent: ...   [date, in non-RFC-822-or-later format]
 ;;     Subject: ...
 ;;
 ;;     Cited message, with no prefixes
diff -Nru emacs-26.1+1/lisp/gnus/gnus-cloud.el emacs-26.3+1/lisp/gnus/gnus-cloud.el
--- emacs-26.1+1/lisp/gnus/gnus-cloud.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-cloud.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-cloud.el --- storing and retrieving data via IMAP
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/gnus/gnus-cus.el emacs-26.3+1/lisp/gnus/gnus-cus.el
--- emacs-26.1+1/lisp/gnus/gnus-cus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-cus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-cus.el --- customization commands for Gnus
 
-;; Copyright (C) 1996, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: news
@@ -140,10 +140,10 @@
 				 :format "%v")) "\
 When to expire.
 
-Overrides any `nnmail-expiry-wait' and `nnmail-expiry-wait-function'
-when expiring expirable messages.  The value can either be a number of
-days (not necessarily an integer) or the symbols `never' or
-`immediate'.")
+Overrides any `nnmail-expiry-wait' or `nnmail-expiry-wait-function'
+settings when expiring expirable messages.  The value can be
+either a number of days (not necessarily an integer), or one of
+the symbols `never' or `immediate'.")
 
     (expiry-target (choice :tag "Expiry Target"
 			   :value delete
diff -Nru emacs-26.1+1/lisp/gnus/gnus-delay.el emacs-26.3+1/lisp/gnus/gnus-delay.el
--- emacs-26.1+1/lisp/gnus/gnus-delay.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-delay.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-delay.el --- Delayed posting of articles
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
diff -Nru emacs-26.1+1/lisp/gnus/gnus-demon.el emacs-26.3+1/lisp/gnus/gnus-demon.el
--- emacs-26.1+1/lisp/gnus/gnus-demon.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-demon.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-demon.el --- daemonic Gnus behavior
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-diary.el emacs-26.3+1/lisp/gnus/gnus-diary.el
--- emacs-26.1+1/lisp/gnus/gnus-diary.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-diary.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-dired.el emacs-26.3+1/lisp/gnus/gnus-dired.el
--- emacs-26.1+1/lisp/gnus/gnus-dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-dired.el --- utility functions where gnus and dired meet
 
-;; Copyright (C) 1996-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
 ;;          Shenghuo Zhu <zsh@cs.rochester.edu>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-draft.el emacs-26.3+1/lisp/gnus/gnus-draft.el
--- emacs-26.1+1/lisp/gnus/gnus-draft.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-draft.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-draft.el --- draft message support for Gnus
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-dup.el emacs-26.3+1/lisp/gnus/gnus-dup.el
--- emacs-26.1+1/lisp/gnus/gnus-dup.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-dup.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-dup.el --- suppression of duplicate articles in Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-eform.el emacs-26.3+1/lisp/gnus/gnus-eform.el
--- emacs-26.1+1/lisp/gnus/gnus-eform.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-eform.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-eform.el --- a mode for editing forms for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus.el emacs-26.3+1/lisp/gnus/gnus.el
--- emacs-26.1+1/lisp/gnus/gnus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
 
-;; Copyright (C) 1987-1990, 1993-1998, 2000-2018 Free Software
+;; Copyright (C) 1987-1990, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -2745,12 +2745,12 @@
      (let ((interactive (nth 1 (memq ':interactive package))))
        (mapcar
 	(lambda (function)
-	  (let (keymap)
+	  (let (type)
 	    (when (consp function)
-	      (setq keymap (car (memq 'keymap function)))
+	      (setq type (cadr function))
 	      (setq function (car function)))
 	    (unless (fboundp function)
-	      (autoload function (car package) nil interactive keymap))))
+	      (autoload function (car package) nil interactive type))))
 	(if (eq (nth 1 package) ':interactive)
 	    (nthcdr 3 package)
 	  (cdr package)))))
@@ -2863,8 +2863,8 @@
       gnus-list-of-unread-articles gnus-list-of-read-articles
       gnus-offer-save-summaries gnus-make-thread-indent-array
       gnus-summary-exit gnus-update-read-articles gnus-summary-last-subject
-      gnus-summary-skip-intangible gnus-summary-article-number
-      gnus-data-header gnus-data-find)
+      (gnus-summary-skip-intangible macro) (gnus-summary-article-number macro)
+      (gnus-data-header macro) (gnus-data-find macro))
      ("gnus-group" gnus-group-insert-group-line gnus-group-quit
       gnus-group-list-groups gnus-group-first-unread-group
       gnus-group-set-mode-line gnus-group-set-info gnus-group-save-newsrc
diff -Nru emacs-26.1+1/lisp/gnus/gnus-fun.el emacs-26.3+1/lisp/gnus/gnus-fun.el
--- emacs-26.1+1/lisp/gnus/gnus-fun.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-fun.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-gravatar.el emacs-26.3+1/lisp/gnus/gnus-gravatar.el
--- emacs-26.1+1/lisp/gnus/gnus-gravatar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-gravatar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-gravatar.el --- Gnus Gravatar support
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
@@ -46,7 +46,8 @@
   :group 'gnus-gravatar)
 
 (defcustom gnus-gravatar-too-ugly gnus-article-x-face-too-ugly
-  "Regexp matching posters whose avatar shouldn't be shown automatically."
+  "Regexp matching posters whose avatar shouldn't be shown automatically.
+If nil, show all avatars."
   :type '(choice regexp (const nil))
   :version "24.1"
   :group 'gnus-gravatar)
diff -Nru emacs-26.1+1/lisp/gnus/gnus-group.el emacs-26.3+1/lisp/gnus/gnus-group.el
--- emacs-26.1+1/lisp/gnus/gnus-group.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-group.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-group.el --- group mode commands for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-html.el emacs-26.3+1/lisp/gnus/gnus-html.el
--- emacs-26.1+1/lisp/gnus/gnus-html.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-html.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-html.el --- Render HTML in a buffer.
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: html, web
diff -Nru emacs-26.1+1/lisp/gnus/gnus-icalendar.el emacs-26.3+1/lisp/gnus/gnus-icalendar.el
--- emacs-26.1+1/lisp/gnus/gnus-icalendar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-icalendar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-icalendar.el --- reply to iCalendar meeting requests
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Tatarik <Jan.Tatarik@gmail.com>
 ;; Keywords: mail, icalendar, org
@@ -767,7 +767,7 @@
     `(let ((,charset (cdr (assoc 'charset (mm-handle-type ,handle)))))
        (with-temp-buffer
          (mm-insert-part ,handle)
-         (when (string= ,charset "utf-8")
+         (when (string= (downcase ,charset) "utf-8")
            (decode-coding-region (point-min) (point-max) 'utf-8))
          ,@body))))
 
diff -Nru emacs-26.1+1/lisp/gnus/gnus-int.el emacs-26.3+1/lisp/gnus/gnus-int.el
--- emacs-26.1+1/lisp/gnus/gnus-int.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-int.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-int.el --- backend interface functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-kill.el emacs-26.3+1/lisp/gnus/gnus-kill.el
--- emacs-26.1+1/lisp/gnus/gnus-kill.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-kill.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-kill.el --- kill commands for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-logic.el emacs-26.3+1/lisp/gnus/gnus-logic.el
--- emacs-26.1+1/lisp/gnus/gnus-logic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-logic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-logic.el --- advanced scoring code for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-mh.el emacs-26.3+1/lisp/gnus/gnus-mh.el
--- emacs-26.1+1/lisp/gnus/gnus-mh.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-mh.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-mh.el --- mh-e interface for Gnus
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-ml.el emacs-26.3+1/lisp/gnus/gnus-ml.el
--- emacs-26.1+1/lisp/gnus/gnus-ml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-ml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-ml.el --- Mailing list minor mode for Gnus
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Gilles  <jgilles@free.fr>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/gnus-mlspl.el emacs-26.3+1/lisp/gnus/gnus-mlspl.el
--- emacs-26.1+1/lisp/gnus/gnus-mlspl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-mlspl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/gnus-msg.el emacs-26.3+1/lisp/gnus/gnus-msg.el
--- emacs-26.1+1/lisp/gnus/gnus-msg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-msg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-notifications.el emacs-26.3+1/lisp/gnus/gnus-notifications.el
--- emacs-26.1+1/lisp/gnus/gnus-notifications.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-notifications.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; gnus-notifications.el -- Send notification on new message in Gnus
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-picon.el emacs-26.3+1/lisp/gnus/gnus-picon.el
--- emacs-26.1+1/lisp/gnus/gnus-picon.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-picon.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-picon.el --- displaying pretty icons in Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news xpm annotation glyph faces
diff -Nru emacs-26.1+1/lisp/gnus/gnus-range.el emacs-26.3+1/lisp/gnus/gnus-range.el
--- emacs-26.1+1/lisp/gnus/gnus-range.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-range.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-range.el --- range and sequence functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-registry.el emacs-26.3+1/lisp/gnus/gnus-registry.el
--- emacs-26.1+1/lisp/gnus/gnus-registry.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-registry.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-registry.el --- article registry for Gnus
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: news registry
diff -Nru emacs-26.1+1/lisp/gnus/gnus-rfc1843.el emacs-26.3+1/lisp/gnus/gnus-rfc1843.el
--- emacs-26.1+1/lisp/gnus/gnus-rfc1843.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-rfc1843.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-rfc1843.el --- HZ (rfc1843) decoding interface functions for Gnus
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news HZ HZ+ mail i18n
diff -Nru emacs-26.1+1/lisp/gnus/gnus-salt.el emacs-26.3+1/lisp/gnus/gnus-salt.el
--- emacs-26.1+1/lisp/gnus/gnus-salt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-salt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus
 
-;; Copyright (C) 1996-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-score.el emacs-26.3+1/lisp/gnus/gnus-score.el
--- emacs-26.1+1/lisp/gnus/gnus-score.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-score.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-score.el --- scoring code for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-sieve.el emacs-26.3+1/lisp/gnus/gnus-sieve.el
--- emacs-26.1+1/lisp/gnus/gnus-sieve.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-sieve.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: NAGY Andras <nagya@inf.elte.hu>,
 ;;	Simon Josefsson <simon@josefsson.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-spec.el emacs-26.3+1/lisp/gnus/gnus-spec.el
--- emacs-26.1+1/lisp/gnus/gnus-spec.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-spec.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-spec.el --- format spec functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-srvr.el emacs-26.3+1/lisp/gnus/gnus-srvr.el
--- emacs-26.1+1/lisp/gnus/gnus-srvr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-srvr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-srvr.el --- virtual server support for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-start.el emacs-26.3+1/lisp/gnus/gnus-start.el
--- emacs-26.1+1/lisp/gnus/gnus-start.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-start.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-start.el --- startup functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-sum.el emacs-26.3+1/lisp/gnus/gnus-sum.el
--- emacs-26.1+1/lisp/gnus/gnus-sum.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-sum.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -83,12 +83,12 @@
 read (or just marked as read) article, the old article will not
 normally be displayed in the Summary buffer.  If this variable is
 t, Gnus will attempt to grab the headers to the old articles, and
-thereby build complete threads.  If it has the value `some', all
-old headers will be fetched but only enough headers to connect
+thereby build complete threads.  If the value is the symbol `some',
+all old headers will be fetched but only enough headers to connect
 otherwise loose threads will be displayed.  This variable can
 also be a number.  In that case, no more than that number of old
-headers will be fetched.  If it has the value `invisible', all
-old headers will be fetched, but none will be displayed.
+headers will be fetched.  If the value is the symbol `invisible',
+all old headers will be fetched, but none will be displayed.
 
 The server has to support NOV for any of this to work.
 
@@ -203,9 +203,10 @@
 
 (defcustom gnus-build-sparse-threads nil
   "If non-nil, fill in the gaps in threads.
-If `some', only fill in the gaps that are needed to tie loose threads
-together.  If `more', fill in all leaf nodes that Gnus can find.  If
-non-nil and non-`some', fill in all gaps that Gnus manages to guess."
+If set to the symbol `some', only fill in the gaps that are
+needed to tie loose threads together.  If the symbol `more', fill
+in all leaf nodes that Gnus can find.  If t (or any other value),
+fill in all gaps that Gnus manages to guess."
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
 		 (const some)
@@ -11962,7 +11963,7 @@
   (interactive "P")
   (gnus-summary-sort 'chars reverse))
 
-(defun gnus-summary-sort-by-mark (&optional reverse)
+(defun gnus-summary-sort-by-marks (&optional reverse)
   "Sort the summary buffer by article marks.
 Argument REVERSE means reverse order."
   (interactive "P")
diff -Nru emacs-26.1+1/lisp/gnus/gnus-topic.el emacs-26.3+1/lisp/gnus/gnus-topic.el
--- emacs-26.1+1/lisp/gnus/gnus-topic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-topic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Ilja Weis <kult@uni-paderborn.de>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-undo.el emacs-26.3+1/lisp/gnus/gnus-undo.el
--- emacs-26.1+1/lisp/gnus/gnus-undo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-undo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-undo.el --- minor mode for undoing in Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gnus-util.el emacs-26.3+1/lisp/gnus/gnus-util.el
--- emacs-26.1+1/lisp/gnus/gnus-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-util.el --- utility functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -140,7 +140,7 @@
 
 (defun gnus-extract-address-components (from)
   "Extract address components from a From header.
-Given an RFC-822 address FROM, extract full name and canonical address.
+Given an RFC-822 (or later) address FROM, extract name and address.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  Much more simple
 solution than `mail-extract-address-components', which works much better, but
 is slower."
diff -Nru emacs-26.1+1/lisp/gnus/gnus-uu.el emacs-26.3+1/lisp/gnus/gnus-uu.el
--- emacs-26.1+1/lisp/gnus/gnus-uu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-uu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
 
-;; Copyright (C) 1985-1987, 1993-1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1987, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/gnus-vm.el emacs-26.3+1/lisp/gnus/gnus-vm.el
--- emacs-26.1+1/lisp/gnus/gnus-vm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-vm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-vm.el --- vm interface for Gnus
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Persson <pp@gnu.ai.mit.edu>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/gnus-win.el emacs-26.3+1/lisp/gnus/gnus-win.el
--- emacs-26.1+1/lisp/gnus/gnus-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gnus-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-win.el --- window configuration functions for Gnus
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/gssapi.el emacs-26.3+1/lisp/gnus/gssapi.el
--- emacs-26.1+1/lisp/gnus/gssapi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/gssapi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gssapi.el --- GSSAPI/Kerberos 5 interface for Emacs
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;;         Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/legacy-gnus-agent.el emacs-26.3+1/lisp/gnus/legacy-gnus-agent.el
--- emacs-26.1+1/lisp/gnus/legacy-gnus-agent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/legacy-gnus-agent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-agent.el --- Legacy unplugged support for Gnus
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/mail-source.el emacs-26.3+1/lisp/gnus/mail-source.el
--- emacs-26.1+1/lisp/gnus/mail-source.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mail-source.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mail-source.el --- functions for fetching mail
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -301,9 +301,9 @@
   :group 'mail-source
   :type 'number)
 
-(defcustom mail-source-movemail-program nil
+(defcustom mail-source-movemail-program "movemail"
   "If non-nil, name of program for fetching new mail."
-  :version "22.1"
+  :version "26.2"
   :group 'mail-source
   :type '(choice (const nil) string))
 
@@ -682,12 +682,16 @@
 	      (setq errors (generate-new-buffer " *mail source loss*"))
 	      (let ((default-directory "/"))
 		(setq result
+		      ;; call-process looks in exec-path, which
+		      ;; contains exec-directory, so will find
+		      ;; Mailutils movemail if it exists, else it will
+		      ;; find "our" movemail in exec-directory.
+		      ;; Bug#31737
 		      (apply
 		       'call-process
 		       (append
 			(list
-			 (or mail-source-movemail-program
-			     (expand-file-name "movemail" exec-directory))
+			 mail-source-movemail-program
 			 nil errors nil from to)))))
 	      (when (file-exists-p to)
 		(set-file-modes to mail-source-default-file-modes))
diff -Nru emacs-26.1+1/lisp/gnus/message.el emacs-26.3+1/lisp/gnus/message.el
--- emacs-26.1+1/lisp/gnus/message.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/message.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; message.el --- composing mail and news messages -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
@@ -1274,10 +1274,9 @@
              (goto-char (point-min))
              (let ((case-fold-search nil))
                (re-search-forward "^OR\\>" nil t))))
-      ;; According to RFC822, "The field-name must be composed of printable
-      ;; ASCII characters (i. e., characters that have decimal values between
-      ;; 33 and 126, except colon)", i. e., any chars except ctl chars,
-      ;; space, or colon.
+      ;; According to RFC 822 and its successors, the field name must
+      ;; consist of printable US-ASCII characters other than colon,
+      ;; i.e., decimal 33-56 and 59-126.
       '(looking-at "[ \t]\\|[][!\"#$%&'()*+,-./0-9;<=>?@A-Z\\\\^_`a-z{|}~]+:"))
   "Set this non-nil if the system's mailer runs the header and body together.
 \(This problem exists on Sunos 4 when sendmail is run in remote mode.)
@@ -1742,7 +1741,7 @@
   :type 'boolean)
 
 (defcustom message-user-fqdn nil
-  "Domain part of Message-Ids."
+  "Domain part of Message-IDs."
   :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)News Headers")
@@ -1800,8 +1799,8 @@
     (concat
      "From "
 
-     ;; Many things can happen to an RFC 822 mailbox before it is put into
-     ;; a `From' line.  The leading phrase can be stripped, e.g.
+     ;; Many things can happen to an RFC 822 (or later) mailbox before it is
+     ;; put into a `From' line.  The leading phrase can be stripped, e.g.
      ;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
      ;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
      ;; can be removed, e.g.
@@ -2431,7 +2430,9 @@
     (while (and (not (eobp))
 		(not last))
       (if (if reverse
-	      (not (looking-at regexp))
+	      (and (not (looking-at regexp))
+		   ;; Don't remove things not looking like header.
+		   (looking-at "[!-9;-~]+:"))
 	    (looking-at regexp))
 	  (progn
 	    (incf number)
@@ -5695,7 +5696,7 @@
 	(insert fullname)
 	(goto-char (point-min))
 	;; Look for a character that cannot appear unquoted
-	;; according to RFC 822.
+	;; according to RFC 822 (or later).
 	(when (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]" nil 1)
 	  ;; Quote fullname, escaping specials.
 	  (goto-char (point-min))
@@ -5709,8 +5710,7 @@
 	(let ((fullname-start (point)))
 	  (insert fullname)
 	  (goto-char fullname-start)
-	  ;; RFC 822 says \ and nonmatching parentheses
-	  ;; must be escaped in comments.
+	  ;; \ and nonmatching parentheses must be escaped in comments.
 	  ;; Escape every instance of ()\ ...
 	  (while (re-search-forward "[()\\]" nil 1)
 	    (replace-match "\\\\\\&" t))
diff -Nru emacs-26.1+1/lisp/gnus/mm-archive.el emacs-26.3+1/lisp/gnus/mm-archive.el
--- emacs-26.1+1/lisp/gnus/mm-archive.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-archive.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-archive.el --- Functions for parsing archive files as MIME
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/gnus/mm-bodies.el emacs-26.3+1/lisp/gnus/mm-bodies.el
--- emacs-26.1+1/lisp/gnus/mm-bodies.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-bodies.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -35,7 +35,7 @@
 ;; BS, vertical TAB, form feed, and ^_
 ;;
 ;; Note that CR is *not* included, as that would allow a non-paired CR
-;; in the body contrary to RFC 2822:
+;; in the body contrary to RFC 822 (or later):
 ;;
 ;;   - CR and LF MUST only occur together as CRLF; they MUST NOT
 ;;     appear independently in the body.
diff -Nru emacs-26.1+1/lisp/gnus/mm-decode.el emacs-26.3+1/lisp/gnus/mm-decode.el
--- emacs-26.1+1/lisp/gnus/mm-decode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-decode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -764,7 +764,7 @@
         (mb (mm-multibyte-p))
         beg)
     (goto-char (point-min))
-    (search-forward-regexp "^\n" nil t)
+    (search-forward-regexp "^\n" nil 'move) ;; There might be no body.
     (setq beg (point))
     (with-current-buffer
           (generate-new-buffer " *mm*")
@@ -1117,7 +1117,7 @@
 	  (mm-remove-part handle)))))))
 
 (defun mm-destroy-parts (handles)
-  "Remove the displayed MIME parts represented by HANDLES."
+  "Destroy the displayed MIME parts represented by HANDLES."
   (if (and (listp handles)
 	   (bufferp (car handles)))
       (mm-destroy-part handles)
diff -Nru emacs-26.1+1/lisp/gnus/mm-encode.el emacs-26.3+1/lisp/gnus/mm-encode.el
--- emacs-26.1+1/lisp/gnus/mm-encode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-encode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-encode.el --- Functions for encoding MIME things
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff -Nru emacs-26.1+1/lisp/gnus/mm-extern.el emacs-26.3+1/lisp/gnus/mm-extern.el
--- emacs-26.1+1/lisp/gnus/mm-extern.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-extern.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-extern.el --- showing message/external-body
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
diff -Nru emacs-26.1+1/lisp/gnus/mml1991.el emacs-26.3+1/lisp/gnus/mml1991.el
--- emacs-26.1+1/lisp/gnus/mml1991.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mml1991.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;	Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
diff -Nru emacs-26.1+1/lisp/gnus/mml2015.el emacs-26.3+1/lisp/gnus/mml2015.el
--- emacs-26.1+1/lisp/gnus/mml2015.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mml2015.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
diff -Nru emacs-26.1+1/lisp/gnus/mml.el emacs-26.3+1/lisp/gnus/mml.el
--- emacs-26.1+1/lisp/gnus/mml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mml.el --- A package for parsing and validating MML documents
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -979,8 +979,10 @@
   (unless handles
     (setq handles (mm-dissect-buffer t)))
   (goto-char (point-min))
-  (search-forward "\n\n" nil t)
-  (delete-region (point) (point-max))
+  (if (search-forward "\n\n" nil 'move)
+      (delete-region (point) (point-max))
+    ;; No content in the part that is the sole part of this message.
+    (insert (if (bolp) "\n" "\n\n")))
   (if (stringp (car handles))
       (mml-insert-mime handles)
     (mml-insert-mime handles t))
diff -Nru emacs-26.1+1/lisp/gnus/mml-sec.el emacs-26.3+1/lisp/gnus/mml-sec.el
--- emacs-26.1+1/lisp/gnus/mml-sec.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mml-sec.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mml-sec.el --- A package with security functions for MML documents
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -658,6 +658,8 @@
     (catch 'break
       (dolist (uid uids nil)
 	(if (and (stringp (epg-user-id-string uid))
+                 (car (mail-header-parse-address
+                       (epg-user-id-string uid)))
 		 (equal (downcase (car (mail-header-parse-address
 					(epg-user-id-string uid))))
 			(downcase (car (mail-header-parse-address
diff -Nru emacs-26.1+1/lisp/gnus/mml-smime.el emacs-26.3+1/lisp/gnus/mml-smime.el
--- emacs-26.1+1/lisp/gnus/mml-smime.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mml-smime.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mml-smime.el --- S/MIME support for MML
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: Gnus, MIME, S/MIME, MML
diff -Nru emacs-26.1+1/lisp/gnus/mm-partial.el emacs-26.3+1/lisp/gnus/mm-partial.el
--- emacs-26.1+1/lisp/gnus/mm-partial.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-partial.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-partial.el --- showing message/partial
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message partial
diff -Nru emacs-26.1+1/lisp/gnus/mm-url.el emacs-26.3+1/lisp/gnus/mm-url.el
--- emacs-26.1+1/lisp/gnus/mm-url.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-url.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-url.el --- a wrapper of url functions/commands for Gnus
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 
diff -Nru emacs-26.1+1/lisp/gnus/mm-util.el emacs-26.3+1/lisp/gnus/mm-util.el
--- emacs-26.1+1/lisp/gnus/mm-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -843,7 +843,8 @@
 					(prog2
 					    (insert-file-contents err-file)
 					    (buffer-string)
-					  (erase-buffer)) t)
+					  (erase-buffer))
+					nil t)
 				       " ")
 			    "\n")
 		    (setq err-msg
diff -Nru emacs-26.1+1/lisp/gnus/mm-uu.el emacs-26.3+1/lisp/gnus/mm-uu.el
--- emacs-26.1+1/lisp/gnus/mm-uu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-uu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-uu.el --- Return uu stuff as mm handles
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
diff -Nru emacs-26.1+1/lisp/gnus/mm-view.el emacs-26.3+1/lisp/gnus/mm-view.el
--- emacs-26.1+1/lisp/gnus/mm-view.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/mm-view.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mm-view.el --- functions for viewing MIME objects
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -368,10 +368,12 @@
 	  (enriched-decode (point-min) (point-max))))
       (mm-handle-set-undisplayer
        handle
-       `(lambda ()
-          (let ((inhibit-read-only t))
-	    (delete-region ,(copy-marker (point-min) t)
-			   ,(point-max-marker))))))))
+       (if (= (point-min) (point-max))
+	   #'ignore
+	 `(lambda ()
+	    (let ((inhibit-read-only t))
+	      (delete-region ,(copy-marker (point-min) t)
+			     ,(point-max-marker)))))))))
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."
diff -Nru emacs-26.1+1/lisp/gnus/nnagent.el emacs-26.3+1/lisp/gnus/nnagent.el
--- emacs-26.1+1/lisp/gnus/nnagent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnagent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnagent.el --- offline backend for Gnus
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/nnbabyl.el emacs-26.3+1/lisp/gnus/nnbabyl.el
--- emacs-26.1+1/lisp/gnus/nnbabyl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnbabyl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnbabyl.el --- rmail mbox access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nndiary.el emacs-26.3+1/lisp/gnus/nndiary.el
--- emacs-26.1+1/lisp/gnus/nndiary.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nndiary.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nndiary.el --- A diary back end for Gnus
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
diff -Nru emacs-26.1+1/lisp/gnus/nndir.el emacs-26.3+1/lisp/gnus/nndir.el
--- emacs-26.1+1/lisp/gnus/nndir.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nndir.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nndir.el --- single directory newsgroup access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/nndoc.el emacs-26.3+1/lisp/gnus/nndoc.el
--- emacs-26.1+1/lisp/gnus/nndoc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nndoc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nndoc.el --- single file access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nndraft.el emacs-26.3+1/lisp/gnus/nndraft.el
--- emacs-26.1+1/lisp/gnus/nndraft.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nndraft.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nndraft.el --- draft article access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/nneething.el emacs-26.3+1/lisp/gnus/nneething.el
--- emacs-26.1+1/lisp/gnus/nneething.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nneething.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nneething.el --- arbitrary file access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -123,7 +123,7 @@
 	 (file-exists-p file)		; The file exists.
 	 (not (file-directory-p file))	; It's not a dir.
 	 (save-excursion
-	   (let ((nnmail-file-coding-system 'binary))
+	   (let ((nnmail-file-coding-system 'raw-text))
 	     (nnmail-find-file file))	; Insert the file in the nntp buf.
 	   (unless (nnheader-article-p)	; Either it's a real article...
 	     (let ((type
diff -Nru emacs-26.1+1/lisp/gnus/nnfolder.el emacs-26.3+1/lisp/gnus/nnfolder.el
--- emacs-26.1+1/lisp/gnus/nnfolder.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnfolder.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnfolder.el --- mail folder access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;;      ShengHuo Zhu <zsh@cs.rochester.edu> (adding NOV)
diff -Nru emacs-26.1+1/lisp/gnus/nngateway.el emacs-26.3+1/lisp/gnus/nngateway.el
--- emacs-26.1+1/lisp/gnus/nngateway.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nngateway.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nngateway.el --- posting news via mail gateways
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/nnheader.el emacs-26.3+1/lisp/gnus/nnheader.el
--- emacs-26.1+1/lisp/gnus/nnheader.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnheader.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnheader.el --- header access macros for Gnus and its backends
 
-;; Copyright (C) 1987-1990, 1993-1998, 2000-2018 Free Software
+;; Copyright (C) 1987-1990, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nnimap.el emacs-26.3+1/lisp/gnus/nnimap.el
--- emacs-26.1+1/lisp/gnus/nnimap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnimap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnimap.el --- IMAP interface for Gnus
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;         Simon Josefsson <simon@josefsson.org>
diff -Nru emacs-26.1+1/lisp/gnus/nnir.el emacs-26.3+1/lisp/gnus/nnir.el
--- emacs-26.1+1/lisp/gnus/nnir.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnir.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnir.el --- Search mail with various search engines  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de>
 ;; Swish-e and Swish++ backends by:
@@ -969,6 +969,7 @@
          (mapcar
           #'(lambda (group)
             (let (artlist)
+	      (setq group (nnimap-decode-gnus-group group))
               (condition-case ()
                   (when (nnimap-change-group
                          (gnus-group-short-name group) server)
diff -Nru emacs-26.1+1/lisp/gnus/nnmail.el emacs-26.3+1/lisp/gnus/nnmail.el
--- emacs-26.1+1/lisp/gnus/nnmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -159,32 +159,33 @@
 
 (defcustom nnmail-expiry-wait 7
   "Expirable articles that are older than this will be expired.
-This variable can either be a number (which will be interpreted as a
-number of days) -- this doesn't have to be an integer.  This variable
-can also be `immediate' and `never'."
+This variable can be either a number of days (not necessarily an
+integer), or one of the symbols `immediate' or `never', meaning
+an article is immediately or never expirable, respectively.
+For more granular control, see `nnmail-expiry-wait-function'."
   :group 'nnmail-expire
-  :type '(choice (const immediate)
-		 (number :tag "days")
-		 (const never)))
+  :type '(choice (const :tag "Immediate" immediate)
+                 (const :tag "Never" never)
+                 (number :tag "Days")))
 
 (defcustom nnmail-expiry-wait-function nil
-  "Variable that holds function to specify how old articles should be before they are expired.
-The function will be called with the name of the group that the expiry
-is to be performed in, and it should return an integer that says how
-many days an article can be stored before it is considered \"old\".
-It can also return the values `never' and `immediate'.
+  "Function to determine how old articles should be before they are expired.
+The function is called with the name of the group that the expiry
+is to be performed in, and should return a value supported by
+`nnmail-expiry-wait', which it overrides.  If this variable is
+nil, the value of `nnmail-expiry-wait' is used instead.
 
 E.g.:
 
 \(setq nnmail-expiry-wait-function
-      (lambda (newsgroup)
-	(cond ((string-match \"private\" newsgroup) 31)
-	      ((string-match \"junk\" newsgroup) 1)
-	      ((string-match \"important\" newsgroup) \\='never)
-	      (t 7))))"
+      (lambda (group)
+        (cond ((string-match-p \"private\" group) 31)
+              ((string-match-p \"junk\" group) 1)
+              ((string-match-p \"important\" group) \\='never)
+              (t 7))))"
   :group 'nnmail-expire
   :type '(choice (const :tag "nnmail-expiry-wait" nil)
-		 (function :format "%v" nnmail-)))
+                 (function :tag "Custom function")))
 
 (defcustom nnmail-expiry-target 'delete
   "Variable that says where expired messages should end up.
diff -Nru emacs-26.1+1/lisp/gnus/nnmairix.el emacs-26.3+1/lisp/gnus/nnmairix.el
--- emacs-26.1+1/lisp/gnus/nnmairix.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnmairix.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnmairix.el --- Mairix back end for Gnus, the Emacs newsreader
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: David Engster <dengste@eml.cc>
 ;; Keywords: mail searching
diff -Nru emacs-26.1+1/lisp/gnus/nnmbox.el emacs-26.3+1/lisp/gnus/nnmbox.el
--- emacs-26.1+1/lisp/gnus/nnmbox.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnmbox.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnmbox.el --- mail mbox access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nnmh.el emacs-26.3+1/lisp/gnus/nnmh.el
--- emacs-26.1+1/lisp/gnus/nnmh.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnmh.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nnml.el emacs-26.3+1/lisp/gnus/nnml.el
--- emacs-26.1+1/lisp/gnus/nnml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnml.el --- mail spool access for Gnus
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Authors: Didier Verna <didier@xemacs.org> (adding compaction)
 ;;	Simon Josefsson <simon@josefsson.org>
diff -Nru emacs-26.1+1/lisp/gnus/nnoo.el emacs-26.3+1/lisp/gnus/nnoo.el
--- emacs-26.1+1/lisp/gnus/nnoo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnoo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnoo.el --- OO Gnus Backends
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/nnregistry.el emacs-26.3+1/lisp/gnus/nnregistry.el
--- emacs-26.1+1/lisp/gnus/nnregistry.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnregistry.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; nnregistry.el --- access to articles via Gnus' message-id registry
 ;;; -*- coding: utf-8 -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Ludovic Courtès <ludo@gnu.org>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/nnrss.el emacs-26.3+1/lisp/gnus/nnrss.el
--- emacs-26.1+1/lisp/gnus/nnrss.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnrss.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnrss.el --- interfacing with RSS
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: RSS
@@ -446,16 +446,16 @@
 (autoload 'timezone-parse-date "timezone")
 
 (defun nnrss-normalize-date (date)
-  "Return a date string of DATE in the RFC822 style.
+  "Return a date string of DATE in the style of RFC 822 and its successors.
 This function handles the ISO 8601 date format described in
-URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC822 style
+URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style
 which RSS 2.0 allows."
   (let (case-fold-search vector year month day time zone cts given)
     (cond ((null date))			; do nothing for this case
 	  ;; if the date is just digits (unix time stamp):
 	  ((string-match "^[0-9]+$" date)
 	   (setq given (seconds-to-time (string-to-number date))))
-	  ;; RFC822
+	  ;; RFC 822
 	  ((string-match " [0-9]+ " date)
 	   (setq vector (timezone-parse-date date)
 		 year (string-to-number (aref vector 0)))
diff -Nru emacs-26.1+1/lisp/gnus/nnspool.el emacs-26.3+1/lisp/gnus/nnspool.el
--- emacs-26.1+1/lisp/gnus/nnspool.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnspool.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnspool.el --- spool access for GNU Emacs
 
-;; Copyright (C) 1988-1990, 1993-1998, 2000-2018 Free Software
+;; Copyright (C) 1988-1990, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff -Nru emacs-26.1+1/lisp/gnus/nntp.el emacs-26.3+1/lisp/gnus/nntp.el
--- emacs-26.1+1/lisp/gnus/nntp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nntp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nntp.el --- nntp access for Gnus
 
-;; Copyright (C) 1987-1990, 1992-1998, 2000-2018 Free Software
+;; Copyright (C) 1987-1990, 1992-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/nnvirtual.el emacs-26.3+1/lisp/gnus/nnvirtual.el
--- emacs-26.1+1/lisp/gnus/nnvirtual.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnvirtual.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnvirtual.el --- virtual newsgroups access for Gnus
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: David Moore <dmoore@ucsd.edu>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/gnus/nnweb.el emacs-26.3+1/lisp/gnus/nnweb.el
--- emacs-26.1+1/lisp/gnus/nnweb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/nnweb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nnweb.el --- retrieving articles via web search engines
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/gnus/score-mode.el emacs-26.3+1/lisp/gnus/score-mode.el
--- emacs-26.1+1/lisp/gnus/score-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/score-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; score-mode.el --- mode for editing Gnus score files
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff -Nru emacs-26.1+1/lisp/gnus/smiley.el emacs-26.3+1/lisp/gnus/smiley.el
--- emacs-26.1+1/lisp/gnus/smiley.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/smiley.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; smiley.el --- displaying smiley faces
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
diff -Nru emacs-26.1+1/lisp/gnus/smime.el emacs-26.3+1/lisp/gnus/smime.el
--- emacs-26.1+1/lisp/gnus/smime.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/smime.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; smime.el --- S/MIME support library  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
diff -Nru emacs-26.1+1/lisp/gnus/spam.el emacs-26.3+1/lisp/gnus/spam.el
--- emacs-26.1+1/lisp/gnus/spam.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/spam.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; spam.el --- Identifying spam
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
diff -Nru emacs-26.1+1/lisp/gnus/spam-report.el emacs-26.3+1/lisp/gnus/spam-report.el
--- emacs-26.1+1/lisp/gnus/spam-report.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/spam-report.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; spam-report.el --- Reporting spam
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network, spam, mail, gmane, report
diff -Nru emacs-26.1+1/lisp/gnus/spam-stat.el emacs-26.3+1/lisp/gnus/spam-stat.el
--- emacs-26.1+1/lisp/gnus/spam-stat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/spam-stat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; spam-stat.el --- detecting spam based on statistics
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: network
diff -Nru emacs-26.1+1/lisp/gnus/spam-wash.el emacs-26.3+1/lisp/gnus/spam-wash.el
--- emacs-26.1+1/lisp/gnus/spam-wash.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/gnus/spam-wash.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; spam-wash.el --- wash spam before analysis
 
-;; Copyright (C) 2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Andrew Cohen <cohen@andy.bu.edu>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/help-at-pt.el emacs-26.3+1/lisp/help-at-pt.el
--- emacs-26.1+1/lisp/help-at-pt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/help-at-pt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help-at-pt.el --- local help through the keyboard
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Luc Teirlinck <teirllm@auburn.edu>
 ;; Keywords: help
diff -Nru emacs-26.1+1/lisp/help.el emacs-26.3+1/lisp/help.el
--- emacs-26.1+1/lisp/help.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/help.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help.el --- help commands for Emacs
 
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2018 Free Software
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -1377,7 +1377,7 @@
 displays a message about how to delete the help window when it's no
 longer needed.  The help window will be selected if
 `help-window-select' is non-nil.
-Most of this  is done by `help-window-setup', which see."
+Most of this is done by `help-window-setup', which see."
   (declare (indent 1) (debug t))
   `(progn
      ;; Make `help-window-point-marker' point nowhere.  The only place
diff -Nru emacs-26.1+1/lisp/help-fns.el emacs-26.3+1/lisp/help-fns.el
--- emacs-26.1+1/lisp/help-fns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/help-fns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help-fns.el --- Complex help functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2018 Free Software
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -89,11 +89,23 @@
       (unless (help--loaded-p file)
         (load file 'noerror 'nomessage)))))
 
+(defcustom help-enable-completion-auto-load t
+  "Whether completion for Help commands can perform autoloading.
+If non-nil, whenever invoking completion for `describe-function'
+or `describe-variable' load files that might contain definitions
+with the current prefix.  The files are chosen according to
+`definition-prefixes'."
+  :type 'boolean
+  :group 'help
+  :version "26.3")
+
 (defun help--symbol-completion-table (string pred action)
-  (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))
-    (help--load-prefixes prefixes))
+  (when help-enable-completion-auto-load
+    (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))
+      (help--load-prefixes prefixes)))
   (let ((prefix-completions
-         (mapcar #'intern (all-completions string definition-prefixes))))
+         (and help-enable-completion-auto-load
+              (mapcar #'intern (all-completions string definition-prefixes)))))
     (complete-with-action action obarray string
                           (if pred (lambda (sym)
                                      (or (funcall pred sym)
diff -Nru emacs-26.1+1/lisp/help-macro.el emacs-26.3+1/lisp/help-macro.el
--- emacs-26.1+1/lisp/help-macro.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/help-macro.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/help-mode.el emacs-26.3+1/lisp/help-mode.el
--- emacs-26.1+1/lisp/help-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/help-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help-mode.el --- `help-mode' used by *Help* buffers
 
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2018 Free Software
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/hexl.el emacs-26.3+1/lisp/hexl.el
--- emacs-26.1+1/lisp/hexl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hexl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*-
 
-;; Copyright (C) 1989, 1994, 1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1989, 1994, 1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
@@ -1104,8 +1104,15 @@
   "Return a string ruler for Hexl mode."
   (let* ((highlight (mod (hexl-current-address) 16))
 	 (s (cdr (assq hexl-bits hexl-rulers)))
-	 (pos 0))
+	 (pos 0)
+         (lnum-width
+          (if display-line-numbers
+              (round (line-number-display-width 'columns))
+            0)))
     (set-text-properties 0 (length s) nil s)
+    (when (> lnum-width 0)
+      (setq s (concat (make-string lnum-width ?  ) s))
+      (setq pos (+ pos lnum-width)))
     ;; Turn spaces in the header into stretch specs so they work
     ;; regardless of the header-line face.
     (while (string-match "[ \t]+" s pos)
@@ -1116,10 +1123,11 @@
 			 s))
     ;; Highlight the current column.
     (let ( (offset (+ (* 2 highlight) (/ (* 8 highlight) hexl-bits))) )
+      (if (> lnum-width 0) (setq offset (+ offset lnum-width)))
       (put-text-property (+ 11 offset) (+ 13 offset) 'face 'highlight s))
     ;; Highlight the current ascii column
-    (put-text-property (+ (hexl-ascii-start-column) highlight 1)
-                       (+ (hexl-ascii-start-column) highlight 2)
+    (put-text-property (+ (hexl-ascii-start-column) lnum-width highlight 1)
+                       (+ (hexl-ascii-start-column) lnum-width highlight 2)
                        'face 'highlight s)
     s))
 
diff -Nru emacs-26.1+1/lisp/hex-util.el emacs-26.3+1/lisp/hex-util.el
--- emacs-26.1+1/lisp/hex-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hex-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hex-util.el --- Functions to encode/decode hexadecimal string -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: data
diff -Nru emacs-26.1+1/lisp/hfy-cmap.el emacs-26.3+1/lisp/hfy-cmap.el
--- emacs-26.1+1/lisp/hfy-cmap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hfy-cmap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hfy-cmap.el --- Fallback colour name -> rgb mapping for `htmlfontify'
 
-;; Copyright (C) 2002-2003, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2009-2019 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
diff -Nru emacs-26.1+1/lisp/hilit-chg.el emacs-26.3+1/lisp/hilit-chg.el
--- emacs-26.1+1/lisp/hilit-chg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hilit-chg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard Sharman <rsharman@pobox.com>
 ;; Keywords: faces
diff -Nru emacs-26.1+1/lisp/hi-lock.el emacs-26.3+1/lisp/hi-lock.el
--- emacs-26.1+1/lisp/hi-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hi-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hi-lock.el --- minor mode for interactive automatic highlighting  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: David M. Koppelman <koppel@ece.lsu.edu>
 ;; Keywords: faces, minor-mode, matching, display
@@ -409,7 +409,11 @@
 (defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer)
 ;;;###autoload
 (defun hi-lock-line-face-buffer (regexp &optional face)
-  "Set face of all lines containing a match of REGEXP to FACE.
+  "Highlight all lines that match REGEXP using FACE.
+The lines that match REGEXP will be displayed by merging
+the attributes of FACE with any other face attributes
+of text in those lines.
+
 Interactively, prompt for REGEXP using `read-regexp', then FACE.
 Use the global history list for FACE.
 
diff -Nru emacs-26.1+1/lisp/hippie-exp.el emacs-26.3+1/lisp/hippie-exp.el
--- emacs-26.1+1/lisp/hippie-exp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hippie-exp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/hl-line.el emacs-26.3+1/lisp/hl-line.el
--- emacs-26.1+1/lisp/hl-line.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/hl-line.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hl-line.el --- highlight the current line  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/htmlfontify.el emacs-26.3+1/lisp/htmlfontify.el
--- emacs-26.1+1/lisp/htmlfontify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/htmlfontify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks -*- lexical-binding: t -*-
 
-;; Copyright (C) 2002-2003, 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2009-2019 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
diff -Nru emacs-26.1+1/lisp/ibuf-ext.el emacs-26.3+1/lisp/ibuf-ext.el
--- emacs-26.1+1/lisp/ibuf-ext.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ibuf-ext.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ibuf-ext.el --- extensions for ibuffer  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff -Nru emacs-26.1+1/lisp/ibuffer.el emacs-26.3+1/lisp/ibuffer.el
--- emacs-26.1+1/lisp/ibuffer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ibuffer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ibuffer.el --- operate on buffers like dired  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@ -590,6 +590,7 @@
     (define-key map (kbd "R") 'ibuffer-do-rename-uniquely)
     (define-key map (kbd "S") 'ibuffer-do-save)
     (define-key map (kbd "T") 'ibuffer-do-toggle-read-only)
+    (define-key map (kbd "L") 'ibuffer-do-toggle-lock)
     (define-key map (kbd "r") 'ibuffer-do-replace-regexp)
     (define-key map (kbd "V") 'ibuffer-do-revert)
     (define-key map (kbd "W") 'ibuffer-do-view-and-eval)
@@ -862,6 +863,10 @@
       '(menu-item "Print" ibuffer-do-print))
     (define-key-after operate-map [do-toggle-modified]
       '(menu-item "Toggle modification flag" ibuffer-do-toggle-modified))
+    (define-key-after operate-map [do-toggle-read-only]
+      '(menu-item "Toggle read-only flag" ibuffer-do-toggle-read-only))
+    (define-key-after operate-map [do-toggle-lock]
+      '(menu-item "Toggle lock flag" ibuffer-do-toggle-lock))
     (define-key-after operate-map [do-revert]
       '(menu-item "Revert" ibuffer-do-revert
         :help "Revert marked buffers to their associated file"))
@@ -1361,6 +1366,16 @@
    :modifier-p t)
   (read-only-mode (if (integerp arg) arg 'toggle)))
 
+(define-ibuffer-op ibuffer-do-toggle-lock (&optional arg)
+  "Toggle locked status in marked buffers.
+If optional ARG is a non-negative integer, lock buffers.
+If ARG is a negative integer or 0, unlock buffers.
+Otherwise, toggle lock status."
+  (:opstring "toggled lock status in"
+   :interactive "P"
+   :modifier-p t)
+  (emacs-lock-mode (if (integerp arg) arg 'toggle)))
+
 (define-ibuffer-op ibuffer-do-delete ()
   "Kill marked buffers as with `kill-this-buffer'."
   (:opstring "killed"
@@ -1912,11 +1927,9 @@
      (let ((procs 0)
 	   (files 0))
        (dolist (string strings)
-	 (if (string-match "\\(?:\\`([[:ascii:]]+)\\)" string)
-	     (progn (setq procs (1+ procs))
-		    (if (< (match-end 0) (length string))
-			(setq files (1+ files))))
-	   (setq files (1+ files))))
+         (when (get-text-property 1 'ibuffer-process string)
+           (setq procs (1+ procs)))
+	 (setq files (1+ files)))
        (concat (cond ((zerop files) "No files")
 		     ((= 1 files) "1 file")
 		     (t (format "%d files" files)))
@@ -1928,7 +1941,8 @@
 	(filename (ibuffer-make-column-filename buffer mark)))
     (if proc
 	(concat (propertize (format "(%s %s)" proc (process-status proc))
-			    'font-lock-face 'italic)
+			    'font-lock-face 'italic
+                            'ibuffer-process proc)
 		(if (> (length filename) 0)
 		    (format " %s" filename)
 		  ""))
@@ -2509,11 +2523,12 @@
 
 Operations on marked buffers:
 \\<ibuffer-mode-map>
-  `\\[ibuffer-do-save]' - Save the marked buffers
-  `\\[ibuffer-do-view]' - View the marked buffers in this frame.
+  `\\[ibuffer-do-save]' - Save the marked buffers.
+  `\\[ibuffer-do-view]' - View the marked buffers in the selected frame.
   `\\[ibuffer-do-view-other-frame]' - View the marked buffers in another frame.
   `\\[ibuffer-do-revert]' - Revert the marked buffers.
   `\\[ibuffer-do-toggle-read-only]' - Toggle read-only state of marked buffers.
+  `\\[ibuffer-do-toggle-lock]' - Toggle lock state of marked buffers.
   `\\[ibuffer-do-delete]' - Kill the marked buffers.
   `\\[ibuffer-do-isearch]' - Do incremental search in the marked buffers.
   `\\[ibuffer-do-isearch-regexp]' - Isearch for regexp in the marked buffers.
@@ -2532,7 +2547,7 @@
           buffer's file as an argument.
   `\\[ibuffer-do-eval]' - Evaluate a form in each of the marked buffers.  This
           is a very flexible command.  For example, if you want to make all
-          of the marked buffers read only, try using (read-only-mode 1) as
+          of the marked buffers read-only, try using (read-only-mode 1) as
           the input form.
   `\\[ibuffer-do-view-and-eval]' - As above, but view each buffer while the form
           is evaluated.
@@ -2547,21 +2562,20 @@
           all unmarked buffers.
   `\\[ibuffer-change-marks]' - Change the mark used on marked buffers.
   `\\[ibuffer-unmark-forward]' - Unmark the buffer at point.
-  `\\[ibuffer-unmark-backward]' - Unmark the buffer at point, and move to the
-          previous line.
+  `\\[ibuffer-unmark-backward]' - Unmark the previous buffer.
   `\\[ibuffer-unmark-all]' - Unmark buffers marked with MARK.
   `\\[ibuffer-unmark-all-marks]' - Unmark all marked buffers.
   `\\[ibuffer-mark-by-mode]' - Mark buffers by major mode.
   `\\[ibuffer-mark-unsaved-buffers]' - Mark all \"unsaved\" buffers.
           This means that the buffer is modified, and has an associated file.
   `\\[ibuffer-mark-modified-buffers]' - Mark all modified buffers,
-          regardless of whether or not they have an associated file.
+          regardless of whether they have an associated file.
   `\\[ibuffer-mark-special-buffers]' - Mark all buffers whose name begins and
           ends with `*'.
   `\\[ibuffer-mark-dissociated-buffers]' - Mark all buffers which have
           an associated file, but that file doesn't currently exist.
   `\\[ibuffer-mark-read-only-buffers]' - Mark all read-only buffers.
-  `\\[ibuffer-mark-dired-buffers]' - Mark buffers in `dired' mode.
+  `\\[ibuffer-mark-dired-buffers]' - Mark buffers in `dired-mode'.
   `\\[ibuffer-mark-help-buffers]' - Mark buffers in `help-mode', `apropos-mode', etc.
   `\\[ibuffer-mark-old-buffers]' - Mark buffers older than `ibuffer-old-time'.
   `\\[ibuffer-mark-for-delete]' - Mark the buffer at point for deletion.
@@ -2640,17 +2654,17 @@
 
 ** Information on Filtering:
 
- You can filter your ibuffer view via different criteria.  Each Ibuffer
+You can filter your Ibuffer view via different criteria.  Each Ibuffer
 buffer has its own stack of active filters.  For example, suppose you
 are working on an Emacs Lisp project.  You can create an Ibuffer
-buffer displays buffers in just `emacs-lisp' modes via
+buffer displaying only `emacs-lisp-mode' buffers via
 `\\[ibuffer-filter-by-mode] emacs-lisp-mode RET'.  In this case, there
 is just one entry on the filtering stack.
 
 You can also combine filters.  The various filtering commands push a
 new filter onto the stack, and the filters combine to show just
 buffers which satisfy ALL criteria on the stack.  For example, suppose
-you only want to see buffers in `emacs-lisp' mode, whose names begin
+you only want to see buffers in `emacs-lisp-mode', whose names begin
 with \"gnus\".  You can accomplish this via:
 
   \\[ibuffer-filter-by-mode] emacs-lisp-mode RET
@@ -2694,8 +2708,8 @@
 multiple filter groups; instead, the first filter group is used.  The
 filter groups are displayed in this order of precedence.
 
-You may rearrange filter groups by using the regular
-`\\[ibuffer-kill-line]' and `\\[ibuffer-yank]' pair.  Yanked groups
+You may rearrange filter groups by using the usual pair
+`\\[ibuffer-kill-line]' and `\\[ibuffer-yank]'.  Yanked groups
 will be inserted before the group at point."
   ;; Include state info next to the mode name.
   (set (make-local-variable 'mode-line-process)
diff -Nru emacs-26.1+1/lisp/ibuf-macs.el emacs-26.3+1/lisp/ibuf-macs.el
--- emacs-26.1+1/lisp/ibuf-macs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ibuf-macs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ibuf-macs.el --- macros for ibuffer  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff -Nru emacs-26.1+1/lisp/icomplete.el emacs-26.3+1/lisp/icomplete.el
--- emacs-26.1+1/lisp/icomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/icomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; icomplete.el --- minibuffer completion incremental feedback
 
-;; Copyright (C) 1992-1994, 1997, 1999, 2001-2018 Free Software
+;; Copyright (C) 1992-1994, 1997, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Ken Manheimer <klm@i.am>
diff -Nru emacs-26.1+1/lisp/ido.el emacs-26.3+1/lisp/ido.el
--- emacs-26.1+1/lisp/ido.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ido.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ido.el --- interactively do things with buffers and files -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
@@ -1239,6 +1239,9 @@
 ;; Dynamically bound in ido-read-internal.
 (defvar ido-completing-read)
 
+;; If dynamically set when ido-exit is 'fallback, overrides fallback command.
+(defvar ido-fallback nil)
+
 ;;; FUNCTIONS
 
 (defun ido-active (&optional merge)
@@ -2220,6 +2223,7 @@
 	(run-hook-with-args 'ido-before-fallback-functions
 			    (or fallback 'switch-to-buffer))
 	(call-interactively (or fallback 'switch-to-buffer)))
+    (setq ido-fallback nil)
     (let* ((ido-context-switch-command switch-cmd)
 	   (ido-current-directory nil)
 	   (ido-directory-nonreadable nil)
@@ -2245,7 +2249,7 @@
 
        ((eq ido-exit 'fallback)
 	(let ((read-buffer-function nil))
-	  (setq this-command (or fallback 'switch-to-buffer))
+	  (setq this-command (or ido-fallback fallback 'switch-to-buffer))
 	  (run-hook-with-args 'ido-before-fallback-functions this-command)
 	  (call-interactively this-command)))
 
@@ -2341,6 +2345,7 @@
   ;; Internal function for ido-find-file and friends
   (unless item
     (setq item 'file))
+  (setq ido-fallback nil)
   (let ((ido-current-directory (ido-expand-directory default))
 	(ido-context-switch-command switch-cmd)
 	ido-directory-nonreadable ido-directory-too-big
@@ -2412,7 +2417,7 @@
 	;; we don't want to change directory of current buffer.
 	(let ((default-directory ido-current-directory)
 	      (read-file-name-function nil))
-	  (setq this-command (or fallback 'find-file))
+	  (setq this-command (or ido-fallback fallback 'find-file))
 	  (run-hook-with-args 'ido-before-fallback-functions this-command)
 	  (call-interactively this-command)))
 
@@ -2821,13 +2826,15 @@
   (setq ido-exit 'takeprompt)
   (exit-minibuffer))
 
-(defun ido-fallback-command ()
-  "Fallback to non-Ido version of current command."
+(defun ido-fallback-command (&optional fallback-command)
+  "Fallback to non-Ido version of current command.
+The optional FALLBACK-COMMAND argument indicates which command to run."
   (interactive)
   (let ((i (length ido-text)))
     (while (> i 0)
       (push (aref ido-text (setq i (1- i))) unread-command-events)))
   (setq ido-exit 'fallback)
+  (setq ido-fallback fallback-command)
   (exit-minibuffer))
 
 (defun ido-enter-find-file ()
diff -Nru emacs-26.1+1/lisp/ielm.el emacs-26.3+1/lisp/ielm.el
--- emacs-26.1+1/lisp/ielm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ielm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ielm.el --- interaction mode for Emacs Lisp  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Smith <maa036@lancaster.ac.uk>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/iimage.el emacs-26.3+1/lisp/iimage.el
--- emacs-26.1+1/lisp/iimage.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/iimage.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; iimage.el --- Inline image minor mode.
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/image/compface.el emacs-26.3+1/lisp/image/compface.el
--- emacs-26.1+1/lisp/image/compface.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image/compface.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; compface.el --- functions for converting X-Face headers
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/image/gravatar.el emacs-26.3+1/lisp/image/gravatar.el
--- emacs-26.1+1/lisp/image/gravatar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image/gravatar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gravatar.el --- Get Gravatars
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
@@ -40,18 +40,35 @@
 
 ;; FIXME a time value is not the nicest format for a custom variable.
 (defcustom gravatar-cache-ttl (days-to-time 30)
-  "Time to live for gravatar cache entries."
+  "Time to live for gravatar cache entries.
+If a requested gravatar has been cached for longer than this, it
+is retrieved anew."
   :type '(repeat integer)
   :group 'gravatar)
 
-;; FIXME Doc is tautological.  What are the options?
 (defcustom gravatar-rating "g"
-  "Default rating for gravatar."
+  "Most explicit Gravatar rating level to allow.
+Some gravatars are rated according to how suitable they are for
+different audiences.  The supported rating levels are, in order
+of increasing explicitness, the following:
+
+\"g\"  - Suitable for any audience.
+\"pg\" - May contain rude gestures, provocatively dressed
+       individuals, mild profanity, or mild violence.
+\"r\"  - May contain harsh profanity, intense violence, nudity,
+       or hard drug use.
+\"x\"  - May contain hardcore sexual imagery or extremely
+       disturbing violence.
+
+Each level covers itself as well as all less explicit levels.
+For example, setting this variable to \"pg\" will allow gravatars
+rated either \"g\" or \"pg\"."
   :type 'string
   :group 'gravatar)
 
 (defcustom gravatar-size 32
-  "Default size in pixels for gravatars."
+  "Gravatar size in pixels to request.
+Valid sizes range from 1 to 2048 inclusive."
   :type 'integer
   :group 'gravatar)
 
@@ -104,8 +121,10 @@
 
 ;;;###autoload
 (defun gravatar-retrieve (mail-address cb &optional cbargs)
-  "Retrieve MAIL-ADDRESS gravatar and call CB on retrieval.
-You can provide a list of argument to pass to CB in CBARGS."
+  "Asynchronously retrieve a gravatar for MAIL-ADDRESS.
+When finished, call CB as (apply CB GRAVATAR CBARGS),
+where GRAVATAR is either an image descriptor, or the symbol
+`error' if the retrieval failed."
   (let ((url (gravatar-build-url mail-address)))
     (if (gravatar-cache-expired url)
 	(let ((args (list url
@@ -126,7 +145,9 @@
 
 ;;;###autoload
 (defun gravatar-retrieve-synchronously (mail-address)
-  "Retrieve MAIL-ADDRESS gravatar and returns it."
+  "Synchronously retrieve a gravatar for MAIL-ADDRESS.
+Value is either an image descriptor, or the symbol `error' if the
+retrieval failed."
   (let ((url (gravatar-build-url mail-address)))
     (if (gravatar-cache-expired url)
         (with-current-buffer (url-retrieve-synchronously url)
diff -Nru emacs-26.1+1/lisp/image-dired.el emacs-26.3+1/lisp/image-dired.el
--- emacs-26.1+1/lisp/image-dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image-dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; image-dired.el --- use dired to browse and manipulate your images -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 ;;
 ;; Version: 0.4.11
 ;; Keywords: multimedia
diff -Nru emacs-26.1+1/lisp/image.el emacs-26.3+1/lisp/image.el
--- emacs-26.1+1/lisp/image.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; image.el --- image API  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: multimedia
@@ -413,13 +413,20 @@
 (defun create-image (file-or-data &optional type data-p &rest props)
   "Create an image.
 FILE-OR-DATA is an image file name or image data.
+
 Optional TYPE is a symbol describing the image type.  If TYPE is omitted
 or nil, try to determine the image type from its first few bytes
 of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
 use its file extension as image type.
+
 Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
+
 Optional PROPS are additional image attributes to assign to the image,
-like, e.g. `:mask MASK'.
+like, e.g. `:mask MASK'.  If the property `:scale' is not given and the
+display has a high resolution (more exactly, when the average width of a
+character in the default font is more than 10 pixels), the image is
+automatically scaled up in proportion to the default font.
+
 Value is the image created, or nil if images of type TYPE are not supported.
 
 Images should not be larger than specified by `max-image-size'.
@@ -445,10 +452,10 @@
         ;; plist.  Decouple plist entries where the key matches
         ;; the property.
         (if (eq (cadr image) property)
-            (setcdr image (cddr image))
+            (setcdr image (cdddr image))
           (setq image (cddr image))))
     ;; Just enter the new value.
-    (plist-put (cdr image) property value))
+    (setcdr image (plist-put (cdr image) property value)))
   value)
 
 (defun image-property (image property)
@@ -916,7 +923,7 @@
   :version "24.3")
 
 (defcustom imagemagick-enabled-types
-  '(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
+  '(3FR ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
     CUR CUT DCM DCR DCX DDS DJVU DNG DPX EXR FAX FITS GBR GIF
     GIF87 GRB HRZ ICB ICO ICON J2C JNG JP2 JPC JPEG JPG JPX K25
     KDC MIFF MNG MRW MSL MSVG MTV NEF ORF OTB PBM PCD PCDS PCL
@@ -950,7 +957,7 @@
   :set (lambda (symbol value)
 	 (set-default symbol value)
 	 (imagemagick-register-types))
-  :version "24.3")
+  :version "26.2")                      ; remove ART (bug#22289)
 
 (imagemagick-register-types)
 
diff -Nru emacs-26.1+1/lisp/image-file.el emacs-26.3+1/lisp/image-file.el
--- emacs-26.1+1/lisp/image-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; image-file.el --- support for visiting image files
 ;;
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
@@ -97,8 +97,9 @@
 ;;;###autoload
 (defun insert-image-file (file &optional visit beg end replace)
   "Insert the image file FILE into the current buffer.
-Optional arguments VISIT, BEG, END, and REPLACE are interpreted as for
-the command `insert-file-contents'."
+Optional arguments VISIT, BEG, END, and REPLACE are interpreted
+as for the command `insert-file-contents'.  Return list of
+absolute file name and number of characters inserted."
   (let ((rval
 	 (image-file-call-underlying #'insert-file-contents-literally
 				     'insert-file-contents
diff -Nru emacs-26.1+1/lisp/image-mode.el emacs-26.3+1/lisp/image-mode.el
--- emacs-26.1+1/lisp/image-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/image-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; image-mode.el --- support for visiting image files  -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Richard Stallman <rms@gnu.org>
 ;; Keywords: multimedia
@@ -761,9 +761,11 @@
 	 (type (if (fboundp 'imagemagick-types)
 		   'imagemagick
 		 (image-type file-or-data nil data-p)))
+         ;; :scale 1: If we do not set this, create-image will apply
+         ;; default scaling based on font size.
 	 (image (if (not edges)
-		    (create-image file-or-data type data-p)
-		  (create-image file-or-data type data-p
+		    (create-image file-or-data type data-p :scale 1)
+		  (create-image file-or-data type data-p :scale 1
 				:max-width (- (nth 2 edges) (nth 0 edges))
 				:max-height (- (nth 3 edges) (nth 1 edges)))))
 	 (inhibit-read-only t)
diff -Nru emacs-26.1+1/lisp/imenu.el emacs-26.3+1/lisp/imenu.el
--- emacs-26.1+1/lisp/imenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/imenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; imenu.el --- framework for mode-specific buffer indexes  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
 ;;         Lars Lindberg <lli@sypro.cap.se>
@@ -96,11 +96,11 @@
   :type 'boolean
   :group 'imenu)
 
-(defcustom imenu-auto-rescan-maxout 60000
-  "Imenu auto-rescan is disabled in buffers larger than this size (in bytes).
-This variable is buffer-local."
+(defcustom imenu-auto-rescan-maxout 600000
+  "Imenu auto-rescan is disabled in buffers larger than this size (in bytes)."
   :type 'integer
-  :group 'imenu)
+  :group 'imenu
+  :version "26.2")
 
 (defvar imenu-always-use-completion-buffer-p nil)
 (make-obsolete-variable 'imenu-always-use-completion-buffer-p
@@ -187,7 +187,9 @@
 
 (defcustom imenu-generic-skip-comments-and-strings t
   "When non-nil, ignore text inside comments and strings.
-Only affects `imenu--generic-function'."
+Only affects `imenu-default-create-index-function' (and any
+alternative implementation of `imenu-create-index-function' that
+uses `imenu--generic-function')."
   :type 'boolean
   :group 'imenu
   :version "24.4")
@@ -205,9 +207,9 @@
 matches are put).
 REGEXP is a regular expression matching a definition construct
 which is to be displayed in the menu.  REGEXP may also be a
-function, called without arguments.  It is expected to search
-backwards.  It must return true and set `match-data' if it finds
-another element.
+function of no arguments.  If REGEXP is a function, it is
+expected to search backwards, return non-nil if it finds a
+definition construct, and set `match-data' for that construct.
 INDEX is an integer specifying which subexpression of REGEXP
 matches the definition's name; this subexpression is displayed as
 the menu item.
@@ -738,7 +740,7 @@
 ;; so it needs to be careful never to loop!
 (defun imenu--generic-function (patterns)
   "Return an index alist of the current buffer based on PATTERNS.
-PATTERNS should be an alist with the same form as `imenu-generic-expression'.
+PATTERNS should be an alist of the same form as `imenu-generic-expression'.
 
 If `imenu-generic-skip-comments-and-strings' is non-nil, this ignores
 text inside comments and strings.
diff -Nru emacs-26.1+1/lisp/indent.el emacs-26.3+1/lisp/indent.el
--- emacs-26.1+1/lisp/indent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/indent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; indent.el --- indentation commands for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
@@ -65,15 +65,17 @@
   "Indent line in proper way for current major mode.
 Normally, this is done by calling the function specified by the
 variable `indent-line-function'.  However, if the value of that
-variable is `indent-relative' or `indent-relative-maybe', handle
-it specially (since those functions are used for tabbing); in
-that case, indent by aligning to the previous non-blank line."
+variable is `indent-relative' or `indent-relative-first-indent-point',
+handle it specially (since those functions are used for tabbing);
+in that case, indent by aligning to the previous non-blank line."
   (interactive)
   (save-restriction
     (widen)
   (syntax-propertize (line-end-position))
   (if (memq indent-line-function
-	    '(indent-relative indent-relative-maybe))
+            '(indent-relative
+              indent-relative-maybe
+              indent-relative-first-indent-point))
       ;; These functions are used for tabbing, but can't be used for
       ;; indenting.  Replace with something ad-hoc.
       (let ((column (save-excursion
@@ -592,8 +594,9 @@
 
 If the previous nonblank line has no indent points beyond the
 column point starts at, then `tab-to-tab-stop' is done, if both
-FIRST-ONLY and UNINDENTED-OK are nil, otherwise nothing is done
-in this case.
+FIRST-ONLY and UNINDENTED-OK are nil, otherwise nothing is done.
+If there isn't a previous nonblank line and UNINDENTED-OK is nil,
+call `tab-to-tab-stop'.
 
 See also `indent-relative-first-indent-point'."
   (interactive "P")
diff -Nru emacs-26.1+1/lisp/info.el emacs-26.3+1/lisp/info.el
--- emacs-26.1+1/lisp/info.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/info.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; info.el --- Info package for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1992-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
@@ -30,6 +30,15 @@
 ;; This distinction is to support indexing of computer programming
 ;; language terms that may contain ":" but not ": ".
 
+;; The commands in this file should start either with "Info-" or with
+;; "info-".  The capitalized version is for commands that are bound to
+;; keys, and therefore are unlikely to be invoked by name via "M-x";
+;; the lower-case version is for commands invoked by name.  This
+;; arrangement makes completion of "info-" commands work better,
+;; because the "Info-" commands (of which there are a lot) don't get
+;; in the way.  Please adhere to this convention when you add commands
+;; here.
+
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
@@ -4253,8 +4262,9 @@
 ;; We deliberately fontify only ‘..’ quoting, and not `..', because
 ;; the former can be done much more reliably, i.e. without risking
 ;; false positives.
+;; FIXME: It doesn't handle nested quotes.
 (defvar Info-mode-font-lock-keywords
-  '(("‘\\([^’]*\\)’" (1 'Info-quoted))))
+  '(("‘\\([‘’]\\|[^‘’]*\\)’" (1 'Info-quoted))))
 
 ;; Autoload cookie needed by desktop.el
 ;;;###autoload
diff -Nru emacs-26.1+1/lisp/info-look.el emacs-26.3+1/lisp/info-look.el
--- emacs-26.1+1/lisp/info-look.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/info-look.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; info-look.el --- major-mode-sensitive Info index lookup facility -*- lexical-binding: t -*-
 ;; An older version of this was known as libc.el.
 
-;; Copyright (C) 1995-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;;         (did not show signs of life (Nov 2001)  -stef)
diff -Nru emacs-26.1+1/lisp/informat.el emacs-26.3+1/lisp/informat.el
--- emacs-26.1+1/lisp/informat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/informat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; informat.el --- info support functions package for Emacs
 
-;; Copyright (C) 1986, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
diff -Nru emacs-26.1+1/lisp/info-xref.el emacs-26.3+1/lisp/info-xref.el
--- emacs-26.1+1/lisp/info-xref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/info-xref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; info-xref.el --- check external references in an Info document -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Ryde <user42@zip.com.au>
 ;; Keywords: docs
diff -Nru emacs-26.1+1/lisp/international/ccl.el emacs-26.3+1/lisp/international/ccl.el
--- emacs-26.1+1/lisp/international/ccl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/ccl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ccl.el --- CCL (Code Conversion Language) compiler  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/characters.el emacs-26.3+1/lisp/international/characters.el
--- emacs-26.1+1/lisp/international/characters.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/characters.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; characters.el --- set syntax and category for multibyte characters
 
-;; Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -643,12 +643,24 @@
     (setq c (1+ c)))
 
   ;; Circled Latin
-  (setq c #x24b6)
-  (while (<= c #x24cf)
+  (setq c #x24B6)
+  (while (<= c #x24CF)
     (modify-category-entry c ?l)
     (modify-category-entry (+ c 26) ?l)
     (setq c (1+ c)))
 
+  ;; Supplemental Mathematical Operators
+  (setq c #x2A00)
+  (while (<= c #x2AFF)
+    (set-case-syntax c "." tbl)
+    (setq c (1+ c)))
+
+  ;; Miscellaneous Symbols and Arrows
+  (setq c #x2B00)
+  (while (<= c #x2BFF)
+    (set-case-syntax c "." tbl)
+    (setq c (1+ c)))
+
   ;; Coptic
   ;; There's no Coptic category.  However, Coptic letters that are
   ;; part of the Greek block above get the Greek category, and those
@@ -656,6 +668,12 @@
   ;; consistent about their category.
   (modify-category-entry '(#x2C80 . #x2CFF) ?g)
 
+  ;; Supplemental Punctuation
+  (setq c #x2E00)
+  (while (<= c #x2E7F)
+    (set-case-syntax c "." tbl)
+    (setq c (1+ c)))
+
   ;; Fullwidth Latin
   (setq c #xff21)
   (while (<= c #xff3a)
@@ -968,8 +986,8 @@
 	   (#x1039 . #x103A)
 	   (#x103D . #x103E)
 	   (#x1058 . #x1059)
-	   (#x105E . #x1160)
-	   (#x1171 . #x1074)
+	   (#x105E . #x1060)
+	   (#x1071 . #x1074)
 	   (#x1082 . #x1082)
 	   (#x1085 . #x1086)
 	   (#x108D . #x108D)
@@ -1200,7 +1218,7 @@
 	   (#xFF01 . #xFF60)
 	   (#xFFE0 . #xFFE6)
 	   (#x16FE0 . #x16FE1)
-	   (#x17000 . #x187EC)
+	   (#x17000 . #x187F1)
 	   (#x18800 . #x18AF2)
 	   (#x1B000 . #x1B11E)
            (#x1B170 . #x1B2FB)
@@ -1233,13 +1251,16 @@
 	   (#x1F6CC . #x1F6CC)
 	   (#x1F6D0 . #x1F6D2)
 	   (#x1F6EB . #x1F6EC)
-	   (#x1F6F4 . #x1F6F8)
+	   (#x1F6F4 . #x1F6F9)
 	   (#x1F910 . #x1F93E)
-	   (#x1F940 . #x1F94C)
-	   (#x1F950 . #x1F96B)
-	   (#x1F980 . #x1F997)
-	   (#x1F9C0 . #x1F9C0)
-           (#x1F9D0 . #x1F9E6)
+	   (#x1F940 . #x1F970)
+	   (#x1F973 . #x1F976)
+	   (#x1F97A . #x1F97A)
+	   (#x1F97C . #x1F9A2)
+	   (#x1F9B0 . #x1F9B9)
+	   (#x1F9C0 . #x1F9C2)
+           (#x1F9D0 . #x1F9FF)
+           (#x1FA60 . #x1FA6D)
 	   (#x20000 . #x2FFFF)
 	   (#x30000 . #x3FFFF))))
   (dolist (elt l)
@@ -1403,7 +1424,9 @@
 
 (defun update-glyphless-char-display (&optional variable value)
   "Make the setting of `glyphless-char-display-control' take effect.
-This function updates the char-table `glyphless-char-display'."
+This function updates the char-table `glyphless-char-display',
+and is intended to be used in the `:set' attribute of the
+option `glyphless-char-display'."
   (when value
     (set-default variable value))
   (dolist (elt value)
diff -Nru emacs-26.1+1/lisp/international/fontset.el emacs-26.3+1/lisp/international/fontset.el
--- emacs-26.1+1/lisp/international/fontset.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/fontset.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fontset.el --- commands for handling fontset
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -53,7 +53,10 @@
 	("ascii-0$" . ascii)
 	("gb2312.1980" . chinese-gb2312)
 	("gbk" . chinese-gbk)
-	("gb18030" . (unicode . nil))
+        ;; GB18030 needs the characters encoded by gb18030, but a
+        ;; gb18030 font doesn't necessarily support all of the GB18030
+        ;; characters.
+	("gb18030" . (gb18030 . unicode))
 	("jisx0208.1978" . japanese-jisx0208-1978)
 	("jisx0208" . japanese-jisx0208)
 	("jisx0201" . jisx0201)
@@ -216,6 +219,9 @@
 	(lydian #x10920)
 	(kharoshthi #x10A00)
 	(manichaean #x10AC0)
+        (hanifi-rohingya #x10D00)
+        (old-sogdian #x10F00)
+        (sogdian #x10F30)
 	(mahajani #x11150)
 	(sinhala-archaic-number #x111E1)
 	(khojki #x11200)
@@ -226,6 +232,7 @@
 	(siddham #x11580)
 	(modi #x11600)
 	(takri #x11680)
+        (dogra #x11800)
 	(warang-citi #x118A1)
         (zanabazar-square #x11A00)
         (soyombo #x11A50)
@@ -233,11 +240,14 @@
         (bhaiksuki #x11C00)
         (marchen #x11C72)
         (masaram-gondi #x11D00)
+        (gunjala-gondi #x11D60)
+        (makasar #x11EE0)
 	(cuneiform #x12000)
 	(cuneiform-numbers-and-punctuation #x12400)
 	(mro #x16A40)
 	(bassa-vah #x16AD0)
 	(pahawh-hmong #x16B11)
+        (medefaidrin #x16E40)
         (tangut #x17000)
         (tangut-components #x18800)
         (nushu #x1B170)
@@ -254,7 +264,7 @@
 
 (defvar otf-script-alist)
 
-;; The below was synchronized with the latest Feb 25, 2016 version of
+;; The below was synchronized with the latest Jul 23, 2017 version of
 ;; https://www.microsoft.com/typography/otspec/scripttags.htm.
 (setq otf-script-alist
       '((adlm . adlam)
@@ -309,6 +319,7 @@
 	(hano . hanunoo)
         (hatr . hatran)
 	(hebr . hebrew)
+        (hung . old-hungarian)
 	(phli . inscriptional-pahlavi)
 	(prti . inscriptional-parthian)
 	(java . javanese)
@@ -804,9 +815,16 @@
              (#x4DC0 . #x4DFF)	;; Yijing Hexagram Symbols
              (#xFE10 . #xFE1F)	;; Vertical Forms
              (#x10100 . #x1013F)	;; Aegean Numbers
+             (#x10190 . #x101CF)	;; Ancient Symbols
+             (#x101D0 . #x101FF)	;; Phaistos Disc
              (#x102E0 . #x102FF)	;; Coptic Epact Numbers
              (#x1D000 . #x1D0FF)	;; Byzantine Musical Symbols
              (#x1D200 . #x1D24F)	;; Ancient Greek Musical Notation
+             (#x1D2E0 . #x1D2FF)	;; Mayan Numerals
+             (#x1D300 . #x1D35F)	;; Tai Xuan Jing Symbols
+             (#x1D360 . #x1D37F)	;; Counting Rod Numerals
+             (#x1F000 . #x1F02F)	;; Mahjong Tiles
+             (#x1F030 . #x1F09F)	;; Domino Tiles
              (#x1F0A0 . #x1F0FF)	;; Playing Cards
              (#x1F100 . #x1F1FF)	;; Enclosed Alphanumeric Suppl
              (#x1F300 . #x1F5FF)	;; Misc Symbols and Pictographs
@@ -815,7 +833,9 @@
              (#x1F680 . #x1F6FF)	;; Transport and Map Symbols
              (#x1F700 . #x1F77F)	;; Alchemical Symbols
              (#x1F780 . #x1F7FF)	;; Geometric Shapes Extended
-             (#x1F800 . #x1F8FF)))	;; Supplemental Arrows-C
+             (#x1F800 . #x1F8FF)	;; Supplemental Arrows-C
+             (#x1F900 . #x1F9FF)	;; Supplemental Symbols and Pictographs
+             (#x1FA00 . #x1FA6F)))	;; Chess Symbols
     (set-fontset-font "fontset-default" symbol-subgroup
                       '("Symbola" . "iso10646-1") nil 'prepend))
   ;; Box Drawing and Block Elements
diff -Nru emacs-26.1+1/lisp/international/isearch-x.el emacs-26.3+1/lisp/international/isearch-x.el
--- emacs-26.1+1/lisp/international/isearch-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/isearch-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; isearch-x.el --- extended isearch handling commands
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/iso-ascii.el emacs-26.3+1/lisp/international/iso-ascii.el
--- emacs-26.1+1/lisp/international/iso-ascii.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/iso-ascii.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals
 
-;; Copyright (C) 1987, 1995, 1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1987, 1995, 1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Howard Gayle
diff -Nru emacs-26.1+1/lisp/international/iso-cvt.el emacs-26.3+1/lisp/international/iso-cvt.el
--- emacs-26.1+1/lisp/international/iso-cvt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/iso-cvt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: utf-8 -*-
 ;; This file was formerly called gm-lingo.el.
 
-;; Copyright (C) 1993-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
 ;; Keywords: tex, iso, latin, i18n
diff -Nru emacs-26.1+1/lisp/international/iso-transl.el emacs-26.3+1/lisp/international/iso-transl.el
--- emacs-26.1+1/lisp/international/iso-transl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/iso-transl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; iso-transl.el --- keyboard input for ISO 10646 chars -*- coding: utf-8 -*-
 
-;; Copyright (C) 1987, 1993-1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1987, 1993-1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Howard Gayle
@@ -234,18 +234,18 @@
 ;; Language-specific translation lists.
 (defvar iso-transl-language-alist
   '(("Esperanto"
-     ("C"  . [?Æ])
-     ("G"  . [?Ø])
-     ("H"  . [?¦])
-     ("J"  . [?¬])
-     ("S"  . [?Þ])
-     ("U"  . [?Ý])
-     ("c"  . [?æ])
-     ("g"  . [?ø])
-     ("h"  . [?¶])
-     ("j"  . [?¼])
-     ("s"  . [?þ])
-     ("u"  . [?ý]))
+     ("C"  . [?Ĉ])
+     ("G"  . [?Ĝ])
+     ("H"  . [?Ĥ])
+     ("J"  . [?Ĵ])
+     ("S"  . [?Ŝ])
+     ("U"  . [?Ŭ])
+     ("c"  . [?ĉ])
+     ("g"  . [?ĝ])
+     ("h"  . [?ĥ])
+     ("j"  . [?ĵ])
+     ("s"  . [?ŝ])
+     ("u"  . [?ŭ]))
     ("French"
      ("C"  . [?Ç])
      ("c"  . [?ç]))
diff -Nru emacs-26.1+1/lisp/international/ja-dic-cnv.el emacs-26.3+1/lisp/international/ja-dic-cnv.el
--- emacs-26.1+1/lisp/international/ja-dic-cnv.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/ja-dic-cnv.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
diff -Nru emacs-26.1+1/lisp/international/kinsoku.el emacs-26.3+1/lisp/international/kinsoku.el
--- emacs-26.1+1/lisp/international/kinsoku.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/kinsoku.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/kkc.el emacs-26.3+1/lisp/international/kkc.el
--- emacs-26.1+1/lisp/international/kkc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/kkc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/latexenc.el emacs-26.3+1/lisp/international/latexenc.el
--- emacs-26.1+1/lisp/international/latexenc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/latexenc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latexenc.el --- guess correct coding system in LaTeX files -*-coding: utf-8 -*-
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Arne Jørgensen <arne@arnested.dk>
 ;; Keywords: mule, coding system, latex
diff -Nru emacs-26.1+1/lisp/international/latin1-disp.el emacs-26.3+1/lisp/international/latin1-disp.el
--- emacs-26.1+1/lisp/international/latin1-disp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/latin1-disp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: utf-8;-*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/international/mule-cmds.el emacs-26.3+1/lisp/international/mule-cmds.el
--- emacs-26.1+1/lisp/international/mule-cmds.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/mule-cmds.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-cmds.el --- commands for multilingual environment  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -2229,7 +2229,7 @@
     ("bg" "Bulgarian" cp1251) ; Bulgarian
     ; bh Bihari
     ; bi Bislama
-    ("bn" . "UTF-8") ; Bengali, Bangla
+    ("bn" "Bengali" utf-8) ; Bengali, Bangla
     ("bo" . "Tibetan")
     ("br" . "Latin-1") ; Breton
     ("bs" . "Latin-2") ; Bosnian
@@ -2242,6 +2242,7 @@
     ("de" "German" iso-8859-1)
     ; dv Divehi
     ; dz Bhutani
+    ("ee" . "Latin-4") ; Ewe
     ("el" "Greek" iso-8859-7)
     ;; Users who specify "en" explicitly typically want Latin-1, not ASCII.
     ;; That's actually what the GNU locales define, modulo things like
@@ -2250,10 +2251,10 @@
     ("en" "English" iso-8859-1) ; English
     ("eo" . "Esperanto") ; Esperanto
     ("es" "Spanish" iso-8859-1)
-    ("et" . "Latin-1") ; Estonian
+    ("et" . "Latin-9") ; Estonian
     ("eu" . "Latin-1") ; Basque
-    ("fa" . "UTF-8") ; Persian
-    ("fi" . "Latin-1") ; Finnish
+    ("fa" "Persian" utf-8) ; Persian
+    ("fi" . "Latin-9") ; Finnish
     ("fj" . "Latin-1") ; Fiji
     ("fo" . "Latin-1") ; Faroese
     ("fr" "French" iso-8859-1) ; French
@@ -2263,11 +2264,12 @@
     ("gez" "Ethiopic" utf-8) ; Geez
     ("gl" . "Latin-1") ; Gallegan; Galician
     ; gn Guarani
-    ("gu" . "UTF-8") ; Gujarati
+    ("gu" "Gujarati" utf-8) ; Gujarati
     ("gv" . "Latin-1") ; Manx Gaelic
     ; ha Hausa
     ("he" "Hebrew" iso-8859-8)
     ("hi" "Devanagari" utf-8) ; Hindi
+    ("hni_IN" . "UTF-8") ; Chhattisgarhi
     ("hr" "Croatian" iso-8859-2) ; Croatian
     ("hu" . "Latin-2") ; Hungarian
     ; hy Armenian
@@ -2284,20 +2286,20 @@
     ("ka" "Georgian" georgian-ps) ; Georgian
     ; kk Kazakh
     ("kl" . "Latin-1") ; Greenlandic
-    ; km Cambodian
+    ("km" "Khmer" utf-8) ; Cambodian, Khmer
     ("kn" "Kannada" utf-8)
     ("ko" "Korean" euc-kr)
-    ; ks Kashmiri
+    ("ks" . "UTF-8") ; Kashmiri
     ; ku Kurdish
     ("kw" . "Latin-1") ; Cornish
-    ; ky Kirghiz
+    ("ky" . "UTF-8") ; Kirghiz
     ("la" . "Latin-1") ; Latin
     ("lb" . "Latin-1") ; Luxemburgish
-    ("lg" . "Laint-6") ; Ganda
+    ("lg" . "Latin-6") ; Ganda, a.k.a. Luganda
     ; ln Lingala
     ("lo" "Lao" utf-8) ; Laothian
     ("lt" "Lithuanian" iso-8859-13)
-    ("lv" . "Latvian") ; Latvian, Lettish
+    ("lv" "Latvian" iso-8859-13) ; Latvian, Lettish
     ; mg Malagasy
     ("mi" . "Latin-7") ; Maori
     ("mk" "Cyrillic-ISO" iso-8859-5) ; Macedonian
@@ -2307,24 +2309,29 @@
     ("mr" "Devanagari" utf-8) ; Marathi
     ("ms" . "Latin-1") ; Malay
     ("mt" . "Latin-3") ; Maltese
-    ; my Burmese
+    ("my" "Burmese" utf-8) ; Burmese
     ; na Nauru
     ("nb" . "Latin-1") ; Norwegian
     ("ne" "Devanagari" utf-8) ; Nepali
     ("nl" "Dutch" iso-8859-1)
+    ("nn" . "Latin-1") ; Norwegian Nynorsk
     ("no" . "Latin-1") ; Norwegian
+    ("nr_ZA" . "UTF-8") ; South Ndebele
+    ("nso_ZA" . "UTF-8") ; Pedi
     ("oc" . "Latin-1") ; Occitan
     ("om_ET" . "UTF-8") ; (Afan) Oromo
     ("om" . "Latin-1") ; (Afan) Oromo
-    ; or Oriya
-    ("pa" . "UTF-8") ; Punjabi
-    ("pl" . "Latin-2") ; Polish
+    ("or" "Oriya" utf-8)
+    ("pa" "Punjabi" utf-8) ; Punjabi
+    ("pl" "Polish" iso-8859-2) ; Polish
     ; ps Pashto, Pushto
+    ("pt_BR" "Brazilian Portuguese" iso-8859-1) ; Brazilian Portuguese
     ("pt" . "Latin-1") ; Portuguese
     ; qu Quechua
     ("rm" . "Latin-1") ; Rhaeto-Romanic
     ; rn Kirundi
     ("ro" "Romanian" iso-8859-2)
+    ("ru_RU.koi8r" "Cyrillic-KOI8" koi8-r)
     ("ru_RU" "Russian" iso-8859-5)
     ("ru_UA" "Russian" koi8-u)
     ; rw Kinyarwanda
@@ -2333,7 +2340,7 @@
     ("se" . "UTF-8") ; Northern Sami
     ; sg Sangho
     ("sh" . "Latin-2") ; Serbo-Croatian
-    ; si Sinhalese
+    ("si" "Sinhala" utf-8) ; Sinhalese
     ("sid" . "UTF-8") ; Sidamo
     ("sk" "Slovak" iso-8859-2)
     ("sl" "Slovenian" iso-8859-2)
@@ -2341,7 +2348,7 @@
     ; sn Shona
     ("so_ET" "UTF-8") ; Somali
     ("so" "Latin-1") ; Somali
-    ("sq" . "Latin-1") ; Albanian
+    ("sq" . "Latin-2") ; Albanian
     ("sr" . "Latin-2") ; Serbian (Latin alphabet)
     ; ss Siswati
     ("st" . "Latin-1") ;  Sesotho
@@ -2349,17 +2356,20 @@
     ("sv" "Swedish" iso-8859-1)		; Swedish
     ("sw" . "Latin-1") ; Swahili
     ("ta" "Tamil" utf-8)
-    ("te" . "UTF-8") ; Telugu
+    ("te" "Telugu" utf-8) ; Telugu
     ("tg" "Tajik" koi8-t)
-    ("th" "Thai" tis-620)
+    ("th_TH.tis620" "Thai" tis-620)
+    ("th_TH.TIS-620" "Thai" tis-620)
+    ("th_TH" "Thai" iso-8859-11)
+    ("th" "Thai" iso-8859-11)
     ("ti" "Ethiopic" utf-8) ; Tigrinya
     ("tig_ER" . "UTF-8") ; Tigre
     ; tk Turkmen
     ("tl" . "Latin-1") ; Tagalog
-    ; tn Setswana
+    ("tn" . "Latin-9") ; Setswana, Tswana
     ; to Tonga
     ("tr" "Turkish" iso-8859-9)
-    ; ts Tsonga
+    ("ts" . "Latin-1") ; Tsonga
     ("tt" . "UTF-8") ; Tatar
     ; tw Twi
     ; ug Uighur
@@ -2367,6 +2377,7 @@
     ("ur" . "UTF-8") ; Urdu
     ("uz_UZ@cyrillic" . "UTF-8"); Uzbek
     ("uz" . "Latin-1") ; Uzbek
+    ("ve" . "UTF-8") ; Venda
     ("vi" "Vietnamese" utf-8)
     ; vo Volapuk
     ("wa" . "Latin-1") ; Walloon
@@ -2396,7 +2407,6 @@
 
     ;; Nonstandard or obsolete language codes
     ("cz" . "Czech") ; e.g. Solaris 2.6
-    ("ee" . "Latin-4") ; Estonian, e.g. X11R6.4
     ("iw" . "Hebrew") ; e.g. X11R6.4
     ("sp" . "Cyrillic-ISO") ; Serbian (Cyrillic alphabet), e.g. X11R6.4
     ("su" . "Latin-1") ; Finnish, e.g. Solaris 2.6
@@ -2934,7 +2944,7 @@
 	       (#x4DC0 . #x4DFF)
 	       ;; (#x4E00 . #x9FFF) CJK Unified Ideographs
 	       (#xA000 . #xD7FF)
-	       ;; (#xD800 . #xFAFF) Surrogate/Private
+	       ;; (#xD800 . #xF8FF) Surrogate/Private
 	       (#xFB00 . #x134FF)
 	       ;; (#x13500 . #x143FF) unused
                (#x14400 . #x14646)
diff -Nru emacs-26.1+1/lisp/international/mule-conf.el emacs-26.3+1/lisp/international/mule-conf.el
--- emacs-26.1+1/lisp/international/mule-conf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/mule-conf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-conf.el --- configure multilingual environment
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
@@ -1305,6 +1305,11 @@
   :bom '(utf-8-with-signature . utf-8))
 
 (define-coding-system-alias 'mule-utf-8 'utf-8)
+;; See this page:
+;; https://docs.microsoft.com/en-us/windows/desktop/intl/code-page-identifiers
+;; Starting with Windows 10, people are trying to set their systems to
+;; use UTF-8 , so we had better recognized this alias:
+(define-coding-system-alias 'cp65001 'utf-8)
 
 (define-coding-system 'utf-8-emacs
   "Support for all Emacs characters (including non-Unicode characters)."
diff -Nru emacs-26.1+1/lisp/international/mule-diag.el emacs-26.3+1/lisp/international/mule-diag.el
--- emacs-26.1+1/lisp/international/mule-diag.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/mule-diag.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -355,7 +355,8 @@
 		     (:iso-revision-number "ISO revision number: "
 					   number-to-string)
 		     (:supplementary-p
-		      "Used only as a parent of some other charset." nil)))
+		      "Used only as a parent or a subset of some other charset,
+or provided just for backward compatibility." nil)))
 	(let ((val (get-charset-property charset (car elt))))
 	  (when val
 	    (if (cadr elt) (insert (cadr elt)))
diff -Nru emacs-26.1+1/lisp/international/mule.el emacs-26.3+1/lisp/international/mule.el
--- emacs-26.1+1/lisp/international/mule.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/mule.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule.el --- basic commands for multilingual environment
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -1851,9 +1851,12 @@
 
 Each function in this list should be written to operate on the
 current buffer, but should not modify it in any way.  The buffer
-will contain undecoded text of parts of the file.  Each function
+will contain the text of parts of the file.  Each function
 should take one argument, SIZE, which says how many characters
-\(starting from point) it should look at.
+\(starting from point) it should look at.  The function might be
+called both when the file is visited and Emacs wants to decode
+its contents, and when the file's buffer is about to be saved
+and Emacs wants to determine how to encode its contents.
 
 If one of these functions succeeds in determining a coding
 system, it should return that coding system.  Otherwise, it
@@ -2500,7 +2503,18 @@
                   (let ((sym-type (coding-system-type sym))
                         (bfcs-type
                          (coding-system-type buffer-file-coding-system)))
-                    (if (and (coding-system-equal 'utf-8 sym-type)
+                    ;; If the buffer is unibyte, its encoding is
+                    ;; immaterial (it is just the default value of
+                    ;; buffer-file-coding-system), so we ignore it.
+                    ;; This situation happens when this function is
+                    ;; called as part of visiting a file, as opposed
+                    ;; to when saving a buffer to a file.
+                    (if (and enable-multibyte-characters
+                             ;; 'charset' will signal an error in
+                             ;; coding-system-equal, since it isn't a
+                             ;; coding-system.  So test that up front.
+                             (not (equal sym-type 'charset))
+                             (coding-system-equal 'utf-8 sym-type)
                              (coding-system-equal 'utf-8 bfcs-type))
                         buffer-file-coding-system
 		      sym))
@@ -2544,7 +2558,18 @@
       (let* ((match (match-string 2))
 	     (sym (intern (downcase match))))
 	(if (coding-system-p sym)
-	    sym
+            ;; If the encoding tag is UTF-8 and the buffer's
+            ;; encoding is one of the variants of UTF-8, use the
+            ;; buffer's encoding.  This allows, e.g., saving an
+            ;; HTML file as UTF-8 with BOM when the tag says UTF-8.
+            (let ((sym-type (coding-system-type sym))
+                  (bfcs-type
+                   (coding-system-type buffer-file-coding-system)))
+              (if (and enable-multibyte-characters
+                       (coding-system-equal 'utf-8 sym-type)
+                       (coding-system-equal 'utf-8 bfcs-type))
+                  buffer-file-coding-system
+		sym))
 	  (message "Warning: unknown coding system \"%s\"" match)
 	  nil)))))
 
diff -Nru emacs-26.1+1/lisp/international/mule-util.el emacs-26.3+1/lisp/international/mule-util.el
--- emacs-26.1+1/lisp/international/mule-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/mule-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-util.el --- utility functions for multilingual environment (mule)  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/ogonek.el emacs-26.3+1/lisp/international/ogonek.el
--- emacs-26.1+1/lisp/international/ogonek.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/ogonek.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ogonek.el --- change the encoding of Polish diacritics
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Włodek Bzyl
 ;;	   Ryszard Kubiak
diff -Nru emacs-26.1+1/lisp/international/quail.el emacs-26.3+1/lisp/international/quail.el
--- emacs-26.1+1/lisp/international/quail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/quail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; quail.el --- provides simple input method for multilingual text
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/rfc1843.el emacs-26.3+1/lisp/international/rfc1843.el
--- emacs-26.1+1/lisp/international/rfc1843.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/rfc1843.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc1843.el --- HZ (rfc1843) decoding  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news HZ HZ+ mail i18n
diff -Nru emacs-26.1+1/lisp/international/titdic-cnv.el emacs-26.3+1/lisp/international/titdic-cnv.el
--- emacs-26.1+1/lisp/international/titdic-cnv.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/titdic-cnv.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/international/ucs-normalize.el emacs-26.3+1/lisp/international/ucs-normalize.el
--- emacs-26.1+1/lisp/international/ucs-normalize.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/ucs-normalize.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ucs-normalize.el --- Unicode normalization NFC/NFD/NFKD/NFKC
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Taichi Kawabata <kawabata.taichi@gmail.com>
 ;; Keywords: unicode, normalization
@@ -30,7 +30,7 @@
 ;;
 ;; HFS-Normalization:
 ;; Reference:
-;; http://developer.apple.com/technotes/tn/tn1150.html
+;; https://developer.apple.com/library/archive/technotes/tn/tn1150.html
 ;;
 ;; HFS Normalization excludes following area for decomposition.
 ;;
diff -Nru emacs-26.1+1/lisp/international/utf-7.el emacs-26.3+1/lisp/international/utf-7.el
--- emacs-26.1+1/lisp/international/utf-7.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/utf-7.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; utf-7.el --- utf-7 coding system
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n, mail
diff -Nru emacs-26.1+1/lisp/international/utf7.el emacs-26.3+1/lisp/international/utf7.el
--- emacs-26.1+1/lisp/international/utf7.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/international/utf7.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs   -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Jon K Hellan <hellan@acm.org>
 ;; Maintainer: bugs@gnus.org
diff -Nru emacs-26.1+1/lisp/isearchb.el emacs-26.3+1/lisp/isearchb.el
--- emacs-26.1+1/lisp/isearchb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/isearchb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/isearch.el emacs-26.3+1/lisp/isearch.el
--- emacs-26.1+1/lisp/isearch.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/isearch.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; isearch.el --- incremental search minor mode -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992-1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1997, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Maintainer: emacs-devel@gnu.org
@@ -188,11 +188,14 @@
 to the search status stack.")
 
 (defvar isearch-filter-predicate #'isearch-filter-visible
-  "Predicate that filters the search hits that would normally be available.
-Search hits that dissatisfy the predicate are skipped.  The function
-has two arguments: the positions of start and end of text matched by
-the search.  If this function returns nil, continue searching without
-stopping at this match.
+  "Predicate to filter hits of Isearch and replace commands.
+Isearch hits that don't satisfy the predicate will be skipped.
+The value should be a function of two arguments; it will be
+called with the the positions of the start and the end of the
+text matched by Isearch and replace commands.  If this function
+returns nil, Isearch and replace commands will continue searching
+without stopping at resp. replacing this match.
+
 If you use `add-function' to modify this variable, you can use the
 `isearch-message-prefix' advice property to specify the prefix string
 displayed in the search message.")
@@ -590,7 +593,7 @@
   "Stack of search status elements.
 Each element is an `isearch--state' struct where the slots are
  [STRING MESSAGE POINT SUCCESS FORWARD OTHER-END WORD
-  ERROR WRAPPED BARRIER CASE-FOLD-SEARCH]")
+  ERROR WRAPPED BARRIER CASE-FOLD-SEARCH POP-FUN]")
 
 (defvar isearch-string "")  ; The current search string.
 (defvar isearch-message "") ; text-char-description version of isearch-string
@@ -1956,11 +1959,14 @@
 
 
 (defun isearch-delete-char ()
-  "Discard last input item and move point back.
-Last input means the last character or the last isearch command
-that added or deleted characters from the search string,
-moved point, toggled regexp mode or case-sensitivity, etc.
-If no previous match was done, just beep."
+  "Undo last input item during a search.
+
+An input item is the result of a command that pushes a new state
+of isearch (as recorded by the `isearch--state' structure) to
+`isearch-cmds'.  Info node `(emacs)Basic Isearch' explains when
+Emacs records a new input item.
+
+If no input items have been entered yet, just beep."
   (interactive)
   (if (null (cdr isearch-cmds))
       (ding)
@@ -3006,10 +3012,13 @@
 	      (setq isearch-hidden t)))))))
 
 (defun isearch-filter-visible (beg end)
-  "Test whether the current search hit is visible at least partially.
-Return non-nil if the text from BEG to END is visible to Isearch as
-determined by `isearch-range-invisible' unless invisible text can be
-searched too when `search-invisible' is t."
+  "Return non-nil if text between BEG and END is deemed visible by Isearch.
+This function is intended to be used as `isearch-filter-predicate'.
+It returns non-nil if the text between BEG and END is visible to
+Isearch, at least partially, as determined by `isearch-range-invisible'.
+If `search-invisible' is t, which allows Isearch matches inside
+invisible text, this function will always return non-nil, regardless
+of what `isearch-range-invisible' says."
   (or (eq search-invisible t)
       (not (isearch-range-invisible beg end))))
 
diff -Nru emacs-26.1+1/lisp/jit-lock.el emacs-26.3+1/lisp/jit-lock.el
--- emacs-26.1+1/lisp/jit-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/jit-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; jit-lock.el --- just-in-time fontification  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Keywords: faces files
diff -Nru emacs-26.1+1/lisp/jka-cmpr-hook.el emacs-26.3+1/lisp/jka-cmpr-hook.el
--- emacs-26.1+1/lisp/jka-cmpr-hook.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/jka-cmpr-hook.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
 
-;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2018 Free Software
+;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
diff -Nru emacs-26.1+1/lisp/jka-compr.el emacs-26.3+1/lisp/jka-compr.el
--- emacs-26.1+1/lisp/jka-compr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/jka-compr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
-;; Copyright (C) 1993-1995, 1997, 1999-2018 Free Software Foundation,
+;; Copyright (C) 1993-1995, 1997, 1999-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Jay K. Adams <jka@ece.cmu.edu>
diff -Nru emacs-26.1+1/lisp/json.el emacs-26.3+1/lisp/json.el
--- emacs-26.1+1/lisp/json.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/json.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; json.el --- JavaScript Object Notation parser / generator -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Theresa O'Connor <ted@oconnor.cx>
 ;; Version: 1.4
diff -Nru emacs-26.1+1/lisp/kermit.el emacs-26.3+1/lisp/kermit.el
--- emacs-26.1+1/lisp/kermit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/kermit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; kermit.el --- additions to shell mode for use with kermit
 
-;; Copyright (C) 1988, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jeff Norden <jeff@colgate.csnet>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/kmacro.el emacs-26.3+1/lisp/kmacro.el
--- emacs-26.1+1/lisp/kmacro.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/kmacro.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; kmacro.el --- enhanced keyboard macros -*- lexical-binding: t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
@@ -263,7 +263,10 @@
 (defun kmacro-insert-counter (arg)
   "Insert current value of `kmacro-counter', then increment it by ARG.
 Interactively, ARG defaults to 1.  With \\[universal-argument], insert
-current value of `kmacro-counter', but do not increment it."
+the previous value of `kmacro-counter', and do not increment the
+current value.
+The previous value of the counter is the one it had before
+the last increment."
   (interactive "P")
   (if kmacro-initial-counter-value
       (setq kmacro-counter kmacro-initial-counter-value
@@ -692,9 +695,10 @@
 
 When used during defining/executing a macro, inserts the current value
 of `kmacro-counter' and increments the counter value by ARG (or by 1 if no
-prefix argument).  With just \\[universal-argument], inserts the current value
-of `kmacro-counter', but does not modify the counter; this is the
-same as incrementing the counter by zero.
+prefix argument).  With just \\[universal-argument], inserts the previous
+value of `kmacro-counter', and does not modify the counter; this is
+different from incrementing the counter by zero.  (The previous value
+of the counter is the one it had before the last increment.)
 
 The macro counter can be set directly via \\[kmacro-set-counter] and \\[kmacro-add-counter].
 The format of the inserted value of the counter can be controlled
diff -Nru emacs-26.1+1/lisp/language/china-util.el emacs-26.3+1/lisp/language/china-util.el
--- emacs-26.1+1/lisp/language/china-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/china-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; china-util.el --- utilities for Chinese  -*- coding: utf-8 -*-
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/chinese.el emacs-26.3+1/lisp/language/chinese.el
--- emacs-26.1+1/lisp/language/chinese.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/chinese.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; chinese.el --- support for Chinese -*- coding: utf-8; -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/cyrillic.el emacs-26.3+1/lisp/language/cyrillic.el
--- emacs-26.1+1/lisp/language/cyrillic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/cyrillic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cyrillic.el --- support for Cyrillic -*- coding: utf-8; -*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/cyril-util.el emacs-26.3+1/lisp/language/cyril-util.el
--- emacs-26.1+1/lisp/language/cyril-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/cyril-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cyril-util.el --- utilities for Cyrillic scripts
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, Cyrillic
 
diff -Nru emacs-26.1+1/lisp/language/czech.el emacs-26.3+1/lisp/language/czech.el
--- emacs-26.1+1/lisp/language/czech.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/czech.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; czech.el --- support for Czech -*- coding: utf-8 -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/language/english.el emacs-26.3+1/lisp/language/english.el
--- emacs-26.1+1/lisp/language/english.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/english.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; english.el --- support for English
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/ethiopic.el emacs-26.3+1/lisp/language/ethiopic.el
--- emacs-26.1+1/lisp/language/ethiopic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/ethiopic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ethiopic.el --- support for Ethiopic	-*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/ethio-util.el emacs-26.3+1/lisp/language/ethio-util.el
--- emacs-26.1+1/lisp/language/ethio-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/ethio-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ethio-util.el --- utilities for Ethiopic	-*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1997-1998, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2002-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/european.el emacs-26.3+1/lisp/language/european.el
--- emacs-26.1+1/lisp/language/european.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/european.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; european.el --- support for European languages -*- coding: utf-8; -*-
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/georgian.el emacs-26.3+1/lisp/language/georgian.el
--- emacs-26.1+1/lisp/language/georgian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/georgian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; georgian.el --- language support for Georgian
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/language/greek.el emacs-26.3+1/lisp/language/greek.el
--- emacs-26.1+1/lisp/language/greek.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/greek.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; greek.el --- support for Greek
 
-;; Copyright (C) 2002, 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2013-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/hanja-util.el emacs-26.3+1/lisp/language/hanja-util.el
--- emacs-26.1+1/lisp/language/hanja-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/hanja-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hanja-util.el --- Korean Hanja util module  -*- coding: utf-8 -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Jihyun Cho <jihyun.jo@gmail.com>
 ;; Keywords: multilingual, input method, Korean, Hanja
diff -Nru emacs-26.1+1/lisp/language/hebrew.el emacs-26.3+1/lisp/language/hebrew.el
--- emacs-26.1+1/lisp/language/hebrew.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/hebrew.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hebrew.el --- support for Hebrew -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/indian.el emacs-26.3+1/lisp/language/indian.el
--- emacs-26.1+1/lisp/language/indian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/indian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; indian.el --- Indian languages support -*- coding: utf-8; -*-
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff -Nru emacs-26.1+1/lisp/language/ind-util.el emacs-26.3+1/lisp/language/ind-util.el
--- emacs-26.1+1/lisp/language/ind-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/ind-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Devanagari
diff -Nru emacs-26.1+1/lisp/language/japanese.el emacs-26.3+1/lisp/language/japanese.el
--- emacs-26.1+1/lisp/language/japanese.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/japanese.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/japan-util.el emacs-26.3+1/lisp/language/japan-util.el
--- emacs-26.1+1/lisp/language/japan-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/japan-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/korean.el emacs-26.3+1/lisp/language/korean.el
--- emacs-26.1+1/lisp/language/korean.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/korean.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; korean.el --- support for Korean -*- coding: utf-8 -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/korea-util.el emacs-26.3+1/lisp/language/korea-util.el
--- emacs-26.1+1/lisp/language/korea-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/korea-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; korea-util.el --- utilities for Korean
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/lao.el emacs-26.3+1/lisp/language/lao.el
--- emacs-26.1+1/lisp/language/lao.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/lao.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lao.el --- support for Lao -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/lao-util.el emacs-26.3+1/lisp/language/lao-util.el
--- emacs-26.1+1/lisp/language/lao-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/lao-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lao-util.el --- utilities for Lao -*- coding: utf-8; -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/romanian.el emacs-26.3+1/lisp/language/romanian.el
--- emacs-26.1+1/lisp/language/romanian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/romanian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; romanian.el --- support for Romanian -*- coding: utf-8 -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
 ;; Keywords: multilingual, Romanian, i18n
diff -Nru emacs-26.1+1/lisp/language/slovak.el emacs-26.3+1/lisp/language/slovak.el
--- emacs-26.1+1/lisp/language/slovak.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/slovak.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; slovak.el --- support for Slovak -*- coding: utf-8 -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Authors:    Tibor Šimko <tibor.simko@fmph.uniba.sk>,
 ;;             Milan Zamazal <pdm@zamazal.org>
diff -Nru emacs-26.1+1/lisp/language/tai-viet.el emacs-26.3+1/lisp/language/tai-viet.el
--- emacs-26.1+1/lisp/language/tai-viet.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/tai-viet.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tai-viet.el --- support for Tai Viet -*- coding: utf-8 -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff -Nru emacs-26.1+1/lisp/language/thai.el emacs-26.3+1/lisp/language/thai.el
--- emacs-26.1+1/lisp/language/thai.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/thai.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thai.el --- support for Thai -*- coding: utf-8 -*-
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/thai-util.el emacs-26.3+1/lisp/language/thai-util.el
--- emacs-26.1+1/lisp/language/thai-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/thai-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thai-util.el --- utilities for Thai -*- coding: utf-8; -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/tibetan.el emacs-26.3+1/lisp/language/tibetan.el
--- emacs-26.1+1/lisp/language/tibetan.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/tibetan.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tibetan.el --- support for Tibetan language -*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/tibet-util.el emacs-26.3+1/lisp/language/tibet-util.el
--- emacs-26.1+1/lisp/language/tibet-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/tibet-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: utf-8-emacs; -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/utf-8-lang.el emacs-26.3+1/lisp/language/utf-8-lang.el
--- emacs-26.1+1/lisp/language/utf-8-lang.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/utf-8-lang.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; utf-8-lang.el --- generic UTF-8 language environment
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/language/vietnamese.el emacs-26.3+1/lisp/language/vietnamese.el
--- emacs-26.1+1/lisp/language/vietnamese.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/vietnamese.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vietnamese.el --- support for Vietnamese -*- coding: utf-8; -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/language/viet-util.el emacs-26.3+1/lisp/language/viet-util.el
--- emacs-26.1+1/lisp/language/viet-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/language/viet-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viet-util.el --- utilities for Vietnamese  -*- coding: utf-8; -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/ldefs-boot.el emacs-26.3+1/lisp/ldefs-boot.el
--- emacs-26.1+1/lisp/ldefs-boot.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ldefs-boot.el	2019-09-10 00:32:49.000000000 +0000
@@ -69,6 +69,7 @@
 
 ;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (0 0 0 0))
 ;;; Generated autoloads from progmodes/ada-mode.el
+(push (purecopy '(ada-mode 4 0)) package--builtin-versions)
 
 (autoload 'ada-add-extensions "ada-mode" "\
 Define SPEC and BODY as being valid extensions for Ada files.
@@ -1819,7 +1820,7 @@
 may also revert some non-file buffers, as described in the
 documentation of that variable.  It ignores buffers with modes
 matching `global-auto-revert-ignore-modes', and buffers with a
-non-nil vale of `global-auto-revert-ignore-buffer'.
+non-nil value of `global-auto-revert-ignore-buffer'.
 
 When a buffer is reverted, a message is generated.  This can be
 suppressed by setting `auto-revert-verbose' to nil.
@@ -2335,7 +2336,7 @@
 bookmark record, but this is usually only done by programmatic callers.
 
 If DISPLAY-FUNC is non-nil, it is a function to invoke to display the
-bookmark.  It defaults to `switch-to-buffer'.  A typical value for
+bookmark.  It defaults to `pop-to-buffer-same-window'.  A typical value for
 DISPLAY-FUNC would be `switch-to-buffer-other-window'.
 
 \(fn BOOKMARK &optional DISPLAY-FUNC)" t nil)
@@ -4582,9 +4583,8 @@
 
 (autoload 'checkdoc-continue "checkdoc" "\
 Find the next doc string in the current buffer which has a style error.
-Prefix argument TAKE-NOTES means to continue through the whole buffer and
-save warnings in a separate buffer.  Second optional argument START-POINT
-is the starting location.  If this is nil, `point-min' is used instead.
+Prefix argument TAKE-NOTES means to continue through the whole
+buffer and save warnings in a separate buffer.
 
 \(fn &optional TAKE-NOTES)" t nil)
 
@@ -5925,6 +5925,9 @@
 pseudo-classes, and pseudo-elements on the Mozilla Developer
 Network (MDN).
 
+Use `\\[fill-paragraph]' to reformat CSS declaration blocks.  It can also
+be used to fill comments.
+
 \\{css-mode-map}
 
 \(fn)" t nil)
@@ -6020,7 +6023,10 @@
 ;;;;;;  (0 0 0 0))
 ;;; Generated autoloads from emacs-lisp/cursor-sensor.el
 
-(defvar cursor-sensor-inhibit nil)
+(defvar cursor-sensor-inhibit nil "\
+When non-nil, suspend `cursor-sensor-mode' and `cursor-intangible-mode'.
+By convention, this is a list of symbols where each symbol stands for the
+\"cause\" of the suspension.")
 
 (autoload 'cursor-intangible-mode "cursor-sensor" "\
 Keep cursor outside of any `cursor-intangible' text property.
@@ -6748,7 +6754,7 @@
 
 When called interactively, prompt for VARIABLE in the minibuffer.
 
-This works by calling `add-variable-watch' on VARIABLE.  If you
+This works by calling `add-variable-watcher' on VARIABLE.  If you
 quit from the debugger, this will abort the change (unless the
 change is caused by the termination of a let-binding).
 
@@ -6966,13 +6972,22 @@
 region limits, if narrowed; the column number; and the horizontal
 scroll amount, if the buffer is horizontally scrolled.
 
-The character information includes the character code; charset and
-code points in it; syntax; category; how the character is encoded in
-BUFFER and in BUFFER's file; character composition information (if
-relevant); the font and font glyphs used to display the character;
-the character's canonical name and other properties defined by the
-Unicode Data Base; and widgets, buttons, overlays, and text properties
-relevant to POS.
+The character information includes:
+ its codepoint;
+ its charset (see `char-charset'), overridden by the `charset' text
+   property at POS, if any;
+ the codepoint of the character in the above charset;
+ the character's script (as defined by `char-script-table')
+ the character's syntax, as produced by `syntax-after'
+   and `internal-describe-syntax-value';
+ its category (see `char-category-set' and `describe-char-categories');
+ how to input the character using the keyboard and input methods;
+ how the character is encoded in BUFFER and in BUFFER's file;
+ the font and font glyphs used to display the character;
+ the composition information for displaying the character (if relevant);
+ the character's canonical name and other properties defined by the
+   Unicode Data Base;
+ and widgets, buttons, overlays, and text properties relevant to POS.
 
 \(fn POS &optional BUFFER)" t nil)
 
@@ -9280,6 +9295,7 @@
 
 (autoload 'ediff-windows-wordwise "ediff" "\
 Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
+This compares the portions of text visible in each of the two windows.
 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 follows:
 If WIND-A is nil, use selected window.
@@ -9291,6 +9307,7 @@
 
 (autoload 'ediff-windows-linewise "ediff" "\
 Compare WIND-A and WIND-B, which are selected by clicking, linewise.
+This compares the portions of text visible in each of the two windows.
 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 follows:
 If WIND-A is nil, use selected window.
@@ -9304,8 +9321,8 @@
 Run Ediff on a pair of regions in specified buffers.
 BUFFER-A and BUFFER-B are the buffers to be compared.
 Regions (i.e., point and mark) can be set in advance or marked interactively.
-This function is effective only for relatively small regions, up to 200
-lines.  For large regions, use `ediff-regions-linewise'.
+This function might be slow for large regions.  If you find it slow,
+use `ediff-regions-linewise' instead.
 STARTUP-HOOKS is a list of functions that Emacs calls without
 arguments after setting up the Ediff buffers.
 
@@ -10078,6 +10095,9 @@
 
 Other values are interpreted as usual.
 
+See also `emacs-lock-unlockable-modes', which exempts buffers under
+some major modes from being locked under some circumstances.
+
 \(fn &optional ARG)" t nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "emacs-lock" '("toggle-emacs-lock" "emacs-lock-")))
@@ -13303,6 +13323,9 @@
 (autoload 'flyspell-region "flyspell" "\
 Flyspell text between BEG and END.
 
+Make sure `flyspell-mode' is turned on if you want the highlight
+of a misspelled word removed when you've corrected it.
+
 \(fn BEG END)" t nil)
 
 (autoload 'flyspell-buffer "flyspell" "\
@@ -15082,7 +15105,14 @@
 rejected.  (The smaller the prime number, the less secure the
 key exchange is against man-in-the-middle attacks.)
 
-A value of nil says to use the default GnuTLS value.")
+A value of nil says to use the default GnuTLS value.
+
+The default value of this variable is such that virtually any
+connection can be established, whether this connection can be
+considered cryptographically \"safe\" or not.  However, Emacs
+network security is handled at a higher level via
+`open-network-stream' and the Network Security Manager.  See Info
+node `(emacs) Network Security'.")
 
 (custom-autoload 'gnutls-min-prime-bits "gnutls" t)
 
@@ -15165,13 +15195,17 @@
 ;;; Generated autoloads from image/gravatar.el
 
 (autoload 'gravatar-retrieve "gravatar" "\
-Retrieve MAIL-ADDRESS gravatar and call CB on retrieval.
-You can provide a list of argument to pass to CB in CBARGS.
+Asynchronously retrieve a gravatar for MAIL-ADDRESS.
+When finished, call CB as (apply CB GRAVATAR CBARGS),
+where GRAVATAR is either an image descriptor, or the symbol
+`error' if the retrieval failed.
 
 \(fn MAIL-ADDRESS CB &optional CBARGS)" nil nil)
 
 (autoload 'gravatar-retrieve-synchronously "gravatar" "\
-Retrieve MAIL-ADDRESS gravatar and returns it.
+Synchronously retrieve a gravatar for MAIL-ADDRESS.
+Value is either an image descriptor, or the symbol `error' if the
+retrieval failed.
 
 \(fn MAIL-ADDRESS)" nil nil)
 
@@ -15212,7 +15246,7 @@
 
 (custom-autoload 'grep-setup-hook "grep" t)
 
-(defconst grep-regexp-alist `((,(concat "^\\(?:" "\\(?1:[^�\n]+\\)\\(?3:�\\)\\(?2:[0-9]+\\):" "\\|" "\\(?1:[^\n:]+?[^\n/:]\\):[	 ]*\\(?2:[1-9][0-9]*\\)[	 ]*:" "\\)") 1 2 (,(lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face))) (when mbeg (- mbeg beg))))) \, (lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) nil nil (3 '(face nil display ":"))) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\
+(defconst grep-regexp-alist `((,(concat "^\\(?:" "\\(?1:[^�\n]+\\)\\(?3:�\\)\\(?2:[0-9]+\\):" "\\|" "\\(?1:" "\\(?:[a-zA-Z]:\\)?" "[^\n:]+?[^\n/:]\\):[	 ]*\\(?2:[1-9][0-9]*\\)[	 ]*:" "\\)") 1 2 (,(lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face))) (when mbeg (- mbeg beg))))) \, (lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) nil nil (3 '(face nil display ":"))) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\
 Regexp used to match grep hits.
 See `compilation-error-regexp-alist' for format details.")
 
@@ -16227,7 +16261,11 @@
 (defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer)
 
 (autoload 'hi-lock-line-face-buffer "hi-lock" "\
-Set face of all lines containing a match of REGEXP to FACE.
+Highlight all lines that match REGEXP using FACE.
+The lines that match REGEXP will be displayed by merging
+the attributes of FACE with any other face attributes
+of text in those lines.
+
 Interactively, prompt for REGEXP using `read-regexp', then FACE.
 Use the global history list for FACE.
 
@@ -17682,13 +17720,20 @@
 (autoload 'create-image "image" "\
 Create an image.
 FILE-OR-DATA is an image file name or image data.
+
 Optional TYPE is a symbol describing the image type.  If TYPE is omitted
 or nil, try to determine the image type from its first few bytes
 of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
 use its file extension as image type.
+
 Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
+
 Optional PROPS are additional image attributes to assign to the image,
-like, e.g. `:mask MASK'.
+like, e.g. `:mask MASK'.  If the property `:scale' is not given and the
+display has a high resolution (more exactly, when the average width of a
+character in the default font is more than 10 pixels), the image is
+automatically scaled up in proportion to the default font.
+
 Value is the image created, or nil if images of type TYPE are not supported.
 
 Images should not be larger than specified by `max-image-size'.
@@ -17989,8 +18034,9 @@
 
 (autoload 'insert-image-file "image-file" "\
 Insert the image file FILE into the current buffer.
-Optional arguments VISIT, BEG, END, and REPLACE are interpreted as for
-the command `insert-file-contents'.
+Optional arguments VISIT, BEG, END, and REPLACE are interpreted
+as for the command `insert-file-contents'.  Return list of
+absolute file name and number of characters inserted.
 
 \(fn FILE &optional VISIT BEG END REPLACE)" nil nil)
 
@@ -18100,9 +18146,9 @@
 matches are put).
 REGEXP is a regular expression matching a definition construct
 which is to be displayed in the menu.  REGEXP may also be a
-function, called without arguments.  It is expected to search
-backwards.  It must return true and set `match-data' if it finds
-another element.
+function of no arguments.  If REGEXP is a function, it is
+expected to search backwards, return non-nil if it finds a
+definition construct, and set `match-data' for that construct.
 INDEX is an integer specifying which subexpression of REGEXP
 matches the definition's name; this subexpression is displayed as
 the menu item.
@@ -19415,9 +19461,10 @@
 
 When used during defining/executing a macro, inserts the current value
 of `kmacro-counter' and increments the counter value by ARG (or by 1 if no
-prefix argument).  With just \\[universal-argument], inserts the current value
-of `kmacro-counter', but does not modify the counter; this is the
-same as incrementing the counter by zero.
+prefix argument).  With just \\[universal-argument], inserts the previous
+value of `kmacro-counter', and does not modify the counter; this is
+different from incrementing the counter by zero.  (The previous value
+of the counter is the one it had before the last increment.)
 
 The macro counter can be set directly via \\[kmacro-set-counter] and \\[kmacro-add-counter].
 The format of the inserted value of the counter can be controlled
@@ -20104,7 +20151,8 @@
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload 'mail-extract-address-components "mail-extr" "\
-Given an RFC-822 address ADDRESS, extract full name and canonical address.
+Extract full name and canonical address from ADDRESS.
+ADDRESS should be in RFC 822 (or later) format.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  If no
 name can be extracted, FULL-NAME will be nil.  Also see
 `mail-extr-ignore-single-names' and
@@ -20189,7 +20237,7 @@
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
-If non-nil, use a full, hairy RFC822 parser on mail addresses.
+If non-nil, use a full, hairy RFC 822 (or later) parser on mail addresses.
 Otherwise, (the default) use a smaller, somewhat faster, and
 often correct parser.")
 
@@ -24778,7 +24826,7 @@
 
 (autoload 'parse-time-string "parse-time" "\
 Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
-STRING should be on something resembling an RFC2822 string, a la
+STRING should be something resembling an RFC 822 (or later) date-time, e.g.,
 \"Fri, 25 Mar 2016 16:24:56 +0100\", but this function is
 somewhat liberal in what format it accepts, and will attempt to
 return a \"likely\" value even for somewhat malformed strings.
@@ -24870,58 +24918,43 @@
 ;;; Generated autoloads from emacs-lisp/pcase.el
 
 (autoload 'pcase "pcase" "\
-Evaluate EXP and attempt to match it against structural patterns.
+Evaluate EXP to get EXPVAL; try passing control to one of CASES.
 CASES is a list of elements of the form (PATTERN CODE...).
+For the first CASE whose PATTERN \"matches\" EXPVAL,
+evaluate its CODE..., and return the value of the last form.
+If no CASE has a PATTERN that matches, return nil.
+
+Each PATTERN expands, in essence, to a predicate to call
+on EXPVAL.  When the return value of that call is non-nil,
+PATTERN matches.  PATTERN can take one of the forms:
+
+  _                matches anything.
+  \\='VAL             matches if EXPVAL is `equal' to VAL.
+  KEYWORD          shorthand for \\='KEYWORD
+  INTEGER          shorthand for \\='INTEGER
+  STRING           shorthand for \\='STRING
+  SYMBOL           matches anything and binds it to SYMBOL.
+                   If a SYMBOL is used twice in the same pattern
+                   the second occurrence becomes an `eq'uality test.
+  (pred FUN)       matches if FUN called on EXPVAL returns non-nil.
+  (app FUN PAT)    matches if FUN called on EXPVAL matches PAT.
+  (guard BOOLEXP)  matches if BOOLEXP evaluates to non-nil.
+  (let PAT EXPR)   matches if EXPR matches PAT.
+  (and PAT...)     matches if all the patterns match.
+  (or PAT...)      matches if any of the patterns matches.
+
+FUN in `pred' and `app' can take one of the forms:
+  SYMBOL  or  (lambda ARGS BODY)
+     call it with one argument
+  (F ARG1 .. ARGn)
+     call F with ARG1..ARGn and EXPVAL as n+1'th argument
 
-A structural PATTERN describes a template that identifies a class
-of values.  For example, the pattern \\=`(,foo ,bar) matches any
-two element list, binding its elements to symbols named `foo' and
-`bar' -- in much the same way that `cl-destructuring-bind' would.
-
-A significant difference from `cl-destructuring-bind' is that, if
-a pattern match fails, the next case is tried until either a
-successful match is found or there are no more cases.  The CODE
-expression corresponding to the matching pattern determines the
-return value.  If there is no match the returned value is nil.
-
-Another difference is that pattern elements may be quoted,
-meaning they must match exactly: The pattern \\='(foo bar)
-matches only against two element lists containing the symbols
-`foo' and `bar' in that order.  (As a short-hand, atoms always
-match themselves, such as numbers or strings, and need not be
-quoted.)
-
-Lastly, a pattern can be logical, such as (pred numberp), that
-matches any number-like element; or the symbol `_', that matches
-anything.  Also, when patterns are backquoted, a comma may be
-used to introduce logical patterns inside backquoted patterns.
-
-The complete list of standard patterns is as follows:
-
-  _		matches anything.
-  SYMBOL	matches anything and binds it to SYMBOL.
-                If a SYMBOL is used twice in the same pattern
-                the second occurrence becomes an `eq'uality test.
-  (or PAT...)	matches if any of the patterns matches.
-  (and PAT...)	matches if all the patterns match.
-  \\='VAL		matches if the object is `equal' to VAL.
-  ATOM		is a shorthand for \\='ATOM.
-		   ATOM can be a keyword, an integer, or a string.
-  (pred FUN)	matches if FUN applied to the object returns non-nil.
-  (guard BOOLEXP)	matches if BOOLEXP evaluates to non-nil.
-  (let PAT EXP)	matches if EXP matches PAT.
-  (app FUN PAT)	matches if FUN applied to the object matches PAT.
+FUN, BOOLEXP, EXPR, and subsequent PAT can refer to variables
+bound earlier in the pattern by a SYMBOL pattern.
 
 Additional patterns can be defined using `pcase-defmacro'.
 
-The FUN argument in the `app' pattern may have the following forms:
-  SYMBOL or (lambda ARGS BODY)  in which case it's called with one argument.
-  (F ARG1 .. ARGn) in which case F gets called with an n+1'th argument
-                        which is the value being matched.
-So a FUN of the form SYMBOL is equivalent to (FUN).
-FUN can refer to variables bound earlier in the pattern.
-
-See Info node `(elisp) Pattern matching case statement' in the
+See Info node `(elisp) Pattern-Matching Conditional' in the
 Emacs Lisp manual for more information and examples.
 
 \(fn EXP &rest CASES)" nil t)
@@ -24949,28 +24982,45 @@
 (function-put 'pcase-lambda 'lisp-indent-function 'defun)
 
 (autoload 'pcase-let* "pcase" "\
-Like `let*' but where you can use `pcase' patterns for bindings.
-BODY should be an expression, and BINDINGS should be a list of bindings
-of the form (PAT EXP).
+Like `let*', but supports destructuring BINDINGS using `pcase' patterns.
+As with `pcase-let', BINDINGS are of the form (PATTERN EXP), but the
+EXP in each binding in BINDINGS can use the results of the destructuring
+bindings that precede it in BINDINGS' order.
+
+Each EXP should match (i.e. be of compatible structure) to its
+respective PATTERN; a mismatch may signal an error or may go
+undetected, binding variables to arbitrary values, such as nil.
 
 \(fn BINDINGS &rest BODY)" nil t)
 
 (function-put 'pcase-let* 'lisp-indent-function '1)
 
 (autoload 'pcase-let "pcase" "\
-Like `let' but where you can use `pcase' patterns for bindings.
-BODY should be a list of expressions, and BINDINGS should be a list of bindings
-of the form (PAT EXP).
-The macro is expanded and optimized under the assumption that those
-patterns *will* match, so a mismatch may go undetected or may cause
-any kind of error.
+Like `let', but supports destructuring BINDINGS using `pcase' patterns.
+BODY should be a list of expressions, and BINDINGS should be a list of
+bindings of the form (PATTERN EXP).
+All EXPs are evaluated first, and then used to perform destructuring
+bindings by matching each EXP against its respective PATTERN.  Then
+BODY is evaluated with those bindings in effect.
+
+Each EXP should match (i.e. be of compatible structure) to its
+respective PATTERN; a mismatch may signal an error or may go
+undetected, binding variables to arbitrary values, such as nil.
 
 \(fn BINDINGS &rest BODY)" nil t)
 
 (function-put 'pcase-let 'lisp-indent-function '1)
 
 (autoload 'pcase-dolist "pcase" "\
-Like `dolist' but where the binding can be a `pcase' pattern.
+Eval BODY once for each set of bindings defined by PATTERN and LIST elements.
+PATTERN should be a `pcase' pattern describing the structure of
+LIST elements, and LIST is a list of objects that match PATTERN,
+i.e. have a structure that is compatible with PATTERN.
+For each element of LIST, this macro binds the variables in
+PATTERN to the corresponding subfields of the LIST element, and
+then evaluates BODY with these bindings in effect.  The
+destructuring bindings of variables in PATTERN to the subfields
+of the elements of LIST is performed as if by `pcase-let'.
 
 \(fn (PATTERN LIST) BODY...)" nil t)
 
@@ -24981,7 +25031,10 @@
 Patterns of the form (NAME ...) will be expanded according
 to this macro.
 
-\(fn NAME ARGS &rest BODY)" nil t)
+By convention, DOC should use \"EXPVAL\" to stand
+for the result of evaluating EXP (first arg to `pcase').
+
+\(fn NAME ARGS [DOC] &rest BODY...)" nil t)
 
 (function-put 'pcase-defmacro 'lisp-indent-function '2)
 
@@ -27567,13 +27620,13 @@
  (defun simplified-regexp-opt (strings &optional paren)
    (let ((parens
           (cond ((stringp paren)       (cons paren \"\\\\)\"))
-                ((eq paren 'words)    '(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
-                ((eq paren 'symbols) '(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
-                ((null paren)          '(\"\\\\(?:\" . \"\\\\)\"))
-                (t                       '(\"\\\\(\" . \"\\\\)\")))))
-     (concat (car paren)
-             (mapconcat 'regexp-quote strings \"\\\\|\")
-             (cdr paren))))
+                ((eq paren \\='words)    \\='(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\"))
+                ((eq paren \\='symbols) \\='(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\"))
+                ((null paren)          \\='(\"\\\\(?:\" . \"\\\\)\"))
+                (t                       \\='(\"\\\\(\" . \"\\\\)\")))))
+     (concat (car parens)
+             (mapconcat \\='regexp-quote strings \"\\\\|\")
+             (cdr parens))))
 
 \(fn STRINGS &optional PAREN)" nil nil)
 
@@ -28216,12 +28269,12 @@
 Ask user a multiple choice question.
 PROMPT should be a string that will be displayed as the prompt.
 
-CHOICES is an alist where the first element in each entry is a
-character to be entered, the second element is a short name for
-the entry to be displayed while prompting (if there's room, it
-might be shortened), and the third, optional entry is a longer
-explanation that will be displayed in a help buffer if the user
-requests more help.
+CHOICES is a list of (KEY NAME [DESCRIPTION]).  KEY is a
+character to be entered.  NAME is a short name for the entry to
+be displayed while prompting (if there's room, it might be
+shortened).  DESCRIPTION is an optional longer explanation that
+will be displayed in a help buffer if the user requests more
+help.
 
 This function translates user input into responses by consulting
 the bindings in `query-replace-map'; see the documentation of
@@ -28232,9 +28285,9 @@
 again.
 
 When `use-dialog-box' is t (the default), this function can pop
-up a dialog window to collect the user input. That functionality
-requires `display-popup-menus-p' to return t. Otherwise, a text
-dialog will be used.
+up a dialog window to collect the user input.  That functionality
+requires `display-popup-menus-p' to return t.  Otherwise, a
+text dialog will be used.
 
 The return value is the matching entry from the CHOICES list.
 
@@ -28666,12 +28719,14 @@
      matches whitespace and graphic characters.
 
 `alphanumeric', `alnum'
-     matches alphabetic characters and digits.  (For multibyte characters,
-     it matches according to Unicode character properties.)
+     matches alphabetic characters and digits.  For multibyte characters,
+     it matches characters whose Unicode `general-category' property
+     indicates they are alphabetic or decimal number characters.
 
 `letter', `alphabetic', `alpha'
-     matches alphabetic characters.  (For multibyte characters,
-     it matches according to Unicode character properties.)
+     matches alphabetic characters.  For multibyte characters,
+     it matches characters whose Unicode `general-category' property
+     indicates they are alphabetic characters.
 
 `ascii'
      matches ASCII (unibyte) characters.
@@ -28680,10 +28735,14 @@
      matches non-ASCII (multibyte) characters.
 
 `lower', `lower-case'
-     matches anything lower-case.
+     matches anything lower-case, as determined by the current case
+     table.  If `case-fold-search' is non-nil, this also matches any
+     upper-case letter.
 
 `upper', `upper-case'
-     matches anything upper-case.
+     matches anything upper-case, as determined by the current case
+     table.  If `case-fold-search' is non-nil, this also matches any
+     lower-case letter.
 
 `punctuation', `punct'
      matches punctuation.  (But at present, for multibyte characters,
@@ -28742,7 +28801,7 @@
      `chinese-two-byte'			(\\cC)
      `greek-two-byte'			(\\cG)
      `japanese-hiragana-two-byte'	(\\cH)
-     `indian-tow-byte'			(\\cI)
+     `indian-two-byte'			(\\cI)
      `japanese-katakana-two-byte'	(\\cK)
      `korean-hangul-two-byte'		(\\cN)
      `cyrillic-two-byte'		(\\cY)
@@ -28917,13 +28976,30 @@
 (autoload 'savehist-mode "savehist" "\
 Toggle saving of minibuffer history (Savehist mode).
 With a prefix argument ARG, enable Savehist mode if ARG is
-positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil.
+positive, and disable it otherwise.  If called from Lisp,
+also enable the mode if ARG is omitted or nil.
 
 When Savehist mode is enabled, minibuffer history is saved
-periodically and when exiting Emacs.  When Savehist mode is
-enabled for the first time in an Emacs session, it loads the
-previous minibuffer history from `savehist-file'.
+to `savehist-file' periodically and when exiting Emacs.  When
+Savehist mode is enabled for the first time in an Emacs session,
+it loads the previous minibuffer histories from `savehist-file'.
+The variable `savehist-autosave-interval' controls the
+periodicity of saving minibuffer histories.
+
+If `savehist-save-minibuffer-history' is non-nil (the default),
+all recorded minibuffer histories will be saved.  You can arrange
+for additional history variables to be saved and restored by
+customizing `savehist-additional-variables', which by default is
+an empty list.  For example, to save the history of commands
+invoked via \\[execute-extended-command], add `command-history' to the list in
+`savehist-additional-variables'.
+
+Alternatively, you could customize `savehist-save-minibuffer-history'
+to nil, and add to `savehist-additional-variables' only those
+history variables you want to save.
+
+To ignore some history variables, add their symbols to the list
+in `savehist-ignored-variables'.
 
 This mode should normally be turned on from your Emacs init file.
 Calling it at any other time replaces your current minibuffer
@@ -29808,7 +29884,7 @@
 (defvar send-mail-function (if (and (boundp 'smtpmail-smtp-server) smtpmail-smtp-server) 'smtpmail-send-it 'sendmail-query-once) "\
 Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
-not a valid RFC822 header or continuation line,
+not a valid RFC 822 (or later) header or continuation line,
 that matches the variable `mail-header-separator'.
 This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package.")
@@ -30065,7 +30141,14 @@
 (defvar server-name "server" "\
 The name of the Emacs server, if this Emacs process creates one.
 The command `server-start' makes use of this.  It should not be
-changed while a server is running.")
+changed while a server is running.
+If this is a file name with no leading directories, Emacs will
+create a socket file by that name under `server-socket-dir'
+if `server-use-tcp' is nil, else under `server-auth-dir'.
+If this is an absolute file name, it specifies where the socket
+file will be created.  To have emacsclient connect to the same
+socket, use the \"-s\" switch for local non-TCP sockets, and
+the \"-f\" switch otherwise.")
 
 (custom-autoload 'server-name "server" t)
 
@@ -30086,6 +30169,9 @@
 To force-start a server, do \\[server-force-delete] and then
 \\[server-start].
 
+To check from a Lisp program whether a server is running, use
+the `server-process' variable.
+
 \(fn &optional LEAVE-DEAD INHIBIT-PROMPT)" t nil)
 
 (autoload 'server-force-delete "server" "\
@@ -30857,7 +30943,7 @@
 
 ;;;### (autoloads nil "soap-client" "net/soap-client.el" (0 0 0 0))
 ;;; Generated autoloads from net/soap-client.el
-(push (purecopy '(soap-client 3 1 3)) package--builtin-versions)
+(push (purecopy '(soap-client 3 1 4)) package--builtin-versions)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "soap-client" '("soap-")))
 
@@ -32130,8 +32216,6 @@
 This mode changes the definition of a word so that word commands
 treat nomenclature boundaries as word boundaries.
 
-\\{subword-mode-map}
-
 \(fn &optional ARG)" t nil)
 
 (defvar global-subword-mode nil "\
@@ -32233,6 +32317,7 @@
 
 ;;;### (autoloads nil "svg" "svg.el" (0 0 0 0))
 ;;; Generated autoloads from svg.el
+(push (purecopy '(svg 0 5)) package--builtin-versions)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "svg" '("svg-")))
 
@@ -33655,8 +33740,10 @@
 
 (autoload 'list-at-point "thingatpt" "\
 Return the Lisp list at point, or nil if none is found.
+If IGNORE-COMMENT-OR-STRING is non-nil comments and strings are
+treated as white space.
 
-\(fn)" nil nil)
+\(fn &optional IGNORE-COMMENT-OR-STRING)" nil nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "thingatpt" '("form-at-point" "thing-at-point-" "sentence-at-point" "word-at-point" "in-string-p" "end-of-thing" "beginning-of-thing")))
 
@@ -33921,6 +34008,7 @@
 
 (autoload 'date-to-time "time-date" "\
 Parse a string DATE that represents a date-time and return a time value.
+DATE should be in one of the forms recognized by `parse-time-string'.
 If DATE lacks timezone information, GMT is assumed.
 
 \(fn DATE)" nil nil)
@@ -34594,7 +34682,7 @@
 
 ;;;### (autoloads nil "trampver" "net/trampver.el" (0 0 0 0))
 ;;; Generated autoloads from net/trampver.el
-(push (purecopy '(tramp 2 3 3 26 1)) package--builtin-versions)
+(push (purecopy '(tramp 2 3 5 26 3)) package--builtin-versions)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "trampver" '("tramp-")))
 
@@ -35261,16 +35349,16 @@
 
 (autoload 'url-copy-file "url-handlers" "\
 Copy URL to NEWNAME.  Both args must be strings.
-Signals a `file-already-exists' error if file NEWNAME already exists,
+Signal a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 Fourth arg KEEP-TIME non-nil means give the new file the same
 last-modified time as the old one.  (This works on only some systems.)
-Fifth arg PRESERVE-UID-GID is ignored.
+Args PRESERVE-UID-GID and PRESERVE-PERMISSIONS are ignored.
 A prefix arg makes KEEP-TIME non-nil.
 
-\(fn URL NEWNAME &optional OK-IF-ALREADY-EXISTS KEEP-TIME PRESERVE-UID-GID)" nil nil)
+\(fn URL NEWNAME &optional OK-IF-ALREADY-EXISTS KEEP-TIME PRESERVE-UID-GID PRESERVE-PERMISSIONS)" nil nil)
 
 (autoload 'url-file-local-copy "url-handlers" "\
 Copy URL into a temporary file on this machine.
@@ -35934,7 +36022,12 @@
 \(fn &optional VC-FILESET COMMENT)" t nil)
 
 (autoload 'vc-version-diff "vc" "\
-Report diffs between revisions of the fileset in the repository history.
+Report diffs between revisions REV1 and REV2 in the repository history.
+This compares two revisions of the current fileset.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in the fileset.
 
 \(fn FILES REV1 REV2)" t nil)
 
@@ -35950,8 +36043,14 @@
 \(fn &optional HISTORIC NOT-URGENT)" t nil)
 
 (autoload 'vc-version-ediff "vc" "\
-Show differences between revisions of the fileset in the
-repository history using ediff.
+Show differences between REV1 and REV2 of FILES using ediff.
+This compares two revisions of the files in FILES.  Currently,
+only a single file's revisions can be compared, i.e. FILES can
+specify only one file name.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in FILES.
 
 \(fn FILES REV1 REV2)" t nil)
 
@@ -36506,6 +36605,7 @@
 ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el"
 ;;;;;;  (0 0 0 0))
 ;;; Generated autoloads from progmodes/verilog-mode.el
+(push (purecopy '(verilog-mode 2017 8 7 201875024)) package--builtin-versions)
 
 (autoload 'verilog-mode "verilog-mode" "\
 Major mode for editing Verilog code.
@@ -37389,8 +37489,8 @@
 if ARG is omitted or nil.
 
 When View mode is enabled, commands that do not change the buffer
-contents are available as usual.  Kill commands insert text in
-kill buffers but do not delete.  Most other commands beep and
+contents are available as usual.  Kill commands save text but
+do not delete it from the buffer.  Most other commands beep and
 tell the user that the buffer is read-only.
 
 \\<view-mode-map>
@@ -38494,7 +38594,11 @@
 
 (autoload 'xref-find-references "xref" "\
 Find references to the identifier at point.
-With prefix argument, prompt for the identifier.
+This command might prompt for the identifier as needed, perhaps
+offering the symbol at point as the default.
+With prefix argument, or if `xref-prompt-for-identifier' is t,
+always prompt for the identifier.  If `xref-prompt-for-identifier'
+is nil, prompt only if there's no usable symbol at point.
 
 \(fn IDENTIFIER)" t nil)
 
diff -Nru emacs-26.1+1/lisp/leim/quail/arabic.el emacs-26.3+1/lisp/leim/quail/arabic.el
--- emacs-26.1+1/lisp/leim/quail/arabic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/arabic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; arabic.el --- Quail package for inputting Arabic	-*- coding: utf-8;-*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Cloos <cloos@jhcloos.com>
 ;; Keywords: mule, input method, Arabic
diff -Nru emacs-26.1+1/lisp/leim/quail/croatian.el emacs-26.3+1/lisp/leim/quail/croatian.el
--- emacs-26.1+1/lisp/leim/quail/croatian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/croatian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; croatian.el -- Quail package for inputting Croatian  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Nikšić <hniksic@xemacs.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/leim/quail/cyril-jis.el emacs-26.3+1/lisp/leim/quail/cyril-jis.el
--- emacs-26.1+1/lisp/leim/quail/cyril-jis.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/cyril-jis.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/cyrillic.el emacs-26.3+1/lisp/leim/quail/cyrillic.el
--- emacs-26.1+1/lisp/leim/quail/cyrillic.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/cyrillic.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cyrillic.el --- Quail package for inputting Cyrillic characters
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/czech.el emacs-26.3+1/lisp/leim/quail/czech.el
--- emacs-26.1+1/lisp/leim/quail/czech.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/czech.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; czech.el --- Quail package for inputting Czech -*-coding: utf-8;-*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/leim/quail/georgian.el emacs-26.3+1/lisp/leim/quail/georgian.el
--- emacs-26.1+1/lisp/leim/quail/georgian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/georgian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; georgian.el --- Quail package for inputting Georgian characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/leim/quail/greek.el emacs-26.3+1/lisp/leim/quail/greek.el
--- emacs-26.1+1/lisp/leim/quail/greek.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/greek.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; greek.el --- Quail package for inputting Greek -*-coding: utf-8-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/hangul.el emacs-26.3+1/lisp/leim/quail/hangul.el
--- emacs-26.1+1/lisp/leim/quail/hangul.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/hangul.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hangul.el --- Korean Hangul input method
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Jihyun Cho <jihyun.jo@gmail.com>
 ;; Keywords: multilingual, input method, Korean, Hangul
diff -Nru emacs-26.1+1/lisp/leim/quail/hanja3.el emacs-26.3+1/lisp/leim/quail/hanja3.el
--- emacs-26.1+1/lisp/leim/quail/hanja3.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/hanja3.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hanja3.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Koaunghi Un <koaunghi.un@zdv.uni-tuebingen.de>
 ;; Keywords: mule, quail, multilingual, input method, Korean, Hanja
diff -Nru emacs-26.1+1/lisp/leim/quail/hanja.el emacs-26.3+1/lisp/leim/quail/hanja.el
--- emacs-26.1+1/lisp/leim/quail/hanja.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/hanja.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/indian.el emacs-26.3+1/lisp/leim/quail/indian.el
--- emacs-26.1+1/lisp/leim/quail/indian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/indian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; indian.el --- Quail packages for inputting Indian
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: KAWABATA, Taichi <kawabata@m17n.org>
 
diff -Nru emacs-26.1+1/lisp/leim/quail/ipa.el emacs-26.3+1/lisp/leim/quail/ipa.el
--- emacs-26.1+1/lisp/leim/quail/ipa.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/ipa.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ipa.el --- Quail package for inputting IPA characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/ipa-praat.el emacs-26.3+1/lisp/leim/quail/ipa-praat.el
--- emacs-26.1+1/lisp/leim/quail/ipa-praat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/ipa-praat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ipa-praat.el --- Inputting IPA characters with the conventions of Praat
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Oliver Scholz <epameinondas@gmx.de>
 ;; Keywords: multilingual, input method, IPA
diff -Nru emacs-26.1+1/lisp/leim/quail/japanese.el emacs-26.3+1/lisp/leim/quail/japanese.el
--- emacs-26.1+1/lisp/leim/quail/japanese.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/japanese.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; japanese.el --- Quail package for inputting Japanese  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/latin-alt.el emacs-26.3+1/lisp/leim/quail/latin-alt.el
--- emacs-26.1+1/lisp/leim/quail/latin-alt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/latin-alt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/latin-ltx.el emacs-26.3+1/lisp/leim/quail/latin-ltx.el
--- emacs-26.1+1/lisp/leim/quail/latin-ltx.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/latin-ltx.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
 ;;   2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/latin-post.el emacs-26.3+1/lisp/leim/quail/latin-post.el
--- emacs-26.1+1/lisp/leim/quail/latin-post.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/latin-post.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/latin-pre.el emacs-26.3+1/lisp/leim/quail/latin-pre.el
--- emacs-26.1+1/lisp/leim/quail/latin-pre.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/latin-pre.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/lrt.el emacs-26.3+1/lisp/leim/quail/lrt.el
--- emacs-26.1+1/lisp/leim/quail/lrt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/lrt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lrt.el --- Quail package for inputting Lao characters by LRT method  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/persian.el emacs-26.3+1/lisp/leim/quail/persian.el
--- emacs-26.1+1/lisp/leim/quail/persian.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/persian.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; persian.el  --- Quail package for inputting Persian/Farsi keyboard	-*- coding: utf-8;-*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Mohsen BANAN <libre@mohsen.1.banan.byname.net>
 ;; X-URL: http://mohsen.1.banan.byname.net/contact
diff -Nru emacs-26.1+1/lisp/leim/quail/programmer-dvorak.el emacs-26.3+1/lisp/leim/quail/programmer-dvorak.el
--- emacs-26.1+1/lisp/leim/quail/programmer-dvorak.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/programmer-dvorak.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; programmer-dvorak.el --- Quail package for the programmer Dvorak layout
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Joakim Jalap <joakim.jalap@fastmail.com>
 
diff -Nru emacs-26.1+1/lisp/leim/quail/py-punct.el emacs-26.3+1/lisp/leim/quail/py-punct.el
--- emacs-26.1+1/lisp/leim/quail/py-punct.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/py-punct.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/rfc1345.el emacs-26.3+1/lisp/leim/quail/rfc1345.el
--- emacs-26.1+1/lisp/leim/quail/rfc1345.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/rfc1345.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc1345.el --- Quail method for RFC 1345 mnemonics -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/leim/quail/sgml-input.el emacs-26.3+1/lisp/leim/quail/sgml-input.el
--- emacs-26.1+1/lisp/leim/quail/sgml-input.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/sgml-input.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sgml-input.el --- Quail method for Unicode entered as SGML entities -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/leim/quail/sisheng.el emacs-26.3+1/lisp/leim/quail/sisheng.el
--- emacs-26.1+1/lisp/leim/quail/sisheng.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/sisheng.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sisheng.el --- sisheng input method for Chinese pinyin transliteration
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Werner LEMBERG <wl@gnu.org>
 
diff -Nru emacs-26.1+1/lisp/leim/quail/slovak.el emacs-26.3+1/lisp/leim/quail/slovak.el
--- emacs-26.1+1/lisp/leim/quail/slovak.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/slovak.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; slovak.el --- Quail package for inputting Slovak  -*-coding: utf-8;-*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Authors: Tibor Šimko <tibor.simko@fmph.uniba.sk>
 ;;	Milan Zamazal <pdm@zamazal.org>
diff -Nru emacs-26.1+1/lisp/leim/quail/symbol-ksc.el emacs-26.3+1/lisp/leim/quail/symbol-ksc.el
--- emacs-26.1+1/lisp/leim/quail/symbol-ksc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/symbol-ksc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: utf-8;-*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/tamil-dvorak.el emacs-26.3+1/lisp/leim/quail/tamil-dvorak.el
--- emacs-26.1+1/lisp/leim/quail/tamil-dvorak.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/tamil-dvorak.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tamil-dvorak.el --- Quail package for Tamil input with Dvorak keyboard
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Shakthi Kannan <author@shakthimaan.com>
 
diff -Nru emacs-26.1+1/lisp/leim/quail/tibetan.el emacs-26.3+1/lisp/leim/quail/tibetan.el
--- emacs-26.1+1/lisp/leim/quail/tibetan.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/tibetan.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: utf-8-emacs;-*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/leim/quail/uni-input.el emacs-26.3+1/lisp/leim/quail/uni-input.el
--- emacs-26.1+1/lisp/leim/quail/uni-input.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/uni-input.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; uni-input.el --- Hex Unicode input method
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff -Nru emacs-26.1+1/lisp/leim/quail/vntelex.el emacs-26.3+1/lisp/leim/quail/vntelex.el
--- emacs-26.1+1/lisp/leim/quail/vntelex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/vntelex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vntelex.el --- Quail package for Vietnamese by Telex method
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
diff -Nru emacs-26.1+1/lisp/leim/quail/vnvni.el emacs-26.3+1/lisp/leim/quail/vnvni.el
--- emacs-26.1+1/lisp/leim/quail/vnvni.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/vnvni.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vnvni.el --- Quail package for Vietnamese by VNI method
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;;           Nguyen Thai Ngoc Duy <pclouds@gmail.com>
diff -Nru emacs-26.1+1/lisp/leim/quail/welsh.el emacs-26.3+1/lisp/leim/quail/welsh.el
--- emacs-26.1+1/lisp/leim/quail/welsh.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/leim/quail/welsh.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; welsh.el --- Quail package for inputting Welsh characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff -Nru emacs-26.1+1/lisp/linum.el emacs-26.3+1/lisp/linum.el
--- emacs-26.1+1/lisp/linum.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/linum.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; linum.el --- display line numbers in the left margin -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Markus Triska <markus.triska@gmx.at>
 ;; Maintainer: emacs-devel@gnu.org
@@ -121,6 +121,10 @@
               ;; if some large buffer was under linum-mode when
               ;; desktop was saved.  So we disable linum-mode for
               ;; non-client frames in a daemon session.
+
+              ;; Note that nowadays, this actually doesn't show line
+              ;; numbers in client frames at all, because we visit the
+              ;; file before creating the client frame.  See bug#35726.
               (and (daemonp) (null (frame-parameter nil 'client))))
     (linum-mode 1)))
 
diff -Nru emacs-26.1+1/lisp/loadhist.el emacs-26.3+1/lisp/loadhist.el
--- emacs-26.1+1/lisp/loadhist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/loadhist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
-;; Copyright (C) 1995, 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/loadup.el emacs-26.3+1/lisp/loadup.el
--- emacs-26.1+1/lisp/loadup.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/loadup.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
-;; Copyright (C) 1985-1986, 1992, 1994, 2001-2018 Free Software
+;; Copyright (C) 1985-1986, 1992, 1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/locate.el emacs-26.3+1/lisp/locate.el
--- emacs-26.1+1/lisp/locate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/locate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; locate.el --- interface to the locate command
 
-;; Copyright (C) 1996, 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Keywords: unix files
diff -Nru emacs-26.1+1/lisp/lpr.el emacs-26.3+1/lisp/lpr.el
--- emacs-26.1+1/lisp/lpr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/lpr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lpr.el --- print Emacs buffer on line printer
 
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2018 Free Software
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/ls-lisp.el emacs-26.3+1/lisp/ls-lisp.el
--- emacs-26.1+1/lisp/ls-lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ls-lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
diff -Nru emacs-26.1+1/lisp/macros.el emacs-26.3+1/lisp/macros.el
--- emacs-26.1+1/lisp/macros.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/macros.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
-;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2018 Free Software
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/binhex.el emacs-26.3+1/lisp/mail/binhex.el
--- emacs-26.1+1/lisp/mail/binhex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/binhex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; binhex.el --- decode BinHex-encoded text
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: binhex news
diff -Nru emacs-26.1+1/lisp/mail/blessmail.el emacs-26.3+1/lisp/mail/blessmail.el
--- emacs-26.1+1/lisp/mail/blessmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/blessmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/mail/emacsbug.el emacs-26.3+1/lisp/mail/emacsbug.el
--- emacs-26.1+1/lisp/mail/emacsbug.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/emacsbug.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
 
-;; Copyright (C) 1985, 1994, 1997-1998, 2000-2018 Free Software
+;; Copyright (C) 1985, 1994, 1997-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: K. Shane Hartman
diff -Nru emacs-26.1+1/lisp/mail/feedmail.el emacs-26.3+1/lisp/mail/feedmail.el
--- emacs-26.1+1/lisp/mail/feedmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/feedmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -560,7 +560,7 @@
 ;; maybe some distant mail system needs it.  Really, though, if you
 ;; want a sender line in your mail, just put one in there and don't
 ;; wait for feedmail to do it for you.  (Yes, I know all about
-;; RFC-822 and RFC-1123, but are you *really* one of those cases
+;; RFC-822-or-later and RFC-1123, but are you *really* one of those cases
 ;; they're talking about?  I doubt it.)
 (defcustom feedmail-sender-line nil
   "If non-nil and the email has no Sender: header, use this value.
@@ -786,7 +786,7 @@
 by feedmail to either \"Date\" or \"Resent-Date\".
 
 If you decide to format your own date field, do us all a favor and know
-what you're doing.  Study the relevant parts of RFC-822 and RFC-1123.
+what you're doing.  Study the relevant parts of RFC-822-or-later and RFC-1123.
 Don't make me come up there!
 
 You should let feedmail generate a Date: for you unless you are sure
@@ -1514,7 +1514,7 @@
 
 
 (defvar feedmail-is-a-resend nil
-  "Non-nil means the message is a Resend (in the RFC-822 sense).
+  "Non-nil means the message is a Resend (in the RFC-822-or-later sense).
 This affects the composition of certain headers.  feedmail sets this
 variable as soon as it starts prepping the message text buffer, so any
 user-supplied functions can rely on it.  Users shouldn't set or change this
@@ -2454,7 +2454,7 @@
 
 	  (let ((case-fold-search t) (addr-regexp))
 	    (goto-char (point-min))
-	    ;; There are some RFC-822 combinations/cases missed here,
+	    ;; There are some RFC-822-or-later combinations/cases missed here,
 	    ;; but probably good enough and what users expect.
 	    ;;
 	    ;; Use resent-* stuff only if there is at least one non-empty one.
diff -Nru emacs-26.1+1/lisp/mail/flow-fill.el emacs-26.3+1/lisp/mail/flow-fill.el
--- emacs-26.1+1/lisp/mail/flow-fill.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/flow-fill.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flow-fill.el --- interpret RFC2646 "flowed" text
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/mail/footnote.el emacs-26.3+1/lisp/mail/footnote.el
--- emacs-26.1+1/lisp/mail/footnote.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/footnote.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; footnote.el --- footnote support for message mode
 
-;; Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Steven L Baur <steve@xemacs.org>
 ;; Keywords: mail, news
diff -Nru emacs-26.1+1/lisp/mail/hashcash.el emacs-26.3+1/lisp/mail/hashcash.el
--- emacs-26.1+1/lisp/mail/hashcash.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/hashcash.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hashcash.el --- Add hashcash payments to email
 
-;; Copyright (C) 2003-2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/ietf-drums.el emacs-26.3+1/lisp/mail/ietf-drums.el
--- emacs-26.1+1/lisp/mail/ietf-drums.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/ietf-drums.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-;;; ietf-drums.el --- Functions for parsing RFC822bis headers
+;;; ietf-drums.el --- Functions for parsing RFC 2822 headers
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -20,10 +20,10 @@
 
 ;;; Commentary:
 
-;; DRUMS is an IETF Working Group that works (or worked) on the
-;; successor to RFC822, "Standard For The Format Of Arpa Internet Text
-;; Messages".  This library is based on
-;; draft-ietf-drums-msg-fmt-05.txt, released on 1998-08-05.
+;; DRUMS is an IETF Working Group that worked on Internet RFC 2822,
+;; the successor to RFC 822 and the predecessor of RFC 5322.  This
+;; library is based on draft-ietf-drums-msg-fmt-05.txt, released on
+;; 1998-08-05.
 
 ;; Pending a real regression self test suite, Simon Josefsson added
 ;; various self test expressions snipped from bug reports, and their
diff -Nru emacs-26.1+1/lisp/mail/mailabbrev.el emacs-26.3+1/lisp/mail/mailabbrev.el
--- emacs-26.1+1/lisp/mail/mailabbrev.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mailabbrev.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailabbrev.el --- abbrev-expansion of mail aliases
 
-;; Copyright (C) 1985-1987, 1992-1993, 1996-1997, 2000-2018 Free
+;; Copyright (C) 1985-1987, 1992-1993, 1996-1997, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com; now jwz@jwz.org>
diff -Nru emacs-26.1+1/lisp/mail/mailalias.el emacs-26.3+1/lisp/mail/mailalias.el
--- emacs-26.1+1/lisp/mail/mailalias.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mailalias.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailalias.el --- expand and complete mailing address aliases -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985, 1987, 1995-1997, 2001-2018 Free Software
+;; Copyright (C) 1985, 1987, 1995-1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/mailclient.el emacs-26.3+1/lisp/mail/mailclient.el
--- emacs-26.1+1/lisp/mail/mailclient.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mailclient.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailclient.el --- mail sending via system's mail client.
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
@@ -152,7 +152,7 @@
 		  (setq character-coding (downcase character-coding)))
 		(concat
 		 "mailto:"
-		 ;; some of the headers according to RFC822
+		 ;; Some of the headers according to RFC 822 (or later).
 		 (mailclient-gather-addresses "To"
 					      'drop-first-name)
 		 (mailclient-gather-addresses "cc"  )
diff -Nru emacs-26.1+1/lisp/mail/mail-extr.el emacs-26.3+1/lisp/mail/mail-extr.el
--- emacs-26.1+1/lisp/mail/mail-extr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mail-extr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-;;; mail-extr.el --- extract full name and address from RFC 822 mail header
+;;; mail-extr.el --- extract full name and address from email header
 
-;; Copyright (C) 1991-1994, 1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1991-1994, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Joe Wells <jbw@cs.bu.edu>
@@ -29,15 +29,15 @@
 ;;
 ;;    mail-extract-address-components: (address &optional all)
 ;;
-;;    Given an RFC-822 ADDRESS, extract full name and canonical address.
+;;    Given an RFC-822-or-later ADDRESS, extract name and address.
 ;;    Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).
 ;;    If no name can be extracted, FULL-NAME will be nil.
 ;;    ADDRESS may be a string or a buffer.  If it is a buffer, the visible
 ;;     (narrowed) portion of the buffer will be interpreted as the address.
 ;;     (This feature exists so that the clever caller might be able to avoid
 ;;     consing a string.)
-;;    If ADDRESS contains more than one RFC-822 address, only the first is
-;;     returned.
+;;    If ADDRESS contains more than one RFC-822-or-later address, only
+;;     the first is returned.
 ;;
 ;;    If ALL is non-nil, that means return info about all the addresses
 ;;     that are found in ADDRESS.  The value is a list of elements of
@@ -149,7 +149,7 @@
 ;; 	* Handle "null" addresses.  Handle = used for spacing in mailbox
 ;; 	  name.  Fix bug in handling of ROUTE-ADDR-type addresses that are
 ;; 	  missing their brackets.  Handle uppercase "JR".  Extract full
-;; 	  names from X.400 addresses encoded in RFC-822.  Fix bug in
+;; 	  names from X.400 addresses encoded in RFC-822-or-later.  Fix bug in
 ;;        handling of multiple addresses where first has trailing comment.
 ;;        Handle more kinds of telephone extension lead-ins.
 ;;
@@ -209,7 +209,7 @@
 
 
 (defgroup mail-extr nil
-  "Extract full name and address from RFC 822 mail header."
+  "Extract full name and address from RFC 822 (or later) mail header."
   :prefix "mail-extr-"
   :group 'mail)
 
@@ -288,8 +288,9 @@
 (defconst mail-extr-all-letters-but-separators
   (purecopy "][[:alnum:]{|}'~`"))
 
-;; Any character that can occur in a name in an RFC822 address including
-;; the separator (hyphen and possibly period) for multipart names.
+;; Any character that can occur in a name in an RFC 822 (or later)
+;; address including the separator (hyphen and possibly period) for
+;; multipart names.
 ;; #### should . be in here?
 (defconst mail-extr-all-letters
   (purecopy (concat mail-extr-all-letters-but-separators "---")))
@@ -532,7 +533,8 @@
     (?.  ".")
     (?\[ ".")
     (?\] ".")
-    ;; % and ! aren't RFC822 characters, but it is convenient to pretend
+    ;; % and ! aren't RFC 822 (or later) characters,
+    ;; but it is convenient to pretend.
     (?%  ".")
     (?!  ".") ;; this needs to be word-constituent when not in .UUCP mode
     )
@@ -697,7 +699,8 @@
 
 ;;;###autoload
 (defun mail-extract-address-components (address &optional all)
-  "Given an RFC-822 address ADDRESS, extract full name and canonical address.
+  "Extract full name and canonical address from ADDRESS.
+ADDRESS should be in RFC 822 (or later) format.
 Returns a list of the form (FULL-NAME CANONICAL-ADDRESS).  If no
 name can be extracted, FULL-NAME will be nil.  Also see
 `mail-extr-ignore-single-names' and
@@ -930,10 +933,10 @@
 	  ;; Trim other punctuation lists of items outside < > pair to handle
 	  ;; stupid MTAs.
 	  (when <-pos			; don't need to check >-pos also
-	    ;; handle bozo software that violates RFC 822 by sticking
-	    ;; punctuation marks outside of a < > pair
+	    ;; Handle bozo software that violates RFC 822 (or later)
+	    ;; by sticking punctuation marks outside of a < > pair.
 	    (mail-extr-nuke-outside-range @-pos <-pos >-pos t)
-	    ;; RFC 822 says nothing about these two outside < >, but
+	    ;; RFC 822 (or later) says nothing about these two outside < >, but
 	    ;; remove those positions from the lists to make things
 	    ;; easier.
 	    (mail-extr-nuke-outside-range !-pos <-pos >-pos t)
@@ -1319,7 +1322,7 @@
 		       (narrow-to-region atom-beg atom-end)
 		       (cond
 
-			;; Handle X.400 addresses encoded in RFC-822.
+			;; Handle X.400 addresses encoded in RFC 822 or later.
 			;; *** Shit!  This has to handle the case where it is
 			;; *** embedded in a quote too!
 			;; *** Shit!  The input is being broken up into atoms
@@ -1406,26 +1409,25 @@
 	      (insert (upcase mi) ". ")))
 
 	  ;; Nuke name if it is the same as mailbox name.
-          (when mail-extr-ignore-single-names
-            (let ((buffer-length (- (point-max) (point-min)))
-                  (i 0)
-                  (names-match-flag t))
-              (when (and (> buffer-length 0)
-                         (eq buffer-length (- mbox-end mbox-beg)))
-                (goto-char (point-max))
-                (insert-buffer-substring canonicalization-buffer
-                                         mbox-beg mbox-end)
-                (while (and names-match-flag
-                            (< i buffer-length))
-                  (or (eq (downcase (char-after (+ i (point-min))))
-                          (downcase
-                           (char-after (+ i buffer-length (point-min)))))
-                      (setq names-match-flag nil))
-                  (setq i (1+ i)))
-                (delete-region (+ (point-min) buffer-length) (point-max))
-                (and names-match-flag
-                     mail-extr-ignore-realname-equals-mailbox-name
-                     (narrow-to-region (point) (point))))))
+	  (let ((buffer-length (- (point-max) (point-min)))
+		(i 0)
+		(names-match-flag t))
+	    (when (and (> buffer-length 0)
+		       (eq buffer-length (- mbox-end mbox-beg)))
+	      (goto-char (point-max))
+	      (insert-buffer-substring canonicalization-buffer
+				       mbox-beg mbox-end)
+	      (while (and names-match-flag
+			  (< i buffer-length))
+		(or (eq (downcase (char-after (+ i (point-min))))
+			(downcase
+			 (char-after (+ i buffer-length (point-min)))))
+		    (setq names-match-flag nil))
+		(setq i (1+ i)))
+	      (delete-region (+ (point-min) buffer-length) (point-max))
+	      (and names-match-flag
+			   mail-extr-ignore-realname-equals-mailbox-name
+			   (narrow-to-region (point) (point)))))
 
 	  ;; Nuke name if it's just one word.
 	  (goto-char (point-min))
diff -Nru emacs-26.1+1/lisp/mail/mailheader.el emacs-26.3+1/lisp/mail/mailheader.el
--- emacs-26.1+1/lisp/mail/mailheader.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mailheader.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailheader.el --- mail header parsing, merging, formatting
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: tools, mail, news
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This package provides an abstraction to RFC822-style messages, used in
+;; This package provides an abstraction of RFC 822 (or later) format, used in
 ;; mail, news, and some other systems.  The simple syntactic rules for such
 ;; headers, such as quoting and line folding, are routinely reimplemented
 ;; in many individual packages.  This package removes the need for this
diff -Nru emacs-26.1+1/lisp/mail/mail-hist.el emacs-26.3+1/lisp/mail/mail-hist.el
--- emacs-26.1+1/lisp/mail/mail-hist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mail-hist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mail-hist.el --- headers and message body history for outgoing mail
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Created: March, 1994
diff -Nru emacs-26.1+1/lisp/mail/mail-parse.el emacs-26.3+1/lisp/mail/mail-parse.el
--- emacs-26.1+1/lisp/mail/mail-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mail-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mail-parse.el --- Interface functions for parsing mail
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/mail/mail-prsvr.el emacs-26.3+1/lisp/mail/mail-prsvr.el
--- emacs-26.1+1/lisp/mail/mail-prsvr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mail-prsvr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mail-prsvr.el --- Interface variables for parsing mail
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/mail/mail-utils.el emacs-26.3+1/lisp/mail/mail-utils.el
--- emacs-26.1+1/lisp/mail/mail-utils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mail-utils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mail-utils.el --- utility functions used both by rmail and rnews
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail, news
@@ -29,7 +29,7 @@
 
 ;;;###autoload
 (defcustom mail-use-rfc822 nil
-  "If non-nil, use a full, hairy RFC822 parser on mail addresses.
+  "If non-nil, use a full, hairy RFC 822 (or later) parser on mail addresses.
 Otherwise, (the default) use a smaller, somewhat faster, and
 often correct parser."
   :type 'boolean
@@ -384,7 +384,7 @@
 	 (date (mail-fetch-field "date"))
 	 ;; A From: header can contain multiple addresses, a "From "
 	 ;; line must contain only one.  (Bug#7760)
-	 ;; See eg RFC 5322, 3.6.2. Originator Fields.
+	 ;; See, e.g., RFC 5322, 3.6.2. Originator Fields.
 	 (end (string-match "[ \t]*[,\n]" from)))
     (format "From %s %s\n" (if end
 			       (substring from 0 end)
diff -Nru emacs-26.1+1/lisp/mail/metamail.el emacs-26.3+1/lisp/mail/metamail.el
--- emacs-26.1+1/lisp/mail/metamail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/metamail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; metamail.el --- Metamail interface for GNU Emacs
 
-;; Copyright (C) 1993, 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Keywords: mail, news, mime, multimedia
diff -Nru emacs-26.1+1/lisp/mail/mspools.el emacs-26.3+1/lisp/mail/mspools.el
--- emacs-26.1+1/lisp/mail/mspools.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/mspools.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mspools.el --- show mail spools waiting to be read
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff -Nru emacs-26.1+1/lisp/mail/qp.el emacs-26.3+1/lisp/mail/qp.el
--- emacs-26.1+1/lisp/mail/qp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/qp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
diff -Nru emacs-26.1+1/lisp/mail/reporter.el emacs-26.3+1/lisp/mail/reporter.el
--- emacs-26.1+1/lisp/mail/reporter.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/reporter.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
-;; Copyright (C) 1993-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/rfc2045.el emacs-26.3+1/lisp/mail/rfc2045.el
--- emacs-26.1+1/lisp/mail/rfc2045.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rfc2045.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc2045.el --- Functions for decoding rfc2045 headers
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/mail/rfc2047.el emacs-26.3+1/lisp/mail/rfc2047.el
--- emacs-26.1+1/lisp/mail/rfc2047.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rfc2047.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -340,7 +340,7 @@
 
 ;; Use this syntax table when parsing into regions that may need
 ;; encoding.  Double quotes are string delimiters, backslash is
-;; character quoting, and all other RFC 2822 special characters are
+;; character quoting, and all other RFC 822 (or later) special characters are
 ;; treated as punctuation so we can use forward-sexp/forward-word to
 ;; skip to the end of regions appropriately.  Nb. ietf-drums does
 ;; things differently.
@@ -368,7 +368,7 @@
 
 (defun rfc2047-encode-region (b e &optional dont-fold)
   "Encode words in region B to E that need encoding.
-By default, the region is treated as containing RFC2822 addresses.
+By default, the region is treated as containing RFC 822 (or later) addresses.
 Dynamically bind `rfc2047-encoding-type' to change that."
   (save-restriction
     (narrow-to-region b e)
@@ -405,7 +405,7 @@
 	(with-syntax-table rfc2047-syntax-table
 	  (goto-char (point-min))
 	  (condition-case err		; in case of unbalanced quotes
-	      ;; Look for rfc2822-style: sequences of atoms, quoted
+	      ;; Look for RFC 822 (or later) style: sequences of atoms, quoted
 	      ;; strings, specials, whitespace.  (Specials mustn't be
 	      ;; encoded.)
 	      (while (not (eobp))
@@ -1027,7 +1027,7 @@
 	      (replace-match " "))
 	    (setq end (point-max))
 	    ;; Quote decoded words if there are special characters
-	    ;; which might violate RFC2822.
+	    ;; which might violate RFC 822 (or later).
 	    (when (and rfc2047-quote-decoded-words-containing-tspecials
 		       (let ((regexp (car (rassq
 					   'address-mime
diff -Nru emacs-26.1+1/lisp/mail/rfc2231.el emacs-26.3+1/lisp/mail/rfc2231.el
--- emacs-26.1+1/lisp/mail/rfc2231.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rfc2231.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/mail/rfc2368.el emacs-26.3+1/lisp/mail/rfc2368.el
--- emacs-26.1+1/lisp/mail/rfc2368.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rfc2368.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc2368.el --- support for rfc2368
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Sen Nagata <sen@eccosys.com>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/mail/rfc822.el emacs-26.3+1/lisp/mail/rfc822.el
--- emacs-26.1+1/lisp/mail/rfc822.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rfc822.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike
+;;; rfc822.el --- hairy RFC 822 (or later) parser for mail, news, etc.
 
-;; Copyright (C) 1986-1987, 1990, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1986-1987, 1990, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
@@ -24,8 +24,8 @@
 
 ;;; Commentary:
 
-;; Support functions for parsing RFC-822 headers, used by mail and news
-;; modes.
+;; Support functions for parsing headers used by mail and news modes.
+;; The header format is specified by Internet RFC 822 and its successors.
 
 ;;; Code:
 
diff -Nru emacs-26.1+1/lisp/mail/rmailedit.el emacs-26.3+1/lisp/mail/rmailedit.el
--- emacs-26.1+1/lisp/mail/rmailedit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailedit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message
 
-;; Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/mail/rmail.el emacs-26.3+1/lisp/mail/rmail.el
--- emacs-26.1+1/lisp/mail/rmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1988, 1993-1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1988, 1993-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -785,8 +785,8 @@
     (concat
      "From "
 
-     ;; Many things can happen to an RFC 822 mailbox before it is put into
-     ;; a `From' line.  The leading phrase can be stripped, e.g.
+     ;; Many things can happen to an RFC 822 (or later) mailbox before it is
+     ;; put into a `From' line.  The leading phrase can be stripped, e.g.
      ;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
      ;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
      ;; can be removed, e.g.
@@ -1009,8 +1009,8 @@
   "Report that the buffer is not in the mbox file format.
 MSGNUM, if present, indicates the malformed message."
   (if msgnum
-      (error "Message %d is not a valid RFC2822 message" msgnum)
-    (error "Message is not a valid RFC2822 message")))
+      (error "Message %d is not a valid RFC 822 (or later) message" msgnum)
+    (error "Message is not a valid RFC 822 (or later) message")))
 
 (defun rmail-convert-babyl-to-mbox ()
   "Convert the mail file from Babyl version 5 to mbox.
@@ -2079,7 +2079,8 @@
 		   ;; If we just read the password, most likely it is
 		   ;; wrong.  Otherwise, see if there is a specific
 		   ;; reason to think that the problem is a wrong passwd.
-		   (if (and (rmail-remote-proto-p proto)
+		   (if (and proto
+                            (rmail-remote-proto-p proto)
 			    (or got-password
 				(re-search-forward rmail-remote-password-error
 						   nil t)))
@@ -2154,9 +2155,9 @@
     (insert "\n")))
 
 (defun rmail-add-mbox-headers ()
-  "Validate the RFC2822 format for the new messages.
+  "Validate the RFC 822 (or later) format for the new messages.
 Point should be at the first new message.
-An error is signaled if the new messages are not RFC2822
+An error is signaled if the new messages are not RFC 822 (or later)
 compliant.
 Unless an Rmail attribute header already exists, add it to the
 new messages.  Return the number of new messages."
@@ -3927,9 +3928,9 @@
 	     (setq tem (copy-sequence tem))
 	     (set-text-properties 0 (length tem) nil tem)
 	     (setq tem (copy-sequence tem))
-	     ;; Use prin1 to fake RFC822 quoting
+	     ;; Use prin1 to fake RFC 822 (or later) quoting
 	     (let ((field (prin1-to-string tem)))
-	       ;; Wrap it in parens to make it a comment according to RFC822
+	       ;; Wrap it in parens to make it a comment.
 	       (if date
 		   (concat "(" field "'s message of " date ")")
 		 (concat "(" field ")"))))))
@@ -3958,7 +3959,7 @@
              (if message-id
                  ;; "<AA259@bar.edu> (message from Unix Loser on 1-Apr-89)"
                  (concat message-id " (" field ")")
-	       ;; Wrap in parens to make it a comment, for RFC822.
+	       ;; Wrap in parens to make it a comment.
 	       (concat "(" field ")")))))
         (t
          ;; If we can't kludge it simply, do it correctly
diff -Nru emacs-26.1+1/lisp/mail/rmailkwd.el emacs-26.3+1/lisp/mail/rmailkwd.el
--- emacs-26.1+1/lisp/mail/rmailkwd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailkwd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs
 
-;; Copyright (C) 1985, 1988, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985, 1988, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/rmailmm.el emacs-26.3+1/lisp/mail/rmailmm.el
--- emacs-26.1+1/lisp/mail/rmailmm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailmm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailmm.el --- MIME decoding and display stuff for RMAIL
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexander Pohoyda
 ;;	Alex Schroeder
diff -Nru emacs-26.1+1/lisp/mail/rmailmsc.el emacs-26.3+1/lisp/mail/rmailmsc.el
--- emacs-26.1+1/lisp/mail/rmailmsc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailmsc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/mail/rmailout.el emacs-26.3+1/lisp/mail/rmailout.el
--- emacs-26.1+1/lisp/mail/rmailout.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailout.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
 
-;; Copyright (C) 1985, 1987, 1993-1994, 2001-2018 Free Software
+;; Copyright (C) 1985, 1987, 1993-1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/rmailsort.el emacs-26.3+1/lisp/mail/rmailsort.el
--- emacs-26.1+1/lisp/mail/rmailsort.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailsort.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailsort.el --- Rmail: sort messages
 
-;; Copyright (C) 1990, 1993-1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1990, 1993-1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
diff -Nru emacs-26.1+1/lisp/mail/rmail-spam-filter.el emacs-26.3+1/lisp/mail/rmail-spam-filter.el
--- emacs-26.1+1/lisp/mail/rmail-spam-filter.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmail-spam-filter.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmail-spam-filter.el --- spam filter for Rmail, the Emacs mail reader
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 ;; Keywords: email, spam, filter, rmail
 ;; Author: Eli Tziperman <eli AT deas.harvard.edu>
 ;; Package: rmail
diff -Nru emacs-26.1+1/lisp/mail/rmailsum.el emacs-26.3+1/lisp/mail/rmailsum.el
--- emacs-26.1+1/lisp/mail/rmailsum.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/rmailsum.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailsum.el --- make summary buffers for the mail reader  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985, 1993-1996, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1985, 1993-1996, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -1692,7 +1692,7 @@
 When called from Lisp code, N may be omitted and defaults to 1.
 
 This command always outputs the complete message header,
-even the header display is currently pruned."
+even if the header display is currently pruned."
   (interactive
    (progn (require 'rmailout)
 	  (list (rmail-output-read-file-name)
diff -Nru emacs-26.1+1/lisp/mail/sendmail.el emacs-26.3+1/lisp/mail/sendmail.el
--- emacs-26.1+1/lisp/mail/sendmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/sendmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sendmail.el --- mail sending commands for Emacs
 
-;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -147,7 +147,7 @@
       'smtpmail-send-it 'sendmail-query-once)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
-not a valid RFC822 header or continuation line,
+not a valid RFC 822 (or later) header or continuation line,
 that matches the variable `mail-header-separator'.
 This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package."
@@ -905,7 +905,7 @@
 	    (ml (when mail-mailing-lists
                 ;; The surrounding regexp assumes the use of
                 ;; `mail-strip-quoted-names' on addresses before matching
-                ;; Cannot deal with full RFC 822 freedom, but that is
+                ;; Cannot deal with full RFC 822 (or later), but that is
                 ;; unlikely to be problematic.
                 (concat "\\(?:[[:space:];,]\\|\\`\\)"
                         (regexp-opt mail-mailing-lists t)
@@ -1041,7 +1041,7 @@
 		 (fullname-end (point-marker)))
 	     (goto-char fullname-start)
 	     ;; Look for a character that cannot appear unquoted
-	     ;; according to RFC 822.
+	     ;; according to RFC 822 (or later).
 	     (if (or (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
 					fullname-end 1)
 		     quote-fullname)
@@ -1065,8 +1065,7 @@
 		 (insert "\""))
 	     (let ((fullname-end (point-marker)))
 	       (goto-char fullname-start)
-	       ;; RFC 822 says \ and nonmatching parentheses
-	       ;; must be escaped in comments.
+	       ;; \ and nonmatching parentheses must be escaped in comments.
 	       ;; Escape every instance of ()\ ...
 	       (while (re-search-forward "[()\\]" fullname-end 1)
 		 (replace-match "\\\\\\&" t))
diff -Nru emacs-26.1+1/lisp/mail/smtpmail.el emacs-26.3+1/lisp/mail/smtpmail.el
--- emacs-26.1+1/lisp/mail/smtpmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/smtpmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
-;; Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
@@ -101,9 +101,9 @@
 
 (defcustom smtpmail-stream-type nil
   "Type of SMTP connections to use.
-This may be either nil (possibly upgraded to STARTTLS if possible),
-or `starttls' (refuse to send if STARTTLS isn't available), or `plain'
-\(never use STARTTLS), or `ssl' (to use TLS/SSL)."
+This may be either nil (upgrade with STARTTLS if possible),
+`starttls' (refuse to send if STARTTLS isn't available),
+`plain' (never use STARTTLS), or `ssl' (to use TLS/SSL)."
   :version "24.1"
   :group 'smtpmail
   :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)
@@ -256,7 +256,7 @@
 			       (fullname-end (point-marker)))
 			   (goto-char fullname-start)
 			   ;; Look for a character that cannot appear unquoted
-			   ;; according to RFC 822.
+			   ;; according to RFC 822 or its successors.
 			   (if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
 						  fullname-end 1)
 			       (progn
@@ -274,8 +274,9 @@
 			   (insert fullname)
 			   (let ((fullname-end (point-marker)))
 			     (goto-char fullname-start)
-			     ;; RFC 822 says \ and nonmatching parentheses
-			     ;; must be escaped in comments.
+			     ;; RFC 822 and its successors say \ and
+			     ;; nonmatching parentheses must be
+			     ;; escaped in comments.
 			     ;; Escape every instance of ()\ ...
 			     (while (re-search-forward "[()\\]" fullname-end 1)
 			       (replace-match "\\\\\\&" t))
@@ -402,21 +403,22 @@
   (with-temp-buffer
     ;; Get index, get first mail, send it, update index, get second
     ;; mail, send it, etc...
-    (let ((file-msg "")
+    (let (file-data file-elisp
           (qfile (expand-file-name smtpmail-queue-index-file
                                    smtpmail-queue-dir))
 	  result)
       (insert-file-contents qfile)
       (goto-char (point-min))
       (while (not (eobp))
-	(setq file-msg (buffer-substring (point) (line-end-position)))
-	(load file-msg)
+	(setq file-data (buffer-substring (point) (line-end-position)))
+	(setq file-elisp (concat file-data ".el"))
+	(load file-elisp)
 	;; Insert the message literally: it is already encoded as per
 	;; the MIME headers, and code conversions might guess the
 	;; encoding wrongly.
 	(with-temp-buffer
 	  (let ((coding-system-for-read 'no-conversion))
-	    (insert-file-contents file-msg))
+	    (insert-file-contents file-data))
           (let ((smtpmail-mail-address
                  (or (and mail-specify-envelope-from (mail-envelope-from))
                      user-mail-address)))
@@ -426,8 +428,8 @@
 				    (current-buffer)))
 		  (error "Sending failed: %s" result))
               (error "Sending failed; no recipients"))))
-	(delete-file file-msg)
-	(delete-file (concat file-msg ".el"))
+	(delete-file file-data)
+	(delete-file file-elisp)
 	(delete-region (point-at-bol) (point-at-bol 2)))
       (write-region (point-min) (point-max) qfile))))
 
diff -Nru emacs-26.1+1/lisp/mail/supercite.el emacs-26.3+1/lisp/mail/supercite.el
--- emacs-26.1+1/lisp/mail/supercite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/supercite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; supercite.el --- minor mode for citing mail and news replies
 
-;; Copyright (C) 1993, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -315,7 +315,7 @@
   :group 'supercite-hooks)
 
 (defcustom sc-mail-warn-if-non-rfc822-p t
-  "Warn if mail headers don't conform to RFC822."
+  "Warn if mail headers don't conform to RFC 822 (or later)."
   :type 'boolean
   :group 'supercite-attr)
 (defcustom sc-mumble ""
@@ -745,10 +745,10 @@
   nil)
 
 (defun sc-mail-error-in-mail-field ()
-  "Issue warning that mail headers don't conform to RFC 822."
+  "Issue warning that mail headers don't conform to email RFCs."
   (let* ((len (min (length curline) 10))
 	 (ellipsis (if (< len (length curline)) "..." ""))
-	 (msg "Mail header \"%s%s\" doesn't conform to RFC 822. skipping..."))
+	 (msg "Mail header \"%s%s\" doesn't conform to RFC 822 (or later). skipping..."))
     (message msg (substring curline 0 len) ellipsis))
   (beep)
   (sit-for 2)
diff -Nru emacs-26.1+1/lisp/mail/uce.el emacs-26.3+1/lisp/mail/uce.el
--- emacs-26.1+1/lisp/mail/uce.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/uce.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; uce.el --- facilitate reply to unsolicited commercial email
 
-;; Copyright (C) 1996, 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: stanislav shalunov <shalunov@mccme.ru>
 ;; Created: 10 Dec 1996
diff -Nru emacs-26.1+1/lisp/mail/undigest.el emacs-26.3+1/lisp/mail/undigest.el
--- emacs-26.1+1/lisp/mail/undigest.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/undigest.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1994, 1996, 2001-2018 Free Software
+;; Copyright (C) 1985-1986, 1994, 1996, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mail/unrmail.el emacs-26.3+1/lisp/mail/unrmail.el
--- emacs-26.1+1/lisp/mail/unrmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/unrmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; unrmail.el --- convert Rmail Babyl files to mbox files
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/mail/uudecode.el emacs-26.3+1/lisp/mail/uudecode.el
--- emacs-26.1+1/lisp/mail/uudecode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/uudecode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; uudecode.el -- elisp native uudecode
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: uudecode news
diff -Nru emacs-26.1+1/lisp/mail/yenc.el emacs-26.3+1/lisp/mail/yenc.el
--- emacs-26.1+1/lisp/mail/yenc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mail/yenc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; yenc.el --- elisp native yenc decoder
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jesper Harder <harder@ifa.au.dk>
 ;; Keywords: yenc news
diff -Nru emacs-26.1+1/lisp/Makefile.in emacs-26.3+1/lisp/Makefile.in
--- emacs-26.1+1/lisp/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -259,9 +259,9 @@
 ## compile-main.  But maybe this is not even necessary any more now
 ## that this uses relative filenames.
 TAGS: ${ETAGS} ${tagsfiles}
-	rm -f $@
-	touch $@
-	ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@
+	$(AM_V_at)rm -f $@
+	$(AM_V_at)touch $@
+	$(AM_V_GEN)ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@
 
 
 # The src/Makefile.in has its own set of dependencies and when they decide
diff -Nru emacs-26.1+1/lisp/makesum.el emacs-26.3+1/lisp/makesum.el
--- emacs-26.1+1/lisp/makesum.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/makesum.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
diff -Nru emacs-26.1+1/lisp/man.el emacs-26.3+1/lisp/man.el
--- emacs-26.1+1/lisp/man.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/man.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; man.el --- browse UNIX manual pages -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1994, 1996-1997, 2001-2018 Free Software
+;; Copyright (C) 1993-1994, 1996-1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
@@ -318,7 +318,7 @@
 
 (defvar Man-reference-regexp
   (concat "\\(" Man-name-regexp
-	  "\\(‐?\n[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\("
+	  "\\(\\([-‐]\n\\)?[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\("
 	  Man-section-regexp "\\))")
   "Regular expression describing a reference to another manpage.")
 
@@ -624,7 +624,13 @@
                           ;; so we don't need `2>' even with DOS shells
                           ;; which do support stderr redirection.
                           ((not (fboundp 'make-process)) " %s")
-                          ((concat " %s 2>" null-device)))))
+                          ((concat " %s 2>" null-device
+                                   ;; Some MS-Windows ports of Groff
+                                   ;; try to read stdin after exhausting
+                                   ;; the command-line arguments; make
+                                   ;; them exit if/when they do.
+                                   (if (eq system-type 'windows-nt)
+                                       (concat " <" null-device)))))))
 	(flist Man-filter-list))
     (while (and flist (car flist))
       (let ((pcom (car (car flist)))
@@ -664,7 +670,7 @@
      ;; "chmod(2V)" case ?
      ((string-match (concat "^" Man-reference-regexp "$") ref)
       (setq name (replace-regexp-in-string "[\n\t ]" "" (match-string 1 ref))
-	    section (match-string 3 ref)))
+	    section (match-string 4 ref)))
      ;; "2v chmod" case ?
      ((string-match (concat "^\\(" Man-section-regexp
 			    "\\) +\\(" Man-name-regexp "\\)$") ref)
@@ -783,11 +789,22 @@
       ;;     see this-
       ;;     command-here(1)
       ;; Note: This code gets executed iff our entry is after POS.
-      (when (looking-at "‐?[ \t\r\n]+\\([-a-zA-Z0-9._+:]+\\)([0-9])")
-	(setq word (concat word (match-string-no-properties 1)))
+      (when (looking-at
+             (concat
+              "‐?[ \t\r\n]+\\([-a-zA-Z0-9._+:]+\\)(" Man-section-regexp ")"))
+        (let ((1st-part word))
+          (setq word (concat word (match-string-no-properties 1)))
+          ;; If they use -Tascii, we cannot know whether a hyphen at
+          ;; EOL is or isn't part of the referenced manpage name.
+          ;; Heuristics: if the part of the manpage before the hyphen
+          ;; doesn't include a hyphen, we consider the hyphen to be
+          ;; added by troff, and remove it.
+          (or (not (eq (string-to-char (substring 1st-part -1)) ?-))
+              (string-match-p "-" (substring 1st-part 0 -1))
+              (setq word (replace-regexp-in-string "-" "" word))))
 	;; Make sure the section number gets included by the code below.
 	(goto-char (match-end 1)))
-      (when (string-match "[-._]+$" word)
+      (when (string-match "[-._‐]+$" word)
 	(setq word (substring word 0 (match-beginning 0))))
       ;; The following was commented out since the preceding code
       ;; should not produce a leading "*" in the first place.
@@ -1378,7 +1395,8 @@
 
       (with-current-buffer Man-buffer
 	(save-excursion
-	  (let ((case-fold-search nil))
+	  (let ((case-fold-search nil)
+                (inhibit-read-only t))
 	    (goto-char (point-min))
 	    (cond ((or (looking-at "No \\(manual \\)*entry for")
 		       (looking-at "[^\n]*: nothing appropriate$"))
diff -Nru emacs-26.1+1/lisp/master.el emacs-26.3+1/lisp/master.el
--- emacs-26.1+1/lisp/master.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/master.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; master.el --- make a buffer the master over another buffer
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff -Nru emacs-26.1+1/lisp/mb-depth.el emacs-26.3+1/lisp/mb-depth.el
--- emacs-26.1+1/lisp/mb-depth.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mb-depth.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mb-depth.el --- Indicate minibuffer-depth in prompt -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience
diff -Nru emacs-26.1+1/lisp/md4.el emacs-26.3+1/lisp/md4.el
--- emacs-26.1+1/lisp/md4.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/md4.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; md4.el --- MD4 Message Digest Algorithm. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2001, 2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Taro Kawagishi <tarok@transpulse.org>
 ;; Keywords: MD4
diff -Nru emacs-26.1+1/lisp/menu-bar.el emacs-26.3+1/lisp/menu-bar.el
--- emacs-26.1+1/lisp/menu-bar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/menu-bar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; menu-bar.el --- define a default menu bar
 
-;; Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard M. Stallman
 ;; Maintainer: emacs-devel@gnu.org
@@ -689,7 +689,7 @@
 		   debug-on-quit debug-on-error
 		   ;; Somehow this works, when tool-bar and menu-bar don't.
 		   tooltip-mode window-divider-mode
-		   save-place uniquify-buffer-name-style fringe-mode
+		   save-place-mode uniquify-buffer-name-style fringe-mode
 		   indicate-empty-lines indicate-buffer-boundaries
 		   case-fold-search font-use-system-font
 		   current-language-environment default-input-method
@@ -1413,7 +1413,7 @@
 
     (bindings--define-key menu [save-place]
       (menu-bar-make-toggle
-       toggle-save-place-globally save-place
+       toggle-save-place-globally save-place-mode
        "Save Place in Files between Sessions"
        "Saving place in files %s"
        "Visit files of previous session when restarting Emacs"
@@ -1421,7 +1421,7 @@
        ;; Do it by name, to avoid a free-variable
        ;; warning during byte compilation.
        (set-default
-	'save-place (not (symbol-value 'save-place)))))
+	'save-place-mode (not (symbol-value 'save-place-mode)))))
 
     (bindings--define-key menu [uniquify]
       (menu-bar-make-toggle
diff -Nru emacs-26.1+1/lisp/mh-e/ChangeLog.1 emacs-26.3+1/lisp/mh-e/ChangeLog.1
--- emacs-26.1+1/lisp/mh-e/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -11419,7 +11419,7 @@
 	(dist): Leave release in current directory.
 
 
-  Copyright (C) 2003-2018 Free Software Foundation, Inc.
+  Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/mh-e/ChangeLog.2 emacs-26.3+1/lisp/mh-e/ChangeLog.2
--- emacs-26.1+1/lisp/mh-e/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -73,10 +73,10 @@
 
 	* mh-folder.el (mh-inc-folder): Revert SF #2321115, SF #250
 	which processed pending deletes and refiles.  Call to
-	mh-process-or-undo-commands to insure that pending changes are
+	mh-process-or-undo-commands to ensure that pending changes are
 	properly tagged after including new mail (closes SF #271).
 
-	* mh-comp.el: Insure that mail-header-separator is set before
+	* mh-comp.el: Ensure that mail-header-separator is set before
 	invoking any mml functions (closes SF #270).
 
 2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -140,7 +140,7 @@
 	(addresses SF #1916032).
 
 	* mh-folder.el (mh-inc-folder): Call mh-process-or-undo-commands
-	before running to insure we do not lose any pending changes.
+	before running to ensure we do not lose any pending changes.
 	(closes SF #2321115).
 
 2012-11-25  Ted Phelps  <phelps@gnusto.com>
@@ -3673,7 +3673,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-  Copyright (C) 2005-2018 Free Software Foundation, Inc.
+  Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/mh-e/mh-acros.el emacs-26.3+1/lisp/mh-e/mh-acros.el
--- emacs-26.1+1/lisp/mh-e/mh-acros.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-acros.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-acros.el --- macros used in MH-E
 
-;; Copyright (C) 2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-alias.el emacs-26.3+1/lisp/mh-e/mh-alias.el
--- emacs-26.1+1/lisp/mh-e/mh-alias.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-alias.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 
-;; Copyright (C) 1994-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-buffers.el emacs-26.3+1/lisp/mh-e/mh-buffers.el
--- emacs-26.1+1/lisp/mh-e/mh-buffers.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-buffers.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-buffers.el --- MH-E buffer constants and utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-compat.el emacs-26.3+1/lisp/mh-e/mh-compat.el
--- emacs-26.1+1/lisp/mh-e/mh-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-comp.el emacs-26.3+1/lisp/mh-e/mh-comp.el
--- emacs-26.1+1/lisp/mh-e/mh-comp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-comp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-comp.el --- MH-E functions for composing and sending messages
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
@@ -925,8 +925,10 @@
                      (list "-form" mh-comp-formfile)))
     (setq new (make-temp-file "comp."))
     (rename-file (concat temp-folder "/" "1") new t)
-    (delete-file (concat temp-folder "/" ".mh_sequences"))
-    (delete-directory temp-folder)
+    ;; The temp folder could contain various metadata files.  Rather
+    ;; than trying to enumerate all the known files, just do a
+    ;; recursive delete on the directory.
+    (delete-directory temp-folder t)
     new))
 
 (defun mh-read-draft (use initial-contents delete-contents-file)
diff -Nru emacs-26.1+1/lisp/mh-e/mh-e.el emacs-26.3+1/lisp/mh-e/mh-e.el
--- emacs-26.1+1/lisp/mh-e/mh-e.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-e.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-e.el --- GNU Emacs interface to the MH mail system
 
-;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2018 Free
+;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
@@ -1022,12 +1022,13 @@
   (when delete-other-windows-flag
     (delete-other-windows)))
 
-;; FIXME: Maybe out of date?  --xfq
 (if (boundp 'customize-package-emacs-version-alist)
     (add-to-list 'customize-package-emacs-version-alist
                  '(MH-E ("6.0" . "22.1") ("6.1" . "22.1") ("7.0" . "22.1")
                         ("7.1" . "22.1") ("7.2" . "22.1") ("7.3" . "22.1")
-                        ("7.4" . "22.1") ("8.0" . "22.1"))))
+                        ("7.4" . "22.1") ("8.0" . "22.1") ("8.1" . "23.1")
+                        ("8.2" . "23.1") ("8.3" . "24.1") ("8.4" . "24.4")
+                        ("8.5" . "24.4") ("8.6" . "24.4"))))
 
 
 
@@ -2412,14 +2413,14 @@
   :package-version '(MH-E . "8.0"))
 
 ;; These entries have been intentionally excluded by the developers.
-;;  "Comments:"                         ; RFC 2822 - show this one
+;;  "Comments:"                         ; RFC 822 (or later) - show this one
 ;;  "Fax:"                              ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Mail-System-Version:"              ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Mailer:"                           ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Organization:"                     ;
 ;;  "Phone:"                            ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
 ;;  "Reply-By:"                         ; RFC 2156
-;;  "Reply-To:"                         ; RFC 2822
+;;  "Reply-To:"                         ; RFC 822 (or later)
 ;;  "Sender:"                           ;
 ;;  "User-Agent:"                       ; Similar to X-Mailer, so display it.
 ;;  "X-Mailer:"                         ;
@@ -2480,9 +2481,9 @@
     "From "                             ; sendmail
     "Generate-Delivery-Report:"         ; RFC 2156
     "Importance:"                       ; RFC 2156, 2421
-    "In-Reply-To:"                      ; RFC 2822
+    "In-Reply-To:"                      ; RFC 822 (or later)
     "Incomplete-Copy:"                  ; RFC 2156
-    "Keywords:"                         ; RFC 2822
+    "Keywords:"                         ; RFC 822 (or later)
     "Language:"                         ; RFC 2156
     "Lines:"                            ; RFC 1036
     "List-"                             ; RFC 2369, 2919
@@ -2492,7 +2493,7 @@
     "Mail-Reply-To:"                    ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Mailing-List:"                     ; Egroups/yahoogroups mailing list manager
     "Message-Content:"                  ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
-    "Message-Id:"                       ; RFC 822
+    "Message-ID:"                       ; RFC 822 (or later)
     "Message-Type:"                     ; RFC 2156
     "Mime-Version"                      ; RFC 2045
     "Msgid:"
@@ -2523,14 +2524,14 @@
     "Priority:"                         ; RFC 2156
     "Read-Receipt-To:"                  ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Received-SPF:"                     ; Gmail
-    "Received:"                         ; RFC 822
-    "References:"                       ; RFC 2822
+    "Received:"                         ; RFC 822 (or later)
+    "References:"                       ; RFC 822 (or later)
     "Registered-Mail-Reply-Requested-By:"       ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Remailed-"                         ; MH
     "Replaces:"                         ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Replied:"                          ; MH
-    "Resent-"                           ; RFC 2822
-    "Return-Path:"                      ; RFC 822
+    "Resent-"                           ; RFC 822 (or later)
+    "Return-Path:"                      ; RFC 822 (or later)
     "Return-Receipt-Requested:"         ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Return-Receipt-To:"                ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
     "Seal-Send-Time:"
diff -Nru emacs-26.1+1/lisp/mh-e/mh-folder.el emacs-26.3+1/lisp/mh-e/mh-folder.el
--- emacs-26.1+1/lisp/mh-e/mh-folder.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-folder.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-folder.el --- MH-Folder mode
 
-;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-funcs.el emacs-26.3+1/lisp/mh-e/mh-funcs.el
--- emacs-26.1+1/lisp/mh-e/mh-funcs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-funcs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
-;; Copyright (C) 1993, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-gnus.el emacs-26.3+1/lisp/mh-e/mh-gnus.el
--- emacs-26.1+1/lisp/mh-e/mh-gnus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-gnus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus
 
-;; Copyright (C) 2003-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-identity.el emacs-26.3+1/lisp/mh-e/mh-identity.el
--- emacs-26.1+1/lisp/mh-e/mh-identity.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-identity.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-identity.el --- multiple identify support for MH-E
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-inc.el emacs-26.3+1/lisp/mh-e/mh-inc.el
--- emacs-26.1+1/lisp/mh-e/mh-inc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-inc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-inc.el --- MH-E "inc" and separate mail spool handling
 
-;; Copyright (C) 2003-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-junk.el emacs-26.3+1/lisp/mh-e/mh-junk.el
--- emacs-26.1+1/lisp/mh-e/mh-junk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-junk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- MH-E interface to anti-spam measures
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-letter.el emacs-26.3+1/lisp/mh-e/mh-letter.el
--- emacs-26.1+1/lisp/mh-e/mh-letter.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-letter.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-letter.el --- MH-Letter mode
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-limit.el emacs-26.3+1/lisp/mh-e/mh-limit.el
--- emacs-26.1+1/lisp/mh-e/mh-limit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-limit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-limit.el --- MH-E display limits
 
-;; Copyright (C) 2001-2003, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2003, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-mime.el emacs-26.3+1/lisp/mh-e/mh-mime.el
--- emacs-26.1+1/lisp/mh-e/mh-mime.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-mime.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-mime.el --- MH-E MIME support
 
-;; Copyright (C) 1993, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-print.el emacs-26.3+1/lisp/mh-e/mh-print.el
--- emacs-26.1+1/lisp/mh-e/mh-print.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-print.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-scan.el emacs-26.3+1/lisp/mh-e/mh-scan.el
--- emacs-26.1+1/lisp/mh-e/mh-scan.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-scan.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-scan.el --- MH-E scan line constants and utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-search.el emacs-26.3+1/lisp/mh-e/mh-search.el
--- emacs-26.1+1/lisp/mh-e/mh-search.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-search.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-search  ---  MH-Search mode
 
-;; Copyright (C) 1993, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-seq.el emacs-26.3+1/lisp/mh-e/mh-seq.el
--- emacs-26.1+1/lisp/mh-e/mh-seq.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-seq.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-seq.el --- MH-E sequences support
 
-;; Copyright (C) 1993, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-show.el emacs-26.3+1/lisp/mh-e/mh-show.el
--- emacs-26.1+1/lisp/mh-e/mh-show.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-show.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-show.el --- MH-Show mode
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-speed.el emacs-26.3+1/lisp/mh-e/mh-speed.el
--- emacs-26.1+1/lisp/mh-e/mh-speed.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-speed.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-speed.el --- MH-E speedbar support
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-thread.el emacs-26.3+1/lisp/mh-e/mh-thread.el
--- emacs-26.1+1/lisp/mh-e/mh-thread.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-thread.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-thread.el --- MH-E threading support
 
-;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-tool-bar.el emacs-26.3+1/lisp/mh-e/mh-tool-bar.el
--- emacs-26.1+1/lisp/mh-e/mh-tool-bar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-tool-bar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-tool-bar.el --- MH-E tool bar support
 
-;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/mh-e/mh-utils.el emacs-26.3+1/lisp/mh-e/mh-utils.el
--- emacs-26.1+1/lisp/mh-e/mh-utils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-utils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-utils.el --- MH-E general utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
@@ -887,7 +887,7 @@
 ;;;###mh-autoload
 (defun mh-header-field-beginning ()
   "Move to the beginning of the current header field.
-Handles RFC 822 continuation lines."
+Handle RFC 822 (or later) continuation lines."
   (beginning-of-line)
   (while (looking-at "^[ \t]")
     (forward-line -1)))
@@ -895,7 +895,7 @@
 ;;;###mh-autoload
 (defun mh-header-field-end ()
   "Move to the end of the current header field.
-Handles RFC 822 continuation lines."
+Handle RFC 822 (or later) continuation lines."
   (forward-line 1)
   (while (looking-at "^[ \t]")
     (forward-line 1))
diff -Nru emacs-26.1+1/lisp/mh-e/mh-xface.el emacs-26.3+1/lisp/mh-e/mh-xface.el
--- emacs-26.1+1/lisp/mh-e/mh-xface.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mh-e/mh-xface.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mh-xface.el --- MH-E X-Face and Face header field display
 
-;; Copyright (C) 2002-2003, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff -Nru emacs-26.1+1/lisp/midnight.el emacs-26.3+1/lisp/midnight.el
--- emacs-26.1+1/lisp/midnight.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/midnight.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; midnight.el --- run something every midnight, e.g., kill old buffers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Sam Steingold <sds@gnu.org>
 ;; Maintainer: Sam Steingold <sds@gnu.org>
@@ -64,7 +64,7 @@
 
 (defcustom clean-buffer-list-delay-general 3
   "The number of days before any buffer becomes eligible for autokilling.
-The autokilling is done by `clean-buffer-list' when is it in `midnight-hook'.
+The autokilling is done by `clean-buffer-list' when it is in `midnight-hook'.
 Currently displayed and/or modified (unsaved) buffers, as well as buffers
 matching `clean-buffer-list-kill-never-buffer-names' and
 `clean-buffer-list-kill-never-regexps' are excluded."
@@ -81,7 +81,7 @@
   "List of regexps saying which buffers will be killed at midnight.
 If buffer name matches a regexp in the list and the buffer was not displayed
 in the last `clean-buffer-list-delay-special' seconds, it is killed by
-`clean-buffer-list' when is it in `midnight-hook'.
+`clean-buffer-list' when it is in `midnight-hook'.
 If a member of the list is a cons, its `car' is the regexp and its `cdr' is
 the number of seconds to use instead of `clean-buffer-list-delay-special'.
 See also `clean-buffer-list-kill-buffer-names',
@@ -101,7 +101,7 @@
   "List of strings saying which buffers will be killed at midnight.
 Buffers with names in this list, which were not displayed in the last
 `clean-buffer-list-delay-special' seconds, are killed by `clean-buffer-list'
-when is it in `midnight-hook'.
+when it is in `midnight-hook'.
 If a member of the list is a cons, its `car' is the name and its `cdr' is
 the number of seconds to use instead of `clean-buffer-list-delay-special'.
 See also `clean-buffer-list-kill-regexps',
diff -Nru emacs-26.1+1/lisp/minibuf-eldef.el emacs-26.3+1/lisp/minibuf-eldef.el
--- emacs-26.1+1/lisp/minibuf-eldef.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/minibuf-eldef.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable  -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience
diff -Nru emacs-26.1+1/lisp/minibuffer.el emacs-26.3+1/lisp/minibuffer.el
--- emacs-26.1+1/lisp/minibuffer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/minibuffer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; minibuffer.el --- Minibuffer completion functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Package: emacs
@@ -174,10 +174,14 @@
 
 (defun completion-table-dynamic (fun &optional switch-buffer)
   "Use function FUN as a dynamic completion table.
-FUN is called with one argument, the string for which completion is required,
-and it should return an alist containing all the intended possible completions.
-This alist may be a full list of possible completions so that FUN can ignore
-the value of its argument.
+FUN is called with one argument, the string for which completion is requested,
+and it should return a completion table containing all the intended possible
+completions.
+This table is allowed to include elements that do not actually match the
+string: they will be automatically filtered out.
+The completion table returned by FUN can use any of the usual formats of
+completion tables such as lists, alists, and hash-tables.
+
 If SWITCH-BUFFER is non-nil and completion is performed in the
 minibuffer, FUN will be called in the buffer from which the minibuffer
 was entered.
@@ -185,6 +189,8 @@
 The result of the `completion-table-dynamic' form is a function
 that can be used as the COLLECTION argument to `try-completion' and
 `all-completions'.  See Info node `(elisp)Programmed Completion'.
+The completion table returned by `completion-table-dynamic' has empty
+metadata and trivial boundaries.
 
 See also the related function `completion-table-with-cache'."
   (lambda (string pred action)
diff -Nru emacs-26.1+1/lisp/misc.el emacs-26.3+1/lisp/misc.el
--- emacs-26.1+1/lisp/misc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/misc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; misc.el --- some nonstandard editing and utility commands for Emacs
 
-;; Copyright (C) 1989, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
diff -Nru emacs-26.1+1/lisp/misearch.el emacs-26.3+1/lisp/misearch.el
--- emacs-26.1+1/lisp/misearch.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/misearch.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; misearch.el --- isearch extensions for multi-buffer search
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Juri Linkov <juri@jurta.org>
 ;; Keywords: matching
diff -Nru emacs-26.1+1/lisp/mouse-copy.el emacs-26.3+1/lisp/mouse-copy.el
--- emacs-26.1+1/lisp/mouse-copy.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mouse-copy.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mouse-copy.el --- one-click text copy and move
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
diff -Nru emacs-26.1+1/lisp/mouse-drag.el emacs-26.3+1/lisp/mouse-drag.el
--- emacs-26.1+1/lisp/mouse-drag.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mouse-drag.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
 
-;; Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
diff -Nru emacs-26.1+1/lisp/mouse.el emacs-26.3+1/lisp/mouse.el
--- emacs-26.1+1/lisp/mouse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mouse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mouse.el --- window system-independent mouse support  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1995, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware, mouse
@@ -326,7 +326,7 @@
 (define-obsolete-function-alias 'mouse-tear-off-window 'tear-off-window "24.4")
 (defun tear-off-window (click)
   "Delete the selected window, and create a new frame displaying its buffer."
-  (interactive "e")
+  (interactive (list last-nonmenu-event))
   (mouse-minibuffer-check click)
   (let* ((window (posn-window (event-start click)))
 	 (buf (window-buffer window))
@@ -1225,7 +1225,11 @@
 	 (bounds (window-edges start-window))
 	 (make-cursor-line-fully-visible nil)
 	 (top (nth 1 bounds))
-	 (bottom (if (window-minibuffer-p start-window)
+	 (bottom (if (or (window-minibuffer-p start-window)
+                         ;; Do not account for the mode line if there
+                         ;; is no mode line, which is common for child
+                         ;; frames.
+                         (not mode-line-format))
 		     (nth 3 bounds)
 		   ;; Don't count the mode line.
 		   (1- (nth 3 bounds))))
@@ -2511,9 +2515,9 @@
             (setq drag-but-negligible
                   (and (eq (overlay-buffer mouse-drag-and-drop-overlay)
                            buffer-to-paste)
-                       (< (overlay-start mouse-drag-and-drop-overlay)
+                       (<= (overlay-start mouse-drag-and-drop-overlay)
                           point-to-paste)
-                       (< point-to-paste
+                       (<= point-to-paste
                           (overlay-end mouse-drag-and-drop-overlay)))))
 
           ;; Show a tooltip.
diff -Nru emacs-26.1+1/lisp/mpc.el emacs-26.3+1/lisp/mpc.el
--- emacs-26.1+1/lisp/mpc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mpc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mpc.el --- A client for the Music Player Daemon   -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: multimedia
diff -Nru emacs-26.1+1/lisp/msb.el emacs-26.3+1/lisp/msb.el
--- emacs-26.1+1/lisp/msb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/msb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; msb.el --- customizable buffer-selection with multiple menus
 
-;; Copyright (C) 1993-1995, 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Lindberg <lars.lindberg@home.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/mwheel.el emacs-26.3+1/lisp/mwheel.el
--- emacs-26.1+1/lisp/mwheel.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/mwheel.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mwheel.el --- Wheel mouse support
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 ;; Maintainer: William M. Perry <wmperry@gnu.org>
 ;; Keywords: mouse
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/net/ange-ftp.el emacs-26.3+1/lisp/net/ange-ftp.el
--- emacs-26.1+1/lisp/net/ange-ftp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/ange-ftp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989-1996, 1998, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1989-1996, 1998, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
diff -Nru emacs-26.1+1/lisp/net/browse-url.el emacs-26.3+1/lisp/net/browse-url.el
--- emacs-26.1+1/lisp/net/browse-url.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/browse-url.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/net/dbus.el emacs-26.3+1/lisp/net/dbus.el
--- emacs-26.1+1/lisp/net/dbus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/dbus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dbus.el --- Elisp bindings for D-Bus. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hardware
@@ -1791,10 +1791,11 @@
 this connection to those buses."
   (or (featurep 'dbusbind)
       (signal 'dbus-error (list "Emacs not compiled with dbus support")))
-  (dbus--init-bus bus private)
-  (dbus-register-signal
-   bus nil dbus-path-local dbus-interface-local
-   "Disconnected" #'dbus-handle-bus-disconnect))
+  (prog1
+      (dbus--init-bus bus private)
+    (dbus-register-signal
+     bus nil dbus-path-local dbus-interface-local
+     "Disconnected" #'dbus-handle-bus-disconnect)))
 
  
 ;; Initialize `:system' and `:session' buses.  This adds their file
diff -Nru emacs-26.1+1/lisp/net/dig.el emacs-26.3+1/lisp/net/dig.el
--- emacs-26.1+1/lisp/net/dig.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/dig.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dig.el --- Domain Name System dig interface
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS BIND dig comm
diff -Nru emacs-26.1+1/lisp/net/dns.el emacs-26.3+1/lisp/net/dns.el
--- emacs-26.1+1/lisp/net/dns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/dns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dns.el --- Domain Name Service lookups
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: network comm
diff -Nru emacs-26.1+1/lisp/net/eudcb-bbdb.el emacs-26.3+1/lisp/net/eudcb-bbdb.el
--- emacs-26.1+1/lisp/net/eudcb-bbdb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudcb-bbdb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudcb-ldap.el emacs-26.3+1/lisp/net/eudcb-ldap.el
--- emacs-26.1+1/lisp/net/eudcb-ldap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudcb-ldap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudcb-mab.el emacs-26.3+1/lisp/net/eudcb-mab.el
--- emacs-26.1+1/lisp/net/eudcb-mab.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudcb-mab.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
diff -Nru emacs-26.1+1/lisp/net/eudc-bob.el emacs-26.3+1/lisp/net/eudc-bob.el
--- emacs-26.1+1/lisp/net/eudc-bob.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudc-bob.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudc.el emacs-26.3+1/lisp/net/eudc.el
--- emacs-26.1+1/lisp/net/eudc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudc-export.el emacs-26.3+1/lisp/net/eudc-export.el
--- emacs-26.1+1/lisp/net/eudc-export.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudc-export.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudc-export.el --- functions to export EUDC query results
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudc-hotlist.el emacs-26.3+1/lisp/net/eudc-hotlist.el
--- emacs-26.1+1/lisp/net/eudc-hotlist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudc-hotlist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudc-hotlist.el --- hotlist management for EUDC
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eudc-vars.el emacs-26.3+1/lisp/net/eudc-vars.el
--- emacs-26.1+1/lisp/net/eudc-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eudc-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudc-vars.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/net/eww.el emacs-26.3+1/lisp/net/eww.el
--- emacs-26.1+1/lisp/net/eww.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/eww.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eww.el --- Emacs Web Wowser  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: html
@@ -1526,7 +1526,7 @@
 (defun eww-download-callback (status url)
   (unless (plist-get status :error)
     (let* ((obj (url-generic-parse-url url))
-           (path (car (url-path-and-query obj)))
+           (path (directory-file-name (car (url-path-and-query obj))))
            (file (eww-make-unique-file-name
                   (eww-decode-url-file-name (file-name-nondirectory path))
                   eww-download-directory)))
diff -Nru emacs-26.1+1/lisp/net/gnutls.el emacs-26.3+1/lisp/net/gnutls.el
--- emacs-26.1+1/lisp/net/gnutls.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/gnutls.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnutls.el --- Support SSL/TLS connections through GnuTLS
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: comm, tls, ssl, encryption
@@ -46,7 +46,15 @@
 (defcustom gnutls-algorithm-priority nil
   "If non-nil, this should be a TLS priority string.
 For instance, if you want to skip the \"dhe-rsa\" algorithm,
-set this variable to \"normal:-dhe-rsa\"."
+set this variable to \"normal:-dhe-rsa\".
+
+This variable can be useful for modifying low-level TLS
+connection parameters (for instance if you need to connect to a
+host that only accepts a specific algorithm).  However, in
+general, Emacs network security is handled by the Network
+Security Manager (NSM), and the default value of nil delegates
+the job of checking the connection security to the NSM.
+See Info node `(emacs) Network Security'."
   :group 'gnutls
   :type '(choice (const nil)
                  string))
@@ -72,7 +80,13 @@
 If the condition test fails, an error will be signaled.
 
 If the value of this variable is t, every connection will be subjected
-to all of the tests described above."
+to all of the tests described above.
+
+The default value of this variable is nil, which means that no
+checks are performed at the gnutls level.  Instead the checks are
+performed via `open-network-stream' at a higher level by the
+Network Security Manager.  See Info node `(emacs) Network
+Security'."
   :group 'gnutls
   :version "24.4"
   :type '(choice
@@ -111,7 +125,14 @@
 rejected.  \(The smaller the prime number, the less secure the
 key exchange is against man-in-the-middle attacks.)
 
-A value of nil says to use the default GnuTLS value."
+A value of nil says to use the default GnuTLS value.
+
+The default value of this variable is such that virtually any
+connection can be established, whether this connection can be
+considered cryptographically \"safe\" or not.  However, Emacs
+network security is handled at a higher level via
+`open-network-stream' and the Network Security Manager.  See Info
+node `(emacs) Network Security'."
   :type '(choice (const :tag "Use default value" nil)
                  (integer :tag "Number of bits" 512))
   :group 'gnutls)
diff -Nru emacs-26.1+1/lisp/net/goto-addr.el emacs-26.3+1/lisp/net/goto-addr.el
--- emacs-26.1+1/lisp/net/goto-addr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/goto-addr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
-;; Copyright (C) 1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/net/hmac-def.el emacs-26.3+1/lisp/net/hmac-def.el
--- emacs-26.1+1/lisp/net/hmac-def.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/hmac-def.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hmac-def.el --- A macro for defining HMAC functions.
 
-;; Copyright (C) 1999, 2001, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: HMAC, RFC2104
diff -Nru emacs-26.1+1/lisp/net/hmac-md5.el emacs-26.3+1/lisp/net/hmac-md5.el
--- emacs-26.1+1/lisp/net/hmac-md5.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/hmac-md5.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hmac-md5.el --- Compute HMAC-MD5.
 
-;; Copyright (C) 1999, 2001, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: HMAC, RFC2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5
diff -Nru emacs-26.1+1/lisp/net/imap.el emacs-26.3+1/lisp/net/imap.el
--- emacs-26.1+1/lisp/net/imap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/imap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; imap.el --- imap library
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: mail
@@ -2094,23 +2094,23 @@
 ;;                      addr-host ")"
 ;;
 ;;   addr-adl        = nstring
-;;                       ; Holds route from [RFC-822] route-addr if
+;;                       ; Holds route from [RFC-822 (or later)] route-addr if
 ;;                       ; non-nil
 ;;
 ;;   addr-host       = nstring
-;;                       ; nil indicates [RFC-822] group syntax.
-;;                       ; Otherwise, holds [RFC-822] domain name
+;;                       ; nil indicates [RFC-822 (or later)] group syntax.
+;;                       ; Otherwise, holds [RFC-822 (or later)] domain name
 ;;
 ;;   addr-mailbox    = nstring
-;;                       ; nil indicates end of [RFC-822] group; if
+;;                       ; nil indicates end of [RFC-822 (or later)] group; if
 ;;                       ; non-nil and addr-host is nil, holds
-;;                       ; [RFC-822] group name.
-;;                       ; Otherwise, holds [RFC-822] local-part
-;;                       ; after removing [RFC-822] quoting
+;;                       ; [RFC-822 (or later)] group name.
+;;                       ; Otherwise, holds [RFC-822 (or later)] local-part
+;;                       ; after removing [RFC-822 (or later)] quoting
 ;;
 ;;   addr-name       = nstring
-;;                       ; If non-nil, holds phrase from [RFC-822]
-;;                       ; mailbox after removing [RFC-822] quoting
+;;                       ; If non-nil, holds phrase from [RFC-822 (or later)]
+;;                       ; mailbox after removing [RFC-822 (or later)] quoting
 ;;
 
 (defsubst imap-parse-address ()
diff -Nru emacs-26.1+1/lisp/net/ldap.el emacs-26.3+1/lisp/net/ldap.el
--- emacs-26.1+1/lisp/net/ldap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/ldap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: emacs-devel@gnu.org
@@ -646,7 +646,12 @@
 	       (not (equal "" sizelimit)))
 	  (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
       (if passwd
-	  (let* ((process-connection-type nil)
+	  ;; Work around Bug#33154, see also Bug#33050.  Leaving
+	  ;; process-connection-type at its default (typically t)
+	  ;; would probably be fine too, however this is the minimal
+	  ;; change on the release branch that fixes ldap.el on Darwin
+	  ;; and leaves other operating systems unchanged.
+	  (let* ((process-connection-type (eq system-type 'darwin))
 		 (proc-args (append arglist ldap-ldapsearch-args
 				    filter))
 		 (proc (apply #'start-process "ldapsearch" buf
diff -Nru emacs-26.1+1/lisp/net/mailcap.el emacs-26.3+1/lisp/net/mailcap.el
--- emacs-26.1+1/lisp/net/mailcap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/mailcap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailcap.el --- MIME media types configuration -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff -Nru emacs-26.1+1/lisp/net/mairix.el emacs-26.3+1/lisp/net/mairix.el
--- emacs-26.1+1/lisp/net/mairix.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/mairix.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mairix.el --- Mairix interface for Emacs
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: David Engster <dengste@eml.cc>
 ;; Keywords: mail searching
diff -Nru emacs-26.1+1/lisp/net/netrc.el emacs-26.3+1/lisp/net/netrc.el
--- emacs-26.1+1/lisp/net/netrc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/netrc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; netrc.el --- .netrc parsing functionality
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff -Nru emacs-26.1+1/lisp/net/net-utils.el emacs-26.3+1/lisp/net/net-utils.el
--- emacs-26.1+1/lisp/net/net-utils.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/net-utils.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; net-utils.el --- network functions
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Mar 16 1997
diff -Nru emacs-26.1+1/lisp/net/network-stream.el emacs-26.3+1/lisp/net/network-stream.el
--- emacs-26.1+1/lisp/net/network-stream.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/network-stream.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; network-stream.el --- open network processes, possibly with encryption -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: network
diff -Nru emacs-26.1+1/lisp/net/newst-backend.el emacs-26.3+1/lisp/net/newst-backend.el
--- emacs-26.1+1/lisp/net/newst-backend.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newst-backend.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newst-backend.el --- Retrieval backend for newsticker.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-backend.el
@@ -1699,8 +1699,8 @@
     nil))
 
 (defun newsticker--decode-rfc822-date (rfc822-string)
-  "Return RFC822-STRING in format like `decode-time'.
-Converts from RFC822 to Emacs representation.
+  "Convert RFC822-STRING to a Lisp timestamp.
+RFC822-STRING should use RFC 822 (or later) format.
 Examples:
 Sat, 07 September 2002 00:00:01 +0100
 Sat, 07 September 2002 00:00:01 MET
diff -Nru emacs-26.1+1/lisp/net/newsticker.el emacs-26.3+1/lisp/net/newsticker.el
--- emacs-26.1+1/lisp/net/newsticker.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newsticker.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newsticker.el --- A Newsticker for Emacs. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newsticker.el
diff -Nru emacs-26.1+1/lisp/net/newst-plainview.el emacs-26.3+1/lisp/net/newst-plainview.el
--- emacs-26.1+1/lisp/net/newst-plainview.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newst-plainview.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newst-plainview.el --- Single buffer frontend for newsticker.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-plainview.el
diff -Nru emacs-26.1+1/lisp/net/newst-reader.el emacs-26.3+1/lisp/net/newst-reader.el
--- emacs-26.1+1/lisp/net/newst-reader.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newst-reader.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newst-reader.el --- Generic RSS reader functions.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-reader.el
diff -Nru emacs-26.1+1/lisp/net/newst-ticker.el emacs-26.3+1/lisp/net/newst-ticker.el
--- emacs-26.1+1/lisp/net/newst-ticker.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newst-ticker.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; newst-ticker.el --- mode line ticker for newsticker.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-ticker.el
diff -Nru emacs-26.1+1/lisp/net/newst-treeview.el emacs-26.3+1/lisp/net/newst-treeview.el
--- emacs-26.1+1/lisp/net/newst-treeview.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/newst-treeview.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newst-treeview.el --- Treeview frontend for newsticker.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-treeview.el
diff -Nru emacs-26.1+1/lisp/net/nsm.el emacs-26.3+1/lisp/net/nsm.el
--- emacs-26.1+1/lisp/net/nsm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/nsm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nsm.el --- Network Security Manager
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: encryption, security, network
@@ -319,29 +319,34 @@
 	t))))
 
 (defun nsm-query-user (message args cert)
-  (let ((buffer (get-buffer-create "*Network Security Manager*")))
-    (save-window-excursion
-      ;; First format the certificate and warnings.
-      (with-help-window buffer
-        (with-current-buffer buffer
-          (erase-buffer)
-          (when (> (length cert) 0)
-            (insert cert "\n"))
-          (let ((start (point)))
-            (insert (apply #'format-message message args))
-            (goto-char start)
-            ;; Fill the first line of the message, which usually
-            ;; contains lots of explanatory text.
-            (fill-region (point) (line-end-position)))))
-      ;; Then ask the user what to do about it.
-      (unwind-protect
-          (cadr
-           (read-multiple-choice
-            "Continue connecting?"
-            '((?a "always" "Accept this certificate this session and for all future sessions.")
-              (?s "session only" "Accept this certificate this session only.")
-              (?n "no" "Refuse to use this certificate, and close the connection."))))
-        (kill-buffer buffer)))))
+  (catch 'return
+    (while t
+      (let ((buffer (get-buffer-create "*Network Security Manager*")))
+        (save-window-excursion
+          ;; First format the certificate and warnings.
+          (with-help-window buffer
+            (with-current-buffer buffer
+              (erase-buffer)
+              (when (> (length cert) 0)
+                (insert cert "\n"))
+              (let ((start (point)))
+                (insert (apply #'format-message message args))
+                (goto-char start)
+                ;; Fill the first line of the message, which usually
+                ;; contains lots of explanatory text.
+                (fill-region (point) (line-end-position)))))
+          ;; Then ask the user what to do about it.
+          (pcase (unwind-protect
+                     (cadr
+                      (read-multiple-choice
+                       "Continue connecting?"
+                       '((?a "always" "Accept this certificate this session and for all future sessions.")
+                         (?s "session only" "Accept this certificate this session only.")
+                         (?n "no" "Refuse to use this certificate, and close the connection.")
+                         (?r "reshow" "Reshow certificate information."))))
+                   (kill-buffer buffer))
+            ("reshow")
+            (val (throw 'return val))))))))
 
 (defun nsm-save-host (host port status what permanency)
   (let* ((id (nsm-id host port))
diff -Nru emacs-26.1+1/lisp/net/ntlm.el emacs-26.3+1/lisp/net/ntlm.el
--- emacs-26.1+1/lisp/net/ntlm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/ntlm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ntlm.el --- NTLM (NT LanManager) authentication support
 
-;; Copyright (C) 2001, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Taro Kawagishi <tarok@transpulse.org>
 ;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
diff -Nru emacs-26.1+1/lisp/net/pop3.el emacs-26.3+1/lisp/net/pop3.el
--- emacs-26.1+1/lisp/net/pop3.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/pop3.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/net/puny.el emacs-26.3+1/lisp/net/puny.el
--- emacs-26.1+1/lisp/net/puny.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/puny.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; puny.el --- translate non-ASCII domain names to ASCII
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, net
diff -Nru emacs-26.1+1/lisp/net/quickurl.el emacs-26.3+1/lisp/net/quickurl.el
--- emacs-26.1+1/lisp/net/quickurl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/quickurl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; quickurl.el --- insert a URL based on text at point in buffer
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
diff -Nru emacs-26.1+1/lisp/net/rcirc.el emacs-26.3+1/lisp/net/rcirc.el
--- emacs-26.1+1/lisp/net/rcirc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/rcirc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rcirc.el --- default, simple IRC client          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Ryan Yeske <rcyeske@gmail.com>
 ;; Maintainers: Ryan Yeske <rcyeske@gmail.com>,
@@ -182,6 +182,8 @@
   :type '(repeat string)
   :group 'rcirc)
 
+(defvar rcirc-prompt-start-marker nil)
+
 (define-minor-mode rcirc-omit-mode
   "Toggle the hiding of \"uninteresting\" lines.
 With a prefix argument ARG, enable Rcirc-Omit mode if ARG is
@@ -401,7 +403,6 @@
 
 (defvar rcirc-nick nil)
 
-(defvar rcirc-prompt-start-marker nil)
 (defvar rcirc-prompt-end-marker nil)
 
 (defvar rcirc-nick-table nil)
@@ -585,7 +586,7 @@
 
       (setq-local rcirc-connection-info
 		  (list server port nick user-name full-name startup-channels
-			password encryption))
+			password encryption server-alias))
       (setq-local rcirc-process process)
       (setq-local rcirc-server server)
       (setq-local rcirc-server-name
@@ -753,12 +754,12 @@
   (with-rcirc-process-buffer process
     (setq rcirc-last-server-message-time (current-time))
     (setq rcirc-process-output (concat rcirc-process-output output))
-    (when (= (aref rcirc-process-output
-                   (1- (length rcirc-process-output))) ?\n)
-      (mapc (lambda (line)
-              (rcirc-process-server-response process line))
-            (split-string rcirc-process-output "[\n\r]" t))
-      (setq rcirc-process-output nil))))
+    (when (= ?\n (aref rcirc-process-output
+                       (1- (length rcirc-process-output))))
+      (let ((lines (split-string rcirc-process-output "[\n\r]" t)))
+        (setq rcirc-process-output nil)
+        (dolist (line lines)
+          (rcirc-process-server-response process line))))))
 
 (defun rcirc-reschedule-timeout (process)
   (with-rcirc-process-buffer process
diff -Nru emacs-26.1+1/lisp/net/rfc2104.el emacs-26.3+1/lisp/net/rfc2104.el
--- emacs-26.1+1/lisp/net/rfc2104.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/rfc2104.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
diff -Nru emacs-26.1+1/lisp/net/rlogin.el emacs-26.3+1/lisp/net/rlogin.el
--- emacs-26.1+1/lisp/net/rlogin.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/rlogin.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rlogin.el --- remote login interface
 
-;; Copyright (C) 1992-1995, 1997-1998, 2001-2018 Free Software
+;; Copyright (C) 1992-1995, 1997-1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Noah Friedman
diff -Nru emacs-26.1+1/lisp/net/sasl-cram.el emacs-26.3+1/lisp/net/sasl-cram.el
--- emacs-26.1+1/lisp/net/sasl-cram.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sasl-cram.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl-cram.el --- CRAM-MD5 module for the SASL client framework
 
-;; Copyright (C) 2000, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;;	Kenichi OKADA <okada@opaopa.org>
diff -Nru emacs-26.1+1/lisp/net/sasl-digest.el emacs-26.3+1/lisp/net/sasl-digest.el
--- emacs-26.1+1/lisp/net/sasl-digest.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sasl-digest.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl-digest.el --- DIGEST-MD5 module for the SASL client framework
 
-;; Copyright (C) 2000, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;;	Kenichi OKADA <okada@opaopa.org>
diff -Nru emacs-26.1+1/lisp/net/sasl.el emacs-26.3+1/lisp/net/sasl.el
--- emacs-26.1+1/lisp/net/sasl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sasl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl.el --- SASL client framework
 
-;; Copyright (C) 2000, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: SASL
diff -Nru emacs-26.1+1/lisp/net/sasl-ntlm.el emacs-26.3+1/lisp/net/sasl-ntlm.el
--- emacs-26.1+1/lisp/net/sasl-ntlm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sasl-ntlm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl-ntlm.el --- NTLM (NT Lan Manager) module for the SASL client framework
 
-;; Copyright (C) 2000, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Taro Kawagishi <tarok@transpulse.org>
 ;; Keywords: SASL, NTLM
diff -Nru emacs-26.1+1/lisp/net/sasl-scram-rfc.el emacs-26.3+1/lisp/net/sasl-scram-rfc.el
--- emacs-26.1+1/lisp/net/sasl-scram-rfc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sasl-scram-rfc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl-scram-rfc.el --- SCRAM-SHA-1 module for the SASL client framework  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Magnus Henoch <magnus.henoch@gmail.com>
 ;; Package: sasl
diff -Nru emacs-26.1+1/lisp/net/secrets.el emacs-26.3+1/lisp/net/secrets.el
--- emacs-26.1+1/lisp/net/secrets.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/secrets.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; secrets.el --- Client interface to gnome-keyring and kwallet. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm password passphrase
@@ -612,9 +612,9 @@
           (error 'wrong-type-argument (cadr attributes)))
 	(setq props (append
 		     props
-		     (list :dict-entry
-			   (substring (symbol-name (car attributes)) 1)
-			   (cadr attributes)))
+		     `((:dict-entry
+			,(substring (symbol-name (car attributes)) 1)
+			,(cadr attributes))))
 	      attributes (cddr attributes)))
       ;; Search.  The result is a list of object paths.
       (setq result
@@ -650,9 +650,9 @@
             (error 'wrong-type-argument (cadr attributes)))
 	  (setq props (append
 		       props
-		       (list :dict-entry
-			     (substring (symbol-name (car attributes)) 1)
-			     (cadr attributes)))
+		       `((:dict-entry
+			  ,(substring (symbol-name (car attributes)) 1)
+			  ,(cadr attributes))))
 		attributes (cddr attributes)))
 	;; Create the item.
 	(setq result
diff -Nru emacs-26.1+1/lisp/net/shr-color.el emacs-26.3+1/lisp/net/shr-color.el
--- emacs-26.1+1/lisp/net/shr-color.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/shr-color.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shr-color.el --- Simple HTML Renderer color management
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: html
diff -Nru emacs-26.1+1/lisp/net/shr.el emacs-26.3+1/lisp/net/shr.el
--- emacs-26.1+1/lisp/net/shr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/shr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shr.el --- Simple HTML Renderer -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: html
@@ -302,9 +302,9 @@
 
 (defun shr-copy-url (url)
   "Copy the URL under point to the kill ring.
-If IMAGE-URL (the prefix) is non-nil, or there is no link under
-point, but there is an image under point then copy the URL of the
-image under point instead."
+With a prefix argument, or if there is no link under point, but
+there is an image under point then copy the URL of the image
+under point instead."
   (interactive (list (shr-url-at-point current-prefix-arg)))
   (if (not url)
       (message "No URL under point")
diff -Nru emacs-26.1+1/lisp/net/sieve.el emacs-26.3+1/lisp/net/sieve.el
--- emacs-26.1+1/lisp/net/sieve.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sieve.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff -Nru emacs-26.1+1/lisp/net/sieve-manage.el emacs-26.3+1/lisp/net/sieve-manage.el
--- emacs-26.1+1/lisp/net/sieve-manage.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sieve-manage.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sieve-manage.el --- Implementation of the managesieve protocol in elisp
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;;         Albert Krewinkel <tarleb@moltkeplatz.de>
@@ -512,7 +512,8 @@
 
 (defun sieve-manage-parse-capability (str)
   "Parse managesieve capability string `STR'.
-Set variable `sieve-manage-capability' to "
+Return alist of capabilities, suitable for assignment
+to local variable `sieve-manage-capability'."
   (let ((capas (delq nil
                      (mapcar #'split-string-and-unquote
                              (split-string str "\n")))))
diff -Nru emacs-26.1+1/lisp/net/sieve-mode.el emacs-26.3+1/lisp/net/sieve-mode.el
--- emacs-26.1+1/lisp/net/sieve-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/sieve-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff -Nru emacs-26.1+1/lisp/net/snmp-mode.el emacs-26.3+1/lisp/net/snmp-mode.el
--- emacs-26.1+1/lisp/net/snmp-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/snmp-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
-;; Copyright (C) 1995, 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <psmith@BayNetworks.com>
 ;; Keywords: data
diff -Nru emacs-26.1+1/lisp/net/soap-client.el emacs-26.3+1/lisp/net/soap-client.el
--- emacs-26.1+1/lisp/net/soap-client.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/soap-client.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,11 +1,11 @@
 ;;; soap-client.el --- Access SOAP web services       -*- lexical-binding: t -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com>
 ;; Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
 ;; Created: December, 2009
-;; Version: 3.1.3
+;; Version: 3.1.4
 ;; Keywords: soap, web-services, comm, hypermedia
 ;; Package: soap-client
 ;; Homepage: https://github.com/alex-hhh/emacs-soap-client
@@ -685,8 +685,17 @@
         (anyType (soap-decode-any-type node))
         (Array (soap-decode-array node))))))
 
+(defun soap-type-of (element)
+  "Return the type of ELEMENT."
+  ;; Support Emacs < 26 byte-code running in Emacs >= 26 sessions
+  ;; (Bug#31742).
+  (let ((type (type-of element)))
+    (if (eq type 'vector)
+        (aref element 0) ; For Emacs 25 and earlier.
+      type)))
+
 ;; Register methods for `soap-xs-basic-type'
-(let ((tag (aref (make-soap-xs-basic-type) 0)))
+(let ((tag (soap-type-of (make-soap-xs-basic-type))))
   (put tag 'soap-attribute-encoder #'soap-encode-xs-basic-type-attributes)
   (put tag 'soap-encoder #'soap-encode-xs-basic-type)
   (put tag 'soap-decoder #'soap-decode-xs-basic-type))
@@ -915,7 +924,7 @@
     (soap-decode-type type node)))
 
 ;; Register methods for `soap-xs-element'
-(let ((tag (aref (make-soap-xs-element) 0)))
+(let ((tag (soap-type-of (make-soap-xs-element))))
   (put tag 'soap-resolve-references #'soap-resolve-references-for-xs-element)
   (put tag 'soap-attribute-encoder #'soap-encode-xs-element-attributes)
   (put tag 'soap-encoder #'soap-encode-xs-element)
@@ -1011,7 +1020,7 @@
       (setf (soap-xs-attribute-reference attribute)
             (soap-wsdl-get reference wsdl predicate)))))
 
-(put (aref (make-soap-xs-attribute) 0)
+(put (soap-type-of (make-soap-xs-attribute))
      'soap-resolve-references #'soap-resolve-references-for-xs-attribute)
 
 (defun soap-resolve-references-for-xs-attribute-group (attribute-group wsdl)
@@ -1036,7 +1045,7 @@
         (setf (soap-xs-attribute-group-attribute-groups attribute-group)
               (soap-xs-attribute-group-attribute-groups resolved))))))
 
-(put (aref (make-soap-xs-attribute-group) 0)
+(put (soap-type-of (make-soap-xs-attribute-group))
      'soap-resolve-references #'soap-resolve-references-for-xs-attribute-group)
 
 ;;;;; soap-xs-simple-type
@@ -1374,7 +1383,7 @@
       (soap-validate-xs-simple-type value type))))
 
 ;; Register methods for `soap-xs-simple-type'
-(let ((tag (aref (make-soap-xs-simple-type) 0)))
+(let ((tag (soap-type-of (make-soap-xs-simple-type))))
   (put tag 'soap-resolve-references
        #'soap-resolve-references-for-xs-simple-type)
   (put tag 'soap-attribute-encoder #'soap-encode-xs-simple-type-attributes)
@@ -1927,7 +1936,7 @@
             (soap-xs-complex-type-indicator type)))))
 
 ;; Register methods for `soap-xs-complex-type'
-(let ((tag (aref (make-soap-xs-complex-type) 0)))
+(let ((tag (soap-type-of (make-soap-xs-complex-type))))
   (put tag 'soap-resolve-references
        #'soap-resolve-references-for-xs-complex-type)
   (put tag 'soap-attribute-encoder #'soap-encode-xs-complex-type-attributes)
@@ -2147,7 +2156,7 @@
 function depending on the type of the ELEMENT.
 
 If ELEMENT has no resolver function, it is silently ignored."
-  (let ((resolver (get (aref element 0) 'soap-resolve-references)))
+  (let ((resolver (get (soap-type-of element) 'soap-resolve-references)))
     (when resolver
       (funcall resolver element wsdl))))
 
@@ -2272,13 +2281,13 @@
 
 ;; Install resolvers for our types
 (progn
-  (put (aref (make-soap-message) 0) 'soap-resolve-references
+  (put (soap-type-of (make-soap-message)) 'soap-resolve-references
        'soap-resolve-references-for-message)
-  (put (aref (make-soap-operation) 0) 'soap-resolve-references
+  (put (soap-type-of (make-soap-operation)) 'soap-resolve-references
        'soap-resolve-references-for-operation)
-  (put (aref (make-soap-binding) 0) 'soap-resolve-references
+  (put (soap-type-of (make-soap-binding)) 'soap-resolve-references
        'soap-resolve-references-for-binding)
-  (put (aref (make-soap-port) 0) 'soap-resolve-references
+  (put (soap-type-of (make-soap-port)) 'soap-resolve-references
        'soap-resolve-references-for-port))
 
 (defun soap-wsdl-resolve-references (wsdl)
@@ -2685,16 +2694,17 @@
                (cond ((listp type)
                       (catch 'done
                         (dolist (union-member type)
-                          (let* ((decoder (get (aref union-member 0)
+                          (let* ((decoder (get (soap-type-of union-member)
                                                'soap-decoder))
                                  (result (ignore-errors
                                            (funcall decoder
                                                     union-member node))))
                             (when result (throw 'done result))))))
                      (t
-                      (let ((decoder (get (aref type 0) 'soap-decoder)))
+                      (let ((decoder (get (soap-type-of type) 'soap-decoder)))
                         (cl-assert decoder nil
-                                   "no soap-decoder for %s type" (aref type 0))
+                                   "no soap-decoder for %s type"
+                                   (soap-type-of type))
                         (funcall decoder type node))))))))))
 
 (defun soap-decode-any-type (node)
@@ -2878,9 +2888,9 @@
 
 Attributes are inserted in the current buffer at the current
 position."
-  (let ((attribute-encoder (get (aref type 0) 'soap-attribute-encoder)))
+  (let ((attribute-encoder (get (soap-type-of type) 'soap-attribute-encoder)))
     (cl-assert attribute-encoder nil
-               "no soap-attribute-encoder for %s type" (aref type 0))
+               "no soap-attribute-encoder for %s type" (soap-type-of type))
     (funcall attribute-encoder value type)))
 
 (defun soap-encode-value (value type)
@@ -2892,8 +2902,8 @@
 is to be encoded.  This is a generic function which finds an
 encoder function based on TYPE and calls that encoder to do the
 work."
-  (let ((encoder (get (aref type 0) 'soap-encoder)))
-    (cl-assert encoder nil "no soap-encoder for %s type" (aref type 0))
+  (let ((encoder (get (soap-type-of type) 'soap-encoder)))
+    (cl-assert encoder nil "no soap-encoder for %s type" (soap-type-of type))
     (funcall encoder value type))
   (when (soap-element-namespace-tag type)
     (add-to-list 'soap-encoded-namespaces (soap-element-namespace-tag type))))
diff -Nru emacs-26.1+1/lisp/net/soap-inspect.el emacs-26.3+1/lisp/net/soap-inspect.el
--- emacs-26.1+1/lisp/net/soap-inspect.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/soap-inspect.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; soap-inspect.el --- Interactive WSDL inspector    -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com>
 ;; Created: October 2010
@@ -49,10 +49,10 @@
 
 This is a generic function, depending on TYPE a specific function
 will be called."
-  (let ((sample-value (get (aref type 0) 'soap-sample-value)))
+  (let ((sample-value (get (soap-type-of type) 'soap-sample-value)))
     (if sample-value
         (funcall sample-value type)
-      (error "Cannot provide sample value for type %s" (aref type 0)))))
+      (error "Cannot provide sample value for type %s" (soap-type-of type)))))
 
 (defun soap-sample-value-for-xs-basic-type (type)
   "Provide a sample value for TYPE, an xs-basic-type.
@@ -174,31 +174,31 @@
 
 (progn
   ;; Install soap-sample-value methods for our types
-  (put (aref (make-soap-xs-basic-type) 0)
+  (put (soap-type-of (make-soap-xs-basic-type))
        'soap-sample-value
        'soap-sample-value-for-xs-basic-type)
 
-  (put (aref (make-soap-xs-element) 0)
+  (put (soap-type-of (make-soap-xs-element))
        'soap-sample-value
        'soap-sample-value-for-xs-element)
 
-  (put (aref (make-soap-xs-attribute) 0)
+  (put (soap-type-of (make-soap-xs-attribute))
        'soap-sample-value
        'soap-sample-value-for-xs-attribute)
 
-  (put (aref (make-soap-xs-attribute) 0)
+  (put (soap-type-of (make-soap-xs-attribute))
        'soap-sample-value
        'soap-sample-value-for-xs-attribute-group)
 
-  (put (aref (make-soap-xs-simple-type) 0)
+  (put (soap-type-of (make-soap-xs-simple-type))
        'soap-sample-value
        'soap-sample-value-for-xs-simple-type)
 
-  (put (aref (make-soap-xs-complex-type) 0)
+  (put (soap-type-of (make-soap-xs-complex-type))
        'soap-sample-value
        'soap-sample-value-for-xs-complex-type)
 
-  (put (aref (make-soap-message) 0)
+  (put (soap-type-of (make-soap-message))
        'soap-sample-value
        'soap-sample-value-for-message))
 
@@ -222,7 +222,7 @@
 The buffer is populated with information about ELEMENT with links
 to its sub elements.  If ELEMENT is the WSDL document itself, the
 entire WSDL can be inspected."
-  (let ((inspect (get (aref element 0) 'soap-inspect)))
+  (let ((inspect (get (soap-type-of element) 'soap-inspect)))
     (unless inspect
       (error "Soap-inspect: no inspector for element"))
 
@@ -507,39 +507,39 @@
 (progn
   ;; Install the soap-inspect methods for our types
 
-  (put (aref (make-soap-xs-basic-type) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-basic-type)) 'soap-inspect
        'soap-inspect-xs-basic-type)
 
-  (put (aref (make-soap-xs-element) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-element)) 'soap-inspect
        'soap-inspect-xs-element)
 
-  (put (aref (make-soap-xs-simple-type) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-simple-type)) 'soap-inspect
        'soap-inspect-xs-simple-type)
 
-  (put (aref (make-soap-xs-complex-type) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-complex-type)) 'soap-inspect
        'soap-inspect-xs-complex-type)
 
-  (put (aref (make-soap-xs-attribute) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-attribute)) 'soap-inspect
        'soap-inspect-xs-attribute)
 
-  (put (aref (make-soap-xs-attribute-group) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-xs-attribute-group)) 'soap-inspect
        'soap-inspect-xs-attribute-group)
 
-  (put (aref (make-soap-message) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-message)) 'soap-inspect
        'soap-inspect-message)
-  (put (aref (make-soap-operation) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-operation)) 'soap-inspect
        'soap-inspect-operation)
 
-  (put (aref (make-soap-port-type) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-port-type)) 'soap-inspect
        'soap-inspect-port-type)
 
-  (put (aref (make-soap-binding) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-binding)) 'soap-inspect
        'soap-inspect-binding)
 
-  (put (aref (make-soap-port) 0) 'soap-inspect
+  (put (soap-type-of (make-soap-port)) 'soap-inspect
        'soap-inspect-port)
 
-  (put (aref (soap-make-wsdl "origin") 0) 'soap-inspect
+  (put (soap-type-of (soap-make-wsdl "origin")) 'soap-inspect
        'soap-inspect-wsdl))
 
 (provide 'soap-inspect)
diff -Nru emacs-26.1+1/lisp/net/socks.el emacs-26.3+1/lisp/net/socks.el
--- emacs-26.1+1/lisp/net/socks.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/socks.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; socks.el --- A Socks v5 Client for Emacs
 
-;; Copyright (C) 1996-2000, 2002, 2007-2018 Free Software Foundation,
+;; Copyright (C) 1996-2000, 2002, 2007-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: William M. Perry <wmperry@gnu.org>
diff -Nru emacs-26.1+1/lisp/net/starttls.el emacs-26.3+1/lisp/net/starttls.el
--- emacs-26.1+1/lisp/net/starttls.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/starttls.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
diff -Nru emacs-26.1+1/lisp/net/telnet.el emacs-26.3+1/lisp/net/telnet.el
--- emacs-26.1+1/lisp/net/telnet.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/telnet.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2018 Free Software
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: William F. Schelter
diff -Nru emacs-26.1+1/lisp/net/tls.el emacs-26.3+1/lisp/net/tls.el
--- emacs-26.1+1/lisp/net/tls.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tls.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
diff -Nru emacs-26.1+1/lisp/net/tramp-adb.el emacs-26.3+1/lisp/net/tramp-adb.el
--- emacs-26.1+1/lisp/net/tramp-adb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-adb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-adb.el --- Functions for calling Android Debug Bridge from Tramp  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Jürgen Hötzel <juergen@archlinux.org>
 ;; Keywords: comm, processes
@@ -40,8 +40,7 @@
   "Name of the Android Debug Bridge program."
   :group 'tramp
   :version "24.4"
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;;;###tramp-autoload
 (defcustom tramp-adb-connect-if-not-connected nil
@@ -49,8 +48,7 @@
 It is used for TCP/IP devices."
   :group 'tramp
   :version "25.1"
-  :type 'boolean
-  :require 'tramp)
+  :type 'boolean)
 
 ;;;###tramp-autoload
 (defconst tramp-adb-method "adb"
@@ -62,8 +60,7 @@
   "Regexp used as prompt in almquist shell."
   :type 'string
   :version "24.4"
-  :group 'tramp
-  :require 'tramp)
+  :group 'tramp)
 
 (defconst tramp-adb-ls-date-regexp
   "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]"
@@ -284,13 +281,16 @@
 ;; code could be shared?
 (defun tramp-adb-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."
-  (format
-   "%s%s"
+   ;; Preserve trailing "/".
+  (funcall
+   (if (string-equal (file-name-nondirectory filename) "")
+       'file-name-as-directory 'identity)
    (with-parsed-tramp-file-name (expand-file-name filename) nil
      (tramp-make-tramp-file-name
       method user domain host port
       (with-tramp-file-property v localname "file-truename"
-	(let ((result nil))			; result steps in reverse order
+	(let ((result nil)			; result steps in reverse order
+	      (quoted (tramp-compat-file-name-quoted-p localname)))
 	  (tramp-message v 4 "Finding true name for `%s'" filename)
 	  (let* ((steps (split-string localname "/" 'omit))
 		 (localnamedir (tramp-run-real-handler
@@ -362,11 +362,19 @@
 				  (not (string= (substring result -1) "/"))))
 	      (setq result (concat result "/"))))
 
+	  ;; Detect cycle.
+	  (when (and (file-symlink-p filename)
+		     (string-equal result localname))
+	    (tramp-error
+	     v 'file-error
+	     "Apparent cycle of symbolic links for %s" filename))
+	  ;; If the resulting localname looks remote, we must quote it
+	  ;; for security reasons.
+	  (when (or quoted (file-remote-p result))
+	    (let (file-name-handler-alist)
+	      (setq result (tramp-compat-file-name-quote result))))
 	  (tramp-message v 4 "True name of `%s' is `%s'" localname result)
-	  result))))
-
-   ;; Preserve trailing "/".
-   (if (string-equal (file-name-nondirectory filename) "") "/" "")))
+	  result))))))
 
 (defun tramp-adb-handle-file-attributes (filename &optional id-format)
   "Like `file-attributes' for Tramp files."
@@ -689,13 +697,22 @@
 	      (tramp-error v 'file-error "Cannot write: `%s'" filename))
 	  (delete-file tmpfile)))
 
-      (when (or (eq visit t) (stringp visit))
-	(set-visited-file-modtime))
-
       (unless (equal curbuf (current-buffer))
 	(tramp-error
 	 v 'file-error
-	 "Buffer has changed from `%s' to `%s'" curbuf (current-buffer))))))
+	 "Buffer has changed from `%s' to `%s'" curbuf (current-buffer)))
+
+      ;; Set file modification time.
+      (when (or (eq visit t) (stringp visit))
+	(set-visited-file-modtime
+	 (tramp-compat-file-attribute-modification-time
+	  (file-attributes filename))))
+
+      ;; The end.
+      (when (and (null noninteractive)
+		 (or (eq visit t) (null visit) (stringp visit)))
+	(tramp-message v 0 "Wrote %s" filename))
+      (run-hooks 'tramp-handle-write-region-hook))))
 
 (defun tramp-adb-handle-set-file-modes (filename mode)
   "Like `set-file-modes' for Tramp files."
@@ -1046,7 +1063,9 @@
 	    (or (null program) tramp-process-connection-type))
 	   (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
 	   (name1 name)
-	   (i 0))
+	   (i 0)
+	   ;; We do not want to run timers.
+	   timer-list timer-idle-list)
 
       (while (get-process name1)
 	;; NAME must be unique as process name.
diff -Nru emacs-26.1+1/lisp/net/tramp-cache.el emacs-26.3+1/lisp/net/tramp-cache.el
--- emacs-26.1+1/lisp/net/tramp-cache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-cache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-cache.el --- file information caching for Tramp  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2000, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@inanna.danann.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -73,16 +73,14 @@
   :version "24.4"
   :type '(repeat (list (choice :tag "File Name regexp" regexp (const nil))
 		       (choice :tag "        Property" string)
-		       (choice :tag "           Value" sexp)))
-  :require 'tramp)
+		       (choice :tag "           Value" sexp))))
 
 ;;;###tramp-autoload
 (defcustom tramp-persistency-file-name
   (expand-file-name (locate-user-emacs-file "tramp"))
   "File which keeps connection history for Tramp connections."
   :group 'tramp
-  :type 'file
-  :require 'tramp)
+  :type 'file)
 
 (defvar tramp-cache-data-changed nil
   "Whether persistent cache data have been changed.")
diff -Nru emacs-26.1+1/lisp/net/tramp-cmds.el emacs-26.3+1/lisp/net/tramp-cmds.el
--- emacs-26.1+1/lisp/net/tramp-cmds.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-cmds.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-cmds.el --- Interactive commands for Tramp  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -49,7 +49,7 @@
      (unless (string-equal input "")
        (list (intern input)))))
   (when syntax
-    (custom-set-variables `(tramp-syntax ',syntax))))
+    (customize-set-variable 'tramp-syntax syntax)))
 
 (defun tramp-list-tramp-buffers ()
   "Return a list of all Tramp connection buffers."
diff -Nru emacs-26.1+1/lisp/net/tramp-compat.el emacs-26.3+1/lisp/net/tramp-compat.el
--- emacs-26.1+1/lisp/net/tramp-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-compat.el --- Tramp compatibility functions  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
diff -Nru emacs-26.1+1/lisp/net/tramp.el emacs-26.3+1/lisp/net/tramp.el
--- emacs-26.1+1/lisp/net/tramp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp.el --- Transparent Remote Access, Multiple Protocol  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -79,8 +79,7 @@
   "Whether Tramp is enabled.
 If it is set to nil, all remote file names are used literally."
   :group 'tramp
-  :type 'boolean
-  :require 'tramp)
+  :type 'boolean)
 
 (defcustom tramp-verbose 3
   "Verbosity level for Tramp messages.
@@ -98,8 +97,7 @@
  9  test commands
 10  traces (huge)."
   :group 'tramp
-  :type 'integer
-  :require 'tramp)
+  :type 'integer)
 
 (defcustom tramp-backup-directory-alist nil
   "Alist of filename patterns and backup directory names.
@@ -114,8 +112,7 @@
 policy for local files."
   :group 'tramp
   :type '(repeat (cons (regexp :tag "Regexp matching filename")
-		       (directory :tag "Backup directory name")))
-  :require 'tramp)
+		       (directory :tag "Backup directory name"))))
 
 (defcustom tramp-auto-save-directory nil
   "Put auto-save files in this directory, if set.
@@ -123,8 +120,7 @@
 This setting has precedence over `auto-save-file-name-transforms'."
   :group 'tramp
   :type '(choice (const :tag "Use default" nil)
-		 (directory :tag "Auto save directory name"))
-  :require 'tramp)
+		 (directory :tag "Auto save directory name")))
 
 (defcustom tramp-encoding-shell
   (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh")
@@ -148,16 +144,14 @@
 mechanisms in tramp.el which automatically determine the right shell to
 use for the remote host."
   :group 'tramp
-  :type '(file :must-match t)
-  :require 'tramp)
+  :type '(file :must-match t))
 
 (defcustom tramp-encoding-command-switch
   (if (tramp-compat-funcall 'w32-shell-dos-semantics) "/c" "-c")
   "Use this switch together with `tramp-encoding-shell' for local commands.
 See the variable `tramp-encoding-shell' for more information."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 (defcustom tramp-encoding-command-interactive
   (unless (tramp-compat-funcall 'w32-shell-dos-semantics) "-i")
@@ -165,8 +159,7 @@
 See the variable `tramp-encoding-shell' for more information."
   :version "24.1"
   :group 'tramp
-  :type '(choice (const nil) string)
-  :require 'tramp)
+  :type '(choice (const nil) string))
 
 ;;;###tramp-autoload
 (defvar tramp-methods nil
@@ -309,8 +302,7 @@
 See `tramp-methods' for possibilities.
 Also see `tramp-default-method-alist'."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;;;###tramp-autoload
 (defcustom tramp-default-method-alist nil
@@ -328,8 +320,7 @@
   :group 'tramp
   :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
 		       (choice :tag "User regexp" regexp sexp)
-		       (choice :tag "Method name" string (const nil))))
-  :require 'tramp)
+		       (choice :tag "Method name" string (const nil)))))
 
 (defconst tramp-default-method-marker "-"
   "Marker for default method in remote file names.")
@@ -341,15 +332,14 @@
 
 This variable is regarded as obsolete, and will be removed soon."
   :group 'tramp
-  :type '(choice (const nil) string)
-  :require 'tramp)
+  :type '(choice (const nil) string))
 
 ;;;###tramp-autoload
 (defcustom tramp-default-user-alist nil
   "Default user to use for specific method/host pairs.
 This is an alist of items (METHOD HOST USER).  The first matching item
 specifies the user to use for a file name which does not specify a
-user.  METHOD and USER are regular expressions or nil, which is
+user.  METHOD and HOST are regular expressions or nil, which is
 interpreted as a regular expression which always matches.  If no entry
 matches, the variable `tramp-default-user' takes effect.
 
@@ -358,22 +348,20 @@
   :group 'tramp
   :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
 		       (choice :tag "  Host regexp" regexp sexp)
-		       (choice :tag "    User name" string (const nil))))
-  :require 'tramp)
+		       (choice :tag "    User name" string (const nil)))))
 
 (defcustom tramp-default-host (system-name)
   "Default host to use for transferring files.
 Useful for su and sudo methods mostly."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;;;###tramp-autoload
 (defcustom tramp-default-host-alist nil
   "Default host to use for specific method/user pairs.
 This is an alist of items (METHOD USER HOST).  The first matching item
 specifies the host to use for a file name which does not specify a
-host.  METHOD and HOST are regular expressions or nil, which is
+host.  METHOD and USER are regular expressions or nil, which is
 interpreted as a regular expression which always matches.  If no entry
 matches, the variable `tramp-default-host' takes effect.
 
@@ -383,8 +371,7 @@
   :version "24.4"
   :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
 		       (choice :tag "  User regexp" regexp sexp)
-		       (choice :tag "    Host name" string (const nil))))
-  :require 'tramp)
+		       (choice :tag "    Host name" string (const nil)))))
 
 (defcustom tramp-default-proxies-alist nil
   "Route to be followed for specific host/user pairs.
@@ -403,15 +390,13 @@
   :group 'tramp
   :type '(repeat (list (choice :tag "Host regexp" regexp sexp)
 		       (choice :tag "User regexp" regexp sexp)
-		       (choice :tag " Proxy name" string (const nil))))
-  :require 'tramp)
+		       (choice :tag " Proxy name" string (const nil)))))
 
 (defcustom tramp-save-ad-hoc-proxies nil
   "Whether to save ad-hoc proxies persistently."
   :group 'tramp
   :version "24.3"
-  :type 'boolean
-  :require 'tramp)
+  :type 'boolean)
 
 (defcustom tramp-restricted-shell-hosts-alist
   (when (memq system-type '(windows-nt))
@@ -423,8 +408,7 @@
 host runs a registered shell, it shall be added to this list, too."
   :version "24.3"
   :group 'tramp
-  :type '(repeat (regexp :tag "Host regexp"))
-  :require 'tramp)
+  :type '(repeat (regexp :tag "Host regexp")))
 
 ;;;###tramp-autoload
 (defconst tramp-local-host-regexp
@@ -485,16 +469,14 @@
   "String used for end of line in local processes."
   :version "24.1"
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 (defcustom tramp-rsh-end-of-line "\n"
   "String used for end of line in rsh connections.
 I don't think this ever needs to be changed, so please tell me about it
 if you need to change this."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 (defcustom tramp-login-prompt-regexp
   ".*\\(user\\|login\\)\\( .*\\)?: *"
@@ -503,8 +485,7 @@
 
 Sometimes the prompt is reported to look like \"login as:\"."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-shell-prompt-pattern
   ;; Allow a prompt to start right after a ^M since it indeed would be
@@ -526,8 +507,7 @@
 This regexp must match both `tramp-initial-end-of-output' and
 `tramp-end-of-output'."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-password-prompt-regexp
   (format "^.*\\(%s\\).*:\^@? *"
@@ -540,8 +520,7 @@
 The `sudo' program appears to insert a `^@' character into the prompt."
   :version "24.4"
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-wrong-passwd-regexp
   (concat "^.*"
@@ -566,8 +545,7 @@
   "Regexp matching a `login failed' message.
 The regexp should match at end of buffer."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-yesno-prompt-regexp
   (concat
@@ -578,8 +556,7 @@
 The regexp should match at end of buffer.
 See also `tramp-yn-prompt-regexp'."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-yn-prompt-regexp
   (concat
@@ -592,8 +569,7 @@
 The regexp should match at end of buffer.
 See also `tramp-yesno-prompt-regexp'."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-terminal-prompt-regexp
   (concat "\\("
@@ -605,8 +581,7 @@
 The regexp should match at end of buffer.
 The answer will be provided by `tramp-action-terminal', which see."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-operation-not-permitted-regexp
   (concat "\\(" "preserving times.*" "\\|" "set mode" "\\)" ":\\s-*"
@@ -615,8 +590,7 @@
 Copying has been performed successfully already, so this message can
 be ignored safely."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-copy-failed-regexp
   (concat "\\(.+: "
@@ -628,8 +602,7 @@
           "\\)\\s-*")
   "Regular expression matching copy problems in (s)cp operations."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defcustom tramp-process-alive-regexp
   ""
@@ -639,8 +612,7 @@
 The answer will be provided by `tramp-action-process-alive',
 `tramp-action-out-of-band', which see."
   :group 'tramp
-  :type 'regexp
-  :require 'tramp)
+  :type 'regexp)
 
 (defconst tramp-temp-name-prefix "tramp."
   "Prefix to use for temporary files.
@@ -1127,8 +1099,7 @@
 Please raise a bug report via \"M-x tramp-bug\" if your system needs
 this variable to be set as well."
   :group 'tramp
-  :type '(choice (const nil) integer)
-  :require 'tramp)
+  :type '(choice (const nil) integer))
 
 ;; Logging in to a remote host normally requires obtaining a pty.  But
 ;; Emacs on macOS has process-connection-type set to nil by default,
@@ -1139,8 +1110,7 @@
 Tramp binds `process-connection-type' to the value given here before
 opening a connection to a remote host."
   :group 'tramp
-  :type '(choice (const nil) (const t) (const pty))
-  :require 'tramp)
+  :type '(choice (const nil) (const t) (const pty)))
 
 (defcustom tramp-connection-timeout 60
   "Defines the max time to wait for establishing a connection (in seconds).
@@ -1149,8 +1119,7 @@
 The timeout does not include the time reading a password."
   :group 'tramp
   :version "24.4"
-  :type 'integer
-  :require 'tramp)
+  :type 'integer)
 
 (defcustom tramp-connection-min-time-diff 5
   "Defines seconds between two consecutive connection attempts.
@@ -1164,8 +1133,7 @@
 let-bind this variable."
   :group 'tramp
   :version "24.4"
-  :type '(choice (const nil) integer)
-  :require 'tramp)
+  :type '(choice (const nil) integer))
 
 (defcustom tramp-completion-reread-directory-timeout 10
   "Defines seconds since last remote command before rereading a directory.
@@ -1177,8 +1145,7 @@
 would require an immediate reread during filename completion, nil
 means to use always cached values for the directory contents."
   :group 'tramp
-  :type '(choice (const nil) (const t) integer)
-  :require 'tramp)
+  :type '(choice (const nil) (const t) integer))
 
 ;;; Internal Variables:
 
@@ -1353,11 +1320,13 @@
       tramp-default-host))
 
 (defun tramp-dissect-file-name (name &optional nodefault)
-  "Return a `tramp-file-name' structure.
-The structure consists of remote method, remote user, remote host,
-localname (file name on remote host) and hop.  If NODEFAULT is
-non-nil, the file name parts are not expanded to their default
-values."
+  "Return a `tramp-file-name' structure of NAME, a remote file name.
+The structure consists of method, user, domain, host, port,
+localname (file name on remote host), and hop.
+
+Unless NODEFAULT is non-nil, method, user and host are expanded
+to their default values. For the other file name parts, no
+default values are used."
   (save-match-data
     (unless (tramp-tramp-file-p name)
       (tramp-compat-user-error nil "Not a Tramp file name: \"%s\"" name))
@@ -1405,9 +1374,12 @@
     (method user domain host port localname &optional hop)
   "Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME.
 When not nil, optional DOMAIN, PORT and HOP are used."
+  ;; Unless `tramp-syntax' is `simplified', we need a method.
+  (when (and (not (zerop (length tramp-postfix-method-format)))
+             (zerop (length method)))
+    (signal 'wrong-type-argument (list 'stringp method)))
   (concat tramp-prefix-format hop
-	  (unless (or (zerop (length method))
-                      (zerop (length tramp-postfix-method-format)))
+	  (unless (zerop (length tramp-postfix-method-format))
 	    (concat method tramp-postfix-method-format))
 	  user
 	  (unless (zerop (length domain))
@@ -1614,10 +1586,11 @@
     ;; The message.
     (insert (apply #'format-message fmt-string arguments))))
 
-(defvar tramp-message-show-message t
+(defvar tramp-message-show-message (null noninteractive)
   "Show Tramp message in the minibuffer.
-This variable is used to disable messages from `tramp-error'.
-The messages are visible anyway, because an error is raised.")
+This variable is used to suppress progress reporter output, and
+to disable messages from `tramp-error'.  Those messages are
+visible anyway, because an error is raised.")
 
 (defsubst tramp-message (vec-or-proc level fmt-string &rest arguments)
   "Emit a message depending on verbosity level.
@@ -1921,7 +1894,6 @@
    ;; The method related defaults.
    (cdr (assoc method tramp-completion-function-alist))))
 
-
 ;;; Fontification of `read-file-name':
 
 (defvar tramp-rfn-eshadow-overlay)
@@ -1931,11 +1903,11 @@
   "Set up a minibuffer for `file-name-shadow-mode'.
 Adds another overlay hiding filename parts according to Tramp's
 special handling of `substitute-in-file-name'."
-  (when (symbol-value 'minibuffer-completing-file-name)
+  (when minibuffer-completing-file-name
     (setq tramp-rfn-eshadow-overlay
 	  (make-overlay (minibuffer-prompt-end) (minibuffer-prompt-end)))
     ;; Copy rfn-eshadow-overlay properties.
-    (let ((props (overlay-properties (symbol-value 'rfn-eshadow-overlay))))
+    (let ((props (overlay-properties rfn-eshadow-overlay)))
       (while props
  	;; The `field' property prevents correct minibuffer
  	;; completion; we exclude it.
@@ -1953,6 +1925,13 @@
 (defun tramp-rfn-eshadow-update-overlay-regexp ()
   (format "[^%s/~]*\\(/\\|~\\)" tramp-postfix-host-format))
 
+;; Package rfn-eshadow is preloaded in Emacs, but for some reason,
+;; it only did (defvar rfn-eshadow-overlay) without giving it a global
+;; value, so it was only declared as dynamically-scoped within the
+;; rfn-eshadow.el file.  This is now fixed in Emacs>26.1 but we still need
+;; this defvar here for older releases.
+(defvar rfn-eshadow-overlay)
+
 (defun tramp-rfn-eshadow-update-overlay ()
   "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input.
 This is intended to be used as a minibuffer `post-command-hook' for
@@ -1960,13 +1939,11 @@
 been set up by `rfn-eshadow-setup-minibuffer'."
   ;; In remote files name, there is a shadowing just for the local part.
   (ignore-errors
-    (let ((end (or (overlay-end (symbol-value 'rfn-eshadow-overlay))
+    (let ((end (or (overlay-end rfn-eshadow-overlay)
 		   (minibuffer-prompt-end)))
 	  ;; We do not want to send any remote command.
 	  (non-essential t))
-      (when
-	  (tramp-tramp-file-p
-	   (buffer-substring-no-properties end (point-max)))
+      (when (tramp-tramp-file-p (buffer-substring end (point-max)))
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region
@@ -2764,7 +2741,9 @@
    "Return a (user host) tuple allowed to access.
 User is always nil."
    (tramp-parse-group
-    (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)") 1 ","))
+    (concat "\\(?:^[ \t]*Host\\)" "\\|" "\\(?:^.+\\)"
+	    "\\|" "\\(" tramp-host-regexp "\\)")
+    1 "[ \t]+"))
 
 ;; Generic function.
 (defun tramp-parse-shostkeys-sknownhosts (dirname regexp)
@@ -3182,17 +3161,18 @@
 
 (defun tramp-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."
-  (let ((result (expand-file-name filename))
-	(numchase 0)
-	;; Don't make the following value larger than
-	;; necessary.  People expect an error message in a
-	;; timely fashion when something is wrong;
-	;; otherwise they might think that Emacs is hung.
-	;; Of course, correctness has to come first.
-	(numchase-limit 20)
-	symlink-target)
-    (format
-     "%s%s"
+  ;; Preserve trailing "/".
+  (funcall
+   (if (string-equal (file-name-nondirectory filename) "")
+       'file-name-as-directory 'identity)
+   (let ((result (expand-file-name filename))
+	 (numchase 0)
+	 ;; Don't make the following value larger than necessary.
+	 ;; People expect an error message in a timely fashion when
+	 ;; something is wrong; otherwise they might think that Emacs
+	 ;; is hung.  Of course, correctness has to come first.
+	 (numchase-limit 20)
+	 symlink-target)
      (with-parsed-tramp-file-name result v1
        (with-tramp-file-property v1 v1-localname "file-truename"
 	 (while (and (setq symlink-target (file-symlink-p result))
@@ -3217,10 +3197,7 @@
 	     (tramp-error
 	      v1 'file-error
 	      "Maximum number (%d) of symlinks exceeded" numchase-limit)))
-	 (directory-file-name result)))
-
-     ;; Preserve trailing "/".
-     (if (string-equal (file-name-nondirectory filename) "") "/" ""))))
+	 (directory-file-name result))))))
 
 (defun tramp-handle-find-backup-file-name (filename)
   "Like `find-backup-file-name' for Tramp files."
@@ -3823,7 +3800,9 @@
 This is needed in order to hide `last-coding-system-used', which is set
 for process communication also."
   (with-current-buffer (process-buffer proc)
-    (let (buffer-read-only last-coding-system-used)
+    (let (buffer-read-only last-coding-system-used
+	  ;; We do not want to run timers.
+	  timer-list timer-idle-list)
       ;; Under Windows XP, `accept-process-output' doesn't return
       ;; sometimes.  So we add an additional timeout.  JUST-THIS-ONE
       ;; is set due to Bug#12145.  It is an integer, in order to avoid
@@ -4601,10 +4580,11 @@
 	       (or
 		;; When `tramp-own-remote-path' is in `tramp-remote-path',
 		;; the remote path is only set in the session cache.
+                ;; Use `path-separator' as it does eshell.
 		(tramp-get-connection-property
 		 (tramp-get-connection-process v) "remote-path" nil)
 		(tramp-get-connection-property v "remote-path" nil))
-	       ":"))
+	       path-separator))
 	  (getenv "PATH"))))
 
 (eval-after-load "esh-util"
@@ -4645,8 +4625,6 @@
 ;;   strange when doing zerop, we should kill the process and start
 ;;   again.  (Greg Stark)
 ;;
-;; * Make shadowfile.el grok Tramp filenames.  (Bug#4526, Bug#4846)
-;;
 ;; * I was wondering if it would be possible to use tramp even if I'm
 ;;   actually using sshfs.  But when I launch a command I would like
 ;;   to get it executed on the remote machine where the files really
diff -Nru emacs-26.1+1/lisp/net/tramp-ftp.el emacs-26.3+1/lisp/net/tramp-ftp.el
--- emacs-26.1+1/lisp/net/tramp-ftp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-ftp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
diff -Nru emacs-26.1+1/lisp/net/tramp-gvfs.el emacs-26.3+1/lisp/net/tramp-gvfs.el
--- emacs-26.1+1/lisp/net/tramp-gvfs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-gvfs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-gvfs.el --- Tramp access functions for GVFS daemon  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -69,7 +69,7 @@
 ;;   'car
 ;;   (dbus-call-method
 ;;    :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
-;;    tramp-gvfs-interface-mounttracker "listMountableInfo")))
+;;    tramp-gvfs-interface-mounttracker "ListMountableInfo")))
 
 ;; Note that all other connection methods are not tested, beside the
 ;; ones offered for customization in `tramp-gvfs-methods'.  If you
@@ -122,8 +122,7 @@
 			 (const "obex")
 			 (const "sftp")
 			 (const "smb")
-			 (const "synce")))
-  :require 'tramp)
+			 (const "synce"))))
 
 ;; Add defaults for `tramp-default-user-alist' and `tramp-default-host-alist'.
 ;;;###tramp-autoload
@@ -141,8 +140,7 @@
   "Zeroconf domain to be used for discovering services, like host names."
   :group 'tramp
   :version "23.2"
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;; Add the methods to `tramp-methods', in order to allow minibuffer
 ;; completion.
@@ -393,8 +391,7 @@
 devices."
   :group 'tramp
   :version "23.2"
-  :type '(choice (const nil) integer)
-  :require 'tramp)
+  :type '(choice (const nil) integer))
 
 (defvar tramp-bluez-discovery nil
   "Indicator for a running bluetooth device discovery.
@@ -1270,7 +1267,8 @@
 	(file-attributes filename))))
 
     ;; The end.
-    (when (or (eq visit t) (null visit) (stringp visit))
+    (when (and (null noninteractive)
+	       (or (eq visit t) (null visit) (stringp visit)))
       (tramp-message v 0 "Wrote %s" filename))
     (run-hooks 'tramp-handle-write-region-hook)))
 
diff -Nru emacs-26.1+1/lisp/net/tramp-sh.el emacs-26.3+1/lisp/net/tramp-sh.el
--- emacs-26.1+1/lisp/net/tramp-sh.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-sh.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-sh.el --- Tramp access functions for (s)sh-like connections  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; (copyright statements below in code to be updated with the above notice)
 
@@ -41,14 +41,15 @@
 (defvar vc-hg-program)
 
 ;;;###tramp-autoload
-(defcustom tramp-inline-compress-start-size 4096
+(defcustom tramp-inline-compress-start-size
+  (unless (memq system-type '(windows-nt)) 4096)
   "The minimum size of compressing where inline transfer.
 When inline transfer, compress transferred data of file
 whose size is this value or above (up to `tramp-copy-size-limit').
 If it is nil, no compression at all will be applied."
   :group 'tramp
-  :type '(choice (const nil) integer)
-  :require 'tramp)
+  :version "26.3"
+  :type '(choice (const nil) integer))
 
 ;;;###tramp-autoload
 (defcustom tramp-copy-size-limit 10240
@@ -56,8 +57,7 @@
 out-of-the-band copy.
 If it is nil, out-of-the-band copy will be used without a check."
   :group 'tramp
-  :type '(choice (const nil) integer)
-  :require 'tramp)
+  :type '(choice (const nil) integer))
 
 ;;;###tramp-autoload
 (defcustom tramp-terminal-type "dumb"
@@ -66,8 +66,7 @@
 confused by ANSI color escape sequences and suchlike.  Often, shell init
 files conditionalize this setup based on the TERM environment variable."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;;;###tramp-autoload
 (defcustom tramp-histfile-override "~/.tramp_history"
@@ -84,8 +83,7 @@
   :version "25.2"
   :type '(choice (const :tag "Do not override HISTFILE" nil)
                  (const :tag "Unset HISTFILE" t)
-                 (string :tag "Redirect to a file"))
-  :require 'tramp)
+                 (string :tag "Redirect to a file")))
 
 ;;;###tramp-autoload
 (defconst tramp-display-escape-sequence-regexp "\e[[;0-9]+m"
@@ -119,8 +117,7 @@
   "Whether to use `tramp-ssh-controlmaster-options'."
   :group 'tramp
   :version "24.4"
-  :type 'boolean
-  :require 'tramp)
+  :type 'boolean)
 
 (defvar tramp-ssh-controlmaster-options nil
   "Which ssh Control* arguments to use.
@@ -528,8 +525,7 @@
   :type '(repeat (choice
 		  (const :tag "Default Directories" tramp-default-remote-path)
 		  (const :tag "Private Directories" tramp-own-remote-path)
-		  (string :tag "Directory")))
-  :require 'tramp)
+		  (string :tag "Directory"))))
 
 ;;;###tramp-autoload
 (defcustom tramp-remote-process-environment
@@ -550,11 +546,10 @@
 The TERM environment variable should be set via `tramp-terminal-type'.
 
 The INSIDE_EMACS environment variable will automatically be set
-based on the TRAMP and Emacs versions, and should not be set here."
+based on the Tramp and Emacs versions, and should not be set here."
   :group 'tramp
   :version "26.1"
-  :type '(repeat string)
-  :require 'tramp)
+  :type '(repeat string))
 
 ;;;###tramp-autoload
 (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
@@ -567,8 +562,7 @@
 for tilde expansion.  The extra arguments should typically prevent the
 shell from reading its init file."
   :group 'tramp
-  :type '(alist :key-type regexp :value-type string)
-  :require 'tramp)
+  :type '(alist :key-type regexp :value-type string))
 
 (defconst tramp-actions-before-shell
   '((tramp-login-prompt-regexp tramp-action-login)
@@ -798,7 +792,7 @@
 (defconst tramp-perl-encode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -836,7 +830,7 @@
 (defconst tramp-perl-decode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -1126,8 +1120,10 @@
 
 (defun tramp-sh-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."
-  (format
-   "%s%s"
+   ;; Preserve trailing "/".
+  (funcall
+   (if (string-equal (file-name-nondirectory filename) "")
+       'file-name-as-directory 'identity)
    (with-parsed-tramp-file-name (expand-file-name filename) nil
      (tramp-make-tramp-file-name
       method user domain host port
@@ -1231,10 +1227,7 @@
 	    (let (file-name-handler-alist)
 	      (setq result (tramp-compat-file-name-quote result))))
 	  (tramp-message v 4 "True name of `%s' is `%s'" localname result)
-	  result))))
-
-   ;; Preserve trailing "/".
-   (if (string-equal (file-name-nondirectory filename) "") "/" "")))
+	  result))))))
 
 ;; Basic functions.
 
@@ -2046,7 +2039,9 @@
   (unless (memq op '(copy rename))
     (error "Unknown operation `%s', must be `copy' or `rename'" op))
 
-  (if (file-directory-p filename)
+  (if (and
+       (file-directory-p filename)
+       (not (tramp-equal-remote filename newname)))
       (progn
 	(copy-directory filename newname keep-date t)
 	(when (eq op 'rename) (delete-directory filename 'recursive)))
@@ -2206,6 +2201,8 @@
 	     (localname2 (if t2 (file-remote-p newname 'localname) newname))
 	     (prefix (file-remote-p (if t1 filename newname)))
              cmd-result)
+	(when (and (eq op 'copy) (file-directory-p filename))
+	  (setq cmd (concat cmd " -R")))
 
 	(cond
 	 ;; Both files are on a remote host, with same user.
@@ -2481,7 +2478,9 @@
 	      ;; The default directory must be remote.
 	      (let ((default-directory
 		      (file-name-directory (if t1 filename newname)))
-		    (process-environment (copy-sequence process-environment)))
+		    (process-environment (copy-sequence process-environment))
+		    ;; We do not want to run timers.
+		    timer-list timer-idle-list)
 		;; Set the transfer process properties.
 		(tramp-set-connection-property
 		 v "process-name" (buffer-name (current-buffer)))
@@ -2908,7 +2907,9 @@
 	   ;; We do not want to raise an error when
 	   ;; `start-file-process' has been started several times in
 	   ;; `eshell' and friends.
-	   (tramp-current-connection nil)
+	   tramp-current-connection
+	   ;; We do not want to run timers.
+	   timer-list timer-idle-list
 	   p)
 
       (while (get-process name1)
@@ -3420,7 +3421,8 @@
 	;; Set the ownership.
         (when need-chown
           (tramp-set-file-uid-gid filename uid gid))
-	(when (or (eq visit t) (null visit) (stringp visit))
+	(when (and (null noninteractive)
+		   (or (eq visit t) (null visit) (stringp visit)))
 	  (tramp-message v 0 "Wrote %s" filename))
 	(run-hooks 'tramp-handle-write-region-hook)))))
 
@@ -4103,7 +4105,10 @@
     (with-current-buffer (process-buffer proc)
       ;; Use MULE to select the right EOL convention for communicating
       ;; with the process.
-      (let ((cs (or (and (memq 'utf-8 (coding-system-list))
+      (let ((cs (or (and (memq 'utf-8-hfs (coding-system-list))
+			 (string-match "^Darwin" uname)
+			 (cons 'utf-8-hfs 'utf-8-hfs))
+		    (and (memq 'utf-8 (coding-system-list))
 			 (string-match "utf-?8" (tramp-get-remote-locale vec))
 			 (cons 'utf-8 'utf-8))
 		    (process-coding-system proc)
@@ -4115,16 +4120,11 @@
 	      cs-encode
 	      (coding-system-change-eol-conversion
 	       cs-encode (if (string-match "^Darwin" uname) 'mac 'unix)))
-	(tramp-send-command vec "echo foo ; echo bar" t)
+	(tramp-send-command vec "(echo foo ; echo bar)" t)
 	(goto-char (point-min))
 	(when (search-forward "\r" nil t)
 	  (setq cs-decode (coding-system-change-eol-conversion cs-decode 'dos)))
-	;; Special setting for macOS.
-	(when (and (string-match "^Darwin" uname)
-		   (memq 'utf-8-hfs (coding-system-list)))
-	  (setq cs-decode 'utf-8-hfs
-		cs-encode 'utf-8-hfs))
-	(set-buffer-process-coding-system cs-decode cs-encode)
+	(set-process-coding-system proc cs-decode cs-encode)
 	(tramp-message
 	 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
 
@@ -4438,7 +4438,8 @@
     (if (stringp output) (concat " >" output) ""))))
 
 (defconst tramp-inline-compress-commands
-  '(("gzip" "gzip -d")
+  '(;; Suppress warnings about obsolete environment variable GZIP.
+    ("env GZIP= gzip" "env GZIP= gzip -d")
     ("bzip2" "bzip2 -d")
     ("xz" "xz -d")
     ("compress" "compress -d"))
@@ -4470,13 +4471,14 @@
 	      (zerop
 	       (tramp-call-local-coding-command
 		(format
+		 "echo %s | %s | %s" magic
 		 ;; Windows shells need the program file name after
 		 ;; the pipe symbol be quoted if they use forward
 		 ;; slashes as directory separators.
-		 (if (memq system-type '(windows-nt))
-		     "echo %s | \"%s\" | \"%s\""
-		   "echo %s | %s | %s")
-		 magic compress decompress)
+		 (mapconcat
+		  'shell-quote-argument (split-string compress) " ")
+		 (mapconcat
+		  'shell-quote-argument (split-string decompress) " "))
 		nil nil))
 	    (throw 'next nil))
 	  (tramp-message
diff -Nru emacs-26.1+1/lisp/net/tramp-smb.el emacs-26.3+1/lisp/net/tramp-smb.el
--- emacs-26.1+1/lisp/net/tramp-smb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-smb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-smb.el --- Tramp access functions for SMB servers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -66,16 +66,14 @@
 (defcustom tramp-smb-program "smbclient"
   "Name of SMB client to run."
   :group 'tramp
-  :type 'string
-  :require 'tramp)
+  :type 'string)
 
 ;;;###tramp-autoload
 (defcustom tramp-smb-acl-program "smbcacls"
   "Name of SMB acls to run."
   :group 'tramp
   :type 'string
-  :version "24.4"
-  :require 'tramp)
+  :version "24.4")
 
 ;;;###tramp-autoload
 (defcustom tramp-smb-conf "/dev/null"
@@ -83,8 +81,7 @@
 If it is nil, no smb.conf will be added to the `tramp-smb-program'
 call, letting the SMB client use the default one."
   :group 'tramp
-  :type '(choice (const nil) (file :must-match t))
-  :require 'tramp)
+  :type '(choice (const nil) (file :must-match t)))
 
 (defvar tramp-smb-version nil
   "Version string of the SMB client.")
@@ -151,6 +148,7 @@
 	 "NT_STATUS_OBJECT_NAME_NOT_FOUND"
 	 "NT_STATUS_OBJECT_PATH_SYNTAX_BAD"
 	 "NT_STATUS_PASSWORD_MUST_CHANGE"
+	 "NT_STATUS_RESOURCE_NAME_NOT_FOUND"
 	 "NT_STATUS_SHARING_VIOLATION"
 	 "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
 	 "NT_STATUS_UNSUCCESSFUL"
@@ -295,8 +293,7 @@
 shall be given.  This is needed for remote processes."
   :group 'tramp
   :type 'string
-  :version "24.3"
-  :require 'tramp)
+  :version "24.3")
 
 ;;;###tramp-autoload
 (defcustom tramp-smb-winexe-shell-command "powershell.exe"
@@ -304,8 +301,7 @@
 This must be Powershell V2 compatible."
   :group 'tramp
   :type 'string
-  :version "24.3"
-  :require 'tramp)
+  :version "24.3")
 
 ;;;###tramp-autoload
 (defcustom tramp-smb-winexe-shell-command-switch "-file -"
@@ -313,8 +309,7 @@
 This can be used to disable echo etc."
   :group 'tramp
   :type 'string
-  :version "24.3"
-  :require 'tramp)
+  :version "24.3")
 
 ;; It must be a `defsubst' in order to push the whole code into
 ;; tramp-loaddefs.el.  Otherwise, there would be recursive autoloading.
@@ -464,7 +459,9 @@
 			       (expand-file-name
 				tramp-temp-name-prefix
 				(tramp-compat-temporary-file-directory))))
-		   (args      (list (concat "//" host "/" share) "-E")))
+		   (args      (list (concat "//" host "/" share) "-E"))
+		   ;; We do not want to run timers.
+		   timer-list timer-idle-list)
 
 	      (if (not (zerop (length user)))
 		  (setq args (append args (list "-U" user)))
@@ -645,7 +642,12 @@
 	  (goto-char (point-min))
 	  (search-forward-regexp tramp-smb-errors nil t)
 	  (tramp-error
-	   v 'file-error "%s `%s'" (match-string 0) directory))))))
+	   v 'file-error "%s `%s'" (match-string 0) directory)))
+
+      ;; "rmdir" does not report an error.  So we check ourselves.
+      (when (file-exists-p directory)
+	(tramp-error
+	 v 'file-error "`%s' not removed." directory)))))
 
 (defun tramp-smb-handle-delete-file (filename &optional _trash)
   "Like `delete-file' for Tramp files."
@@ -752,7 +754,9 @@
 	(let* ((share     (tramp-smb-get-share v))
 	       (localname (replace-regexp-in-string
 			   "\\\\" "/" (tramp-smb-get-localname v)))
-	       (args      (list (concat "//" host "/" share) "-E")))
+		 (args      (list (concat "//" host "/" share) "-E"))
+		 ;; We do not want to run timers.
+		 timer-list timer-idle-list)
 
 	  (if (not (zerop (length user)))
 	      (setq args (append args (list "-U" user)))
@@ -1235,6 +1239,8 @@
     (let* ((name (file-name-nondirectory program))
 	   (name1 name)
 	   (i 0)
+	   ;; We do not want to run timers.
+	   timer-list timer-idle-list
 	   input tmpinput outbuf command ret)
 
       ;; Determine input.
@@ -1417,7 +1423,9 @@
 			   "\\\\" "/" (tramp-smb-get-localname v)))
 	       (args      (list (concat "//" host "/" share) "-E" "-S"
 				(replace-regexp-in-string
-				 "\n" "," acl-string))))
+				 "\n" "," acl-string)))
+	       ;; We do not want to run timers.
+	       timer-list timer-idle-list)
 
 	  (if (not (zerop (length user)))
 	      (setq args (append args (list "-U" user)))
@@ -1497,7 +1505,9 @@
 	   (command (mapconcat 'identity (cons program args) " "))
 	   (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
 	   (name1 name)
-	   (i 0))
+	   (i 0)
+	   ;; We do not want to run timers.
+	   timer-list timer-idle-list)
       (unwind-protect
 	  (save-excursion
 	    (save-restriction
@@ -1589,9 +1599,18 @@
 	(tramp-error
 	 v 'file-error
 	 "Buffer has changed from `%s' to `%s'" curbuf (current-buffer)))
-      (when (eq visit t)
-	(set-visited-file-modtime)))))
 
+      ;; Set file modification time.
+      (when (or (eq visit t) (stringp visit))
+	(set-visited-file-modtime
+	 (tramp-compat-file-attribute-modification-time
+	  (file-attributes filename))))
+
+      ;; The end.
+      (when (and (null noninteractive)
+		 (or (eq visit t) (null visit) (stringp visit)))
+	(tramp-message v 0 "Wrote %s" filename))
+      (run-hooks 'tramp-handle-write-region-hook))))
 
 ;; Internal file name functions.
 
diff -Nru emacs-26.1+1/lisp/net/tramp-uu.el emacs-26.3+1/lisp/net/tramp-uu.el
--- emacs-26.1+1/lisp/net/tramp-uu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/tramp-uu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-uu.el --- uuencode in Lisp  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
diff -Nru emacs-26.1+1/lisp/net/trampver.el emacs-26.3+1/lisp/net/trampver.el
--- emacs-26.1+1/lisp/net/trampver.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/trampver.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,13 +1,13 @@
 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol  -*- lexical-binding:t -*-
 ;;; lisp/trampver.el.  Generated from trampver.el.in by configure.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.3.3.26.1
+;; Version: 2.3.5.26.3
 
 ;; This file is part of GNU Emacs.
 
@@ -33,7 +33,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.3.3.26.1"
+(defconst tramp-version "2.3.5.26.3"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -55,12 +55,16 @@
 ;; Check for Emacs version.
 (let ((x (if (>= emacs-major-version 24)
     "ok"
-  (format "Tramp 2.3.3.26.1 is not fit for %s"
+  (format "Tramp 2.3.5.26.3 is not fit for %s"
 	  (when (string-match "^.*$" (emacs-version))
 	    (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
-;; Tramp versions integrated into Emacs.
+;; Tramp versions integrated into Emacs.  If a user option declares a
+;; `:package-version' which doesn't belong to an integrated Tramp
+;; version, it must be added here as well (see `tramp-syntax', for
+;; example).  This can be checked by something like
+;; (customize-changed "26.1")
 (add-to-list
  'customize-package-emacs-version-alist
  '(Tramp ("2.0.55" . "22.1") ("2.0.57" . "22.2") ("2.0.58-pre" . "22.3")
@@ -70,7 +74,8 @@
 	 ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
 	 ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
 	 ("2.2.13.25.2" . "25.3")
-	 ("2.3.3.26.1" . "26.1")))
+         ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")
+         ("2.3.5.26.3" . "26.3")))
 
 (add-hook 'tramp-unload-hook
 	  (lambda ()
diff -Nru emacs-26.1+1/lisp/net/webjump.el emacs-26.3+1/lisp/net/webjump.el
--- emacs-26.1+1/lisp/net/webjump.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/webjump.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; webjump.el --- programmable Web hotlist
 
-;; Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:    Neil W. Van Dyke <nwv@acm.org>
 ;; Created:   09-Aug-1996
diff -Nru emacs-26.1+1/lisp/net/zeroconf.el emacs-26.3+1/lisp/net/zeroconf.el
--- emacs-26.1+1/lisp/net/zeroconf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/net/zeroconf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; zeroconf.el --- Service browser using Avahi.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hardware
diff -Nru emacs-26.1+1/lisp/newcomment.el emacs-26.3+1/lisp/newcomment.el
--- emacs-26.1+1/lisp/newcomment.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/newcomment.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newcomment.el --- (un)comment regions of buffers -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -319,11 +319,11 @@
 (defcustom comment-empty-lines nil
   "If nil, `comment-region' does not comment out empty lines.
 If t, it always comments out empty lines.
-If `eol' it only comments out empty lines if comments are
-terminated by the end of line (i.e. `comment-end' is empty)."
+If `eol', it only comments out empty lines if comments are
+terminated by the end of line (i.e., `comment-end' is empty)."
   :type '(choice (const :tag "Never" nil)
-	  (const :tag "Always" t)
-	  (const :tag "EOl-terminated" eol))
+                 (const :tag "Always" t)
+                 (const :tag "EOL-terminated" eol))
   :group 'comment)
 
 ;;;;
@@ -887,7 +887,7 @@
 (defun uncomment-region (beg end &optional arg)
   "Uncomment each line in the BEG .. END region.
 The numeric prefix ARG can specify a number of chars to remove from the
-comment markers."
+comment delimiters."
   (interactive "*r\nP")
   (comment-normalize-vars)
   (when (> beg end) (setq beg (prog1 end (setq end beg))))
@@ -901,7 +901,8 @@
 (defun uncomment-region-default (beg end &optional arg)
   "Uncomment each line in the BEG .. END region.
 The numeric prefix ARG can specify a number of chars to remove from the
-comment markers."
+comment delimiters.
+This function is the default value of `uncomment-region-function'."
   (goto-char beg)
   (setq end (copy-marker end))
   (let* ((numarg (prefix-numeric-value arg))
diff -Nru emacs-26.1+1/lisp/notifications.el emacs-26.3+1/lisp/notifications.el
--- emacs-26.1+1/lisp/notifications.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/notifications.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; notifications.el --- Client interface to desktop notifications.
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: comm desktop notifications
diff -Nru emacs-26.1+1/lisp/novice.el emacs-26.3+1/lisp/novice.el
--- emacs-26.1+1/lisp/novice.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/novice.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985-1987, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1987, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/nxml/nxml-enc.el emacs-26.3+1/lisp/nxml/nxml-enc.el
--- emacs-26.1+1/lisp/nxml/nxml-enc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-enc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-enc.el --- XML encoding auto-detection  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/nxml-maint.el emacs-26.3+1/lisp/nxml/nxml-maint.el
--- emacs-26.1+1/lisp/nxml/nxml-maint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-maint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-maint.el --- commands for maintainers of nxml-*.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/nxml-mode.el emacs-26.3+1/lisp/nxml/nxml-mode.el
--- emacs-26.1+1/lisp/nxml/nxml-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-mode.el --- a new XML mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
@@ -2378,7 +2378,9 @@
 (put 'nxml-char-ref 'evaporate t)
 
 (defun nxml-char-ref-display-extra (start end n)
-  (when nxml-char-ref-extra-display
+  (when (and ;; Displaying literal newline is unhelpful.
+         (not (eql n ?\n))
+         nxml-char-ref-extra-display)
     (let ((name (or (get-char-code-property n 'name)
                     (get-char-code-property n 'old-name)))
 	  (glyph-string (and nxml-char-ref-display-glyph-flag
diff -Nru emacs-26.1+1/lisp/nxml/nxml-ns.el emacs-26.3+1/lisp/nxml/nxml-ns.el
--- emacs-26.1+1/lisp/nxml/nxml-ns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-ns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-ns.el --- XML namespace processing  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/nxml-outln.el emacs-26.3+1/lisp/nxml/nxml-outln.el
--- emacs-26.1+1/lisp/nxml/nxml-outln.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-outln.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-outln.el --- outline support for nXML mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/nxml-parse.el emacs-26.3+1/lisp/nxml/nxml-parse.el
--- emacs-26.1+1/lisp/nxml/nxml-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-parse.el --- XML parser, sharing infrastructure with nxml-mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/nxml-rap.el emacs-26.3+1/lisp/nxml/nxml-rap.el
--- emacs-26.1+1/lisp/nxml/nxml-rap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-rap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-rap.el --- low-level support for random access parsing for nXML mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
@@ -35,35 +35,25 @@
 ;;
 ;; Our strategy is to keep track of just the problematic things.
 ;; Specifically, we keep track of all comments, CDATA sections and
-;; processing instructions in the instance.  We do this by marking all
-;; except the first character of these with a non-nil nxml-inside text
-;; property. The value of the nxml-inside property is comment,
-;; cdata-section or processing-instruction.  The first character does
-;; not have the nxml-inside property so we can find the beginning of
-;; the construct by looking for a change in a text property value
-;; (Emacs provides primitives for this).  We use text properties
-;; rather than overlays, since the implementation of overlays doesn't
-;; look like it scales to large numbers of overlays in a buffer.
-;;
-;; We don't in fact track all these constructs, but only track them in
-;; some initial part of the instance.
+;; processing instructions in the instance.  We do this by marking
+;; the first character of these with the generic string syntax by setting
+;; a 'syntax-table' text property in `sgml-syntax-propertize'.
 ;;
 ;; Thus to parse some random point in the file we first ensure that we
-;; have scanned up to that point.  Then we search backwards for a
-;; <. Then we check whether the < has an nxml-inside property. If it
-;; does we go backwards to first character that does not have an
-;; nxml-inside property (this character must be a <).  Then we start
-;; parsing forward from the < we have found.
+;; have scanned up to that point.  Then we search backwards for a <.
+;; Then we check whether the < has the generic string syntax.  If it
+;; does we go backwards to first character of the generic string (this
+;; character must be a <).  Then we start parsing forward from the <
+;; we have found.
 ;;
 ;; The prolog has to be parsed specially, so we also keep track of the
 ;; end of the prolog in `nxml-prolog-end'. The prolog is reparsed on
 ;; every change to the prolog.  This won't work well if people try to
 ;; edit huge internal subsets. Hopefully that will be rare.
 ;;
-;; We keep track of the changes by adding to the buffer's
-;; after-change-functions hook.  Scanning is also done as a
-;; prerequisite to fontification by adding to fontification-functions
-;; (in the same way as jit-lock).  This means that scanning for these
+;; We rely on the `syntax-propertize-function' machinery to keep track
+;; of the changes in the buffer.  Fontification also relies on correct
+;; `syntax-table' properties.  This means that scanning for these
 ;; constructs had better be quick.  Fortunately it is. Firstly, the
 ;; typical proportion of comments, CDATA sections and processing
 ;; instructions is small relative to other things.  Secondly, to scan
@@ -79,7 +69,15 @@
   "Integer giving position following end of the prolog.")
 
 (defsubst nxml-get-inside (pos)
-  (save-excursion (nth 8 (syntax-ppss pos))))
+  "Return non-nil if inside comment, CDATA, or PI."
+  (let ((ppss (save-excursion (syntax-ppss pos))))
+    (or
+     ;; Inside comment.
+     (nth 4 ppss)
+     ;; Inside "generic" string which is used for CDATA, and PI.
+     ;; "Normal" double and single quoted strings are used for
+     ;; attribute values.
+     (eq t (nth 3 ppss)))))
 
 (defun nxml-inside-end (pos)
   "Return the end of the inside region containing POS.
diff -Nru emacs-26.1+1/lisp/nxml/nxml-util.el emacs-26.3+1/lisp/nxml/nxml-util.el
--- emacs-26.1+1/lisp/nxml/nxml-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/nxml-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nxml-util.el --- utility functions for nxml-*.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/rng-cmpct.el emacs-26.3+1/lisp/nxml/rng-cmpct.el
--- emacs-26.1+1/lisp/nxml/rng-cmpct.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-cmpct.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-cmpct.el --- parsing of RELAX NG Compact Syntax schemas  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-dt.el emacs-26.3+1/lisp/nxml/rng-dt.el
--- emacs-26.1+1/lisp/nxml/rng-dt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-dt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-dt.el --- datatype library interface for RELAX NG  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-loc.el emacs-26.3+1/lisp/nxml/rng-loc.el
--- emacs-26.1+1/lisp/nxml/rng-loc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-loc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-loc.el --- Locate the schema to use for validation  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-maint.el emacs-26.3+1/lisp/nxml/rng-maint.el
--- emacs-26.1+1/lisp/nxml/rng-maint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-maint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-maint.el --- commands for RELAX NG maintainers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-match.el emacs-26.3+1/lisp/nxml/rng-match.el
--- emacs-26.1+1/lisp/nxml/rng-match.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-match.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-match.el --- matching of RELAX NG patterns against XML events  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-nxml.el emacs-26.3+1/lisp/nxml/rng-nxml.el
--- emacs-26.1+1/lisp/nxml/rng-nxml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-nxml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-nxml.el --- make nxml-mode take advantage of rng-validate-mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-parse.el emacs-26.3+1/lisp/nxml/rng-parse.el
--- emacs-26.1+1/lisp/nxml/rng-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-parse.el --- parse an XML file and validate it against a schema  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-pttrn.el emacs-26.3+1/lisp/nxml/rng-pttrn.el
--- emacs-26.1+1/lisp/nxml/rng-pttrn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-pttrn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-pttrn.el --- RELAX NG patterns  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-uri.el emacs-26.3+1/lisp/nxml/rng-uri.el
--- emacs-26.1+1/lisp/nxml/rng-uri.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-uri.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-uri.el --- URI parsing and manipulation  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/rng-util.el emacs-26.3+1/lisp/nxml/rng-util.el
--- emacs-26.1+1/lisp/nxml/rng-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-util.el --- utility functions for RELAX NG library
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-valid.el emacs-26.3+1/lisp/nxml/rng-valid.el
--- emacs-26.1+1/lisp/nxml/rng-valid.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-valid.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-valid.el --- real-time validation of XML using RELAX NG  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/rng-xsd.el emacs-26.3+1/lisp/nxml/rng-xsd.el
--- emacs-26.1+1/lisp/nxml/rng-xsd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/rng-xsd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rng-xsd.el --- W3C XML Schema datatypes library for RELAX NG  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, RelaxNG
diff -Nru emacs-26.1+1/lisp/nxml/xmltok.el emacs-26.3+1/lisp/nxml/xmltok.el
--- emacs-26.1+1/lisp/nxml/xmltok.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/xmltok.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xmltok.el --- XML tokenization  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML
diff -Nru emacs-26.1+1/lisp/nxml/xsd-regexp.el emacs-26.3+1/lisp/nxml/xsd-regexp.el
--- emacs-26.1+1/lisp/nxml/xsd-regexp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/nxml/xsd-regexp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xsd-regexp.el --- translate W3C XML Schema regexps to Emacs regexps  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: wp, hypermedia, languages, XML, regexp
diff -Nru emacs-26.1+1/lisp/obarray.el emacs-26.3+1/lisp/obarray.el
--- emacs-26.1+1/lisp/obarray.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obarray.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; obarray.el --- obarray functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: obarray functions
diff -Nru emacs-26.1+1/lisp/obsolete/abbrevlist.el emacs-26.3+1/lisp/obsolete/abbrevlist.el
--- emacs-26.1+1/lisp/obsolete/abbrevlist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/abbrevlist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; abbrevlist.el --- list one abbrev table alphabetically ordered
 
-;; Copyright (C) 1986, 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992, 2001-2019 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/assoc.el emacs-26.3+1/lisp/obsolete/assoc.el
--- emacs-26.1+1/lisp/obsolete/assoc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/assoc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; assoc.el --- insert/delete functions on association lists  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Keywords: extensions
diff -Nru emacs-26.1+1/lisp/obsolete/bruce.el emacs-26.3+1/lisp/obsolete/bruce.el
--- emacs-26.1+1/lisp/obsolete/bruce.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/bruce.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; bruce.el --- bruce phrase utility for overloading the Communications
 ;;; Decency Act snoops, if any.
 
-;; Copyright (C) 1988, 1993, 1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1993, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/cc-compat.el emacs-26.3+1/lisp/obsolete/cc-compat.el
--- emacs-26.1+1/lisp/obsolete/cc-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/cc-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;	       1994-1999 Barry A. Warsaw
diff -Nru emacs-26.1+1/lisp/obsolete/cl-compat.el emacs-26.3+1/lisp/obsolete/cl-compat.el
--- emacs-26.1+1/lisp/obsolete/cl-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/cl-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility)
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
diff -Nru emacs-26.1+1/lisp/obsolete/complete.el emacs-26.3+1/lisp/obsolete/complete.el
--- emacs-26.1+1/lisp/obsolete/complete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/complete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; complete.el --- partial completion mechanism plus other goodies
 
-;; Copyright (C) 1990-1993, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: abbrev convenience
diff -Nru emacs-26.1+1/lisp/obsolete/crisp.el emacs-26.3+1/lisp/obsolete/crisp.el
--- emacs-26.1+1/lisp/obsolete/crisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/crisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
-;; Copyright (C) 1997-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp
diff -Nru emacs-26.1+1/lisp/obsolete/cust-print.el emacs-26.3+1/lisp/obsolete/cust-print.el
--- emacs-26.1+1/lisp/obsolete/cust-print.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/cust-print.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cust-print.el --- handles print-level and print-circle
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Adapted-By: ESR
diff -Nru emacs-26.1+1/lisp/obsolete/erc-hecomplete.el emacs-26.3+1/lisp/obsolete/erc-hecomplete.el
--- emacs-26.1+1/lisp/obsolete/erc-hecomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/erc-hecomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-hecomplete.el --- Provides Nick name completion for ERC
 
-;; Copyright (C) 2001-2002, 2004, 2006-2018 Free Software Foundation,
+;; Copyright (C) 2001-2002, 2004, 2006-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
diff -Nru emacs-26.1+1/lisp/obsolete/eudcb-ph.el emacs-26.3+1/lisp/obsolete/eudcb-ph.el
--- emacs-26.1+1/lisp/obsolete/eudcb-ph.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/eudcb-ph.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
diff -Nru emacs-26.1+1/lisp/obsolete/fast-lock.el emacs-26.3+1/lisp/obsolete/fast-lock.el
--- emacs-26.1+1/lisp/obsolete/fast-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/fast-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode
 
-;; Copyright (C) 1994-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/gs.el emacs-26.3+1/lisp/obsolete/gs.el
--- emacs-26.1+1/lisp/obsolete/gs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/gs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gs.el --- interface to Ghostscript
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/obsolete/gulp.el emacs-26.3+1/lisp/obsolete/gulp.el
--- emacs-26.1+1/lisp/obsolete/gulp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/gulp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gulp.el --- ask for updates for Lisp packages
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/html2text.el emacs-26.3+1/lisp/obsolete/html2text.el
--- emacs-26.1+1/lisp/obsolete/html2text.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/html2text.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; html2text.el --- a simple html to plain text converter -*- coding: utf-8 -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Joakim Hove <hove@phys.ntnu.no>
 ;; Obsolete-since: 26.1
diff -Nru emacs-26.1+1/lisp/obsolete/iswitchb.el emacs-26.3+1/lisp/obsolete/iswitchb.el
--- emacs-26.1+1/lisp/obsolete/iswitchb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/iswitchb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; iswitchb.el --- switch between buffers using substrings
 
-;; Copyright (C) 1996-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff -Nru emacs-26.1+1/lisp/obsolete/landmark.el emacs-26.3+1/lisp/obsolete/landmark.el
--- emacs-26.1+1/lisp/obsolete/landmark.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/landmark.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,8 +1,8 @@
 ;;; landmark.el --- Neural-network robot that learns landmarks  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2019 Free Software Foundation, Inc.
 
-;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
+;; Author: Terrence Brannon <metaperl@gmail.com>
 ;; Created: December 16, 1996 - first release to usenet
 ;; Keywords: games, neural network, adaptive search, chemotaxis
 ;; Version: 1.0
@@ -36,7 +36,7 @@
 ;; the smell of the tree increases, then the weights in the robot's
 ;; brain are adjusted to encourage this odor-driven behavior in the
 ;; future. If the smell of the tree decreases, the robots weights are
-;; adjusted to discourage a correct move.
+;; adjusted to discourage that odor-driven behavior.
 
 ;; In laymen's terms, the search space is initially flat. The point
 ;; of training is to "turn up the edges of the search space" so that
@@ -53,6 +53,13 @@
 ;; a single move, one moves east,west and south, then both east and
 ;; west will be improved when they shouldn't
 
+;; The source code was developed as part of a course on Brain Theory
+;; and Neural Networks at the University of Southern California. The
+;; original problem description and solution appeared in 1981 in the
+;; paper "Landmark Learning: An Illustration of Associative
+;; Search" authored by Andrew G. Barto and Richard S. Sutton and
+;; published to Biological Cybernetics.
+
 ;; Many thanks to Yuri Pryadkin <yuri@rana.usc.edu> for this
 ;; concise problem description.
 
diff -Nru emacs-26.1+1/lisp/obsolete/lazy-lock.el emacs-26.3+1/lisp/obsolete/lazy-lock.el
--- emacs-26.1+1/lisp/obsolete/lazy-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/lazy-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode
 
-;; Copyright (C) 1994-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/ledit.el emacs-26.3+1/lisp/obsolete/ledit.el
--- emacs-26.1+1/lisp/obsolete/ledit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/ledit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ledit.el --- Emacs side of ledit interface
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: languages
diff -Nru emacs-26.1+1/lisp/obsolete/levents.el emacs-26.3+1/lisp/obsolete/levents.el
--- emacs-26.1+1/lisp/obsolete/levents.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/levents.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; levents.el --- emulate the Lucid event data type and associated functions
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
diff -Nru emacs-26.1+1/lisp/obsolete/lmenu.el emacs-26.3+1/lisp/obsolete/lmenu.el
--- emacs-26.1+1/lisp/obsolete/lmenu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/lmenu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lmenu.el --- emulate Lucid's menubar support
 
-;; Copyright (C) 1992-1994, 1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992-1994, 1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Keywords: emulations obsolete
diff -Nru emacs-26.1+1/lisp/obsolete/longlines.el emacs-26.3+1/lisp/obsolete/longlines.el
--- emacs-26.1+1/lisp/obsolete/longlines.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/longlines.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; longlines.el --- automatically wrap long lines   -*- coding:utf-8 -*-
 
-;; Copyright (C) 2000-2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
diff -Nru emacs-26.1+1/lisp/obsolete/lucid.el emacs-26.3+1/lisp/obsolete/lucid.el
--- emacs-26.1+1/lisp/obsolete/lucid.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/lucid.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lucid.el --- emulate some Lucid Emacs functions
 
-;; Copyright (C) 1993, 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
diff -Nru emacs-26.1+1/lisp/obsolete/messcompat.el emacs-26.3+1/lisp/obsolete/messcompat.el
--- emacs-26.1+1/lisp/obsolete/messcompat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/messcompat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; messcompat.el --- making message mode compatible with mail mode
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
diff -Nru emacs-26.1+1/lisp/obsolete/mouse-sel.el emacs-26.3+1/lisp/obsolete/mouse-sel.el
--- emacs-26.1+1/lisp/obsolete/mouse-sel.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/mouse-sel.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mouse-sel.el --- multi-click selection support
 
-;; Copyright (C) 1993-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
diff -Nru emacs-26.1+1/lisp/obsolete/old-emacs-lock.el emacs-26.3+1/lisp/obsolete/old-emacs-lock.el
--- emacs-26.1+1/lisp/obsolete/old-emacs-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/old-emacs-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
 
-;; Copyright (C) 1994, 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94
diff -Nru emacs-26.1+1/lisp/obsolete/old-whitespace.el emacs-26.3+1/lisp/obsolete/old-whitespace.el
--- emacs-26.1+1/lisp/obsolete/old-whitespace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/old-whitespace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; whitespace.el --- warn about and clean bogus whitespaces in the file
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
 ;; Keywords: convenience
diff -Nru emacs-26.1+1/lisp/obsolete/options.el emacs-26.3+1/lisp/obsolete/options.el
--- emacs-26.1+1/lisp/obsolete/options.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/options.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; options.el --- edit Options command for Emacs
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Obsolete-since: 22.1
diff -Nru emacs-26.1+1/lisp/obsolete/otodo-mode.el emacs-26.3+1/lisp/obsolete/otodo-mode.el
--- emacs-26.1+1/lisp/obsolete/otodo-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/otodo-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; todo-mode.el --- major mode for editing TODO list files
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <privat@os10000.net>
 ;; Maintainer: Stephen Berman <stephen.berman@gmx.net>
diff -Nru emacs-26.1+1/lisp/obsolete/pc-mode.el emacs-26.3+1/lisp/obsolete/pc-mode.el
--- emacs-26.1+1/lisp/obsolete/pc-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pc-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pc-mode.el --- emulate certain key bindings used on PCs
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: emulations
diff -Nru emacs-26.1+1/lisp/obsolete/pc-select.el emacs-26.3+1/lisp/obsolete/pc-select.el
--- emacs-26.1+1/lisp/obsolete/pc-select.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pc-select.el	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 ;;;		     (or MAC GUI or MS-windoze (bah)) look-and-feel
 ;;;		     including key bindings.
 
-;; Copyright (C) 1995-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE>
 ;; Keywords: convenience emulations
diff -Nru emacs-26.1+1/lisp/obsolete/pgg-def.el emacs-26.3+1/lisp/obsolete/pgg-def.el
--- emacs-26.1+1/lisp/obsolete/pgg-def.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg-def.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
-;; Copyright (C) 1999, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff -Nru emacs-26.1+1/lisp/obsolete/pgg.el emacs-26.3+1/lisp/obsolete/pgg.el
--- emacs-26.1+1/lisp/obsolete/pgg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg.el --- glue for the various PGP implementations.
 
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
diff -Nru emacs-26.1+1/lisp/obsolete/pgg-gpg.el emacs-26.3+1/lisp/obsolete/pgg-gpg.el
--- emacs-26.1+1/lisp/obsolete/pgg-gpg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg-gpg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption and gpg-agent support added by:
diff -Nru emacs-26.1+1/lisp/obsolete/pgg-parse.el emacs-26.3+1/lisp/obsolete/pgg-parse.el
--- emacs-26.1+1/lisp/obsolete/pgg-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg-parse.el --- OpenPGP packet parsing
 
-;; Copyright (C) 1999, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
diff -Nru emacs-26.1+1/lisp/obsolete/pgg-pgp5.el emacs-26.3+1/lisp/obsolete/pgg-pgp5.el
--- emacs-26.1+1/lisp/obsolete/pgg-pgp5.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg-pgp5.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg-pgp5.el --- PGP 5.* support for PGG.
 
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff -Nru emacs-26.1+1/lisp/obsolete/pgg-pgp.el emacs-26.3+1/lisp/obsolete/pgg-pgp.el
--- emacs-26.1+1/lisp/obsolete/pgg-pgp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/pgg-pgp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
 
-;; Copyright (C) 1999-2000, 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff -Nru emacs-26.1+1/lisp/obsolete/rcompile.el emacs-26.3+1/lisp/obsolete/rcompile.el
--- emacs-26.1+1/lisp/obsolete/rcompile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/rcompile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rcompile.el --- run a compilation on a remote machine
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Alon Albert <alon@milcse.rtsg.mot.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/sregex.el emacs-26.3+1/lisp/obsolete/sregex.el
--- emacs-26.1+1/lisp/obsolete/sregex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/sregex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sregex.el --- symbolic regular expressions
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/s-region.el emacs-26.3+1/lisp/obsolete/s-region.el
--- emacs-26.1+1/lisp/obsolete/s-region.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/s-region.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; s-region.el --- set region using shift key
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/obsolete/sup-mouse.el emacs-26.3+1/lisp/obsolete/sup-mouse.el
--- emacs-26.1+1/lisp/obsolete/sup-mouse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/sup-mouse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
-;; Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/obsolete/terminal.el emacs-26.3+1/lisp/obsolete/terminal.el
--- emacs-26.1+1/lisp/obsolete/terminal.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/terminal.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs
 
-;; Copyright (C) 1986-1989, 1993-1994, 2001-2018 Free Software
+;; Copyright (C) 1986-1989, 1993-1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
diff -Nru emacs-26.1+1/lisp/obsolete/tpu-edt.el emacs-26.3+1/lisp/obsolete/tpu-edt.el
--- emacs-26.1+1/lisp/obsolete/tpu-edt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/tpu-edt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
-;; Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff -Nru emacs-26.1+1/lisp/obsolete/tpu-extras.el emacs-26.3+1/lisp/obsolete/tpu-extras.el
--- emacs-26.1+1/lisp/obsolete/tpu-extras.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/tpu-extras.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
 
-;; Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff -Nru emacs-26.1+1/lisp/obsolete/tpu-mapper.el emacs-26.3+1/lisp/obsolete/tpu-mapper.el
--- emacs-26.1+1/lisp/obsolete/tpu-mapper.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/tpu-mapper.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
 
-;; Copyright (C) 1993-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff -Nru emacs-26.1+1/lisp/obsolete/vc-arch.el emacs-26.3+1/lisp/obsolete/vc-arch.el
--- emacs-26.1+1/lisp/obsolete/vc-arch.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/vc-arch.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-arch.el --- VC backend for the Arch version-control system  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
diff -Nru emacs-26.1+1/lisp/obsolete/vi.el emacs-26.3+1/lisp/obsolete/vi.el
--- emacs-26.1+1/lisp/obsolete/vi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/vi.el	2019-09-10 00:32:49.000000000 +0000
@@ -132,7 +132,7 @@
   (define-key vi-com-map "\C-e" 'vi-expose-line-below)
   (define-key vi-com-map "\C-f" 'vi-forward-windowful)
   (define-key vi-com-map "\C-g" 'keyboard-quit)
-  (define-key vi-com-map "\C-i" 'indent-relative-maybe) ; TAB
+  (define-key vi-com-map "\C-i" 'indent-relative-first-indent-point) ; TAB
   (define-key vi-com-map "\C-j" 'vi-next-line) ; LFD
   (define-key vi-com-map "\C-k" 'vi-kill-line) ; extension
   (define-key vi-com-map "\C-l" 'recenter)
diff -Nru emacs-26.1+1/lisp/obsolete/vip.el emacs-26.3+1/lisp/obsolete/vip.el
--- emacs-26.1+1/lisp/obsolete/vip.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/vip.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vip.el --- a VI Package for GNU Emacs
 
-;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2018 Free Software
+;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Masahiko Sato <ms@sail.stanford.edu>
diff -Nru emacs-26.1+1/lisp/obsolete/ws-mode.el emacs-26.3+1/lisp/obsolete/ws-mode.el
--- emacs-26.1+1/lisp/obsolete/ws-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/ws-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
-;; Copyright (C) 1991, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
 ;; Version: 0.7
diff -Nru emacs-26.1+1/lisp/obsolete/xesam.el emacs-26.3+1/lisp/obsolete/xesam.el
--- emacs-26.1+1/lisp/obsolete/xesam.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/xesam.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xesam.el --- Xesam interface to search engines.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: tools, hypermedia
diff -Nru emacs-26.1+1/lisp/obsolete/yow.el emacs-26.3+1/lisp/obsolete/yow.el
--- emacs-26.1+1/lisp/obsolete/yow.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/obsolete/yow.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; yow.el --- quote random zippyisms
 
-;; Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Author: Richard Mlynarik
diff -Nru emacs-26.1+1/lisp/org/ChangeLog.1 emacs-26.3+1/lisp/org/ChangeLog.1
--- emacs-26.1+1/lisp/org/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -32833,7 +32833,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-	Copyright (C) 2008-2018 Free Software Foundation, Inc.
+	Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/org/ob-abc.el emacs-26.3+1/lisp/org/ob-abc.el
--- emacs-26.1+1/lisp/org/ob-abc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-abc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-abc.el --- Org Babel Functions for ABC -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: William Waites
 ;; Keywords: literate programming, music
diff -Nru emacs-26.1+1/lisp/org/ob-asymptote.el emacs-26.3+1/lisp/org/ob-asymptote.el
--- emacs-26.1+1/lisp/org/ob-asymptote.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-asymptote.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-asymptote.el --- Babel Functions for Asymptote -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-awk.el emacs-26.3+1/lisp/org/ob-awk.el
--- emacs-26.1+1/lisp/org/ob-awk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-awk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-awk.el --- Babel Functions for Awk            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-calc.el emacs-26.3+1/lisp/org/ob-calc.el
--- emacs-26.1+1/lisp/org/ob-calc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-calc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-calc.el --- Babel Functions for Calc          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-C.el emacs-26.3+1/lisp/org/ob-C.el
--- emacs-26.1+1/lisp/org/ob-C.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-C.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-C.el --- Babel Functions for C and Similar Languages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;;      Thierry Banel
diff -Nru emacs-26.1+1/lisp/org/ob-clojure.el emacs-26.3+1/lisp/org/ob-clojure.el
--- emacs-26.1+1/lisp/org/ob-clojure.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-clojure.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-clojure.el --- Babel Functions for Clojure    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson
 ;;
diff -Nru emacs-26.1+1/lisp/org/ob-comint.el emacs-26.3+1/lisp/org/ob-comint.el
--- emacs-26.1+1/lisp/org/ob-comint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-comint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-comint.el --- Babel Functions for Interaction with Comint Buffers -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
diff -Nru emacs-26.1+1/lisp/org/ob-coq.el emacs-26.3+1/lisp/org/ob-coq.el
--- emacs-26.1+1/lisp/org/ob-coq.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-coq.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-coq.el --- Babel Functions for Coq            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-core.el emacs-26.3+1/lisp/org/ob-core.el
--- emacs-26.1+1/lisp/org/ob-core.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-core.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-core.el --- Working with Code Blocks          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-css.el emacs-26.3+1/lisp/org/ob-css.el
--- emacs-26.1+1/lisp/org/ob-css.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-css.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-css.el --- Babel Functions for CSS            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-ditaa.el emacs-26.3+1/lisp/org/ob-ditaa.el
--- emacs-26.1+1/lisp/org/ob-ditaa.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ditaa.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ditaa.el --- Babel Functions for ditaa        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-dot.el emacs-26.3+1/lisp/org/ob-dot.el
--- emacs-26.1+1/lisp/org/ob-dot.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-dot.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-dot.el --- Babel Functions for dot            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-ebnf.el emacs-26.3+1/lisp/org/ob-ebnf.el
--- emacs-26.1+1/lisp/org/ob-ebnf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ebnf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ebnf.el --- Babel Functions for EBNF          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Gauland
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob.el emacs-26.3+1/lisp/org/ob.el
--- emacs-26.1+1/lisp/org/ob.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob.el --- Working with Code Blocks in Org        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-emacs-lisp.el emacs-26.3+1/lisp/org/ob-emacs-lisp.el
--- emacs-26.1+1/lisp/org/ob-emacs-lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-emacs-lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-emacs-lisp.el --- Babel Functions for Emacs-lisp Code -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-eval.el emacs-26.3+1/lisp/org/ob-eval.el
--- emacs-26.1+1/lisp/org/ob-eval.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-eval.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-eval.el --- Babel Functions for External Code Evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
diff -Nru emacs-26.1+1/lisp/org/ob-exp.el emacs-26.3+1/lisp/org/ob-exp.el
--- emacs-26.1+1/lisp/org/ob-exp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-exp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-forth.el emacs-26.3+1/lisp/org/ob-forth.el
--- emacs-26.1+1/lisp/org/ob-forth.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-forth.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-forth.el --- Babel Functions for Forth        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, forth
diff -Nru emacs-26.1+1/lisp/org/ob-fortran.el emacs-26.3+1/lisp/org/ob-fortran.el
--- emacs-26.1+1/lisp/org/ob-fortran.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-fortran.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-fortran.el --- Babel Functions for Fortran    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Authors: Sergey Litvinov
 ;;       Eric Schulte
diff -Nru emacs-26.1+1/lisp/org/ob-gnuplot.el emacs-26.3+1/lisp/org/ob-gnuplot.el
--- emacs-26.1+1/lisp/org/ob-gnuplot.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-gnuplot.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-gnuplot.el --- Babel Functions for Gnuplot    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-groovy.el emacs-26.3+1/lisp/org/ob-groovy.el
--- emacs-26.1+1/lisp/org/ob-groovy.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-groovy.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-groovy.el --- Babel Functions for Groovy      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Miro Bezjak
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-haskell.el emacs-26.3+1/lisp/org/ob-haskell.el
--- emacs-26.1+1/lisp/org/ob-haskell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-haskell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-haskell.el --- Babel Functions for Haskell    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-hledger.el emacs-26.3+1/lisp/org/ob-hledger.el
--- emacs-26.1+1/lisp/org/ob-hledger.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-hledger.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;  ob-hledger.el --- Babel Functions for hledger      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Michael
 ;; Keywords: literate programming, reproducible research, plain text accounting
diff -Nru emacs-26.1+1/lisp/org/ob-io.el emacs-26.3+1/lisp/org/ob-io.el
--- emacs-26.1+1/lisp/org/ob-io.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-io.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-io.el --- Babel Functions for Io              -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Andrzej Lichnerowicz
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-java.el emacs-26.3+1/lisp/org/ob-java.el
--- emacs-26.1+1/lisp/org/ob-java.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-java.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-java.el --- Babel Functions for Java          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-J.el emacs-26.3+1/lisp/org/ob-J.el
--- emacs-26.1+1/lisp/org/ob-J.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-J.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-J.el --- Babel Functions for J                -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-js.el emacs-26.3+1/lisp/org/ob-js.el
--- emacs-26.1+1/lisp/org/ob-js.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-js.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-js.el --- Babel Functions for Javascript      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
diff -Nru emacs-26.1+1/lisp/org/ob-keys.el emacs-26.3+1/lisp/org/ob-keys.el
--- emacs-26.1+1/lisp/org/ob-keys.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-keys.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-keys.el --- Key Bindings for Babel            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-latex.el emacs-26.3+1/lisp/org/ob-latex.el
--- emacs-26.1+1/lisp/org/ob-latex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-latex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-latex.el --- Babel Functions for LaTeX        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-ledger.el emacs-26.3+1/lisp/org/ob-ledger.el
--- emacs-26.1+1/lisp/org/ob-ledger.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ledger.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ledger.el --- Babel Functions for Ledger      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
diff -Nru emacs-26.1+1/lisp/org/ob-lilypond.el emacs-26.3+1/lisp/org/ob-lilypond.el
--- emacs-26.1+1/lisp/org/ob-lilypond.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-lilypond.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- Babel Functions for Lilypond  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
diff -Nru emacs-26.1+1/lisp/org/ob-lisp.el emacs-26.3+1/lisp/org/ob-lisp.el
--- emacs-26.1+1/lisp/org/ob-lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-lisp.el --- Babel Functions for Common Lisp   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Joel Boehland
 ;;	 Eric Schulte
diff -Nru emacs-26.1+1/lisp/org/ob-lob.el emacs-26.3+1/lisp/org/ob-lob.el
--- emacs-26.1+1/lisp/org/ob-lob.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-lob.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-lob.el --- Functions Supporting the Library of Babel -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-lua.el emacs-26.3+1/lisp/org/ob-lua.el
--- emacs-26.1+1/lisp/org/ob-lua.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-lua.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2016-2019 Free Software Foundation, Inc.
 
 ;; Authors: Dieter Schoen
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-makefile.el emacs-26.3+1/lisp/org/ob-makefile.el
--- emacs-26.1+1/lisp/org/ob-makefile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-makefile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-makefile.el --- Babel Functions for Makefile  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; 	   Thomas S. Dye
diff -Nru emacs-26.1+1/lisp/org/ob-matlab.el emacs-26.3+1/lisp/org/ob-matlab.el
--- emacs-26.1+1/lisp/org/ob-matlab.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-matlab.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-matlab.el --- Babel support for Matlab        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-maxima.el emacs-26.3+1/lisp/org/ob-maxima.el
--- emacs-26.1+1/lisp/org/ob-maxima.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-maxima.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-maxima.el --- Babel Functions for Maxima      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;;	Eric Schulte
diff -Nru emacs-26.1+1/lisp/org/ob-mscgen.el emacs-26.3+1/lisp/org/ob-mscgen.el
--- emacs-26.1+1/lisp/org/ob-mscgen.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-mscgen.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-msc.el --- Babel Functions for Mscgen         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-ocaml.el emacs-26.3+1/lisp/org/ob-ocaml.el
--- emacs-26.1+1/lisp/org/ob-ocaml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ocaml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ocaml.el --- Babel Functions for Ocaml        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-octave.el emacs-26.3+1/lisp/org/ob-octave.el
--- emacs-26.1+1/lisp/org/ob-octave.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-octave.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-octave.el --- Babel Functions for Octave and Matlab -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-org.el emacs-26.3+1/lisp/org/ob-org.el
--- emacs-26.1+1/lisp/org/ob-org.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-org.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-org.el --- Babel Functions for Org Code Blocks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-perl.el emacs-26.3+1/lisp/org/ob-perl.el
--- emacs-26.1+1/lisp/org/ob-perl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-perl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-perl.el --- Babel Functions for Perl          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Dan Davison
 ;;	 Eric Schulte
diff -Nru emacs-26.1+1/lisp/org/ob-picolisp.el emacs-26.3+1/lisp/org/ob-picolisp.el
--- emacs-26.1+1/lisp/org/ob-picolisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-picolisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-picolisp.el --- Babel Functions for Picolisp  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Thorsten Jolitz
 ;;	 Eric Schulte
diff -Nru emacs-26.1+1/lisp/org/ob-plantuml.el emacs-26.3+1/lisp/org/ob-plantuml.el
--- emacs-26.1+1/lisp/org/ob-plantuml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-plantuml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-plantuml.el --- Babel Functions for Plantuml  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-processing.el emacs-26.3+1/lisp/org/ob-processing.el
--- emacs-26.1+1/lisp/org/ob-processing.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-processing.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-processing.el --- Babel functions for processing -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-python.el emacs-26.3+1/lisp/org/ob-python.el
--- emacs-26.1+1/lisp/org/ob-python.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-python.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-python.el --- Babel Functions for Python      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-ref.el emacs-26.3+1/lisp/org/ob-ref.el
--- emacs-26.1+1/lisp/org/ob-ref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ref.el --- Babel Functions for Referencing External Data -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	 Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-R.el emacs-26.3+1/lisp/org/ob-R.el
--- emacs-26.1+1/lisp/org/ob-R.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-R.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-R.el --- Babel Functions for R                -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;;	Dan Davison
diff -Nru emacs-26.1+1/lisp/org/ob-ruby.el emacs-26.3+1/lisp/org/ob-ruby.el
--- emacs-26.1+1/lisp/org/ob-ruby.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-ruby.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ruby.el --- Babel Functions for Ruby          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-sass.el emacs-26.3+1/lisp/org/ob-sass.el
--- emacs-26.1+1/lisp/org/ob-sass.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-sass.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-sass.el --- Babel Functions for the Sass CSS generation language -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-scheme.el emacs-26.3+1/lisp/org/ob-scheme.el
--- emacs-26.1+1/lisp/org/ob-scheme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-scheme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-scheme.el --- Babel Functions for Scheme      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;	    Michael Gauland
diff -Nru emacs-26.1+1/lisp/org/ob-screen.el emacs-26.3+1/lisp/org/ob-screen.el
--- emacs-26.1+1/lisp/org/ob-screen.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-screen.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-screen.el --- Babel Support for Interactive Terminal -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
diff -Nru emacs-26.1+1/lisp/org/ob-sed.el emacs-26.3+1/lisp/org/ob-sed.el
--- emacs-26.1+1/lisp/org/ob-sed.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-sed.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-sed.el --- Babel Functions for Sed Scripts    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Bjarte Johansen
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-shell.el emacs-26.3+1/lisp/org/ob-shell.el
--- emacs-26.1+1/lisp/org/ob-shell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-shell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-shen.el emacs-26.3+1/lisp/org/ob-shen.el
--- emacs-26.1+1/lisp/org/ob-shen.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-shen.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-shen.el --- Babel Functions for Shen          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, shen
diff -Nru emacs-26.1+1/lisp/org/ob-sql.el emacs-26.3+1/lisp/org/ob-sql.el
--- emacs-26.1+1/lisp/org/ob-sql.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-sql.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-sql.el --- Babel Functions for SQL            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-sqlite.el emacs-26.3+1/lisp/org/ob-sqlite.el
--- emacs-26.1+1/lisp/org/ob-sqlite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-sqlite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- Babel Functions for SQLite Databases -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-stan.el emacs-26.3+1/lisp/org/ob-stan.el
--- emacs-26.1+1/lisp/org/ob-stan.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-stan.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-stan.el --- Babel Functions for Stan          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Kyle Meyer
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-table.el emacs-26.3+1/lisp/org/ob-table.el
--- emacs-26.1+1/lisp/org/ob-table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-table.el --- Support for Calling Babel Functions from Tables -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-tangle.el emacs-26.3+1/lisp/org/ob-tangle.el
--- emacs-26.1+1/lisp/org/ob-tangle.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-tangle.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-tangle.el --- Extract Source Code From Org Files -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/ob-vala.el emacs-26.3+1/lisp/org/ob-vala.el
--- emacs-26.1+1/lisp/org/ob-vala.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ob-vala.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ob-vala.el --- Babel functions for Vala evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Christian Garbs <mitch@cgarbs.de>
 ;; Keywords: literate programming, reproducible research
diff -Nru emacs-26.1+1/lisp/org/org-agenda.el emacs-26.3+1/lisp/org/org-agenda.el
--- emacs-26.1+1/lisp/org/org-agenda.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-agenda.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-archive.el emacs-26.3+1/lisp/org/org-archive.el
--- emacs-26.1+1/lisp/org/org-archive.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-archive.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-archive.el --- Archiving for Org             -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-attach.el emacs-26.3+1/lisp/org/org-attach.el
--- emacs-26.1+1/lisp/org/org-attach.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-attach.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-attach.el --- Manage file attachments to Org tasks -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
diff -Nru emacs-26.1+1/lisp/org/org-bbdb.el emacs-26.3+1/lisp/org/org-bbdb.el
--- emacs-26.1+1/lisp/org/org-bbdb.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-bbdb.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Authors: Carsten Dominik <carsten at orgmode dot org>
 ;;       Thomas Baumann <thomas dot baumann at ch dot tum dot de>
diff -Nru emacs-26.1+1/lisp/org/org-bibtex.el emacs-26.3+1/lisp/org/org-bibtex.el
--- emacs-26.1+1/lisp/org/org-bibtex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-bibtex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-bibtex.el --- Org links to BibTeX entries    -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;;
 ;; Authors: Bastien Guerry <bzg@gnu.org>
 ;;       Carsten Dominik <carsten dot dominik at gmail dot com>
diff -Nru emacs-26.1+1/lisp/org/org-capture.el emacs-26.3+1/lisp/org/org-capture.el
--- emacs-26.1+1/lisp/org/org-capture.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-capture.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-capture.el --- Fast note taking in Org       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-clock.el emacs-26.3+1/lisp/org/org-clock.el
--- emacs-26.1+1/lisp/org/org-clock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-clock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org mode -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-colview.el emacs-26.3+1/lisp/org/org-colview.el
--- emacs-26.1+1/lisp/org/org-colview.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-colview.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-colview.el --- Column View in Org            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-compat.el emacs-26.3+1/lisp/org/org-compat.el
--- emacs-26.1+1/lisp/org/org-compat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-compat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-compat.el --- Compatibility Code for Older Emacsen -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-crypt.el emacs-26.3+1/lisp/org/org-crypt.el
--- emacs-26.1+1/lisp/org/org-crypt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-crypt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*-
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
diff -Nru emacs-26.1+1/lisp/org/org-ctags.el emacs-26.3+1/lisp/org/org-ctags.el
--- emacs-26.1+1/lisp/org/org-ctags.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-ctags.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-ctags.el - Integrate Emacs "tags" Facility with Org -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 
diff -Nru emacs-26.1+1/lisp/org/org-datetree.el emacs-26.3+1/lisp/org/org-datetree.el
--- emacs-26.1+1/lisp/org/org-datetree.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-datetree.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-datetree.el --- Create date entries in a tree -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-docview.el emacs-26.3+1/lisp/org/org-docview.el
--- emacs-26.1+1/lisp/org/org-docview.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-docview.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-docview.el --- Support for links to doc-view-mode buffers -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-duration.el emacs-26.3+1/lisp/org/org-duration.el
--- emacs-26.1+1/lisp/org/org-duration.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-duration.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-duration.el --- Library handling durations   -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org.el emacs-26.3+1/lisp/org/org.el
--- emacs-26.1+1/lisp/org/org.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; org.el --- Outline-based notes management and organizer -*- lexical-binding: t; -*-
 
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
diff -Nru emacs-26.1+1/lisp/org/org-element.el emacs-26.3+1/lisp/org/org-element.el
--- emacs-26.1+1/lisp/org/org-element.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-element.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-element.el --- Parser for Org Syntax         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-entities.el emacs-26.3+1/lisp/org/org-entities.el
--- emacs-26.1+1/lisp/org/org-entities.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-entities.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-entities.el --- Support for Special Entities -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
diff -Nru emacs-26.1+1/lisp/org/org-eshell.el emacs-26.3+1/lisp/org/org-eshell.el
--- emacs-26.1+1/lisp/org/org-eshell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-eshell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-eshell.el - Support for Links to Working Directories in Eshell -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
 
diff -Nru emacs-26.1+1/lisp/org/org-eww.el emacs-26.3+1/lisp/org/org-eww.el
--- emacs-26.1+1/lisp/org/org-eww.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-eww.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-eww.el --- Store url and kill from Eww mode for Org  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
 ;; Keywords: link, eww
diff -Nru emacs-26.1+1/lisp/org/org-faces.el emacs-26.3+1/lisp/org/org-faces.el
--- emacs-26.1+1/lisp/org/org-faces.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-faces.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-faces.el --- Face definitions -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-feed.el emacs-26.3+1/lisp/org/org-feed.el
--- emacs-26.1+1/lisp/org/org-feed.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-feed.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-feed.el --- Add RSS feed items to Org files  -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-footnote.el emacs-26.3+1/lisp/org/org-footnote.el
--- emacs-26.1+1/lisp/org/org-footnote.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-footnote.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-footnote.el --- Footnote support in Org      -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-gnus.el emacs-26.3+1/lisp/org/org-gnus.el
--- emacs-26.1+1/lisp/org/org-gnus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-gnus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-gnus.el --- Support for Links to Gnus Groups and Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
diff -Nru emacs-26.1+1/lisp/org/org-habit.el emacs-26.3+1/lisp/org/org-habit.el
--- emacs-26.1+1/lisp/org/org-habit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-habit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-habit.el --- The habit tracking code for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-id.el emacs-26.3+1/lisp/org/org-id.el
--- emacs-26.1+1/lisp/org/org-id.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-id.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-id.el --- Global identifiers for Org entries -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -160,9 +160,9 @@
 (defcustom org-id-include-domain nil
   "Non-nil means add the domain name to new IDs.
 This ensures global uniqueness of IDs, and is also suggested by
-RFC 2445 in combination with RFC 822.  This is only relevant if
-`org-id-method' is `org'.  When uuidgen is used, the domain will never
-be added.
+the relevant RFCs.  This is relevant only if `org-id-method' is
+`org'.  When uuidgen is used, the domain will never be added.
+
 The default is to not use this because we have no really good way to get
 the true domain, and Org entries will normally not be shared with enough
 people to make this necessary."
diff -Nru emacs-26.1+1/lisp/org/org-indent.el emacs-26.3+1/lisp/org/org-indent.el
--- emacs-26.1+1/lisp/org/org-indent.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-indent.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-indent.el --- Dynamic indentation for Org    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-info.el emacs-26.3+1/lisp/org/org-info.el
--- emacs-26.1+1/lisp/org/org-info.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-info.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-info.el --- Support for Links to Info Nodes -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-inlinetask.el emacs-26.3+1/lisp/org/org-inlinetask.el
--- emacs-26.1+1/lisp/org/org-inlinetask.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-inlinetask.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-inlinetask.el --- Tasks Independent of Outline Hierarchy -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-irc.el emacs-26.3+1/lisp/org/org-irc.el
--- emacs-26.1+1/lisp/org/org-irc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-irc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-irc.el --- Store Links to IRC Sessions -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
diff -Nru emacs-26.1+1/lisp/org/org-lint.el emacs-26.3+1/lisp/org/org-lint.el
--- emacs-26.1+1/lisp/org/org-lint.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-lint.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-lint.el --- Linting for Org documents        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-list.el emacs-26.3+1/lisp/org/org-list.el
--- emacs-26.1+1/lisp/org/org-list.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-list.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-list.el --- Plain lists for Org              -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;	   Bastien Guerry <bzg@gnu.org>
diff -Nru emacs-26.1+1/lisp/org/org-macro.el emacs-26.3+1/lisp/org/org-macro.el
--- emacs-26.1+1/lisp/org/org-macro.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-macro.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-macro.el --- Macro Replacement Code for Org  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-macs.el emacs-26.3+1/lisp/org/org-macs.el
--- emacs-26.1+1/lisp/org/org-macs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-macs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-macs.el --- Top-level Definitions for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-mhe.el emacs-26.3+1/lisp/org/org-mhe.el
--- emacs-26.1+1/lisp/org/org-mhe.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-mhe.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-mhe.el --- Support for Links to MH-E Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-mobile.el emacs-26.3+1/lisp/org/org-mobile.el
--- emacs-26.1+1/lisp/org/org-mobile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-mobile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; org-mobile.el --- Code for Asymmetric Sync With a Mobile Device -*- lexical-binding: t; -*-
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-mouse.el emacs-26.3+1/lisp/org/org-mouse.el
--- emacs-26.1+1/lisp/org/org-mouse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-mouse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-mouse.el --- Better mouse support for Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
diff -Nru emacs-26.1+1/lisp/org/org-pcomplete.el emacs-26.3+1/lisp/org/org-pcomplete.el
--- emacs-26.1+1/lisp/org/org-pcomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-pcomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer Completion Code -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
diff -Nru emacs-26.1+1/lisp/org/org-plot.el emacs-26.3+1/lisp/org/org-plot.el
--- emacs-26.1+1/lisp/org/org-plot.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-plot.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-plot.el --- Support for Plotting from Org -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
diff -Nru emacs-26.1+1/lisp/org/org-protocol.el emacs-26.3+1/lisp/org/org-protocol.el
--- emacs-26.1+1/lisp/org/org-protocol.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-protocol.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-protocol.el --- Intercept Calls from Emacsclient to Trigger Custom Actions -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
 ;; Authors: Bastien Guerry <bzg@gnu.org>
 ;;       Daniel M German <dmg AT uvic DOT org>
diff -Nru emacs-26.1+1/lisp/org/org-rmail.el emacs-26.3+1/lisp/org/org-rmail.el
--- emacs-26.1+1/lisp/org/org-rmail.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-rmail.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-rmail.el --- Support for Links to Rmail Messages -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-src.el emacs-26.3+1/lisp/org/org-src.el
--- emacs-26.1+1/lisp/org/org-src.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-src.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-src.el --- Source code examples in Org       -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;	   Bastien Guerry <bzg@gnu.org>
diff -Nru emacs-26.1+1/lisp/org/org-table.el emacs-26.3+1/lisp/org/org-table.el
--- emacs-26.1+1/lisp/org/org-table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-table.el --- The Table Editor for Org        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-timer.el emacs-26.3+1/lisp/org/org-timer.el
--- emacs-26.1+1/lisp/org/org-timer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-timer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-timer.el --- Timer code for Org mode         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/org-w3m.el emacs-26.3+1/lisp/org/org-w3m.el
--- emacs-26.1+1/lisp/org/org-w3m.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/org-w3m.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-w3m.el --- Support from Copy and Paste From w3m -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/ox-ascii.el emacs-26.3+1/lisp/org/ox-ascii.el
--- emacs-26.1+1/lisp/org/ox-ascii.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-ascii.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/ox-beamer.el emacs-26.3+1/lisp/org/ox-beamer.el
--- emacs-26.1+1/lisp/org/ox-beamer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-beamer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;;         Nicolas Goaziou <n.goaziou AT gmail DOT com>
diff -Nru emacs-26.1+1/lisp/org/ox.el emacs-26.3+1/lisp/org/ox.el
--- emacs-26.1+1/lisp/org/ox.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox.el --- Export Framework for Org Mode          -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/ox-html.el emacs-26.3+1/lisp/org/ox-html.el
--- emacs-26.1+1/lisp/org/ox-html.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-html.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-html.el --- HTML Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Jambunathan K <kjambunathan at gmail dot com>
@@ -234,7 +234,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
@@ -524,7 +524,7 @@
  * @licstart  The following is the entire license notice for the
  *  JavaScript code in %SCRIPT_PATH.
  *
- * Copyright (C) 2012-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019 Free Software Foundation, Inc.
  *
  *
  * The JavaScript code in this tag is free software: you can
@@ -553,7 +553,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
diff -Nru emacs-26.1+1/lisp/org/ox-icalendar.el emacs-26.3+1/lisp/org/ox-icalendar.el
--- emacs-26.1+1/lisp/org/ox-icalendar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-icalendar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Nicolas Goaziou <n dot goaziou at gmail dot com>
diff -Nru emacs-26.1+1/lisp/org/ox-latex.el emacs-26.3+1/lisp/org/ox-latex.el
--- emacs-26.1+1/lisp/org/ox-latex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-latex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/ox-man.el emacs-26.3+1/lisp/org/ox-man.el
--- emacs-26.1+1/lisp/org/ox-man.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-man.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; ox-man.el --- Man Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;;      Luis R Anaya <papoanaya aroba hot mail punto com>
diff -Nru emacs-26.1+1/lisp/org/ox-md.el emacs-26.3+1/lisp/org/ox-md.el
--- emacs-26.1+1/lisp/org/ox-md.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-md.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-md.el --- Markdown Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: org, wp, markdown
diff -Nru emacs-26.1+1/lisp/org/ox-odt.el emacs-26.3+1/lisp/org/ox-odt.el
--- emacs-26.1+1/lisp/org/ox-odt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-odt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff -Nru emacs-26.1+1/lisp/org/ox-org.el emacs-26.3+1/lisp/org/ox-org.el
--- emacs-26.1+1/lisp/org/ox-org.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-org.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-org.el --- Org Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: org, wp
diff -Nru emacs-26.1+1/lisp/org/ox-publish.el emacs-26.3+1/lisp/org/ox-publish.el
--- emacs-26.1+1/lisp/org/ox-publish.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-publish.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*-
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
diff -Nru emacs-26.1+1/lisp/org/ox-texinfo.el emacs-26.3+1/lisp/org/ox-texinfo.el
--- emacs-26.1+1/lisp/org/ox-texinfo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/org/ox-texinfo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
diff -Nru emacs-26.1+1/lisp/outline.el emacs-26.3+1/lisp/outline.el
--- emacs-26.1+1/lisp/outline.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/outline.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; outline.el --- outline mode commands for Emacs
 
-;; Copyright (C) 1986, 1993-1995, 1997, 2000-2018 Free Software
+;; Copyright (C) 1986, 1993-1995, 1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/paren.el emacs-26.3+1/lisp/paren.el
--- emacs-26.1+1/lisp/paren.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/paren.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; paren.el --- highlight matching paren
 
-;; Copyright (C) 1993, 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/password-cache.el emacs-26.3+1/lisp/password-cache.el
--- emacs-26.1+1/lisp/password-cache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/password-cache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; password-cache.el --- Read passwords, possibly using a password cache.
 
-;; Copyright (C) 1999-2000, 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Created: 2003-12-21
diff -Nru emacs-26.1+1/lisp/pcmpl-cvs.el emacs-26.3+1/lisp/pcmpl-cvs.el
--- emacs-26.1+1/lisp/pcmpl-cvs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-cvs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-cvs.el --- functions for dealing with cvs completions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Package: pcomplete
diff -Nru emacs-26.1+1/lisp/pcmpl-gnu.el emacs-26.3+1/lisp/pcmpl-gnu.el
--- emacs-26.1+1/lisp/pcmpl-gnu.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-gnu.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-gnu.el --- completions for GNU project tools -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
diff -Nru emacs-26.1+1/lisp/pcmpl-linux.el emacs-26.3+1/lisp/pcmpl-linux.el
--- emacs-26.1+1/lisp/pcmpl-linux.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-linux.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
diff -Nru emacs-26.1+1/lisp/pcmpl-rpm.el emacs-26.3+1/lisp/pcmpl-rpm.el
--- emacs-26.1+1/lisp/pcmpl-rpm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-rpm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
diff -Nru emacs-26.1+1/lisp/pcmpl-unix.el emacs-26.3+1/lisp/pcmpl-unix.el
--- emacs-26.1+1/lisp/pcmpl-unix.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-unix.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-unix.el --- standard UNIX completions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
diff -Nru emacs-26.1+1/lisp/pcmpl-x.el emacs-26.3+1/lisp/pcmpl-x.el
--- emacs-26.1+1/lisp/pcmpl-x.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcmpl-x.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-x.el --- completion for miscellaneous tools  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: processes, tools, convenience
diff -Nru emacs-26.1+1/lisp/pcomplete.el emacs-26.3+1/lisp/pcomplete.el
--- emacs-26.1+1/lisp/pcomplete.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pcomplete.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcomplete.el --- programmable completion -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes abbrev
diff -Nru emacs-26.1+1/lisp/pixel-scroll.el emacs-26.3+1/lisp/pixel-scroll.el
--- emacs-26.1+1/lisp/pixel-scroll.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/pixel-scroll.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pixel-scroll.el --- Scroll a line smoothly
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 ;; Author: Tak Kunihiro <tkk@misasa.okayama-u.ac.jp>
 ;; Keywords: mouse
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/play/5x5.el emacs-26.3+1/lisp/play/5x5.el
--- emacs-26.1+1/lisp/play/5x5.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/5x5.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; 5x5.el --- simple little puzzle game
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
diff -Nru emacs-26.1+1/lisp/play/animate.el emacs-26.3+1/lisp/play/animate.el
--- emacs-26.1+1/lisp/play/animate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/animate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; animate.el --- make text dance
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: Richard Stallman <rms@gnu.org>
 ;; Keywords: games
diff -Nru emacs-26.1+1/lisp/play/blackbox.el emacs-26.3+1/lisp/play/blackbox.el
--- emacs-26.1+1/lisp/play/blackbox.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/blackbox.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; blackbox.el --- blackbox game in Emacs Lisp
 
-;; Copyright (C) 1985-1987, 1992, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985-1987, 1992, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: F. Thomas May <uw-nsr!uw-warp!tom@beaver.cs.washington.edu>
diff -Nru emacs-26.1+1/lisp/play/bubbles.el emacs-26.3+1/lisp/play/bubbles.el
--- emacs-26.1+1/lisp/play/bubbles.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/bubbles.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bubbles.el --- Puzzle game for Emacs
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; URL:         http://ulf.epplejasper.de/
@@ -250,10 +250,10 @@
   "Indicate whether images have been created successfully.")
 
 (defvar bubbles--col-offset 0
-  "Horizontal offset for centering the bubbles grid.")
+  "Horizontal offset for centering the bubbles grid, in pixels.")
 
 (defvar bubbles--row-offset 0
-  "Vertical offset for centering the bubbles grid.")
+  "Vertical offset for centering the bubbles grid, in pixels.")
 
 (defvar bubbles--save-data nil
   "List containing bubbles save data (SCORE BUFFERCONTENTS).")
@@ -960,33 +960,26 @@
 (defun bubbles--compute-offsets ()
   "Update horizontal and vertical offsets for centering the bubbles grid.
 Set `bubbles--col-offset' and `bubbles--row-offset'."
-  (cond ((and (display-images-p)
-              bubbles--images-ok
-              (not (eq bubbles-graphics-theme 'ascii))
-              (fboundp 'window-inside-pixel-edges))
-         ;; compute offset in units of pixels
-         (let ((bubbles--image-size
-                (car (image-size (car bubbles--images) t))))
-           (setq bubbles--col-offset
-                 (list
-                  (max 0 (/ (- (nth 2 (window-inside-pixel-edges))
-                               (nth 0 (window-inside-pixel-edges))
-                               (* ( + bubbles--image-size 2) ;; margin
-                                  (bubbles--grid-width))) 2))))
-           (setq bubbles--row-offset
-                 (list
-                  (max 0 (/ (- (nth 3 (window-inside-pixel-edges))
-                               (nth 1 (window-inside-pixel-edges))
-                               (* (+ bubbles--image-size 1) ;; margin
-                                  (bubbles--grid-height))) 2))))))
-        (t
-         ;; compute offset in units of chars
-         (setq bubbles--col-offset
-               (max 0 (/ (- (window-width)
-                            (bubbles--grid-width)) 2)))
-         (setq bubbles--row-offset
-               (max 0 (/ (- (window-height)
-                            (bubbles--grid-height) 2) 2))))))
+  (let* ((use-images-p (and (display-images-p)
+                            bubbles--images-ok
+                            (not (eq bubbles-graphics-theme 'ascii))))
+         (bubbles--image-size
+          (if use-images-p (car (image-size (car bubbles--images) t)) 1))
+         ;; In GUI mode, leave thin margins around the images.
+         (image-hor-size
+          (if use-images-p (+ bubbles--image-size 2) bubbles--image-size))
+         (image-vert-size
+          (if use-images-p (1+ bubbles--image-size) bubbles--image-size)))
+    (setq bubbles--col-offset
+          (max 0 (/ (- (nth 2 (window-body-pixel-edges))
+                       (nth 0 (window-body-pixel-edges))
+                       (* image-hor-size (bubbles--grid-width)))
+                    2)))
+    (setq bubbles--row-offset
+          (max 0 (/ (- (nth 3 (window-body-pixel-edges))
+                       (nth 1 (window-body-pixel-edges))
+                       (* image-vert-size (bubbles--grid-height)))
+                    2)))))
 
 (defun bubbles--remove-overlays ()
   "Remove all overlays."
@@ -1007,7 +1000,8 @@
     (insert " ")
     (put-text-property (point-min) (point)
                        'display
-                       (cons 'space (list :height bubbles--row-offset)))
+                       (cons 'space (list :height
+                                          (list bubbles--row-offset))))
     (insert "\n")
     (let ((max-char (length (bubbles--colors))))
       (dotimes (i (bubbles--grid-height))
@@ -1015,7 +1009,8 @@
           (insert " ")
           (put-text-property p (point)
                              'display
-                             (cons 'space (list :width bubbles--col-offset))))
+                             (cons 'space (list :width
+                                                (list bubbles--col-offset)))))
         (dotimes (j (bubbles--grid-width))
           (let* ((index (random max-char))
                  (char (nth index bubbles-chars)))
@@ -1025,7 +1020,8 @@
       (insert "\n ")
       (put-text-property (1- (point)) (point)
                          'display
-                         (cons 'space (list :width bubbles--col-offset))))
+                         (cons 'space (list :width
+                                            (list bubbles--col-offset)))))
     (put-text-property (point-min) (point-max) 'pointer 'arrow))
   (bubbles-mode)
   (bubbles--reset-score)
@@ -1177,7 +1173,7 @@
       (insert " ")
       (put-text-property (1- (point)) (point)
                          'display
-                         (cons 'space (list :width bubbles--col-offset)))
+                         (cons 'space (list :width (list bubbles--col-offset))))
       (insert (format "Score:    %4d" bubbles--score))
       (put-text-property pos (point) 'status t))))
 
@@ -1197,7 +1193,7 @@
     (insert "\n ")
     (put-text-property (1- (point)) (point)
                        'display
-                       (cons 'space (list :width bubbles--col-offset)))
+                       (cons 'space (list :width (list bubbles--col-offset))))
     (insert "Game Over!"))
   ;; save score
   (gamegrid-add-score (format "bubbles-%s-%d-%d-%d-scores"
diff -Nru emacs-26.1+1/lisp/play/cookie1.el emacs-26.3+1/lisp/play/cookie1.el
--- emacs-26.1+1/lisp/play/cookie1.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/cookie1.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cookie1.el --- retrieve random phrases from fortune cookie files
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/play/decipher.el emacs-26.3+1/lisp/play/decipher.el
--- emacs-26.1+1/lisp/play/decipher.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/decipher.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers
 ;;
-;; Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Christopher J. Madsen <chris_madsen@geocities.com>
 ;; Keywords: games
diff -Nru emacs-26.1+1/lisp/play/dissociate.el emacs-26.3+1/lisp/play/dissociate.el
--- emacs-26.1+1/lisp/play/dissociate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/dissociate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dissociate.el --- scramble text amusingly for Emacs
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
diff -Nru emacs-26.1+1/lisp/play/doctor.el emacs-26.3+1/lisp/play/doctor.el
--- emacs-26.1+1/lisp/play/doctor.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/doctor.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; doctor.el --- psychological help for frustrated users
 
-;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2018 Free Software
+;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/play/dunnet.el emacs-26.3+1/lisp/play/dunnet.el
--- emacs-26.1+1/lisp/play/dunnet.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/dunnet.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dunnet.el --- text adventure for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992-1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ron Schnell <ronnie@driver-aces.com>
 ;; Created: 25 Jul 1992
diff -Nru emacs-26.1+1/lisp/play/fortune.el emacs-26.3+1/lisp/play/fortune.el
--- emacs-26.1+1/lisp/play/fortune.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/fortune.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fortune.el --- use fortune to create signatures
 
-;; Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <Holger.Schauer@gmx.de>
 ;; Keywords: games utils mail
diff -Nru emacs-26.1+1/lisp/play/gamegrid.el emacs-26.3+1/lisp/play/gamegrid.el
--- emacs-26.1+1/lisp/play/gamegrid.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/gamegrid.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gamegrid.el --- library for implementing grid-based games on Emacs
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Version: 1.02
diff -Nru emacs-26.1+1/lisp/play/gametree.el emacs-26.3+1/lisp/play/gametree.el
--- emacs-26.1+1/lisp/play/gametree.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/gametree.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gametree.el --- manage game analysis trees in Emacs
 
-;; Copyright (C) 1997, 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ian T Zimmerman <itz@rahul.net>
 ;; Created: Wed Dec 10 07:41:46 PST 1997
diff -Nru emacs-26.1+1/lisp/play/gomoku.el emacs-26.3+1/lisp/play/gomoku.el
--- emacs-26.1+1/lisp/play/gomoku.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/gomoku.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gomoku.el --- Gomoku game between you and Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1988, 1994, 1996, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1994, 1996, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
diff -Nru emacs-26.1+1/lisp/play/handwrite.el emacs-26.3+1/lisp/play/handwrite.el
--- emacs-26.1+1/lisp/play/handwrite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/handwrite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; handwrite.el --- turns your emacs buffer into a handwritten document
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
 ;; Created: October 21 1996
diff -Nru emacs-26.1+1/lisp/play/life.el emacs-26.3+1/lisp/play/life.el
--- emacs-26.1+1/lisp/play/life.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/life.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
-;; Copyright (C) 1988, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/play/morse.el emacs-26.3+1/lisp/play/morse.el
--- emacs-26.1+1/lisp/play/morse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/morse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; morse.el --- convert text to morse code and back
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
 ;; Keywords: games
diff -Nru emacs-26.1+1/lisp/play/mpuz.el emacs-26.3+1/lisp/play/mpuz.el
--- emacs-26.1+1/lisp/play/mpuz.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/mpuz.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mpuz.el --- multiplication puzzle for GNU Emacs
 
-;; Copyright (C) 1990, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
 ;; Overhauled: Daniel Pfeiffer <occitan@esperanto.org>
diff -Nru emacs-26.1+1/lisp/play/pong.el emacs-26.3+1/lisp/play/pong.el
--- emacs-26.1+1/lisp/play/pong.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/pong.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pong.el --- classical implementation of pong
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Benjamin Drieu <bdrieu@april.org>
 ;; Keywords: games
@@ -262,7 +262,7 @@
 
 
 (defun pong-move-left ()
-  "Move bat 2 up.
+  "Move bat 1 up.
 This is called left for historical reasons, since in some pong
 implementations you move with left/right paddle."
   (interactive)
@@ -274,7 +274,7 @@
 
 
 (defun pong-move-right ()
-  "Move bat 2 up."
+  "Move bat 1 down."
   (interactive)
   (if (< (+ pong-bat-player1 pong-bat-width) (1- pong-height))
       (and
diff -Nru emacs-26.1+1/lisp/play/snake.el emacs-26.3+1/lisp/play/snake.el
--- emacs-26.1+1/lisp/play/snake.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/snake.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; snake.el --- implementation of Snake for Emacs
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Created: 1997-09-10
diff -Nru emacs-26.1+1/lisp/play/solitaire.el emacs-26.3+1/lisp/play/solitaire.el
--- emacs-26.1+1/lisp/play/solitaire.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/solitaire.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; solitaire.el --- game of solitaire in Emacs Lisp
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de>
 ;; Created: Fri afternoon, Jun  3,  1994
diff -Nru emacs-26.1+1/lisp/play/spook.el emacs-26.3+1/lisp/play/spook.el
--- emacs-26.1+1/lisp/play/spook.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/spook.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
 
-;; Copyright (C) 1988, 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
diff -Nru emacs-26.1+1/lisp/play/tetris.el emacs-26.3+1/lisp/play/tetris.el
--- emacs-26.1+1/lisp/play/tetris.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/tetris.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tetris.el --- implementation of Tetris for Emacs
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Version: 2.01
diff -Nru emacs-26.1+1/lisp/play/zone.el emacs-26.3+1/lisp/play/zone.el
--- emacs-26.1+1/lisp/play/zone.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/play/zone.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; zone.el --- idle display hacks
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Victor Zandy <zandy@cs.wisc.edu>
 ;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
@@ -109,7 +109,7 @@
   (save-window-excursion
     (let ((f (selected-frame))
           (outbuf (get-buffer-create "*zone*"))
-          (text (buffer-substring (window-start) (window-end)))
+          (text (buffer-substring (window-start) (window-end nil t)))
           (wp (1+ (- (window-point)
                      (window-start)))))
       (put 'zone 'orig-buffer (current-buffer))
diff -Nru emacs-26.1+1/lisp/plstore.el emacs-26.3+1/lisp/plstore.el
--- emacs-26.1+1/lisp/plstore.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/plstore.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; plstore.el --- secure plist store -*- lexical-binding: t -*-
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff -Nru emacs-26.1+1/lisp/printing.el emacs-26.3+1/lisp/printing.el
--- emacs-26.1+1/lisp/printing.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/printing.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; printing.el --- printing utilities
 
-;; Copyright (C) 2000-2001, 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2001, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/proced.el emacs-26.3+1/lisp/proced.el
--- emacs-26.1+1/lisp/proced.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/proced.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; proced.el --- operate on system processes like dired
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Roland Winkler <winkler@gnu.org>
 ;; Keywords: Processes, Unix
diff -Nru emacs-26.1+1/lisp/profiler.el emacs-26.3+1/lisp/profiler.el
--- emacs-26.1+1/lisp/profiler.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/profiler.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; profiler.el --- UI and helper functions for Emacs's native profiler -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Tomohiro Matsuyama <tomo@cx4a.org>
 ;; Keywords: lisp
diff -Nru emacs-26.1+1/lisp/progmodes/ada-mode.el emacs-26.3+1/lisp/progmodes/ada-mode.el
--- emacs-26.1+1/lisp/progmodes/ada-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ada-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,12 +1,13 @@
 ;;; ada-mode.el --- major-mode for editing Ada sources
 
-;; Copyright (C) 1994-1995, 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Keywords: languages ada
+;; Version: 4.0
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/progmodes/ada-prj.el emacs-26.3+1/lisp/progmodes/ada-prj.el
--- emacs-26.1+1/lisp/progmodes/ada-prj.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ada-prj.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ada-prj.el --- GUI editing of project files for the ada-mode
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
 ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
diff -Nru emacs-26.1+1/lisp/progmodes/ada-stmt.el emacs-26.3+1/lisp/progmodes/ada-stmt.el
--- emacs-26.1+1/lisp/progmodes/ada-stmt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ada-stmt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
 
-;; Copyright (C) 1987, 1993-1994, 1996-2018 Free Software Foundation,
+;; Copyright (C) 1987, 1993-1994, 1996-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Authors: Daniel Pfeiffer
diff -Nru emacs-26.1+1/lisp/progmodes/ada-xref.el emacs-26.3+1/lisp/progmodes/ada-xref.el
--- emacs-26.1+1/lisp/progmodes/ada-xref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ada-xref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; ada-xref.el --- for lookup and completion in Ada mode
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
diff -Nru emacs-26.1+1/lisp/progmodes/antlr-mode.el emacs-26.3+1/lisp/progmodes/antlr-mode.el
--- emacs-26.1+1/lisp/progmodes/antlr-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/antlr-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; antlr-mode.el --- major mode for ANTLR grammar files
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Christoph Wedler <Christoph.Wedler@sap.com>
 ;; Keywords: languages, ANTLR, code generator
diff -Nru emacs-26.1+1/lisp/progmodes/asm-mode.el emacs-26.3+1/lisp/progmodes/asm-mode.el
--- emacs-26.1+1/lisp/progmodes/asm-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/asm-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/autoconf.el emacs-26.3+1/lisp/progmodes/autoconf.el
--- emacs-26.1+1/lisp/progmodes/autoconf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/autoconf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.ac files
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
diff -Nru emacs-26.1+1/lisp/progmodes/bat-mode.el emacs-26.3+1/lisp/progmodes/bat-mode.el
--- emacs-26.1+1/lisp/progmodes/bat-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/bat-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bat-mode.el --- Major mode for editing DOS/Windows scripts
 
-;; Copyright (C) 2003, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Arni Magnusson <arnima@hafro.is>
 ;; Keywords: languages
diff -Nru emacs-26.1+1/lisp/progmodes/bug-reference.el emacs-26.3+1/lisp/progmodes/bug-reference.el
--- emacs-26.1+1/lisp/progmodes/bug-reference.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/bug-reference.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; bug-reference.el --- buttonize bug references
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Created: 21 Mar 2007
diff -Nru emacs-26.1+1/lisp/progmodes/cc-align.el emacs-26.3+1/lisp/progmodes/cc-align.el
--- emacs-26.1+1/lisp/progmodes/cc-align.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-align.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2004- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff -Nru emacs-26.1+1/lisp/progmodes/cc-awk.el emacs-26.3+1/lisp/progmodes/cc-awk.el
--- emacs-26.1+1/lisp/progmodes/cc-awk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-awk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-awk.el --- AWK specific code within cc-mode.
 
-;; Copyright (C) 1988, 1994, 1996, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1994, 1996, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el)
diff -Nru emacs-26.1+1/lisp/progmodes/cc-bytecomp.el emacs-26.3+1/lisp/progmodes/cc-bytecomp.el
--- emacs-26.1+1/lisp/progmodes/cc-bytecomp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-bytecomp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
 ;; Maintainer: bug-cc-mode@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/cc-cmds.el emacs-26.3+1/lisp/progmodes/cc-cmds.el
--- emacs-26.1+1/lisp/progmodes/cc-cmds.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-cmds.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff -Nru emacs-26.1+1/lisp/progmodes/cc-defs.el emacs-26.3+1/lisp/progmodes/cc-defs.el
--- emacs-26.1+1/lisp/progmodes/cc-defs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-defs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-defs.el --- compile time definitions for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
@@ -87,7 +87,7 @@
 
 ;;; Variables also used at compile time.
 
-(defconst c-version "5.33.1"
+(defconst c-version "5.33.2"
   "CC Mode version number.")
 
 (defconst c-version-sym (intern c-version))
diff -Nru emacs-26.1+1/lisp/progmodes/cc-engine.el emacs-26.3+1/lisp/progmodes/cc-engine.el
--- emacs-26.1+1/lisp/progmodes/cc-engine.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-engine.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-engine.el --- core syntax guessing engine for CC mode -*- coding: utf-8 -*-
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2001- Alan Mackenzie
 ;;             1998- Martin Stjernholm
@@ -8514,6 +8514,8 @@
 	  got-parens
 	  ;; True if there is an identifier in the declarator.
 	  got-identifier
+	  ;; True if we find a number where an identifier was expected.
+	  got-number
 	  ;; True if there's a non-close-paren match of
 	  ;; `c-type-decl-suffix-key'.
 	  got-suffix
@@ -8591,7 +8593,9 @@
 	  (and (looking-at c-identifier-start)
 	       (setq pos (point))
 	       (setq got-identifier (c-forward-name))
-	       (setq name-start pos)))
+	       (setq name-start pos))
+	  (when (looking-at "[0-9]")
+	    (setq got-number t))) ; We've probably got an arithmetic expression.
 
       ;; Skip over type decl suffix operators and trailing noise macros.
       (while
@@ -9056,7 +9060,7 @@
 
 	   ;; CASE 18
 	   (when (and (not (memq context '(nil top)))
-		      (or got-prefix
+		      (or (and got-prefix (not got-number))
 			  (and (eq context 'decl)
 			       (not c-recognize-paren-inits)
 			       (or got-parens got-suffix))))
diff -Nru emacs-26.1+1/lisp/progmodes/cc-fonts.el emacs-26.3+1/lisp/progmodes/cc-fonts.el
--- emacs-26.1+1/lisp/progmodes/cc-fonts.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-fonts.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-fonts.el --- font lock support for CC Mode
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             2002- Martin Stjernholm
@@ -1279,12 +1279,14 @@
 	   (c-put-char-property (1- match-pos)
 				'c-type 'c-decl-arg-start)
 	   (cons 'decl nil))
-	  ;; Got an open paren preceded by an arith operator.
+	  ;; Got (an) open paren(s) preceded by an arith operator.
 	  ((and (eq (char-before match-pos) ?\()
 		(save-excursion
 		  (goto-char match-pos)
-		  (and (zerop (c-backward-token-2 2))
-		       (looking-at c-arithmetic-op-regexp))))
+		  (while
+		      (and (zerop (c-backward-token-2))
+			   (eq (char-after) ?\()))
+		  (looking-at c-arithmetic-op-regexp)))
 	   (cons nil nil))
 	  ;; In a C++ member initialization list.
 	  ((and (eq (char-before match-pos) ?,)
diff -Nru emacs-26.1+1/lisp/progmodes/cc-guess.el emacs-26.3+1/lisp/progmodes/cc-guess.el
--- emacs-26.1+1/lisp/progmodes/cc-guess.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-guess.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-guess.el --- guess indentation values by scanning existing code
 
-;; Copyright (C) 1985, 1987, 1992-2006, 2011-2018 Free Software
+;; Copyright (C) 1985, 1987, 1992-2006, 2011-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author:     1994-1995 Barry A. Warsaw
diff -Nru emacs-26.1+1/lisp/progmodes/cc-langs.el emacs-26.3+1/lisp/progmodes/cc-langs.el
--- emacs-26.1+1/lisp/progmodes/cc-langs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-langs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-langs.el --- language specific settings for CC Mode -*- coding: utf-8 -*-
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2002- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff -Nru emacs-26.1+1/lisp/progmodes/cc-menus.el emacs-26.3+1/lisp/progmodes/cc-menus.el
--- emacs-26.1+1/lisp/progmodes/cc-menus.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-menus.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-menus.el --- imenu support for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
diff -Nru emacs-26.1+1/lisp/progmodes/cc-mode.el emacs-26.3+1/lisp/progmodes/cc-mode.el
--- emacs-26.1+1/lisp/progmodes/cc-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-mode.el --- major mode for editing C and similar languages
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
@@ -1487,6 +1487,7 @@
   ;; lock context (etc.) fontification.
   (goto-char pos)
   (let ((lit-start (c-literal-start))
+	old-pos
 	(new-pos pos)
 	capture-opener
 	bod-lim bo-decl)
@@ -1509,10 +1510,15 @@
     (while
 	;; Go to a less nested declaration each time round this loop.
 	(and
+	 (setq old-pos (point))
 	 (c-syntactic-skip-backward "^;{}" bod-lim t)
 	 (> (point) bod-lim)
 	 (progn (c-forward-syntactic-ws)
-		(setq bo-decl (point))
+		;; Have we got stuck in a comment at EOB?
+		(not (and (eobp)
+			  (c-literal-start))))
+	 (< (point) old-pos)
+	 (progn (setq bo-decl (point))
 		(or (not (looking-at c-protection-key))
 		    (c-forward-keyword-clause 1)))
 	 (progn
@@ -2214,6 +2220,7 @@
 
 ;; reporter-submit-bug-report requires sendmail.
 (declare-function mail-position-on-field "sendmail" (field &optional soft))
+(declare-function mail-text "sendmail" ())
 
 (defun c-submit-bug-report ()
   "Submit via mail a bug report on CC Mode."
@@ -2278,9 +2285,26 @@
 	vars)
       (lambda ()
 	(run-hooks 'c-prepare-bug-report-hook)
+	(let ((hook (get mail-user-agent 'hookvar)))
+	  (if hook
+	      (add-hook hook
+			(lambda ()
+			  (save-excursion
+			    (mail-text)
+			    (unless (looking-at "Package: ")
+			      (insert "Package: " c-mode-bug-package "\n\n"))))
+			nil t)))
 	(save-excursion
 	  (or (mail-position-on-field "X-Debbugs-Package")
-	      (insert c-mode-bug-package)))
+	      (insert c-mode-bug-package))
+	  ;; For mail clients that do not support X- headers.
+	  ;; Sadly reporter-submit-bug-report unconditionally adds
+	  ;; a blank line before SALUTATION, so we can't use that.
+	  ;; It is also sad that reporter offers no way to leave point
+	  ;; after this line we are now inserting.
+	  (mail-text)
+	  (or (looking-at "Package:")
+	      (insert "Package: " c-mode-bug-package)))
 	(insert (format "Buffer Style: %s\nc-emacs-features: %s\n"
 			style c-features)))))))
 
diff -Nru emacs-26.1+1/lisp/progmodes/cc-styles.el emacs-26.3+1/lisp/progmodes/cc-styles.el
--- emacs-26.1+1/lisp/progmodes/cc-styles.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-styles.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-styles.el --- support for styles in CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2004- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff -Nru emacs-26.1+1/lisp/progmodes/cc-vars.el emacs-26.3+1/lisp/progmodes/cc-vars.el
--- emacs-26.1+1/lisp/progmodes/cc-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cc-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
-;; Copyright (C) 1985, 1987, 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:    2002- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff -Nru emacs-26.1+1/lisp/progmodes/cfengine.el emacs-26.3+1/lisp/progmodes/cfengine.el
--- emacs-26.1+1/lisp/progmodes/cfengine.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cfengine.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cfengine.el --- mode for editing Cfengine files
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
diff -Nru emacs-26.1+1/lisp/progmodes/cmacexp.el emacs-26.3+1/lisp/progmodes/cmacexp.el
--- emacs-26.1+1/lisp/progmodes/cmacexp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cmacexp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Francesco Potortì <pot@gnu.org>
diff -Nru emacs-26.1+1/lisp/progmodes/compile.el emacs-26.3+1/lisp/progmodes/compile.el
--- emacs-26.1+1/lisp/progmodes/compile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/compile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1987, 1993-1999, 2001-2018 Free Software
+;; Copyright (C) 1985-1987, 1993-1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Authors: Roland McGrath <roland@gnu.org>,
@@ -1429,17 +1429,17 @@
                              file line end-line col end-col (or type 2) fmt))
 
             (when (integerp file)
-              (setq type (if (consp type)
-                             (compilation-type type)
-                           (or type 2)))
-              (compilation--note-type type)
-
-              (compilation--put-prop
-               file 'font-lock-face
-               (symbol-value (aref [compilation-info-face
-                                    compilation-warning-face
-                                    compilation-error-face]
-                                   type))))
+              (let ((this-type (if (consp type)
+                                   (compilation-type type)
+                                 (or type 2))))
+                (compilation--note-type this-type)
+
+                (compilation--put-prop
+                 file 'font-lock-face
+                 (symbol-value (aref [compilation-info-face
+                                      compilation-warning-face
+                                      compilation-error-face]
+                                     this-type)))))
 
             (compilation--put-prop
              line 'font-lock-face compilation-line-face)
diff -Nru emacs-26.1+1/lisp/progmodes/cperl-mode.el emacs-26.3+1/lisp/progmodes/cperl-mode.el
--- emacs-26.1+1/lisp/progmodes/cperl-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cperl-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cperl-mode.el --- Perl code editing commands for Emacs
 
-;; Copyright (C) 1985-1987, 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich
 ;;	Bob Olson
@@ -8884,7 +8884,7 @@
 	(goto-char new-beg)))
     (setq beg (point))
     (goto-char end)
-    (while (and end
+    (while (and end (< end (point-max))
 		(progn
 		  (or (bolp) (condition-case nil
 				 (forward-line 1)
diff -Nru emacs-26.1+1/lisp/progmodes/cpp.el emacs-26.3+1/lisp/progmodes/cpp.el
--- emacs-26.1+1/lisp/progmodes/cpp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cpp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: c, faces, tools
diff -Nru emacs-26.1+1/lisp/progmodes/cwarn.el emacs-26.3+1/lisp/progmodes/cwarn.el
--- emacs-26.1+1/lisp/progmodes/cwarn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/cwarn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren
 ;; Keywords: c, languages, faces
diff -Nru emacs-26.1+1/lisp/progmodes/dcl-mode.el emacs-26.3+1/lisp/progmodes/dcl-mode.el
--- emacs-26.1+1/lisp/progmodes/dcl-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/dcl-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf2ps.el emacs-26.3+1/lisp/progmodes/ebnf2ps.el
--- emacs-26.1+1/lisp/progmodes/ebnf2ps.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf2ps.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-abn.el emacs-26.3+1/lisp/progmodes/ebnf-abn.el
--- emacs-26.1+1/lisp/progmodes/ebnf-abn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-abn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF)
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-bnf.el emacs-26.3+1/lisp/progmodes/ebnf-bnf.el
--- emacs-26.1+1/lisp/progmodes/ebnf-bnf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-bnf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-bnf.el --- parser for EBNF
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-dtd.el emacs-26.3+1/lisp/progmodes/ebnf-dtd.el
--- emacs-26.1+1/lisp/progmodes/ebnf-dtd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-dtd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-ebx.el emacs-26.3+1/lisp/progmodes/ebnf-ebx.el
--- emacs-26.1+1/lisp/progmodes/ebnf-ebx.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-ebx.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-iso.el emacs-26.3+1/lisp/progmodes/ebnf-iso.el
--- emacs-26.1+1/lisp/progmodes/ebnf-iso.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-iso.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-iso.el --- parser for ISO EBNF
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-otz.el emacs-26.3+1/lisp/progmodes/ebnf-otz.el
--- emacs-26.1+1/lisp/progmodes/ebnf-otz.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-otz.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-otz.el --- syntactic chart OpTimiZer
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebnf-yac.el emacs-26.3+1/lisp/progmodes/ebnf-yac.el
--- emacs-26.1+1/lisp/progmodes/ebnf-yac.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebnf-yac.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-yac.el --- parser for Yacc/Bison
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/progmodes/ebrowse.el emacs-26.3+1/lisp/progmodes/ebrowse.el
--- emacs-26.1+1/lisp/progmodes/ebrowse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ebrowse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/elisp-mode.el emacs-26.3+1/lisp/progmodes/elisp-mode.el
--- emacs-26.1+1/lisp/progmodes/elisp-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/elisp-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elisp-mode.el --- Emacs Lisp mode  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, languages
@@ -1189,11 +1189,11 @@
 Normally, this function truncates long output according to the
 value of the variables `eval-expression-print-length' and
 `eval-expression-print-level'.  With a prefix argument of zero,
-however, there is no such truncation.  Such a prefix argument
-also causes integers to be printed in several additional formats
-\(octal, hexadecimal, and character when the prefix argument is
--1 or the integer is `eval-expression-print-maximum-character' or
-less).
+however, there is no such truncation.
+Integer values are printed in several formats (decimal, octal,
+and hexadecimal).  When the prefix argument is -1 or the value
+doesn't exceed `eval-expression-print-maximum-character', an
+integer value is also printed as a character of that codepoint.
 
 If `eval-expression-debug-on-error' is non-nil, which is the default,
 this command arranges for all errors to enter the debugger."
diff -Nru emacs-26.1+1/lisp/progmodes/etags.el emacs-26.3+1/lisp/progmodes/etags.el
--- emacs-26.1+1/lisp/progmodes/etags.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/etags.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; etags.el --- etags facility for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2018 Free
+;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
diff -Nru emacs-26.1+1/lisp/progmodes/executable.el emacs-26.3+1/lisp/progmodes/executable.el
--- emacs-26.1+1/lisp/progmodes/executable.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/executable.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1994-1996, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: languages, unix
diff -Nru emacs-26.1+1/lisp/progmodes/f90.el emacs-26.3+1/lisp/progmodes/f90.el
--- emacs-26.1+1/lisp/progmodes/f90.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/f90.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; f90.el --- Fortran-90 mode (free format)  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1995-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Torbjörn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff -Nru emacs-26.1+1/lisp/progmodes/flymake.el emacs-26.3+1/lisp/progmodes/flymake.el
--- emacs-26.1+1/lisp/progmodes/flymake.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/flymake.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flymake.el --- A universal on-the-fly syntax checker  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: Leo Liu <sdl.web@gmail.com>
diff -Nru emacs-26.1+1/lisp/progmodes/flymake-proc.el emacs-26.3+1/lisp/progmodes/flymake-proc.el
--- emacs-26.1+1/lisp/progmodes/flymake-proc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/flymake-proc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flymake-proc.el --- Flymake backend for external tools  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: Leo Liu <sdl.web@gmail.com>
@@ -854,7 +854,7 @@
   (unless (stringp file-name)
     (error "Invalid file-name"))
 
-  (let* ((dir       (file-name-directory file-name))
+  (let* ((dir       (file-name-directory (file-name-unquote file-name)))
          ;; Not sure what this slash-pos is all about, but I guess it's just
          ;; trying to remove the leading / of absolute file names.
 	 (slash-pos (string-match "/" dir))
diff -Nru emacs-26.1+1/lisp/progmodes/fortran.el emacs-26.3+1/lisp/progmodes/fortran.el
--- emacs-26.1+1/lisp/progmodes/fortran.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/fortran.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
-;; Copyright (C) 1986, 1993-1995, 1997-2018 Free Software Foundation,
+;; Copyright (C) 1986, 1993-1995, 1997-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/gdb-mi.el emacs-26.3+1/lisp/progmodes/gdb-mi.el
--- emacs-26.1+1/lisp/progmodes/gdb-mi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/gdb-mi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gdb-mi.el --- User Interface for running GDB  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Nick Roberts <nickrob@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -1120,13 +1120,15 @@
 (defcustom gdb-show-changed-values t
   "If non-nil change the face of out of scope variables and changed values.
 Out of scope variables are suppressed with `shadow' face.
-Changed values are highlighted with the face `font-lock-warning-face'."
+Changed values are highlighted with the face `font-lock-warning-face'.
+Used by Speedbar."
   :type 'boolean
   :group 'gdb
   :version "22.1")
 
 (defcustom gdb-max-children 40
-  "Maximum number of children before expansion requires confirmation."
+  "Maximum number of children before expansion requires confirmation.
+Used by Speedbar."
   :type 'integer
   :group 'gdb
   :version "22.1")
@@ -1782,9 +1784,10 @@
 (defvar gdb-control-commands-regexp
   (concat
    "^\\("
-   "commands\\|if\\|while\\|define\\|document\\|"
+   "comm\\(a\\(n\\(ds?\\)?\\)?\\)?\\|if\\|while"
+   "\\|def\\(i\\(ne?\\)?\\)?\\|doc\\(u\\(m\\(e\\(nt?\\)?\\)?\\)?\\)?\\|"
    gdb-python-guile-commands-regexp
-   "\\|while-stepping\\|stepping\\|ws\\|actions"
+   "\\|while-stepping\\|stepp\\(i\\(ng?\\)?\\)?\\|ws\\|actions"
    "\\)\\([[:blank:]]+\\([^[:blank:]]*\\)\\)?$")
   "Regexp matching GDB commands that enter a recursive reading loop.
 As long as GDB is in the recursive reading loop, it does not expect
@@ -1846,7 +1849,7 @@
   ;; Python and Guile commands that have an argument don't enter the
   ;; recursive reading loop.
   (let* ((control-command-p (string-match gdb-control-commands-regexp string))
-         (command-arg (match-string 3 string))
+         (command-arg (and control-command-p (match-string 3 string)))
          (python-or-guile-p (string-match gdb-python-guile-commands-regexp
                                           string)))
     (if (and control-command-p
diff -Nru emacs-26.1+1/lisp/progmodes/glasses.el emacs-26.3+1/lisp/progmodes/glasses.el
--- emacs-26.1+1/lisp/progmodes/glasses.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/glasses.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; glasses.el --- make cantReadThis readable
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Milan Zamazal <pdm@zamazal.org>
diff -Nru emacs-26.1+1/lisp/progmodes/grep.el emacs-26.3+1/lisp/progmodes/grep.el
--- emacs-26.1+1/lisp/progmodes/grep.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/grep.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; grep.el --- run `grep' and display the results  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1987, 1993-1999, 2001-2018 Free Software
+;; Copyright (C) 1985-1987, 1993-1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
@@ -366,6 +366,9 @@
 Notice that using \\[next-error] or \\[compile-goto-error] modifies
 `compilation-last-buffer' rather than `grep-last-buffer'.")
 
+(defvar grep-match-face	'match
+  "Face name to use for grep matches.")
+
 ;;;###autoload
 (defconst grep-regexp-alist
   `((,(concat "^\\(?:"
@@ -379,7 +382,9 @@
               ;; to handle weird file names (with colons in them) as
               ;; well as possible.  E.g., use [1-9][0-9]* rather than
               ;; [0-9]+ so as to accept ":034:" in file names.
-              "\\(?1:[^\n:]+?[^\n/:]\\):[\t ]*\\(?2:[1-9][0-9]*\\)[\t ]*:"
+              "\\(?1:"
+              "\\(?:[a-zA-Z]:\\)?" ; Allow "C:..." for w32.
+              "[^\n:]+?[^\n/:]\\):[\t ]*\\(?2:[1-9][0-9]*\\)[\t ]*:"
               "\\)")
      1 2
      ;; Calculate column positions (col . end-col) of first grep match on a line
@@ -387,7 +392,7 @@
          (when grep-highlight-matches
            (let* ((beg (match-end 0))
                   (end (save-excursion (goto-char beg) (line-end-position)))
-                  (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face)))
+                  (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
              (when mbeg
                (- mbeg beg)))))
       .
@@ -395,7 +400,7 @@
          (when grep-highlight-matches
            (let* ((beg (match-end 0))
                   (end (save-excursion (goto-char beg) (line-end-position)))
-                  (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face))
+                  (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
                   (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
              (when mend
                (- mend beg))))))
@@ -419,9 +424,6 @@
 (defvar grep-error-face	'compilation-error
   "Face name to use for grep error messages.")
 
-(defvar grep-match-face	'match
-  "Face name to use for grep matches.")
-
 (defvar grep-context-face 'shadow
   "Face name to use for grep context lines.")
 
diff -Nru emacs-26.1+1/lisp/progmodes/gud.el emacs-26.3+1/lisp/progmodes/gud.el
--- emacs-26.1+1/lisp/progmodes/gud.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/gud.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gud.el --- Grand Unified Debugger mode for running GDB and other debuggers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992-1996, 1998, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1992-1996, 1998, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
diff -Nru emacs-26.1+1/lisp/progmodes/hideif.el emacs-26.3+1/lisp/progmodes/hideif.el
--- emacs-26.1+1/lisp/progmodes/hideif.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/hideif.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hideif.el --- hides selected code within ifdef  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1988, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Brian Marick
 ;;	Daniel LaLiberte <liberte@holonexus.org>
diff -Nru emacs-26.1+1/lisp/progmodes/hideshow.el emacs-26.3+1/lisp/progmodes/hideshow.el
--- emacs-26.1+1/lisp/progmodes/hideshow.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/hideshow.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;;      Dan Nicolaescu <dann@ics.uci.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/icon.el emacs-26.3+1/lisp/progmodes/icon.el
--- emacs-26.1+1/lisp/progmodes/icon.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/icon.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Copyright (C) 1989, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Chris Smith <csmith@convex.com>
 ;; Created: 15 Feb 89
diff -Nru emacs-26.1+1/lisp/progmodes/idlwave.el emacs-26.3+1/lisp/progmodes/idlwave.el
--- emacs-26.1+1/lisp/progmodes/idlwave.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/idlwave.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; idlwave.el --- IDL editing mode for GNU Emacs
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
diff -Nru emacs-26.1+1/lisp/progmodes/idlw-complete-structtag.el emacs-26.3+1/lisp/progmodes/idlw-complete-structtag.el
--- emacs-26.1+1/lisp/progmodes/idlw-complete-structtag.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/idlw-complete-structtag.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; idlw-complete-structtag.el --- Completion of structure tags.
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/idlw-help.el emacs-26.3+1/lisp/progmodes/idlw-help.el
--- emacs-26.1+1/lisp/progmodes/idlw-help.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/idlw-help.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; idlw-help.el --- HTML Help code for IDLWAVE
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;;
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
diff -Nru emacs-26.1+1/lisp/progmodes/idlw-shell.el emacs-26.3+1/lisp/progmodes/idlw-shell.el
--- emacs-26.1+1/lisp/progmodes/idlw-shell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/idlw-shell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; idlw-shell.el --- run IDL as an inferior process of Emacs.
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
diff -Nru emacs-26.1+1/lisp/progmodes/idlw-toolbar.el emacs-26.3+1/lisp/progmodes/idlw-toolbar.el
--- emacs-26.1+1/lisp/progmodes/idlw-toolbar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/idlw-toolbar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/inf-lisp.el emacs-26.3+1/lisp/progmodes/inf-lisp.el
--- emacs-26.1+1/lisp/progmodes/inf-lisp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/inf-lisp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; inf-lisp.el --- an inferior-lisp mode
 
-;; Copyright (C) 1988, 1993-1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1993-1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/js.el emacs-26.3+1/lisp/progmodes/js.el
--- emacs-26.1+1/lisp/progmodes/js.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/js.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; js.el --- Major mode for editing JavaScript  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Karl Landstrom <karl.landstrom@brgeight.se>
 ;;         Daniel Colascione <dan.colascione@gmail.com>
@@ -479,6 +479,7 @@
   "Align continuation of non-empty ([{ lines in `js-mode'."
   :version "26.1"
   :type 'boolean
+  :safe 'booleanp
   :group 'js)
 
 (defcustom js-comment-lineup-func #'c-lineup-C-comments
@@ -793,7 +794,6 @@
 (defun js--re-search-backward-inner (regexp &optional bound count)
   "Auxiliary function for `js--re-search-backward'."
   (let ((parse)
-        str-terminator
         (orig-macro-start
          (save-excursion
            (and (js--beginning-of-macro)
@@ -804,13 +804,7 @@
                  (save-excursion (backward-char) (looking-at "/[/*]")))
         (forward-char))
       (setq parse (syntax-ppss))
-      (cond ((setq str-terminator (nth 3 parse))
-             (when (eq str-terminator t)
-               (setq str-terminator ?/))
-             (re-search-backward
-              (concat "\\([^\\]\\|^\\)" (string str-terminator))
-              (point-at-bol) t))
-            ((nth 7 parse)
+      (cond ((nth 8 parse)
              (goto-char (nth 8 parse)))
             ((or (nth 4 parse)
                  (and (eq (char-before) ?/) (eq (char-after) ?*)))
diff -Nru emacs-26.1+1/lisp/progmodes/ld-script.el emacs-26.3+1/lisp/progmodes/ld-script.el
--- emacs-26.1+1/lisp/progmodes/ld-script.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ld-script.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ld-script.el --- GNU linker script editing mode for Emacs
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO<jet@gyve.org>
 ;; Keywords: languages, faces
diff -Nru emacs-26.1+1/lisp/progmodes/m4-mode.el emacs-26.3+1/lisp/progmodes/m4-mode.el
--- emacs-26.1+1/lisp/progmodes/m4-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/m4-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
 
-;; Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Andrew Csillag <drew@thecsillags.com>
 ;; Keywords: languages, faces
diff -Nru emacs-26.1+1/lisp/progmodes/make-mode.el emacs-26.3+1/lisp/progmodes/make-mode.el
--- emacs-26.1+1/lisp/progmodes/make-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/make-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; make-mode.el --- makefile editing commands for Emacs -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992, 1994, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
 ;;	Eric S. Raymond <esr@snark.thyrsus.com>
diff -Nru emacs-26.1+1/lisp/progmodes/mantemp.el emacs-26.3+1/lisp/progmodes/mantemp.el
--- emacs-26.1+1/lisp/progmodes/mantemp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/mantemp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
 
-;; Copyright (C) 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Tom Houlder <thoulder@icor.fr>
 ;; Created: 10 Dec 1996
diff -Nru emacs-26.1+1/lisp/progmodes/meta-mode.el emacs-26.3+1/lisp/progmodes/meta-mode.el
--- emacs-26.1+1/lisp/progmodes/meta-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/meta-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -*- lexical-binding:t -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de>
 ;; Version: 1.0
diff -Nru emacs-26.1+1/lisp/progmodes/mixal-mode.el emacs-26.3+1/lisp/progmodes/mixal-mode.el
--- emacs-26.1+1/lisp/progmodes/mixal-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/mixal-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mixal-mode.el --- Major mode for the mix asm language.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/octave.el emacs-26.3+1/lisp/progmodes/octave.el
--- emacs-26.1+1/lisp/progmodes/octave.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/octave.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; octave.el --- editing octave source files under emacs  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
 ;;	   John Eaton <jwe@octave.org>
@@ -1591,8 +1591,23 @@
      (list (format "print_usage ('%s');\n" fn)))
     (let (result)
       (dolist (line inferior-octave-output-list)
+        ;; The help output has changed a few times in GNU Octave.
+        ;; Earlier versions output "usage: " before the function signature.
+        ;; After deprecating the usage function, and up until GNU Octave 4.0.3,
+        ;; the output looks like this:
+        ;; -- Mapping Function: abs (Z).
+        ;; After GNU Octave 4.2.0, the output is less verbose and it looks like
+        ;; this:
+        ;; -- abs (Z)
+        ;; The following regexp matches these three formats.
+        ;; The "usage: " alternative matches the symbol, because a call to
+        ;; print_usage with a non-existent function (e.g., print_usage ('A'))
+        ;; would output:
+        ;; error: print_usage: 'A' not found
+        ;; and we wouldn't like to match anything in this case.
+        ;; See bug #36459.
         (when (string-match
-               "\\s-*\\(?:--[^:]+\\|usage\\):\\s-*\\(.*\\)$"
+               "\\s-*\\(?:--[^:]+:\\|\\_<usage:\\|--\\)\\s-*\\(.*\\)$"
                line)
           (push (match-string 1 line) result)))
       (setq octave-eldoc-cache
diff -Nru emacs-26.1+1/lisp/progmodes/opascal.el emacs-26.3+1/lisp/progmodes/opascal.el
--- emacs-26.1+1/lisp/progmodes/opascal.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/opascal.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; opascal.el --- major mode for editing Object Pascal source in Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Authors: Ray Blaak <blaak@infomatch.com>,
 ;;          Simon South <ssouth@member.fsf.org>
diff -Nru emacs-26.1+1/lisp/progmodes/pascal.el emacs-26.3+1/lisp/progmodes/pascal.el
--- emacs-26.1+1/lisp/progmodes/pascal.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/pascal.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pascal.el --- major mode for editing pascal source in Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2019 Free Software Foundation, Inc.
 
 ;; Author: Espen Skoglund <esk@gnu.org>
 ;; Keywords: languages
diff -Nru emacs-26.1+1/lisp/progmodes/perl-mode.el emacs-26.3+1/lisp/progmodes/perl-mode.el
--- emacs-26.1+1/lisp/progmodes/perl-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/perl-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; perl-mode.el --- Perl code editing commands for GNU Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1990, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: William F. Mann
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/progmodes/prog-mode.el emacs-26.3+1/lisp/progmodes/prog-mode.el
--- emacs-26.1+1/lisp/progmodes/prog-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/prog-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; prog-mode.el --- Generic major mode for programming  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/progmodes/project.el emacs-26.3+1/lisp/progmodes/project.el
--- emacs-26.1+1/lisp/progmodes/project.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/project.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; project.el --- Operations on the current project  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lisp/progmodes/prolog.el emacs-26.3+1/lisp/progmodes/prolog.el
--- emacs-26.1+1/lisp/progmodes/prolog.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/prolog.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; prolog.el --- major mode for Prolog (and Mercury) -*- lexical-binding:t -*-
 
-;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2018 Free
+;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Authors: Emil Åström <emil_astrom(at)hotmail(dot)com>
@@ -480,12 +480,6 @@
 
 ;; Keyboard
 
-(defcustom prolog-hungry-delete-key-flag nil
-  "Non-nil means delete key consumes all preceding spaces."
-  :version "24.1"
-  :group 'prolog-keyboard
-  :type 'boolean)
-
 (defcustom prolog-electric-dot-flag nil
   "Non-nil means make dot key electric.
 Electric dot appends newline or inserts head of a new clause.
diff -Nru emacs-26.1+1/lisp/progmodes/ps-mode.el emacs-26.3+1/lisp/progmodes/ps-mode.el
--- emacs-26.1+1/lisp/progmodes/ps-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ps-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
diff -Nru emacs-26.1+1/lisp/progmodes/python.el emacs-26.3+1/lisp/progmodes/python.el
--- emacs-26.1+1/lisp/progmodes/python.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/python.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; python.el --- Python's flying circus support for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Fabián E. Gallina <fgallina@gnu.org>
 ;; URL: https://github.com/fgallina/python.el
@@ -2231,7 +2231,7 @@
 (defvar python-shell--prompt-calculated-output-regexp nil
   "Calculated output prompt regexp for inferior python shell.
 Do not set this variable directly, instead use
-`python-shell-set-prompt-regexp'.")
+`python-shell-prompt-set-calculated-regexps'.")
 
 (defun python-shell-prompt-detect ()
   "Detect prompts for the current `python-shell-interpreter'.
@@ -2266,15 +2266,16 @@
                          ;; carriage returns in unbuffered mode.
                          (let ((inhibit-eol-conversion (getenv "PYTHONUNBUFFERED")))
                            (python-shell--save-temp-file code))))
-                    ;; Use `process-file' as it is remote-host friendly.
-                    (process-file
-                     interpreter
-                     code-file
-                     '(t nil)
-                     nil
-                     interpreter-arg)
-                    ;; Try to cleanup
-                    (delete-file code-file)))
+                    (unwind-protect
+                        ;; Use `process-file' as it is remote-host friendly.
+                        (process-file
+                         interpreter
+                         code-file
+                         '(t nil)
+                         nil
+                         interpreter-arg)
+                      ;; Try to cleanup
+                      (delete-file code-file))))
                 (buffer-string)))
              (prompts
               (catch 'prompts
diff -Nru emacs-26.1+1/lisp/progmodes/ruby-mode.el emacs-26.3+1/lisp/progmodes/ruby-mode.el
--- emacs-26.1+1/lisp/progmodes/ruby-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/ruby-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ruby-mode.el --- Major mode for editing Ruby files -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Authors: Yukihiro Matsumoto
 ;;	Nobuyoshi Nakada
diff -Nru emacs-26.1+1/lisp/progmodes/scheme.el emacs-26.3+1/lisp/progmodes/scheme.el
--- emacs-26.1+1/lisp/progmodes/scheme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/scheme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; scheme.el --- Scheme (and DSSSL) editing mode    -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1986-1988, 1997-1998, 2001-2018 Free Software
+;; Copyright (C) 1986-1988, 1997-1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu>
diff -Nru emacs-26.1+1/lisp/progmodes/sh-script.el emacs-26.3+1/lisp/progmodes/sh-script.el
--- emacs-26.1+1/lisp/progmodes/sh-script.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/sh-script.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1997, 1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1993-1997, 1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
diff -Nru emacs-26.1+1/lisp/progmodes/simula.el emacs-26.3+1/lisp/progmodes/simula.el
--- emacs-26.1+1/lisp/progmodes/simula.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/simula.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; simula.el --- SIMULA 87 code editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1996, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
diff -Nru emacs-26.1+1/lisp/progmodes/sql.el emacs-26.3+1/lisp/progmodes/sql.el
--- emacs-26.1+1/lisp/progmodes/sql.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/sql.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sql.el --- specialized comint.el for SQL interpreters  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <michael@mauger.com>
diff -Nru emacs-26.1+1/lisp/progmodes/subword.el emacs-26.3+1/lisp/progmodes/subword.el
--- emacs-26.1+1/lisp/progmodes/subword.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/subword.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subword.el --- Handling capitalized subwords in a nomenclature -*- lexical-binding: t -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO
 
@@ -113,9 +113,7 @@
   NSGraphicsContext  =>  \"NS\", \"Graphics\" and \"Context\"
 
 This mode changes the definition of a word so that word commands
-treat nomenclature boundaries as word boundaries.
-
-\\{subword-mode-map}"
+treat nomenclature boundaries as word boundaries."
     :lighter " ,"
     (when subword-mode (superword-mode -1))
     (subword-setup-buffer))
diff -Nru emacs-26.1+1/lisp/progmodes/tcl.el emacs-26.3+1/lisp/progmodes/tcl.el
--- emacs-26.1+1/lisp/progmodes/tcl.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/tcl.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tcl.el --- Tcl code editing commands for Emacs
 
-;; Copyright (C) 1994, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1998-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Author: Tom Tromey <tromey@redhat.com>
diff -Nru emacs-26.1+1/lisp/progmodes/vera-mode.el emacs-26.3+1/lisp/progmodes/vera-mode.el
--- emacs-26.1+1/lisp/progmodes/vera-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/vera-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vera-mode.el --- major mode for editing Vera files
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author:      Reto Zimmermann <reto@gnu.org>
 ;; Maintainer:  Reto Zimmermann <reto@gnu.org>
diff -Nru emacs-26.1+1/lisp/progmodes/verilog-mode.el emacs-26.3+1/lisp/progmodes/verilog-mode.el
--- emacs-26.1+1/lisp/progmodes/verilog-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/verilog-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,12 +1,15 @@
 ;;; verilog-mode.el --- major mode for editing verilog source in Emacs
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael McNamara <mac@verilog.com>
 ;;    Wilson Snyder <wsnyder@wsnyder.org>
 ;; X-URL: http://www.veripool.org
 ;; Created: 3 Jan 1996
 ;; Keywords: languages
+;; The "Version" is the date followed by the decimal rendition of the Git
+;;     commit hex.
+;; Version: 2017.8.7.201875024
 
 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
 ;; file on 19/3/2008, and the maintainer agreed that when a bug is
diff -Nru emacs-26.1+1/lisp/progmodes/vhdl-mode.el emacs-26.3+1/lisp/progmodes/vhdl-mode.el
--- emacs-26.1+1/lisp/progmodes/vhdl-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/vhdl-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
diff -Nru emacs-26.1+1/lisp/progmodes/which-func.el emacs-26.3+1/lisp/progmodes/which-func.el
--- emacs-26.1+1/lisp/progmodes/which-func.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/which-func.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; which-func.el --- print current function in mode line  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994, 1997-1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1994, 1997-1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
diff -Nru emacs-26.1+1/lisp/progmodes/xref.el emacs-26.3+1/lisp/progmodes/xref.el
--- emacs-26.1+1/lisp/progmodes/xref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/xref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; xref.el --- Cross-referencing commands              -*-lexical-binding:t-*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -323,21 +323,23 @@
 (defcustom xref-prompt-for-identifier '(not xref-find-definitions
                                             xref-find-definitions-other-window
                                             xref-find-definitions-other-frame)
-  "When t, always prompt for the identifier name.
+  "If non-nil, prompt for the identifier to find.
+
+When t, always prompt for the identifier name.
 
 When nil, prompt only when there's no value at point we can use,
 or when the command has been called with the prefix argument.
 
-Otherwise, it's a list of xref commands which will prompt
-anyway (the value at point, if any, will be used as the default).
-
+Otherwise, it's a list of xref commands which will always prompt,
+with the identifier at point, if any, used as the default.
 If the list starts with `not', the meaning of the rest of the
-elements is negated."
-  :type '(choice (const :tag "always" t)
-                 (const :tag "auto" nil)
-                 (set :menu-tag "command specific" :tag "commands"
+elements is negated: these commands will NOT prompt."
+  :type '(choice (const :tag "Always prompt for identifier" t)
+                 (const :tag "Prompt if no identifier at point" nil)
+                 (set :menu-tag "Prompt according to command"
+                      :tag "Prompt according to command"
 		      :value (not)
-		      (const :tag "Except" not)
+		      (const :tag "Except for commands listed below" not)
 		      (repeat :inline t (symbol :tag "command")))))
 
 (defcustom xref-after-jump-hook '(recenter
@@ -866,7 +868,11 @@
 ;;;###autoload
 (defun xref-find-references (identifier)
   "Find references to the identifier at point.
-With prefix argument, prompt for the identifier."
+This command might prompt for the identifier as needed, perhaps
+offering the symbol at point as the default.
+With prefix argument, or if `xref-prompt-for-identifier' is t,
+always prompt for the identifier.  If `xref-prompt-for-identifier'
+is nil, prompt only if there's no usable symbol at point."
   (interactive (list (xref--read-identifier "Find references of: ")))
   (xref--find-xrefs identifier 'references identifier nil))
 
diff -Nru emacs-26.1+1/lisp/progmodes/xscheme.el emacs-26.3+1/lisp/progmodes/xscheme.el
--- emacs-26.1+1/lisp/progmodes/xscheme.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/progmodes/xscheme.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xscheme.el --- run MIT Scheme under Emacs        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1986-1987, 1989-1990, 2001-2018 Free Software
+;; Copyright (C) 1986-1987, 1989-1990, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/ps-bdf.el emacs-26.3+1/lisp/ps-bdf.el
--- emacs-26.1+1/lisp/ps-bdf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ps-bdf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2019 Free Software Foundation, Inc.
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/lisp/ps-def.el emacs-26.3+1/lisp/ps-def.el
--- emacs-26.1+1/lisp/ps-def.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ps-def.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-def.el --- XEmacs and Emacs definitions for ps-print -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
diff -Nru emacs-26.1+1/lisp/ps-mule.el emacs-26.3+1/lisp/ps-mule.el
--- emacs-26.1+1/lisp/ps-mule.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ps-mule.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-mule.el --- provide multi-byte character facility to ps-print
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
diff -Nru emacs-26.1+1/lisp/ps-print.el emacs-26.3+1/lisp/ps-print.el
--- emacs-26.1+1/lisp/ps-print.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ps-print.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-print.el --- print text from the buffer as PostScript -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2019 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
diff -Nru emacs-26.1+1/lisp/ps-samp.el emacs-26.3+1/lisp/ps-samp.el
--- emacs-26.1+1/lisp/ps-samp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ps-samp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-samp.el --- ps-print sample setup code
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
@@ -76,8 +76,8 @@
       (concat "Subject: " (or (mail-fetch-field "Subject") "???")))))
 
 ;; Look in an article or mail message for the From: line.  Sorta-kinda
-;; understands RFC-822 addresses and can pull the real name out where
-;; it's provided.
+;; understands RFC 822 (or later) addresses and can pull the real name
+;; out where it's provided.
 (defun ps-article-author ()
   (save-excursion
     (save-restriction
diff -Nru emacs-26.1+1/lisp/recentf.el emacs-26.3+1/lisp/recentf.el
--- emacs-26.1+1/lisp/recentf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/recentf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; recentf.el --- setup a menu of recently opened files
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: July 19 1999
@@ -67,7 +67,8 @@
 A nil value means to save the whole list.
 See the command `recentf-save-list'."
   :group 'recentf
-  :type 'integer)
+  :type '(choice (integer :tag "Entries" :value 1)
+		 (const :tag "No Limit" nil)))
 
 (defcustom recentf-save-file (locate-user-emacs-file "recentf" ".recentf")
   "File to save the recent list into."
diff -Nru emacs-26.1+1/lisp/rect.el emacs-26.3+1/lisp/rect.el
--- emacs-26.1+1/lisp/rect.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/rect.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rect.el --- rectangle functions for GNU Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1999-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: Didier Verna <didier@xemacs.org>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/register.el emacs-26.3+1/lisp/register.el
--- emacs-26.1+1/lisp/register.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/register.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; register.el --- register commands for Emacs      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1985, 1993-1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985, 1993-1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/registry.el emacs-26.3+1/lisp/registry.el
--- emacs-26.1+1/lisp/registry.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/registry.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; registry.el --- Track and remember data items by various fields
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
@@ -358,7 +358,7 @@
 entries first and return candidates from beginning of list."
   (let* ((precious (oref db precious))
 	 (precious-p (lambda (entry-key)
-		       (cdr (memq (car entry-key) precious))))
+		       (memq (car entry-key) precious)))
 	 (data (oref db data))
 	 (candidates (cl-loop for k being the hash-keys of data
 			      using (hash-values v)
diff -Nru emacs-26.1+1/lisp/repeat.el emacs-26.3+1/lisp/repeat.el
--- emacs-26.1+1/lisp/repeat.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/repeat.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; repeat.el --- convenient way to repeat the previous command  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Created: Mo 02 Mar 98
diff -Nru emacs-26.1+1/lisp/replace.el emacs-26.3+1/lisp/replace.el
--- emacs-26.1+1/lisp/replace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/replace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; replace.el --- replace commands for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2018 Free
+;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -1748,6 +1748,7 @@
                           (when (and list-matching-lines-jump-to-current-line
                                      (not multi-occur-p)
                                      (not orig-line-shown-p)
+                                     orig-line
                                      (>= curr-line orig-line))
                             (insert
                              (concat
@@ -1774,7 +1775,8 @@
                   ;; Insert original line if haven't done yet.
                   (when (and list-matching-lines-jump-to-current-line
                              (not multi-occur-p)
-                             (not orig-line-shown-p))
+                             (not orig-line-shown-p)
+                             orig-line)
                     (with-current-buffer out-buf
                       (insert
                        (concat
@@ -2147,6 +2149,10 @@
 	    noedit nil)))
   (set-match-data match-data)
   (replace-match newtext fixedcase literal)
+  ;; `query-replace' undo feature needs the beginning of the match position,
+  ;; but `replace-match' may change it, for instance, with a regexp like "^".
+  ;; Ensure that this function preserves the match data (Bug#31492).
+  (set-match-data match-data)
   ;; `replace-match' leaves point at the end of the replacement text,
   ;; so move point to the beginning when replacing backward.
   (when backward (goto-char (nth 0 match-data)))
@@ -2576,6 +2582,7 @@
 			   (let ((stack-idx         0)
                                  (stack-len         (length stack))
                                  (num-replacements  0)
+                                 (nocasify t) ; Undo must preserve case (Bug#31073).
                                  search-string
                                  next-replacement)
                              (while (and (< stack-idx stack-len)
@@ -2607,7 +2614,8 @@
                                    (setq real-match-data
                                          (save-excursion
                                            (goto-char (match-beginning 0))
-                                           (looking-at search-string)
+                                           ;; We must quote the string (Bug#37073)
+                                           (looking-at (regexp-quote search-string))
                                            (match-data t (nth 2 elt)))
                                          noedit
                                          (replace-match-maybe-edit
@@ -2617,7 +2625,9 @@
                                          real-match-data
                                          (save-excursion
                                            (goto-char (match-beginning 0))
-                                           (looking-at next-replacement)
+                                           (if regexp-flag
+                                               (looking-at next-replacement)
+                                             (looking-at (regexp-quote next-replacement)))
                                            (match-data t (nth 2 elt))))
                                    ;; Set replaced nil to keep in loop
                                    (when (eq def 'undo-all)
@@ -2716,7 +2726,8 @@
 				 (replace-match-maybe-edit
 				  next-replacement nocasify literal noedit
 				  real-match-data backward)
-				 replaced t))
+				 replaced t)
+			   (setq next-replacement-replaced next-replacement))
 			 (setq done t))
 
 			((eq def 'delete-and-edit)
diff -Nru emacs-26.1+1/lisp/reposition.el emacs-26.3+1/lisp/reposition.el
--- emacs-26.1+1/lisp/reposition.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/reposition.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reposition.el --- center a Lisp function or comment on the screen
 
-;; Copyright (C) 1991, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
diff -Nru emacs-26.1+1/lisp/reveal.el emacs-26.3+1/lisp/reveal.el
--- emacs-26.1+1/lisp/reveal.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/reveal.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reveal.el --- Automatically reveal hidden text at point -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: outlines
diff -Nru emacs-26.1+1/lisp/rfn-eshadow.el emacs-26.3+1/lisp/rfn-eshadow.el
--- emacs-26.1+1/lisp/rfn-eshadow.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/rfn-eshadow.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text
 ;;
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience minibuffer
@@ -132,9 +132,7 @@
 
 ;; An overlay covering the shadowed part of the filename (local to the
 ;; minibuffer).
-(defvar rfn-eshadow-overlay)
-(make-variable-buffer-local 'rfn-eshadow-overlay)
-
+(defvar-local rfn-eshadow-overlay nil)
 
 ;;; Hook functions
 
diff -Nru emacs-26.1+1/lisp/rot13.el emacs-26.3+1/lisp/rot13.el
--- emacs-26.1+1/lisp/rot13.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/rot13.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rot13.el --- display a buffer in ROT13  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/rtree.el emacs-26.3+1/lisp/rtree.el
--- emacs-26.1+1/lisp/rtree.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/rtree.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rtree.el --- functions for manipulating range trees
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 
diff -Nru emacs-26.1+1/lisp/ruler-mode.el emacs-26.3+1/lisp/ruler-mode.el
--- emacs-26.1+1/lisp/ruler-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ruler-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ruler-mode.el --- display a ruler in the header line
 
-;; Copyright (C) 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/savehist.el emacs-26.3+1/lisp/savehist.el
--- emacs-26.1+1/lisp/savehist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/savehist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; savehist.el --- Save minibuffer history
 
-;; Copyright (C) 1997, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -172,13 +172,30 @@
 (define-minor-mode savehist-mode
   "Toggle saving of minibuffer history (Savehist mode).
 With a prefix argument ARG, enable Savehist mode if ARG is
-positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil.
+positive, and disable it otherwise.  If called from Lisp,
+also enable the mode if ARG is omitted or nil.
 
 When Savehist mode is enabled, minibuffer history is saved
-periodically and when exiting Emacs.  When Savehist mode is
-enabled for the first time in an Emacs session, it loads the
-previous minibuffer history from `savehist-file'.
+to `savehist-file' periodically and when exiting Emacs.  When
+Savehist mode is enabled for the first time in an Emacs session,
+it loads the previous minibuffer histories from `savehist-file'.
+The variable `savehist-autosave-interval' controls the
+periodicity of saving minibuffer histories.
+
+If `savehist-save-minibuffer-history' is non-nil (the default),
+all recorded minibuffer histories will be saved.  You can arrange
+for additional history variables to be saved and restored by
+customizing `savehist-additional-variables', which by default is
+an empty list.  For example, to save the history of commands
+invoked via \\[execute-extended-command], add `command-history' to the list in
+`savehist-additional-variables'.
+
+Alternatively, you could customize `savehist-save-minibuffer-history'
+to nil, and add to `savehist-additional-variables' only those
+history variables you want to save.
+
+To ignore some history variables, add their symbols to the list
+in `savehist-ignored-variables'.
 
 This mode should normally be turned on from your Emacs init file.
 Calling it at any other time replaces your current minibuffer
diff -Nru emacs-26.1+1/lisp/saveplace.el emacs-26.3+1/lisp/saveplace.el
--- emacs-26.1+1/lisp/saveplace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/saveplace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; saveplace.el --- automatically save place in files
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: emacs-devel@gnu.org
@@ -27,7 +27,7 @@
 ;; Automatically save place in files, so that visiting them later
 ;; (even during a different Emacs session) automatically moves point
 ;; to the saved position, when the file is first found.  Uses the
-;; value of buffer-local variable save-place to determine whether to
+;; value of buffer-local variable save-place-mode to determine whether to
 ;; save position or not.
 ;;
 ;; Thanks to Stefan Schoef, who sent a patch with the
@@ -179,7 +179,7 @@
 
 (defun save-place-to-alist ()
   ;; put filename and point in a cons box and then cons that onto the
-  ;; front of the save-place-alist, if save-place is non-nil.
+  ;; front of the save-place-alist, if save-place-mode is non-nil.
   ;; Otherwise, just delete that file from the alist.
   ;; first check to make sure alist has been loaded in from the master
   ;; file.  If not, do so, then feel free to modify the alist.  It
@@ -309,8 +309,8 @@
           nil))))
 
 (defun save-places-to-alist ()
-  ;; go through buffer-list, saving places to alist if save-place is
-  ;; non-nil, deleting them from alist if it is nil.
+  ;; go through buffer-list, saving places to alist if save-place-mode
+  ;; is non-nil, deleting them from alist if it is nil.
   (let ((buf-list (buffer-list)))
     (while buf-list
       ;; put this into a save-excursion in case someone is counting on
@@ -335,7 +335,7 @@
 	      (and (integerp (cdr cell))
 		   (goto-char (cdr cell))))
           ;; and make sure it will be saved again for later
-          (setq save-place t)))))
+          (setq save-place-mode t)))))
 
 (declare-function dired-goto-file "dired" (file))
 
@@ -360,7 +360,7 @@
 	       ((and (listp (cdr cell)) (assq 'dired-filename (cdr cell)))
 		(dired-goto-file (cdr (assq 'dired-filename (cdr cell)))))))
           ;; and make sure it will be saved again for later
-          (setq save-place t)))))
+          (setq save-place-mode t)))))
 
 (defun save-place-kill-emacs-hook ()
   ;; First update the alist.  This loads the old save-place-file if nec.
diff -Nru emacs-26.1+1/lisp/sb-image.el emacs-26.3+1/lisp/sb-image.el
--- emacs-26.1+1/lisp/sb-image.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/sb-image.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sb-image --- Image management for speedbar
 
-;; Copyright (C) 1999-2003, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2003, 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff -Nru emacs-26.1+1/lisp/scroll-all.el emacs-26.3+1/lisp/scroll-all.el
--- emacs-26.1+1/lisp/scroll-all.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/scroll-all.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; scroll-all.el --- scroll all buffers together minor mode
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
 ;; Keywords: convenience scroll lock
diff -Nru emacs-26.1+1/lisp/scroll-bar.el emacs-26.3+1/lisp/scroll-bar.el
--- emacs-26.1+1/lisp/scroll-bar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/scroll-bar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; scroll-bar.el --- window system-independent scroll bar support
 
-;; Copyright (C) 1993-1995, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1999-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: hardware
diff -Nru emacs-26.1+1/lisp/scroll-lock.el emacs-26.3+1/lisp/scroll-lock.el
--- emacs-26.1+1/lisp/scroll-lock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/scroll-lock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; scroll-lock.el --- Scroll lock scrolling.
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/select.el emacs-26.3+1/lisp/select.el
--- emacs-26.1+1/lisp/select.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/select.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; select.el --- lisp portion of standard selection support  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/server.el emacs-26.3+1/lisp/server.el
--- emacs-26.1+1/lisp/server.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/server.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process -*- lexical-binding: t -*-
 
-;; Copyright (C) 1986-1987, 1992, 1994-2018 Free Software Foundation,
+;; Copyright (C) 1986-1987, 1992, 1994-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
@@ -255,7 +255,14 @@
 (defcustom server-name "server"
   "The name of the Emacs server, if this Emacs process creates one.
 The command `server-start' makes use of this.  It should not be
-changed while a server is running."
+changed while a server is running.
+If this is a file name with no leading directories, Emacs will
+create a socket file by that name under `server-socket-dir'
+if `server-use-tcp' is nil, else under `server-auth-dir'.
+If this is an absolute file name, it specifies where the socket
+file will be created.  To have emacsclient connect to the same
+socket, use the \"-s\" switch for local non-TCP sockets, and
+the \"-f\" switch otherwise."
   :group 'server
   :type 'string
   :version "23.1")
@@ -599,7 +606,10 @@
 argument INHIBIT-PROMPT is non-nil.
 
 To force-start a server, do \\[server-force-delete] and then
-\\[server-start]."
+\\[server-start].
+
+To check from a Lisp program whether a server is running, use
+the `server-process' variable."
   (interactive "P")
   (when (or (not server-clients)
 	    ;; Ask the user before deleting existing clients---except
@@ -725,7 +735,11 @@
   nil              the server is definitely not running.
   t                the server seems to be running.
   something else   we cannot determine whether it's running without using
-                   commands which may have to wait for a long time."
+                   commands which may have to wait for a long time.
+
+This function can return non-nil if the server was started by some other
+Emacs process.  To check from a Lisp program whether a server was started
+by the current Emacs process, use the `server-process' variable."
   (unless name (setq name server-name))
   (condition-case nil
       (if server-use-tcp
@@ -1607,7 +1621,14 @@
 			      (frame-terminal))))
 		'nomini 'visible (selected-window))))
 	    (condition-case nil
-		(switch-to-buffer next-buffer)
+                ;; If the client specified a new buffer position,
+                ;; treat that as an explicit point-move command, and
+                ;; override switch-to-buffer-preserve-window-point.
+                (let ((switch-to-buffer-preserve-window-point
+                       (if filepos
+                           nil
+                         switch-to-buffer-preserve-window-point)))
+                  (switch-to-buffer next-buffer))
 	      ;; After all the above, we might still have ended up with
 	      ;; a minibuffer/dedicated-window (if there's no other).
 	      (error (pop-to-buffer next-buffer)))))))
diff -Nru emacs-26.1+1/lisp/ses.el emacs-26.3+1/lisp/ses.el
--- emacs-26.1+1/lisp/ses.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/ses.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ses.el -- Simple Emacs Spreadsheet  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Vincent Belaïche  <vincentb1@users.sourceforge.net>
diff -Nru emacs-26.1+1/lisp/shadowfile.el emacs-26.3+1/lisp/shadowfile.el
--- emacs-26.1+1/lisp/shadowfile.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/shadowfile.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shadowfile.el --- automatic file copying
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files
@@ -25,37 +25,38 @@
 ;;  This package helps you to keep identical copies of files in more than one
 ;;  place - possibly on different machines.  When you save a file, it checks
 ;;  whether it is on the list of files with "shadows", and if so, it tries to
-;;  copy it when you exit Emacs (or use the shadow-copy-files command).
+;;  copy it when you exit Emacs (or use the `shadow-copy-files' command).
 
 ;; Installation & Use:
 
-;;  Add clusters (if necessary) and file groups with shadow-define-cluster,
-;;  shadow-define-literal-group, and shadow-define-regexp-group (see the
+;;  Add clusters (if necessary) and file groups with `shadow-define-cluster',
+;;  `shadow-define-literal-group', and `shadow-define-regexp-group' (see the
 ;;  documentation for these functions for information on how and when to use
 ;;  them).  After doing this once, everything should be automatic.
 
-;;  The lists of clusters and shadows are saved in a ~/.emacs.d/shadows
-;;  (`shadow-info-file') file, so that they can be remembered from one
-;;  Emacs session to another, even (as much as possible) if the Emacs
-;;  session terminates abnormally.  The files needing to be copied are
-;;  stored in `shadow-todo-file'; if a file cannot be copied for any
-;;  reason, it will stay on the list to be tried again next time.  The
-;;  `shadow-info-file' file should itself have shadows on all your accounts
-;;  so that the information in it is consistent everywhere, but
-;;  `shadow-todo-file' is local information and should have no shadows.
+;;  The lists of clusters and shadows are saved in `shadow-info-file',
+;;  so that they can be remembered from one Emacs session to another,
+;;  even (as much as possible) if the Emacs session terminates
+;;  abnormally.  The files needing to be copied are stored in
+;;  `shadow-todo-file'; if a file cannot be copied for any reason, it
+;;  will stay on the list to be tried again next time.  The
+;;  `shadow-info-file' file should itself have shadows on all your
+;;  accounts so that the information in it is consistent everywhere,
+;;  but `shadow-todo-file' is local information and should have no
+;;  shadows.
 
 ;;  If you do not want to copy a particular file, you can answer "no" and
-;;  be asked again next time you hit C-x 4 s or exit Emacs.  If you do not
-;;  want to be asked again, use shadow-cancel, and you will not be asked
+;;  be asked again next time you hit "C-x 4 s" or exit Emacs.  If you do not
+;;  want to be asked again, use "M-x shadow-cancel", and you will not be asked
 ;;  until you change the file and save it again.  If you do not want to
 ;;  shadow that file ever again, you can edit it out of the shadows
-;;  buffer.  Anytime you edit the shadows buffer, you must type M-x
-;;  shadow-read-files to load in the new information, or your changes will
+;;  buffer.  Anytime you edit the shadows buffer, you must type "M-x
+;;  shadow-read-files" to load in the new information, or your changes will
 ;;  be overwritten!
 
 ;; Bugs & Warnings:
 ;;
-;;  - It is bad to have two emacses both running shadowfile at the same
+;;  - It is bad to have two Emacsen both running shadowfile at the same
 ;;  time.  It tries to detect this condition, but is not always successful.
 ;;
 ;;  - You have to be careful not to edit a file in two locations
@@ -64,19 +65,16 @@
 ;;
 ;;  - It ought to check modification times of both files to make sure
 ;;  it is doing the right thing.  This will have to wait until
-;;  file-newer-than-file-p works between machines.
+;;  `file-newer-than-file-p' works between machines.
 ;;
 ;;  - It will not make directories for you, it just fails to copy files
 ;;  that belong in non-existent directories.
-;;
-;;  Please report any bugs to me (boris@gnu.org).  Also let me know
-;;  if you have suggestions or would like to be informed of updates.
 
 
 ;;; Code:
 
 (require 'cl-lib)
-(require 'ange-ftp)
+(require 'tramp)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Variables
@@ -107,35 +105,35 @@
   :type 'boolean
   :group 'shadow)
 
-;; FIXME in a sense, this changed in 24.4 (addition of locate-user-emacs-file),
-;; but due to the weird way this variable is initialized to nil, it didn't
-;; literally change.  Same for shadow-todo-file.
-(defcustom shadow-info-file nil
+(defcustom shadow-info-file (locate-user-emacs-file "shadows" ".shadows")
   "File to keep shadow information in.
 The `shadow-info-file' should be shadowed to all your accounts to
 ensure consistency.  Default: ~/.emacs.d/shadows"
-  :type '(choice (const nil) file)
-  :group 'shadow)
+  :type 'file
+  :group 'shadow
+  :version "26.2")
 
-(defcustom shadow-todo-file nil
+(defcustom shadow-todo-file
+  (locate-user-emacs-file "shadow_todo" ".shadow_todo")
   "File to store the list of uncopied shadows in.
 This means that if a remote system is down, or for any reason you cannot or
 decide not to copy your shadow files at the end of one Emacs session, it will
 remember and ask you again in your next Emacs session.
 This file must NOT be shadowed to any other system, it is host-specific.
 Default: ~/.emacs.d/shadow_todo"
-  :type '(choice (const nil) file)
-  :group 'shadow)
+  :type 'file
+  :group 'shadow
+  :version "26.2")
 
 
 ;;; The following two variables should in most cases initialize themselves
 ;;; correctly.  They are provided as variables in case the defaults are wrong
 ;;; on your machine (and for efficiency).
 
-(defvar shadow-system-name (system-name)
-  "The complete hostname of this machine.")
+(defvar shadow-system-name (concat "/" (system-name) ":")
+  "The identification for local files on this machine.")
 
-(defvar shadow-homedir nil
+(defvar shadow-homedir "~"
   "Your home directory on this machine.")
 
 ;;;
@@ -186,12 +184,12 @@
   (car list))
 
 (defun shadow-regexp-superquote (string)
-  "Like `regexp-quote', but includes the ^ and $.
+  "Like `regexp-quote', but includes the \\` and \\'.
 This makes sure regexp matches nothing but STRING."
-  (concat "^" (regexp-quote string) "$"))
+  (concat "\\`" (regexp-quote string) "\\'"))
 
 (defun shadow-suffix (prefix string)
-  "If PREFIX begins STRING, return the rest.
+  "If PREFIX begins with STRING, return the rest.
 Return value is non-nil if PREFIX and STRING are `string=' up to the length of
 PREFIX."
   (let ((lp (length prefix))
@@ -204,70 +202,66 @@
 ;;; Clusters and sites
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; I use the term `site' to refer to a string which may be the name of a
-;;; cluster or a literal hostname.  All user-level commands should accept
-;;; either.
-
-(defun shadow-make-cluster (name primary regexp)
-  "Create a shadow cluster.
-It is called NAME, uses the PRIMARY hostname and REGEXP matching all
-hosts in the cluster.  The variable `shadow-clusters' associates the
-names of clusters to these structures.  This function is for program
-use: to create clusters interactively, use `shadow-define-cluster'
-instead."
-  (list name primary regexp))
-
-(defmacro shadow-cluster-name (cluster)
-  "Return the name of the CLUSTER."
-  (list 'elt cluster 0))
-
-(defmacro shadow-cluster-primary (cluster)
-  "Return the primary hostname of a CLUSTER."
-  (list 'elt cluster 1))
-
-(defmacro shadow-cluster-regexp (cluster)
-  "Return the regexp matching hosts in a CLUSTER."
-  (list 'elt cluster 2))
+;;; I use the term `site' to refer to a string which may be the
+;;; cluster identification "/name:", a remote identification
+;;; "/method:user@host:", or "/system-name:' (the value of
+;;; `shadow-system-name') for the location of local files.  All
+;;; user-level commands should accept either.
+
+(cl-defstruct (shadow-cluster (:type list) :named) name primary regexp)
 
 (defun shadow-set-cluster (name primary regexp)
   "Put cluster NAME on the list of clusters.
 Replace old definition, if any.  PRIMARY and REGEXP are the
 information defining the cluster.  For interactive use, call
 `shadow-define-cluster' instead."
-  (let ((rest (cl-remove-if (lambda (x) (equal name (car x)))
+  (let ((rest (cl-remove-if (lambda (x) (equal name (shadow-cluster-name x)))
 			    shadow-clusters)))
     (setq shadow-clusters
-	  (cons (shadow-make-cluster name primary regexp)
+	  (cons (make-shadow-cluster :name name :primary primary :regexp regexp)
 		rest))))
 
-(defmacro shadow-get-cluster (name)
+(defun shadow-get-cluster (name)
   "Return cluster named NAME, or nil."
-  (list 'assoc name 'shadow-clusters))
+  (shadow-find
+   (lambda (x) (string-equal (shadow-cluster-name x) name))
+   shadow-clusters))
+
+;;; SITES
+
+(defun shadow-site-name (site)
+  "Return name if SITE has the form \"/name:\", otherwise SITE."
+  (if (string-match "\\`/\\([-.[:word:]]+\\):\\'" site)
+      (match-string 1 site) site))
+
+(defun shadow-name-site (name)
+  "Return \"/name:\" if NAME has word syntax, otherwise NAME."
+  (if (string-match "\\`[-.[:word:]]+\\'" name)
+      (format "/%s:"name) name))
 
 (defun shadow-site-primary (site)
-  "If SITE is a cluster, return primary host, otherwise return SITE."
-  (let ((c (shadow-get-cluster site)))
-    (if c
-	(shadow-cluster-primary c)
+  "If SITE is a cluster, return primary identification, otherwise return SITE."
+  (let ((cluster (shadow-get-cluster (shadow-site-name site))))
+    (if cluster
+	(shadow-cluster-primary cluster)
       site)))
 
-;;; SITES
-
 (defun shadow-site-cluster (site)
-  "Given a SITE (hostname or cluster name), return cluster it is in, or nil."
-  (or (assoc site shadow-clusters)
+  "Given a SITE, return cluster it is in, or nil."
+  (or (shadow-get-cluster (shadow-site-name site))
       (shadow-find
-       (function (lambda (x)
-		   (string-match (shadow-cluster-regexp x)
-				 site)))
+       (lambda (x)
+         (string-match (shadow-cluster-regexp x) (shadow-name-site site)))
        shadow-clusters)))
 
 (defun shadow-read-site ()
-  "Read a cluster name or hostname from the minibuffer."
-  (let ((ans (completing-read "Host or cluster name [RET when done]: "
+  "Read a cluster name or host identification from the minibuffer."
+  (let ((ans (completing-read "Host identification or cluster name: "
 			      shadow-clusters)))
-    (if (equal "" ans)
-	nil
+    (when (or (shadow-get-cluster (shadow-site-name ans))
+	      (string-equal ans shadow-system-name)
+	      (string-equal ans (shadow-site-name shadow-system-name))
+	      (setq ans (file-remote-p ans)))
       ans)))
 
 (defun shadow-site-match (site1 site2)
@@ -281,63 +275,95 @@
 	    (string-match (shadow-cluster-regexp cluster1) primary2)
 	  (string-equal site1 primary2)))))
 
-(defun shadow-get-user (site)
-  "Return the default username for a SITE."
-  (ange-ftp-get-user (shadow-site-primary site)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Filename manipulation
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun shadow-parse-fullname (fullname)
-  "Parse FULLNAME into (site user path) list.
-Leave it alone if it already is one.  Return nil if the argument is
-not a full ange-ftp pathname."
-  (if (listp fullname)
-      fullname
-    (ange-ftp-ftp-name fullname)))
-
 (defun shadow-parse-name (name)
-  "Parse any NAME into (site user name) list.
-Argument can be a simple name, full ange-ftp name, or already a hup list."
-  (or (shadow-parse-fullname name)
-      (list shadow-system-name
-	    (user-login-name)
-	    name)))
-
-(defsubst shadow-make-fullname (host user name)
-  "Make an ange-ftp style fullname out of HOST, USER (optional), and NAME.
-This is probably not as general as it ought to be."
-  (concat "/"
-	  (if user (concat user "@"))
-	  host ":"
-	  name))
+  "Parse any NAME into a `tramp-file-name' structure.
+Argument can be a simple name, remote file name, or already a
+`tramp-file-name' structure."
+  (cond
+   ((null name) nil)
+   ((tramp-file-name-p name) name)
+   ((file-remote-p name) (tramp-dissect-file-name name))
+   ((shadow-local-file name)
+    (make-tramp-file-name
+     :host (shadow-site-name shadow-system-name)
+     :localname (shadow-local-file name)))
+   ;; Cluster name.
+   ((string-match "^/\\([^:/]+\\):\\([^:]*\\)$" name)
+    (let ((name (match-string 1 name))
+          (file (match-string 2 name)))
+      (when (shadow-get-cluster name)
+        (make-tramp-file-name :host name :localname file))))))
+
+(defsubst shadow-make-fullname (hup &optional host name)
+  "Make a Tramp style fullname out of HUP, a `tramp-file-name' structure.
+Replace HOST, and NAME when non-nil."
+  (let ((hup (copy-tramp-file-name hup)))
+    (when host (setf (tramp-file-name-host hup) host))
+    (when name (setf (tramp-file-name-localname hup) name))
+    (if (null (tramp-file-name-method hup))
+	(format
+	 "/%s:%s" (tramp-file-name-host hup) (tramp-file-name-localname hup))
+      (tramp-make-tramp-file-name
+       (tramp-file-name-method hup)
+       (tramp-file-name-user hup)
+       (tramp-file-name-domain hup)
+       (tramp-file-name-host hup)
+       (tramp-file-name-port hup)
+       (tramp-file-name-localname hup)
+       (tramp-file-name-hop hup)))))
 
 (defun shadow-replace-name-component (fullname newname)
   "Return FULLNAME with the name component changed to NEWNAME."
-  (let ((hup (shadow-parse-fullname fullname)))
-    (shadow-make-fullname (nth 0 hup) (nth 1 hup) newname)))
+  (concat (file-remote-p fullname) newname))
 
 (defun shadow-local-file (file)
-  "If FILE is at this site, remove /user@host part.
-If refers to a different system or a different user on this system,
-return nil."
-  (let ((hup (shadow-parse-fullname file)))
-    (cond ((null hup) file)
-	  ((and (shadow-site-match (nth 0 hup) shadow-system-name)
-		(string-equal (nth 1 hup) (user-login-name)))
-	   (nth 2 hup))
-	  (t nil))))
+  "If FILE is not remote, return it.
+If it refers to a different system, return nil."
+  (cond
+   ((null file) nil)
+   ;; `tramp-file-name' structure.
+   ((and (tramp-file-name-p file) (null (tramp-file-name-method file)))
+    (tramp-file-name-localname file))
+   ((tramp-file-name-p file) nil)
+   ;; Local host name.
+   ((string-match
+     (format "^%s\\([^:]*\\)$" (regexp-quote shadow-system-name)) file)
+    (match-string 1 file))
+   ;; Cluster name.
+   ((and (string-match "^/\\([^:/]+\\):\\([^:]*\\)$" file)
+         (shadow-get-cluster (match-string 1 file)))
+    (let ((file (match-string 2 file))
+	  (primary
+	   (shadow-cluster-primary
+	    (shadow-get-cluster (match-string 1 file)))))
+      (when (string-equal primary shadow-system-name) (setq primary nil))
+      (shadow-local-file (concat primary file))))
+   ;; Local name.
+   ((null (file-remote-p file)) file)))
 
 (defun shadow-expand-cluster-in-file-name (file)
   "If hostname part of FILE is a cluster, expand it to cluster's primary hostname.
 Will return the name bare if it is a local file."
-  (let ((hup (shadow-parse-name file)))
-    (cond ((null hup) file)
-	  ((shadow-local-file hup))
-	  ((shadow-make-fullname (shadow-site-primary (nth 0 hup))
-				 (nth 1 hup)
-				 (nth 2 hup))))))
+  (when (stringp file)
+    (cond
+     ;; Local file.
+     ((shadow-local-file file))
+     ;; Cluster name.
+     ((string-match "^\\(/[^:/]+:\\)[^:]*$" file)
+      (let ((primary
+             (save-match-data
+	       (shadow-cluster-primary
+	        (shadow-get-cluster
+                 (shadow-site-name (match-string 1 file)))))))
+	(if (not primary)
+            file
+          (setq file (replace-match primary nil nil file 1))
+          (or (shadow-local-file file) file))))
+     (t file))))
 
 (defun shadow-expand-file-name (file &optional default)
   "Expand file name and get FILE's true name."
@@ -352,46 +378,50 @@
 	 (homedir (if (shadow-local-file hup)
 		      shadow-homedir
 		    (file-name-as-directory
-		     (nth 2 (shadow-parse-fullname
-			     (expand-file-name
-			      (shadow-make-fullname
-			       (nth 0 hup) (nth 1 hup) "~")))))))
-	 (suffix (shadow-suffix homedir (nth 2 hup)))
-	 (cluster (shadow-site-cluster (nth 0 hup))))
+		     (file-local-name
+                      (expand-file-name (shadow-make-fullname hup nil "~"))))))
+	 (suffix (shadow-suffix homedir (tramp-file-name-localname hup)))
+	 (cluster (shadow-site-cluster (shadow-make-fullname hup nil ""))))
+    (when cluster
+      (setf (tramp-file-name-method hup) nil
+	    (tramp-file-name-host hup) (shadow-cluster-name cluster)))
     (shadow-make-fullname
-     (if cluster
-	 (shadow-cluster-name cluster)
-       (nth 0 hup))
-     (nth 1 hup)
+     hup nil
      (if suffix
-	 (concat "~/" suffix)
-       (nth 2 hup)))))
+         (concat "~/" suffix)
+       (tramp-file-name-localname hup)))))
 
 (defun shadow-same-site (pattern file)
   "True if the site of PATTERN and of FILE are on the same site.
-If usernames are supplied, they must also match exactly.  PATTERN and FILE may
-be lists of host, user, name, or ange-ftp file names.  FILE may also be just a
-local filename."
-  (let ((pattern-sup (shadow-parse-fullname pattern))
+PATTERN and FILE may be Tramp vectors, or remote file names.
+FILE may also be just a local filename."
+  (let ((pattern-sup (shadow-parse-name pattern))
 	(file-sup    (shadow-parse-name file)))
     (and
-     (shadow-site-match (nth 0 pattern-sup) (nth 0 file-sup))
-     (or (null (nth 1 pattern-sup))
-	 (string-equal (nth 1 pattern-sup) (nth 1 file-sup))))))
+     (shadow-site-match
+      (tramp-file-name-host pattern-sup) (tramp-file-name-host file-sup))
+     (or (null (tramp-file-name-user pattern-sup))
+	 (string-equal
+          (tramp-file-name-user pattern-sup)
+          (tramp-file-name-user file-sup))))))
 
 (defun shadow-file-match (pattern file &optional regexp)
  "Return t if PATTERN matches FILE.
 If REGEXP is supplied and non-nil, the file part of the pattern is a regular
-expression, otherwise it must match exactly.  The sites and usernames must
-match---see `shadow-same-site'.  The pattern must be in full ange-ftp format,
+expression, otherwise it must match exactly.  The sites must
+match---see `shadow-same-site'.  The pattern must be in full Tramp format,
 but the file can be any valid filename.  This function does not do any
 filename expansion or contraction, you must do that yourself first."
- (let* ((pattern-sup (shadow-parse-fullname pattern))
+ (let* ((pattern-sup (shadow-parse-name pattern))
 	(file-sup (shadow-parse-name file)))
    (and (shadow-same-site pattern-sup file-sup)
 	(if regexp
-	    (string-match (nth 2 pattern-sup) (nth 2 file-sup))
-	  (string-equal (nth 2 pattern-sup) (nth 2 file-sup))))))
+	    (string-match
+             (tramp-file-name-localname pattern-sup)
+             (tramp-file-name-localname file-sup))
+	  (string-equal
+           (tramp-file-name-localname pattern-sup)
+           (tramp-file-name-localname file-sup))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; User-level Commands
@@ -405,30 +435,34 @@
 defined by a name, the network address of a primary host (the one we copy
 files to), and a regular expression that matches the hostnames of all the
 sites in the cluster."
-  (interactive (list (completing-read "Cluster name: " shadow-clusters () ())))
+  (interactive (list (completing-read "Cluster name: " shadow-clusters)))
   (let* ((old (shadow-get-cluster name))
-	 (primary (read-string "Primary host: "
-			       (if old (shadow-cluster-primary old)
-				 name)))
-	 (regexp   (let (try-regexp)
-		     (while (not
-			     (string-match
-			      (setq try-regexp
+	 (primary (let (try-primary)
+		    (while (not
+			    (or
+			     (string-equal
+			      (setq try-primary
 				    (read-string
-				     "Regexp matching all host names: "
-				     (if old (shadow-cluster-regexp old)
-				       (shadow-regexp-superquote primary))))
-			      primary))
-		       (message "Regexp doesn't include the primary host!")
-		       (sit-for 2))
-		     try-regexp))
-;	 (username (read-no-blanks-input
-;		    (format "Username (default %s): "
-;			    (shadow-get-user primary))
-;		    (if old (or (shadow-cluster-username old) "")
-;		      (user-login-name))))
-	 )
-;    (if (string-equal "" username) (setq username nil))
+				     "Primary host: "
+				     (if old (shadow-cluster-primary old)
+				       name)))
+			      shadow-system-name)
+			     (file-remote-p try-primary)))
+		      (message "Not a valid primary!")
+		      (sit-for 2))
+		    try-primary))
+	 (regexp  (let (try-regexp)
+		    (while (not
+			    (string-match
+			     (setq try-regexp
+				   (read-string
+				    "Regexp matching all host names: "
+				    (if old (shadow-cluster-regexp old)
+				      (shadow-regexp-superquote primary))))
+			     primary))
+		      (message "Regexp doesn't include the primary host!")
+		      (sit-for 2))
+		    try-regexp)))
     (shadow-set-cluster name primary regexp)))
 
 ;;;###autoload
@@ -438,20 +472,14 @@
 new version will be copied to each of the other locations.  Sites can be
 specific hostnames, or names of clusters (see `shadow-define-cluster')."
   (interactive)
-  (let* ((hup (shadow-parse-fullname
+  (let* ((hup (shadow-parse-name
 	       (shadow-contract-file-name (buffer-file-name))))
-	 (name (nth 2 hup))
-	 user site group)
+	 (name (tramp-file-name-localname hup))
+	 site group)
     (while (setq site (shadow-read-site))
-      (setq user (read-string (format "Username (default %s): "
-				      (shadow-get-user site)))
-	    name (read-string "Filename: " name))
-      (setq group (cons (shadow-make-fullname site
-					      (if (string-equal "" user)
-						  (shadow-get-user site)
-						user)
-					      name)
-			group)))
+      (setq name (read-string "Filename: " name)
+            hup (shadow-parse-name (shadow-contract-file-name name))
+	    group (cons (shadow-make-fullname hup site) group)))
     (setq shadow-literal-groups (cons group shadow-literal-groups)))
   (shadow-write-info-file))
 
@@ -468,19 +496,12 @@
 		 "Filename regexp: "
 		 (if (buffer-file-name)
 		     (shadow-regexp-superquote
-		      (nth 2
-			   (shadow-parse-name
-			    (shadow-contract-file-name
-			     (buffer-file-name))))))))
-	site sites usernames)
+                      (file-local-name (buffer-file-name))))))
+	site sites)
     (while (setq site (shadow-read-site))
-      (setq sites (cons site sites))
-      (setq usernames
-	    (cons (read-string (format "Username for %s: " site)
-			       (shadow-get-user site))
-		  usernames)))
+      (setq sites (cons site sites)))
     (setq shadow-regexp-groups
-	  (cons (shadow-make-group regexp sites usernames)
+	  (cons (shadow-make-group regexp sites)
 		shadow-regexp-groups))
     (shadow-write-info-file)))
 
@@ -537,14 +558,14 @@
 ;;; Internal functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun shadow-make-group (regexp sites usernames)
+(defun shadow-make-group (regexp sites)
   "Make a description of a file group---
-actually a list of regexp ange-ftp file names---from REGEXP (name of file to
-be shadowed), list of SITES, and corresponding list of USERNAMES for each
-site."
+actually a list of regexp Tramp file names---from REGEXP (name of file to
+be shadowed), and list of SITES"
   (if sites
-      (cons (shadow-make-fullname (car sites) (car usernames) regexp)
-	    (shadow-make-group regexp (cdr sites) (cdr usernames)))
+      (cons (shadow-make-fullname
+             (shadow-parse-name (shadow-site-primary (car sites))) nil regexp)
+	    (shadow-make-group regexp (cdr sites)))
     nil))
 
 (defun shadow-copy-file (s)
@@ -601,7 +622,9 @@
 			   (car groups))))
 	(append (cond ((equal nonmatching (car groups)) nil)
 		      (regexp
-		       (let ((realname (nth 2 (shadow-parse-fullname file))))
+		       (let ((realname
+                              (tramp-file-name-localname
+                               (shadow-parse-name file))))
 			 (mapcar
 			  (function
 			   (lambda (x)
@@ -636,9 +659,8 @@
 Thus restores shadowfile's state from your last Emacs session.
 Return t unless files were locked; then return nil."
   (interactive)
-  (if (and (fboundp 'file-locked-p)
-	   (or (stringp (file-locked-p shadow-info-file))
-	       (stringp (file-locked-p shadow-todo-file))))
+  (if (or (stringp (file-locked-p shadow-info-file))
+          (stringp (file-locked-p shadow-todo-file)))
       (progn
 	(message "Shadowfile is running in another Emacs; can't have two.")
 	(beep)
@@ -647,7 +669,7 @@
     (save-current-buffer
       (when shadow-info-file
 	(set-buffer (setq shadow-info-buffer
-			  (find-file-noselect shadow-info-file)))
+			  (find-file-noselect shadow-info-file 'nowarn)))
 	(when (and (not (buffer-modified-p))
 		   (file-newer-than-file-p (make-auto-save-file-name)
 					   shadow-info-file))
@@ -680,6 +702,7 @@
 	(if (not shadow-info-buffer)
 	    (setq shadow-info-buffer (find-file-noselect shadow-info-file)))
 	(set-buffer shadow-info-buffer)
+        (setq buffer-read-only nil)
 	(delete-region (point-min) (point-max))
 	(shadow-insert-var 'shadow-clusters)
 	(shadow-insert-var 'shadow-literal-groups)
@@ -692,6 +715,7 @@
     (if (not shadow-todo-buffer)
 	(setq shadow-todo-buffer (find-file-noselect shadow-todo-file)))
     (set-buffer shadow-todo-buffer)
+    (setq buffer-read-only nil)
     (delete-region (point-min) (point-max))
     (shadow-insert-var 'shadow-files-to-copy)
     (if save (shadow-save-todo-file))))
@@ -765,24 +789,6 @@
        (kill-emacs)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Lucid Emacs compatibility
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; This is on hold until someone tells me about a working version of
-;; map-ynp for Lucid Emacs.
-
-;(when (string-match "Lucid" emacs-version)
-;  (require 'symlink-fix)
-;  (require 'ange-ftp)
-;  (require 'map-ynp)
-;  (if (not (fboundp 'file-truename))
-;      (fset 'shadow-expand-file-name
-;	    (symbol-function 'symlink-expand-file-name)))
-;  (if (not (fboundp 'ange-ftp-ftp-name))
-;      (fset 'ange-ftp-ftp-name
-;	    (symbol-function 'ange-ftp-ftp-name))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Hook us up
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -790,18 +796,10 @@
 (defun shadow-initialize ()
   "Set up file shadowing."
   (interactive)
-  (if (null shadow-homedir)
-      (setq shadow-homedir
-	    (file-name-as-directory (shadow-expand-file-name "~"))))
-  (if (null shadow-info-file)
-      (setq shadow-info-file
-            ;; FIXME: Move defaults to their defcustom.
-	    (shadow-expand-file-name
-             (locate-user-emacs-file "shadows" ".shadows"))))
-  (if (null shadow-todo-file)
-      (setq shadow-todo-file
-	    (shadow-expand-file-name
-	     (locate-user-emacs-file "shadow_todo" ".shadow_todo"))))
+  (setq shadow-homedir
+        (file-name-as-directory (shadow-expand-file-name shadow-homedir))
+        shadow-info-file (shadow-expand-file-name shadow-info-file)
+        shadow-todo-file (shadow-expand-file-name shadow-todo-file))
   (if (not (shadow-read-files))
       (progn
 	(message "Shadowfile information files not found - aborting")
diff -Nru emacs-26.1+1/lisp/shell.el emacs-26.3+1/lisp/shell.el
--- emacs-26.1+1/lisp/shell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/shell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 1993-1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1988, 1993-1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
@@ -483,7 +483,7 @@
   ;; Don't use pcomplete's defaulting mechanism, rely on
   ;; shell-dynamic-complete-functions instead.
   (set (make-local-variable 'pcomplete-default-completion-function) #'ignore)
-  (setq comint-input-autoexpand shell-input-autoexpand)
+  (setq-local comint-input-autoexpand shell-input-autoexpand)
   ;; Not needed in shell-mode because it's inherited from comint-mode, but
   ;; placed here for read-shell-command.
   (add-hook 'completion-at-point-functions 'comint-completion-at-point nil t))
diff -Nru emacs-26.1+1/lisp/simple.el emacs-26.3+1/lisp/simple.el
--- emacs-26.1+1/lisp/simple.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/simple.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; simple.el --- basic editing commands for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1993-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
@@ -639,8 +639,9 @@
           (while (re-search-forward "\\s-$" end-marker t)
             (skip-syntax-backward "-" (line-beginning-position))
             (let ((b (point)) (e (match-end 0)))
-              (when (region-modifiable-p b e)
-                (delete-region b e)))))
+              (if (region-modifiable-p b e)
+                  (delete-region b e)
+                (goto-char e)))))
         (if end
             (set-marker end-marker nil)
           ;; Delete trailing empty lines.
@@ -1010,13 +1011,16 @@
         (filter-buffer-substring (region-beginning) (region-end) method)))))
   "Function to get the region's content.
 Called with one argument METHOD which can be:
-- nil: return the content as a string.
+- nil: return the content as a string (list of strings for
+  non-contiguous regions).
 - `delete-only': delete the region; the return value is undefined.
-- `bounds': return the boundaries of the region as a list of cons
-  cells of the form (START . END).
+- `bounds': return the boundaries of the region as a list of one
+  or more cons cells of the form (START . END).
 - anything else: delete the region and return its content
-  as a string, after filtering it with `filter-buffer-substring', which
-  is called with METHOD as its 3rd argument.")
+  as a string (or list of strings for non-contiguous regions),
+  after filtering it with `filter-buffer-substring', which
+  is called, for each contiguous sub-region, with METHOD as its
+  3rd argument.")
 
 (defvar region-insert-function
   (lambda (lines)
@@ -1352,7 +1356,7 @@
 	(if (or (not coding)
 		(eq (coding-system-type coding) t))
 	    (setq coding (default-value 'buffer-file-coding-system)))
-	(if (eq (char-charset char) 'eight-bit)
+	(if (and (>= char #x3fff80) (<= char #x3fffff))
 	    (setq encoding-msg
 		  (format "(%d, #o%o, #x%x, raw-byte)" char char char))
 	  ;; Check if the character is displayed with some `display'
@@ -1470,9 +1474,9 @@
   :version "26.1")
 
 (defun eval-expression-print-format (value)
-  "If VALUE in an integer, return a specially formatted string.
+  "If VALUE is an integer, return a specially formatted string.
 This string will typically look like \" (#o1, #x1, ?\\C-a)\".
-If VALUE is not an integer, nil is returned.
+If VALUE is not an integer, return nil.
 This function is used by commands like `eval-expression' that
 display the result of expression evaluation."
   (when (integerp value)
@@ -1533,11 +1537,11 @@
 there is no such truncation.
 
 If the resulting value is an integer, and CHAR-PRINT-LIMIT is
-non-nil (interactively, unless given a positive prefix argument)
+non-nil (interactively, unless given a non-zero prefix argument)
 it will be printed in several additional formats (octal,
 hexadecimal, and character).  The character format is only used
 if the value is below CHAR-PRINT-LIMIT (interactively, if the
-prefix argument is -1 or the value is below
+prefix argument is -1 or the value doesn't exceed
 `eval-expression-print-maximum-character').
 
 Runs the hook `eval-expression-minibuffer-setup-hook' on entering the
@@ -2116,7 +2120,11 @@
 	 (prompt-end (minibuffer-prompt-end))
 	 (old-column (unless (and (eolp) (> (point) prompt-end))
 		       (if (= (line-number-at-pos) 1)
-			   (max (- (current-column) (1- prompt-end)) 0)
+			   (max (- (current-column)
+				   (save-excursion
+				     (goto-char (1- prompt-end))
+				     (current-column)))
+				0)
 			 (current-column)))))
     (condition-case nil
 	(with-no-warnings
@@ -2135,7 +2143,10 @@
        (goto-char (point-max))
        (when old-column
 	 (if (= (line-number-at-pos) 1)
-	     (move-to-column (+ old-column (1- (minibuffer-prompt-end))))
+	     (move-to-column (+ old-column
+				(save-excursion
+				  (goto-char (1- (minibuffer-prompt-end)))
+				  (current-column))))
 	   (move-to-column old-column)))))))
 
 (defun previous-line-or-history-element (&optional arg)
@@ -2150,7 +2161,11 @@
 	 (prompt-end (minibuffer-prompt-end))
 	 (old-column (unless (and (eolp) (> (point) prompt-end))
 		       (if (= (line-number-at-pos) 1)
-			   (max (- (current-column) (1- prompt-end)) 0)
+			   (max (- (current-column)
+				   (save-excursion
+				     (goto-char (1- prompt-end))
+				     (current-column)))
+				0)
 			 (current-column)))))
     (condition-case nil
 	(with-no-warnings
@@ -2169,7 +2184,10 @@
        (goto-char (minibuffer-prompt-end))
        (if old-column
 	   (if (= (line-number-at-pos) 1)
-	       (move-to-column (+ old-column (1- (minibuffer-prompt-end))))
+	       (move-to-column (+ old-column
+				  (save-excursion
+				    (goto-char (1- (minibuffer-prompt-end)))
+				    (current-column))))
 	     (move-to-column old-column))
 	 ;; Put the cursor at the end of the visual line instead of the
 	 ;; logical line, so the next `previous-line-or-history-element'
@@ -3848,11 +3866,14 @@
       (process-file shell-file-name nil t nil shell-command-switch command))))
 
 (defun process-file (program &optional infile buffer display &rest args)
-  "Process files synchronously in a separate process.
+  "Process files synchronously in a separate process that runs PROGRAM.
 Similar to `call-process', but may invoke a file handler based on
 `default-directory'.  The current working directory of the
 subprocess is `default-directory'.
 
+If PROGRAM is a remote file name, it should be processed
+by `file-local-name' before passing it to this function.
+
 File names in INFILE and BUFFER are handled normally, but file
 names in ARGS should be relative to `default-directory', as they
 are passed to the process verbatim.  (This is a difference to
@@ -3897,12 +3918,15 @@
 
 This handler ought to run PROGRAM, perhaps on the local host,
 perhaps on a remote host that corresponds to `default-directory'.
-In the latter case, the local part of `default-directory' becomes
-the working directory of the process.
+In the latter case, the local part of `default-directory', the one
+produced from it by `file-local-name', becomes the working directory
+of the process on the remote host.
 
 PROGRAM and PROGRAM-ARGS might be file names.  They are not
-objects of file handler invocation.  File handlers might not
-support pty association, if PROGRAM is nil."
+objects of file handler invocation, so they need to be obtained
+by calling `file-local-name', in case they are remote file names.
+
+File handlers might not support pty association, if PROGRAM is nil."
   (let ((fh (find-file-name-handler default-directory 'start-file-process)))
     (if fh (apply fh 'start-file-process name buffer program program-args)
       (apply 'start-process name buffer program program-args))))
@@ -4228,7 +4252,7 @@
 Use `filter-buffer-substring' instead of `buffer-substring',
 `buffer-substring-no-properties', or `delete-and-extract-region' when
 you want to allow filtering to take place.  For example, major or minor
-modes can use `filter-buffer-substring-function' to extract characters
+modes can use `filter-buffer-substring-function' to exclude text properties
 that are special to a buffer, and should not be copied into other buffers."
   (funcall filter-buffer-substring-function beg end delete))
 
@@ -4323,13 +4347,13 @@
 A non-nil value ensures that Emacs kill operations do not
 irrevocably overwrite existing clipboard text by saving it to the
 `kill-ring' prior to the kill.  Such text can subsequently be
-retrieved via \\[yank] \\[yank-pop]]."
+retrieved via \\[yank] \\[yank-pop]."
   :type 'boolean
   :group 'killing
   :version "23.2")
 
 (defcustom kill-do-not-save-duplicates nil
-  "Do not add a new string to `kill-ring' if it duplicates the last one.
+  "If non-nil, don't add a string to `kill-ring' if it duplicates the last one.
 The comparison is done using `equal-including-properties'."
   :type 'boolean
   :group 'killing
@@ -5244,8 +5268,10 @@
   nil)
 
 (defun append-to-buffer (buffer start end)
-  "Append to specified buffer the text of the region.
-It is inserted into that buffer before its point.
+  "Append to specified BUFFER the text of the region.
+The text is inserted into that buffer before its point.
+BUFFER can be a buffer or the name of a buffer; this
+function will create BUFFER if it doesn't already exist.
 
 When calling from a program, give three arguments:
 BUFFER (or buffer name), START and END.
@@ -5267,8 +5293,10 @@
             (set-window-point window (point))))))))
 
 (defun prepend-to-buffer (buffer start end)
-  "Prepend to specified buffer the text of the region.
-It is inserted into that buffer after its point.
+  "Prepend to specified BUFFER the text of the region.
+The text is inserted into that buffer after its point.
+BUFFER can be a buffer or the name of a buffer; this
+function will create BUFFER if it doesn't already exist.
 
 When calling from a program, give three arguments:
 BUFFER (or buffer name), START and END.
@@ -5281,8 +5309,10 @@
 	(insert-buffer-substring oldbuf start end)))))
 
 (defun copy-to-buffer (buffer start end)
-  "Copy to specified buffer the text of the region.
-It is inserted into that buffer, replacing existing text there.
+  "Copy to specified BUFFER the text of the region.
+The text is inserted into that buffer, replacing existing text there.
+BUFFER can be a buffer or the name of a buffer; this
+function will create BUFFER if it doesn't already exist.
 
 When calling from a program, give three arguments:
 BUFFER (or buffer name), START and END.
@@ -5488,8 +5518,10 @@
        (progn (cl-assert (mark)) t)))
 
 (defun region-bounds ()
-  "Return the boundaries of the region as a pair of positions.
-Value is a list of cons cells of the form (START . END)."
+  "Return the boundaries of the region.
+Value is a list of one or more cons cells of the form (START . END).
+It will have more than one cons cell when the region is non-contiguous,
+see `region-noncontiguous-p' and `extract-rectangle-bounds'."
   (funcall region-extract-function 'bounds))
 
 (defun region-noncontiguous-p ()
@@ -5792,10 +5824,10 @@
 
 Transient Mark mode is a global minor mode.  When enabled, the
 region is highlighted with the `region' face whenever the mark
-is active.  The mark is \"deactivated\" by changing the buffer,
-and after certain other operations that set the mark but whose
-main purpose is something else--for example, incremental search,
-\\[beginning-of-buffer], and \\[end-of-buffer].
+is active.  The mark is \"deactivated\" after certain non-motion
+commands, including those that change the text in the buffer, and
+during shift or mouse selection by any unshifted cursor motion
+command (see Info node `Shift Selection' for more details).
 
 You can also deactivate the mark by typing \\[keyboard-quit] or
 \\[keyboard-escape-quit].
@@ -5971,10 +6003,6 @@
 When the `track-eol' feature is doing its job, the value is
 `most-positive-fixnum'.")
 
-(defvar last--line-number-width 0
-  "Last value of width used for displaying line numbers.
-Used internally by `line-move-visual'.")
-
 (defcustom line-move-ignore-invisible t
   "Non-nil means commands that move by lines ignore invisible newlines.
 When this option is non-nil, \\[next-line], \\[previous-line], \\[move-end-of-line], and \\[move-beginning-of-line] behave
@@ -5997,7 +6025,7 @@
 If nil, `line-move' moves point by logical lines.
 A non-nil setting of `goal-column' overrides the value of this variable
 and forces movement by logical lines.
-A window that is  horizontally scrolled also forces movement by logical
+A window that is horizontally scrolled also forces movement by logical
 lines."
   :type 'boolean
   :group 'editing-basics
@@ -6253,19 +6281,9 @@
 	     (memq last-command `(next-line previous-line ,this-command)))
 	;; If so, there's no need to reset `temporary-goal-column',
 	;; but we may need to hscroll.
-        (progn
-          (if (or (/= (cdr temporary-goal-column) hscroll)
-                  (>  (cdr temporary-goal-column) 0))
-              (setq target-hscroll (cdr temporary-goal-column)))
-          ;; Update the COLUMN part of temporary-goal-column if the
-          ;; line-number display changed its width since the last
-          ;; time.
-          (setq temporary-goal-column
-                (cons (+ (car temporary-goal-column)
-                         (/ (float (- lnum-width last--line-number-width))
-                            (frame-char-width)))
-                      (cdr temporary-goal-column)))
-          (setq last--line-number-width lnum-width))
+        (if (or (/= (cdr temporary-goal-column) hscroll)
+                (>  (cdr temporary-goal-column) 0))
+            (setq target-hscroll (cdr temporary-goal-column)))
       ;; Otherwise, we should reset `temporary-goal-column'.
       (let ((posn (posn-at-point))
 	    x-pos)
@@ -6275,7 +6293,7 @@
 	 ((memq (nth 1 posn) '(right-fringe left-fringe))
 	  (setq temporary-goal-column (cons (window-width) hscroll)))
 	 ((car (posn-x-y posn))
-	  (setq x-pos (car (posn-x-y posn)))
+	  (setq x-pos (- (car (posn-x-y posn)) lnum-width))
 	  ;; In R2L lines, the X pixel coordinate is measured from the
 	  ;; left edge of the window, but columns are still counted
 	  ;; from the logical-order beginning of the line, i.e. from
@@ -7817,7 +7835,7 @@
   "If the buffer starts with a mail header, move point to the header's end.
 Otherwise, moves to `point-min'.
 The end of the header is the start of the next line, if there is one,
-else the end of the last line.  This function obeys RFC822."
+else the end of the last line.  This function obeys RFC 822 (or later)."
   (goto-char (point-min))
   (when (re-search-forward
 	 "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)
@@ -7943,7 +7961,7 @@
 		   (read-variable (format "Set variable (default %s): " default-var)
 				  default-var)
 		 (read-variable "Set variable: ")))
-	  (minibuffer-help-form '(describe-variable var))
+	  (minibuffer-help-form `(describe-variable ',var))
 	  (prop (get var 'variable-interactive))
           (obsolete (car (get var 'byte-obsolete-variable)))
 	  (prompt (format "Set %s %s to value: " var
@@ -8169,6 +8187,9 @@
 BUFFER - the buffer in which the choice should be inserted,
 BASE-POSITION - where to insert the completion.
 
+Functions should also accept and ignore a potential fourth
+argument, passed for backwards compatibility.
+
 If a function in the list returns non-nil, that function is supposed
 to have inserted the CHOICE in the BUFFER, and possibly exited
 the minibuffer; no further functions will be called.
diff -Nru emacs-26.1+1/lisp/skeleton.el emacs-26.3+1/lisp/skeleton.el
--- emacs-26.1+1/lisp/skeleton.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/skeleton.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; skeleton.el --- Lisp language extension for writing statement skeletons
 
-;; Copyright (C) 1993-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -268,7 +268,8 @@
 	(or (eolp) (not skeleton-end-newline) (newline-and-indent))
 	(run-hooks 'skeleton-end-hook)
 	(sit-for 0)
-	(or (pos-visible-in-window-p beg)
+	(or (not (eq (window-buffer) (current-buffer)))
+            (pos-visible-in-window-p beg)
 	    (progn
 	      (goto-char beg)
 	      (recenter 0)))
diff -Nru emacs-26.1+1/lisp/sort.el emacs-26.3+1/lisp/sort.el
--- emacs-26.1+1/lisp/sort.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/sort.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer -*- lexical-binding: t -*-
 
-;; Copyright (C) 1986-1987, 1994-1995, 2001-2018 Free Software
+;; Copyright (C) 1986-1987, 1994-1995, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Howie Kaye
diff -Nru emacs-26.1+1/lisp/soundex.el emacs-26.3+1/lisp/soundex.el
--- emacs-26.1+1/lisp/soundex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/soundex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; soundex.el --- implement Soundex algorithm -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/speedbar.el emacs-26.3+1/lisp/speedbar.el
--- emacs-26.1+1/lisp/speedbar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/speedbar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; speedbar --- quick access to files and tags in a frame
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
@@ -700,7 +700,7 @@
 function `speedbar-add-supported-extension' to add a new extension at
 runtime, or use the configuration dialog to set it in your init file.
 If you add an extension to this list, and it does not appear, you may
-need to also modify `completion-ignored-extension' which will also help
+need to also modify `completion-ignored-extensions' which will also help
 file completion."
   :group 'speedbar
   :type '(repeat (regexp :tag "Extension Regexp"))
diff -Nru emacs-26.1+1/lisp/startup.el emacs-26.3+1/lisp/startup.el
--- emacs-26.1+1/lisp/startup.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/startup.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; startup.el --- process Emacs shell arguments  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994-2018 Free Software Foundation,
+;; Copyright (C) 1985-1986, 1992, 1994-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -552,9 +552,17 @@
 	    (if default-directory
 		(setq default-directory
                       (if (eq system-type 'windows-nt)
-                          ;; Convert backslashes to forward slashes.
-                          (expand-file-name
-                           (decode-coding-string default-directory coding t))
+                          ;; We pass the decoded default-directory as
+                          ;; the 2nd arg to expand-file-name to make
+                          ;; sure it sees a multibyte string as the
+                          ;; default directory; this avoids the side
+                          ;; effect of returning a unibyte string from
+                          ;; expand-file-name because it still sees
+                          ;; the undecoded value of default-directory.
+                          (let ((defdir (decode-coding-string default-directory
+                                                              coding t)))
+                            ;; Convert backslashes to forward slashes.
+                            (expand-file-name defdir defdir))
                         (decode-coding-string default-directory coding t))))))
 
 	;; Decode all the important variables and directory lists, now
@@ -2507,9 +2515,9 @@
                    ((eq initial-buffer-choice t)
                     (get-buffer-create "*scratch*"))
                    (t
-                    (error "initial-buffer-choice must be a string, a function, or t.")))))
+                    (error "`initial-buffer-choice' must be a string, a function, or t")))))
         (unless (buffer-live-p buf)
-          (error "initial-buffer-choice is not a live buffer."))
+          (error "Value returned by `initial-buffer-choice' is not a live buffer: %S" buf))
         (setq displayable-buffers (cons buf displayable-buffers))))
 
     ;; Display the first two buffers in `displayable-buffers'.  If
diff -Nru emacs-26.1+1/lisp/strokes.el emacs-26.3+1/lisp/strokes.el
--- emacs-26.1+1/lisp/strokes.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/strokes.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; strokes.el --- control Emacs through mouse strokes
 
-;; Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: David Bakhash <cadet@alum.mit.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/subr.el emacs-26.3+1/lisp/subr.el
--- emacs-26.1+1/lisp/subr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/subr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subr.el --- basic lisp subroutines for Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2018 Free Software
+;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -93,12 +93,13 @@
   `(put (quote ,symbol) 'edebug-form-spec (quote ,spec)))
 
 (defmacro lambda (&rest cdr)
-  "Return a lambda expression.
-A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is
-self-quoting; the result of evaluating the lambda expression is the
-expression itself.  The lambda expression may then be treated as a
-function, i.e., stored as the function value of a symbol, passed to
-`funcall' or `mapcar', etc.
+  "Return an anonymous function.
+Under dynamic binding, a call of the form (lambda ARGS DOCSTRING
+INTERACTIVE BODY) is self-quoting; the result of evaluating the
+lambda expression is the expression itself.  Under lexical
+binding, the result is a closure.  Regardless, the result is a
+function, i.e., it may be stored as the function value of a
+symbol, passed to `funcall' or `mapcar', etc.
 
 ARGS should take the same form as an argument list for a `defun'.
 DOCSTRING is an optional documentation string.
@@ -705,6 +706,21 @@
     (setq list (cdr list)))
   list)
 
+(defun assoc-delete-all (key alist)
+  "Delete from ALIST all elements whose car is `equal' to KEY.
+Return the modified alist.
+Elements of ALIST that are not conses are ignored."
+  (while (and (consp (car alist))
+	      (equal (car (car alist)) key))
+    (setq alist (cdr alist)))
+  (let ((tail alist) tail-cdr)
+    (while (setq tail-cdr (cdr tail))
+      (if (and (consp (car tail-cdr))
+	       (equal (car (car tail-cdr)) key))
+	  (setcdr tail (cdr tail-cdr))
+	(setq tail tail-cdr))))
+  alist)
+
 (defun assq-delete-all (key alist)
   "Delete from ALIST all elements whose car is `eq' to KEY.
 Return the modified alist.
@@ -736,9 +752,9 @@
   alist)
 
 (defun alist-get (key alist &optional default remove testfn)
-  "Return the value associated with KEY in ALIST.
+  "Find the first element of ALIST whose `car' equals KEY and return its `cdr'.
 If KEY is not found in ALIST, return DEFAULT.
-Use TESTFN to lookup in the alist if non-nil.  Otherwise, use `assq'.
+Equality with KEY is tested by TESTFN, defaulting to `eq'.
 
 This is a generalized variable suitable for use with `setf'.
 When using it to set a value, optional argument REMOVE non-nil
@@ -3527,7 +3543,7 @@
 ;; Don't throw `throw-on-input' on those events by default.
 (setq while-no-input-ignore-events
       '(focus-in focus-out help-echo iconify-frame
-        make-frame-visible selection-request))
+        make-frame-visible selection-request buffer-switch))
 
 (defmacro while-no-input (&rest body)
   "Execute BODY only as long as there's no pending input.
@@ -5207,15 +5223,15 @@
 (defvar definition-prefixes (make-hash-table :test 'equal)
   "Hash table mapping prefixes to the files in which they're used.
 This can be used to automatically fetch not-yet-loaded definitions.
-More specifically, if there is a value of the form (FILES...) for a string PREFIX
-it means that the FILES define variables or functions with names that start
-with PREFIX.
+More specifically, if there is a value of the form (FILES...) for
+a string PREFIX it means that the FILES define variables or functions
+with names that start with PREFIX.
 
 Note that it does not imply that all definitions starting with PREFIX can
 be found in those files.  E.g. if prefix is \"gnus-article-\" there might
-still be definitions of the form \"gnus-article-toto-titi\" in other files, which would
-presumably appear in this table under another prefix such as \"gnus-\"
-or \"gnus-article-toto-\".")
+still be definitions of the form \"gnus-article-toto-titi\" in other files,
+which would presumably appear in this table under another prefix such as
+\"gnus-\" or \"gnus-article-toto-\".")
 
 (defun register-definition-prefixes (file prefixes)
   "Register that FILE uses PREFIXES."
diff -Nru emacs-26.1+1/lisp/svg.el emacs-26.3+1/lisp/svg.el
--- emacs-26.1+1/lisp/svg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/svg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,9 +1,10 @@
 ;;; svg.el --- SVG image creation functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: image
+;; Version: 0.5
 
 ;; This file is part of GNU Emacs.
 
@@ -30,7 +31,7 @@
 (eval-when-compile (require 'subr-x))
 
 (defun svg-create (width height &rest args)
-  "Create a new, empty SVG image with dimensions WIDTHxHEIGHT.
+  "Create a new, empty SVG image with dimensions WIDTH x HEIGHT.
 ARGS can be used to provide `stroke' and `stroke-width' parameters to
 any further elements added."
   (dom-node 'svg
@@ -42,8 +43,8 @@
 
 (defun svg-gradient (svg id type stops)
   "Add a gradient with ID to SVG.
-TYPE is `linear' or `radial'.  STOPS is a list of percentage/color
-pairs."
+TYPE is `linear' or `radial'.
+STOPS is a list of percentage/color pairs."
   (svg--def
    svg
    (apply
@@ -66,9 +67,9 @@
   "Create a rectangle on SVG, starting at position X/Y, of WIDTH/HEIGHT.
 ARGS is a plist of modifiers.  Possible values are
 
-:stroke-width PIXELS.  The line width.
-:stroke-color COLOR.  The line color.
-:gradient ID.  The gradient ID to use."
+:stroke-width PIXELS   The line width.
+:stroke-color COLOR    The line color.
+:gradient ID           The gradient ID to use."
   (svg--append
    svg
    (dom-node 'rect
diff -Nru emacs-26.1+1/lisp/tabify.el emacs-26.3+1/lisp/tabify.el
--- emacs-26.1+1/lisp/tabify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tabify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
-;; Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: emacs
diff -Nru emacs-26.1+1/lisp/talk.el emacs-26.3+1/lisp/talk.el
--- emacs-26.1+1/lisp/talk.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/talk.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; talk.el --- allow several users to talk to each other through Emacs
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, frames
diff -Nru emacs-26.1+1/lisp/tar-mode.el emacs-26.3+1/lisp/tar-mode.el
--- emacs-26.1+1/lisp/tar-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tar-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU Emacs
 
-;; Copyright (C) 1990-1991, 1993-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1991, 1993-2019 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/tempo.el emacs-26.3+1/lisp/tempo.el
--- emacs-26.1+1/lisp/tempo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tempo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tempo.el --- Flexible template insertion
 
-;; Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: David Kågedal <davidk@lysator.liu.se>
 ;; Created: 16 Feb 1994
diff -Nru emacs-26.1+1/lisp/term/AT386.el emacs-26.3+1/lisp/term/AT386.el
--- emacs-26.1+1/lisp/term/AT386.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/AT386.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; AT386.el --- terminal support package for IBM AT keyboards
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/common-win.el emacs-26.3+1/lisp/term/common-win.el
--- emacs-26.1+1/lisp/term/common-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/common-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; common-win.el --- common part of handling window systems
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/internal.el emacs-26.3+1/lisp/term/internal.el
--- emacs-26.1+1/lisp/term/internal.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/internal.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; internal.el --- support for PC internal terminal
 
-;; Copyright (C) 1993-1994, 1998-1999, 2001-2018 Free Software
+;; Copyright (C) 1993-1994, 1998-1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
diff -Nru emacs-26.1+1/lisp/term/iris-ansi.el emacs-26.3+1/lisp/term/iris-ansi.el
--- emacs-26.1+1/lisp/term/iris-ansi.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/iris-ansi.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps
 
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 
diff -Nru emacs-26.1+1/lisp/term/konsole.el emacs-26.3+1/lisp/term/konsole.el
--- emacs-26.1+1/lisp/term/konsole.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/konsole.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; konsole.el --- terminal initialization for konsole
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 (require 'term/xterm)
 
diff -Nru emacs-26.1+1/lisp/term/news.el emacs-26.3+1/lisp/term/news.el
--- emacs-26.1+1/lisp/term/news.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/news.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard
 
-;; Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/ns-win.el emacs-26.3+1/lisp/term/ns-win.el
--- emacs-26.1+1/lisp/term/ns-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/ns-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1994, 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2005-2019 Free Software Foundation, Inc.
 
 ;; Authors: Carl Edman
 ;;	Christian Limpach
diff -Nru emacs-26.1+1/lisp/term/pc-win.el emacs-26.3+1/lisp/term/pc-win.el
--- emacs-26.1+1/lisp/term/pc-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/pc-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994, 1996-1997, 1999, 2001-2018 Free Software
+;; Copyright (C) 1994, 1996-1997, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
diff -Nru emacs-26.1+1/lisp/term/README emacs-26.3+1/lisp/term/README
--- emacs-26.1+1/lisp/term/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff -Nru emacs-26.1+1/lisp/term/rxvt.el emacs-26.3+1/lisp/term/rxvt.el
--- emacs-26.1+1/lisp/term/rxvt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/rxvt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/screen.el emacs-26.3+1/lisp/term/screen.el
--- emacs-26.1+1/lisp/term/screen.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/screen.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; screen.el --- terminal initialization for screen and tmux  -*- lexical-binding: t -*-
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 (require 'term/xterm)
 
diff -Nru emacs-26.1+1/lisp/term/sun.el emacs-26.3+1/lisp/term/sun.el
--- emacs-26.1+1/lisp/term/sun.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/sun.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
-;; Copyright (C) 1987, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/tmux.el emacs-26.3+1/lisp/term/tmux.el
--- emacs-26.1+1/lisp/term/tmux.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/tmux.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; tmux.el --- terminal initialization for tmux  -*- lexical-binding: t -*-
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 (require 'term/xterm)
 
diff -Nru emacs-26.1+1/lisp/term/tty-colors.el emacs-26.3+1/lisp/term/tty-colors.el
--- emacs-26.1+1/lisp/term/tty-colors.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/tty-colors.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tty-colors.el --- color support for character terminals
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: emacs-devel@gnu.org
@@ -824,10 +824,12 @@
 	(replace-regexp-in-string " +" "" (downcase color))
       color)))
 
-(defun tty-color-24bit (rgb)
-  "Return pixel value on 24-bit terminals. Return nil if RGB is
-nil or not on 24-bit terminal."
-  (when (and rgb (= (display-color-cells) 16777216))
+(defun tty-color-24bit (rgb &optional display)
+  "Return 24-bit color pixel value for RGB value on DISPLAY.
+DISPLAY can be a display name or a frame, and defaults to the
+selected frame's display.
+If DISPLAY is not on a 24-but TTY terminal, return nil."
+  (when (and rgb (= (display-color-cells display) 16777216))
     (let ((r (lsh (car rgb) -8))
 	  (g (lsh (cadr rgb) -8))
 	  (b (lsh (nth 2 rgb) -8)))
@@ -850,7 +852,7 @@
       (error "Invalid specification for tty color \"%s\"" name))
   (tty-modify-color-alist
    (append (list (tty-color-canonicalize name)
-		 (or (tty-color-24bit rgb) index))
+		 (or (tty-color-24bit rgb frame) index))
 	   rgb)
    frame))
 
@@ -1026,7 +1028,7 @@
 	  (or (assoc color (tty-color-alist frame))
 	      (let ((rgb (tty-color-standard-values color)))
 		(and rgb
-		     (let ((pixel (tty-color-24bit rgb)))
+		     (let ((pixel (tty-color-24bit rgb frame)))
 		       (or (and pixel (cons color (cons pixel rgb)))
 			   (tty-color-approximate rgb frame)))))))))
 
diff -Nru emacs-26.1+1/lisp/term/tvi970.el emacs-26.3+1/lisp/term/tvi970.el
--- emacs-26.1+1/lisp/term/tvi970.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/tvi970.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tvi970.el --- terminal support for the Televideo 970
 
-;; Copyright (C) 1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/vt100.el emacs-26.3+1/lisp/term/vt100.el
--- emacs-26.1+1/lisp/term/vt100.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/vt100.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vt100.el --- define VT100 function key sequences in function-key-map
 
-;; Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/w32console.el emacs-26.3+1/lisp/term/w32console.el
--- emacs-26.1+1/lisp/term/w32console.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/w32console.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; w32console.el -- Setup w32 console keys and colors.
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/w32-win.el emacs-26.3+1/lisp/term/w32-win.el
--- emacs-26.1+1/lisp/term/w32-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/w32-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system -*- lexical-binding: t -*-
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -170,6 +170,15 @@
 ;; new layout/language selected by the user.
 (global-set-key [language-change] 'ignore)
 
+;; Some Windows applications send the 'noname' (VK_NONAME) pseudo-key
+;; to prevent Windows from sleeping.  We want to ignore these key
+;; events, to avoid annoying users by ringing the bell and announcing
+;; that the key is not bound.
+(global-set-key [noname]   'ignore)
+(global-set-key [C-noname] 'ignore)
+(global-set-key [M-noname] 'ignore)
+
+
 (defvar x-resource-name)
 
 
diff -Nru emacs-26.1+1/lisp/term/wyse50.el emacs-26.3+1/lisp/term/wyse50.el
--- emacs-26.1+1/lisp/term/wyse50.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/wyse50.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wyse50.el --- terminal support code for Wyse 50
 
-;; Copyright (C) 1989, 1993-1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1989, 1993-1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
diff -Nru emacs-26.1+1/lisp/term/xterm.el emacs-26.3+1/lisp/term/xterm.el
--- emacs-26.1+1/lisp/term/xterm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/xterm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff -Nru emacs-26.1+1/lisp/term/x-win.el emacs-26.3+1/lisp/term/x-win.el
--- emacs-26.1+1/lisp/term/x-win.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term/x-win.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
diff -Nru emacs-26.1+1/lisp/term.el emacs-26.3+1/lisp/term.el
--- emacs-26.1+1/lisp/term.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/term.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; term.el --- general command interpreter in a window stuff
 
-;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2018 Free Software
+;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Per Bothner <per@bothner.com>
@@ -33,6 +33,21 @@
 
 ;;; Commentary:
 
+;; This file defines a general command-interpreter-in-a-buffer package
+;; (term mode).  The idea is that you can build specific process-in-a-buffer
+;; modes on top of term mode -- e.g., lisp, shell, scheme, T, soar, ....
+;; This way, all these specific packages share a common base functionality,
+;; and a common set of bindings, which makes them easier to use (and
+;; saves code, implementation time, etc., etc.).
+
+;; If, instead of `term', you call `ansi-term', you get multiple term
+;; buffers, after every new call ansi-term opens a new
+;; "*ansi-term*<xx>" window, where <xx> is, as usual, a number...
+
+;; For hints on converting existing process modes (e.g., tex-mode,
+;; background, dbx, gdb, kermit, prolog, telnet) to use term-mode
+;; instead of shell-mode, see the notes at the end of this file.
+
 ;; Speed considerations and a few caveats
 ;; --------------------------------------
 ;;
@@ -85,13 +100,6 @@
 ;; # By default nobody can't do anything
 ;; deny	root		*
 ;;
-;;
-;;             ----------------------------------------
-;;
-;;  If, instead of 'term', you call 'ansi-term', you get multiple term
-;; buffers, after every new call ansi-term opens a new *ansi-term*<xx> window,
-;; where <xx> is, as usual, a number...
-;;
 ;;             ----------------------------------------
 ;;
 ;;  With the term-buffer-maximum-size you can finally decide how many
@@ -100,7 +108,6 @@
 ;;
 ;;             ----------------------------------------
 ;;
-;;
 ;;  ANSI colorization should work well, I've decided to limit the interpreter
 ;; to five outstanding commands (like ESC [ 01;04;32;41;07m.
 ;;  You shouldn't need more, if you do, tell me and I'll increase it.  It's
@@ -115,38 +122,6 @@
 ;;  - Add hooks to allow raw-mode keys to be configurable
 ;;  - Which keys are better ? \eOA or \e[A ?
 ;;
-;;
-;;  Changes:
-;;
-;; V4.0 January 1997
-;;
-;;   - Huge reworking of the faces code: now we only have roughly 20-30
-;;     faces for everything so we're even faster than the old md-term.el !
-;;   - Finished removing all the J-Shell code.
-;;
-;;  V3.0 January 1997
-;;
-;;  - Now all the supportable ANSI commands work well.
-;;  - Reworked a little the code: much less jsh-inspired stuff
-;;
-;;  V2.3 November
-;;
-;;  - Now all the faces are accessed through an array: much cleaner code.
-;;
-;;  V2.2 November 4 1996
-;;
-;;  - Implemented ANSI output colorization ( a bit rough but enough for
-;;    color_ls )
-;;
-;;  - Implemented a maximum limit for the scroll buffer (stolen from
-;;    comint.el)
-;;
-;;  v2.1 October 28 1996, first public release
-;;
-;;  - Some new keybindings for term-char mode ( notably home/end/...)
-;;  - Directory, hostname and username tracking via ange-ftp
-;;  - Multi-term capability via the ansi-term call
-;;
 ;;  ----------------------------------------------------------------
 ;;  You should/could have something like this in your .emacs to take
 ;;  full advantage of this package
@@ -160,7 +135,6 @@
 ;;  	             (auto-fill-mode -1)
 ;;  	             (setq tab-width 8 ))))
 ;;
-;;
 ;;             ----------------------------------------
 ;;
 ;;  If you want to use color ls the best setup is to have a different file
@@ -171,7 +145,6 @@
 ;;
 ;;             ----------------------------------------
 ;;
-;;
 ;;  # Configuration file for the color ls utility
 ;;  # This file goes in the /etc directory, and must be world readable.
 ;;  # You can copy this file to .dir_colors in your $HOME directory to
@@ -228,73 +201,64 @@
 ;;  .xbm 01;35
 ;;  .xpm 01;35
 ;;
-;;
 ;;             ----------------------------------------
 ;;
-;;  Notice: for directory/host/user tracking you need to have something
-;; like this in your shell startup script (this is for a POSIXish shell
-;; like Bash but should be quite easy to port to other shells)
+;; There are actually two methods for directory tracking, one
+;; implemented in `term-command-hook' which sets the directory
+;; according to an escape sequence of the form "\032/<directory>\n".
+;; Some shells like bash will already send this escape sequence when
+;; they detect they are running in Emacs.  This can be configured or
+;; disabled on the Emacs side by setting `term-command-hook' to
+;; a different function.
+;;
+;; The second method is in `term-handle-ansi-terminal-messages' which
+;; sets user, host, and directory according to escape sequences of the
+;; form "\033AnSiTc <directory>\n" (replace the "c" with "u" and "h"
+;; for user and host, respectively).  If the user and host don't
+;; match, it will set directory to a remote one, so it is important to
+;; set user and host correctly first.  See the example bash
+;; configuration below.
 ;;
 ;;             ----------------------------------------
 ;;
-;;  # Set HOSTNAME if not already set.
+;;	# Set HOSTNAME if not already set.
 ;;	: ${HOSTNAME=$(uname -n)}
 ;;
-;;  # su does not change this but I'd like it to
-;;
+;;	# su does not change this but I'd like it to
 ;;	USER=$(whoami)
 ;;
-;;  # ...
+;;	# ...
 ;;
 ;;	case $TERM in
 ;;	    eterm*)
 ;;
 ;;		printf '%s\n' \
 ;;		 -------------------------------------------------------------- \
-;;		 "Hello $user" \
+;;		 "Hello $USER" \
 ;;		 "Today is $(date)" \
 ;;		 "We are on $HOSTNAME running $(uname) under Emacs term mode" \
 ;;		 --------------------------------------------------------------
 ;;
-;;		export EDITOR=emacsclient
-;;
 ;;		# The \033 stands for ESC.
 ;;		# There is a space between "AnSiT?" and $whatever.
+;;		printf '\033AnSiTh %s\n' "$HOSTNAME"
+;;		printf '\033AnSiTu %s\n' "$USER"
+;;		printf '\033AnSiTc %s\n' "$PWD"
 ;;
 ;;		cd()    { command cd    "$@"; printf '\033AnSiTc %s\n' "$PWD"; }
 ;;		pushd() { command pushd "$@"; printf '\033AnSiTc %s\n' "$PWD"; }
 ;;		popd()  { command popd  "$@"; printf '\033AnSiTc %s\n' "$PWD"; }
 ;;
-;;		printf '\033AnSiTc %s\n' "$PWD"
-;;		printf '\033AnSiTh %s\n' "$HOSTNAME"
-;;		printf '\033AnSiTu %s\n' "$USER"
-;;
-;;		eval $(dircolors $HOME/.emacs_dircolors)
+;;		# Use custom dircolors in term buffers.
+;;		# eval $(dircolors $HOME/.emacs_dircolors)
 ;;	esac
 ;;
-;;  # ...
-;;
+;;	# ...
 ;;
-
-;;; Original Commentary:
-;; ---------------------
-
-;; The changelog is at the end of this file.
-
-;; Please send me bug reports, bug fixes, and extensions, so that I can
-;; merge them into the master source.
-;;     - Per Bothner (bothner@cygnus.com)
-
-;; This file defines a general command-interpreter-in-a-buffer package
-;; (term mode).  The idea is that you can build specific process-in-a-buffer
-;; modes on top of term mode -- e.g., lisp, shell, scheme, T, soar, ....
-;; This way, all these specific packages share a common base functionality,
-;; and a common set of bindings, which makes them easier to use (and
-;; saves code, implementation time, etc., etc.).
-
-;; For hints on converting existing process modes (e.g., tex-mode,
-;; background, dbx, gdb, kermit, prolog, telnet) to use term-mode
-;; instead of shell-mode, see the notes at the end of this file.
+;; For troubleshooting in Bash, you can check the definition of the
+;; custom functions with the "type" command.  e.g. "type cd".  If you
+;; do not see the expected definition from the config below, then the
+;; directory tracking will not work.
 
 
 ;; Brief Command Documentation:
@@ -302,21 +266,21 @@
 ;; Term Mode Commands: (common to all derived modes, like cmushell & cmulisp
 ;; mode)
 ;;
-;; m-p	    term-previous-input    	  Cycle backwards in input history
-;; m-n	    term-next-input  	    	  Cycle forwards
-;; m-r     term-previous-matching-input  Previous input matching a regexp
-;; m-s     comint-next-matching-input      Next input that matches
+;; M-p     term-previous-input           Cycle backwards in input history
+;; M-n     term-next-input               Cycle forwards
+;; M-r     term-previous-matching-input  Previous input matching a regexp
+;; M-s     comint-next-matching-input    Next input that matches
 ;; return  term-send-input
-;; c-c c-a term-bol                      Beginning of line; skip prompt.
-;; c-d	    term-delchar-or-maybe-eof     Delete char unless at end of buff.
-;; c-c c-u term-kill-input	    	    ^u
-;; c-c c-w backward-kill-word    	    ^w
-;; c-c c-c term-interrupt-subjob 	    ^c
-;; c-c c-z term-stop-subjob	    	    ^z
-;; c-c c-\ term-quit-subjob	    	    ^\
-;; c-c c-o term-kill-output		    Delete last batch of process output
-;; c-c c-r term-show-output		    Show last batch of process output
-;; c-c c-h term-dynamic-list-input-ring  List input history
+;; C-c C-a term-bol                      Beginning of line; skip prompt.
+;; C-d     term-delchar-or-maybe-eof     Delete char unless at end of buff.
+;; C-c C-u term-kill-input               ^u
+;; C-c C-w backward-kill-word            ^w
+;; C-c C-c term-interrupt-subjob         ^c
+;; C-c C-z term-stop-subjob              ^z
+;; C-c C-\ term-quit-subjob              ^\
+;; C-c C-o term-kill-output              Delete last batch of process output
+;; C-c C-r term-show-output              Show last batch of process output
+;; C-c C-h term-dynamic-list-input-ring  List input history
 ;;
 ;; Not bound by default in term-mode
 ;; term-send-invisible			Read a line w/o echo, and send to proc
@@ -326,8 +290,8 @@
 ;; term-replace-by-expanded-filename	Expand and complete filename at point;
 ;;					replace with expanded/completed name.
 ;; term-kill-subjob			No mercy.
-;; term-show-maximum-output            Show as much output as possible.
-;; term-continue-subjob		Send CONT signal to buffer's process
+;; term-show-maximum-output             Show as much output as possible.
+;; term-continue-subjob                 Send CONT signal to buffer's process
 ;;					group.  Useful if you accidentally
 ;;					suspend your process (with C-c C-z).
 
@@ -344,6 +308,7 @@
 (eval-when-compile (require 'cl-lib))
 (require 'ring)
 (require 'ehelp)
+(require 'comint) ; Password regexp.
 
 (declare-function ring-empty-p "ring" (ring))
 (declare-function ring-ref "ring" (ring index))
@@ -1517,6 +1482,31 @@
   ;; don't define :te=\\E[2J\\E[?47l\\E8:ti=\\E7\\E[?47h\
   "Termcap capabilities supported.")
 
+;; This private hack is for backwards compatibility with Bash 4.3 and earlier.
+;; It can be useful even when running a program other than Bash, as the
+;; program might invoke Bash as an interactive subshell.  See this thread:
+;; https://lists.gnu.org/r/emacs-devel/2018-05/msg00670.html
+;; Remove this hack and its uses once Bash 4.4-or-later is reasonably
+;; universal, because it slows down execution slightly when
+;; term--bash-needs-EMACSp is first called.
+(defvar term--bash-needs-EMACS-status nil
+  "43 if Bash is so old that it needs EMACS set.
+Some other integer if Bash is new or not in use.
+Nil if unknown.")
+(defun term--bash-needs-EMACSp ()
+  "t if Bash is old, nil if it is new or not in use."
+  (eq 43
+      (or term--bash-needs-EMACS-status
+          (setf
+           term--bash-needs-EMACS-status
+           (let ((process-environment
+                  (cons "BASH_ENV" process-environment)))
+             (condition-case nil
+                 (call-process
+                  "bash" nil nil nil "-c"
+                  "case $BASH_VERSION in [0123].*|4.[0123].*) exit 43;; esac")
+               (error 0)))))))
+
 ;; This auxiliary function cranks up the process for term-exec in
 ;; the appropriate environment.
 
@@ -1534,12 +1524,6 @@
 	   (format term-termcap-format "TERMCAP="
 		   term-term-name term-height term-width)
 
-	   ;; This is for backwards compatibility with Bash 4.3 and earlier.
-	   ;; Remove this hack once Bash 4.4-or-later is common, because
-	   ;; it breaks './configure' of some packages that expect it to
-	   ;; say where to find EMACS.
-	   (format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
-
 	   (format "INSIDE_EMACS=%s,term:%s" emacs-version term-protocol-version)
 	   (format "LINES=%d" term-height)
 	   (format "COLUMNS=%d" term-width))
@@ -1551,6 +1535,9 @@
 	;; escape codes, so we need to see the raw output.  We will have to
 	;; do the decoding by hand on the parts that are made of chars.
 	(coding-system-for-read 'binary))
+    (when (term--bash-needs-EMACSp)
+      (push (format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
+            process-environment))
     (apply 'start-process name buffer
 	   "/bin/sh" "-c"
 	   (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\
@@ -2258,12 +2245,10 @@
 (defun term-send-invisible (str &optional proc)
   "Read a string without echoing.
 Then send it to the process running in the current buffer.  A new-line
-is additionally sent.  String is not saved on term input history list.
-Security bug: your string can still be temporarily recovered with
-\\[view-lossage]."
+is additionally sent.  String is not saved on term input history list."
   (interactive "P") ; Defeat snooping via C-x esc
   (when (not (stringp str))
-    (setq str (term-read-noecho "Non-echoed text: " t)))
+    (setq str (read-passwd "Non-echoed text: ")))
   (when (not proc)
     (setq proc (get-buffer-process (current-buffer))))
   (if (not proc) (error "Current buffer has no process")
@@ -2272,6 +2257,16 @@
     (term-send-string proc str)
     (term-send-string proc "\n")))
 
+;; TODO: Maybe combine this with `comint-watch-for-password-prompt'.
+(defun term-watch-for-password-prompt (string)
+  "Prompt in the minibuffer for password and send without echoing.
+Checks if STRING contains a password prompt as defined by
+`comint-password-prompt-regexp'."
+  (when (term-in-line-mode)
+    (when (let ((case-fold-search t))
+            (string-match comint-password-prompt-regexp string))
+      (term-send-invisible (read-passwd string)))))
+
 
 ;;; Low-level process communication
 
@@ -2750,12 +2745,10 @@
 	(setq default-directory
 	      (file-name-as-directory
 	       (if (and (string= term-ansi-at-host (system-name))
-					(string= term-ansi-at-user (user-real-login-name)))
+                        (string= term-ansi-at-user (user-real-login-name)))
 		   (expand-file-name term-ansi-at-dir)
-		 (if (string= term-ansi-at-user (user-real-login-name))
-		     (concat "/" term-ansi-at-host ":" term-ansi-at-dir)
-		   (concat "/" term-ansi-at-user "@" term-ansi-at-host ":"
-			   term-ansi-at-dir)))))
+                 (concat "/-:" term-ansi-at-user "@" term-ansi-at-host ":"
+                         term-ansi-at-dir))))
 
 	;; I'm not sure this is necessary,
 	;; but it's best to be on the safe side.
@@ -2868,11 +2861,12 @@
                           ;; next time.
                           (when (= funny str-length)
                             (let ((partial 0))
-                              (while (eq (char-charset (aref decoded-substring
-                                                             (- count 1 partial)))
-                                         'eight-bit)
+                              (while (and (< partial count)
+                                          (eq (char-charset (aref decoded-substring
+                                                                  (- count 1 partial)))
+                                              'eight-bit))
                                 (cl-incf partial))
-                              (when (> partial 0)
+                              (when (> count partial 0)
                                 (setq term-terminal-undecoded-bytes
                                       (substring decoded-substring (- partial)))
                                 (setq decoded-substring
@@ -3129,6 +3123,8 @@
 	  (term-handle-deferred-scroll))
 
 	(set-marker (process-mark proc) (point))
+        (when (stringp decoded-substring)
+          (term-watch-for-password-prompt decoded-substring))
 	(when save-point
 	  (goto-char save-point)
 	  (set-marker save-point nil))
@@ -3386,11 +3382,10 @@
    ;; \E[B - cursor down (terminfo: cud)
    ((eq char ?B)
     (let ((tcr (term-current-row)))
-      (unless (= tcr (1- term-scroll-end))
+      (unless (>= tcr term-scroll-end)
 	(term-down
-	 (if (> (+ tcr term-terminal-parameter) term-scroll-end)
-	     (- term-scroll-end 1 tcr)
-	   (max 1 term-terminal-parameter)) t))))
+         (min (- term-scroll-end tcr) (max 1 term-terminal-parameter))
+         t))))
    ;; \E[C - cursor right (terminfo: cuf, cuf1)
    ((eq char ?C)
     (term-move-columns
diff -Nru emacs-26.1+1/lisp/textmodes/artist.el emacs-26.3+1/lisp/textmodes/artist.el
--- emacs-26.1+1/lisp/textmodes/artist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/artist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; artist.el --- draw ascii graphics with your mouse
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
diff -Nru emacs-26.1+1/lisp/textmodes/bib-mode.el emacs-26.3+1/lisp/textmodes/bib-mode.el
--- emacs-26.1+1/lisp/textmodes/bib-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/bib-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bib-mode.el --- major mode for editing bib files
 
-;; Copyright (C) 1989, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Henry Kautz
 ;; (according to authors.el)
diff -Nru emacs-26.1+1/lisp/textmodes/bibtex.el emacs-26.3+1/lisp/textmodes/bibtex.el
--- emacs-26.1+1/lisp/textmodes/bibtex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/bibtex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bibtex.el --- BibTeX mode for GNU Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994-1999, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994-1999, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
@@ -457,7 +457,7 @@
 which is called to determine the initial content of the field.
 ALTERNATIVE if non-nil is an integer that numbers sets of
 alternatives, starting from zero."
-  :group 'BibTeX
+  :group 'bibtex
   :version "26.1"                       ; add Conference
   :type 'bibtex-entry-alist)
 (put 'bibtex-BibTeX-entry-alist 'risky-local-variable t)
diff -Nru emacs-26.1+1/lisp/textmodes/bibtex-style.el emacs-26.3+1/lisp/textmodes/bibtex-style.el
--- emacs-26.1+1/lisp/textmodes/bibtex-style.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/bibtex-style.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bibtex-style.el --- Major mode for BibTeX Style files -*- lexical-binding: t -*-
 
-;; Copyright (C) 2005, 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tex
diff -Nru emacs-26.1+1/lisp/textmodes/conf-mode.el emacs-26.3+1/lisp/textmodes/conf-mode.el
--- emacs-26.1+1/lisp/textmodes/conf-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/conf-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: conf ini windows java
diff -Nru emacs-26.1+1/lisp/textmodes/css-mode.el emacs-26.3+1/lisp/textmodes/css-mode.el
--- emacs-26.1+1/lisp/textmodes/css-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/css-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; css-mode.el --- Major mode to edit CSS files  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Maintainer: Simen Heggestøyl <simenheg@gmail.com>
@@ -32,7 +32,6 @@
 
 ;;; Code:
 
-(require 'eww)
 (require 'cl-lib)
 (require 'color)
 (require 'seq)
@@ -1402,6 +1401,9 @@
 pseudo-classes, and pseudo-elements on the Mozilla Developer
 Network (MDN).
 
+Use `\\[fill-paragraph]' to reformat CSS declaration blocks.  It can also
+be used to fill comments.
+
 \\{css-mode-map}"
   (setq-local font-lock-defaults css-font-lock-defaults)
   (setq-local comment-start "/*")
diff -Nru emacs-26.1+1/lisp/textmodes/dns-mode.el emacs-26.3+1/lisp/textmodes/dns-mode.el
--- emacs-26.1+1/lisp/textmodes/dns-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/dns-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
 
-;; Copyright (C) 2000-2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS master zone file SOA comm
diff -Nru emacs-26.1+1/lisp/textmodes/enriched.el emacs-26.3+1/lisp/textmodes/enriched.el
--- emacs-26.1+1/lisp/textmodes/enriched.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/enriched.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; enriched.el --- read and save files in text/enriched format
 
-;; Copyright (C) 1994-1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: wp, faces
diff -Nru emacs-26.1+1/lisp/textmodes/fill.el emacs-26.3+1/lisp/textmodes/fill.el
--- emacs-26.1+1/lisp/textmodes/fill.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/fill.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fill.el --- fill commands for Emacs
 
-;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2018 Free
+;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/flyspell.el emacs-26.3+1/lisp/textmodes/flyspell.el
--- emacs-26.1+1/lisp/textmodes/flyspell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/flyspell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flyspell.el --- On-the-fly spell checker  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
 ;; Maintainer: emacs-devel@gnu.org
@@ -31,10 +31,10 @@
 ;;
 ;; To enable Flyspell in text representing computer programs, type
 ;; M-x flyspell-prog-mode.
-;; In that mode only text inside comments is checked.
+;; In that mode only text inside comments and strings is checked.
 ;;
 ;; Some user variables control the behavior of flyspell.  They are
-;; those defined under the `User variables' comment.
+;; those defined under the `User configuration' comment.
 
 ;;; Code:
 
@@ -137,7 +137,10 @@
 (defcustom flyspell-persistent-highlight t
   "Non-nil means misspelled words remain highlighted until corrected.
 If this variable is nil, only the most recently detected misspelled word
-is highlighted."
+is highlighted, and the highlight is turned off as soon as point moves
+off the misspelled word.
+
+Make sure this variable is non-nil if you use `flyspell-region'."
   :group 'flyspell
   :type 'boolean)
 
@@ -1367,7 +1370,10 @@
 ;;*    flyspell-small-region ...                                        */
 ;;*---------------------------------------------------------------------*/
 (defun flyspell-small-region (beg end)
-  "Flyspell text between BEG and END."
+  "Flyspell text between BEG and END.
+
+This function is intended to work on small regions, as
+determined by `flyspell-large-region'."
   (save-excursion
     (if (> beg end)
 	(let ((old beg))
@@ -1414,10 +1420,20 @@
 The list of incorrect words should be in `flyspell-external-ispell-buffer'.
 \(We finish by killing that buffer and setting the variable to nil.)
 The buffer to mark them in is `flyspell-large-region-buffer'."
-  (let (words-not-found
-	(ispell-otherchars (ispell-get-otherchars))
-	(buffer-scan-pos flyspell-large-region-beg)
-	case-fold-search)
+  (let* (words-not-found
+         (flyspell-casechars (flyspell-get-casechars))
+         (ispell-otherchars (ispell-get-otherchars))
+         (ispell-many-otherchars-p (ispell-get-many-otherchars-p))
+         (word-chars (concat flyspell-casechars
+                             "+\\("
+                             (if (not (string= "" ispell-otherchars))
+                                 (concat ispell-otherchars "?"))
+                             flyspell-casechars
+                             "+\\)"
+                             (if ispell-many-otherchars-p
+                                 "*" "?")))
+         (buffer-scan-pos flyspell-large-region-beg)
+         case-fold-search)
     (with-current-buffer flyspell-external-ispell-buffer
       (goto-char (point-min))
       ;; Loop over incorrect words, in the order they were reported,
@@ -1447,11 +1463,18 @@
 			      ;; Move back into the match
 			      ;; so flyspell-get-word will find it.
 			      (forward-char -1)
-			      (flyspell-get-word)))
+                              ;; Is this a word that matches the
+                              ;; current dictionary?
+                              (if (looking-at word-chars)
+			          (flyspell-get-word))))
 			   (found (car found-list))
 			   (found-length (length found))
 			   (misspell-length (length word)))
 		      (when (or
+                             ;; Misspelled word is not from the
+                             ;; language supported by the current
+                             ;; dictionary.
+                             (null found)
 			     ;; Size matches, we really found it.
 			     (= found-length misspell-length)
 			     ;; Matches as part of a boundary-char separated
@@ -1473,13 +1496,21 @@
 			     ;; backslash) and none of the previous
 			     ;; conditions match.
 			     (and (not ispell-really-aspell)
+                                  (not ispell-really-hunspell)
+                                  (not ispell-really-enchant)
 				  (save-excursion
 				    (goto-char (- (nth 1 found-list) 1))
 				    (if (looking-at "[\\]" )
 					t
 				      nil))))
 			(setq keep nil)
-			(flyspell-word nil t)
+                        ;; Don't try spell-checking words whose
+                        ;; characters don't match CASECHARS, because
+                        ;; flyspell-word will then consider as
+                        ;; misspelling the preceding word that matches
+                        ;; CASECHARS.
+                        (or (null found)
+			    (flyspell-word nil t))
 			;; Search for next misspelled word will begin from
 			;; end of last validated match.
 			(setq buffer-scan-pos (point))))
@@ -1638,7 +1669,10 @@
 ;;*---------------------------------------------------------------------*/
 ;;;###autoload
 (defun flyspell-region (beg end)
-  "Flyspell text between BEG and END."
+  "Flyspell text between BEG and END.
+
+Make sure `flyspell-mode' is turned on if you want the highlight
+of a misspelled word removed when you've corrected it."
   (interactive "r")
   (ispell-set-spellchecker-params)  ; Initialize variables and dicts alists
   (if (= beg end)
diff -Nru emacs-26.1+1/lisp/textmodes/ispell.el emacs-26.3+1/lisp/textmodes/ispell.el
--- emacs-26.1+1/lisp/textmodes/ispell.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/ispell.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ispell.el --- interface to spell checkers  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994-1995, 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 1997-2019 Free Software Foundation, Inc.
 
 ;; Author:           Ken Stevens <k.stevens@ieee.org>
 
@@ -117,6 +117,8 @@
 
 (defalias 'check-ispell-version 'ispell-check-version)
 
+(declare-function flyspell-unhighlight-at "flyspell" (pos))
+
 ;;; **********************************************************************
 ;;; The following variables should be set according to personal preference
 ;;; and location of binaries:
@@ -721,6 +723,7 @@
 	;; Make sure these variables are (re-)initialized to the default value
 	(setq ispell-really-aspell nil
               ispell-really-hunspell nil
+              ispell-really-enchant nil
 	      ispell-encoding8-command nil)
 
 	(goto-char (point-min))
@@ -1111,7 +1114,19 @@
 				 null-device
 				 t
 				 nil
-				 "-D")
+                                 "-D"
+                                 ;; Use -a to prevent Hunspell from
+                                 ;; trying to initialize its
+                                 ;; curses/termcap UI, which causes it
+                                 ;; to crash or fail to start in some
+                                 ;; MS-Windows ports.
+                                 "-a"
+                                 ;; Hunspell 1.7.0 (and later?) won't
+                                 ;; show LOADED DICTIONARY unless
+                                 ;; there's at least one file argument
+                                 ;; on the command line.  So we feed
+                                 ;; it with the null device.
+				 null-device)
 	    (buffer-string))
 	  "[\n\r]+"
 	  t))
@@ -1200,8 +1215,9 @@
   (with-output-to-string
     (with-current-buffer
         standard-output
-        (apply 'ispell-call-process
-               (concat ispell-program-name "-lsmod") nil t nil args))))
+      (apply 'ispell-call-process
+             (replace-regexp-in-string "enchant\\(-[0-9]\\)?$" "enchant-lsmod\\1"
+                                       ispell-program-name) nil t nil args))))
 
 (defun ispell--get-extra-word-characters (&optional lang)
   "Get the extra word characters for LANG as a character class.
@@ -2090,10 +2106,7 @@
 	     (or no-query
 		 (y-or-n-p "Personal dictionary modified.  Save? ")))
     (ispell-send-string "#\n")	; save dictionary
-    (message "Personal dictionary saved.")
-    (when flyspell-mode
-      (flyspell-mode 0)
-      (flyspell-mode 1)))
+    (message "Personal dictionary saved."))
   ;; unassert variable, even if not saved to avoid questioning.
   (setq ispell-pdict-modified-p nil))
 
@@ -2221,15 +2234,16 @@
 		   ((= char ?i)		; accept and insert word into pers dict
 		    (ispell-send-string (concat "*" word "\n"))
 		    (setq ispell-pdict-modified-p '(t)) ; dictionary modified!
-		    (when (fboundp 'flyspell-unhighlight-at)
-                          (flyspell-unhighlight-at start))
+
+                    (when flyspell-mode
+                      (flyspell-unhighlight-at start))
 		    nil)
 		   ((or (= char ?a) (= char ?A)) ; accept word without insert
 		    (ispell-send-string (concat "@" word "\n"))
 		    (cl-pushnew word ispell-buffer-session-localwords
                                 :test #'equal)
-		    (when (fboundp 'flyspell-unhighlight-at)
-                          (flyspell-unhighlight-at start))
+		    (when flyspell-mode
+                      (flyspell-unhighlight-at start))
 		    (or ispell-buffer-local-name ; session localwords might conflict
 			(setq ispell-buffer-local-name (buffer-name)))
 		    (if (null ispell-pdict-modified-p)
@@ -2270,8 +2284,9 @@
 		    (ispell-pdict-save ispell-silently-savep)
 		    (message "%s"
 		     (substitute-command-keys
-		      (concat "Spell-checking suspended;"
-			      " use C-u \\[ispell-word] to resume")))
+		      (concat
+                       "Spell-checking suspended; use "
+		       "\\[universal-argument] \\[ispell-word] to resume")))
 		    (setq ispell-quit start)
 		    nil)
 		   ((= char ?q)
diff -Nru emacs-26.1+1/lisp/textmodes/less-css-mode.el emacs-26.3+1/lisp/textmodes/less-css-mode.el
--- emacs-26.1+1/lisp/textmodes/less-css-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/less-css-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; less-css-mode.el --- Major mode for editing Less CSS files  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Steve Purcell <steve@sanityinc.com>
 ;; Maintainer: Simen Heggestøyl <simenheg@gmail.com>
diff -Nru emacs-26.1+1/lisp/textmodes/makeinfo.el emacs-26.3+1/lisp/textmodes/makeinfo.el
--- emacs-26.1+1/lisp/textmodes/makeinfo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/makeinfo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; makeinfo.el --- run makeinfo conveniently
 
-;; Copyright (C) 1991, 1993, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/mhtml-mode.el emacs-26.3+1/lisp/textmodes/mhtml-mode.el
--- emacs-26.1+1/lisp/textmodes/mhtml-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/mhtml-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mhtml-mode.el --- HTML editing mode that handles CSS and JS -*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Keywords: wp, hypermedia, comm, languages
 
@@ -21,13 +21,10 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'flyspell)
-  (require 'sgml-mode))
+(eval-and-compile (require 'sgml-mode))
 (require 'js)
 (require 'css-mode)
 (require 'prog-mode)
-(require 'font-lock)
 
 (defcustom mhtml-tag-relative-indent t
   "How <script> and <style> bodies are indented relative to the tag.
@@ -349,6 +346,8 @@
       ;; HTML.
       (sgml-indent-line))))
 
+(declare-function flyspell-generic-progmode-verify "flyspell")
+
 (defun mhtml--flyspell-check-word ()
   (let ((submode (get-text-property (point) 'mhtml-submode)))
     (if submode
diff -Nru emacs-26.1+1/lisp/textmodes/nroff-mode.el emacs-26.3+1/lisp/textmodes/nroff-mode.el
--- emacs-26.1+1/lisp/textmodes/nroff-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/nroff-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source
 
-;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2018 Free Software
+;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/page.el emacs-26.3+1/lisp/textmodes/page.el
--- emacs-26.1+1/lisp/textmodes/page.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/page.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; page.el --- page motion commands for Emacs
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp convenience
diff -Nru emacs-26.1+1/lisp/textmodes/page-ext.el emacs-26.3+1/lisp/textmodes/page-ext.el
--- emacs-26.1+1/lisp/textmodes/page-ext.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/page-ext.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; page-ext.el --- extended page handling commands
 
-;; Copyright (C) 1990-1991, 1993-1994, 2001-2018 Free Software
+;; Copyright (C) 1990-1991, 1993-1994, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Robert J. Chassell <bob@gnu.org>
diff -Nru emacs-26.1+1/lisp/textmodes/paragraphs.el emacs-26.3+1/lisp/textmodes/paragraphs.el
--- emacs-26.1+1/lisp/textmodes/paragraphs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/paragraphs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; paragraphs.el --- paragraph and sentence parsing
 
-;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2018 Free Software
+;; Copyright (C) 1985-1987, 1991, 1994-1997, 1999-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/picture.el emacs-26.3+1/lisp/textmodes/picture.el
--- emacs-26.1+1/lisp/textmodes/picture.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/picture.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
 
-;; Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: emacs-devel@gnu.org
@@ -623,7 +623,6 @@
 (defvar picture-mode-map
   (let ((map (make-keymap)))
     (define-key map [remap self-insert-command] 'picture-self-insert)
-    (define-key map [remap self-insert-command] 'picture-self-insert)
     (define-key map [remap completion-separator-self-insert-command]
 			  'picture-self-insert)
     (define-key map [remap completion-separator-self-insert-autofilling]
diff -Nru emacs-26.1+1/lisp/textmodes/po.el emacs-26.3+1/lisp/textmodes/po.el
--- emacs-26.1+1/lisp/textmodes/po.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/po.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; po.el --- basic support of PO translation files
 
-;; Copyright (C) 1995-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Authors: François Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
diff -Nru emacs-26.1+1/lisp/textmodes/refbib.el emacs-26.3+1/lisp/textmodes/refbib.el
--- emacs-26.1+1/lisp/textmodes/refbib.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/refbib.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; refbib.el --- convert refer-style references to ones usable by Latex bib
 
-;; Copyright (C) 1989, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Henry Kautz <kautz@research.att.com>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/refer.el emacs-26.3+1/lisp/textmodes/refer.el
--- emacs-26.1+1/lisp/textmodes/refer.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/refer.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; refer.el --- look up references in bibliography files
 
-;; Copyright (C) 1992, 1996, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1996, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/refill.el emacs-26.3+1/lisp/textmodes/refill.el
--- emacs-26.1+1/lisp/textmodes/refill.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/refill.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; refill.el --- `auto-fill' by refilling paragraphs on changes
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Miles Bader <miles@gnu.org>
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-auc.el emacs-26.3+1/lisp/textmodes/reftex-auc.el
--- emacs-26.1+1/lisp/textmodes/reftex-auc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-auc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-auc.el --- RefTeX's interface to AUCTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-cite.el emacs-26.3+1/lisp/textmodes/reftex-cite.el
--- emacs-26.1+1/lisp/textmodes/reftex-cite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-cite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-cite.el --- creating citations with RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-dcr.el emacs-26.3+1/lisp/textmodes/reftex-dcr.el
--- emacs-26.1+1/lisp/textmodes/reftex-dcr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-dcr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex.el emacs-26.3+1/lisp/textmodes/reftex.el
--- emacs-26.1+1/lisp/textmodes/reftex.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
-;; Copyright (C) 1997-2000, 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2000, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-global.el emacs-26.3+1/lisp/textmodes/reftex-global.el
--- emacs-26.1+1/lisp/textmodes/reftex-global.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-global.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-global.el --- operations on entire documents with RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-index.el emacs-26.3+1/lisp/textmodes/reftex-index.el
--- emacs-26.1+1/lisp/textmodes/reftex-index.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-index.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-index.el --- index support with RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-parse.el emacs-26.3+1/lisp/textmodes/reftex-parse.el
--- emacs-26.1+1/lisp/textmodes/reftex-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-parse.el --- parser functions for RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-ref.el emacs-26.3+1/lisp/textmodes/reftex-ref.el
--- emacs-26.1+1/lisp/textmodes/reftex-ref.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-ref.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-ref.el --- code to create labels and references with RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-sel.el emacs-26.3+1/lisp/textmodes/reftex-sel.el
--- emacs-26.1+1/lisp/textmodes/reftex-sel.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-sel.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-sel.el --- the selection modes for RefTeX
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-toc.el emacs-26.3+1/lisp/textmodes/reftex-toc.el
--- emacs-26.1+1/lisp/textmodes/reftex-toc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-toc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-toc.el --- RefTeX's table of contents mode
 
-;; Copyright (C) 1997-2000, 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2000, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/reftex-vars.el emacs-26.3+1/lisp/textmodes/reftex-vars.el
--- emacs-26.1+1/lisp/textmodes/reftex-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/reftex-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-vars.el --- configuration variables for RefTeX
 
-;; Copyright (C) 1997-1999, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/remember.el emacs-26.3+1/lisp/textmodes/remember.el
--- emacs-26.1+1/lisp/textmodes/remember.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/remember.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; remember --- a mode for quickly jotting down things to remember
 
-;; Copyright (C) 1999-2001, 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2001, 2003-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/rst.el emacs-26.3+1/lisp/textmodes/rst.el
--- emacs-26.1+1/lisp/textmodes/rst.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/rst.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rst.el --- Mode for viewing and editing reStructuredText-documents  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: Stefan Merten <stefan at merten-home dot de>
 ;; Author: Stefan Merten <stefan at merten-home dot de>,
diff -Nru emacs-26.1+1/lisp/textmodes/sgml-mode.el emacs-26.3+1/lisp/textmodes/sgml-mode.el
--- emacs-26.1+1/lisp/textmodes/sgml-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/sgml-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992, 1995-1996, 1998, 2001-2018 Free Software
+;; Copyright (C) 1992, 1995-1996, 1998, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: James Clark <jjc@jclark.com>
@@ -100,24 +100,20 @@
   :group 'sgml
   :type 'hook)
 
-;; As long as Emacs's syntax can't be complemented with predicates to context
-;; sensitively confirm the syntax of characters, we have to live with this
-;; kludgy kind of tradeoff.
-(defvar sgml-specials '(?\")
+;; The official handling of "--" is complicated in SGML, and
+;; historically not well supported by browser HTML parsers.
+;; Recommendations for writing HTML comments is to use <!--...-->
+;; (where ... doesn't contain "--") to avoid the complications
+;; altogether (XML goes even further by requiring this in the spec).
+;; So there is probably no need to handle it "correctly".
+(defvar sgml-specials '(?\" ?\')
   "List of characters that have a special meaning for SGML mode.
 This list is used when first loading the `sgml-mode' library.
-The supported characters and potential disadvantages are:
+The supported characters are ?\\\", ?\\=', and ?-.
 
-  ?\\\"	Makes \" in text start a string.
-  ?\\='	Makes \\=' in text start a string.
-  ?-	Makes -- in text start a comment.
-
-When only one of ?\\\" or ?\\=' are included, \"\\='\" or \\='\"\\=', as can be found in
-DTDs, start a string.  To partially avoid this problem this also makes these
-self insert as named entities depending on `sgml-quick-keys'.
-
-Including ?- has the problem of affecting dashes that have nothing to do
-with comments, so we normally turn it off.")
+Including ?- makes double dashes into comment delimiters, but
+they are really only supposed to delimit comments within DTD
+definitions.  So we normally turn it off.")
 
 (defvar sgml-quick-keys nil
   "Use <, >, &, /, SPC and `sgml-specials' keys \"electrically\" when non-nil.
@@ -351,20 +347,21 @@
      ("--[ \t\n]*\\(>\\)" (1 "> b"))
      ("\\(<\\)[?!]" (1 (prog1 "|>"
                          (sgml-syntax-propertize-inside end))))
-     ;; Double quotes outside of tags should not introduce strings.
+     ;; Quotes outside of tags should not introduce strings.
      ;; Be careful to call `syntax-ppss' on a position before the one we're
      ;; going to change, so as not to need to flush the data we just computed.
-     ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0))))
-                    (goto-char (match-end 0)))
-                  (string-to-syntax ".")))))))
+     ("[\"']" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0))))
+                       (goto-char (match-end 0)))
+                     (string-to-syntax ".")))))))
 
 (defun sgml-syntax-propertize (start end)
   "Syntactic keywords for `sgml-mode'."
   (goto-char start)
-  (sgml-syntax-propertize-inside end)
-  (funcall
-   (syntax-propertize-rules sgml-syntax-propertize-rules)
-   start end))
+  (with-syntax-table (or syntax-ppss-table (syntax-table))
+    (sgml-syntax-propertize-inside end)
+    (funcall
+     (syntax-propertize-rules sgml-syntax-propertize-rules)
+     start end)))
 
 (defun sgml-syntax-propertize-inside (end)
   (let ((ppss (syntax-ppss)))
@@ -572,6 +569,7 @@
 			      sgml-font-lock-keywords-2)
 			     nil t))
   (setq-local syntax-propertize-function #'sgml-syntax-propertize)
+  (setq-local syntax-ppss-table sgml-tag-syntax-table)
   (setq-local facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
   (setq-local sgml-xml-mode (sgml-xml-guess))
   (unless sgml-xml-mode
diff -Nru emacs-26.1+1/lisp/textmodes/table.el emacs-26.3+1/lisp/textmodes/table.el
--- emacs-26.1+1/lisp/textmodes/table.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/table.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; table.el --- create and edit WYSIWYG text based embedded tables  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
diff -Nru emacs-26.1+1/lisp/textmodes/texinfmt.el emacs-26.3+1/lisp/textmodes/texinfmt.el
--- emacs-26.1+1/lisp/textmodes/texinfmt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/texinfmt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; texinfmt.el --- format Texinfo files into Info files
 
-;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2018 Free Software
+;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
diff -Nru emacs-26.1+1/lisp/textmodes/texinfo.el emacs-26.3+1/lisp/textmodes/texinfo.el
--- emacs-26.1+1/lisp/textmodes/texinfo.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/texinfo.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; texinfo.el --- major mode for editing Texinfo files
 
-;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2018 Free Software
+;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Robert J. Chassell
diff -Nru emacs-26.1+1/lisp/textmodes/tex-mode.el emacs-26.3+1/lisp/textmodes/tex-mode.el
--- emacs-26.1+1/lisp/textmodes/tex-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/tex-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2018 Free
+;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/texnfo-upd.el emacs-26.3+1/lisp/textmodes/texnfo-upd.el
--- emacs-26.1+1/lisp/textmodes/texnfo-upd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/texnfo-upd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
 
-;; Copyright (C) 1989-1992, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1989-1992, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: bug-texinfo@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/text-mode.el emacs-26.3+1/lisp/textmodes/text-mode.el
--- emacs-26.1+1/lisp/textmodes/text-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/text-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; text-mode.el --- text mode, and its idiosyncratic commands
 
-;; Copyright (C) 1985, 1992, 1994, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1985, 1992, 1994, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/textmodes/tildify.el emacs-26.3+1/lisp/textmodes/tildify.el
--- emacs-26.1+1/lisp/textmodes/tildify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/tildify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tildify.el --- adding hard spaces into texts -*- lexical-binding: t -*-
 
-;; Copyright (C) 1997-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2019 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
 ;;             Michal Nazarewicz <mina86@mina86.com>
diff -Nru emacs-26.1+1/lisp/textmodes/two-column.el emacs-26.3+1/lisp/textmodes/two-column.el
--- emacs-26.1+1/lisp/textmodes/two-column.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/two-column.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; two-column.el --- minor mode for editing of two-column text
 
-;; Copyright (C) 1992-1995, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1995, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Adapted-By: ESR, Daniel Pfeiffer
diff -Nru emacs-26.1+1/lisp/textmodes/underline.el emacs-26.3+1/lisp/textmodes/underline.el
--- emacs-26.1+1/lisp/textmodes/underline.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/textmodes/underline.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs
 
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
diff -Nru emacs-26.1+1/lisp/thingatpt.el emacs-26.3+1/lisp/thingatpt.el
--- emacs-26.1+1/lisp/thingatpt.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/thingatpt.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thingatpt.el --- get the `thing' at point  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
 ;; Maintainer: emacs-devel@gnu.org
@@ -219,17 +219,15 @@
 
 (defun thing-at-point-bounds-of-list-at-point ()
   "Return the bounds of the list at point.
+Prefer the enclosing list with fallback on sexp at point.
 \[Internal function used by `bounds-of-thing-at-point'.]"
   (save-excursion
-    (let* ((st (parse-partial-sexp (point-min) (point)))
-           (beg (or (and (eq 4 (car (syntax-after (point))))
-                         (not (nth 8 st))
-                         (point))
-                    (nth 1 st))))
-      (when beg
-        (goto-char beg)
-        (forward-sexp)
-        (cons beg (point))))))
+    (if (ignore-errors (up-list -1))
+	(ignore-errors (cons (point) (progn (forward-sexp) (point))))
+      (let ((bound (bounds-of-thing-at-point 'sexp)))
+	(and bound
+	     (<= (car bound) (point)) (< (point) (cdr bound))
+	     bound)))))
 
 ;; Defuns
 
@@ -474,7 +472,7 @@
 
 (put 'url 'end-op (lambda () (end-of-thing 'url)))
 
-(put 'url 'beginning-op (lambda () (end-of-thing 'url)))
+(put 'url 'beginning-op (lambda () (beginning-of-thing 'url)))
 
 ;; The normal thingatpt mechanism doesn't work for complex regexps.
 ;; This should work for almost any regexp wherever we are in the
@@ -608,8 +606,13 @@
 
 (put 'number 'thing-at-point 'number-at-point)
 ;;;###autoload
-(defun list-at-point ()
-  "Return the Lisp list at point, or nil if none is found."
-  (form-at-point 'list 'listp))
+(defun list-at-point (&optional ignore-comment-or-string)
+  "Return the Lisp list at point, or nil if none is found.
+If IGNORE-COMMENT-OR-STRING is non-nil comments and strings are
+treated as white space."
+  (let ((ppss (and ignore-comment-or-string (syntax-ppss))))
+    (save-excursion
+      (goto-char (or (nth 8 ppss) (point)))
+      (form-at-point 'list 'listp))))
 
 ;;; thingatpt.el ends here
diff -Nru emacs-26.1+1/lisp/thumbs.el emacs-26.3+1/lisp/thumbs.el
--- emacs-26.1+1/lisp/thumbs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/thumbs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/time.el emacs-26.3+1/lisp/time.el
--- emacs-26.1+1/lisp/time.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/time.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; time.el --- display time, load and mail indicator in mode line of Emacs
 
-;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2018 Free Software
+;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/time-stamp.el emacs-26.3+1/lisp/time-stamp.el
--- emacs-26.1+1/lisp/time-stamp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/time-stamp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
 
-;; Copyright (C) 1989, 1993-1995, 1997, 2000-2018 Free Software
+;; Copyright (C) 1989, 1993-1995, 1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/timezone.el emacs-26.3+1/lisp/timezone.el
--- emacs-26.1+1/lisp/timezone.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/timezone.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; timezone.el --- time zone package for GNU Emacs
 
-;; Copyright (C) 1990-1993, 1996, 1999, 2001-2018 Free Software
+;; Copyright (C) 1990-1993, 1996, 1999, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Masanobu Umeda
diff -Nru emacs-26.1+1/lisp/tmm.el emacs-26.3+1/lisp/tmm.el
--- emacs-26.1+1/lisp/tmm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tmm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tmm.el --- text mode access to menu-bar  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-1996, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/t-mouse.el emacs-26.3+1/lisp/t-mouse.el
--- emacs-26.1+1/lisp/t-mouse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/t-mouse.el	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mouse gpm linux
 
-;; Copyright (C) 1994-1995, 1998, 2006-2018 Free Software Foundation,
+;; Copyright (C) 1994-1995, 1998, 2006-2019 Free Software Foundation,
 ;; Inc.
 
 ;; This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/tool-bar.el emacs-26.3+1/lisp/tool-bar.el
--- emacs-26.1+1/lisp/tool-bar.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tool-bar.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tool-bar.el --- setting up the tool bar
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: mouse frames
diff -Nru emacs-26.1+1/lisp/tooltip.el emacs-26.3+1/lisp/tooltip.el
--- emacs-26.1+1/lisp/tooltip.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tooltip.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tooltip.el --- show tooltip windows
 
-;; Copyright (C) 1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
diff -Nru emacs-26.1+1/lisp/tree-widget.el emacs-26.3+1/lisp/tree-widget.el
--- emacs-26.1+1/lisp/tree-widget.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tree-widget.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tree-widget.el --- Tree widget
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff -Nru emacs-26.1+1/lisp/tutorial.el emacs-26.3+1/lisp/tutorial.el
--- emacs-26.1+1/lisp/tutorial.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/tutorial.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tutorial.el --- tutorial for Emacs
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
diff -Nru emacs-26.1+1/lisp/type-break.el emacs-26.3+1/lisp/type-break.el
--- emacs-26.1+1/lisp/type-break.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/type-break.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; type-break.el --- encourage rests from typing at appropriate intervals  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994-1995, 1997, 2000-2018 Free Software Foundation,
+;; Copyright (C) 1994-1995, 1997, 2000-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Noah Friedman
diff -Nru emacs-26.1+1/lisp/uniquify.el emacs-26.3+1/lisp/uniquify.el
--- emacs-26.1+1/lisp/uniquify.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/uniquify.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; uniquify.el --- unique buffer names dependent on file name -*- lexical-binding: t -*-
 
-;; Copyright (C) 1989, 1995-1997, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1989, 1995-1997, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Dick King <king@reasoning.com>
diff -Nru emacs-26.1+1/lisp/url/ChangeLog.1 emacs-26.3+1/lisp/url/ChangeLog.1
--- emacs-26.1+1/lisp/url/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3068,7 +3068,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1999, 2001-2002, 2004-2018 Free Software Foundation,
+  Copyright (C) 1999, 2001-2002, 2004-2019 Free Software Foundation,
   Inc.
 
   This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/lisp/url/url-about.el emacs-26.3+1/lisp/url/url-about.el
--- emacs-26.1+1/lisp/url/url-about.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-about.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-about.el --- Show internal URLs
 
-;; Copyright (C) 2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-auth.el emacs-26.3+1/lisp/url/url-auth.el
--- emacs-26.1+1/lisp/url/url-auth.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-auth.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-cache.el emacs-26.3+1/lisp/url/url-cache.el
--- emacs-26.1+1/lisp/url/url-cache.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-cache.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-cid.el emacs-26.3+1/lisp/url/url-cid.el
--- emacs-26.1+1/lisp/url/url-cid.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-cid.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-cid.el --- Content-ID URL loader
 
-;; Copyright (C) 1998-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-cookie.el emacs-26.3+1/lisp/url/url-cookie.el
--- emacs-26.1+1/lisp/url/url-cookie.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-cookie.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-cookie.el --- URL cookie support  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-dav.el emacs-26.3+1/lisp/url/url-dav.el
--- emacs-26.1+1/lisp/url/url-dav.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-dav.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-dav.el --- WebDAV support
 
-;; Copyright (C) 2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/url/url-dired.el emacs-26.3+1/lisp/url/url-dired.el
--- emacs-26.1+1/lisp/url/url-dired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-dired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-dired.el --- URL Dired minor mode
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, files
 
diff -Nru emacs-26.1+1/lisp/url/url-domsuf.el emacs-26.3+1/lisp/url/url-domsuf.el
--- emacs-26.1+1/lisp/url/url-domsuf.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-domsuf.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-domsuf.el --- Say what domain names can have cookies set.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 
diff -Nru emacs-26.1+1/lisp/url/url.el emacs-26.3+1/lisp/url/url.el
--- emacs-26.1+1/lisp/url/url.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-1999, 2001, 2004-2018 Free Software Foundation,
+;; Copyright (C) 1996-1999, 2001, 2004-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
diff -Nru emacs-26.1+1/lisp/url/url-expand.el emacs-26.3+1/lisp/url/url-expand.el
--- emacs-26.1+1/lisp/url/url-expand.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-expand.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-expand.el --- expand-file-name for URLs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-file.el emacs-26.3+1/lisp/url/url-file.el
--- emacs-26.1+1/lisp/url/url-file.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-file.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-file.el --- File retrieval code
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-ftp.el emacs-26.3+1/lisp/url/url-ftp.el
--- emacs-26.1+1/lisp/url/url-ftp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-ftp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-ftp.el --- FTP wrapper
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-future.el emacs-26.3+1/lisp/url/url-future.el
--- emacs-26.1+1/lisp/url/url-future.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-future.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-future.el --- general futures facility for url.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
diff -Nru emacs-26.1+1/lisp/url/url-gw.el emacs-26.3+1/lisp/url/url-gw.el
--- emacs-26.1+1/lisp/url/url-gw.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-gw.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 
-;; Copyright (C) 1997-1998, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/url/url-handlers.el emacs-26.3+1/lisp/url/url-handlers.el
--- emacs-26.1+1/lisp/url/url-handlers.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-handlers.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -41,6 +41,9 @@
 (declare-function mm-decode-string "mm-bodies" (string charset))
 ;; mm-decode loads mail-parse.
 (declare-function mail-content-type-get "mail-parse" (ct attribute))
+;; mm-bodies loads mm-util.
+(declare-function mm-charset-to-coding-system "mm-util"
+                  (charset &optional lbt allow-override silent))
 
 ;; Implementation status
 ;; ---------------------
@@ -250,15 +253,15 @@
 ;; The actual implementation
 ;;;###autoload
 (defun url-copy-file (url newname &optional ok-if-already-exists
-			  _keep-time _preserve-uid-gid)
+                          _keep-time _preserve-uid-gid _preserve-permissions)
   "Copy URL to NEWNAME.  Both args must be strings.
-Signals a `file-already-exists' error if file NEWNAME already exists,
+Signal a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 Fourth arg KEEP-TIME non-nil means give the new file the same
 last-modified time as the old one.  (This works on only some systems.)
-Fifth arg PRESERVE-UID-GID is ignored.
+Args PRESERVE-UID-GID and PRESERVE-PERMISSIONS are ignored.
 A prefix arg makes KEEP-TIME non-nil."
   (if (and (file-exists-p newname)
 	   (not ok-if-already-exists))
@@ -341,7 +344,7 @@
     (unless buffer (signal 'file-error (list url "No Data")))
     (with-current-buffer buffer
       ;; XXX: This is HTTP/S specific and should be moved to url-http
-      ;; instead.  See https://debbugs.gnu.org/17549.
+      ;; instead.  See bug#17549.
       (when (bound-and-true-p url-http-response-status)
         ;; Don't signal an error if VISIT is non-nil, because
         ;; 'insert-file-contents' doesn't.  This is required to
@@ -354,7 +357,7 @@
                          (< url-http-response-status 300)))
           (let ((desc (nth 2 (assq url-http-response-status url-http-codes))))
             (kill-buffer buffer)
-            ;; Signal file-error per https://debbugs.gnu.org/16733.
+            ;; Signal file-error per bug#16733.
             (signal 'file-error (list url desc))))))
     (url-insert-buffer-contents buffer url visit beg end replace)))
 
diff -Nru emacs-26.1+1/lisp/url/url-history.el emacs-26.3+1/lisp/url/url-history.el
--- emacs-26.1+1/lisp/url/url-history.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-history.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-history.el --- Global history tracking for URL package  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-http.el emacs-26.3+1/lisp/url/url-http.el
--- emacs-26.1+1/lisp/url/url-http.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-http.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-http.el --- HTTP retrieval routines  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999, 2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/url/url-imap.el emacs-26.3+1/lisp/url/url-imap.el
--- emacs-26.1+1/lisp/url/url-imap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-imap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-imap.el --- IMAP retrieval routines
 
-;; Copyright (C) 1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: comm, data, processes
diff -Nru emacs-26.1+1/lisp/url/url-irc.el emacs-26.3+1/lisp/url/url-irc.el
--- emacs-26.1+1/lisp/url/url-irc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-irc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-irc.el --- IRC URL interface
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-ldap.el emacs-26.3+1/lisp/url/url-ldap.el
--- emacs-26.1+1/lisp/url/url-ldap.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-ldap.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1998-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-mailto.el emacs-26.3+1/lisp/url/url-mailto.el
--- emacs-26.1+1/lisp/url/url-mailto.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-mailto.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-methods.el emacs-26.3+1/lisp/url/url-methods.el
--- emacs-26.1+1/lisp/url/url-methods.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-methods.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-methods.el --- Load URL schemes as needed
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-misc.el emacs-26.3+1/lisp/url/url-misc.el
--- emacs-26.1+1/lisp/url/url-misc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-misc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1996-1999, 2002, 2004-2018 Free Software Foundation,
+;; Copyright (C) 1996-1999, 2002, 2004-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Keywords: comm, data, processes
diff -Nru emacs-26.1+1/lisp/url/url-news.el emacs-26.3+1/lisp/url/url-news.el
--- emacs-26.1+1/lisp/url/url-news.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-news.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-nfs.el emacs-26.3+1/lisp/url/url-nfs.el
--- emacs-26.1+1/lisp/url/url-nfs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-nfs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-nfs.el --- NFS URL interface
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-ns.el emacs-26.3+1/lisp/url/url-ns.el
--- emacs-26.1+1/lisp/url/url-ns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-ns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
 
-;; Copyright (C) 1997-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-parse.el emacs-26.3+1/lisp/url/url-parse.el
--- emacs-26.1+1/lisp/url/url-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-parse.el --- Uniform Resource Locator parser -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff -Nru emacs-26.1+1/lisp/url/url-privacy.el emacs-26.3+1/lisp/url/url-privacy.el
--- emacs-26.1+1/lisp/url/url-privacy.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-privacy.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-privacy.el --- Global history tracking for URL package
 
-;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-proxy.el emacs-26.3+1/lisp/url/url-proxy.el
--- emacs-26.1+1/lisp/url/url-proxy.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-proxy.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-proxy.el --- Proxy server support
 
-;; Copyright (C) 1999, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004-2019 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff -Nru emacs-26.1+1/lisp/url/url-queue.el emacs-26.3+1/lisp/url/url-queue.el
--- emacs-26.1+1/lisp/url/url-queue.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-queue.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-queue.el --- Fetching web pages in parallel   -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: comm
diff -Nru emacs-26.1+1/lisp/url/url-tramp.el emacs-26.3+1/lisp/url/url-tramp.el
--- emacs-26.1+1/lisp/url/url-tramp.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-tramp.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-tramp.el --- file-name-handler magic invoking Tramp for some protocols
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, data, processes, hypermedia
diff -Nru emacs-26.1+1/lisp/url/url-util.el emacs-26.3+1/lisp/url/url-util.el
--- emacs-26.1+1/lisp/url/url-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996-1999, 2001, 2004-2018 Free Software Foundation,
+;; Copyright (C) 1996-1999, 2001, 2004-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
@@ -74,7 +74,8 @@
 
 ;;;###autoload
 (defun url-parse-args (str &optional nodowncase)
-  ;; Return an assoc list of attribute/value pairs from an RFC822-type string
+  ;; Return an assoc list of attribute/value pairs from a string
+  ;; that uses RFC 822 (or later) format.
   (let (
 	name				; From name=
 	value				; its value
diff -Nru emacs-26.1+1/lisp/url/url-vars.el emacs-26.3+1/lisp/url/url-vars.el
--- emacs-26.1+1/lisp/url/url-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/url/url-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
-;; Copyright (C) 1996-1999, 2001, 2004-2018 Free Software Foundation,
+;; Copyright (C) 1996-1999, 2001, 2004-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
diff -Nru emacs-26.1+1/lisp/userlock.el emacs-26.3+1/lisp/userlock.el
--- emacs-26.1+1/lisp/userlock.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/userlock.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
-;; Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Richard King
 ;; (according to authors.el)
diff -Nru emacs-26.1+1/lisp/vc/add-log.el emacs-26.3+1/lisp/vc/add-log.el
--- emacs-26.1+1/lisp/vc/add-log.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/add-log.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; add-log.el --- change log maintenance commands for Emacs
 
-;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2018 Free
+;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/compare-w.el emacs-26.3+1/lisp/vc/compare-w.el
--- emacs-26.1+1/lisp/vc/compare-w.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/compare-w.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; compare-w.el --- compare text between windows for Emacs
 
-;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2018 Free Software
+;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/cvs-status.el emacs-26.3+1/lisp/vc/cvs-status.el
--- emacs-26.1+1/lisp/vc/cvs-status.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/cvs-status.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs cvs status tree vc tools
diff -Nru emacs-26.1+1/lisp/vc/diff.el emacs-26.3+1/lisp/vc/diff.el
--- emacs-26.1+1/lisp/vc/diff.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/diff.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; diff.el --- run `diff'  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994, 1996, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Frank Bresz
diff -Nru emacs-26.1+1/lisp/vc/diff-mode.el emacs-26.3+1/lisp/vc/diff-mode.el
--- emacs-26.1+1/lisp/vc/diff-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/diff-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: convenience patch diff vc
diff -Nru emacs-26.1+1/lisp/vc/ediff-diff.el emacs-26.3+1/lisp/vc/ediff-diff.el
--- emacs-26.1+1/lisp/vc/ediff-diff.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-diff.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-diff.el --- diff-related utilities
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff.el emacs-26.3+1/lisp/vc/ediff.el
--- emacs-26.1+1/lisp/vc/ediff.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff.el --- a comprehensive visual interface to diff & patch
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
@@ -927,6 +927,7 @@
 ;;;###autoload
 (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
   "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
+This compares the portions of text visible in each of the two windows.
 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 follows:
 If WIND-A is nil, use selected window.
@@ -940,6 +941,7 @@
 ;;;###autoload
 (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
   "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
+This compares the portions of text visible in each of the two windows.
 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
 follows:
 If WIND-A is nil, use selected window.
@@ -950,7 +952,8 @@
   (ediff-windows dumb-mode wind-A wind-B
 		 startup-hooks 'ediff-windows-linewise nil))
 
-;; Compare WIND-A and WIND-B, which are selected by clicking.
+;; Compare visible portions of text in WIND-A and WIND-B, which are
+;; selected by clicking.
 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
 ;; works as follows:
 ;; If WIND-A is nil, use selected window.
@@ -991,8 +994,8 @@
   "Run Ediff on a pair of regions in specified buffers.
 BUFFER-A and BUFFER-B are the buffers to be compared.
 Regions (i.e., point and mark) can be set in advance or marked interactively.
-This function is effective only for relatively small regions, up to 200
-lines.  For large regions, use `ediff-regions-linewise'.
+This function might be slow for large regions.  If you find it slow,
+use `ediff-regions-linewise' instead.
 STARTUP-HOOKS is a list of functions that Emacs calls without
 arguments after setting up the Ediff buffers."
   (interactive
diff -Nru emacs-26.1+1/lisp/vc/ediff-help.el emacs-26.3+1/lisp/vc/ediff-help.el
--- emacs-26.1+1/lisp/vc/ediff-help.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-help.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-hook.el emacs-26.3+1/lisp/vc/ediff-hook.el
--- emacs-26.1+1/lisp/vc/ediff-hook.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-hook.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-init.el emacs-26.3+1/lisp/vc/ediff-init.el
--- emacs-26.1+1/lisp/vc/ediff-init.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-init.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-merg.el emacs-26.3+1/lisp/vc/ediff-merg.el
--- emacs-26.1+1/lisp/vc/ediff-merg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-merg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-merg.el --- merging utilities
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-mult.el emacs-26.3+1/lisp/vc/ediff-mult.el
--- emacs-26.1+1/lisp/vc/ediff-mult.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-mult.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
-;; Copyright (C) 1995-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-ptch.el emacs-26.3+1/lisp/vc/ediff-ptch.el
--- emacs-26.1+1/lisp/vc/ediff-ptch.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-ptch.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
-;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-util.el emacs-26.3+1/lisp/vc/ediff-util.el
--- emacs-26.1+1/lisp/vc/ediff-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-util.el --- the core commands and utilities of ediff  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1994-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-vers.el emacs-26.3+1/lisp/vc/ediff-vers.el
--- emacs-26.1+1/lisp/vc/ediff-vers.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-vers.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;; Copyright (C) 1995-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/ediff-wind.el emacs-26.3+1/lisp/vc/ediff-wind.el
--- emacs-26.1+1/lisp/vc/ediff-wind.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/ediff-wind.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
-;; Copyright (C) 1994-1997, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff -Nru emacs-26.1+1/lisp/vc/log-edit.el emacs-26.3+1/lisp/vc/log-edit.el
--- emacs-26.1+1/lisp/vc/log-edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/log-edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs cvs commit log vc
diff -Nru emacs-26.1+1/lisp/vc/log-view.el emacs-26.3+1/lisp/vc/log-view.el
--- emacs-26.1+1/lisp/vc/log-view.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/log-view.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; log-view.el --- Major mode for browsing revision log histories -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tools, vc
diff -Nru emacs-26.1+1/lisp/vc/pcvs-defs.el emacs-26.3+1/lisp/vc/pcvs-defs.el
--- emacs-26.1+1/lisp/vc/pcvs-defs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/pcvs-defs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff -Nru emacs-26.1+1/lisp/vc/pcvs.el emacs-26.3+1/lisp/vc/pcvs.el
--- emacs-26.1+1/lisp/vc/pcvs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/pcvs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcvs.el --- a front-end to CVS  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: The PCL-CVS Trust <pcl-cvs@cyclic.com>
 ;;	Per Cederqvist <ceder@lysator.liu.se>
diff -Nru emacs-26.1+1/lisp/vc/pcvs-info.el emacs-26.3+1/lisp/vc/pcvs-info.el
--- emacs-26.1+1/lisp/vc/pcvs-info.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/pcvs-info.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff -Nru emacs-26.1+1/lisp/vc/pcvs-parse.el emacs-26.3+1/lisp/vc/pcvs-parse.el
--- emacs-26.1+1/lisp/vc/pcvs-parse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/pcvs-parse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcvs-parse.el --- the CVS output parser
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff -Nru emacs-26.1+1/lisp/vc/pcvs-util.el emacs-26.3+1/lisp/vc/pcvs-util.el
--- emacs-26.1+1/lisp/vc/pcvs-util.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/pcvs-util.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff -Nru emacs-26.1+1/lisp/vc/smerge-mode.el emacs-26.3+1/lisp/vc/smerge-mode.el
--- emacs-26.1+1/lisp/vc/smerge-mode.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/smerge-mode.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*-
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict
diff -Nru emacs-26.1+1/lisp/vc/vc-annotate.el emacs-26.3+1/lisp/vc/vc-annotate.el
--- emacs-26.1+1/lisp/vc/vc-annotate.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-annotate.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-annotate.el --- VC Annotate Support  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1997-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-bzr.el emacs-26.3+1/lisp/vc/vc-bzr.el
--- emacs-26.1+1/lisp/vc/vc-bzr.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-bzr.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-bzr.el --- VC backend for the bzr revision control system  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; 	   Riccardo Murri <riccardo.murri@gmail.com>
diff -Nru emacs-26.1+1/lisp/vc/vc-cvs.el emacs-26.3+1/lisp/vc/vc-cvs.el
--- emacs-26.1+1/lisp/vc/vc-cvs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-cvs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-cvs.el --- non-resident support for CVS version-control  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1995, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-dav.el emacs-26.3+1/lisp/vc/vc-dav.el
--- emacs-26.1+1/lisp/vc/vc-dav.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-dav.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-dav.el --- vc.el support for WebDAV
 
-;; Copyright (C) 2001, 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
diff -Nru emacs-26.1+1/lisp/vc/vc-dir.el emacs-26.3+1/lisp/vc/vc-dir.el
--- emacs-26.1+1/lisp/vc/vc-dir.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-dir.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-dir.el --- Directory status display under VC  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author:   Dan Nicolaescu <dann@ics.uci.edu>
 ;; Keywords: vc tools
diff -Nru emacs-26.1+1/lisp/vc/vc-dispatcher.el emacs-26.3+1/lisp/vc/vc-dispatcher.el
--- emacs-26.1+1/lisp/vc/vc-dispatcher.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-dispatcher.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-dispatcher.el -- generic command-dispatcher facility.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc.el emacs-26.3+1/lisp/vc/vc.el
--- emacs-26.1+1/lisp/vc/vc.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc.el --- drive a version-control system from within Emacs  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992-1998, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: emacs-devel@gnu.org
@@ -1814,7 +1814,12 @@
 
 ;;;###autoload
 (defun vc-version-diff (_files rev1 rev2)
-  "Report diffs between revisions of the fileset in the repository history."
+  "Report diffs between revisions REV1 and REV2 in the repository history.
+This compares two revisions of the current fileset.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in the fileset."
   (interactive (vc-diff-build-argument-list-internal))
   ;; All that was just so we could do argument completion!
   (when (and (not rev1) rev2)
@@ -1846,8 +1851,14 @@
 
 ;;;###autoload
 (defun vc-version-ediff (files rev1 rev2)
-  "Show differences between revisions of the fileset in the
-repository history using ediff."
+  "Show differences between REV1 and REV2 of FILES using ediff.
+This compares two revisions of the files in FILES.  Currently,
+only a single file's revisions can be compared, i.e. FILES can
+specify only one file name.
+If REV1 is nil, it defaults to the current revision, i.e. revision
+of the last commit.
+If REV2 is nil, it defaults to the work tree, i.e. the current
+state of each file in FILES."
   (interactive (vc-diff-build-argument-list-internal))
   ;; All that was just so we could do argument completion!
   (when (and (not rev1) rev2)
@@ -1966,10 +1977,13 @@
 	(with-current-buffer filebuf
 	  (let ((failed t))
 	    (unwind-protect
-		(let ((coding-system-for-read 'no-conversion)
-		      (coding-system-for-write 'no-conversion))
+		(let ((coding-system-for-read 'no-conversion))
 		  (with-temp-file filename
 		    (let ((outbuf (current-buffer)))
+                      ;; We will read the backend's output with no
+                      ;; conversions, so we should also save the
+                      ;; temporary file with no encoding conversions.
+                      (setq buffer-file-coding-system 'no-conversion)
 		      ;; Change buffer to get local value of
 		      ;; vc-checkout-switches.
 		      (with-current-buffer filebuf
@@ -2256,8 +2270,9 @@
 	 (vc-call-backend bk 'print-log files-arg buf shortlog
                           (when is-start-revision working-revision) limit))
        (lambda (_bk _files-arg ret)
-	 (vc-print-log-setup-buttons working-revision
-				     is-start-revision limit ret))
+         (save-excursion
+           (vc-print-log-setup-buttons working-revision
+                                       is-start-revision limit ret)))
        ;; When it's nil, point really shouldn't move (bug#15322).
        (when working-revision
          (lambda (bk)
diff -Nru emacs-26.1+1/lisp/vc/vc-filewise.el emacs-26.3+1/lisp/vc/vc-filewise.el
--- emacs-26.1+1/lisp/vc/vc-filewise.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-filewise.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-filewise.el --- common functions for file-oriented back ends.
 
-;; Copyright (C) 1992-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-git.el emacs-26.3+1/lisp/vc/vc-git.el
--- emacs-26.1+1/lisp/vc/vc-git.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-git.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Alexandre Julliard <julliard@winehq.org>
 ;; Keywords: vc tools
@@ -298,9 +298,6 @@
                 '("--ignored"))
             "--"))
         (status (apply #'vc-git--run-command-string file args)))
-    ;; Alternatively, the `ignored' state could be detected with 'git
-    ;; ls-files -i -o --exclude-standard', but that's an extra process
-    ;; call, and the `ignored' state is rarely needed.
     (if (null status)
         ;; If status is nil, there was an error calling git, likely because
         ;; the file is not in a git repo.
@@ -565,6 +562,7 @@
 (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
 
 (defun vc-git-dir-status-goto-stage (git-state)
+  ;; TODO: Look into reimplementing this using `git status --porcelain=v2'.
   (let ((files (vc-git-dir-status-state->files git-state)))
     (erase-buffer)
     (pcase (vc-git-dir-status-state->stage git-state)
@@ -581,7 +579,7 @@
                        "ls-files" "-z" "-c" "-s" "--"))
       (`ls-files-conflict
        (vc-git-command (current-buffer) 'async files
-                       "ls-files" "-z" "-c" "-s" "--"))
+                       "ls-files" "-z" "-u" "--"))
       (`ls-files-unknown
        (vc-git-command (current-buffer) 'async files
                        "ls-files" "-z" "-o" "--directory"
@@ -860,13 +858,13 @@
     (vc-git-command nil nil file "checkout" "-q" "--")))
 
 (defvar vc-git-error-regexp-alist
-  '(("^ \\(.+\\) |" 1 nil nil 0))
+  '(("^ \\(.+\\)\\> *|" 1 nil nil 0))
   "Value of `compilation-error-regexp-alist' in *vc-git* buffers.")
 
 ;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
 (declare-function vc-compilation-mode "vc-dispatcher" (backend))
 
-(defun vc-git--pushpull (command prompt)
+(defun vc-git--pushpull (command prompt extra-args)
   "Run COMMAND (a string; either push or pull) on the current Git branch.
 If PROMPT is non-nil, prompt for the Git command to run."
   (let* ((root (vc-git-root default-directory))
@@ -885,6 +883,7 @@
       (setq git-program (car  args)
 	    command     (cadr args)
 	    args        (cddr args)))
+    (setq args (nconc args extra-args))
     (require 'vc-dispatcher)
     (apply 'vc-do-async-command buffer root git-program command args)
     (with-current-buffer buffer
@@ -892,7 +891,7 @@
         (vc-compilation-mode 'git)
         (setq-local compile-command
                     (concat git-program " " command " "
-                            (if args (mapconcat 'identity args " ") "")))
+                            (mapconcat 'identity args " ")))
         (setq-local compilation-directory root)
         ;; Either set `compilation-buffer-name-function' locally to nil
         ;; or use `compilation-arguments' to set `name-function'.
@@ -907,13 +906,13 @@
   "Pull changes into the current Git branch.
 Normally, this runs \"git pull\".  If PROMPT is non-nil, prompt
 for the Git command to run."
-  (vc-git--pushpull "pull" prompt))
+  (vc-git--pushpull "pull" prompt '("--stat")))
 
 (defun vc-git-push (prompt)
   "Push changes from the current Git branch.
 Normally, this runs \"git push\".  If PROMPT is non-nil, prompt
 for the Git command to run."
-  (vc-git--pushpull "push" prompt))
+  (vc-git--pushpull "push" prompt nil))
 
 (defun vc-git-merge-branch ()
   "Merge changes into the current Git branch.
@@ -941,9 +940,6 @@
           (vc-git--run-command-string directory "status" "--porcelain" "--"))
          (lines (when status (split-string status "\n" 'omit-nulls)))
          files)
-    ;; TODO: Look into reimplementing `vc-git-state', as well as
-    ;; `vc-git-dir-status-files', based on this output, thus making the
-    ;; extra process call in `vc-git-find-file-hook' unnecessary.
     (dolist (line lines files)
       (when (string-match "\\([ MADRCU?!][ MADRCU?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?"
                           line)
@@ -978,15 +974,10 @@
 (defun vc-git-find-file-hook ()
   "Activate `smerge-mode' if there is a conflict."
   (when (and buffer-file-name
-             ;; FIXME
-             ;; 1) the net result is to call git twice per file.
-             ;; 2) v-g-c-f is documented to take a directory.
-             ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html
-             (vc-git-conflicted-files buffer-file-name)
+             (eq (vc-state buffer-file-name 'Git) 'conflict)
              (save-excursion
                (goto-char (point-min))
                (re-search-forward "^<<<<<<< " nil 'noerror)))
-    (vc-file-setprop buffer-file-name 'vc-state 'conflict)
     (smerge-start-session)
     (when vc-git-resolve-conflicts
       (add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local))
diff -Nru emacs-26.1+1/lisp/vc/vc-hg.el emacs-26.3+1/lisp/vc/vc-hg.el
--- emacs-26.1+1/lisp/vc/vc-hg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-hg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-hg.el --- VC backend for the mercurial version control system  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; Author: Ivan Kanis
 ;; Maintainer: emacs-devel@gnu.org
@@ -1296,12 +1296,8 @@
   (vc-hg-command buffer 1 nil "outgoing" "-n" (unless (string= remote-location "")
 						remote-location)))
 
-(defvar vc-hg-error-regexp-alist nil
-  ;; 'hg pull' does not list modified files, so, for now, the only
-  ;; benefit of `vc-compilation-mode' is that one can get rid of
-  ;; *vc-hg* buffer with 'q' or 'z'.
-  ;; TODO: call 'hg incoming' before pull/merge to get the list of
-  ;;       modified files
+(defvar vc-hg-error-regexp-alist
+  '(("^M \\(.+\\)" 1 nil nil 0))
   "Value of `compilation-error-regexp-alist' in *vc-hg* buffers.")
 
 (autoload 'vc-do-async-command "vc-dispatcher")
@@ -1309,9 +1305,10 @@
 (defvar compilation-directory)
 (defvar compilation-arguments)  ; defined in compile.el
 
-(defun vc-hg--pushpull (command prompt &optional obsolete)
+(defun vc-hg--pushpull (command prompt post-processing &optional obsolete)
   "Run COMMAND (a string; either push or pull) on the current Hg branch.
 If PROMPT is non-nil, prompt for the Hg command to run.
+POST-PROCESSING is a list of commands to execute after the command.
 If OBSOLETE is non-nil, behave like the old versions of the Hg push/pull
 commands, which only operated on marked files."
   (let (marked-list)
@@ -1327,18 +1324,14 @@
       (let* ((root (vc-hg-root default-directory))
 	     (buffer (format "*vc-hg : %s*" (expand-file-name root)))
 	     (hg-program vc-hg-program)
-	     ;; Fixme: before updating the working copy to the latest
-	     ;; state, should check if it's visiting an old revision.
-	     (args (if (equal command "pull") '("-u"))))
+	     args)
 	;; If necessary, prompt for the exact command.
         ;; TODO if pushing, prompt if no default push location - cf bzr.
 	(when prompt
 	  (setq args (split-string
 		      (read-shell-command
                        (format "Hg %s command: " command)
-                       (format "%s %s%s" hg-program command
-                               (if (not args) ""
-                                 (concat " " (mapconcat 'identity args " "))))
+                       (format "%s %s" hg-program command)
                        'vc-hg-history)
 		      " " t))
 	  (setq hg-program (car  args)
@@ -1347,10 +1340,17 @@
 	(apply 'vc-do-async-command buffer root hg-program command args)
         (with-current-buffer buffer
           (vc-run-delayed
+            (dolist (cmd post-processing)
+              (apply 'vc-do-command buffer nil hg-program nil cmd))
             (vc-compilation-mode 'hg)
             (setq-local compile-command
                         (concat hg-program " " command " "
-                                (if args (mapconcat 'identity args " ") "")))
+                                (mapconcat 'identity args " ")
+                                (mapconcat (lambda (args)
+                                             (concat " && " hg-program " "
+                                                     (mapconcat 'identity
+                                                                args " ")))
+                                           post-processing "")))
             (setq-local compilation-directory root)
             ;; Either set `compilation-buffer-name-function' locally to nil
             ;; or use `compilation-arguments' to set `name-function'.
@@ -1371,7 +1371,15 @@
 which fetches changesets from the default remote repository and
 then attempts to update the working directory."
   (interactive "P")
-  (vc-hg--pushpull "pull" prompt (called-interactively-p 'interactive)))
+  (vc-hg--pushpull "pull" prompt
+                   ;; Fixme: before updating the working copy to the latest
+                   ;; state, should check if it's visiting an old revision.
+                   ;; post-processing: list modified files and update
+                   ;; NB: this will not work with "pull = --rebase"
+                   ;;     or "pull = --update" in hgrc.
+                   '(("--pager" "no" "status" "--rev" "." "--rev" "tip")
+                     ("update"))
+                   (called-interactively-p 'interactive)))
 
 (defun vc-hg-push (prompt)
   "Push changes from the current Mercurial branch.
@@ -1381,7 +1389,7 @@
 If called interactively with a set of marked Log View buffers,
 call \"hg push -r REVS\" to push the specified revisions REVS."
   (interactive "P")
-  (vc-hg--pushpull "push" prompt (called-interactively-p 'interactive)))
+  (vc-hg--pushpull "push" prompt nil (called-interactively-p 'interactive)))
 
 (defun vc-hg-merge-branch ()
   "Merge incoming changes into the current working directory.
diff -Nru emacs-26.1+1/lisp/vc/vc-hooks.el emacs-26.3+1/lisp/vc/vc-hooks.el
--- emacs-26.1+1/lisp/vc/vc-hooks.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-hooks.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-hooks.el --- resident support for version-control
 
-;; Copyright (C) 1992-1996, 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1996, 1998-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-mtn.el emacs-26.3+1/lisp/vc/vc-mtn.el
--- emacs-26.1+1/lisp/vc/vc-mtn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-mtn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-mtn.el --- VC backend for Monotone  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: vc
diff -Nru emacs-26.1+1/lisp/vc/vc-rcs.el emacs-26.3+1/lisp/vc/vc-rcs.el
--- emacs-26.1+1/lisp/vc/vc-rcs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-rcs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-rcs.el --- support for RCS version-control  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-sccs.el emacs-26.3+1/lisp/vc/vc-sccs.el
--- emacs-26.1+1/lisp/vc/vc-sccs.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-sccs.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-sccs.el --- support for SCCS version-control  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-src.el emacs-26.3+1/lisp/vc/vc-src.el
--- emacs-26.1+1/lisp/vc/vc-src.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-src.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-src.el --- support for SRC version-control  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1992-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vc/vc-svn.el emacs-26.3+1/lisp/vc/vc-svn.el
--- emacs-26.1+1/lisp/vc/vc-svn.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vc/vc-svn.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
diff -Nru emacs-26.1+1/lisp/vcursor.el emacs-26.3+1/lisp/vcursor.el
--- emacs-26.1+1/lisp/vcursor.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vcursor.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vcursor.el --- manipulate an alternative ("virtual") cursor
 
-;; Copyright (C) 1994, 1996, 1998, 2001-2018 Free Software Foundation,
+;; Copyright (C) 1994, 1996, 1998, 2001-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
diff -Nru emacs-26.1+1/lisp/version.el emacs-26.3+1/lisp/version.el
--- emacs-26.1+1/lisp/version.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/version.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; version.el --- record version number of Emacs
 
-;; Copyright (C) 1985, 1992, 1994-1995, 1999-2018 Free Software
+;; Copyright (C) 1985, 1992, 1994-1995, 1999-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/view.el emacs-26.3+1/lisp/view.el
--- emacs-26.1+1/lisp/view.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/view.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; view.el --- peruse file or buffer without editing
 
-;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2018 Free Software
+;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: K. Shane Hartman
@@ -386,8 +386,8 @@
 if ARG is omitted or nil.
 
 When View mode is enabled, commands that do not change the buffer
-contents are available as usual.  Kill commands insert text in
-kill buffers but do not delete.  Most other commands beep and
+contents are available as usual.  Kill commands save text but
+do not delete it from the buffer.  Most other commands beep and
 tell the user that the buffer is read-only.
 
 \\<view-mode-map>
diff -Nru emacs-26.1+1/lisp/vt100-led.el emacs-26.3+1/lisp/vt100-led.el
--- emacs-26.1+1/lisp/vt100-led.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vt100-led.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones
 
-;; Copyright (C) 1988, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/vt-control.el emacs-26.3+1/lisp/vt-control.el
--- emacs-26.1+1/lisp/vt-control.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/vt-control.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vt-control.el --- Common VTxxx control functions
 
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff -Nru emacs-26.1+1/lisp/w32-fns.el emacs-26.3+1/lisp/w32-fns.el
--- emacs-26.1+1/lisp/w32-fns.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/w32-fns.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; w32-fns.el --- Lisp routines for 32-bit Windows
 
-;; Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/w32-vars.el emacs-26.3+1/lisp/w32-vars.el
--- emacs-26.1+1/lisp/w32-vars.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/w32-vars.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/lisp/wdired.el emacs-26.3+1/lisp/wdired.el
--- emacs-26.1+1/lisp/wdired.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/wdired.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wdired.el --- Rename files editing their names in dired buffers -*- coding: utf-8; -*-
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Filename: wdired.el
 ;; Author: Juan León Lahoz García <juanleon1@gmail.com>
@@ -543,19 +543,39 @@
     (goto-char (point-max))
     (forward-line -1)
     (let ((done nil)
+	  (failed t)
 	  curr-filename)
       (while (and (not done) (not (bobp)))
         (setq curr-filename (wdired-get-filename nil t))
         (if (equal curr-filename filename-ori)
-            (progn
-              (setq done t)
-              (let ((inhibit-read-only t))
-                (dired-move-to-filename)
-                (search-forward (wdired-get-filename t) nil t)
-                (replace-match (file-name-nondirectory filename-ori) t t))
-              (dired-do-create-files-regexp
-               (function dired-rename-file)
-               "Move" 1 ".*" filename-new nil t))
+	    (unwind-protect
+		(progn
+		  (setq done t)
+		  (let ((inhibit-read-only t))
+                    ;; Remove dired-filename text property in order to
+                    ;; find filename-new when it only partially
+                    ;; replaces filename-ori (bug#32173); the text
+                    ;; property is added again when renaming succeeds.
+		    (remove-text-properties
+		     (line-beginning-position) (line-end-position)
+		     '(dired-filename nil))
+		    (dired-move-to-filename)
+		    (search-forward (wdired-get-filename t) nil t)
+		    (replace-match (file-name-nondirectory filename-ori) t t))
+		  (dired-do-create-files-regexp
+		   (function dired-rename-file)
+		   "Move" 1 ".*" filename-new nil t)
+		  (setq failed nil))
+              ;; If user quits before renaming succeeds, restore the
+              ;; dired-filename text property.
+	      (when failed
+		(beginning-of-line)
+		(let ((beg (re-search-forward
+			    directory-listing-before-filename-regexp
+			    (line-end-position) t))
+		      (end (dired-move-to-end-of-filename))
+		      (inhibit-read-only t))
+		  (add-text-properties beg end '(dired-filename t)))))
 	  (forward-line -1))))))
 
 ;; marks a list of files for deletion
diff -Nru emacs-26.1+1/lisp/whitespace.el emacs-26.3+1/lisp/whitespace.el
--- emacs-26.1+1/lisp/whitespace.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/whitespace.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; whitespace.el --- minor mode to visualize TAB, (HARD) SPACE, NEWLINE -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff -Nru emacs-26.1+1/lisp/wid-browse.el emacs-26.3+1/lisp/wid-browse.el
--- emacs-26.1+1/lisp/wid-browse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/wid-browse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wid-browse.el --- functions for browsing widgets
 ;;
-;; Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
diff -Nru emacs-26.1+1/lisp/wid-edit.el emacs-26.3+1/lisp/wid-edit.el
--- emacs-26.1+1/lisp/wid-edit.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/wid-edit.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t; lexical-binding:t -*-
 ;;
-;; Copyright (C) 1996-1997, 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: emacs-devel@gnu.org
@@ -2746,7 +2746,7 @@
   "A widget which groups other widgets inside."
   :convert-widget 'widget-types-convert-widget
   :copy 'widget-types-copy
-  :format "%v"
+  :format ":\n%v"
   :value-create 'widget-group-value-create
   :value-get 'widget-editable-list-value-get
   :default-get 'widget-group-default-get
diff -Nru emacs-26.1+1/lisp/widget.el emacs-26.3+1/lisp/widget.el
--- emacs-26.1+1/lisp/widget.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/widget.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; widget.el --- a library of user interface components
 ;;
-;; Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
diff -Nru emacs-26.1+1/lisp/windmove.el emacs-26.3+1/lisp/windmove.el
--- emacs-26.1+1/lisp/windmove.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/windmove.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; windmove.el --- directional window-selection routines
 ;;
-;; Copyright (C) 1998-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Hovav Shacham (hovav@cs.stanford.edu)
 ;; Created: 17 October 1998
diff -Nru emacs-26.1+1/lisp/window.el emacs-26.3+1/lisp/window.el
--- emacs-26.1+1/lisp/window.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/window.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; window.el --- GNU Emacs window commands aside from those written in C  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985, 1989, 1992-1994, 2000-2018 Free Software
+;; Copyright (C) 1985, 1989, 1992-1994, 2000-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -201,7 +201,7 @@
 
 (defmacro with-current-buffer-window (buffer-or-name action quit-function &rest body)
   "Evaluate BODY with a buffer BUFFER-OR-NAME current and show that buffer.
-This construct is like `with-temp-buffer-window' but unlike that
+This construct is like `with-temp-buffer-window' but unlike that,
 makes the buffer specified by BUFFER-OR-NAME current for running
 BODY."
   (declare (debug t))
@@ -224,7 +224,7 @@
 
 (defmacro with-displayed-buffer-window (buffer-or-name action quit-function &rest body)
   "Show a buffer BUFFER-OR-NAME and evaluate BODY in that buffer.
-This construct is like `with-current-buffer-window' but unlike that
+This construct is like `with-current-buffer-window' but unlike that,
 displays the buffer specified by BUFFER-OR-NAME before running BODY."
   (declare (debug t))
   (let ((buffer (make-symbol "buffer"))
@@ -992,16 +992,16 @@
 ALIST is an association list of symbols and values.  The
 following special symbols can be used in ALIST.
 
-`side' denotes the side of the frame where the new window shall
-  be located.  Valid values are `bottom', `right', `top' and
-  `left'.  The default is `bottom'.
-
-`slot' if non-nil, specifies the window slot where to display
-  BUFFER.  A value of zero or nil means use the middle slot on
-  the specified side.  A negative value means use a slot
-  preceding (that is, above or on the left of) the middle slot.
-  A positive value means use a slot following (that is, below or
-  on the right of) the middle slot.  The default is zero.
+ `side' denotes the side of the frame where the new window shall
+   be located.  Valid values are `bottom', `right', `top' and
+   `left'.  The default is `bottom'.
+
+ `slot' if non-nil, specifies the window slot where to display
+   BUFFER.  A value of zero or nil means use the middle slot on
+   the specified side.  A negative value means use a slot
+   preceding (that is, above or on the left of) the middle slot.
+   A positive value means use a slot following (that is, below or
+   on the right of) the middle slot.  The default is zero.
 
 If the current frame size or the settings of `window-sides-slots'
 do not permit making a new window, a suitable existing window may
@@ -1144,15 +1144,16 @@
 		    buffer best-window 'reuse alist dedicated)))))))))
 
 (defun window-toggle-side-windows (&optional frame)
-  "Toggle side windows on specified FRAME.
+  "Toggle display of side windows on specified FRAME.
 FRAME must be a live frame and defaults to the selected one.
 
-If FRAME has at least one side window, save FRAME's state in the
-FRAME's `window-state' frame parameter and delete all side
-windows on FRAME afterwards.  Otherwise, if FRAME has a
-`window-state' parameter, use that to restore any side windows on
-FRAME leaving FRAME's main window alone.  Signal an error if
-FRAME has no side window and no saved state is found."
+If FRAME has at least one side window, delete all side
+windows on FRAME after saving FRAME's state in the
+FRAME's `window-state' frame parameter.  Otherwise,
+restore any side windows recorded in FRAME's `window-state'
+parameter, leaving FRAME's main window alone.  Signal an
+error if FRAME has no side windows and no saved state for
+it is found."
   (interactive)
   (let* ((frame (window-normalize-frame frame))
          (window--sides-inhibit-check t)
@@ -4683,6 +4684,8 @@
 BUFFER-OR-NAME may be a buffer or the name of an existing buffer
 and defaults to the current buffer.
 
+Interactively, prompt for the buffer.
+
 The following non-nil values of the optional argument FRAME
 have special meanings:
 
@@ -4699,9 +4702,25 @@
 Any other value of FRAME means consider all windows on all
 frames.
 
-When a window showing BUFFER-OR-NAME is dedicated and the only
-window of its frame, that frame is deleted when there are other
-frames left."
+Interactively, FRAME is the prefix argument, so you can
+use \\[universal-argument] 0 to specify all windows only on
+the current terminal's frames.
+
+If a frame's root window shows the buffer specified by
+BUFFER-OR-NAME and is dedicated to that buffer and that frame
+does not host the active minibuffer window and there is at least
+one other frame on that frame's terminal, delete that frame.
+Otherwise, do not delete a frame's root window if it shows the
+buffer specified by BUFFER-OR-NAME and do not delete any frame's
+main window showing that buffer either.  Rather, in any such
+case, call `switch-to-prev-buffer' to show another buffer in that
+window and make sure the window is no more dedicated to its
+buffer.
+
+If the buffer specified by BUFFER-OR-NAME is shown in a
+minibuffer window, do nothing for that window.  For any window
+that does not show that buffer, remove the buffer from that
+window's lists of previous and next buffers."
   (interactive "BDelete windows on (buffer):\nP")
   (let ((buffer (window-normalize-buffer buffer-or-name))
 	;; Handle the "inverted" meaning of the FRAME argument wrt other
@@ -6381,7 +6400,7 @@
   :group 'windows)
 
 (defun same-window-p (buffer-name)
-  "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
+  "Return non-nil if buffer BUFFER-NAME would be shown in the \"same\" window.
 This function returns non-nil if `display-buffer' or
 `pop-to-buffer' would show a buffer named BUFFER-NAME in the
 selected rather than (as usual) some other window.  See
@@ -6704,7 +6723,11 @@
        ((or (eq type 'frame)
 	    (and (eq (car quit-restore) 'same)
 		 (eq (nth 1 quit-restore) 'frame)))
-	;; Adjust size of frame if asked for.
+	;; A window that never showed another buffer but BUFFER ever
+        ;; since it was created on a new frame.
+        ;;
+        ;; Adjust size of frame if asked for.  We probably should do
+        ;; that only for a single window frame.
 	(cond
 	 ((not size))
 	 ((consp size)
@@ -6723,7 +6746,10 @@
        ((or (eq type 'window)
 	    (and (eq (car quit-restore) 'same)
 		 (eq (nth 1 quit-restore) 'window)))
-	;; Adjust height of window if asked for.
+	;; A window that never showed another buffer but BUFFER ever
+        ;; since it was created on an existing frame.
+        ;;
+        ;; Adjust width and/or height of window if asked for.
 	(cond
 	 ((not height))
 	 ((numberp height)
@@ -6819,25 +6845,41 @@
   "Custom type for `display-buffer' actions.")
 
 (defvar display-buffer-overriding-action '(nil . nil)
-  "Overriding action to perform to display a buffer.
-It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
+  "Overriding action for buffer display.
+This action overrides all the other actions in the action
+variables and arguments passed to `display-buffer'.  The value
+should be a cons cell (FUNCTIONS . ALIST), where FUNCTIONS is a
 function or a list of functions.  Each function should accept two
 arguments: a buffer to display and an alist similar to ALIST.
-See `display-buffer' for details.")
+See `display-buffer' for details.
+
+This variable is not intended for user customization.  Lisp
+programs should never set this variable permanently but may bind
+it around calls of buffer display functions like `display-buffer'
+or `pop-to-buffer'.  Since such a binding will affect any nested
+buffer display requests, this variable should be used with utmost
+care.")
 (put 'display-buffer-overriding-action 'risky-local-variable t)
 
 (defcustom display-buffer-alist nil
-  "Alist of conditional actions for `display-buffer'.
-This is a list of elements (CONDITION . ACTION), where:
+  "Alist of user-defined conditional actions for `display-buffer'.
+Its value takes effect before processing the ACTION argument of
+`display-buffer' and before `display-buffer-base-action' and
+`display-buffer-fallback-action', but after
+`display-buffer-overriding-action', which see.
+
+If non-nil, this is an alist of elements (CONDITION . ACTION),
+where:
 
  CONDITION is either a regexp matching buffer names, or a
   function that takes two arguments - a buffer name and the
   ACTION argument of `display-buffer' - and returns a boolean.
 
- ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a
-  function or a list of functions.  Each such function should
-  accept two arguments: a buffer to display and an alist of the
-  same form as ALIST.  See `display-buffer' for details.
+ ACTION is a cons cell (FUNCTIONS . ALIST), where FUNCTIONS is an
+  action function or a list of action functions and ALIST is an
+  action alist.  Each such action function should accept two
+  arguments: a buffer to display and an alist of the same form as
+  ALIST.  See `display-buffer' for details.
 
 `display-buffer' scans this alist until it either finds a
 matching regular expression or the function specified by a
@@ -6854,10 +6896,15 @@
 
 (defcustom display-buffer-base-action '(nil . nil)
   "User-specified default action for `display-buffer'.
-It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
-function or a list of functions.  Each function should accept two
-arguments: a buffer to display and an alist similar to ALIST.
-See `display-buffer' for details."
+This is the default action used by `display-buffer' if no other
+actions are specified or all fail, before falling back on
+`display-buffer-fallback-action'.
+
+It should be a cons cell (FUNCTIONS . ALIST), where FUNCTIONS is
+an action function or a list of action functions and ALIST is an
+action alist.  Each such action function should accept two
+arguments: a buffer to display and an alist of the same form as
+ALIST.  See `display-buffer' for details."
   :type display-buffer--action-custom-type
   :risky t
   :version "24.1"
@@ -6873,13 +6920,20 @@
      display-buffer-pop-up-frame))
   "Default fallback action for `display-buffer'.
 This is the action used by `display-buffer' if no other actions
-specified, e.g. by the user options `display-buffer-alist' or
-`display-buffer-base-action'.  See `display-buffer'.")
+have been specified, for example, by the user options
+`display-buffer-alist' or `display-buffer-base-action', or they
+all fail.  It should never be set by programs or users.  See
+`display-buffer'.")
 (put 'display-buffer-fallback-action 'risky-local-variable t)
 
 (defun display-buffer-assq-regexp (buffer-name alist action)
   "Retrieve ALIST entry corresponding to BUFFER-NAME.
-ACTION is the action argument passed to `display-buffer'."
+This returns the cdr of the alist entry ALIST if either its key
+is a string that matches BUFFER-NAME, as reported by
+`string-match-p'; or if the key is a function that returns
+non-nil when called with three arguments: the ALIST key,
+BUFFER-NAME and ACTION.  ACTION should have the form of the
+action argument passed to `display-buffer'."
   (catch 'match
     (dolist (entry alist)
       (let ((key (car entry)))
@@ -6892,7 +6946,8 @@
 (defvar display-buffer--same-window-action
   '(display-buffer-same-window
     (inhibit-same-window . nil))
-  "A `display-buffer' action for displaying in the same window.")
+  "A `display-buffer' action for displaying in the same window.
+Specifies to call `display-buffer-same-window'.")
 (put 'display-buffer--same-window-action 'risky-local-variable t)
 
 (defvar display-buffer--other-frame-action
@@ -6900,105 +6955,106 @@
      display-buffer-pop-up-frame)
     (reusable-frames . 0)
     (inhibit-same-window . t))
-  "A `display-buffer' action for displaying in another frame.")
+  "A `display-buffer' action for displaying in another frame.
+Specifies to call `display-buffer-reuse-window', and if that
+fails, call `display-buffer-pop-up-frame'.")
 (put 'display-buffer--other-frame-action 'risky-local-variable t)
 
 (defun display-buffer (buffer-or-name &optional action frame)
   "Display BUFFER-OR-NAME in some window, without selecting it.
-BUFFER-OR-NAME must be a buffer or the name of an existing
-buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
-or nil if no such window is found.
-
-Optional argument ACTION, if non-nil, should specify a display
-action.  Its form is described below.
-
-Optional argument FRAME, if non-nil, acts like an additional
-ALIST entry (reusable-frames . FRAME) to the action list of ACTION,
-specifying the frame(s) to search for a window that is already
-displaying the buffer.  See `display-buffer-reuse-window'.
-
-If ACTION is non-nil, it should have the form (FUNCTION . ALIST),
-where FUNCTION is either a function or a list of functions, and
-ALIST is an arbitrary association list (alist).
-
-Each such FUNCTION should accept two arguments: the buffer to
-display and an alist.  Based on those arguments, it should
-display the buffer and return the window.  If the caller is
-prepared to handle the case of not displaying the buffer
-and returning nil from `display-buffer' it should pass
-\(allow-no-window . t) as an element of the ALIST.
+BUFFER-OR-NAME must be a buffer or a string naming a live buffer.
+Return the window chosen for displaying that buffer, or nil if no
+such window is found.
+
+Optional argument ACTION, if non-nil, should specify a buffer
+display action of the form (FUNCTIONS . ALIST).  FUNCTIONS is
+either an \"action function\" or a possibly empty list of action
+functions.  ALIST is a possibly empty \"action alist\".
+
+An action function is a function that accepts two arguments: the
+buffer to display and an action alist.  Based on those arguments,
+it should try to display the buffer in a window and return that
+window.  An action alist is an association list mapping symbols
+to values.  Action functions use the action alist passed to them
+to fine-tune their behaviors.
 
-The `display-buffer' function builds a function list and an alist
-by combining the functions and alists specified in
+`display-buffer' builds a list of action functions and an action
+alist by combining any action functions and alists specified by
 `display-buffer-overriding-action', `display-buffer-alist', the
 ACTION argument, `display-buffer-base-action', and
 `display-buffer-fallback-action' (in order).  Then it calls each
 function in the combined function list in turn, passing the
-buffer as the first argument and the combined alist as the second
-argument, until one of the functions returns non-nil.
-
-If ACTION is nil, the function list and the alist are built using
-only the other variables mentioned above.
+buffer as the first argument and the combined action alist as the
+second argument, until one of the functions returns non-nil.
 
-Available action functions include:
- `display-buffer-same-window'
- `display-buffer-reuse-window'
- `display-buffer-pop-up-frame'
- `display-buffer-in-child-frame'
- `display-buffer-pop-up-window'
- `display-buffer-in-previous-window'
- `display-buffer-use-some-window'
- `display-buffer-use-some-frame'
-
-Recognized alist entries include:
-
- `inhibit-same-window' -- A non-nil value prevents the same
-                          window from being used for display.
-
- `inhibit-switch-frame' -- A non-nil value prevents any other
-                           frame from being raised or selected,
-                           even if the window is displayed there.
-
- `reusable-frames' -- Value specifies frame(s) to search for a
-                      window that already displays the buffer.
-                      See `display-buffer-reuse-window'.
-
- `pop-up-frame-parameters' -- Value specifies an alist of frame
-                              parameters to give a new frame, if
-                              one is created.
-
- `window-height' -- Value specifies either an integer (the number
-    of lines of a new window), a floating point number (the
-    fraction of a new window with respect to the height of the
-    frame's root window) or a function to be called with one
-    argument - a new window.  The function is supposed to adjust
-    the height of the window; its return value is ignored.
-    Suitable functions are `shrink-window-if-larger-than-buffer'
-    and `fit-window-to-buffer'.
-
- `window-width' -- Value specifies either an integer (the number
-    of columns of a new window), a floating point number (the
-    fraction of a new window with respect to the width of the
-    frame's root window) or a function to be called with one
-    argument - a new window.  The function is supposed to adjust
-    the width of the window; its return value is ignored.
-
- `allow-no-window' -- A non-nil value indicates readiness for the case
-    of not displaying the buffer and FUNCTION can safely return
-    a non-window value to suppress displaying.
-
- `preserve-size' -- Value should be either (t . nil) to
-    preserve the width of the window, (nil . t) to preserve its
-    height or (t . t) to preserve both.
-
- `window-parameters' -- Value specifies an alist of window
-                        parameters to give the chosen window.
-
-The ACTION argument to `display-buffer' can also have a non-nil
-and non-list value.  This means to display the buffer in a window
-other than the selected one, even if it is already displayed in
-the selected window.  If called interactively with a prefix
-argument, ACTION is t."
+Action functions and the action they try to perform are:
+ `display-buffer-same-window' -- Use the selected window.
+ `display-buffer-reuse-window' -- Use a window already showing
+    the buffer.
+ `display-buffer-in-previous-window' -- Use a window that did
+    show the buffer before.
+ `display-buffer-use-some-window' -- Use some existing window.
+ `display-buffer-pop-up-window' -- Pop up a new window.
+ `display-buffer-below-selected' -- Use or pop up a window below
+    the selected one.
+ `display-buffer-at-bottom' -- Use or pop up a window at the
+    bottom of the selected frame.
+ `display-buffer-pop-up-frame' -- Show the buffer on a new frame.
+ `display-buffer-in-child-frame' -- Show the buffer in a
+    child frame.
+ `display-buffer-no-window' -- Do not display the buffer and
+    have `display-buffer' return nil immediately.
+
+Action alist entries are:
+ 'inhibit-same-window' -- A non-nil value prevents the same
+    window from being used for display.
+ 'inhibit-switch-frame' -- A non-nil value prevents any frame
+    used for showing the buffer from being raised or selected.
+ 'reusable-frames' -- The value specifies the set of frames to
+    search for a window that already displays the buffer.
+    Possible values are nil (the selected frame), t (any live
+    frame), visible (any visible frame), 0 (any visible or
+    iconified frame) or an existing live frame.
+ 'pop-up-frame-parameters' -- The value specifies an alist of
+    frame parameters to give a new frame, if one is created.
+ 'window-height' -- The value specifies the desired height of the
+    window chosen and is either an integer (the total height of
+    the window), a floating point number (the fraction of its
+    total height with respect to the total height of the frame's
+    root window) or a function to be called with one argument -
+    the chosen window.  The function is supposed to adjust the
+    height of the window; its return value is ignored.  Suitable
+    functions are `shrink-window-if-larger-than-buffer' and
+    `fit-window-to-buffer'.
+ 'window-width' -- The value specifies the desired width of the
+    window chosen and is either an integer (the total width of
+    the window), a floating point number (the fraction of its
+    total width with respect to the width of the frame's root
+    window) or a function to be called with one argument - the
+    chosen window.  The function is supposed to adjust the width
+    of the window; its return value is ignored.
+ 'preserve-size' -- The value should be either (t . nil) to
+    preserve the width of the chosen window, (nil . t) to
+    preserve its height or (t . t) to preserve its height and
+    width in future changes of the window configuration.
+ 'window-parameters' -- The value specifies an alist of window
+    parameters to give the chosen window.
+ 'allow-no-window' -- A non-nil value means that `display-buffer'
+    may not display the buffer and return nil immediately.
+
+The entries 'window-height', 'window-width' and 'preserve-size'
+are applied only when the window used for displaying the buffer
+never showed another buffer before.
+
+The ACTION argument can also have a non-nil and non-list value.
+This means to display the buffer in a window other than the
+selected one, even if it is already displayed in the selected
+window.  If called interactively with a prefix argument, ACTION
+is t.  Non-interactive calls should always supply a list or nil.
+
+The optional third argument FRAME, if non-nil, acts like a
+\(reusable-frames . FRAME) entry appended to the action alist
+specified by the ACTION argument."
   (interactive (list (read-buffer "Display buffer: " (other-buffer))
 		     (if current-prefix-arg t)))
   (let ((buffer (if (bufferp buffer-or-name)
@@ -7045,6 +7101,9 @@
 
 (defun display-buffer-other-frame (buffer)
   "Display buffer BUFFER preferably in another frame.
+This function attempts to look for a window displaying BUFFER,
+on all the frames on the current terminal, skipping the selected
+window; if that fails, it pops up a new frame.
 This uses the function `display-buffer' as a subroutine; see
 its documentation for additional customization information."
   (interactive "BDisplay buffer in other frame: ")
@@ -7053,9 +7112,10 @@
 ;;; `display-buffer' action functions:
 
 (defun display-buffer-use-some-frame (buffer alist)
-  "Display BUFFER in an existing frame that meets a predicate
-\(by default any frame other than the current frame).  If
-successful, return the window used; otherwise return nil.
+  "Display BUFFER in an existing frame that meets a predicate.
+The default predicate is to use any frame other than the selected
+frame.  If successful, return the window used; otherwise return
+nil.
 
 If ALIST has a non-nil `inhibit-switch-frame' entry, avoid
 raising the frame.
@@ -7068,30 +7128,29 @@
 If ALIST has a non-nil `inhibit-same-window' entry, avoid using
 the currently selected window (only useful with a frame-predicate
 that allows the selected frame)."
-  (let* ((predicate (or (cdr (assq 'frame-predicate alist))
-                        (lambda (frame)
-                          (and
-                           (not (eq frame (selected-frame)))
-                           (not (window-dedicated-p
-                                 (or
-                                  (get-lru-window frame)
-                                  (frame-first-window frame)))))
-                          )))
+  (let* ((predicate
+          (or (cdr (assq 'frame-predicate alist))
+              (lambda (frame)
+                (and (not (eq frame (selected-frame)))
+                     (get-lru-window frame)))))
          (frame (car (filtered-frame-list predicate)))
-         (window (and frame (get-lru-window frame nil (cdr (assq 'inhibit-same-window alist))))))
+         (window
+          (and frame
+               (get-lru-window
+                frame nil (cdr (assq 'inhibit-same-window alist))))))
     (when window
       (prog1
           (window--display-buffer
-           buffer window 'frame alist display-buffer-mark-dedicated)
+           buffer window 'reuse alist display-buffer-mark-dedicated)
         (unless (cdr (assq 'inhibit-switch-frame alist))
           (window--maybe-raise-frame frame))))))
 
 (defun display-buffer-same-window (buffer alist)
   "Display BUFFER in the selected window.
-This fails if ALIST has a non-nil `inhibit-same-window' entry, or
-if the selected window is a minibuffer window or is dedicated to
-another buffer; in that case, return nil.  Otherwise, return the
-selected window."
+This fails if ALIST has an `inhibit-same-window' element whose
+value is non-nil, or if the selected window is a minibuffer
+window or is dedicated to another buffer; in that case, return nil.
+Otherwise, return the selected window."
   (unless (or (cdr (assq 'inhibit-same-window alist))
 	      (window-minibuffer-p)
 	      (window-dedicated-p))
@@ -7398,10 +7457,13 @@
 (defun display-buffer-in-previous-window (buffer alist)
   "Display BUFFER in a window previously showing it.
 If ALIST has a non-nil `inhibit-same-window' entry, the selected
-window is not eligible for reuse.
+window is not usable.  A dedicated window is usable only if it
+already shows BUFFER.  If ALIST contains a `previous-window'
+entry, the window specified by that entry is usable even if it
+never showed BUFFER before.
 
 If ALIST contains a `reusable-frames' entry, its value determines
-which frames to search for a reusable window:
+which frames to search for a usable window:
   nil -- the selected frame (actually the last non-minibuffer frame)
   A frame   -- just that frame
   `visible' -- all visible frames
@@ -7413,9 +7475,17 @@
 `pop-up-frames' are both nil; search all frames on the current
 terminal if either of those variables is non-nil.
 
-If ALIST has a `previous-window' entry, the window specified by
-that entry will override any other window found by the methods
-above, even if that window never showed BUFFER before."
+If more than one window is usable according to these rules,
+apply the following order of preference:
+
+- Use the window specified by any 'previous-window' ALIST entry,
+  provided it is not the selected window.
+
+- Use a window that showed BUFFER before, provided it is not the
+  selected window.
+
+- Use the selected window if it is either specified by a
+  'previous-window' ALIST entry or showed BUFFER before."
   (let* ((alist-entry (assq 'reusable-frames alist))
 	 (inhibit-same-window
 	  (cdr (assq 'inhibit-same-window alist)))
@@ -7556,7 +7626,12 @@
 buffer at the front of the list of recently selected ones.
 
 Unlike `pop-to-buffer', this function prefers using the selected
-window over popping up a new window or frame."
+window over popping up a new window or frame.  Specifically, if
+the selected window is neither a minibuffer window (as reported
+by `window-minibuffer-p'), nor is dedicated to another buffer
+(see `window-dedicated-p'), BUFFER will be displayed in the
+currently selected window; otherwise it will be displayed in
+another window."
   (pop-to-buffer buffer display-buffer--same-window-action norecord))
 
 (defun read-buffer-to-switch (prompt)
@@ -7980,10 +8055,13 @@
 (defun fit-frame-to-buffer (&optional frame max-height min-height max-width min-width only)
   "Adjust size of FRAME to display the contents of its buffer exactly.
 FRAME can be any live frame and defaults to the selected one.
-Fit only if FRAME's root window is live.  MAX-HEIGHT, MIN-HEIGHT,
-MAX-WIDTH and MIN-WIDTH specify bounds on the new total size of
-FRAME's root window.  MIN-HEIGHT and MIN-WIDTH default to the values of
-`window-min-height' and `window-min-width' respectively.
+Fit only if FRAME's root window is live.
+
+MAX-HEIGHT, MIN-HEIGHT, MAX-WIDTH and MIN-WIDTH specify bounds on
+the new total size of FRAME's root window.  MIN-HEIGHT and
+MIN-WIDTH default to the values of `window-min-height' and
+`window-min-width' respectively.  These arguments are specified
+in the canonical character width and height of FRAME.
 
 If the optional argument ONLY is `vertically', resize the frame
 vertically only.  If ONLY is `horizontally', resize the frame
@@ -8207,7 +8285,7 @@
 are specified in columns and include fringes, margins, a
 scrollbar and a vertical divider, if any.
 
-If the optional argument `preserve-size' is non-nil, preserve the
+Optional argument PRESERVE-SIZE non-nil means to preserve the
 size of WINDOW (see `window-preserve-size').
 
 Fit pixelwise if the option `window-resize-pixelwise' is non-nil.
@@ -9239,8 +9317,15 @@
               (when size
                 (set-process-window-size process (cdr size) (car size))))))))))
 
+;; Remove the following call in Emacs 27, running
+;; 'window-size-change-functions' should suffice.
 (add-hook 'window-configuration-change-hook 'window--adjust-process-windows)
 
+;; Catch any size changes not handled by
+;; 'window-configuration-change-hook' (Bug#32720, "another issue" in
+;; Bug#33230).
+(add-hook 'window-size-change-functions (lambda (_frame)
+                                          (window--adjust-process-windows)))
 
 ;; Some of these are in tutorial--default-keys, so update that if you
 ;; change these.
diff -Nru emacs-26.1+1/lisp/winner.el emacs-26.3+1/lisp/winner.el
--- emacs-26.1+1/lisp/winner.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/winner.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; winner.el --- Restore old window configurations
 
-;; Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
@@ -28,13 +28,7 @@
 ;; windows) so that the changes can be "undone" using the command
 ;; `winner-undo'.  By default this one is bound to the key sequence
 ;; ctrl-c left.  If you change your mind (while undoing), you can
-;; press ctrl-c right (calling `winner-redo').  Even though it uses
-;; some features of Emacs20.3, winner.el should also work with
-;; Emacs19.34 and XEmacs20, provided that the installed version of
-;; custom is not obsolete.
-
-;; Winner mode was improved August 1998.
-;; Further improvements February 2002.
+;; press ctrl-c right (calling `winner-redo').
 
 ;;; Code:
 
diff -Nru emacs-26.1+1/lisp/woman.el emacs-26.3+1/lisp/woman.el
--- emacs-26.1+1/lisp/woman.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/woman.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/xdg.el emacs-26.3+1/lisp/xdg.el
--- emacs-26.1+1/lisp/xdg.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/xdg.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xdg.el --- XDG specification and standard support -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
 ;; Created: 27 January 2017
diff -Nru emacs-26.1+1/lisp/x-dnd.el emacs-26.3+1/lisp/x-dnd.el
--- emacs-26.1+1/lisp/x-dnd.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/x-dnd.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; x-dnd.el --- drag and drop support for X
 
-;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/lisp/xml.el emacs-26.3+1/lisp/xml.el
--- emacs-26.1+1/lisp/xml.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/xml.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xml.el --- XML parser -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
diff -Nru emacs-26.1+1/lisp/xt-mouse.el emacs-26.3+1/lisp/xt-mouse.el
--- emacs-26.1+1/lisp/xt-mouse.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/xt-mouse.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xt-mouse.el --- support the mouse when emacs run in an xterm -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994, 2000-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2000-2019 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: mouse, terminals
diff -Nru emacs-26.1+1/lisp/xwidget.el emacs-26.3+1/lisp/xwidget.el
--- emacs-26.1+1/lisp/xwidget.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lisp/xwidget.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xwidget.el --- api functions for xwidgets  -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 ;;
 ;; Author: Joakim Verona (joakim@verona.se)
 ;;
diff -Nru emacs-26.1+1/lwlib/ChangeLog.1 emacs-26.3+1/lwlib/ChangeLog.1
--- emacs-26.1+1/lwlib/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -1964,7 +1964,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/lwlib/deps.mk emacs-26.3+1/lwlib/deps.mk
--- emacs-26.1+1/lwlib/deps.mk	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/deps.mk	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ### deps.mk --- lwlib/Makefile fragment for GNU Emacs
 
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
diff -Nru emacs-26.1+1/lwlib/lwlib.c emacs-26.3+1/lwlib/lwlib.c
--- emacs-26.1+1/lwlib/lwlib.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* A general interface to the widgets of different toolkits.
 
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994-1996, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib.h emacs-26.3+1/lwlib/lwlib.h
--- emacs-26.1+1/lwlib/lwlib.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
@@ -111,15 +111,9 @@
 Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget);
 
 /* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */
-#ifndef USE_MOTIF
-ATTRIBUTE_CONST
-#endif
 void lw_allow_resizing (Widget w, Boolean flag);
 
 /* Set up the main window. */
-#ifndef USE_MOTIF
-ATTRIBUTE_CONST
-#endif
 void lw_set_main_areas (Widget parent,
                         Widget menubar,
                         Widget work_area);
diff -Nru emacs-26.1+1/lwlib/lwlib-int.h emacs-26.3+1/lwlib/lwlib-int.h
--- emacs-26.1+1/lwlib/lwlib-int.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-int.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib-utils.c emacs-26.3+1/lwlib/lwlib-utils.c
--- emacs-26.1+1/lwlib/lwlib-utils.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-utils.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Defines some widget utility functions.
 
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib-widget.h emacs-26.3+1/lwlib/lwlib-widget.h
--- emacs-26.1+1/lwlib/lwlib-widget.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-widget.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib-Xaw.c emacs-26.3+1/lwlib/lwlib-Xaw.c
--- emacs-26.1+1/lwlib/lwlib-Xaw.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-Xaw.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* The lwlib interface to Athena widgets.
 
 Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
-Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib-Xaw.h emacs-26.3+1/lwlib/lwlib-Xaw.h
--- emacs-26.1+1/lwlib/lwlib-Xaw.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-Xaw.h	2019-09-10 00:32:49.000000000 +0000
@@ -15,15 +15,13 @@
 xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean);
 
 void
-xaw_update_one_value (widget_instance *, Widget, widget_value *)
-  ATTRIBUTE_CONST;
+xaw_update_one_value (widget_instance *, Widget, widget_value *);
 
 void
 xaw_destroy_instance (widget_instance *);
 
 void
-xaw_popup_menu (Widget, XEvent *)
-  ATTRIBUTE_CONST;
+xaw_popup_menu (Widget, XEvent *);
 
 void
 xaw_pop_instance (widget_instance *, Boolean);
diff -Nru emacs-26.1+1/lwlib/lwlib-Xlw.c emacs-26.3+1/lwlib/lwlib-Xlw.c
--- emacs-26.1+1/lwlib/lwlib-Xlw.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-Xlw.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* The lwlib interface to "xlwmenu" menus.
 
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994, 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/lwlib-Xlw.h emacs-26.3+1/lwlib/lwlib-Xlw.h
--- emacs-26.1+1/lwlib/lwlib-Xlw.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-Xlw.h	2019-09-10 00:32:49.000000000 +0000
@@ -15,15 +15,13 @@
 
 void
 xlw_update_one_value (widget_instance* instance, Widget widget,
-		      widget_value* val)
-  ATTRIBUTE_CONST;
+		      widget_value* val);
 
 void
 xlw_destroy_instance (widget_instance* instance);
 
 void
-xlw_pop_instance (widget_instance* instance, Boolean up)
-  ATTRIBUTE_CONST;
+xlw_pop_instance (widget_instance* instance, Boolean up);
 
 void
 xlw_popup_menu (Widget widget, XEvent * event);
diff -Nru emacs-26.1+1/lwlib/lwlib-Xm.c emacs-26.3+1/lwlib/lwlib-Xm.c
--- emacs-26.1+1/lwlib/lwlib-Xm.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/lwlib-Xm.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
 
-Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1997, 1999-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff -Nru emacs-26.1+1/lwlib/Makefile.in emacs-26.3+1/lwlib/Makefile.in
--- emacs-26.1+1/lwlib/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 ### @configure_input@
 
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
@@ -131,6 +131,6 @@
 .PHONY: tags FORCE
 tags: TAGS
 TAGS: ${ETAGS} $(ctagsfiles)
-	${ETAGS} $(ctagsfiles)
+	$(AM_V_GEN)${ETAGS} $(ctagsfiles)
 
 ### Makefile.in ends here
diff -Nru emacs-26.1+1/lwlib/xlwmenu.c emacs-26.3+1/lwlib/xlwmenu.c
--- emacs-26.1+1/lwlib/xlwmenu.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/xlwmenu.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Implements a lightweight menubar widget.
 
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994-1995, 1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1995, 1997, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff -Nru emacs-26.1+1/lwlib/xlwmenu.h emacs-26.3+1/lwlib/xlwmenu.h
--- emacs-26.1+1/lwlib/xlwmenu.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/xlwmenu.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Interface of a lightweight menubar widget.
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff -Nru emacs-26.1+1/lwlib/xlwmenuP.h emacs-26.3+1/lwlib/xlwmenuP.h
--- emacs-26.1+1/lwlib/xlwmenuP.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/lwlib/xlwmenuP.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Internals of a lightweight menubar widget.
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff -Nru emacs-26.1+1/m4/00gnulib.m4 emacs-26.3+1/m4/00gnulib.m4
--- emacs-26.1+1/m4/00gnulib.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/00gnulib.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/absolute-header.m4 emacs-26.3+1/m4/absolute-header.m4
--- emacs-26.1+1/m4/absolute-header.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/absolute-header.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/acl.m4 emacs-26.3+1/m4/acl.m4
--- emacs-26.1+1/m4/acl.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/acl.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # acl.m4 - check for access control list (ACL) primitives
 # serial 22
 
-# Copyright (C) 2002, 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/alloca.m4 emacs-26.3+1/m4/alloca.m4
--- emacs-26.1+1/m4/alloca.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/alloca.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # alloca.m4 serial 14
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2018 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/byteswap.m4 emacs-26.3+1/m4/byteswap.m4
--- emacs-26.1+1/m4/byteswap.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/byteswap.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # byteswap.m4 serial 4
-dnl Copyright (C) 2005, 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/clock_time.m4 emacs-26.3+1/m4/clock_time.m4
--- emacs-26.1+1/m4/clock_time.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/clock_time.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # clock_time.m4 serial 10
-dnl Copyright (C) 2002-2006, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/close-stream.m4 emacs-26.3+1/m4/close-stream.m4
--- emacs-26.1+1/m4/close-stream.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/close-stream.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 #serial 4
-dnl Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/count-leading-zeros.m4 emacs-26.3+1/m4/count-leading-zeros.m4
--- emacs-26.1+1/m4/count-leading-zeros.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/count-leading-zeros.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # count-leading-zeros.m4 serial 2
-dnl Copyright (C) 2012-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/count-one-bits.m4 emacs-26.3+1/m4/count-one-bits.m4
--- emacs-26.1+1/m4/count-one-bits.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/count-one-bits.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # count-one-bits.m4 serial 3
-dnl Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/count-trailing-zeros.m4 emacs-26.3+1/m4/count-trailing-zeros.m4
--- emacs-26.1+1/m4/count-trailing-zeros.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/count-trailing-zeros.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # count-trailing-zeros.m4
-dnl Copyright (C) 2013-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2013-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/c-strtod.m4 emacs-26.3+1/m4/c-strtod.m4
--- emacs-26.1+1/m4/c-strtod.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/c-strtod.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # c-strtod.m4 serial 15
 
-# Copyright (C) 2004-2006, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2006, 2009-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/dirent_h.m4 emacs-26.3+1/m4/dirent_h.m4
--- emacs-26.1+1/m4/dirent_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/dirent_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # dirent_h.m4 serial 16
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/dirfd.m4 emacs-26.3+1/m4/dirfd.m4
--- emacs-26.1+1/m4/dirfd.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/dirfd.m4	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
-# Copyright (C) 2001-2006, 2008-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006, 2008-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/d-type.m4 emacs-26.3+1/m4/d-type.m4
--- emacs-26.1+1/m4/d-type.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/d-type.m4	2019-09-10 00:32:49.000000000 +0000
@@ -5,7 +5,8 @@
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
-# Copyright (C) 1997, 1999-2004, 2006, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999-2004, 2006, 2009-2019 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/dup2.m4 emacs-26.3+1/m4/dup2.m4
--- emacs-26.1+1/m4/dup2.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/dup2.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 #serial 25
-dnl Copyright (C) 2002, 2005, 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2007, 2009-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/environ.m4 emacs-26.3+1/m4/environ.m4
--- emacs-26.1+1/m4/environ.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/environ.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/errno_h.m4 emacs-26.3+1/m4/errno_h.m4
--- emacs-26.1+1/m4/errno_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/errno_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/euidaccess.m4 emacs-26.3+1/m4/euidaccess.m4
--- emacs-26.1+1/m4/euidaccess.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/euidaccess.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # euidaccess.m4 serial 15
-dnl Copyright (C) 2002-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/execinfo.m4 emacs-26.3+1/m4/execinfo.m4
--- emacs-26.1+1/m4/execinfo.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/execinfo.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Check for GNU-style execinfo.h.
 
-dnl Copyright 2012-2018 Free Software Foundation, Inc.
+dnl Copyright 2012-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/explicit_bzero.m4 emacs-26.3+1/m4/explicit_bzero.m4
--- emacs-26.1+1/m4/explicit_bzero.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/explicit_bzero.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-dnl Copyright 2017-2018 Free Software Foundation, Inc.
+dnl Copyright 2017-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/extensions.m4 emacs-26.3+1/m4/extensions.m4
--- emacs-26.1+1/m4/extensions.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/extensions.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 17  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/extern-inline.m4 emacs-26.3+1/m4/extern-inline.m4
--- emacs-26.1+1/m4/extern-inline.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/extern-inline.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2018 Free Software Foundation, Inc.
+dnl Copyright 2012-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/faccessat.m4 emacs-26.3+1/m4/faccessat.m4
--- emacs-26.1+1/m4/faccessat.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/faccessat.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 8
 # See if we need to provide faccessat replacement.
 
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fcntl_h.m4 emacs-26.3+1/m4/fcntl_h.m4
--- emacs-26.1+1/m4/fcntl_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fcntl_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # serial 15
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fcntl.m4 emacs-26.3+1/m4/fcntl.m4
--- emacs-26.1+1/m4/fcntl.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fcntl.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # fcntl.m4 serial 9
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fdatasync.m4 emacs-26.3+1/m4/fdatasync.m4
--- emacs-26.1+1/m4/fdatasync.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fdatasync.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # fdatasync.m4 serial 4
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fdopendir.m4 emacs-26.3+1/m4/fdopendir.m4
--- emacs-26.1+1/m4/fdopendir.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fdopendir.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 10
 # See if we need to provide fdopendir.
 
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/filemode.m4 emacs-26.3+1/m4/filemode.m4
--- emacs-26.1+1/m4/filemode.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/filemode.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # filemode.m4 serial 8
-dnl Copyright (C) 2002, 2005-2006, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/flexmember.m4 emacs-26.3+1/m4/flexmember.m4
--- emacs-26.1+1/m4/flexmember.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/flexmember.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 5
 # Check for flexible array member support.
 
-# Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fpending.m4 emacs-26.3+1/m4/fpending.m4
--- emacs-26.1+1/m4/fpending.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fpending.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # serial 22
 
-# Copyright (C) 2000-2001, 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2004-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fpieee.m4 emacs-26.3+1/m4/fpieee.m4
--- emacs-26.1+1/m4/fpieee.m4	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/m4/fpieee.m4	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,54 @@
+# fpieee.m4 serial 2  -*- coding: utf-8 -*-
+dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl IEEE 754 standardized three items:
+dnl - The formats of single-float and double-float - nowadays commonly
+dnl   available as 'float' and 'double' in C and C++.
+dnl   No autoconf test needed.
+dnl - The overflow and division by zero behaviour: The result are values
+dnl   '±Inf' and 'NaN', rather than exceptions as it was before.
+dnl   This file provides an autoconf macro for ensuring this behaviour of
+dnl   floating-point operations.
+dnl - A set of conditions (overflow, underflow, inexact, etc.) which can
+dnl   be configured to trigger an exception.
+dnl   This cannot be done in a portable way: it depends on the compiler,
+dnl   libc, kernel, and CPU.  No autoconf macro is provided for this.
+
+dnl Ensure non-trapping behaviour of floating-point overflow and
+dnl floating-point division by zero.
+dnl (For integer overflow, see gcc's -ftrapv option; for integer division by
+dnl zero, see the autoconf macro in intdiv0.m4.)
+
+AC_DEFUN([gl_FP_IEEE],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  # IEEE behaviour is the default on all CPUs except Alpha and SH
+  # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4
+  # and the GCC 4.1.2 manual).
+  case "$host_cpu" in
+    alpha*)
+      # On Alpha systems, a compiler option provides the behaviour.
+      # See the ieee(3) manual page, also available at
+      # <https://backdrift.org/man/tru64/man3/ieee.3.html>
+      if test -n "$GCC"; then
+        # GCC has the option -mieee.
+        # For full IEEE compliance (rarely needed), use option -mieee-with-inexact.
+        CPPFLAGS="$CPPFLAGS -mieee"
+      else
+        # Compaq (ex-DEC) C has the option -ieee, equivalent to -ieee_with_no_inexact.
+        # For full IEEE compliance (rarely needed), use option -ieee_with_inexact.
+        CPPFLAGS="$CPPFLAGS -ieee"
+      fi
+      ;;
+    sh*)
+      if test -n "$GCC"; then
+        # GCC has the option -mieee.
+        CPPFLAGS="$CPPFLAGS -mieee"
+      fi
+      ;;
+  esac
+])
diff -Nru emacs-26.1+1/m4/fstatat.m4 emacs-26.3+1/m4/fstatat.m4
--- emacs-26.1+1/m4/fstatat.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fstatat.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # fstatat.m4 serial 4
-dnl Copyright (C) 2004-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/fsync.m4 emacs-26.3+1/m4/fsync.m4
--- emacs-26.1+1/m4/fsync.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/fsync.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # fsync.m4 serial 2
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/getdtablesize.m4 emacs-26.3+1/m4/getdtablesize.m4
--- emacs-26.1+1/m4/getdtablesize.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/getdtablesize.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # getdtablesize.m4 serial 7
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/getgroups.m4 emacs-26.3+1/m4/getgroups.m4
--- emacs-26.1+1/m4/getgroups.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/getgroups.m4	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,8 @@
 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_GETGROUPS.
 
-# Copyright (C) 1996-1997, 1999-2004, 2008-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2004, 2008-2019 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/getloadavg.m4 emacs-26.3+1/m4/getloadavg.m4
--- emacs-26.1+1/m4/getloadavg.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/getloadavg.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # Check for getloadavg.
 
-# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2018 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2019 Free
+# Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/getopt.m4 emacs-26.3+1/m4/getopt.m4
--- emacs-26.1+1/m4/getopt.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/getopt.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # getopt.m4 serial 46
-dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/gettime.m4 emacs-26.3+1/m4/gettime.m4
--- emacs-26.1+1/m4/gettime.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/gettime.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # gettime.m4 serial 8
-dnl Copyright (C) 2002, 2004-2006, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2006, 2009-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/gettimeofday.m4 emacs-26.3+1/m4/gettimeofday.m4
--- emacs-26.1+1/m4/gettimeofday.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/gettimeofday.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 # serial 25
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software
+# Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/gnulib-common.m4 emacs-26.3+1/m4/gnulib-common.m4
--- emacs-26.1+1/m4/gnulib-common.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/gnulib-common.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 38
-dnl Copyright (C) 2007-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/gnulib-comp.m4 emacs-26.3+1/m4/gnulib-comp.m4
--- emacs-26.1+1/m4/gnulib-comp.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/gnulib-comp.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -86,6 +86,8 @@
   # Code from module filevercmp:
   # Code from module flexmember:
   # Code from module fpending:
+  # Code from module fpieee:
+  AC_REQUIRE([gl_FP_IEEE])
   # Code from module fstatat:
   # Code from module fsync:
   # Code from module getdtablesize:
@@ -994,6 +996,7 @@
   m4/filemode.m4
   m4/flexmember.m4
   m4/fpending.m4
+  m4/fpieee.m4
   m4/fstatat.m4
   m4/fsync.m4
   m4/getdtablesize.m4
diff -Nru emacs-26.1+1/m4/group-member.m4 emacs-26.3+1/m4/group-member.m4
--- emacs-26.1+1/m4/group-member.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/group-member.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 # serial 14
 
-# Copyright (C) 1999-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2003-2007, 2009-2019 Free Software
+# Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/include_next.m4 emacs-26.3+1/m4/include_next.m4
--- emacs-26.1+1/m4/include_next.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/include_next.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # include_next.m4 serial 24
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/inttypes.m4 emacs-26.3+1/m4/inttypes.m4
--- emacs-26.1+1/m4/inttypes.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/inttypes.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # inttypes.m4 serial 26
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/largefile.m4 emacs-26.3+1/m4/largefile.m4
--- emacs-26.1+1/m4/largefile.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/largefile.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2018 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/limits-h.m4 emacs-26.3+1/m4/limits-h.m4
--- emacs-26.1+1/m4/limits-h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/limits-h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Check whether limits.h has needed features.
 
-dnl Copyright 2016-2018 Free Software Foundation, Inc.
+dnl Copyright 2016-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/localtime-buffer.m4 emacs-26.3+1/m4/localtime-buffer.m4
--- emacs-26.1+1/m4/localtime-buffer.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/localtime-buffer.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # localtime-buffer.m4 serial 1
-dnl Copyright (C) 2017-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2017-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/longlong.m4 emacs-26.3+1/m4/longlong.m4
--- emacs-26.1+1/m4/longlong.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/longlong.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/lstat.m4 emacs-26.3+1/m4/lstat.m4
--- emacs-26.1+1/m4/lstat.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/lstat.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # serial 31
 
-# Copyright (C) 1997-2001, 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2019 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/manywarnings.m4 emacs-26.3+1/m4/manywarnings.m4
--- emacs-26.1+1/m4/manywarnings.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/manywarnings.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
-# manywarnings.m4 serial 13
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+# manywarnings.m4 serial 13-emacs
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -126,7 +126,6 @@
     -Wbuiltin-macro-redefined \
     -Wcast-align \
     -Wchar-subscripts \
-    -Wchkp \
     -Wclobbered \
     -Wcomment \
     -Wcomments \
diff -Nru emacs-26.1+1/m4/md5.m4 emacs-26.3+1/m4/md5.m4
--- emacs-26.1+1/m4/md5.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/md5.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # md5.m4 serial 14
-dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/memrchr.m4 emacs-26.3+1/m4/memrchr.m4
--- emacs-26.1+1/m4/memrchr.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/memrchr.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # memrchr.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/minmax.m4 emacs-26.3+1/m4/minmax.m4
--- emacs-26.1+1/m4/minmax.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/minmax.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # minmax.m4 serial 4
-dnl Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/mkostemp.m4 emacs-26.3+1/m4/mkostemp.m4
--- emacs-26.1+1/m4/mkostemp.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/mkostemp.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # mkostemp.m4 serial 2
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/mktime.m4 emacs-26.3+1/m4/mktime.m4
--- emacs-26.1+1/m4/mktime.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/mktime.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # serial 30
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/mode_t.m4 emacs-26.3+1/m4/mode_t.m4
--- emacs-26.1+1/m4/mode_t.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/mode_t.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/multiarch.m4 emacs-26.3+1/m4/multiarch.m4
--- emacs-26.1+1/m4/multiarch.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/multiarch.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/nocrash.m4 emacs-26.3+1/m4/nocrash.m4
--- emacs-26.1+1/m4/nocrash.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/nocrash.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/nstrftime.m4 emacs-26.3+1/m4/nstrftime.m4
--- emacs-26.1+1/m4/nstrftime.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/nstrftime.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 # serial 34
 
-# Copyright (C) 1996-1997, 1999-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2007, 2009-2019 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/off_t.m4 emacs-26.3+1/m4/off_t.m4
--- emacs-26.1+1/m4/off_t.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/off_t.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/open-cloexec.m4 emacs-26.3+1/m4/open-cloexec.m4
--- emacs-26.1+1/m4/open-cloexec.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/open-cloexec.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Test whether O_CLOEXEC is defined.
 
-dnl Copyright 2017-2018 Free Software Foundation, Inc.
+dnl Copyright 2017-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/open.m4 emacs-26.3+1/m4/open.m4
--- emacs-26.1+1/m4/open.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/open.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # open.m4 serial 15
-dnl Copyright (C) 2007-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/pipe2.m4 emacs-26.3+1/m4/pipe2.m4
--- emacs-26.1+1/m4/pipe2.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/pipe2.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # pipe2.m4 serial 2
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/pselect.m4 emacs-26.3+1/m4/pselect.m4
--- emacs-26.1+1/m4/pselect.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/pselect.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # pselect.m4 serial 6
-dnl Copyright (C) 2011-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/pthread_sigmask.m4 emacs-26.3+1/m4/pthread_sigmask.m4
--- emacs-26.1+1/m4/pthread_sigmask.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/pthread_sigmask.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # pthread_sigmask.m4 serial 16
-dnl Copyright (C) 2011-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/putenv.m4 emacs-26.3+1/m4/putenv.m4
--- emacs-26.1+1/m4/putenv.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/putenv.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # putenv.m4 serial 22
-dnl Copyright (C) 2002-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/readlinkat.m4 emacs-26.3+1/m4/readlinkat.m4
--- emacs-26.1+1/m4/readlinkat.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/readlinkat.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 5
 # See if we need to provide readlinkat replacement.
 
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/readlink.m4 emacs-26.3+1/m4/readlink.m4
--- emacs-26.1+1/m4/readlink.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/readlink.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # readlink.m4 serial 13
-dnl Copyright (C) 2003, 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sha1.m4 emacs-26.3+1/m4/sha1.m4
--- emacs-26.1+1/m4/sha1.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sha1.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sha1.m4 serial 12
-dnl Copyright (C) 2002-2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sha256.m4 emacs-26.3+1/m4/sha256.m4
--- emacs-26.1+1/m4/sha256.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sha256.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sha256.m4 serial 8
-dnl Copyright (C) 2005, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sha512.m4 emacs-26.3+1/m4/sha512.m4
--- emacs-26.1+1/m4/sha512.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sha512.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sha512.m4 serial 9
-dnl Copyright (C) 2005-2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sig2str.m4 emacs-26.3+1/m4/sig2str.m4
--- emacs-26.1+1/m4/sig2str.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sig2str.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # serial 7
-dnl Copyright (C) 2002, 2005-2006, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/signal_h.m4 emacs-26.3+1/m4/signal_h.m4
--- emacs-26.1+1/m4/signal_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/signal_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # signal_h.m4 serial 18
-dnl Copyright (C) 2007-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/socklen.m4 emacs-26.3+1/m4/socklen.m4
--- emacs-26.1+1/m4/socklen.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/socklen.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # socklen.m4 serial 10
-dnl Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/ssize_t.m4 emacs-26.3+1/m4/ssize_t.m4
--- emacs-26.1+1/m4/ssize_t.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/ssize_t.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/stat-time.m4 emacs-26.3+1/m4/stat-time.m4
--- emacs-26.1+1/m4/stat-time.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stat-time.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2018 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2019 Free
+# Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/stdalign.m4 emacs-26.3+1/m4/stdalign.m4
--- emacs-26.1+1/m4/stdalign.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stdalign.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Check for stdalign.h that conforms to C11.
 
-dnl Copyright 2011-2018 Free Software Foundation, Inc.
+dnl Copyright 2011-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/stddef_h.m4 emacs-26.3+1/m4/stddef_h.m4
--- emacs-26.1+1/m4/stddef_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stddef_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/std-gnu11.m4 emacs-26.3+1/m4/std-gnu11.m4
--- emacs-26.1+1/m4/std-gnu11.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/std-gnu11.m4	2019-09-10 00:32:49.000000000 +0000
@@ -7,7 +7,7 @@
 # or later is installed everywhere a Gnulib program might be developed.
 
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/m4/stdint.m4 emacs-26.3+1/m4/stdint.m4
--- emacs-26.1+1/m4/stdint.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stdint.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # stdint.m4 serial 51
-dnl Copyright (C) 2001-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/stdio_h.m4 emacs-26.3+1/m4/stdio_h.m4
--- emacs-26.1+1/m4/stdio_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stdio_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 48
-dnl Copyright (C) 2007-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/stdlib_h.m4 emacs-26.3+1/m4/stdlib_h.m4
--- emacs-26.1+1/m4/stdlib_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stdlib_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 44
-dnl Copyright (C) 2007-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/st_dm_mode.m4 emacs-26.3+1/m4/st_dm_mode.m4
--- emacs-26.1+1/m4/st_dm_mode.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/st_dm_mode.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 # serial 6
 
-# Copyright (C) 1998-1999, 2001, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 1998-1999, 2001, 2009-2019 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/stpcpy.m4 emacs-26.3+1/m4/stpcpy.m4
--- emacs-26.1+1/m4/stpcpy.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/stpcpy.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # stpcpy.m4 serial 8
-dnl Copyright (C) 2002, 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/string_h.m4 emacs-26.3+1/m4/string_h.m4
--- emacs-26.1+1/m4/string_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/string_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2018 Free Software Foundation, Inc.
+# Copyright (C) 2007-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/strtoimax.m4 emacs-26.3+1/m4/strtoimax.m4
--- emacs-26.1+1/m4/strtoimax.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/strtoimax.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # strtoimax.m4 serial 15
-dnl Copyright (C) 2002-2004, 2006, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006, 2009-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/strtoll.m4 emacs-26.3+1/m4/strtoll.m4
--- emacs-26.1+1/m4/strtoll.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/strtoll.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,6 @@
 # strtoll.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2019 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/symlink.m4 emacs-26.3+1/m4/symlink.m4
--- emacs-26.1+1/m4/symlink.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/symlink.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # serial 7
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sys_select_h.m4 emacs-26.3+1/m4/sys_select_h.m4
--- emacs-26.1+1/m4/sys_select_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sys_select_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sys_select_h.m4 serial 20
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sys_socket_h.m4 emacs-26.3+1/m4/sys_socket_h.m4
--- emacs-26.1+1/m4/sys_socket_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sys_socket_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sys_stat_h.m4 emacs-26.3+1/m4/sys_stat_h.m4
--- emacs-26.1+1/m4/sys_stat_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sys_stat_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 31   -*- Autoconf -*-
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sys_time_h.m4 emacs-26.3+1/m4/sys_time_h.m4
--- emacs-26.1+1/m4/sys_time_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sys_time_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 9
 
-# Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/sys_types_h.m4 emacs-26.3+1/m4/sys_types_h.m4
--- emacs-26.1+1/m4/sys_types_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/sys_types_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 9
-dnl Copyright (C) 2011-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/tempname.m4 emacs-26.3+1/m4/tempname.m4
--- emacs-26.1+1/m4/tempname.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/tempname.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 #serial 5
 
-# Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/timegm.m4 emacs-26.3+1/m4/timegm.m4
--- emacs-26.1+1/m4/timegm.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/timegm.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # timegm.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/time_h.m4 emacs-26.3+1/m4/time_h.m4
--- emacs-26.1+1/m4/time_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/time_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software
+# Foundation, Inc.
 
 # serial 11
 
diff -Nru emacs-26.1+1/m4/time_r.m4 emacs-26.3+1/m4/time_r.m4
--- emacs-26.1+1/m4/time_r.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/time_r.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Reentrant time functions: localtime_r, gmtime_r.
 
-dnl Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/timer_time.m4 emacs-26.3+1/m4/timer_time.m4
--- emacs-26.1+1/m4/timer_time.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/timer_time.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # timer_time.m4 serial 3
-dnl Copyright (C) 2011-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/time_rz.m4 emacs-26.3+1/m4/time_rz.m4
--- emacs-26.1+1/m4/time_rz.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/time_rz.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Time zone functions: tzalloc, localtime_rz, etc.
 
-dnl Copyright (C) 2015-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2015-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/timespec.m4 emacs-26.3+1/m4/timespec.m4
--- emacs-26.1+1/m4/timespec.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/timespec.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,7 @@
 #serial 15
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software
+# Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/tm_gmtoff.m4 emacs-26.3+1/m4/tm_gmtoff.m4
--- emacs-26.1+1/m4/tm_gmtoff.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/tm_gmtoff.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # tm_gmtoff.m4 serial 3
-dnl Copyright (C) 2002, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/unistd_h.m4 emacs-26.3+1/m4/unistd_h.m4
--- emacs-26.1+1/m4/unistd_h.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/unistd_h.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # unistd_h.m4 serial 71
-dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/unlocked-io.m4 emacs-26.3+1/m4/unlocked-io.m4
--- emacs-26.1+1/m4/unlocked-io.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/unlocked-io.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2019 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru emacs-26.1+1/m4/utimbuf.m4 emacs-26.3+1/m4/utimbuf.m4
--- emacs-26.1+1/m4/utimbuf.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/utimbuf.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # serial 9
 
-# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2018 Free Software
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2019 Free Software
 # Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
diff -Nru emacs-26.1+1/m4/utimens.m4 emacs-26.3+1/m4/utimens.m4
--- emacs-26.1+1/m4/utimens.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/utimens.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2003-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/utimes.m4 emacs-26.3+1/m4/utimes.m4
--- emacs-26.1+1/m4/utimes.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/utimes.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # Detect some bugs in glibc's implementation of utimes.
 # serial 5
 
-dnl Copyright (C) 2003-2005, 2009-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/vararrays.m4 emacs-26.3+1/m4/vararrays.m4
--- emacs-26.1+1/m4/vararrays.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/vararrays.m4	2019-09-10 00:32:49.000000000 +0000
@@ -4,7 +4,7 @@
 
 # From Paul Eggert
 
-# Copyright (C) 2001, 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2009-2019 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/warnings.m4 emacs-26.3+1/m4/warnings.m4
--- emacs-26.1+1/m4/warnings.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/warnings.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # warnings.m4 serial 13
-dnl Copyright (C) 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/m4/wchar_t.m4 emacs-26.3+1/m4/wchar_t.m4
--- emacs-26.1+1/m4/wchar_t.m4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/m4/wchar_t.m4	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff -Nru emacs-26.1+1/make-dist emacs-26.3+1/make-dist
--- emacs-26.1+1/make-dist	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/make-dist	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### make-dist: create an Emacs distribution tar file from current srcdir
 
-## Copyright (C) 1995, 1997-1998, 2000-2018 Free Software Foundation,
+## Copyright (C) 1995, 1997-1998, 2000-2019 Free Software Foundation,
 ## Inc.
 
 ## This file is part of GNU Emacs.
@@ -327,10 +327,6 @@
   echo "Running autoreconf"
   autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; }
 
-  ## Make sure src/stamp-h.in is newer than configure.ac.
-  rm -f src/stamp-h.in
-  echo timestamp > src/stamp-h.in
-
   echo "Updating Info files"
   make info
 
diff -Nru emacs-26.1+1/Makefile.in emacs-26.3+1/Makefile.in
--- emacs-26.1+1/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1992-2018 Free Software Foundation, Inc.
+# Copyright (C) 1992-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -151,6 +151,9 @@
 # Currently only used for the systemd service file.
 libdir=@libdir@
 
+# Where to install emacs-module.h.
+includedir=@includedir@
+
 # Where to install Emacs's man pages.
 # Note they contain cross-references that expect them to be in section 1.
 mandir=@mandir@
@@ -192,7 +195,7 @@
 desktopdir=$(datarootdir)/applications
 
 # Where the etc/emacs.appdata.xml file is to be installed.
-appdatadir=$(datarootdir)/appdata
+appdatadir=$(datarootdir)/metainfo
 
 # Where the etc/emacs.service file is to be installed.
 # The system value (typically /usr/lib/systemd/user) can be
@@ -558,6 +561,8 @@
 ## See also these comments from 2004 about cp -r working fine:
 ## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html
 install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
+	umask 022 && $(MKDIR_P) "$(DESTDIR)$(includedir)"
+	$(INSTALL_DATA) src/emacs-module.h "$(DESTDIR)$(includedir)/emacs-module.h"
 	-set ${COPYDESTS} ; \
 	unset CDPATH; \
 	$(set_installuser); \
@@ -741,6 +746,7 @@
 ###
 ### Don't delete the lisp and etc directories if they're in the source tree.
 uninstall: uninstall-$(NTDIR) uninstall-doc
+	rm -f "$(DESTDIR)$(includedir)/emacs-module.h"
 	$(MAKE) -C lib-src uninstall
 	-unset CDPATH; \
 	for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do 	\
diff -Nru emacs-26.1+1/modules/modhelp.py emacs-26.3+1/modules/modhelp.py
--- emacs-26.1+1/modules/modhelp.py	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/modules/modhelp.py	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Module helper script.
 
-# Copyright 2015-2018 Free Software Foundation, Inc.
+# Copyright 2015-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/msdos/autogen/config.in emacs-26.3+1/msdos/autogen/config.in
--- emacs-26.1+1/msdos/autogen/config.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/autogen/config.in	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 
 /* GNU Emacs site configuration template file.
 
-Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2018 Free Software
+Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/msdos/autogen/Makefile.in emacs-26.3+1/msdos/autogen/Makefile.in
--- emacs-26.1+1/msdos/autogen/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/autogen/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 # Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2009, 2013-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2009, 2013-2019 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 # Generated by gnulib-tool.
 # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/msdos/ChangeLog.1 emacs-26.3+1/msdos/ChangeLog.1
--- emacs-26.1+1/msdos/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -1550,7 +1550,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1994-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/msdos/depfiles.bat emacs-26.3+1/msdos/depfiles.bat
--- emacs-26.1+1/msdos/depfiles.bat	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/depfiles.bat	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Auxiliary script for MSDOS, run by ../config.bat
-rem   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+rem   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/msdos/INSTALL emacs-26.3+1/msdos/INSTALL
--- emacs-26.1+1/msdos/INSTALL	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/INSTALL	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port
 
-Copyright (C) 1992, 1994, 1996-1997, 2000-2018 Free Software Foundation,
+Copyright (C) 1992, 1994, 1996-1997, 2000-2019 Free Software Foundation,
 Inc.
 See the end of the file for license conditions.
 
diff -Nru emacs-26.1+1/msdos/inttypes.h emacs-26.3+1/msdos/inttypes.h
--- emacs-26.1+1/msdos/inttypes.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/inttypes.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/msdos/mainmake.v2 emacs-26.3+1/msdos/mainmake.v2
--- emacs-26.1+1/msdos/mainmake.v2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/mainmake.v2	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/msdos/README emacs-26.3+1/msdos/README
--- emacs-26.1+1/msdos/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -10,7 +10,7 @@
 Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 
-# Copyright (C) 1993, 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2002-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed1v2.inp emacs-26.3+1/msdos/sed1v2.inp
--- emacs-26.1+1/msdos/sed1v2.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed1v2.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for src/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996-1997, 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed1x.inp emacs-26.3+1/msdos/sed1x.inp
--- emacs-26.1+1/msdos/sed1x.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed1x.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Extra configuration script for src/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-1997, 1999-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed2v2.inp emacs-26.3+1/msdos/sed2v2.inp
--- emacs-26.1+1/msdos/sed2v2.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed2v2.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for src/config.h under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1993-1997, 1999-2000, 2002-2018 Free Software
+# Copyright (C) 1993-1997, 1999-2000, 2002-2019 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -27,7 +27,7 @@
 #ifndef MSDOS\
 #define MSDOS\
 #endif
-/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2018 Free Software Foundation, Inc."/
+/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2019 Free Software Foundation, Inc."/
 /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'!
 /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
 /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
@@ -66,7 +66,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.1"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "26.3"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff -Nru emacs-26.1+1/msdos/sed2x.inp emacs-26.3+1/msdos/sed2x.inp
--- emacs-26.1+1/msdos/sed2x.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed2x.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Extra configuration script for src/config.h for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed3v2.inp emacs-26.3+1/msdos/sed3v2.inp
--- emacs-26.1+1/msdos/sed3v2.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed3v2.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for lib-src/makefile under DJGPP v2
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1998, 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed4.inp emacs-26.3+1/msdos/sed4.inp
--- emacs-26.1+1/msdos/sed4.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed4.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for src/paths.h
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed5x.inp emacs-26.3+1/msdos/sed5x.inp
--- emacs-26.1+1/msdos/sed5x.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed5x.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for oldxmenu/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sed6.inp emacs-26.3+1/msdos/sed6.inp
--- emacs-26.1+1/msdos/sed6.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sed6.inp	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 # doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x
 # ---------------------------------------------------------------------------
 #
-# Copyright (C) 1997, 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedadmin.inp emacs-26.3+1/msdos/sedadmin.inp
--- emacs-26.1+1/msdos/sedadmin.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedadmin.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for admin/unidata/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedalloc.inp emacs-26.3+1/msdos/sedalloc.inp
--- emacs-26.1+1/msdos/sedalloc.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedalloc.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2008-2018 Free Software Foundation, Inc.
+# Copyright (C) 2008-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedleim.inp emacs-26.3+1/msdos/sedleim.inp
--- emacs-26.1+1/msdos/sedleim.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedleim.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for leim/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedlibcf.inp emacs-26.3+1/msdos/sedlibcf.inp
--- emacs-26.1+1/msdos/sedlibcf.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedlibcf.inp	2019-09-10 00:32:49.000000000 +0000
@@ -5,7 +5,7 @@
 # files whose names are invalid on DOS 8+3 filesystems.
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedlibmk.inp emacs-26.3+1/msdos/sedlibmk.inp
--- emacs-26.1+1/msdos/sedlibmk.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedlibmk.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for lib/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/msdos/sedlisp.inp emacs-26.3+1/msdos/sedlisp.inp
--- emacs-26.1+1/msdos/sedlisp.inp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/msdos/sedlisp.inp	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 # Configuration script for lisp/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/nextstep/ChangeLog.1 emacs-26.3+1/nextstep/ChangeLog.1
--- emacs-26.1+1/nextstep/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nextstep/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -312,7 +312,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008-2018 Free Software Foundation, Inc.
+  Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nextstep/INSTALL emacs-26.3+1/nextstep/INSTALL
--- emacs-26.1+1/nextstep/INSTALL	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nextstep/INSTALL	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -45,6 +45,35 @@
 require 'sudo' for "make install").
 
 
+Targeting different macOS versions
+----------------------------------
+
+The Emacs build process automatically enables or disables macOS
+features according to the version of macOS it is being built on.  It
+is possible to override this automatic configuration if you are
+targeting a different version of macOS, or wish to build one
+executable that is able to enable or disable features at run-time.
+
+To build a version compatible with an older version of macOS use this
+flag:
+
+  -DMAC_OS_X_VERSION_MIN_REQUIRED=x
+
+and to build for a newer version of macOS:
+
+  -DMAC_OS_X_VERSION_MAX_ALLOWED=x
+
+For example, to enable run-time checks for features available between
+macOS 10.6, and 10.12 inclusive:
+
+  ./configure --with-ns CFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
+    -DMAC_OS_X_VERSION_MAX_ALLOWED=101200 -g3 -O2"
+
+The macOS version numbers are formatted as 10x0 for macOS up to 10.10,
+and 10xx00 for macOS 10.10 and above.  A full list is provided in
+/usr/include/AvailabilityMacros.h.
+
+
 Installation
 ------------
 
diff -Nru emacs-26.1+1/nextstep/Makefile.in emacs-26.3+1/nextstep/Makefile.in
--- emacs-26.1+1/nextstep/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nextstep/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-## Copyright (C) 2012-2018 Free Software Foundation, Inc.
+## Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nextstep/README emacs-26.3+1/nextstep/README
--- emacs-26.1+1/nextstep/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nextstep/README	2019-09-10 00:32:49.000000000 +0000
@@ -105,7 +105,7 @@
 
 
 ----------------------------------------------------------------------
-Copyright 2008-2018 Free Software Foundation, Inc.
+Copyright 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nextstep/templates/Info.plist.in emacs-26.3+1/nextstep/templates/Info.plist.in
--- emacs-26.1+1/nextstep/templates/Info.plist.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nextstep/templates/Info.plist.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -675,5 +675,7 @@
 	</array>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
+        <key>NSAppleEventsUsageDescription</key>
+        <string>Emacs requires permission to send AppleEvents to other applications.</string>
 </dict>
 </plist>
diff -Nru emacs-26.1+1/nt/addpm.c emacs-26.3+1/nt/addpm.c
--- emacs-26.1+1/nt/addpm.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/addpm.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -38,9 +38,12 @@
 #include <stdio.h>
 #include <malloc.h>
 
-/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500.  */
+/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x0500.  */
 #ifndef MINGW_W64
-#define _WIN32_IE 0x400
+# ifdef _WIN32_IE
+#  undef _WIN32_IE
+# endif
+#define _WIN32_IE 0x0400
 #endif
 /* Request C Object macros for COM interfaces.  */
 #define COBJMACROS 1
@@ -216,8 +219,9 @@
 	{
 	  int result;
 
-	  char msg[ MAX_PATH ];
-	  sprintf (msg, "Install Emacs at %s?\n", emacs_path);
+	  const char install_msg[] = "Install Emacs at %s?\n";
+	  char msg[ MAX_PATH + sizeof (install_msg) ];
+	  sprintf (msg, install_msg, emacs_path);
 	  result = MessageBox (NULL, msg, "Install Emacs",
 			       MB_OKCANCEL | MB_ICONQUESTION);
 	  if (result != IDOK)
diff -Nru emacs-26.1+1/nt/ChangeLog.1 emacs-26.3+1/nt/ChangeLog.1
--- emacs-26.1+1/nt/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3548,7 +3548,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/cmdproxy.c emacs-26.3+1/nt/cmdproxy.c
--- emacs-26.1+1/nt/cmdproxy.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/cmdproxy.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external
diff -Nru emacs-26.1+1/nt/configure.bat emacs-26.3+1/nt/configure.bat
--- emacs-26.1+1/nt/configure.bat	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/configure.bat	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   This was the old configuration script for MS Windows operating systems
-rem   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+rem   Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/ddeclient.c emacs-26.3+1/nt/ddeclient.c
--- emacs-26.1+1/nt/ddeclient.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/ddeclient.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/emacsclient.rc.in emacs-26.3+1/nt/emacsclient.rc.in
--- emacs-26.1+1/nt/emacsclient.rc.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/emacsclient.rc.in	2019-09-10 00:32:49.000000000 +0000
@@ -25,7 +25,7 @@
 	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
 	    VALUE "FileVersion", "@comma_space_version@\0"
 	    VALUE "InternalName", "EmacsClient\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2001-2018\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001-2019\0"
 	    VALUE "OriginalFilename", "emacsclientw.exe"
 	    VALUE "ProductName", "EmacsClient\0"
 	    VALUE "ProductVersion", "@comma_space_version@\0"
diff -Nru emacs-26.1+1/nt/emacs.rc.in emacs-26.3+1/nt/emacs.rc.in
--- emacs-26.1+1/nt/emacs.rc.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/emacs.rc.in	2019-09-10 00:32:49.000000000 +0000
@@ -31,7 +31,7 @@
 	    VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
 	    VALUE "FileVersion", "@comma_space_version@\0"
 	    VALUE "InternalName", "Emacs\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2001-2018\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001-2019\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs\0"
 	    VALUE "ProductVersion", "@comma_space_version@\0"
diff -Nru emacs-26.1+1/nt/epaths.nt emacs-26.3+1/nt/epaths.nt
--- emacs-26.1+1/nt/epaths.nt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/epaths.nt	2019-09-10 00:32:49.000000000 +0000
@@ -12,7 +12,7 @@
    the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of
    the Emacs source tree used to build Emacs.  */
 /*
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2018 Free Software
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/nt/gnulib-cfg.mk emacs-26.3+1/nt/gnulib-cfg.mk
--- emacs-26.1+1/nt/gnulib-cfg.mk	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/gnulib-cfg.mk	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # Configurations for ../lib/gnulib.mk.
 #
-# Copyright 2017-2018 Free Software Foundation, Inc.
+# Copyright 2017-2019 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/nt/icons/README emacs-26.3+1/nt/icons/README
--- emacs-26.1+1/nt/icons/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/icons/README	2019-09-10 00:32:49.000000000 +0000
@@ -2,13 +2,13 @@
 
 File: emacs.ico
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later
 
 
 File: emacs22.ico
 Author: Andrew Zhilin
-Copyright (C) 2005-2018 Free Software Foundation, Inc.
+Copyright (C) 2005-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
@@ -17,7 +17,7 @@
        gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
        gnu7.ico    gnu8.ico     gnu9.ico
 Author: Rob Davenport <rgd at bigfoot.com>
-Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
diff -Nru emacs-26.1+1/nt/inc/grp.h emacs-26.3+1/nt/inc/grp.h
--- emacs-26.1+1/nt/inc/grp.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/grp.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/inttypes.h emacs-26.3+1/nt/inc/inttypes.h
--- emacs-26.1+1/nt/inc/inttypes.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/inttypes.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/langinfo.h emacs-26.3+1/nt/inc/langinfo.h
--- emacs-26.1+1/nt/inc/langinfo.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/langinfo.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/ms-w32.h emacs-26.3+1/nt/inc/ms-w32.h
--- emacs-26.1+1/nt/inc/ms-w32.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/ms-w32.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
 
-Copyright (C) 1993-1995, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -455,7 +455,12 @@
    windows.h.  For this to have proper effect, config.h must always be
    included before windows.h.  */
 #define _WINSOCKAPI_    1
-#define _WINSOCK_H
+#if !(defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L)
+/* mingw.org's MinGW 5.x changed how it includes winsock.h and time.h,
+   and now defining _WINSOCK_H skips the definition of struct timeval,
+   which we don't want.  */
+# define _WINSOCK_H
+#endif
 
 /* Defines size_t and alloca ().  */
 #include <stdlib.h>
diff -Nru emacs-26.1+1/nt/inc/nl_types.h emacs-26.3+1/nt/inc/nl_types.h
--- emacs-26.1+1/nt/inc/nl_types.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/nl_types.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/stdint.h emacs-26.3+1/nt/inc/stdint.h
--- emacs-26.1+1/nt/inc/stdint.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/stdint.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Replacement stdint.h file for building GNU Emacs on Windows.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/sys/resource.h emacs-26.3+1/nt/inc/sys/resource.h
--- emacs-26.1+1/nt/inc/sys/resource.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/sys/resource.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A limited emulation of sys/resource.h.
 
-Copyright (C) 2016-2018 Free Software Foundation, Inc.
+Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/sys/socket.h emacs-26.3+1/nt/inc/sys/socket.h
--- emacs-26.1+1/nt/inc/sys/socket.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/sys/socket.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -49,6 +49,11 @@
 #define timeval ws_timeval
 #endif
 
+#if defined __MINGW32_VERSION && __MINGW32_VERSION >= 5000002L
+/* Need winerror.h before winsock2.h with mingw.org's MinGW 5.x,
+   otherwise some error codes are not defined.  */
+# include <winerror.h>
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 /* process.c uses uint16_t (from C99) for IPv6, but
diff -Nru emacs-26.1+1/nt/inc/sys/stat.h emacs-26.3+1/nt/inc/sys/stat.h
--- emacs-26.1+1/nt/inc/sys/stat.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/sys/stat.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* sys/stat.h supplied with MSVCRT uses too narrow data types for
    inode and user/group id, so we replace them with our own.
 
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/inc/sys/wait.h emacs-26.3+1/nt/inc/sys/wait.h
--- emacs-26.1+1/nt/inc/sys/wait.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/inc/sys/wait.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* A limited emulation of sys/wait.h on Posix systems.
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/INSTALL emacs-26.3+1/nt/INSTALL
--- emacs-26.1+1/nt/INSTALL	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/INSTALL	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 		    Building and Installing Emacs on MS-Windows
                           using the MSYS and MinGW tools
 
-  Copyright (C) 2013-2018 Free Software Foundation, Inc.
+  Copyright (C) 2013-2019 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
 The MSYS/MinGW build described here is supported on versions of
diff -Nru emacs-26.1+1/nt/INSTALL.W64 emacs-26.3+1/nt/INSTALL.W64
--- emacs-26.1+1/nt/INSTALL.W64	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/INSTALL.W64	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 	  Building and Installing Emacs on 64-bit MS-Windows
 		      using MSYS2 and MinGW-w64
 
-  Copyright (c) 2015-2018 Free Software Foundation, Inc.
+  Copyright (c) 2015-2019 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
 This document describes how to compile a 64-bit GNU Emacs using MSYS2
diff -Nru emacs-26.1+1/nt/Makefile.in emacs-26.3+1/nt/Makefile.in
--- emacs-26.1+1/nt/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2013-2018 Free Software Foundation, Inc.
+# Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/preprep.c emacs-26.3+1/nt/preprep.c
--- emacs-26.1+1/nt/preprep.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/preprep.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Pre-process emacs.exe for profiling by MSVC.
-   Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/nt/README emacs-26.3+1/nt/README
--- emacs-26.1+1/nt/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 	     Emacs for Windows NT/2000 and Windows 95/98/ME
 
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
   This directory contains support for compiling and running GNU Emacs on
diff -Nru emacs-26.1+1/nt/README.W32 emacs-26.3+1/nt/README.W32
--- emacs-26.1+1/nt/README.W32	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/README.W32	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-		Emacs version 26.1 for MS-Windows
+		Emacs version 26.3 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You
@@ -24,7 +24,7 @@
 * Preliminaries
 
   There are two binary distributions named
-  emacs-VER-x86_64-w64-mingw32.zip and emacs-VER-i686-w64-mingw32.zip,
+  emacs-VER-x86_64.zip and emacs-VER-i686.zip,
   where VER is the Emacs version.  These are 64-bit and 32-bit builds,
   respectively.  If you are running a 32-bit version of MS-Windows,
   you need to install the 32-bit build; users of 64-bit Windows can
@@ -45,29 +45,14 @@
   action, by default this will be in a top-level directory with the
   same name as the zip file.
 
-  We also provide a set of optional dependencies, in
-  emacs-MVER-x86_64-deps.zip or emacs-MVER-i686-deps.zip respectively,
-  where MVER is the major Emacs version that should use these
-  libraries.  These provide Emacs with a number of additional optional
-  capabilities, described in detail below.  To use these, unpack them
-  directly over the emacs directory structure.  Note that, if
-  extracting with the Windows Explorer, you will have to override the
-  directory where it wants to put the file with the same directory
-  where you extracted the Emacs binary package.
-
-  Finally, and also optionally, you can run the program addpm.exe in
-  the bin subdirectory which will place an icon for Emacs on the start
-  page.  (This is no longer needed in latest versions of Emacs, so we
-  recommend you not do that, as running addpm.exe will insert entries
-  into the Registry which might get in the way if you upgrade to later
-  versions without updating those entries, or would like to uninstall
-  Emacs.)
-
   Emacs is completely portable.  You can create your own shortcut to
   runemacs.exe and place this wherever you find it convenient (the
   desktop and/or the Taskbar), or run it from a USB or network drive
   without copying or installing anything on the machine itself.
 
+  It is also possible, although not recommended to use the program
+  bin/addpm.exe which will place an icon for Emacs on the start page.
+
 * Prerequisites for Windows 9X
 
   The 32-bit build supports MS-Windows 9X (Windows 95/98/Me).  To run
@@ -151,48 +136,41 @@
   + update-game-score.exe - A utility for updating the score files of
     Emacs games.
 
-* Optional dependency libraries
+* Emacs without optional dependencies
+
+  The files emacs-VER-x86_64.zip and emacs-VER-i686.zip contain a
+  large number of optional dependencies for Emacs.
 
-  Emacs has built in support for XBM and PPM/PGM/PBM images, and the
-  libXpm library is bundled, providing XPM support (required for color
-  toolbar icons and splash screen).  Source for libXpm should be
-  available from the same place from which you got this binary
-  distribution.
-
-  Emacs has a number of optional features which need additional
-  libraries.  These are provided in a separate bundle of dependencies,
-  as described above, and enable support for the following:
+  Emacs has a number of optional features which use these additional
+  dependencies.  They enable support for the following:
 
   - displaying inline images of many types (PNG, JPEG, GIF, TIFF, SVG)
   - SSL/TLS secure network communications (HTTPS, IMAPS, etc.)
   - HTML and XML parsing (necessary for the built-in EWW browser)
   - built-in decompression of compressed text
 
-  The optional dependency libraries are in emacs-MVER-x86_64-deps.zip
-  (64-bit) and emacs-MVER-i686-deps.zip (32-bit), and their sources
-  are in emacs-MVER-deps-mingw-w64-src.zip, where MVER is the major
-  version of Emacs that should use these dependencies.  Note that a
-  64-bit Emacs will only work with the 64-bit dependencies, and the
-  32-bit Emacs only with the 32-bit dependencies.
-
-  Newer/updated builds for these optional libraries are available at
-  http://msys2.github.io/ and
-  http://sourceforge.net/projects/ezwinports/files/ (but you shouldn't
-  need these except in emergencies).
-
-  If you install the libraries in a directory different from where you
-  have the Emacs executable programs, we recommend to add the
-  directory with DLLs to your Path, so that Emacs will be able to find
-  those DLLs when needed.
+  If you do not want these files (if you have them already for
+  instance, or you want the smallest possible Emacs), then you may use
+  the files emacs-VER-x86_64-no-deps.zip or
+  emacs-VER-i686-no-deps.zip. The dependency files are also available
+  as emacs-MVER-x86_64-deps.zip and emacs-MVER-i686-deps.zip. Source
+  code for these dependencies is available as
+  emacs-26-deps-mingw-w64-src.zip.
+
+  All distributions of Emacs have built in support for XBM and
+  PPM/PGM/PBM images, and the libXpm library is bundled, providing XPM
+  support (required for color toolbar icons and splash screen).
+  Source for libXpm should be available from the same place from which
+  you got this binary distribution.
 
 * Installing Emacs with an existing MSYS2 installation
 
-  You may also use Emacs with an existing MSYS2 installation by simply
-  unpacking the Emacs distribution over MSYS2.  You can then use the
-  'pacman' utility to install dependencies.  You should not use the
-  optional dependencies bundle from this site, as this will overwrite
-  MSYS2 files (the dependency bundle derives from MSYS2, but may be a
-  different version).
+  You may also use Emacs with an existing MSYS2 installation by
+  unpacking the emacs-VER-x86_64-no-deps.zip over the MSYS2
+  distribution. You should not use the emacs-VER-x86_64.zip from this
+  site, as this will overwrite MSYS2 files (the dependency bundle
+  derives from MSYS2, but will be from a different version). You can
+  then use the 'pacman' utility to install dependencies.
 
   Some of the optional libraries need to be of certain versions to
   work with your Emacs binary.  Make sure you install those versions
@@ -218,6 +196,7 @@
     mingw-w64-x86_64-libtiff
     mingw-w64-x86_64-libxml2
     mingw-w64-x86_64-xpm-nox
+    mingw-w64-x86_64-lcms2
 
   You can type any subset of this list.  When asked whether to proceed
   with installation, answer Y.
diff -Nru emacs-26.1+1/nt/runemacs.c emacs-26.3+1/nt/runemacs.c
--- emacs-26.1+1/nt/runemacs.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/nt/runemacs.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* runemacs --- Simple program to start Emacs with its console window hidden.
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/oldXMenu/Activate.c emacs-26.3+1/oldXMenu/Activate.c
--- emacs-26.1+1/oldXMenu/Activate.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/Activate.c	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/ChangeLog.1 emacs-26.3+1/oldXMenu/ChangeLog.1
--- emacs-26.1+1/oldXMenu/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -712,7 +712,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/oldXMenu/Create.c emacs-26.3+1/oldXMenu/Create.c
--- emacs-26.1+1/oldXMenu/Create.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/Create.c	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/deps.mk emacs-26.3+1/oldXMenu/deps.mk
--- emacs-26.1+1/oldXMenu/deps.mk	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/deps.mk	2019-09-10 00:32:49.000000000 +0000
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001-2018 Free Software Foundation, Inc.
+## Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/FindSel.c emacs-26.3+1/oldXMenu/FindSel.c
--- emacs-26.1+1/oldXMenu/FindSel.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/FindSel.c	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/insque.c emacs-26.3+1/oldXMenu/insque.c
--- emacs-26.1+1/oldXMenu/insque.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/insque.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1993-1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/Internal.c emacs-26.3+1/oldXMenu/Internal.c
--- emacs-26.1+1/oldXMenu/Internal.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/Internal.c	2019-09-10 00:32:49.000000000 +0000
@@ -3,7 +3,7 @@
 #include "copyright.h"
 
 /*
-Copyright (C) 1993, 1996, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/oldXMenu/Makefile.in emacs-26.3+1/oldXMenu/Makefile.in
--- emacs-26.1+1/oldXMenu/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/oldXMenu/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
 
 
-## Copyright (C) 2001-2018 Free Software Foundation, Inc.
+## Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/README emacs-26.3+1/README
--- emacs-26.1+1/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,8 +1,8 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 26.1 of GNU Emacs, the extensible,
+This directory tree holds version 26.3 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff -Nru emacs-26.1+1/src/alloc.c emacs-26.3+1/src/alloc.c
--- emacs-26.1+1/src/alloc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/alloc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
 
-Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2018 Free Software
+Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1607,9 +1607,7 @@
 
 #define LARGE_STRING_BYTES 1024
 
-/* The SDATA typedef is a struct or union describing string memory
-   sub-allocated from an sblock.  This is where the contents of Lisp
-   strings are stored.  */
+/* The layout of a nonnull string.  */
 
 struct sdata
 {
@@ -1628,13 +1626,8 @@
   unsigned char data[FLEXIBLE_ARRAY_MEMBER];
 };
 
-#ifdef GC_CHECK_STRING_BYTES
-
-typedef struct sdata sdata;
-#define SDATA_NBYTES(S)	(S)->nbytes
-#define SDATA_DATA(S)	(S)->data
-
-#else
+/* A union describing string memory sub-allocated from an sblock.
+   This is where the contents of Lisp strings are stored.  */
 
 typedef union
 {
@@ -1662,8 +1655,6 @@
 #define SDATA_NBYTES(S)	(S)->n.nbytes
 #define SDATA_DATA(S)	((struct sdata *) (S))->data
 
-#endif /* not GC_CHECK_STRING_BYTES */
-
 enum { SDATA_DATA_OFFSET = offsetof (struct sdata, data) };
 
 /* Structure describing a block of memory which is sub-allocated to
@@ -1754,31 +1745,20 @@
 #define GC_STRING_OVERRUN_COOKIE_SIZE 0
 #endif
 
-/* Value is the size of an sdata structure large enough to hold NBYTES
-   bytes of string data.  The value returned includes a terminating
-   NUL byte, the size of the sdata structure, and padding.  */
-
-#ifdef GC_CHECK_STRING_BYTES
-
-#define SDATA_SIZE(NBYTES) FLEXSIZEOF (struct sdata, data, (NBYTES) + 1)
-
-#else /* not GC_CHECK_STRING_BYTES */
-
-/* The 'max' reserves space for the nbytes union member even when NBYTES + 1 is
-   less than the size of that member.  The 'max' is not needed when
-   SDATA_DATA_OFFSET is a multiple of FLEXALIGNOF (struct sdata),
-   because then the alignment code reserves enough space.  */
-
-#define SDATA_SIZE(NBYTES)				      \
-     ((SDATA_DATA_OFFSET				      \
-       + (SDATA_DATA_OFFSET % FLEXALIGNOF (struct sdata) == 0 \
-	  ? NBYTES					      \
-	  : max (NBYTES, FLEXALIGNOF (struct sdata) - 1))     \
-       + 1						      \
-       + FLEXALIGNOF (struct sdata) - 1)		      \
-      & ~(FLEXALIGNOF (struct sdata) - 1))
+/* Return the size of an sdata structure large enough to hold N bytes
+   of string data.  This counts the sdata structure, the N bytes, a
+   terminating NUL byte, and alignment padding.  */
 
-#endif /* not GC_CHECK_STRING_BYTES */
+static ptrdiff_t
+sdata_size (ptrdiff_t n)
+{
+  /* Reserve space for the nbytes union member even when N + 1 is less
+     than the size of that member.  */
+  ptrdiff_t unaligned_size = max (SDATA_DATA_OFFSET + n + 1,
+				  sizeof (sdata));
+  int sdata_align = max (FLEXALIGNOF (struct sdata), alignof (sdata));
+  return (unaligned_size + sdata_align - 1) & ~(sdata_align - 1);
+}
 
 /* Extra bytes to allocate for each string.  */
 
@@ -1831,21 +1811,14 @@
 static void
 check_sblock (struct sblock *b)
 {
-  sdata *from, *end, *from_end;
-
-  end = b->next_free;
+  sdata *end = b->next_free;
 
-  for (from = b->data; from < end; from = from_end)
+  for (sdata *from = b->data; from < end; )
     {
-      /* Compute the next FROM here because copying below may
-	 overwrite data we need to compute it.  */
-      ptrdiff_t nbytes;
-
-      /* Check that the string size recorded in the string is the
-	 same as the one recorded in the sdata structure.  */
-      nbytes = SDATA_SIZE (from->string ? string_bytes (from->string)
-			   : SDATA_NBYTES (from));
-      from_end = (sdata *) ((char *) from + nbytes + GC_STRING_EXTRA);
+      ptrdiff_t nbytes = sdata_size (from->string
+				     ? string_bytes (from->string)
+				     : SDATA_NBYTES (from));
+      from = (sdata *) ((char *) from + nbytes + GC_STRING_EXTRA);
     }
 }
 
@@ -1977,14 +1950,14 @@
 {
   sdata *data, *old_data;
   struct sblock *b;
-  ptrdiff_t needed, old_nbytes;
+  ptrdiff_t old_nbytes;
 
   if (STRING_BYTES_MAX < nbytes)
     string_overflow ();
 
   /* Determine the number of bytes needed to store NBYTES bytes
      of string data.  */
-  needed = SDATA_SIZE (nbytes);
+  ptrdiff_t needed = sdata_size (nbytes);
   if (s->u.s.data)
     {
       old_data = SDATA_OF_STRING (s);
@@ -2234,7 +2207,7 @@
 	      nbytes = s ? STRING_BYTES (s) : SDATA_NBYTES (from);
 	      eassert (nbytes <= LARGE_STRING_BYTES);
 
-	      nbytes = SDATA_SIZE (nbytes);
+	      nbytes = sdata_size (nbytes);
 	      sdata *from_end = (sdata *) ((char *) from
 					   + nbytes + GC_STRING_EXTRA);
 
@@ -2410,7 +2383,7 @@
 
 DEFUN ("bool-vector", Fbool_vector, Sbool_vector, 0, MANY, 0,
        doc: /* Return a new bool-vector with specified arguments as elements.
-Any number of arguments, even zero arguments, are allowed.
+Allows any number of arguments, including zero.
 usage: (bool-vector &rest OBJECTS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
@@ -2642,8 +2615,6 @@
 
   if (float_free_list)
     {
-      /* We use the data field for chaining the free list
-	 so that we won't use the same field that has the mark bit.  */
       XSETFLOAT (val, float_free_list);
       float_free_list = float_free_list->u.chain;
     }
@@ -2747,8 +2718,6 @@
 
   if (cons_free_list)
     {
-      /* We use the cdr for chaining the free list
-	 so that we won't use the same field that has the mark bit.  */
       XSETCONS (val, cons_free_list);
       cons_free_list = cons_free_list->u.s.u.chain;
     }
@@ -2861,7 +2830,7 @@
 
 DEFUN ("list", Flist, Slist, 0, MANY, 0,
        doc: /* Return a newly created list with specified arguments as elements.
-Any number of arguments, even zero arguments, are allowed.
+Allows any number of arguments, including zero.
 usage: (list &rest OBJECTS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
@@ -3473,7 +3442,7 @@
 
 DEFUN ("vector", Fvector, Svector, 0, MANY, 0,
        doc: /* Return a newly created vector with specified arguments as elements.
-Any number of arguments, even zero arguments, are allowed.
+Allows any number of arguments, including zero.
 usage: (vector &rest OBJECTS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
@@ -3884,21 +3853,12 @@
   return obj;
 }
 
-/* Put MARKER back on the free list after using it temporarily.  */
-
-void
-free_marker (Lisp_Object marker)
-{
-  unchain_marker (XMARKER (marker));
-  free_misc (marker);
-}
-
 
 /* Return a newly created vector or string with specified arguments as
    elements.  If all the arguments are characters that can fit
    in a string of events, make a string; otherwise, make a vector.
 
-   Any number of arguments, even zero arguments, are allowed.  */
+   Allows any number of arguments, including zero.  */
 
 Lisp_Object
 make_event_array (ptrdiff_t nargs, Lisp_Object *args)
@@ -6043,6 +6003,8 @@
   VECTOR_UNMARK (&buffer_defaults);
   VECTOR_UNMARK (&buffer_local_symbols);
 
+  unmark_main_thread ();
+
   check_cons_list ();
 
   gc_in_progress = 0;
@@ -6343,12 +6305,8 @@
 {
   struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr);
   Lisp_Object where = blv->where;
-  /* If the value is set up for a killed buffer or deleted
-     frame, restore its global binding.  If the value is
-     forwarded to a C variable, either it's not a Lisp_Object
-     var, or it's staticpro'd already.  */
-  if ((BUFFERP (where) && !BUFFER_LIVE_P (XBUFFER (where)))
-      || (FRAMEP (where) && !FRAME_LIVE_P (XFRAME (where))))
+  /* If the value is set up for a killed buffer restore its global binding.  */
+  if ((BUFFERP (where) && !BUFFER_LIVE_P (XBUFFER (where))))
     swap_in_global_binding (ptr);
   mark_object (blv->where);
   mark_object (blv->valcell);
diff -Nru emacs-26.1+1/src/atimer.c emacs-26.3+1/src/atimer.c
--- emacs-26.1+1/src/atimer.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/atimer.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Asynchronous timers.
-   Copyright (C) 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/atimer.h emacs-26.3+1/src/atimer.h
--- emacs-26.1+1/src/atimer.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/atimer.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Asynchronous timers.
-   Copyright (C) 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/bidi.c emacs-26.3+1/src/bidi.c
--- emacs-26.1+1/src/bidi.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/bidi.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Low-level bidirectional buffer/string-scanning functions for GNU Emacs.
-   Copyright (C) 2000-2001, 2004-2005, 2009-2018 Free Software
+   Copyright (C) 2000-2001, 2004-2005, 2009-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/blockinput.h emacs-26.3+1/src/blockinput.h
--- emacs-26.1+1/src/blockinput.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/blockinput.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
-   Copyright (C) 1989, 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/buffer.c emacs-26.3+1/src/buffer.c
--- emacs-26.1+1/src/buffer.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/buffer.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Buffer manipulation primitives for GNU Emacs.
 
-Copyright (C) 1985-1989, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -108,7 +108,6 @@
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
                                     bool after, Lisp_Object arg1,
                                     Lisp_Object arg2, Lisp_Object arg3);
-static void swap_out_buffer_local_variables (struct buffer *b);
 static void reset_buffer_local_variables (struct buffer *, bool);
 
 /* Alist of all buffer names vs the buffers.  This used to be
@@ -991,10 +990,29 @@
   else
     {
       Lisp_Object tmp, last = Qnil;
+      Lisp_Object buffer;
+      XSETBUFFER (buffer, b);
+
       for (tmp = BVAR (b, local_var_alist); CONSP (tmp); tmp = XCDR (tmp))
         {
           Lisp_Object local_var = XCAR (XCAR (tmp));
           Lisp_Object prop = Fget (local_var, Qpermanent_local);
+          Lisp_Object sym = local_var;
+
+          /* Watchers are run *before* modifying the var.  */
+          if (XSYMBOL (local_var)->u.s.trapped_write == SYMBOL_TRAPPED_WRITE)
+            notify_variable_watchers (local_var, Qnil,
+                                      Qmakunbound, Fcurrent_buffer ());
+
+          eassert (XSYMBOL (sym)->u.s.redirect == SYMBOL_LOCALIZED);
+          /* Need not do anything if some other buffer's binding is
+	     now cached.  */
+          if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
+	    {
+	      /* Symbol is set up for this buffer's old local value:
+	         swap it out!  */
+	      swap_in_global_binding (XSYMBOL (sym));
+	    }
 
           if (!NILP (prop))
             {
@@ -1034,10 +1052,6 @@
             bset_local_var_alist (b, XCDR (tmp));
           else
             XSETCDR (last, XCDR (tmp));
-
-          if (XSYMBOL (local_var)->u.s.trapped_write == SYMBOL_TRAPPED_WRITE)
-            notify_variable_watchers (local_var, Qnil,
-                                      Qmakunbound, Fcurrent_buffer ());
         }
     }
 
@@ -1867,7 +1881,6 @@
      won't be protected from GC.  They would be protected
      if they happened to remain cached in their symbols.
      This gets rid of them for certain.  */
-  swap_out_buffer_local_variables (b);
   reset_buffer_local_variables (b, 1);
 
   bset_name (b, Qnil);
@@ -2737,11 +2750,6 @@
 {
   run_hook (Qchange_major_mode_hook);
 
-  /* Make sure none of the bindings in local_var_alist
-     remain swapped in, in their symbols.  */
-
-  swap_out_buffer_local_variables (current_buffer);
-
   /* Actually eliminate all local bindings of this buffer.  */
 
   reset_buffer_local_variables (current_buffer, 0);
@@ -2753,31 +2761,6 @@
   return Qnil;
 }
 
-/* Make sure no local variables remain set up with buffer B
-   for their current values.  */
-
-static void
-swap_out_buffer_local_variables (struct buffer *b)
-{
-  Lisp_Object oalist, alist, buffer;
-
-  XSETBUFFER (buffer, b);
-  oalist = BVAR (b, local_var_alist);
-
-  for (alist = oalist; CONSP (alist); alist = XCDR (alist))
-    {
-      Lisp_Object sym = XCAR (XCAR (alist));
-      eassert (XSYMBOL (sym)->u.s.redirect == SYMBOL_LOCALIZED);
-      /* Need not do anything if some other buffer's binding is
-	 now cached.  */
-      if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
-	{
-	  /* Symbol is set up for this buffer's old local value:
-	     swap it out!  */
-	  swap_in_global_binding (XSYMBOL (sym));
-	}
-    }
-}
 
 /* Find all the overlays in the current buffer that contain position POS.
    Return the number found, and store them in a vector in *VEC_PTR.
@@ -4560,23 +4543,6 @@
     Lisp_Object *copy;
     ptrdiff_t i;
 
-    if (size)
-      {
-	Lisp_Object ovl
-	  = XVECTOR (last_overlay_modification_hooks)->contents[1];
-
-	/* If the buffer of the first overlay in the array doesn't
-	   match the current buffer, then these modification hooks
-	   should not be run in this buffer.  This could happen when
-	   some code calls some insdel functions, such as del_range_1,
-	   with the PREPARE argument false -- in that case this
-	   function is never called to record the overlay modification
-	   hook functions in the last_overlay_modification_hooks
-	   array, so anything we find there is not ours.  */
-	if (XMARKER (OVERLAY_START (ovl))->buffer != current_buffer)
-	  return;
-      }
-
     USE_SAFE_ALLOCA;
     SAFE_ALLOCA_LISP (copy, size);
     memcpy (copy, XVECTOR (last_overlay_modification_hooks)->contents,
@@ -4587,7 +4553,12 @@
 	Lisp_Object prop_i, overlay_i;
 	prop_i = copy[i++];
 	overlay_i = copy[i++];
-	call_overlay_mod_hooks (prop_i, overlay_i, after, arg1, arg2, arg3);
+	/* It is possible that the recorded overlay has been deleted
+	   (which makes it's markers' buffers be nil), or that (due to
+	   some bug) it belongs to a different buffer.  Only run this
+	   hook if the overlay belongs to the current buffer.  */
+	if (XMARKER (OVERLAY_START (overlay_i))->buffer == current_buffer)
+	  call_overlay_mod_hooks (prop_i, overlay_i, after, arg1, arg2, arg3);
       }
 
     SAFE_FREE ();
@@ -5655,7 +5626,11 @@
 
   DEFVAR_PER_BUFFER ("bidi-display-reordering",
 		     &BVAR (current_buffer, bidi_display_reordering), Qnil,
-		     doc: /* Non-nil means reorder bidirectional text for display in the visual order.  */);
+		     doc: /* Non-nil means reorder bidirectional text for display in the visual order.
+Setting this to nil is intended for use in debugging the display code.
+Don't set to nil in normal sessions, as that is not supported.
+See also `bidi-paragraph-direction'; setting that non-nil might
+speed up redisplay.  */);
 
   DEFVAR_PER_BUFFER ("bidi-paragraph-start-re",
 		     &BVAR (current_buffer, bidi_paragraph_start_re), Qnil,
@@ -6265,9 +6240,11 @@
 
   DEFVAR_LISP ("buffer-list-update-hook", Vbuffer_list_update_hook,
 	       doc: /* Hook run when the buffer list changes.
-Functions running this hook are, `get-buffer-create',
-`make-indirect-buffer', `rename-buffer', `kill-buffer',
-`bury-buffer-internal' and `select-window'.  */);
+Functions (implicitly) running this hook are `get-buffer-create',
+`make-indirect-buffer', `rename-buffer', `kill-buffer', `bury-buffer'
+and `select-window'.  Functions run by this hook should avoid calling
+`select-window' with a nil NORECORD argument or `with-temp-buffer'
+since either may lead to infinite recursion.  */);
   Vbuffer_list_update_hook = Qnil;
   DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook");
 
diff -Nru emacs-26.1+1/src/buffer.h emacs-26.3+1/src/buffer.h
--- emacs-26.1+1/src/buffer.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/buffer.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Header file for the buffer manipulation primitives.
 
-Copyright (C) 1985-1986, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1986, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/bytecode.c emacs-26.3+1/src/bytecode.c
--- emacs-26.1+1/src/bytecode.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/bytecode.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Execution of byte code produced by bytecomp.el.
-   Copyright (C) 1985-1988, 1993, 2000-2018 Free Software Foundation,
+   Copyright (C) 1985-1988, 1993, 2000-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
@@ -367,6 +367,7 @@
   SAFE_ALLOCA_LISP_EXTRA (stack_base, stack_items, bytestr_length);
   Lisp_Object *stack_lim = stack_base + stack_items;
   Lisp_Object *top = stack_base;
+  *top = vector; /* Ensure VECTOR survives GC (Bug#33014).  */
   memcpy (stack_lim, SDATA (bytestr), bytestr_length);
   void *void_stack_lim = stack_lim;
   unsigned char const *bytestr_data = void_stack_lim;
diff -Nru emacs-26.1+1/src/callint.c emacs-26.3+1/src/callint.c
--- emacs-26.1+1/src/callint.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/callint.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Call a Lisp function interactively.
-   Copyright (C) 1985-1986, 1993-1995, 1997, 2000-2018 Free Software
+   Copyright (C) 1985-1986, 1993-1995, 1997, 2000-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/callproc.c emacs-26.3+1/src/callproc.c
--- emacs-26.1+1/src/callproc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/callproc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
 
-Copyright (C) 1985-1988, 1993-1995, 1999-2018 Free Software Foundation,
+Copyright (C) 1985-1988, 1993-1995, 1999-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -220,19 +220,24 @@
 DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
        doc: /* Call PROGRAM synchronously in separate process.
 The remaining arguments are optional.
-The program's input comes from file INFILE (nil means `/dev/null').
-Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION
- means discard it; 0 means discard and don't wait; and `(:file FILE)', where
- FILE is a file name string, means that it should be written to that file
- (if the file already exists it is overwritten).
+The program's input comes from file INFILE (nil means `null-device').
+
+Third argument DESTINATION specifies how to handle program's output.
+If DESTINATION is a buffer, or t that stands for the current buffer,
+ it means insert output in that buffer before point.
+If DESTINATION is nil, it means discard output; 0 means discard
+ and don't wait for the program to terminate.
+If DESTINATION is `(:file FILE)', where FILE is a file name string,
+ it means that output should be written to that file (if the file
+ already exists it is overwritten).
 DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case,
-REAL-BUFFER says what to do with standard output, as above,
-while STDERR-FILE says what to do with standard error in the child.
-STDERR-FILE may be nil (discard standard error output),
-t (mix it with ordinary output), or a file name string.
+ REAL-BUFFER says what to do with standard output, as above,
+ while STDERR-FILE says what to do with standard error in the child.
+ STDERR-FILE may be nil (discard standard error output),
+ t (mix it with ordinary output), or a file name string.
 
 Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted.
-Remaining arguments are strings passed as command arguments to PROGRAM.
+Remaining arguments ARGS are strings passed as command arguments to PROGRAM.
 
 If executable PROGRAM can't be found as an executable, `call-process'
 signals a Lisp error.  `call-process' reports errors in execution of
@@ -1043,7 +1048,8 @@
 t (mix it with ordinary output), or a file name string.
 
 Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted.
-Remaining args are passed to PROGRAM at startup as command args.
+Remaining arguments ARGS are passed to PROGRAM at startup as command-line
+arguments.
 
 If BUFFER is 0, `call-process-region' returns immediately with value nil.
 Otherwise it waits for PROGRAM to terminate
diff -Nru emacs-26.1+1/src/casefiddle.c emacs-26.3+1/src/casefiddle.c
--- emacs-26.1+1/src/casefiddle.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/casefiddle.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* -*- coding: utf-8 -*- */
 /* GNU Emacs case conversion functions.
 
-Copyright (C) 1985, 1994, 1997-1999, 2001-2018 Free Software Foundation,
+Copyright (C) 1985, 1994, 1997-1999, 2001-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/casetab.c emacs-26.3+1/src/casetab.c
--- emacs-26.1+1/src/casetab.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/casetab.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU Emacs routines to deal with case tables.
-   Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 Author: Howard Gayle
 
diff -Nru emacs-26.1+1/src/category.c emacs-26.3+1/src/category.c
--- emacs-26.1+1/src/category.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/category.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* GNU Emacs routines to deal with category tables.
 
-Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/src/ccl.c emacs-26.3+1/src/ccl.c
--- emacs-26.1+1/src/ccl.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ccl.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* CCL (Code Conversion Language) interpreter.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/src/ChangeLog.1 emacs-26.3+1/src/ChangeLog.1
--- emacs-26.1+1/src/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -3521,7 +3521,7 @@
 	* minibuf.c: Don't allow entry to minibuffer
 	while minibuffer is selected.
 
-    Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.10 emacs-26.3+1/src/ChangeLog.10
--- emacs-26.1+1/src/ChangeLog.10	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.10	2019-09-10 00:32:49.000000000 +0000
@@ -27912,7 +27912,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.11 emacs-26.3+1/src/ChangeLog.11
--- emacs-26.1+1/src/ChangeLog.11	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.11	2019-09-10 00:32:49.000000000 +0000
@@ -23186,7 +23186,7 @@
 	Delete argument prop_index.
 	(font_property_table): Change arguments to validator.  Change Callers.
 	(font_lispy_object): Delete.
-	(font_at): Use font_find_object instead fo font_lispy_object.
+	(font_at): Use font_find_object instead of font_lispy_object.
 
 2008-02-01  Kenichi Handa  <handa@ni.aist.go.jp>
 
@@ -31385,7 +31385,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2018 Free Software Foundation, Inc.
+  Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.12 emacs-26.3+1/src/ChangeLog.12
--- emacs-26.1+1/src/ChangeLog.12	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.12	2019-09-10 00:32:49.000000000 +0000
@@ -22936,7 +22936,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2018 Free Software Foundation, Inc.
+  Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.13 emacs-26.3+1/src/ChangeLog.13
--- emacs-26.1+1/src/ChangeLog.13	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.13	2019-09-10 00:32:49.000000000 +0000
@@ -17905,7 +17905,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2018 Free Software Foundation, Inc.
+  Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.2 emacs-26.3+1/src/ChangeLog.2
--- emacs-26.1+1/src/ChangeLog.2	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.2	2019-09-10 00:32:49.000000000 +0000
@@ -4771,7 +4771,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986-1988, 2001-2018 Free Software Foundation, Inc.
+    Copyright (C) 1986-1988, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.3 emacs-26.3+1/src/ChangeLog.3
--- emacs-26.1+1/src/ChangeLog.3	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.3	2019-09-10 00:32:49.000000000 +0000
@@ -16503,7 +16503,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.4 emacs-26.3+1/src/ChangeLog.4
--- emacs-26.1+1/src/ChangeLog.4	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.4	2019-09-10 00:32:49.000000000 +0000
@@ -5135,7 +5135,7 @@
 	(BSTRING): Deleted because they are stubs to the memory funcs.
 	(memmove): Defined as safe_bcopy since memcpy is not safe.
 	(HAVE_X_WINDOWS): Does not conditionally define anything any more.
-	Added support fo the GNU C compiler bundled with R3V7.
+	Added support for the GNU C compiler bundled with R3V7.
 
 1993-07-26  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -6906,7 +6906,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.5 emacs-26.3+1/src/ChangeLog.5
--- emacs-26.1+1/src/ChangeLog.5	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.5	2019-09-10 00:32:49.000000000 +0000
@@ -7148,7 +7148,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.6 emacs-26.3+1/src/ChangeLog.6
--- emacs-26.1+1/src/ChangeLog.6	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.6	2019-09-10 00:32:49.000000000 +0000
@@ -5358,7 +5358,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1995-1996, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.7 emacs-26.3+1/src/ChangeLog.7
--- emacs-26.1+1/src/ChangeLog.7	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.7	2019-09-10 00:32:49.000000000 +0000
@@ -11091,7 +11091,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1997-1998, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1997-1998, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.8 emacs-26.3+1/src/ChangeLog.8
--- emacs-26.1+1/src/ChangeLog.8	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.8	2019-09-10 00:32:49.000000000 +0000
@@ -13979,7 +13979,7 @@
 
 See ChangeLog.7 for earlier changes.
 
-  Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ChangeLog.9 emacs-26.3+1/src/ChangeLog.9
--- emacs-26.1+1/src/ChangeLog.9	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ChangeLog.9	2019-09-10 00:32:49.000000000 +0000
@@ -13294,7 +13294,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/character.c emacs-26.3+1/src/character.c
--- emacs-26.1+1/src/character.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/character.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Basic character support.
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
   Licensed to the Free Software Foundation.
 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -34,6 +34,7 @@
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
+#include "dispextern.h"
 #include "composite.h"
 #include "disptab.h"
 
@@ -288,10 +289,15 @@
       if (VECTORP (disp))
 	for (i = 0, width = 0; i < ASIZE (disp); i++)
 	  {
+	    int c = -1;
 	    ch = AREF (disp, i);
-	    if (CHARACTERP (ch))
+	    if (GLYPH_CODE_P (ch))
+	      c = GLYPH_CODE_CHAR (ch);
+	    else if (CHARACTERP (ch))
+	      c = XFASTINT (ch);
+	    if (c >= 0)
 	      {
-		int w = CHARACTER_WIDTH (XFASTINT (ch));
+		int w = CHARACTER_WIDTH (c);
 		if (INT_ADD_WRAPV (width, w, &width))
 		  string_overflow ();
 	      }
diff -Nru emacs-26.1+1/src/character.h emacs-26.3+1/src/character.h
--- emacs-26.1+1/src/character.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/character.h	2019-09-10 00:32:49.000000000 +0000
@@ -57,7 +57,8 @@
 
 /* Minimum leading code of multibyte characters.  */
 #define MIN_MULTIBYTE_LEADING_CODE 0xC0
-/* Maximum leading code of multibyte characters.  */
+/* Maximum leading code of multibyte characters.  Note: this must be
+   updated if we ever increase MAX_CHAR above.  */
 #define MAX_MULTIBYTE_LEADING_CODE 0xF8
 
 /* Unicode character values.  */
diff -Nru emacs-26.1+1/src/charset.c emacs-26.3+1/src/charset.c
--- emacs-26.1+1/src/charset.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/charset.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Basic character set support.
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010, 2011
diff -Nru emacs-26.1+1/src/charset.h emacs-26.3+1/src/charset.h
--- emacs-26.1+1/src/charset.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/charset.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Header for charset handler.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/src/cm.c emacs-26.3+1/src/cm.c
--- emacs-26.1+1/src/cm.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/cm.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Cursor motion subroutines for GNU Emacs.
-   Copyright (C) 1985, 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001-2019 Free Software Foundation, Inc.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/cmds.c emacs-26.3+1/src/cmds.c
--- emacs-26.1+1/src/cmds.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/cmds.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Simple built-in editing commands.
 
-Copyright (C) 1985, 1993-1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1998, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/cm.h emacs-26.3+1/src/cm.h
--- emacs-26.1+1/src/cm.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/cm.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/coding.c emacs-26.3+1/src/coding.c
--- emacs-26.1+1/src/coding.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/coding.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Coding system handler (conversion, detection, etc).
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
@@ -1225,7 +1225,10 @@
       ONE_MORE_BYTE (c4);
       if (c4 < 0 || ! UTF_8_EXTRA_OCTET_P (c4))
 	break;
-      if (UTF_8_5_OCTET_LEADING_P (c))
+      if (UTF_8_5_OCTET_LEADING_P (c)
+	  /* If we ever need to increase MAX_CHAR, the below may need
+	     to be reviewed.  */
+	  && c < MAX_MULTIBYTE_LEADING_CODE)
 	{
 	  nchars++;
 	  continue;
@@ -1515,13 +1518,6 @@
 /* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions".
    Return true if a text is encoded in one of UTF-16 based coding systems.  */
 
-#define UTF_16_HIGH_SURROGATE_P(val) \
-  (((val) & 0xFC00) == 0xD800)
-
-#define UTF_16_LOW_SURROGATE_P(val) \
-  (((val) & 0xFC00) == 0xDC00)
-
-
 static bool
 detect_coding_utf_16 (struct coding_system *coding,
 		      struct coding_detection_info *detect_info)
@@ -7786,15 +7782,22 @@
   SAFE_FREE ();
 }
 
+/* Code-conversion operations use internal buffers.  There's a single
+   reusable buffer, which is created the first time it is needed, and
+   then never killed.  When this reusable buffer is being used, the
+   reused_workbuf_in_use flag is set.  If we need another conversion
+   buffer while the reusable one is in use (e.g., if code-conversion
+   is reentered when another code-conversion is in progress), we
+   create temporary buffers using the name of the reusable buffer as
+   the base name, see code_conversion_save below.  These temporary
+   buffers are killed when the code-conversion operations that use
+   them return, see code_conversion_restore below.  */
 
-/* Name (or base name) of work buffer for code conversion.  */
+/* A string that serves as name of the reusable work buffer, and as base
+   name of temporary work buffers used for code-conversion operations.  */
 static Lisp_Object Vcode_conversion_workbuf_name;
 
-/* A working buffer used by the top level conversion.  Once it is
-   created, it is never destroyed.  It has the name
-   Vcode_conversion_workbuf_name.  The other working buffers are
-   destroyed after the use is finished, and their names are modified
-   versions of Vcode_conversion_workbuf_name.  */
+/* The reusable working buffer, created once and never killed.  */
 static Lisp_Object Vcode_conversion_reused_workbuf;
 
 /* True iff Vcode_conversion_reused_workbuf is already in use.  */
@@ -9211,22 +9214,22 @@
 
 DEFUN ("check-coding-systems-region", Fcheck_coding_systems_region,
        Scheck_coding_systems_region, 3, 3, 0,
-       doc: /* Check if the region is encodable by coding systems.
+       doc: /* Check if text between START and END is encodable by CODING-SYSTEM-LIST.
 
 START and END are buffer positions specifying the region.
 CODING-SYSTEM-LIST is a list of coding systems to check.
 
-The value is an alist ((CODING-SYSTEM POS0 POS1 ...) ...), where
-CODING-SYSTEM is a member of CODING-SYSTEM-LIST and can't encode the
-whole region, POS0, POS1, ... are buffer positions where non-encodable
-characters are found.
-
 If all coding systems in CODING-SYSTEM-LIST can encode the region, the
-value is nil.
+function returns nil.
+
+If some of the coding systems cannot encode the whole region, value is
+an alist, each element of which has the form (CODING-SYSTEM POS1 POS2 ...),
+which means that CODING-SYSTEM cannot encode the text at buffer positions
+POS1, POS2, ...
 
 START may be a string.  In that case, check if the string is
-encodable, and the value contains indices to the string instead of
-buffer positions.  END is ignored.
+encodable, and the value contains character indices into the string
+instead of buffer positions.  END is ignored in this case.
 
 If the current buffer (or START if it is a string) is unibyte, the value
 is nil.  */)
@@ -9395,7 +9398,8 @@
 Optional 4th arguments DESTINATION specifies where the decoded text goes.
 If nil, the region between START and END is replaced by the decoded text.
 If buffer, the decoded text is inserted in that buffer after point (point
-does not move).
+does not move).  If that buffer is unibyte, it receives the individual
+bytes of the internal representation of the decoded text.
 In those cases, the length of the decoded text is returned.
 If DESTINATION is t, the decoded text is returned.
 
@@ -9553,7 +9557,9 @@
 
 Optional fourth arg BUFFER non-nil means that the decoded text is
 inserted in that buffer after point (point does not move).  In this
-case, the return value is the length of the decoded text.
+case, the return value is the length of the decoded text.  If that
+buffer is unibyte, it receives the individual bytes of the internal
+representation of the decoded text.
 
 This function sets `last-coding-system-used' to the precise coding system
 used (which may be different from CODING-SYSTEM if CODING-SYSTEM is
diff -Nru emacs-26.1+1/src/coding.h emacs-26.3+1/src/coding.h
--- emacs-26.1+1/src/coding.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/coding.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Header for coding system handler.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
@@ -28,6 +28,8 @@
 
 #include "lisp.h"
 
+INLINE_HEADER_BEGIN
+
 /* Index to arguments of Fdefine_coding_system_internal.  */
 
 enum define_coding_system_arg_index
@@ -448,7 +450,7 @@
 
   unsigned char *safe_charsets;
 
-  /* How may heading bytes we can skip for decoding.  This is set to
+  /* How many heading bytes we can skip for decoding.  This is set to
      -1 in setup_coding_system, and updated by detect_coding.  So,
      when this is equal to the byte length of the text being
      converted, we can skip the actual conversion process except for
@@ -662,6 +664,30 @@
 /* Note that this encodes utf-8, not utf-8-emacs, so it's not a no-op.  */
 #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, true)
 
+/* Return true if VAL is a high surrogate.  VAL must be a 16-bit code
+   unit.  */
+
+#define UTF_16_HIGH_SURROGATE_P(val) \
+  (((val) & 0xFC00) == 0xD800)
+
+/* Return true if VAL is a low surrogate.  VAL must be a 16-bit code
+   unit.  */
+
+#define UTF_16_LOW_SURROGATE_P(val) \
+  (((val) & 0xFC00) == 0xDC00)
+
+/* Return the Unicode code point for the given UTF-16 surrogates.  */
+
+INLINE int
+surrogates_to_codepoint (int low, int high)
+{
+  eassert (0 <= low && low <= 0xFFFF);
+  eassert (0 <= high && high <= 0xFFFF);
+  eassert (UTF_16_LOW_SURROGATE_P (low));
+  eassert (UTF_16_HIGH_SURROGATE_P (high));
+  return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400);
+}
+
 /* Extern declarations.  */
 extern Lisp_Object code_conversion_save (bool, bool);
 extern bool encode_coding_utf_8 (struct coding_system *);
@@ -744,4 +770,6 @@
 
 extern char emacs_mule_bytes[256];
 
+INLINE_HEADER_END
+
 #endif /* EMACS_CODING_H */
diff -Nru emacs-26.1+1/src/commands.h emacs-26.3+1/src/commands.h
--- emacs-26.1+1/src/commands.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/commands.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions needed by most editing commands.
-   Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/composite.c emacs-26.3+1/src/composite.c
--- emacs-26.1+1/src/composite.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/composite.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Composite sequence support.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
diff -Nru emacs-26.1+1/src/composite.h emacs-26.3+1/src/composite.h
--- emacs-26.1+1/src/composite.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/composite.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Header for composite sequence handler.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
diff -Nru emacs-26.1+1/src/conf_post.h emacs-26.3+1/src/conf_post.h
--- emacs-26.1+1/src/conf_post.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/conf_post.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* conf_post.h --- configure.ac includes this via AH_BOTTOM
 
-Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2018 Free Software
+Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -48,9 +48,11 @@
 #endif
 
 /* The type of bool bitfields.  Needed to compile Objective-C with
-   standard GCC.  It was also needed to port to pre-C99 compilers,
-   although we don't care about that any more.  */
-#if NS_IMPL_GNUSTEP
+   standard GCC, and to make sure adjacent bool_bf fields are packed
+   into the same 1-, 2-, or 4-byte allocation unit in the MinGW
+   builds.  It was also needed to port to pre-C99 compilers, although
+   we don't care about that any more.  */
+#if NS_IMPL_GNUSTEP || defined(__MINGW32__)
 typedef unsigned int bool_bf;
 #else
 typedef bool bool_bf;
diff -Nru emacs-26.1+1/src/cygw32.c emacs-26.3+1/src/cygw32.c
--- emacs-26.1+1/src/cygw32.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/cygw32.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Cygwin support routines.
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/cygw32.h emacs-26.3+1/src/cygw32.h
--- emacs-26.1+1/src/cygw32.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/cygw32.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Header for Cygwin support routines.
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/data.c emacs-26.3+1/src/data.c
--- emacs-26.1+1/src/data.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/data.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2018 Free Software
+   Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -276,10 +276,12 @@
           }
         case PVEC_MODULE_FUNCTION:
           return Qmodule_function;
-        /* "Impossible" cases.  */
         case PVEC_XWIDGET:
-        case PVEC_OTHER:
+          return Qxwidget;
         case PVEC_XWIDGET_VIEW:
+          return Qxwidget_view;
+        /* "Impossible" cases.  */
+        case PVEC_OTHER:
         case PVEC_SUB_CHAR_TABLE:
         case PVEC_FREE: ;
         }
@@ -344,8 +346,6 @@
   return Qnil;
 }
 
-/* Define this in C to avoid unnecessarily consing up the symbol
-   name.  */
 DEFUN ("keywordp", Fkeywordp, Skeywordp, 1, 1, 0,
        doc: /* Return t if OBJECT is a keyword.
 This means that it is a symbol with a print name beginning with `:'
@@ -1188,7 +1188,7 @@
 
   /* Indicate that the global binding is set up now.  */
   set_blv_where (blv, Qnil);
-  set_blv_found (blv, 0);
+  set_blv_found (blv, false);
 }
 
 /* Set up the buffer-local symbol SYMBOL for validity in the current buffer.
@@ -1257,7 +1257,6 @@
 	swap_in_symval_forwarding (sym, blv);
 	return blv->fwd ? do_symval_forwarding (blv->fwd) : blv_value (blv);
       }
-      /* FALLTHROUGH */
     case SYMBOL_FORWARDED:
       return do_symval_forwarding (SYMBOL_FWD (sym));
     default: emacs_abort ();
@@ -1366,7 +1365,7 @@
 	    tem1 = assq_no_quit (symbol,
 				 BVAR (XBUFFER (where), local_var_alist));
 	    set_blv_where (blv, where);
-	    blv->found = 1;
+	    blv->found = true;
 
 	    if (NILP (tem1))
 	      {
@@ -1381,7 +1380,7 @@
 		if (bindflag || !blv->local_if_set
 		    || let_shadows_buffer_binding_p (sym))
 		  {
-		    blv->found = 0;
+		    blv->found = false;
 		    tem1 = blv->defcell;
 		  }
 		/* If it's a local_if_set, being set not bound,
@@ -1796,7 +1795,7 @@
   blv->local_if_set = 0;
   set_blv_defcell (blv, tem);
   set_blv_valcell (blv, tem);
-  set_blv_found (blv, 0);
+  set_blv_found (blv, false);
   return blv;
 }
 
@@ -1946,30 +1945,27 @@
 	  CALLN (Fmessage, format, SYMBOL_NAME (variable));
 	}
 
-      /* Swap out any local binding for some other buffer, and make
-	 sure the current value is permanently recorded, if it's the
-	 default value.  */
-      find_symbol_value (variable);
+      if (BUFFERP (blv->where) && current_buffer == XBUFFER (blv->where))
+        /* Make sure the current value is permanently recorded, if it's the
+           default value.  */
+        swap_in_global_binding (sym);
 
       bset_local_var_alist
 	(current_buffer,
 	 Fcons (Fcons (variable, XCDR (blv->defcell)),
 		BVAR (current_buffer, local_var_alist)));
 
-      /* Make sure symbol does not think it is set up for this buffer;
-	 force it to look once again for this buffer's value.  */
-      if (current_buffer == XBUFFER (blv->where))
-	set_blv_where (blv, Qnil);
-      set_blv_found (blv, 0);
+      /* If the symbol forwards into a C variable, then load the binding
+         for this buffer now, to preserve the invariant that forwarded
+         variables must always hold the value corresponding to the
+         current buffer (they are swapped eagerly).
+         Otherwise, if C code modifies the variable before we load the
+         binding in, then that new value would clobber the default binding
+         the next time we unload it.  See bug#34318.  */
+      if (blv->fwd)
+        swap_in_symval_forwarding (sym, blv);
     }
 
-  /* If the symbol forwards into a C variable, then load the binding
-     for this buffer now.  If C code modifies the variable before we
-     load the binding in, then that new value will clobber the default
-     binding the next time we unload it.  */
-  if (blv->fwd)
-    swap_in_symval_forwarding (sym, blv);
-
   return variable;
 }
 
@@ -2031,11 +2027,7 @@
   {
     Lisp_Object buf; XSETBUFFER (buf, current_buffer);
     if (EQ (buf, blv->where))
-      {
-	set_blv_where (blv, Qnil);
-	blv->found = 0;
-	find_symbol_value (variable);
-      }
+      swap_in_global_binding (sym);
   }
 
   return variable;
@@ -2429,17 +2421,20 @@
 {
   double f1, f2;
   EMACS_INT i1, i2;
-  bool fneq;
+  bool lt, eq, gt;
   bool test;
 
   CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1);
   CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2);
 
   /* If either arg is floating point, set F1 and F2 to the 'double'
-     approximations of the two arguments, and set FNEQ if floating-point
-     comparison reports that F1 is not equal to F2, possibly because F1
-     or F2 is a NaN.  Regardless, set I1 and I2 to integers that break
-     ties if the floating-point comparison is either not done or reports
+     approximations of the two arguments, and set LT, EQ, and GT to
+     the <, ==, > floating-point comparisons of F1 and F2
+     respectively, taking care to avoid problems if either is a NaN,
+     and trying to avoid problems on platforms where variables (in
+     violation of the C standard) can contain excess precision.
+     Regardless, set I1 and I2 to integers that break ties if the
+     floating-point comparison is either not done or reports
      equality.  */
 
   if (FLOATP (num1))
@@ -2462,7 +2457,9 @@
 	     to I2 will break the tie correctly.  */
 	  i1 = f2 = i2 = XINT (num2);
 	}
-      fneq = f1 != f2;
+      lt = f1 < f2;
+      eq = f1 == f2;
+      gt = f1 > f2;
     }
   else
     {
@@ -2473,39 +2470,49 @@
 	     converse of comparing float to integer (see above).  */
 	  i2 = f1 = i1;
 	  f2 = XFLOAT_DATA (num2);
-	  fneq = f1 != f2;
+	  lt = f1 < f2;
+	  eq = f1 == f2;
+	  gt = f1 > f2;
 	}
       else
 	{
 	  i2 = XINT (num2);
-	  fneq = false;
+	  eq = true;
 	}
     }
 
+  if (eq)
+    {
+      /* Break a floating-point tie by comparing the integers.  */
+      lt = i1 < i2;
+      eq = i1 == i2;
+      gt = i1 > i2;
+    }
+
   switch (comparison)
     {
     case ARITH_EQUAL:
-      test = !fneq && i1 == i2;
+      test = eq;
       break;
 
     case ARITH_NOTEQUAL:
-      test = fneq || i1 != i2;
+      test = !eq;
       break;
 
     case ARITH_LESS:
-      test = fneq ? f1 < f2 : i1 < i2;
+      test = lt;
       break;
 
     case ARITH_LESS_OR_EQUAL:
-      test = fneq ? f1 <= f2 : i1 <= i2;
+      test = lt | eq;
       break;
 
     case ARITH_GRTR:
-      test = fneq ? f1 > f2 : i1 > i2;
+      test = gt;
       break;
 
     case ARITH_GRTR_OR_EQUAL:
-      test = fneq ? f1 >= f2 : i1 >= i2;
+      test = gt | eq;
       break;
 
     default:
@@ -3737,8 +3744,8 @@
   DEFSYM (Qmarker, "marker");
   DEFSYM (Qoverlay, "overlay");
   DEFSYM (Qfinalizer, "finalizer");
-#ifdef HAVE_MODULES
   DEFSYM (Qmodule_function, "module-function");
+#ifdef HAVE_MODULES
   DEFSYM (Quser_ptr, "user-ptr");
 #endif
   DEFSYM (Qfloat, "float");
@@ -3761,6 +3768,8 @@
   DEFSYM (Qfont_entity, "font-entity");
   DEFSYM (Qfont_object, "font-object");
   DEFSYM (Qterminal, "terminal");
+  DEFSYM (Qxwidget, "xwidget");
+  DEFSYM (Qxwidget_view, "xwidget-view");
 
   DEFSYM (Qdefun, "defun");
 
diff -Nru emacs-26.1+1/src/dbusbind.c emacs-26.3+1/src/dbusbind.c
--- emacs-26.1+1/src/dbusbind.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dbusbind.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Elisp bindings for D-Bus.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -346,7 +346,6 @@
   int subtype;
   Lisp_Object elt;
   char const *subsig;
-  int subsiglen;
   char x[DBUS_MAXIMUM_SIGNATURE_LENGTH];
 
   elt = object;
@@ -428,10 +427,9 @@
 	  elt = CDR_SAFE (XD_NEXT_VALUE (elt));
 	}
 
-      subsiglen = snprintf (signature, DBUS_MAXIMUM_SIGNATURE_LENGTH,
-			    "%c%s", dtype, subsig);
-      if (! (0 <= subsiglen && subsiglen < DBUS_MAXIMUM_SIGNATURE_LENGTH))
-	string_overflow ();
+      signature[0] = dtype;
+      signature[1] = '\0';
+      xd_signature_cat (signature, subsig);
       break;
 
     case DBUS_TYPE_VARIANT:
@@ -1419,7 +1417,7 @@
   for (; count < nargs; ++count)
     {
       dtype = XD_OBJECT_TO_DBUS_TYPE (args[count]);
-      if (XD_DBUS_TYPE_P (args[count]))
+      if (count + 1 < nargs && XD_DBUS_TYPE_P (args[count]))
 	{
 	  XD_DEBUG_VALID_LISP_OBJECT_P (args[count]);
 	  XD_DEBUG_VALID_LISP_OBJECT_P (args[count+1]);
diff -Nru emacs-26.1+1/src/decompress.c emacs-26.3+1/src/decompress.c
--- emacs-26.1+1/src/decompress.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/decompress.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface to zlib.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/deps.mk emacs-26.3+1/src/deps.mk
--- emacs-26.1+1/src/deps.mk	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/deps.mk	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### deps.mk --- src/Makefile fragment for GNU Emacs
 
-## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2018 Free Software
+## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2019 Free Software
 ## Foundation, Inc.
 
 ## This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/dired.c emacs-26.3+1/src/dired.c
--- emacs-26.1+1/src/dired.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dired.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Lisp functions for making directory listings.
-   Copyright (C) 1985-1986, 1993-1994, 1999-2018 Free Software
+   Copyright (C) 1985-1986, 1993-1994, 1999-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -358,7 +358,14 @@
 DEFUN ("directory-files-and-attributes", Fdirectory_files_and_attributes,
        Sdirectory_files_and_attributes, 1, 5, 0,
        doc: /* Return a list of names of files and their attributes in DIRECTORY.
-There are four optional arguments:
+Value is a list of the form:
+
+  ((FILE1 FILE1-ATTRS) (FILE2 FILE2-ATTRS) ...)
+
+where each FILEn-ATTRS is the attributes of FILEn as returned
+by `file-attributes'.
+
+This function accepts four optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
  that are relative to the specified directory.
 If MATCH is non-nil, mention only file names that match the regexp MATCH.
diff -Nru emacs-26.1+1/src/dispextern.h emacs-26.3+1/src/dispextern.h
--- emacs-26.1+1/src/dispextern.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dispextern.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Interface definitions for display code.
 
-Copyright (C) 1985, 1993-1994, 1997-2018 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1994, 1997-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2462,6 +2462,10 @@
      descent/ascent (line-height property).  Reset after this glyph.  */
   bool_bf constrain_row_ascent_descent_p : 1;
 
+  /* If true, glyphs for line number display were already produced for
+     the current row.  */
+  bool_bf line_number_produced_p : 1;
+
   enum line_wrap_method line_wrap;
 
   /* The ID of the default face to use.  One of DEFAULT_FACE_ID,
@@ -2641,6 +2645,12 @@
   /* The line number of point's line, or zero if not computed yet.  */
   ptrdiff_t pt_lnum;
 
+  /* Number of pixels to offset tab stops due to width fixup of the
+     first glyph that crosses first_visible_x.  This is only needed on
+     GUI frames, only when display-line-numbers is in effect, and only
+     in hscrolled windows.  */
+  int tab_offset;
+
   /* Left fringe bitmap number (enum fringe_bitmap_type).  */
   unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
 
diff -Nru emacs-26.1+1/src/dispnew.c emacs-26.3+1/src/dispnew.c
--- emacs-26.1+1/src/dispnew.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dispnew.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Updating of data structures for redisplay.
 
-Copyright (C) 1985-1988, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1988, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -4125,7 +4125,12 @@
     }
 
 #ifdef HAVE_XWIDGETS
-  /* Currently this seems needed to detect xwidget movement reliably. */
+  /* Currently this seems needed to detect xwidget movement reliably.
+     This is most probably because an xwidget glyph is represented in
+     struct glyph's 'union u' by a pointer to a struct, which takes 8
+     bytes in 64-bit builds, and thus the comparison of u.val values
+     done by GLYPH_EQUAL_P doesn't work reliably, since it assumes the
+     size of the union is 4 bytes.  FIXME.  */
     return 0;
 #endif
 
@@ -5092,13 +5097,15 @@
  ***********************************************************************/
 
 /* Determine what's under window-relative pixel position (*X, *Y).
-   Return the OBJECT (string or buffer) that's there.
+   Return the object (string or buffer) that's there.
    Return in *POS the position in that object.
    Adjust *X and *Y to character positions.
+   If an image is shown at the specified position, return
+   in *OBJECT its image-spec.
    Return in *DX and *DY the pixel coordinates of the click,
-   relative to the top left corner of OBJECT, or relative to
+   relative to the top left corner of object, or relative to
    the top left corner of the character glyph at (*X, *Y)
-   if OBJECT is nil.
+   if the object at (*X, *Y) is nil.
    Return WIDTH and HEIGHT of the object at (*X, *Y), or zero
    if the coordinates point to an empty area of the display.  */
 
@@ -5208,6 +5215,11 @@
 #ifdef HAVE_WINDOW_SYSTEM
   if (it.what == IT_IMAGE)
     {
+      /* Note that this ignores images that are fringe bitmaps,
+	 because their image ID is zero, and so IMAGE_OPT_FROM_ID will
+	 return NULL.  This is okay, since fringe bitmaps are not
+	 displayed in the text area, and so are never the object we
+	 are interested in.  */
       img = IMAGE_OPT_FROM_ID (it.f, it.image_id);
       if (img && !NILP (img->spec))
 	*object = img->spec;
@@ -6105,6 +6117,7 @@
 
     t->reference_count++;
 #ifdef MSDOS
+    f->output_data.tty = &the_only_tty_output;
     f->output_data.tty->display_info = &the_only_display_info;
 #else
     if (f->output_method == output_termcap)
diff -Nru emacs-26.1+1/src/disptab.h emacs-26.3+1/src/disptab.h
--- emacs-26.1+1/src/disptab.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/disptab.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/doc.c emacs-26.3+1/src/doc.c
--- emacs-26.1+1/src/doc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/doc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Record indices of function doc strings stored in a file. -*- coding: utf-8 -*-
 
-Copyright (C) 1985-1986, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1986, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/doprnt.c emacs-26.3+1/src/doprnt.c
--- emacs-26.1+1/src/doprnt.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/doprnt.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Output like sprintf to a buffer of specified size.    -*- coding: utf-8 -*-
    Also takes args differently: pass one pointer to the end
    of the format string in addition to the format string itself.
-   Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/dosfns.c emacs-26.3+1/src/dosfns.c
--- emacs-26.1+1/src/dosfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dosfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* MS-DOS specific Lisp utilities.  Coded by Manabu Higashida, 1991.
    Major changes May-July 1993 Morten Welinder (only 10% original code left)
-   Copyright (C) 1991, 1993, 1996-1998, 2001-2018 Free Software
+   Copyright (C) 1991, 1993, 1996-1998, 2001-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/dosfns.h emacs-26.3+1/src/dosfns.h
--- emacs-26.1+1/src/dosfns.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dosfns.h	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
    Coded by Manabu Higashida, 1991.
    Modified by Morten Welinder, 1993-1994.
 
-Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2018 Free Software
+Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/dynlib.c emacs-26.3+1/src/dynlib.c
--- emacs-26.1+1/src/dynlib.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dynlib.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Portable API for dynamic loading.
 
-Copyright 2015-2018 Free Software Foundation, Inc.
+Copyright 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/dynlib.h emacs-26.3+1/src/dynlib.h
--- emacs-26.1+1/src/dynlib.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/dynlib.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Portable API for dynamic loading.
 
-Copyright 2015-2018 Free Software Foundation, Inc.
+Copyright 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/editfns.c emacs-26.3+1/src/editfns.c
--- emacs-26.1+1/src/editfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/editfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Lisp functions pertaining to editing.                 -*- coding: utf-8 -*-
 
-Copyright (C) 1985-1987, 1989, 1993-2018 Free Software Foundation, Inc.
+Copyright (C) 1985-1987, 1989, 1993-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3115,6 +3115,9 @@
 #undef ELEMENT
 #undef EQUAL
 
+/* Counter used to rarely_quit in replace-buffer-contents.  */
+static unsigned short rbc_quitcounter;
+
 #define XVECREF_YVECREF_EQUAL(ctx, xoff, yoff)  \
   buffer_chars_equal ((ctx), (xoff), (yoff))
 
@@ -3124,6 +3127,12 @@
   /* Buffers to compare.  */                    \
   struct buffer *buffer_a;                      \
   struct buffer *buffer_b;                      \
+  /* BEGV of each buffer */			\
+  ptrdiff_t beg_a;				\
+  ptrdiff_t beg_b;				\
+  /* Whether each buffer is unibyte/plain-ASCII or not.  */ \
+  bool a_unibyte;				\
+  bool b_unibyte;				\
   /* Bit vectors recording for each character whether it was deleted
      or inserted.  */                           \
   unsigned char *deletions;                     \
@@ -3147,7 +3156,9 @@
 Interactively, prompt for SOURCE.
 As far as possible the replacement is non-destructive, i.e. existing
 buffer contents, markers, properties, and overlays in the current
-buffer stay intact.  */)
+buffer stay intact.
+Warning: this function can be slow if there's a large number of small
+differences between the two buffers.  */)
   (Lisp_Object source)
 {
   struct buffer *a = current_buffer;
@@ -3200,6 +3211,10 @@
   struct context ctx = {
     .buffer_a = a,
     .buffer_b = b,
+    .beg_a = min_a,
+    .beg_b = min_b,
+    .a_unibyte = BUF_ZV (a) == BUF_ZV_BYTE (a),
+    .b_unibyte = BUF_ZV (b) == BUF_ZV_BYTE (b),
     .deletions = SAFE_ALLOCA (del_bytes),
     .insertions = SAFE_ALLOCA (ins_bytes),
     .fdiag = buffer + size_b + 1,
@@ -3215,12 +3230,26 @@
   /* Since we didn’t define EARLY_ABORT, we should never abort
      early.  */
   eassert (! early_abort);
-  SAFE_FREE ();
+
+  rbc_quitcounter = 0;
 
   Fundo_boundary ();
+  bool modification_hooks_inhibited = false;
   ptrdiff_t count = SPECPDL_INDEX ();
   record_unwind_protect (save_excursion_restore, save_excursion_save ());
 
+  /* We are going to make a lot of small modifications, and having the
+     modification hooks called for each of them will slow us down.
+     Instead, we announce a single modification for the entire
+     modified region.  But don't do that if the caller inhibited
+     modification hooks, because then they don't want that.  */
+  if (!inhibit_modification_hooks)
+    {
+      prepare_to_modify_buffer (BEGV, ZV, NULL);
+      specbind (Qinhibit_modification_hooks, Qt);
+      modification_hooks_inhibited = true;
+    }
+
   ptrdiff_t i = size_a;
   ptrdiff_t j = size_b;
   /* Walk backwards through the lists of changes.  This was also
@@ -3228,6 +3257,9 @@
      walk backwards, we don’t have to keep the positions in sync.  */
   while (i >= 0 || j >= 0)
     {
+      /* Allow the user to quit if this gets too slow.  */
+      rarely_quit (++rbc_quitcounter);
+
       /* Check whether there is a change (insertion or deletion)
          before the current position.  */
       if ((i > 0 && bit_is_set (ctx.deletions, i - 1)) ||
@@ -3240,14 +3272,13 @@
             --i;
 	  while (j > 0 && bit_is_set (ctx.insertions, j - 1))
             --j;
+
+	  rarely_quit (rbc_quitcounter++);
+
           ptrdiff_t beg_a = min_a + i;
           ptrdiff_t beg_b = min_b + j;
-          eassert (beg_a >= BEGV);
-          eassert (beg_b >= BUF_BEGV (b));
           eassert (beg_a <= end_a);
           eassert (beg_b <= end_b);
-          eassert (end_a <= ZV);
-          eassert (end_b <= BUF_ZV (b));
           eassert (beg_a < end_a || beg_b < end_b);
           if (beg_a < end_a)
             del_range (beg_a, end_a);
@@ -3261,8 +3292,17 @@
       --i;
       --j;
     }
+  unbind_to (count, Qnil);
+  SAFE_FREE ();
+  rbc_quitcounter = 0;
+
+  if (modification_hooks_inhibited)
+    {
+      signal_after_change (BEGV, size_a, ZV - BEGV);
+      update_compositions (BEGV, ZV, CHECK_INSIDE);
+    }
 
-  return unbind_to (count, Qnil);
+  return Qnil;
 }
 
 static void
@@ -3288,24 +3328,45 @@
 /* Return true if the characters at position POS_A of buffer
    CTX->buffer_a and at position POS_B of buffer CTX->buffer_b are
    equal.  POS_A and POS_B are zero-based.  Text properties are
-   ignored.  */
+   ignored.
+
+   Implementation note: this function is called inside the inner-most
+   loops of compareseq, so it absolutely must be optimized for speed,
+   every last bit of it.  E.g., each additional use of BEGV or such
+   likes will slow down replace-buffer-contents by dozens of percents,
+   because builtin_lisp_symbol will be called one more time in the
+   innermost loop.  */
 
 static bool
 buffer_chars_equal (struct context *ctx,
                     ptrdiff_t pos_a, ptrdiff_t pos_b)
 {
-  eassert (pos_a >= 0);
-  pos_a += BUF_BEGV (ctx->buffer_a);
-  eassert (pos_a >= BUF_BEGV (ctx->buffer_a));
-  eassert (pos_a < BUF_ZV (ctx->buffer_a));
-
-  eassert (pos_b >= 0);
-  pos_b += BUF_BEGV (ctx->buffer_b);
-  eassert (pos_b >= BUF_BEGV (ctx->buffer_b));
-  eassert (pos_b < BUF_ZV (ctx->buffer_b));
+  pos_a += ctx->beg_a;
+  pos_b += ctx->beg_b;
 
-  return BUF_FETCH_CHAR_AS_MULTIBYTE (ctx->buffer_a, pos_a)
-    == BUF_FETCH_CHAR_AS_MULTIBYTE (ctx->buffer_b, pos_b);
+  /* Allow the user to escape out of a slow compareseq call.  */
+  rarely_quit (++rbc_quitcounter);
+
+  ptrdiff_t bpos_a =
+    ctx->a_unibyte ? pos_a : buf_charpos_to_bytepos (ctx->buffer_a, pos_a);
+  ptrdiff_t bpos_b =
+    ctx->b_unibyte ? pos_b : buf_charpos_to_bytepos (ctx->buffer_b, pos_b);
+
+  /* We make the below a series of specific test to avoid using
+     BUF_FETCH_CHAR_AS_MULTIBYTE, which references Lisp symbols, and
+     is therefore significantly slower (see the note in the commentary
+     to this function).  */
+  if (ctx->a_unibyte && ctx->b_unibyte)
+    return BUF_FETCH_BYTE (ctx->buffer_a, bpos_a)
+      == BUF_FETCH_BYTE (ctx->buffer_b, bpos_b);
+  if (ctx->a_unibyte && !ctx->b_unibyte)
+    return UNIBYTE_TO_CHAR (BUF_FETCH_BYTE (ctx->buffer_a, bpos_a))
+      == BUF_FETCH_MULTIBYTE_CHAR (ctx->buffer_b, bpos_b);
+  if (!ctx->a_unibyte && ctx->b_unibyte)
+    return BUF_FETCH_MULTIBYTE_CHAR (ctx->buffer_a, bpos_a)
+      == UNIBYTE_TO_CHAR (BUF_FETCH_BYTE (ctx->buffer_b, bpos_b));
+  return BUF_FETCH_MULTIBYTE_CHAR (ctx->buffer_a, bpos_a)
+    == BUF_FETCH_MULTIBYTE_CHAR (ctx->buffer_b, bpos_b);
 }
 
 
@@ -3779,8 +3840,9 @@
 text is included in the file.  \\[widen] makes all visible again.
 See also `save-restriction'.
 
-When calling from a program, pass two arguments; positions (integers
-or markers) bounding the text that should remain visible.  */)
+When calling from Lisp, pass two arguments START and END:
+positions (integers or markers) bounding the text that should
+remain visible.  */)
   (register Lisp_Object start, Lisp_Object end)
 {
   CHECK_NUMBER_COERCE_MARKER (start);
@@ -3876,9 +3938,9 @@
 
 	  buf->clip_changed = 1; /* Remember that the narrowing changed. */
 	}
-      /* These aren't needed anymore, so don't wait for GC.  */
-      free_marker (XCAR (data));
-      free_marker (XCDR (data));
+      /* Detach the markers, and free the cons instead of waiting for GC.  */
+      detach_marker (XCAR (data));
+      detach_marker (XCDR (data));
       free_cons (XCONS (data));
     }
   else
@@ -4082,7 +4144,8 @@
 
 %s means print a string argument.  Actually, prints any object, with `princ'.
 %d means print as signed number in decimal.
-%o means print as unsigned number in octal, %x as unsigned number in hex.
+%o means print as unsigned number in octal.
+%x means print as unsigned number in hex.
 %X is like %x, but uses upper case.
 %e means print a number in exponential notation.
 %f means print a number in decimal-point notation.
@@ -4195,6 +4258,9 @@
     /* The start and end bytepos in the output string.  */
     ptrdiff_t start, end;
 
+    /* The start of the spec in the format string.  */
+    ptrdiff_t fbeg;
+
     /* Whether the argument is a string with intervals.  */
     bool_bf intervals : 1;
   } *info;
@@ -4346,6 +4412,7 @@
 	  char conversion = *format++;
 	  memset (&discarded[format0 - format_start], 1,
 		  format - format0 - (conversion == '%'));
+	  info[ispec].fbeg = format0 - format_start;
 	  if (conversion == '%')
 	    {
 	      new_result = true;
@@ -4919,7 +4986,9 @@
 		  else if (discarded[bytepos] == 1)
 		    {
 		      position++;
-		      if (fieldn < nspec && translated == info[fieldn].start)
+		      if (fieldn < nspec
+			  && position > info[fieldn].fbeg
+			  && translated == info[fieldn].start)
 			{
 			  translated += info[fieldn].end - info[fieldn].start;
 			  fieldn++;
@@ -4939,7 +5008,9 @@
 		  else if (discarded[bytepos] == 1)
 		    {
 		      position++;
-		      if (fieldn < nspec && translated == info[fieldn].start)
+		      if (fieldn < nspec
+			  && position > info[fieldn].fbeg
+			  && translated == info[fieldn].start)
 			{
 			  translated += info[fieldn].end - info[fieldn].start;
 			  fieldn++;
diff -Nru emacs-26.1+1/src/emacs.c emacs-26.3+1/src/emacs.c
--- emacs-26.1+1/src/emacs.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacs.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2018 Free Software
+Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -158,9 +158,14 @@
 /* To run as a background daemon under Cocoa or Windows,
    we must do a fork+exec, not a simple fork.
 
-   On Cocoa, CoreFoundation lib fails in forked process:
+   On Cocoa, CoreFoundation lib fails in forked process, see Mac OS X
+   Leopard Developer Release Notes for CoreFoundation Framework:
+
    http://developer.apple.com/ReleaseNotes/
-   CoreFoundation/CoreFoundation.html)
+   CoreFoundation/CoreFoundation.html
+
+   Note: the above is no longer available on-line, but it can be found
+   via the "Wayback machine", https://web.archive.org.
 
    On Windows, a Cygwin fork child cannot access the USER subsystem.
 
@@ -330,7 +335,7 @@
 bool fatal_error_in_progress;
 
 #ifdef HAVE_NS
-/* NS autrelease pool, for memory management.  */
+/* NS autorelease pool, for memory management.  */
 static void *ns_pool;
 #endif
 
@@ -707,10 +712,12 @@
   bool disable_aslr = dumping;
 # endif
 
-  if (disable_aslr && disable_address_randomization ())
+  if (disable_aslr && disable_address_randomization ()
+      && !getenv ("EMACS_HEAP_EXEC"))
     {
       /* Set this so the personality will be reverted before execs
-	 after this one.  */
+	 after this one, and to work around an re-exec loop on buggy
+	 kernels (Bug#32083).  */
       xputenv ("EMACS_HEAP_EXEC=true");
 
       /* Address randomization was enabled, but is now disabled.
@@ -873,7 +880,8 @@
 	    newlim = rlim.rlim_max;
 	  newlim -= newlim % pagesize;
 
-	  if (pagesize <= newlim - lim)
+	  if (newlim > lim	/* in case rlim_t is an unsigned type */
+	      && pagesize <= newlim - lim)
 	    {
 	      rlim.rlim_cur = newlim;
 	      if (setrlimit (RLIMIT_STACK, &rlim) == 0)
@@ -882,9 +890,10 @@
 	}
       /* If the stack is big enough, let regex.c more of it before
          falling back to heap allocation.  */
-      emacs_re_safe_alloca = max
-        (min (lim - extra, SIZE_MAX) * (min_ratio / ratio),
-         MAX_ALLOCA);
+      if (lim < extra)
+	lim = extra;	/* avoid wrap-around in unsigned subtraction */
+      emacs_re_safe_alloca =
+	max (min (lim - extra, SIZE_MAX) * (min_ratio / ratio), MAX_ALLOCA);
     }
 #endif /* HAVE_SETRLIMIT and RLIMIT_STACK and not CYGWIN */
 
@@ -1065,7 +1074,7 @@
 #endif /* HAVE_LIBSYSTEMD */
 
 #ifdef USE_GTK
-      fprintf (stderr, "\nWarning: due to a long standing Gtk+ bug\nhttp://bugzilla.gnome.org/show_bug.cgi?id=85715\n\
+      fprintf (stderr, "\nWarning: due to a long standing Gtk+ bug\nhttps://gitlab.gnome.org/GNOME/gtk/issues/221\n\
 Emacs might crash when run in daemon mode and the X11 connection is unexpectedly lost.\n\
 Using an Emacs configured with --with-x-toolkit=lucid does not have this problem.\n");
 #endif /* USE_GTK */
@@ -2013,7 +2022,10 @@
   /* Fsignal calls emacs_abort () if it sees that waiting_for_input is
      set.  */
   waiting_for_input = 0;
-  run_hook (Qkill_emacs_hook);
+  if (noninteractive)
+    safe_run_hooks (Qkill_emacs_hook);
+  else
+    run_hook (Qkill_emacs_hook);
 
 #ifdef HAVE_X_WINDOWS
   /* Transfer any clipboards we own to the clipboard manager.  */
diff -Nru emacs-26.1+1/src/emacsgtkfixed.c emacs-26.3+1/src/emacsgtkfixed.c
--- emacs-26.1+1/src/emacsgtkfixed.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacsgtkfixed.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* A Gtk Widget that inherits GtkFixed, but can be shrunk.
 This file is only use when compiling with Gtk+ 3.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/emacsgtkfixed.h emacs-26.3+1/src/emacsgtkfixed.h
--- emacs-26.1+1/src/emacsgtkfixed.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacsgtkfixed.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* A Gtk Widget that inherits GtkFixed, but can be shrunk.
 This file is only use when compiling with Gtk+ 3.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/emacs-icon.h emacs-26.3+1/src/emacs-icon.h
--- emacs-26.1+1/src/emacs-icon.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacs-icon.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* XPM */
 /* Emacs icon
 
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
         Nicolas Petton <nicolas@petton.fr>
diff -Nru emacs-26.1+1/src/emacs-module.c emacs-26.3+1/src/emacs-module.c
--- emacs-26.1+1/src/emacs-module.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacs-module.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* emacs-module.c - Module loading and runtime implementation
 
-Copyright (C) 2015-2018 Free Software Foundation, Inc.
+Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -36,6 +36,11 @@
 #include <intprops.h>
 #include <verify.h>
 
+/* This module is lackadaisical about function casts.  */
+#if GNUC_PREREQ (8, 0, 0)
+# pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
 /* We use different strategies for allocating the user-visible objects
    (struct emacs_runtime, emacs_env, emacs_value), depending on
    whether the user supplied the -module-assertions flag.  If
@@ -334,20 +339,20 @@
       Lisp_Object globals = global_env_private.values;
       Lisp_Object prev = Qnil;
       ptrdiff_t count = 0;
-      for (Lisp_Object tail = global_env_private.values; CONSP (tail);
+      for (Lisp_Object tail = globals; CONSP (tail);
            tail = XCDR (tail))
         {
-          emacs_value global = XSAVE_POINTER (XCAR (globals), 0);
+          emacs_value global = XSAVE_POINTER (XCAR (tail), 0);
           if (global == ref)
             {
               if (NILP (prev))
                 global_env_private.values = XCDR (globals);
               else
-                XSETCDR (prev, XCDR (globals));
+                XSETCDR (prev, XCDR (tail));
               return;
             }
           ++count;
-          prev = globals;
+          prev = tail;
         }
       module_abort ("Global value was not found in list of %"pD"d globals",
                     count);
@@ -660,13 +665,13 @@
   return ASIZE (lvec);
 }
 
-/* This function should return true if and only if maybe_quit would do
-   anything.  */
+/* This function should return true if and only if maybe_quit would
+   quit.  */
 static bool
 module_should_quit (emacs_env *env)
 {
   MODULE_FUNCTION_BEGIN_NO_CATCH (false);
-  return (! NILP (Vquit_flag) && NILP (Vinhibit_quit)) || pending_signals;
+  return QUITP;
 }
 
 
diff -Nru emacs-26.1+1/src/emacs-module.h.in emacs-26.3+1/src/emacs-module.h.in
--- emacs-26.1+1/src/emacs-module.h.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/emacs-module.h.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* emacs-module.h - GNU Emacs module API.
 
-Copyright (C) 2015-2018 Free Software Foundation, Inc.
+Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/epaths.in emacs-26.3+1/src/epaths.in
--- emacs-26.1+1/src/epaths.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/epaths.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Hey Emacs, this is -*- C -*- code!  */
 /*
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2018 Free Software
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/eval.c emacs-26.3+1/src/eval.c
--- emacs-26.1+1/src/eval.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/eval.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
 
-Copyright (C) 1985-1987, 1993-1995, 1999-2018 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1999-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -282,8 +282,12 @@
   /* Do not allow max_specpdl_size less than actual depth (Bug#16603).  */
   EMACS_INT old_max = max (max_specpdl_size, count);
 
-  if (lisp_eval_depth + 40 > max_lisp_eval_depth)
-    max_lisp_eval_depth = lisp_eval_depth + 40;
+  /* The previous value of 40 is too small now that the debugger
+     prints using cl-prin1 instead of prin1.  Printing lists nested 8
+     deep (which is the value of print-level used in the debugger)
+     currently requires 77 additional frames.  See bug#31919.  */
+  if (lisp_eval_depth + 100 > max_lisp_eval_depth)
+    max_lisp_eval_depth = lisp_eval_depth + 100;
 
   /* While debugging Bug#16603, previous value of 100 was found
      too small to avoid specpdl overflow in the debugger itself.  */
@@ -769,7 +773,7 @@
       LOADHIST_ATTACH (sym);
     }
   else if (!NILP (Vinternal_interpreter_environment)
-	   && !XSYMBOL (sym)->u.s.declared_special)
+	   && (SYMBOLP (sym) && !XSYMBOL (sym)->u.s.declared_special))
     /* A simple (defvar foo) with lexical scoping does "nothing" except
        declare that var to be dynamically scoped *locally* (i.e. within
        the current file or let-block).  */
@@ -1480,10 +1484,7 @@
    If quit-flag is set to `kill-emacs' the SIGINT handler has received
    a request to exit Emacs when it is safe to do.
 
-   When not quitting, process any pending signals.
-
-   If you change this function, also adapt module_should_quit in
-   emacs-module.c.  */
+   When not quitting, process any pending signals.  */
 
 void
 maybe_quit (void)
@@ -1499,7 +1500,7 @@
 This function does not return.
 
 An error symbol is a symbol with an `error-conditions' property
-that is a list of condition names.
+that is a list of condition names.  The symbol should be non-nil.
 A handler for any of those names will get to handle this signal.
 The symbol `error' should normally be one of them.
 
@@ -1511,6 +1512,9 @@
        attributes: noreturn)
   (Lisp_Object error_symbol, Lisp_Object data)
 {
+  /* If they call us with nonsensical arguments, produce "peculiar error".  */
+  if (NILP (error_symbol) && NILP (data))
+    error_symbol = Qerror;
   signal_or_quit (error_symbol, data, false);
   eassume (false);
 }
diff -Nru emacs-26.1+1/src/fileio.c emacs-26.3+1/src/fileio.c
--- emacs-26.1+1/src/fileio.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/fileio.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* File IO for GNU Emacs.
 
-Copyright (C) 1985-1988, 1993-2018 Free Software Foundation, Inc.
+Copyright (C) 1985-1988, 1993-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -195,8 +195,8 @@
    list before reporting it; this saves report_file_errno's caller the
    trouble of preserving errno before calling list1.  */
 
-void
-report_file_errno (char const *string, Lisp_Object name, int errorno)
+Lisp_Object
+get_file_errno_data (char const *string, Lisp_Object name, int errorno)
 {
   Lisp_Object data = CONSP (name) || NILP (name) ? name : list1 (name);
   char *str = emacs_strerror (errorno);
@@ -206,10 +206,18 @@
   Lisp_Object errdata = Fcons (errstring, data);
 
   if (errorno == EEXIST)
-    xsignal (Qfile_already_exists, errdata);
+    return Fcons (Qfile_already_exists, errdata);
   else
-    xsignal (errorno == ENOENT ? Qfile_missing : Qfile_error,
-	     Fcons (build_string (string), errdata));
+    return Fcons (errorno == ENOENT ? Qfile_missing : Qfile_error,
+		  Fcons (build_string (string), errdata));
+}
+
+void
+report_file_errno (char const *string, Lisp_Object name, int errorno)
+{
+  Lisp_Object data = get_file_errno_data (string, name, errorno);
+
+  xsignal (Fcar (data), Fcdr (data));
 }
 
 /* Signal a file-access failure that set errno.  STRING describes the
@@ -864,33 +872,78 @@
       }
   }
   multibyte = STRING_MULTIBYTE (name);
-  if (multibyte != STRING_MULTIBYTE (default_directory))
+  bool defdir_multibyte = STRING_MULTIBYTE (default_directory);
+  if (multibyte != defdir_multibyte)
     {
+      /* We want to make both NAME and DEFAULT_DIRECTORY have the same
+	 multibyteness.  Strategy:
+	 . If either NAME or DEFAULT_DIRECTORY is pure-ASCII, they
+	   can be converted to the multibyteness of the other one
+	   while keeping the same byte sequence.
+	 . If both are non-ASCII, the only safe conversion is to
+	   convert the multibyte one to be unibyte, because the
+	   reverse conversion potentially adds bytes while raw bytes
+	   are converted to their multibyte forms, which we will be
+	   unable to account for, since the information about the
+	   original multibyteness is lost.  If those additional bytes
+	   later leak to system APIs because they are not encoded or
+	   because they are converted to unibyte strings by keeping
+	   the data, file APIs will fail.
+
+	 Note: One could argue that if we see a multibyte string, it
+	 is evidence that file-name decoding was already set up, and
+	 we could convert unibyte strings to multibyte using
+	 DECODE_FILE.  However, this is risky, because the likes of
+	 string_to_multibyte are able of creating multibyte strings
+	 without any decoding.  */
       if (multibyte)
 	{
-	  unsigned char *p = SDATA (name);
+	  bool name_ascii_p = SCHARS (name) == SBYTES (name);
+	  unsigned char *p = SDATA (default_directory);
 
-	  while (*p && ASCII_CHAR_P (*p))
-	    p++;
-	  if (*p == '\0')
+	  if (!name_ascii_p)
+	    while (*p && ASCII_CHAR_P (*p))
+	      p++;
+	  if (name_ascii_p || *p != '\0')
 	    {
-	      /* NAME is a pure ASCII string, and DEFAULT_DIRECTORY is
-		 unibyte.  Do not convert DEFAULT_DIRECTORY to
-		 multibyte; instead, convert NAME to a unibyte string,
-		 so that the result of this function is also a unibyte
-		 string.  This is needed during bootstrapping and
-		 dumping, when Emacs cannot decode file names, because
-		 the locale environment is not set up.  */
+	      /* DEFAULT_DIRECTORY is unibyte and possibly non-ASCII.
+		 Make a unibyte string out of NAME, and arrange for
+		 the result of this function to be a unibyte string.
+		 This is needed during bootstrapping and dumping, when
+		 Emacs cannot decode file names, because the locale
+		 environment is not set up.  */
 	      name = make_unibyte_string (SSDATA (name), SBYTES (name));
 	      multibyte = 0;
 	    }
 	  else
-	    default_directory = string_to_multibyte (default_directory);
+	    {
+	      /* NAME is non-ASCII and multibyte, and
+		 DEFAULT_DIRECTORY is unibyte and pure-ASCII: make a
+		 multibyte string out of DEFAULT_DIRECTORY's data.  */
+	      default_directory =
+		make_multibyte_string (SSDATA (default_directory),
+				       SCHARS (default_directory),
+				       SCHARS (default_directory));
+	    }
 	}
       else
 	{
-	  name = string_to_multibyte (name);
-	  multibyte = 1;
+	  unsigned char *p = SDATA (name);
+
+	  while (*p && ASCII_CHAR_P (*p))
+	    p++;
+	  if (*p == '\0')
+	    {
+	      /* DEFAULT_DIRECTORY is multibyte and NAME is unibyte
+		 and pure-ASCII.  Make a multibyte string out of
+		 NAME's data.  */
+	      name = make_multibyte_string (SSDATA (name),
+					    SCHARS (name), SCHARS (name));
+	      multibyte = 1;
+	    }
+	  else
+	    default_directory = make_unibyte_string (SSDATA (default_directory),
+						     SBYTES (default_directory));
 	}
     }
 
@@ -2421,13 +2474,13 @@
 
 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
        "FMake symbolic link to file: \nGMake symbolic link to file %s: \np",
-       doc: /* Make a symbolic link to TARGET, named NEWNAME.
-If NEWNAME is a directory name, make a like-named symbolic link under
-NEWNAME.
+       doc: /* Make a symbolic link to TARGET, named LINKNAME.
+If LINKNAME is a directory name, make a like-named symbolic link under
+LINKNAME.
 
-Signal a `file-already-exists' error if a file NEWNAME already exists
+Signal a `file-already-exists' error if a file LINKNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
-An integer third arg means request confirmation if NEWNAME already
+An integer third arg means request confirmation if LINKNAME already
 exists, and expand leading "~" or strip leading "/:" in TARGET.
 This happens for interactive use with M-x.  */)
   (Lisp_Object target, Lisp_Object linkname, Lisp_Object ok_if_already_exists)
@@ -2488,7 +2541,7 @@
 }
 
 DEFUN ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0,
-       doc: /* Return t if file FILENAME exists (whether or not you can read it.)
+       doc: /* Return t if file FILENAME exists (whether or not you can read it).
 See also `file-readable-p' and `file-attributes'.
 This returns nil for a symlink to a nonexistent file.
 Use `file-symlink-p' to test for such links.  */)
diff -Nru emacs-26.1+1/src/filelock.c emacs-26.3+1/src/filelock.c
--- emacs-26.1+1/src/filelock.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/filelock.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Lock files for editing.
 
-Copyright (C) 1985-1987, 1993-1994, 1996, 1998-2018 Free Software
+Copyright (C) 1985-1987, 1993-1994, 1996, 1998-2019 Free Software
 Foundation, Inc.
 
 Author: Richard King
@@ -152,7 +152,7 @@
     mib[1] = KERN_BOOTTIME;
     size = sizeof (boottime_val);
 
-    if (sysctl (mib, 2, &boottime_val, &size, NULL, 0) >= 0)
+    if (sysctl (mib, 2, &boottime_val, &size, NULL, 0) >= 0 && size != 0)
       {
 	boot_time = boottime_val.tv_sec;
 	return boot_time;
@@ -849,7 +849,10 @@
   Vtemporary_file_directory = Qnil;
 
   DEFVAR_BOOL ("create-lockfiles", create_lockfiles,
-	       doc: /* Non-nil means use lockfiles to avoid editing collisions.  */);
+	       doc: /* Non-nil means use lockfiles to avoid editing collisions.
+The name of the (per-buffer) lockfile is constructed by prepending a
+'.#' to the name of the file being locked.  See also `lock-buffer' and
+Info node `(emacs)Interlocking'.  */);
   create_lockfiles = 1;
 
   defsubr (&Sunlock_buffer);
diff -Nru emacs-26.1+1/src/firstfile.c emacs-26.3+1/src/firstfile.c
--- emacs-26.1+1/src/firstfile.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/firstfile.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Mark beginning of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1997, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/floatfns.c emacs-26.3+1/src/floatfns.c
--- emacs-26.1+1/src/floatfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/floatfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
 
-Copyright (C) 1988, 1993-1994, 1999, 2001-2018 Free Software Foundation,
+Copyright (C) 1988, 1993-1994, 1999, 2001-2019 Free Software Foundation,
 Inc.
 
 Author: Wolfgang Rupprecht (according to ack.texi)
diff -Nru emacs-26.1+1/src/fns.c emacs-26.3+1/src/fns.c
--- emacs-26.1+1/src/fns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/fns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Random utility Lisp functions.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -1042,10 +1042,8 @@
 DEFUN ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte,
        1, 1, 0,
        doc: /* Return the unibyte equivalent of STRING.
-Multibyte character codes are converted to unibyte according to
-`nonascii-translation-table' or, if that is nil, `nonascii-insert-offset'.
-If the lookup in the translation table fails, this function takes just
-the low 8 bits of each character.  */)
+Multibyte character codes above 255 are converted to unibyte
+by taking just the low 8 bits of each character's code.  */)
   (Lisp_Object string)
 {
   CHECK_STRING (string);
@@ -2496,8 +2494,12 @@
 DEFUN ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0,
        doc: /* Apply FUNCTION to each element of SEQUENCE, and concat the results as strings.
 In between each pair of results, stick in SEPARATOR.  Thus, " " as
-SEPARATOR results in spaces between the values returned by FUNCTION.
-SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
+  SEPARATOR results in spaces between the values returned by FUNCTION.
+SEQUENCE may be a list, a vector, a bool-vector, or a string.
+SEPARATOR must be a string, a vector, or a list of characters.
+FUNCTION must be a function of one argument, and must return a value
+  that is a sequence of characters: either a string, or a vector or
+  list of numbers that are valid character codepoints.  */)
   (Lisp_Object function, Lisp_Object sequence, Lisp_Object separator)
 {
   USE_SAFE_ALLOCA;
diff -Nru emacs-26.1+1/src/font.c emacs-26.3+1/src/font.c
--- emacs-26.1+1/src/font.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/font.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* font.c -- "Font" primitives.
 
-Copyright (C) 2006-2018 Free Software Foundation, Inc.
+Copyright (C) 2006-2019 Free Software Foundation, Inc.
 Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
@@ -2906,6 +2906,9 @@
       font = XFONT_OBJECT (font_object);
       if (font->average_width > 0 && font->height > 0)
 	break;
+      /* Avoid an infinite loop.  */
+      if (psize > pixel_size + 15)
+	return Qnil;
     }
   ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
   FONT_ADD_LOG ("open", entity, font_object);
@@ -5473,6 +5476,13 @@
 footprint in sessions that use lots of different fonts.  */);
   inhibit_compacting_font_caches = 0;
 
+  DEFVAR_BOOL ("xft-ignore-color-fonts",
+	       Vxft_ignore_color_fonts,
+	       doc: /*
+Non-nil means don't query fontconfig for color fonts, since they often
+cause Xft crashes.  Only has an effect in Xft builds.  */);
+  Vxft_ignore_color_fonts = 1;
+
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_FREETYPE
   syms_of_ftfont ();
diff -Nru emacs-26.1+1/src/font.h emacs-26.3+1/src/font.h
--- emacs-26.1+1/src/font.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/font.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* font.h -- Interface definition for font handling.
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -284,7 +284,7 @@
   /* By which pixel size the font is opened.  */
   int pixel_size;
 
-  /* Height of the font.  On X window, this is the same as
+  /* Height of the font.  On X window system, this is the same as
      (font->ascent + font->descent).  */
   int height;
 
@@ -293,7 +293,7 @@
   int space_width;
 
   /* Average width of glyphs in the font.  If the font itself doesn't
-     have that information but has glyphs of ASCII characters, the
+     have that information, but has glyphs of ASCII characters, the
      value is the average width of those glyphs.  Otherwise, the value
      is 0.  */
   int average_width;
@@ -576,8 +576,8 @@
      cons whose cdr part is the actual cache area.  */
   Lisp_Object (*get_cache) (struct frame *f);
 
-  /* List fonts exactly matching with FONT_SPEC on FRAME.  The value
-     is a list of font-entities.  The font properties to be considered
+  /* List fonts exactly matching FONT_SPEC on FRAME.  The value is
+     a list of font-entities.  The font properties to be considered
      are: :foundry, :family, :adstyle, :registry, :script, :lang, and
      :otf.  See the function `font-spec' for their meanings.  Note
      that the last three properties are stored in FONT_EXTRA_INDEX
@@ -593,19 +593,19 @@
      The `open' method of the same font-backend is called with one of
      the returned font-entities.  If the backend needs additional
      information to be used in `open' method, this method can add any
-     Lispy value by the property :font-entity to the entities.
+     Lispy value using the property :font-entity to the entities.
 
      This and the following `match' are the only APIs that allocate
      font-entities.  */
   Lisp_Object (*list) (struct frame *frame, Lisp_Object font_spec);
 
-  /* Return a font-entity most closely matching with FONT_SPEC on
-     FRAME.  Which font property to consider, and how to calculate the
-     closeness is determined by the font backend, thus
+  /* Return a font-entity most closely matching FONT_SPEC on FRAME.
+     Which font property to consider, and how to calculate the
+     closeness, is determined by the font backend, thus
      `face-font-selection-order' is ignored here.
 
-     The properties that the font-entity has is the same as `list'
-     method.  */
+     The properties that the font-entity has are the same as described
+     for the `list' method above.  */
   Lisp_Object (*match) (struct frame *f, Lisp_Object spec);
 
   /* Optional.
@@ -630,7 +630,7 @@
   void (*prepare_face) (struct frame *f, struct face *face);
 
   /* Optional.
-     Done FACE for displaying characters by FACE->font on frame F.  */
+     Done with FACE for displaying characters by FACE->font on frame F.  */
   void (*done_face) (struct frame *f, struct face *face);
 
   /* Optional.
@@ -662,8 +662,8 @@
 
   /* Optional.
      Store bitmap data for glyph-code CODE of FONT in BITMAP.  It is
-     intended that this method is called from the other font-driver
-     for actual drawing.  */
+     intended that this method is called from other font-driver
+     methods for actual drawing.  */
   int (*get_bitmap) (struct font *font, unsigned code,
                      struct font_bitmap *bitmap,
                      int bits_per_pixel);
@@ -677,13 +677,16 @@
   /* Optional.
      Get coordinates of the INDEXth anchor point of the glyph whose
      code is CODE.  Store the coordinates in *X and *Y.  Return 0 if
-     the operations was successful.  Otherwise return -1.  */
+     the operation was successful.  Otherwise return -1.  */
   int (*anchor_point) (struct font *font, unsigned code, int index,
                        int *x, int *y);
 
   /* Optional.
      Return a list describing which scripts/languages FONT
-     supports by which GSUB/GPOS features of OpenType tables.  */
+     supports by which GSUB/GPOS features of OpenType tables.
+     The list should be of the form (GSUB GPOS), where both
+     GSUB and GPOS are lists of the form
+     ((SCRIPT (LANGSYS FEATURE ...) ...) ...)  */
   Lisp_Object (*otf_capability) (struct font *font);
 
   /* Optional.
@@ -707,17 +710,16 @@
 
   /* Optional.
      Make the font driver ready for frame F.  Usually this function
-     makes some data specific to F and stores it in F by calling
-     font_put_frame_data ().  */
+     makes some data specific to F and stores it in F's font_data
+     member by calling font_put_frame_data.  */
   int (*start_for_frame) (struct frame *f);
 
   /* Optional.
-     End using the driver for frame F.  Usually this function free
-     some data stored for F.  */
+     End using the driver for frame F.  Usually this function frees
+     some font data stored in frame F's font_data member.  */
   int (*end_for_frame) (struct frame *f);
 
   /* Optional.
-
      Shape text in GSTRING.  See the docstring of
      `composition-get-gstring' for the format of GSTRING.  If the
      (N+1)th element of GSTRING is nil, input of shaping is from the
@@ -728,19 +730,17 @@
      output glyphs (M) are more than the input glyphs (N), (N+1)th
      through (M)th elements of GSTRING are updated possibly by making
      a new glyph object and storing it in GSTRING.  If (M) is greater
-     than the length of GSTRING, nil should be return.  In that case,
-     this function is called again with the larger GSTRING.  */
+     than the length of GSTRING, this method should return nil.  In
+     that case, the method is called again with a larger GSTRING.  */
   Lisp_Object (*shape) (Lisp_Object lgstring);
 
   /* Optional.
-
      If FONT is usable on frame F, return 0.  Otherwise return -1.
      This method is used only for debugging.  If this method is NULL,
      Emacs assumes that the font is usable on any frame.  */
   int (*check) (struct frame *f, struct font *font);
 
   /* Optional.
-
      Return the number of variation glyphs of character C supported by
      FONT.  VARIATIONS is an array of 256 elements.  If the variation
      selector N (1..256) defines a glyph, that glyph code is stored in
@@ -748,24 +748,27 @@
   int (*get_variation_glyphs) (struct font *font,
                                int c, unsigned variations[256]);
 
+  /* Optional.
+     Set attributes of FONT according to PROPERTIES.
+     PROPERTIES is an alist of pairs (KEY . VALUE) that specifies
+     font properties.  This method should use font-put to set
+     properties of FONT supported by the font driver.
+     See font_filter_properties for more details.  */
   void (*filter_properties) (Lisp_Object font, Lisp_Object properties);
 
   /* Optional.
-
      Return non-zero if FONT_OBJECT can be used as a (cached) font
      for ENTITY on frame F.  */
   bool (*cached_font_ok) (struct frame *f,
                           Lisp_Object font_object,
                           Lisp_Object entity);
 
-  /* Optional
-
-     Return non-nil if the driver support rendering of combining
+  /* Optional.
+     Return non-nil if the driver supports rendering of combining
      characters for FONT according to Unicode combining class.  */
   Lisp_Object (*combining_capability) (struct font *font);
 
-  /* Optional
-
+  /* Optional.
      Called when frame F is double-buffered and its size changes; Xft
      relies on this hook to throw away its old XftDraw (which won't
      work after the size change) and get a new one.  */
@@ -945,6 +948,22 @@
       font_deferred_log ((ACTION), (ARG), (RESULT));	\
   } while (false)
 
+/* FIXME: This is for use in functions that can be called while
+   garbage-collecting, but which assume that Lisp data structures are
+   properly-formed.  This invalid assumption can lead to core dumps
+   (Bug#20890).  */
+INLINE bool
+font_data_structures_may_be_ill_formed (void)
+{
+#ifdef USE_CAIRO
+  /* Although this works around Bug#20890, it is probably not the
+     right thing to do.  */
+  return gc_in_progress;
+#else
+  return false;
+#endif
+}
+
 INLINE_HEADER_END
 
 #endif	/* not EMACS_FONT_H */
diff -Nru emacs-26.1+1/src/fontset.c emacs-26.3+1/src/fontset.c
--- emacs-26.1+1/src/fontset.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/fontset.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Fontset handler.
 
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   2005, 2006, 2007, 2008, 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -1442,23 +1442,26 @@
        doc: /*
 Modify fontset NAME to use FONT-SPEC for TARGET characters.
 
-NAME is a fontset name string, nil for the fontset of FRAME, or t for
-the default fontset.
+NAME is a fontset name (a string), nil for the fontset of FRAME,
+or t for the default fontset.
 
 TARGET may be a single character to use FONT-SPEC for.
 
-Target may be a cons (FROM . TO), where FROM and TO are characters.
-In that case, use FONT-SPEC for all characters in the range FROM
-and TO (inclusive).
-
-TARGET may be a script name symbol.  In that case, use FONT-SPEC for
-all characters that belong to the script.
+TARGET may be a cons (FROM . TO), where FROM and TO are characters.
+In that case, use FONT-SPEC for all the characters in the range
+between FROM and TO (inclusive).
+
+TARGET may be a script symbol.  In that case, use FONT-SPEC for
+all the characters that belong to the script.  See the variable
+`script-representative-chars' for the list of known scripts.
 
 TARGET may be a charset.  In that case, use FONT-SPEC for all
-characters in the charset.
+the characters in the charset.  See `list-character-sets' and
+`list-charset-chars' for the list of character sets and their
+characters.
 
-TARGET may be nil.  In that case, use FONT-SPEC for any characters for
-that no FONT-SPEC is specified.
+TARGET may be nil.  In that case, use FONT-SPEC for any character for
+which no font-spec is specified.
 
 FONT-SPEC may one of these:
  * A font-spec object made by the function `font-spec' (which see).
@@ -1468,11 +1471,11 @@
  * A font name string.
  * nil, which explicitly specifies that there's no font for TARGET.
 
-Optional 4th argument FRAME is a frame or nil for the selected frame
-that is concerned in the case that NAME is nil.
+Optional 4th argument FRAME is a frame, or nil for the selected frame,
+to be considered in the case that NAME is nil.
 
 Optional 5th argument ADD, if non-nil, specifies how to add FONT-SPEC
-to the font specifications for TARGET previously set.  If it is
+to the previously set font specifications for TARGET.  If it is
 `prepend', FONT-SPEC is prepended.  If it is `append', FONT-SPEC is
 appended.  By default, FONT-SPEC overrides the previous settings.  */)
   (Lisp_Object name, Lisp_Object target, Lisp_Object font_spec, Lisp_Object frame, Lisp_Object add)
diff -Nru emacs-26.1+1/src/fontset.h emacs-26.3+1/src/fontset.h
--- emacs-26.1+1/src/fontset.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/fontset.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
diff -Nru emacs-26.1+1/src/frame.c emacs-26.3+1/src/frame.c
--- emacs-26.1+1/src/frame.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/frame.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Generic frame functions.
 
-Copyright (C) 1993-1995, 1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 1997, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1117,6 +1117,7 @@
   f->terminal = terminal;
   f->terminal->reference_count++;
 #ifdef MSDOS
+  f->output_data.tty = &the_only_tty_output;
   f->output_data.tty->display_info = &the_only_display_info;
   if (!inhibit_window_system
       && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))
@@ -5533,8 +5534,8 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
 
-# if (defined HAVE_NS \
-      || (!defined USE_GTK && (defined HAVE_XINERAMA || defined HAVE_XRANDR)))
+# if (defined USE_GTK || defined HAVE_NS || defined HAVE_XINERAMA \
+      || defined HAVE_XRANDR)
 void
 free_monitors (struct MonitorInfo *monitors, int n_monitors)
 {
diff -Nru emacs-26.1+1/src/frame.h emacs-26.3+1/src/frame.h
--- emacs-26.1+1/src/frame.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/frame.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Define frame-object for GNU Emacs.
-   Copyright (C) 1993-1994, 1999-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/fringe.c emacs-26.3+1/src/fringe.c
--- emacs-26.1+1/src/fringe.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/fringe.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Fringe handling (split from xdisp.c).
-   Copyright (C) 1985-1988, 1993-1995, 1997-2018 Free Software
+   Copyright (C) 1985-1988, 1993-1995, 1997-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/ftcrfont.c emacs-26.3+1/src/ftcrfont.c
--- emacs-26.1+1/src/ftcrfont.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ftcrfont.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* ftcrfont.c -- FreeType font driver on cairo.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
+   Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -35,8 +35,9 @@
 struct ftcrfont_info
 {
   struct font font;
-  /* The following six members must be here in this order to be
-     compatible with struct ftfont_info (in ftfont.c).  */
+  /* The following members up to and including 'matrix' must be here
+     in this order to be compatible with struct ftfont_info (in
+     ftfont.c).  */
 #ifdef HAVE_LIBOTF
   bool maybe_otf;	  /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
@@ -164,6 +165,9 @@
 static void
 ftcrfont_close (struct font *font)
 {
+  if (font_data_structures_may_be_ill_formed ())
+    return;
+
   struct ftcrfont_info *ftcrfont_info = (struct ftcrfont_info *) font;
   int i;
 
diff -Nru emacs-26.1+1/src/ftfont.c emacs-26.3+1/src/ftfont.c
--- emacs-26.1+1/src/ftfont.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ftfont.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* ftfont.c -- FreeType font driver.
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -56,8 +56,9 @@
 {
   struct font font;
 #ifdef HAVE_LIBOTF
-  /* The following four members must be here in this order to be
-     compatible with struct xftfont_info (in xftfont.c).  */
+  /* The following members up to and including 'matrix' must be here in
+     this order to be compatible with struct xftfont_info (in
+     xftfont.c).  */
   bool maybe_otf;	/* Flag to tell if this may be OTF or not.  */
   OTF *otf;
 #endif	/* HAVE_LIBOTF */
@@ -764,6 +765,13 @@
   if (scalable >= 0
       && ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse))
     goto err;
+#if defined HAVE_XFT && defined FC_COLOR
+  /* We really don't like color fonts, they cause Xft crashes.  See
+     Bug#30874.  */
+  if (Vxft_ignore_color_fonts
+      && ! FcPatternAddBool (pattern, FC_COLOR, FcFalse))
+    goto err;
+#endif
 
   goto finish;
 
@@ -1235,9 +1243,8 @@
 void
 ftfont_close (struct font *font)
 {
-  /* FIXME: Although this function can be called while garbage-collecting,
-     the function assumes that Lisp data structures are properly-formed.
-     This invalid assumption can lead to core dumps (Bug#20890).  */
+  if (font_data_structures_may_be_ill_formed ())
+    return;
 
   struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
   Lisp_Object val, cache;
diff -Nru emacs-26.1+1/src/ftxfont.c emacs-26.3+1/src/ftxfont.c
--- emacs-26.1+1/src/ftxfont.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ftxfont.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* ftxfont.c -- FreeType font driver on X (without using XFT).
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
diff -Nru emacs-26.1+1/src/.gdbinit emacs-26.3+1/src/.gdbinit
--- emacs-26.1+1/src/.gdbinit	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/.gdbinit	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1992-1998, 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2000-2019 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff -Nru emacs-26.1+1/src/getpagesize.h emacs-26.3+1/src/getpagesize.h
--- emacs-26.1+1/src/getpagesize.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/getpagesize.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Emulate getpagesize on systems that lack it.
-   Copyright (C) 1986, 1992, 1995, 2001-2018 Free Software Foundation,
+   Copyright (C) 1986, 1992, 1995, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/gfilenotify.c emacs-26.3+1/src/gfilenotify.c
--- emacs-26.1+1/src/gfilenotify.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gfilenotify.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Filesystem notifications support with glib API.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+   Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/gmalloc.c emacs-26.3+1/src/gmalloc.c
--- emacs-26.1+1/src/gmalloc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gmalloc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for `malloc' and friends.
-   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2018 Free
+   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2019 Free
    Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
@@ -182,7 +182,7 @@
   };
 
 /* Free list headers for each fragment size.  */
-extern struct list _fraghead[];
+static struct list _fraghead[BLOCKLOG];
 
 /* List of blocks allocated with aligned_alloc and friends.  */
 struct alignlist
@@ -339,9 +339,6 @@
 /* Limit of valid info table indices.  */
 size_t _heaplimit;
 
-/* Free lists for each fragment size.  */
-struct list _fraghead[BLOCKLOG];
-
 /* Instrumentation.  */
 size_t _chunks_used;
 size_t _bytes_used;
@@ -351,10 +348,6 @@
 /* Are you experienced?  */
 int __malloc_initialized;
 
-#else
-
-static struct list _fraghead[BLOCKLOG];
-
 #endif /* HYBRID_MALLOC */
 
 /* Number of extra blocks to get each time we ask for more core.
diff -Nru emacs-26.1+1/src/gnutls.c emacs-26.3+1/src/gnutls.c
--- emacs-26.1+1/src/gnutls.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gnutls.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -38,6 +38,23 @@
    So, require 3.5.1.  */
 #if GNUTLS_VERSION_NUMBER >= 0x030501
 # define HAVE_GNUTLS_AEAD
+#elif GNUTLS_VERSION_NUMBER < 0x030202
+/* gnutls_cipher_get_tag_size was introduced in 3.2.2, but it's only
+   relevant for AEAD ciphers.  */
+# define gnutls_cipher_get_tag_size(cipher) 0
+#endif
+
+#if GNUTLS_VERSION_NUMBER < 0x030200
+/* gnutls_cipher_get_iv_size was introduced in 3.2.0.  For the ciphers
+   available in previous versions, block size is equivalent.  */
+#define gnutls_cipher_get_iv_size(cipher) gnutls_cipher_get_block_size (cipher)
+#endif
+
+#if GNUTLS_VERSION_NUMBER < 0x030202
+/* gnutls_digest_list and gnutls_digest_get_name were added in 3.2.2.
+   For previous versions, the mac algorithms are equivalent.  */
+# define gnutls_digest_list() ((const gnutls_digest_algorithm_t *) gnutls_mac_list ())
+# define gnutls_digest_get_name(id) gnutls_mac_get_name ((gnutls_mac_algorithm_t) id)
 #endif
 
 /* gnutls_mac_get_nonce_size was added in GnuTLS 3.2.0, but was
@@ -205,13 +222,21 @@
 DEF_DLL_FN (size_t, gnutls_mac_get_nonce_size, (gnutls_mac_algorithm_t));
 #   endif
 DEF_DLL_FN (size_t, gnutls_mac_get_key_size, (gnutls_mac_algorithm_t));
+#   ifndef gnutls_digest_list
 DEF_DLL_FN (const gnutls_digest_algorithm_t *, gnutls_digest_list, (void));
+#   endif
+#   ifndef gnutls_digest_get_name
 DEF_DLL_FN (const char *, gnutls_digest_get_name, (gnutls_digest_algorithm_t));
+#   endif
 DEF_DLL_FN (gnutls_cipher_algorithm_t *, gnutls_cipher_list, (void));
+#   ifndef gnutls_cipher_get_iv_size
 DEF_DLL_FN (int, gnutls_cipher_get_iv_size, (gnutls_cipher_algorithm_t));
+#   endif
 DEF_DLL_FN (size_t, gnutls_cipher_get_key_size, (gnutls_cipher_algorithm_t));
 DEF_DLL_FN (int, gnutls_cipher_get_block_size, (gnutls_cipher_algorithm_t));
+#   ifndef gnutls_cipher_get_tag_size
 DEF_DLL_FN (int, gnutls_cipher_get_tag_size, (gnutls_cipher_algorithm_t));
+#   endif
 DEF_DLL_FN (int, gnutls_cipher_init,
 	    (gnutls_cipher_hd_t *, gnutls_cipher_algorithm_t,
 	     const gnutls_datum_t *, const gnutls_datum_t *));
@@ -339,13 +364,21 @@
   LOAD_DLL_FN (library, gnutls_mac_get_nonce_size);
 #   endif
   LOAD_DLL_FN (library, gnutls_mac_get_key_size);
+#   ifndef gnutls_digest_list
   LOAD_DLL_FN (library, gnutls_digest_list);
+#   endif
+#   ifndef gnutls_digest_get_name
   LOAD_DLL_FN (library, gnutls_digest_get_name);
+#   endif
   LOAD_DLL_FN (library, gnutls_cipher_list);
+#   ifndef gnutls_cipher_get_iv_size
   LOAD_DLL_FN (library, gnutls_cipher_get_iv_size);
+#   endif
   LOAD_DLL_FN (library, gnutls_cipher_get_key_size);
   LOAD_DLL_FN (library, gnutls_cipher_get_block_size);
+#   ifndef gnutls_cipher_get_tag_size
   LOAD_DLL_FN (library, gnutls_cipher_get_tag_size);
+#   endif
   LOAD_DLL_FN (library, gnutls_cipher_init);
   LOAD_DLL_FN (library, gnutls_cipher_set_iv);
   LOAD_DLL_FN (library, gnutls_cipher_encrypt2);
@@ -455,13 +488,21 @@
 #    define gnutls_mac_get_nonce_size fn_gnutls_mac_get_nonce_size
 #   endif
 #  define gnutls_mac_get_key_size fn_gnutls_mac_get_key_size
-#  define gnutls_digest_list fn_gnutls_digest_list
-#  define gnutls_digest_get_name fn_gnutls_digest_get_name
+#  ifndef gnutls_digest_list
+#   define gnutls_digest_list fn_gnutls_digest_list
+#  endif
+#  ifndef gnutls_digest_get_name
+#   define gnutls_digest_get_name fn_gnutls_digest_get_name
+#  endif
 #  define gnutls_cipher_list fn_gnutls_cipher_list
-#  define gnutls_cipher_get_iv_size fn_gnutls_cipher_get_iv_size
+#  ifndef gnutls_cipher_get_iv_size
+#   define gnutls_cipher_get_iv_size fn_gnutls_cipher_get_iv_size
+#  endif
 #  define gnutls_cipher_get_key_size fn_gnutls_cipher_get_key_size
 #  define gnutls_cipher_get_block_size fn_gnutls_cipher_get_block_size
-#  define gnutls_cipher_get_tag_size fn_gnutls_cipher_get_tag_size
+#  ifndef gnutls_cipher_get_tag_size
+#   define gnutls_cipher_get_tag_size fn_gnutls_cipher_get_tag_size
+#  endif
 #  define gnutls_cipher_init fn_gnutls_cipher_init
 #  define gnutls_cipher_set_iv fn_gnutls_cipher_set_iv
 #  define gnutls_cipher_encrypt2 fn_gnutls_cipher_encrypt2
@@ -712,8 +753,15 @@
     /* The peer closed the connection. */
     return 0;
   else if (emacs_gnutls_handle_error (state, rtnval))
-    /* non-fatal error */
-    return -1;
+    {
+      /* If we get GNUTLS_E_AGAIN, then set errno appropriately so that
+         wait_reading_process_output retries the correct way instead of
+         erroring out.  */
+      if (rtnval == GNUTLS_E_AGAIN)
+        errno = EAGAIN;
+      /* non-fatal error */
+      return -1;
+    }
   else {
     /* a fatal error occurred */
     return 0;
@@ -2024,7 +2072,14 @@
     cipher = intern (SSDATA (cipher));
 
   if (SYMBOLP (cipher))
-    info = XCDR (Fassq (cipher, Fgnutls_ciphers ()));
+    {
+      info = Fassq (cipher, Fgnutls_ciphers ());
+      if (!CONSP (info))
+	xsignal2 (Qerror,
+		  build_string ("GnuTLS cipher is invalid or not found"),
+		  cipher);
+      info = XCDR (info);
+    }
   else if (TYPE_RANGED_INTEGERP (gnutls_cipher_algorithm_t, cipher))
     gca = XINT (cipher);
   else
@@ -2039,7 +2094,8 @@
 
   ptrdiff_t key_size = gnutls_cipher_get_key_size (gca);
   if (key_size == 0)
-    error ("GnuTLS cipher is invalid or not found");
+    xsignal2 (Qerror,
+	      build_string ("GnuTLS cipher is invalid or not found"), cipher);
 
   ptrdiff_t kstart_byte, kend_byte;
   const char *kdata = extract_data_from_object (key, &kstart_byte, &kend_byte);
@@ -2295,7 +2351,14 @@
     hash_method = intern (SSDATA (hash_method));
 
   if (SYMBOLP (hash_method))
-    info = XCDR (Fassq (hash_method, Fgnutls_macs ()));
+    {
+      info = Fassq (hash_method, Fgnutls_macs ());
+      if (!CONSP (info))
+	xsignal2 (Qerror,
+		  build_string ("GnuTLS MAC-method is invalid or not found"),
+		  hash_method);
+      info = XCDR (info);
+    }
   else if (TYPE_RANGED_INTEGERP (gnutls_mac_algorithm_t, hash_method))
     gma = XINT (hash_method);
   else
@@ -2310,7 +2373,9 @@
 
   ptrdiff_t digest_length = gnutls_hmac_get_len (gma);
   if (digest_length == 0)
-    error ("GnuTLS MAC-method is invalid or not found");
+    xsignal2 (Qerror,
+	      build_string ("GnuTLS MAC-method is invalid or not found"),
+	      hash_method);
 
   ptrdiff_t kstart_byte, kend_byte;
   const char *kdata = extract_data_from_object (key, &kstart_byte, &kend_byte);
@@ -2376,7 +2441,14 @@
     digest_method = intern (SSDATA (digest_method));
 
   if (SYMBOLP (digest_method))
-    info = XCDR (Fassq (digest_method, Fgnutls_digests ()));
+    {
+      info = Fassq (digest_method, Fgnutls_digests ());
+      if (!CONSP (info))
+	xsignal2 (Qerror,
+		  build_string ("GnuTLS digest-method is invalid or not found"),
+		  digest_method);
+      info = XCDR (info);
+    }
   else if (TYPE_RANGED_INTEGERP (gnutls_digest_algorithm_t, digest_method))
     gda = XINT (digest_method);
   else
@@ -2391,7 +2463,9 @@
 
   ptrdiff_t digest_length = gnutls_hash_get_len (gda);
   if (digest_length == 0)
-    error ("GnuTLS digest-method is invalid or not found");
+    xsignal2 (Qerror,
+	      build_string ("GnuTLS digest-method is invalid or not found"),
+	      digest_method);
 
   gnutls_hash_hd_t hash;
   int ret = gnutls_hash_init (&hash, gda);
diff -Nru emacs-26.1+1/src/gnutls.h emacs-26.3+1/src/gnutls.h
--- emacs-26.1+1/src/gnutls.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gnutls.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/gtkutil.c emacs-26.3+1/src/gtkutil.c
--- emacs-26.1+1/src/gtkutil.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gtkutil.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for creating and updating GTK widgets.
 
-Copyright (C) 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -147,6 +147,8 @@
   GtkTextDirection dir;
 };
 
+bool xg_gtk_initialized;        /* Used to make sure xwidget calls are possible */
+
 static GtkWidget * xg_get_widget_from_map (ptrdiff_t idx);
 
 
@@ -259,7 +261,7 @@
 
 #if GTK_CHECK_VERSION (2, 0, 0) && ! GTK_CHECK_VERSION (2, 10, 0)
   /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug
-     http://bugzilla.gnome.org/show_bug.cgi?id=85715).  This way we
+     https://gitlab.gnome.org/GNOME/gtk/issues/221).  This way we
      can continue running, but there will be memory leaks.  */
   g_object_run_dispose (G_OBJECT (gdpy));
 #else
@@ -1498,6 +1500,7 @@
       block_input ();
       xg_set_widget_bg (f, FRAME_GTK_WIDGET (f), FRAME_BACKGROUND_PIXEL (f));
 
+#ifdef USE_TOOLKIT_SCROLL_BARS
       Lisp_Object bar;
       for (bar = FRAME_SCROLL_BARS (f);
            !NILP (bar);
@@ -1508,7 +1511,7 @@
           GtkWidget *webox = gtk_widget_get_parent (scrollbar);
           xg_set_widget_bg (f, webox, FRAME_BACKGROUND_PIXEL (f));
         }
-
+#endif
       unblock_input ();
     }
 }
@@ -5305,6 +5308,8 @@
 #ifdef HAVE_FREETYPE
   x_last_font_name = NULL;
 #endif
+
+  xg_gtk_initialized = true;
 }
 
 #endif /* USE_GTK */
diff -Nru emacs-26.1+1/src/gtkutil.h emacs-26.3+1/src/gtkutil.h
--- emacs-26.1+1/src/gtkutil.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/gtkutil.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Definitions and headers for GTK widgets.
 
-Copyright (C) 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -202,5 +202,6 @@
    to indicate that the callback should do nothing.  */
 extern bool xg_ignore_gtk_scrollbar;
 
+extern bool xg_gtk_initialized;
 #endif /* USE_GTK */
 #endif /* GTKUTIL_H */
diff -Nru emacs-26.1+1/src/image.c emacs-26.3+1/src/image.c
--- emacs-26.1+1/src/image.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/image.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for image support on window system.
 
-Copyright (C) 1989, 1992-2018 Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4308,7 +4308,7 @@
   return 1;
 
  failure:
-  image_error ("Invalid XPM file (%s)", img->spec);
+  image_error ("Invalid XPM3 file (%s)", img->spec);
   x_destroy_x_image (ximg);
   x_destroy_x_image (mask_img);
   x_clear_image (f, img);
@@ -4629,6 +4629,8 @@
   return PALETTERGB (r >> 8, g >> 8, b >> 8);
 #elif defined HAVE_NS
   return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8);
+#elif defined USE_CAIRO
+  return (0xffu << 24) | (r << 16) | (g << 8) | b;
 #else
   xsignal1 (Qfile_error,
 	    build_string ("This Emacs mishandles this image file type"));
@@ -6702,10 +6704,10 @@
   FILE *volatile fp = NULL;
   JSAMPARRAY buffer;
   int row_stride, x, y;
-  unsigned long *colors;
   int width, height;
   int i, ir, ig, ib;
 #ifndef USE_CAIRO
+  unsigned long *colors;
   XImagePtr ximg = NULL;
 #endif
 
@@ -6823,7 +6825,7 @@
     else
       ir = 0, ig = 0, ib = 0;
 
-#ifndef CAIRO
+#ifndef USE_CAIRO
     /* Use the color table mechanism because it handles colors that
        cannot be allocated nicely.  Such colors will be replaced with
        a default color, and we don't have to care about which colors
@@ -8537,7 +8539,9 @@
   int width, height;
   size_t image_width, image_height;
   MagickBooleanType status;
+#ifndef USE_CAIRO
   XImagePtr ximg;
+#endif
   int x, y;
   MagickWand *image_wand;
   PixelIterator *iterator;
@@ -8551,6 +8555,9 @@
   double rotation;
   char hint_buffer[MaxTextExtent];
   char *filename_hint = NULL;
+#ifdef USE_CAIRO
+  void *data = NULL;
+#endif
 
   /* Initialize the ImageMagick environment.  */
   static bool imagemagick_initialized;
@@ -8759,6 +8766,12 @@
       /* Magicexportimage is normally faster than pixelpushing.  This
          method is also well tested.  Some aspects of this method are
          ad-hoc and needs to be more researched. */
+      void *dataptr;
+#ifdef USE_CAIRO
+      data = xmalloc (width * height * 4);
+      const char *exportdepth = "BGRA";
+      dataptr = data;
+#else
       int imagedepth = 24; /*MagickGetImageDepth(image_wand);*/
       const char *exportdepth = imagedepth <= 8 ? "I" : "BGRP"; /*"RGBP";*/
       /* Try to create a x pixmap to hold the imagemagick pixmap.  */
@@ -8771,6 +8784,8 @@
 	  image_error ("Imagemagick X bitmap allocation failure");
 	  goto imagemagick_error;
 	}
+      dataptr = ximg->data;
+#endif /* not USE_CAIRO */
 
       /* Oddly, the below code doesn't seem to work:*/
       /* switch(ximg->bitmap_unit){ */
@@ -8793,14 +8808,17 @@
       */
       int pixelwidth = CharPixel; /*??? TODO figure out*/
       MagickExportImagePixels (image_wand, 0, 0, width, height,
-			       exportdepth, pixelwidth, ximg->data);
+			       exportdepth, pixelwidth, dataptr);
     }
   else
 #endif /* HAVE_MAGICKEXPORTIMAGEPIXELS */
     {
       size_t image_height;
       MagickRealType color_scale = 65535.0 / QuantumRange;
-
+#ifdef USE_CAIRO
+      data = xmalloc (width * height * 4);
+      color_scale /= 256;
+#else
       /* Try to create a x pixmap to hold the imagemagick pixmap.  */
       if (!image_create_x_image_and_pixmap (f, img, width, height, 0,
 					    &ximg, 0))
@@ -8811,6 +8829,7 @@
           image_error ("Imagemagick X bitmap allocation failure");
           goto imagemagick_error;
         }
+#endif
 
       /* Copy imagemagick image to x with primitive yet robust pixel
          pusher loop.  This has been tested a lot with many different
@@ -8823,7 +8842,9 @@
 #ifdef COLOR_TABLE_SUPPORT
 	  free_color_table ();
 #endif
+#ifndef USE_CAIRO
 	  x_destroy_x_image (ximg);
+#endif
           image_error ("Imagemagick pixel iterator creation failed");
           goto imagemagick_error;
         }
@@ -8839,16 +8860,27 @@
 	  for (x = 0; x < xlim; x++)
             {
               PixelGetMagickColor (pixels[x], &pixel);
+#ifdef USE_CAIRO
+	      ((uint32_t *)data)[width * y + x] =
+		lookup_rgb_color (f,
+				  color_scale * pixel.red,
+				  color_scale * pixel.green,
+				  color_scale * pixel.blue);
+#else
               XPutPixel (ximg, x, y,
                          lookup_rgb_color (f,
 					   color_scale * pixel.red,
 					   color_scale * pixel.green,
 					   color_scale * pixel.blue));
+#endif
             }
         }
       DestroyPixelIterator (iterator);
     }
 
+#ifdef USE_CAIRO
+  create_cairo_image_surface (img, data, width, height);
+#else
 #ifdef COLOR_TABLE_SUPPORT
   /* Remember colors allocated for this image.  */
   img->colors = colors_in_color_table (&img->ncolors);
@@ -8860,6 +8892,7 @@
 
   /* Put ximg into the image.  */
   image_put_x_image (f, img, ximg, 0);
+#endif
 
   /* Final cleanup. image_wand should be the only resource left. */
   DestroyMagickWand (image_wand);
@@ -8908,8 +8941,8 @@
 #endif
       success_p = imagemagick_load_image (f, img, 0, 0, SSDATA (file));
     }
-  /* Else its not a file, its a lisp object.  Load the image from a
-     lisp object rather than a file.  */
+  /* Else it's not a file, it's a Lisp object.  Load the image from a
+     Lisp object rather than a file.  */
   else
     {
       Lisp_Object data;
@@ -9217,8 +9250,8 @@
 				  SSDATA (ENCODE_FILE (file)));
       xfree (contents);
     }
-  /* Else its not a file, its a lisp object.  Load the image from a
-     lisp object rather than a file.  */
+  /* Else it's not a file, it's a Lisp object.  Load the image from a
+     Lisp object rather than a file.  */
   else
     {
       Lisp_Object data, original_filename;
@@ -9269,10 +9302,21 @@
 
   /* Set base_uri for properly handling referenced images (via 'href').
      See rsvg bug 596114 - "image refs are relative to curdir, not .svg file"
-     (https://bugzilla.gnome.org/show_bug.cgi?id=596114). */
+     (https://gitlab.gnome.org/GNOME/librsvg/issues/33). */
   if (filename)
     rsvg_handle_set_base_uri(rsvg_handle, filename);
 
+  /* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for
+     rsvg_handle_write and rsvg_handle_close.  FIXME: Use functions
+     like rsvg_handle_new_from_gfile_sync on newer librsvg versions,
+     and remove this hack.  */
+  #if GNUC_PREREQ (4, 6, 0)
+   #pragma GCC diagnostic push
+  #endif
+  #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0)
+   #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+  #endif
+
   /* Parse the contents argument and fill in the rsvg_handle.  */
   rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err);
   if (err) goto rsvg_error;
@@ -9282,6 +9326,10 @@
   rsvg_handle_close (rsvg_handle, &err);
   if (err) goto rsvg_error;
 
+  #if GNUC_PREREQ (4, 6, 0)
+   #pragma GCC diagnostic pop
+  #endif
+
   rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
   if (! check_image_size (f, dimension_data.width, dimension_data.height))
     {
diff -Nru emacs-26.1+1/src/indent.c emacs-26.3+1/src/indent.c
--- emacs-26.1+1/src/indent.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/indent.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Indentation functions.
-   Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2018 Free Software
+   Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -983,9 +983,10 @@
 If it's past end of line, point goes to end of line.
 
 Optional second argument FORCE non-nil means if COLUMN is in the
-middle of a tab character, change it to spaces.
-In addition, if FORCE is t, and the line is too short to reach
-COLUMN, add spaces/tabs to get there.
+middle of a tab character, either change it to spaces (when
+`indent-tabs-mode' is nil), or insert enough spaces before it to reach
+COLUMN (otherwise).  In addition, if FORCE is t, and the line is too short
+to reach COLUMN, add spaces/tabs to get there.
 
 The return value is the current column.  */)
   (Lisp_Object column, Lisp_Object force)
@@ -2147,8 +2148,7 @@
 	 will sometimes err by one column.  */
       int lnum_width = 0;
       int lnum_pixel_width = 0;
-      if (!NILP (Vdisplay_line_numbers)
-	  && !EQ (Vdisplay_line_numbers, Qvisual))
+      if (!NILP (Vdisplay_line_numbers))
 	line_number_display_width (w, &lnum_width, &lnum_pixel_width);
       SET_TEXT_POS (pt, PT, PT_BYTE);
       itdata = bidi_shelve_cache ();
@@ -2278,7 +2278,9 @@
 	  overshoot_handled = 1;
 	}
       if (lcols_given)
-	to_x = window_column_x (w, window, extract_float (lcols), lcols);
+	to_x =
+	  window_column_x (w, window, extract_float (lcols), lcols)
+	  + lnum_pixel_width;
       if (nlines <= 0)
 	{
 	  it.vpos = vpos_init;
@@ -2330,12 +2332,6 @@
 	 an addition to the hscroll amount.  */
       if (lcols_given)
 	{
-	  /* If we are displaying line numbers, we could cross the
-	     line where the width of the line-number display changes,
-	     in which case we need to fix up the pixel coordinate
-	     accordingly.  */
-	  if (lnum_pixel_width > 0)
-	    to_x += it.lnum_pixel_width - lnum_pixel_width;
 	  move_it_in_display_line (&it, ZV, first_x + to_x, MOVE_TO_X);
 	  /* If we find ourselves in the middle of an overlay string
 	     which includes a newline after current string position,
diff -Nru emacs-26.1+1/src/indent.h emacs-26.3+1/src/indent.h
--- emacs-26.1+1/src/indent.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/indent.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions for interface to indent.c
-   Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/inotify.c emacs-26.3+1/src/inotify.c
--- emacs-26.1+1/src/inotify.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/inotify.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Inotify support for Emacs
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/insdel.c emacs-26.3+1/src/insdel.c
--- emacs-26.1+1/src/insdel.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/insdel.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Buffer insertion/deletion and gap motion for GNU Emacs. -*- coding: utf-8 -*-
-   Copyright (C) 1985-1986, 1993-1995, 1997-2018 Free Software
+   Copyright (C) 1985-1986, 1993-1995, 1997-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2149,9 +2149,9 @@
     }
 
   if (! NILP (start_marker))
-    free_marker (start_marker);
+    detach_marker (start_marker);
   if (! NILP (end_marker))
-    free_marker (end_marker);
+    detach_marker (end_marker);
   RESTORE_VALUE;
 
   unbind_to (count, Qnil);
diff -Nru emacs-26.1+1/src/intervals.c emacs-26.3+1/src/intervals.c
--- emacs-26.1+1/src/intervals.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/intervals.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Code for doing intervals.
-   Copyright (C) 1993-1995, 1997-1998, 2001-2018 Free Software
+   Copyright (C) 1993-1995, 1997-1998, 2001-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/intervals.h emacs-26.3+1/src/intervals.h
--- emacs-26.1+1/src/intervals.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/intervals.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and global variables for intervals.
-   Copyright (C) 1993-1994, 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/keyboard.c emacs-26.3+1/src/keyboard.c
--- emacs-26.1+1/src/keyboard.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/keyboard.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
 
-Copyright (C) 1985-1989, 1993-1997, 1999-2018 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1997, 1999-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -364,7 +364,7 @@
 #endif /* HAVE_WINDOW_SYSTEM */
 static bool help_char_p (Lisp_Object);
 static void save_getcjmp (sys_jmp_buf);
-static void restore_getcjmp (sys_jmp_buf);
+static void restore_getcjmp (void *);
 static Lisp_Object apply_modifiers (int, Lisp_Object);
 static void restore_kboard_configuration (int);
 static void handle_interrupt (bool);
@@ -2144,12 +2144,14 @@
     return c;
 
   /* Actually read a character, waiting if necessary.  */
+  ptrdiff_t count = SPECPDL_INDEX ();
   save_getcjmp (save_jump);
+  record_unwind_protect_ptr (restore_getcjmp, save_jump);
   restore_getcjmp (local_getcjmp);
   if (!end_time)
     timer_start_idle ();
   c = kbd_buffer_get_event (&kb, used_mouse_menu, end_time);
-  restore_getcjmp (save_jump);
+  unbind_to (count, Qnil);
 
   if (! NILP (c) && (kb != current_kboard))
     {
@@ -2638,10 +2640,12 @@
 	{
 	  Lisp_Object tem0;
 
+	  ptrdiff_t count = SPECPDL_INDEX ();
 	  save_getcjmp (save_jump);
+	  record_unwind_protect_ptr (restore_getcjmp, save_jump);
 	  restore_getcjmp (local_getcjmp);
 	  tem0 = sit_for (Vecho_keystrokes, 1, 1);
-	  restore_getcjmp (save_jump);
+	  unbind_to (count, Qnil);
 	  if (EQ (tem0, Qt)
 	      && ! CONSP (Vunread_command_events))
 	    echo_now ();
@@ -2712,10 +2716,12 @@
 
 	  timeout = min (timeout, MOST_POSITIVE_FIXNUM / delay_level * 4);
 	  timeout = delay_level * timeout / 4;
+	  ptrdiff_t count1 = SPECPDL_INDEX ();
 	  save_getcjmp (save_jump);
+	  record_unwind_protect_ptr (restore_getcjmp, save_jump);
 	  restore_getcjmp (local_getcjmp);
 	  tem0 = sit_for (make_number (timeout), 1, 1);
-	  restore_getcjmp (save_jump);
+	  unbind_to (count1, Qnil);
 
 	  if (EQ (tem0, Qt)
 	      && ! CONSP (Vunread_command_events))
@@ -2809,6 +2815,9 @@
 
       if (EQ (c, make_number (-2)))
 	return c;
+
+      if (CONSP (c) && EQ (XCAR (c), Qt))
+	c = XCDR (c);
   }
 
  non_reread:
@@ -3322,7 +3331,7 @@
 }
 
 static void
-restore_getcjmp (sys_jmp_buf temp)
+restore_getcjmp (void *temp)
 {
   memcpy (getcjmp, temp, sizeof getcjmp);
 }
@@ -3569,6 +3578,7 @@
     case ICONIFY_EVENT: ignore_event = Qiconify_frame; break;
     case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break;
     case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break;
+    case BUFFER_SWITCH_EVENT: ignore_event = Qbuffer_switch; break;
     default: ignore_event = Qnil; break;
     }
 
@@ -8025,7 +8035,7 @@
     {
       /* No, so use major and minor mode keymaps and keymap property.
 	 Note that tool-bar bindings in the local-map and keymap
-	 properties may not work reliable, as they are only
+	 properties may not work reliably, as they are only
 	 recognized when the tool-bar (or mode-line) is updated,
 	 which does not normally happen after every command.  */
       ptrdiff_t nminor = current_minor_maps (NULL, &tmaps);
@@ -11104,6 +11114,8 @@
   /* Menu and tool bar item parts.  */
   DEFSYM (Qmenu_enable, "menu-enable");
 
+  DEFSYM (Qbuffer_switch, "buffer-switch");
+
 #ifdef HAVE_NTGUI
   DEFSYM (Qlanguage_change, "language-change");
   DEFSYM (Qend_session, "end-session");
@@ -11854,10 +11866,10 @@
 
   DEFVAR_LISP ("debug-on-event",
                Vdebug_on_event,
-               doc: /* Enter debugger on this event.  When Emacs
-receives the special event specified by this variable, it will try to
-break into the debugger as soon as possible instead of processing the
-event normally through `special-event-map'.
+               doc: /* Enter debugger on this event.
+When Emacs receives the special event specified by this variable,
+it will try to break into the debugger as soon as possible instead
+of processing the event normally through `special-event-map'.
 
 Currently, the only supported values for this
 variable are `sigusr1' and `sigusr2'.  */);
@@ -11865,21 +11877,23 @@
 
   DEFVAR_BOOL ("attempt-stack-overflow-recovery",
                attempt_stack_overflow_recovery,
-               doc: /* If non-nil, attempt to recover from C stack
-overflow.  This recovery is unsafe and may lead to deadlocks or data
+               doc: /* If non-nil, attempt to recover from C stack overflows.
+This recovery is potentially unsafe and may lead to deadlocks or data
 corruption, but it usually works and may preserve modified buffers
 that would otherwise be lost.  If nil, treat stack overflow like any
-other kind of crash.  */);
+other kind of crash or fatal error.  */);
   attempt_stack_overflow_recovery = true;
 
   DEFVAR_BOOL ("attempt-orderly-shutdown-on-fatal-signal",
                attempt_orderly_shutdown_on_fatal_signal,
-               doc: /* If non-nil, attempt to perform an orderly
-shutdown when Emacs receives a fatal signal (e.g., a crash).
-This cleanup is unsafe and may lead to deadlocks or data corruption,
-but it usually works and may preserve modified buffers that would
-otherwise be lost.  If nil, crash immediately in response to fatal
-signals.  */);
+               doc: /* If non-nil, attempt orderly shutdown on fatal signals.
+By default this variable is non-nil, and Emacs attempts to perform
+an orderly shutdown when it catches a fatal signal (e.g., a crash).
+The orderly shutdown includes an attempt to auto-save your unsaved edits
+and other useful cleanups.  These cleanups are potentially unsafe and may
+lead to deadlocks or data corruption, but it usually works and may
+preserve data in modified buffers that would otherwise be lost.
+If nil, Emacs crashes immediately in response to fatal signals.  */);
   attempt_orderly_shutdown_on_fatal_signal = true;
 
   /* Create the initial keyboard.  Qt means 'unset'.  */
@@ -12006,7 +12020,12 @@
     for (event = kbd_fetch_ptr; event != kbd_store_ptr; event++)
       {
 	if (event == kbd_buffer + KBD_BUFFER_SIZE)
-	  event = kbd_buffer;
+	  {
+	    event = kbd_buffer;
+	    if (event == kbd_store_ptr)
+	      break;
+	  }
+
 	/* These two special event types has no Lisp_Objects to mark.  */
 	if (event->kind != SELECTION_REQUEST_EVENT
 	    && event->kind != SELECTION_CLEAR_EVENT)
diff -Nru emacs-26.1+1/src/keyboard.h emacs-26.3+1/src/keyboard.h
--- emacs-26.1+1/src/keyboard.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/keyboard.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations useful when processing input.
-   Copyright (C) 1985-1987, 1993, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985-1987, 1993, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/keymap.c emacs-26.3+1/src/keymap.c
--- emacs-26.1+1/src/keymap.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/keymap.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Manipulation of keymaps
-   Copyright (C) 1985-1988, 1993-1995, 1998-2018 Free Software
+   Copyright (C) 1985-1988, 1993-1995, 1998-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2205,10 +2205,12 @@
 
 DEFUN ("single-key-description", Fsingle_key_description,
        Ssingle_key_description, 1, 2, 0,
-       doc: /* Return a pretty description of command character KEY.
+       doc: /* Return a pretty description of a character event KEY.
 Control characters turn into C-whatever, etc.
 Optional argument NO-ANGLES non-nil means don't put angle brackets
-around function keys and event symbols.  */)
+around function keys and event symbols.
+
+See `text-char-description' for describing character codes.  */)
   (Lisp_Object key, Lisp_Object no_angles)
 {
   USE_SAFE_ALLOCA;
@@ -2282,11 +2284,13 @@
 /* This function cannot GC.  */
 
 DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0,
-       doc: /* Return a pretty description of file-character CHARACTER.
-Control characters turn into "^char", etc.  This differs from
-`single-key-description' which turns them into "C-char".
-Also, this function recognizes the 2**7 bit as the Meta character,
-whereas `single-key-description' uses the 2**27 bit for Meta.
+       doc: /* Return the description of CHARACTER in standard Emacs notation.
+CHARACTER must be a valid character code that passes the `characterp' test.
+Control characters turn into "^char", and characters with Meta and other
+modifiers signal an error, as they are not valid character codes.
+This differs from `single-key-description' which accepts character events,
+and thus doesn't enforce the `characterp' condition, turns control
+characters into "C-char", and uses the 2**27 bit for Meta.
 See Info node `(elisp)Describing Characters' for examples.  */)
   (Lisp_Object character)
 {
diff -Nru emacs-26.1+1/src/keymap.h emacs-26.3+1/src/keymap.h
--- emacs-26.1+1/src/keymap.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/keymap.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions to manipulate keymaps.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/kqueue.c emacs-26.3+1/src/kqueue.c
--- emacs-26.1+1/src/kqueue.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/kqueue.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Filesystem notifications support with kqueue API.
 
-Copyright (C) 2015-2018 Free Software Foundation, Inc.
+Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/lastfile.c emacs-26.3+1/src/lastfile.c
--- emacs-26.1+1/src/lastfile.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/lastfile.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Mark end of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/lcms.c emacs-26.3+1/src/lcms.c
--- emacs-26.1+1/src/lcms.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/lcms.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface to Little CMS
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+   Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/lisp.h emacs-26.3+1/src/lisp.h
--- emacs-26.1+1/src/lisp.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/lisp.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter. -*- coding: utf-8 -*-
 
-Copyright (C) 1985-1987, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -2010,7 +2010,7 @@
 }
 
 /* Placeholder for make-docfile to process.  The actual symbol
-   definition is done by lread.c's defsym.  */
+   definition is done by lread.c's define_symbol.  */
 #define DEFSYM(sym, name) /* empty */
 
 
@@ -2587,18 +2587,15 @@
    in the buffer structure itself.  They are handled differently,
    using struct Lisp_Buffer_Objfwd.)
 
-   The `realvalue' slot holds the variable's current value, or a
-   forwarding pointer to where that value is kept.  This value is the
-   one that corresponds to the loaded binding.  To read or set the
-   variable, you must first make sure the right binding is loaded;
-   then you can access the value in (or through) `realvalue'.
+   The `valcell' slot holds the variable's current value (unless `fwd'
+   is set).  This value is the one that corresponds to the loaded binding.
+   To read or set the variable, you must first make sure the right binding
+   is loaded; then you can access the value in (or through) `valcell'.
 
-   `where' is the buffer for which the loaded binding was found.  If
-   it has changed, to make sure the right binding is loaded it is
+   `where' is the buffer for which the loaded binding was found.
+   If it has changed, to make sure the right binding is loaded it is
    necessary to find which binding goes with the current buffer, then
-   load it.  To load it, first unload the previous binding, then copy
-   the value of the new binding into `realvalue' (or through it).
-   Also update LOADED-BINDING to point to the newly loaded binding.
+   load it.  To load it, first unload the previous binding.
 
    `local_if_set' indicates that merely setting the variable creates a
    local binding for the current buffer.  Otherwise the latter, setting
@@ -3047,15 +3044,13 @@
   } while (false)
 
 
-/* Elisp uses several stacks:
-   - the C stack.
-   - the bytecode stack: used internally by the bytecode interpreter.
-     Allocated from the C stack.
-   - The specpdl stack: keeps track of active unwind-protect and
-     dynamic-let-bindings.  Allocated from the `specpdl' array, a manually
-     managed stack.
-   - The handler stack: keeps track of active catch tags and condition-case
-     handlers.  Allocated in a manually managed stack implemented by a
+/* Elisp uses multiple stacks:
+   - The C stack.
+   - The specpdl stack keeps track of backtraces, unwind-protects and
+     dynamic let-bindings.  It is allocated from the 'specpdl' array,
+     a manually managed stack.
+   - The handler stack keeps track of active catch tags and condition-case
+     handlers.  It is allocated in a manually managed stack implemented by a
      doubly-linked list allocated via xmalloc and never freed.  */
 
 /* Structure for recording Lisp call stack for backtrace purposes.  */
@@ -3134,7 +3129,7 @@
    control structures.  A struct handler contains all the information needed to
    restore the state of the interpreter after a non-local jump.
 
-   handler structures are chained together in a doubly linked list; the `next'
+   Handler structures are chained together in a doubly linked list; the `next'
    member points to the next outer catchtag and the `nextfree' member points in
    the other direction to the next inner element (which is typically the next
    free element since we mostly use it on the deepest handler).
@@ -3728,7 +3723,6 @@
 extern Lisp_Object make_save_memory (Lisp_Object *, ptrdiff_t);
 extern void free_save_value (Lisp_Object);
 extern Lisp_Object build_overlay (Lisp_Object, Lisp_Object, Lisp_Object);
-extern void free_marker (Lisp_Object);
 extern void free_cons (struct Lisp_Cons *);
 extern void init_alloc_once (void);
 extern void init_alloc (void);
@@ -3981,6 +3975,7 @@
 
 /* Defined in thread.c.  */
 extern void mark_threads (void);
+extern void unmark_main_thread (void);
 
 /* Defined in editfns.c.  */
 extern void insert1 (Lisp_Object);
@@ -4019,7 +4014,8 @@
 extern void clear_charpos_cache (struct buffer *);
 extern ptrdiff_t buf_charpos_to_bytepos (struct buffer *, ptrdiff_t);
 extern ptrdiff_t buf_bytepos_to_charpos (struct buffer *, ptrdiff_t);
-extern void unchain_marker (struct Lisp_Marker *marker);
+extern void detach_marker (Lisp_Object);
+extern void unchain_marker (struct Lisp_Marker *);
 extern Lisp_Object set_marker_restricted (Lisp_Object, Lisp_Object, Lisp_Object);
 extern Lisp_Object set_marker_both (Lisp_Object, Lisp_Object, ptrdiff_t, ptrdiff_t);
 extern Lisp_Object set_marker_restricted_both (Lisp_Object, Lisp_Object,
@@ -4036,6 +4032,7 @@
 extern void close_file_unwind (int);
 extern void fclose_unwind (void *);
 extern void restore_point_unwind (Lisp_Object);
+extern Lisp_Object get_file_errno_data (const char *, Lisp_Object, int);
 extern _Noreturn void report_file_errno (const char *, Lisp_Object, int);
 extern _Noreturn void report_file_error (const char *, Lisp_Object);
 extern _Noreturn void report_file_notify_error (const char *, Lisp_Object);
diff -Nru emacs-26.1+1/src/lread.c emacs-26.3+1/src/lread.c
--- emacs-26.1+1/src/lread.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/lread.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Lisp parsing and input streams.
 
-Copyright (C) 1985-1989, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -735,10 +735,14 @@
 }
 
 DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0,
-       doc: /* Read a character from the command input (keyboard or macro).
+       doc: /* Read a character event from the command input (keyboard or macro).
 It is returned as a number.
-If the character has modifiers, they are resolved and reflected to the
-character code if possible (e.g. C-SPC -> 0).
+If the event has modifiers, they are resolved and reflected in the
+returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97).
+If some of the modifiers cannot be reflected in the character code, the
+returned value will include those modifiers, and will not be a valid
+character code: it will fail the `characterp' test.  Use `event-basic-type'
+to recover the character code with the modifiers removed.
 
 If the user generates an event which is not a character (i.e. a mouse
 click or function key event), `read-char' signals an error.  As an
@@ -785,10 +789,14 @@
 }
 
 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 3, 0,
-       doc: /* Read a character from the command input (keyboard or macro).
+       doc: /* Read a character event from the command input (keyboard or macro).
 It is returned as a number.  Non-character events are ignored.
-If the character has modifiers, they are resolved and reflected to the
-character code if possible (e.g. C-SPC -> 0).
+If the event has modifiers, they are resolved and reflected in the
+returned character code if possible (e.g. C-SPC yields 0 and C-a yields 97).
+If some of the modifiers cannot be reflected in the character code, the
+returned value will include those modifiers, and will not be a valid
+character code: it will fail the `characterp' test.  Use `event-basic-type'
+to recover the character code with the modifiers removed.
 
 If the optional argument PROMPT is non-nil, display that as a prompt.
 If the optional argument INHERIT-INPUT-METHOD is non-nil and some
@@ -2164,7 +2172,10 @@
   if (EQ (stream, Qt))
     stream = Qread_char;
   if (EQ (stream, Qread_char))
-    /* FIXME: ?! When is this used !?  */
+    /* FIXME: ?! This is used when the reader is called from the
+       minibuffer without a stream, as in (read).  But is this feature
+       ever used, and if so, why?  IOW, will anything break if this
+       feature is removed !?  */
     return call1 (intern ("read-minibuffer"),
 		  build_string ("Lisp expression: "));
 
@@ -2677,7 +2688,7 @@
   int c;
   bool uninterned_symbol = false;
   bool multibyte;
-  char stackbuf[MAX_ALLOCA];
+  char stackbuf[128];  /* Small, as read1 is recursive (Bug#31995).  */
   current_thread->stack_top = stackbuf;
 
   *pch = 0;
diff -Nru emacs-26.1+1/src/macfont.h emacs-26.3+1/src/macfont.h
--- emacs-26.1+1/src/macfont.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/macfont.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface definition for macOS Core text font backend.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/macfont.m emacs-26.3+1/src/macfont.m
--- emacs-26.1+1/src/macfont.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/macfont.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Font driver on macOS Core text.
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2070,7 +2070,7 @@
               ptrdiff_t j;
 
               for (j = 0; j < ASIZE (chars); j++)
-                if (TYPE_RANGED_INTEGERP (UTF32Char, AREF (chars, j))
+                if (RANGED_INTEGERP (0, AREF (chars, j), MAX_UNICODE_CHAR)
                     && CFCharacterSetIsLongCharacterMember (desc_charset,
                                                             XFASTINT (AREF (chars, j))))
                   break;
@@ -2705,6 +2705,9 @@
   int result;
   CFCharacterSetRef charset;
 
+  if (c < 0 || c > MAX_UNICODE_CHAR)
+    return false;
+
   block_input ();
   if (FONT_ENTITY_P (font))
     {
@@ -2994,7 +2997,7 @@
 
       if (NILP (lglyph))
         {
-          lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+          lglyph = LGLYPH_NEW ();
           LGSTRING_SET_GLYPH (lgstring, i, lglyph);
         }
 
diff -Nru emacs-26.1+1/src/macros.c emacs-26.3+1/src/macros.c
--- emacs-26.1+1/src/macros.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/macros.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Keyboard macros.
 
-Copyright (C) 1985-1986, 1993, 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/macros.h emacs-26.3+1/src/macros.h
--- emacs-26.1+1/src/macros.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/macros.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/Makefile.in emacs-26.3+1/src/Makefile.in
--- emacs-26.1+1/src/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2018 Free Software
+# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2019 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -234,7 +234,8 @@
 
 GETADDRINFO_A_LIBS = @GETADDRINFO_A_LIBS@
 
-LIBLCMS2 = @LIBLCMS2@
+LCMS2_LIBS = @LCMS2_LIBS@
+LCMS2_CFLAGS = @LCMS2_CFLAGS@
 
 LIBZ = @LIBZ@
 
@@ -360,7 +361,7 @@
   $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
   $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) $(XDBE_CFLAGS) \
-  $(WEBKIT_CFLAGS) \
+  $(WEBKIT_CFLAGS) $(LCMS2_CFLAGS) \
   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
   $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
   $(LIBSYSTEMD_CFLAGS) \
@@ -492,7 +493,7 @@
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBS_SYSTEM) $(CAIRO_LIBS) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
-   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LIBLCMS2) \
+   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LCMS2_LIBS) \
    $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS)
 
 ## FORCE it so that admin/unidata can decide whether these files
@@ -534,6 +535,7 @@
 ifeq ($(CANNOT_DUMP),yes)
 	ln -f temacs$(EXEEXT) $@
 else
+	unset EMACS_HEAP_EXEC; \
 	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
   ifneq ($(PAXCTL_dumped),)
 	$(PAXCTL_dumped) $@
@@ -674,13 +676,14 @@
 ctagsfiles1 = $(wildcard ${srcdir}/*.[hc])
 ctagsfiles2 = $(wildcard ${srcdir}/*.m)
 
-## FIXME? In out-of-tree builds, should TAGS be generated in srcdir?
+## In out-of-tree builds, TAGS are generated in the build dir, like
+## other non-bootstrap build products (see Bug#31744).
 
 ## This does not need to depend on ../lisp and ../lwlib TAGS files,
 ## because etags "--include" only includes a pointer to the file,
 ## rather than the file contents.
 TAGS: ${ETAGS} $(ctagsfiles1) $(ctagsfiles2)
-	${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \
+	$(AM_V_GEN)${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \
 	  --regex='{c}/[ 	]*DEFVAR_[A-Z_ 	(]+"\([^"]+\)"/\1/' \
 	  --regex='{c}/[ 	]*DEFVAR_[A-Z_ 	(]+"[^"]+",[ 	]\([A-Za-z0-9_]+\)/\1/' \
 	  $(ctagsfiles1) \
@@ -738,6 +741,7 @@
 ifeq ($(CANNOT_DUMP),yes)
 	ln -f temacs$(EXEEXT) $@
 else
+	unset EMACS_HEAP_EXEC; \
 	$(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
   ifneq ($(PAXCTL_dumped),)
 	$(PAXCTL_dumped) emacs$(EXEEXT)
diff -Nru emacs-26.1+1/src/marker.c emacs-26.3+1/src/marker.c
--- emacs-26.1+1/src/marker.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/marker.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Markers: examining, setting and deleting.
-   Copyright (C) 1985, 1997-1998, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985, 1997-1998, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
@@ -530,7 +530,7 @@
 editing in any buffer.  Returns MARKER.  */)
   (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer)
 {
-  return set_marker_internal (marker, position, buffer, 0);
+  return set_marker_internal (marker, position, buffer, false);
 }
 
 /* Like the above, but won't let the position be outside the visible part.  */
@@ -539,7 +539,7 @@
 set_marker_restricted (Lisp_Object marker, Lisp_Object position,
 		       Lisp_Object buffer)
 {
-  return set_marker_internal (marker, position, buffer, 1);
+  return set_marker_internal (marker, position, buffer, true);
 }
 
 /* Set the position of MARKER, specifying both the
@@ -586,6 +586,15 @@
   return marker;
 }
 
+/* Detach a marker so that it no longer points anywhere and no longer
+   slows down editing.  Do not free the marker, though, as a change
+   function could have inserted it into an undo list (Bug#30931).  */
+void
+detach_marker (Lisp_Object marker)
+{
+  Fset_marker (marker, Qnil, Qnil);
+}
+
 /* Remove MARKER from the chain of whatever buffer it is in,
    leaving it points to nowhere.  This is called during garbage
    collection, so we must be careful to ignore and preserve
diff -Nru emacs-26.1+1/src/menu.c emacs-26.3+1/src/menu.c
--- emacs-26.1+1/src/menu.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/menu.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Platform-independent code for terminal communications.
 
-Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2018 Free Software
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/menu.h emacs-26.3+1/src/menu.h
--- emacs-26.1+1/src/menu.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/menu.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions to manipulate menus.
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/minibuf.c emacs-26.3+1/src/minibuf.c
--- emacs-26.1+1/src/minibuf.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/minibuf.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Minibuffer input and completion.
 
-Copyright (C) 1985-1986, 1993-2018 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1054,7 +1054,8 @@
 DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
        doc: /* Read the name of a command and return as a symbol.
 Prompt with PROMPT.  By default, return DEFAULT-VALUE or its first element
-if it is a list.  */)
+if it is a list.  If DEFAULT-VALUE is omitted or nil, and the user enters
+null input, return a symbol whose name is an empty string.  */)
   (Lisp_Object prompt, Lisp_Object default_value)
 {
   Lisp_Object name, default_string;
@@ -1110,20 +1111,21 @@
 }
 
 DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 4, 0,
-       doc: /* Read the name of a buffer and return as a string.
-Prompt with PROMPT.
-Optional second arg DEF is value to return if user enters an empty line.
+       doc: /* Read the name of a buffer and return it as a string.
+Prompt with PROMPT, which should be a string ending with a colon and a space.
+Provides completion on buffer names the user types.
+Optional second arg DEF is value to return if user enters an empty line,
+ instead of that empty string.
  If DEF is a list of default values, return its first element.
-Optional third arg REQUIRE-MATCH determines whether non-existing
- buffer names are allowed.  It has the same meaning as the
+Optional third arg REQUIRE-MATCH has the same meaning as the
  REQUIRE-MATCH argument of `completing-read'.
-The argument PROMPT should be a string ending with a colon and a space.
+Optional arg PREDICATE, if non-nil, is a function limiting the buffers that
+can be considered.  It will be called with each potential candidate, and
+should return non-nil to accept the candidate for completion, nil otherwise.
 If `read-buffer-completion-ignore-case' is non-nil, completion ignores
 case while reading the buffer name.
 If `read-buffer-function' is non-nil, this works by calling it as a
-function, instead of the usual behavior.
-Optional arg PREDICATE if non-nil is a function limiting the buffers that can
-be considered.  */)
+function, instead of the usual behavior.  */)
   (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match,
    Lisp_Object predicate)
 {
@@ -2107,8 +2109,11 @@
 
   DEFVAR_LISP ("read-hide-char", Vread_hide_char,
 	       doc: /* Whether to hide input characters in noninteractive mode.
-It must be a character, which will be used to mask the input
-characters.  This variable should never be set globally.  */);
+If non-nil, it must be a character, which will be used to mask the
+input characters.  This variable should never be set globally.
+
+This variable also overrides the default character that `read-passwd'
+uses to hide passwords.  */);
   Vread_hide_char = Qnil;
 
   defsubr (&Sactive_minibuffer_window);
diff -Nru emacs-26.1+1/src/msdos.c emacs-26.3+1/src/msdos.c
--- emacs-26.1+1/src/msdos.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/msdos.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: cp850 -*-
 
-Copyright (C) 1993-1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1997, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -420,6 +420,9 @@
 /* The only display since MS-DOS does not support multiple ones.  */
 struct tty_display_info the_only_display_info;
 
+/* The only tty_output, since MS-DOS supports only 1 display.  */
+struct tty_output the_only_tty_output;
+
 /* Support for DOS/V (allows Japanese characters to be displayed on
    standard, non-Japanese, ATs).  Only supported for DJGPP v2 and later.  */
 
diff -Nru emacs-26.1+1/src/msdos.h emacs-26.3+1/src/msdos.h
--- emacs-26.1+1/src/msdos.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/msdos.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* MS-DOS specific C utilities, interface.
-   Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -93,6 +93,7 @@
 typedef struct tty_display_info Display_Info;
 
 extern struct tty_display_info the_only_display_info;
+extern struct tty_output the_only_tty_output;
 
 #define FRAME_X_DISPLAY(f) ((Display *) 0)
 #define FRAME_FONT(f) ((f)->output_data.tty->font)
diff -Nru emacs-26.1+1/src/nsfns.m emacs-26.3+1/src/nsfns.m
--- emacs-26.1+1/src/nsfns.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsfns.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for the NeXT/Open/GNUstep and macOS window system.
 
-Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2018 Free Software
+Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/nsfont.m emacs-26.3+1/src/nsfont.m
--- emacs-26.1+1/src/nsfont.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsfont.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Font back-end driver for the NeXT/Open/GNUstep and macOS window system.
    See font.h
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/nsgui.h emacs-26.3+1/src/nsgui.h
--- emacs-26.1+1/src/nsgui.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsgui.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication on the NeXT/Open/GNUstep API.
-   Copyright (C) 1995, 2005, 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2005, 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/nsimage.m emacs-26.3+1/src/nsimage.m
--- emacs-26.1+1/src/nsimage.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsimage.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Image support for the NeXT/Open/GNUstep and macOS window system.
-   Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2018 Free Software
+   Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/nsmenu.m emacs-26.3+1/src/nsmenu.m
--- emacs-26.1+1/src/nsmenu.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsmenu.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* NeXT/Open/GNUstep and macOS Cocoa menu and toolbar module.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1318,8 +1318,9 @@
 
 - (instancetype)init
 {
-  NSColor *col = [NSColor colorWithCalibratedRed: 1.0 green: 1.0
+  NSColor *bgcol = [NSColor colorWithCalibratedRed: 1.0 green: 1.0
                                             blue: 0.792 alpha: 0.95];
+  NSColor *fgcol = [NSColor blackColor];
   NSFont *font = [NSFont toolTipsFontOfSize: 0];
   NSFont *sfont = [font screenFont];
   int height = [sfont ascender] - [sfont descender];
@@ -1328,7 +1329,8 @@
 
   textField = [[NSTextField alloc] initWithFrame: r];
   [textField setFont: font];
-  [textField setBackgroundColor: col];
+  [textField setTextColor: fgcol];
+  [textField setBackgroundColor: bgcol];
 
   [textField setEditable: NO];
   [textField setSelectable: NO];
@@ -1345,7 +1347,7 @@
   [win setReleasedWhenClosed: NO];
   [win setDelegate: self];
   [[win contentView] addSubview: textField];
-/*  [win setBackgroundColor: col]; */
+/*  [win setBackgroundColor: bgcol]; */
   [win setOpaque: NO];
 
   return self;
diff -Nru emacs-26.1+1/src/nsselect.m emacs-26.3+1/src/nsselect.m
--- emacs-26.1+1/src/nsselect.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsselect.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* NeXT/Open/GNUstep / macOS Cocoa selection processing for emacs.
-   Copyright (C) 1993-1994, 2005-2006, 2008-2018 Free Software
+   Copyright (C) 1993-1994, 2005-2006, 2008-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/nsterm.h emacs-26.3+1/src/nsterm.h
--- emacs-26.1+1/src/nsterm.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsterm.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication with NeXT/Open/GNUstep API.
-   Copyright (C) 1989, 1993, 2005, 2008-2018 Free Software Foundation,
+   Copyright (C) 1989, 1993, 2005, 2008-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/nsterm.m emacs-26.3+1/src/nsterm.m
--- emacs-26.1+1/src/nsterm.m	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/nsterm.m	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* NeXT/Open/GNUstep / macOS communication module.      -*- coding: utf-8 -*-
 
-Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2018 Free Software
+Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -276,13 +276,7 @@
 long context_menu_value = 0;
 
 /* display update */
-static struct frame *ns_updating_frame;
-static NSView *focus_view = NULL;
 static int ns_window_num = 0;
-#ifdef NS_IMPL_GNUSTEP
-static NSRect uRect;            // TODO: This is dead, remove it?
-#endif
-static BOOL gsaved = NO;
 static BOOL ns_fake_keydown = NO;
 #ifdef NS_IMPL_COCOA
 static BOOL ns_menu_bar_is_hidden = NO;
@@ -802,6 +796,27 @@
 }
 
 
+static NSRect
+ns_row_rect (struct window *w, struct glyph_row *row,
+               enum glyph_row_area area)
+/* Get the row as an NSRect.  */
+{
+  struct frame *f = XFRAME (WINDOW_FRAME (w));
+  NSRect rect;
+  int window_x, window_y, window_width;
+
+  window_box (w, area, &window_x, &window_y, &window_width, 0);
+
+  rect.origin.x = window_x;
+  rect.origin.y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, row->y));
+  rect.origin.y = max (rect.origin.y, window_y);
+  rect.size.width = window_width;
+  rect.size.height = row->visible_height;
+
+  return rect;
+}
+
+
 /* ==========================================================================
 
     Focus (clipping) and screen update
@@ -1039,12 +1054,13 @@
    external (RIF) call; whole frame, called before update_window_begin
    -------------------------------------------------------------------------- */
 {
+#ifdef NS_IMPL_COCOA
   EmacsView *view = FRAME_NS_VIEW (f);
+
   NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_begin");
 
   ns_update_auto_hide_menu_bar ();
 
-#ifdef NS_IMPL_COCOA
   if ([view isFullscreen] && [view fsIsNative])
   {
     // Fix reappearing tool bar in fullscreen for Mac OS X 10.7
@@ -1054,36 +1070,6 @@
       [toolbar setVisible: tbar_visible];
   }
 #endif
-
-  ns_updating_frame = f;
-  [view lockFocus];
-
-  /* drawRect may have been called for say the minibuffer, and then clip path
-     is for the minibuffer.  But the display engine may draw more because
-     we have set the frame as garbaged.  So reset clip path to the whole
-     view.  */
-#ifdef NS_IMPL_COCOA
-  {
-    NSBezierPath *bp;
-    NSRect r = [view frame];
-    NSRect cr = [[view window] frame];
-    /* If a large frame size is set, r may be larger than the window frame
-       before constrained.  In that case don't change the clip path, as we
-       will clear in to the tool bar and title bar.  */
-    if (r.size.height
-        + FRAME_NS_TITLEBAR_HEIGHT (f)
-        + FRAME_TOOLBAR_HEIGHT (f) <= cr.size.height)
-      {
-        bp = [[NSBezierPath bezierPathWithRect: r] retain];
-        [bp setClip];
-        [bp release];
-      }
-  }
-#endif
-
-#ifdef NS_IMPL_GNUSTEP
-  uRect = NSMakeRect (0, 0, 0, 0);
-#endif
 }
 
 
@@ -1164,118 +1150,57 @@
    external (RIF) call; for whole frame, called after update_window_end
    -------------------------------------------------------------------------- */
 {
-  EmacsView *view = FRAME_NS_VIEW (f);
-
   NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_end");
 
 /*   if (f == MOUSE_HL_INFO (f)->mouse_face_mouse_frame) */
   MOUSE_HL_INFO (f)->mouse_face_defer = 0;
-
-  block_input ();
-
-  [view unlockFocus];
-  [[view window] flushWindow];
-
-  unblock_input ();
-  ns_updating_frame = NULL;
 }
 
-static void
-ns_focus (struct frame *f, NSRect *r, int n)
+
+static BOOL
+ns_clip_to_rect (struct frame *f, NSRect *r, int n)
 /* --------------------------------------------------------------------------
-   Internal: Focus on given frame.  During small local updates this is used to
-     draw, however during large updates, ns_update_begin and ns_update_end are
-     called to wrap the whole thing, in which case these calls are stubbed out.
-     Except, on GNUstep, we accumulate the rectangle being drawn into, because
-     the back end won't do this automatically, and will just end up flushing
-     the entire window.
+   Clip the drawing area to rectangle r in frame f.  If drawing is not
+   currently possible mark r as dirty and return NO, otherwise return
+   YES.
    -------------------------------------------------------------------------- */
 {
-  NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_focus");
-  if (r != NULL)
+  NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_clip_to_rect");
+  if (r)
     {
       NSTRACE_RECT ("r", *r);
-    }
 
-  if (f != ns_updating_frame)
-    {
-      NSView *view = FRAME_NS_VIEW (f);
-      if (view != focus_view)
+      if ([NSView focusView] == FRAME_NS_VIEW (f))
         {
-          if (focus_view != NULL)
-            {
-              [focus_view unlockFocus];
-              [[focus_view window] flushWindow];
-/*debug_lock--; */
-            }
+          [[NSGraphicsContext currentContext] saveGraphicsState];
+          if (n == 2)
+            NSRectClipList (r, 2);
+          else
+            NSRectClip (*r);
 
-          if (view)
-            [view lockFocus];
-          focus_view = view;
-/*if (view) debug_lock++; */
+          return YES;
         }
-    }
-
-  /* clipping */
-  if (r)
-    {
-      [[NSGraphicsContext currentContext] saveGraphicsState];
-      if (n == 2)
-        NSRectClipList (r, 2);
       else
-        NSRectClip (*r);
-      gsaved = YES;
-    }
-}
-
-
-static void
-ns_unfocus (struct frame *f)
-/* --------------------------------------------------------------------------
-     Internal: Remove focus on given frame
-   -------------------------------------------------------------------------- */
-{
-  NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_unfocus");
-
-  if (gsaved)
-    {
-      [[NSGraphicsContext currentContext] restoreGraphicsState];
-      gsaved = NO;
-    }
-
-  if (f != ns_updating_frame)
-    {
-      if (focus_view != NULL)
         {
-          [focus_view unlockFocus];
-          [[focus_view window] flushWindow];
-          focus_view = NULL;
-/*debug_lock--; */
+          NSView *view = FRAME_NS_VIEW (f);
+          int i;
+          for (i = 0 ; i < n ; i++)
+            [view setNeedsDisplayInRect:r[i]];
         }
     }
+
+  return NO;
 }
 
 
 static void
-ns_clip_to_row (struct window *w, struct glyph_row *row,
-		enum glyph_row_area area, BOOL gc)
-/* --------------------------------------------------------------------------
-     Internal (but parallels other terms): Focus drawing on given row
-   -------------------------------------------------------------------------- */
+ns_reset_clipping (struct frame *f)
+/* Internal: Restore the previous graphics state, unsetting any
+   clipping areas.  */
 {
-  struct frame *f = XFRAME (WINDOW_FRAME (w));
-  NSRect clip_rect;
-  int window_x, window_y, window_width;
+  NSTRACE_WHEN (NSTRACE_GROUP_FOCUS, "ns_reset_clipping");
 
-  window_box (w, area, &window_x, &window_y, &window_width, 0);
-
-  clip_rect.origin.x = window_x;
-  clip_rect.origin.y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, row->y));
-  clip_rect.origin.y = max (clip_rect.origin.y, window_y);
-  clip_rect.size.width = window_width;
-  clip_rect.size.height = row->visible_height;
-
-  ns_focus (f, &clip_rect, 1);
+  [[NSGraphicsContext currentContext] restoreGraphicsState];
 }
 
 
@@ -1958,12 +1883,34 @@
 
   if (p != FRAME_PARENT_FRAME (f))
     {
-      parent = [FRAME_NS_VIEW (p) window];
+      block_input ();
       child = [FRAME_NS_VIEW (f) window];
 
-      block_input ();
-      [parent addChildWindow: child
-                     ordered: NSWindowAbove];
+      if ([child parentWindow] != nil)
+        {
+          [[child parentWindow] removeChildWindow:child];
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)])
+#endif
+              [child setAccessibilitySubrole:NSAccessibilityStandardWindowSubrole];
+#endif
+        }
+
+      if (!NILP (new_value))
+        {
+          parent = [FRAME_NS_VIEW (p) window];
+
+          [parent addChildWindow: child
+                         ordered: NSWindowAbove];
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)])
+#endif
+              [child setAccessibilitySubrole:NSAccessibilityFloatingWindowSubrole];
+#endif
+        }
+
       unblock_input ();
 
       fset_parent_frame (f, new_value);
@@ -2525,7 +2472,7 @@
 
   if (f && FRAME_NS_P (f))
     {
-      view = FRAME_NS_VIEW (*fp);
+      view = FRAME_NS_VIEW (f);
 
       position = [[view window] mouseLocationOutsideOfEventStream];
       position = [view convertPoint: position fromView: nil];
@@ -2677,14 +2624,16 @@
   r = [view bounds];
 
   block_input ();
-  ns_focus (f, &r, 1);
-  [ns_lookup_indexed_color (NS_FACE_BACKGROUND
-			    (FACE_FROM_ID (f, DEFAULT_FACE_ID)), f) set];
-  NSRectFill (r);
-  ns_unfocus (f);
+  if (ns_clip_to_rect (f, &r, 1))
+    {
+      [ns_lookup_indexed_color (NS_FACE_BACKGROUND
+                                (FACE_FROM_ID (f, DEFAULT_FACE_ID)), f) set];
+      NSRectFill (r);
+      ns_reset_clipping (f);
 
-  /* as of 2006/11 or so this is now needed */
-  ns_redraw_scroll_bars (f);
+      /* as of 2006/11 or so this is now needed */
+      ns_redraw_scroll_bars (f);
+    }
   unblock_input ();
 }
 
@@ -2705,29 +2654,44 @@
   NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_clear_frame_area");
 
   r = NSIntersectionRect (r, [view frame]);
-  ns_focus (f, &r, 1);
-  [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
+  if (ns_clip_to_rect (f, &r, 1))
+    {
+      [ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), f) set];
 
-  NSRectFill (r);
+      NSRectFill (r);
 
-  ns_unfocus (f);
-  return;
+      ns_reset_clipping (f);
+    }
 }
 
 static void
 ns_copy_bits (struct frame *f, NSRect src, NSRect dest)
 {
+  NSSize delta = NSMakeSize (dest.origin.x - src.origin.x,
+                             dest.origin.y - src.origin.y);
   NSTRACE ("ns_copy_bits");
 
   if (FRAME_NS_VIEW (f))
     {
       hide_bell();              // Ensure the bell image isn't scrolled.
 
-      ns_focus (f, &dest, 1);
-      [FRAME_NS_VIEW (f) scrollRect: src
-                                 by: NSMakeSize (dest.origin.x - src.origin.x,
-                                                 dest.origin.y - src.origin.y)];
-      ns_unfocus (f);
+      /* FIXME: scrollRect:by: is deprecated in macOS 10.14.  There is
+         no obvious replacement so we may have to come up with our own.  */
+      [FRAME_NS_VIEW (f) scrollRect: src by: delta];
+
+#ifdef NS_IMPL_COCOA
+      /* As far as I can tell from the documentation, scrollRect:by:,
+         above, should copy the dirty rectangles from our source
+         rectangle to our destination, however it appears it clips the
+         operation to src.  As a result we need to use
+         translateRectsNeedingDisplayInRect:by: below, and we have to
+         union src and dest so it can pick up the dirty rectangles,
+         and place them, as it also clips to the rectangle.
+
+         FIXME: We need a GNUstep equivalent.  */
+      [FRAME_NS_VIEW (f) translateRectsNeedingDisplayInRect:NSUnionRect (src, dest)
+                                                         by:delta];
+#endif
     }
 }
 
@@ -2837,12 +2801,20 @@
     External (RIF): copy an area horizontally, don't worry about clearing src
    -------------------------------------------------------------------------- */
 {
-  NSRect srcRect = NSMakeRect (x, y, width, height);
+  //NSRect srcRect = NSMakeRect (x, y, width, height);
   NSRect dstRect = NSMakeRect (x+shift_by, y, width, height);
 
   NSTRACE ("ns_shift_glyphs_for_insert");
 
-  ns_copy_bits (f, srcRect, dstRect);
+  /* This doesn't work now as we copy the "bits" before we've had a
+     chance to actually draw any changes to the screen.  This means in
+     certain circumstances we end up with copies of the cursor all
+     over the place.  Just mark the area dirty so it is redrawn later.
+
+     FIXME: Work out how to do this properly.  */
+  // ns_copy_bits (f, srcRect, dstRect);
+
+  [FRAME_NS_VIEW (f) setNeedsDisplayInRect:dstRect];
 }
 
 
@@ -2923,6 +2895,9 @@
   struct face *face = p->face;
   static EmacsImage **bimgs = NULL;
   static int nBimgs = 0;
+  NSRect clearRect = NSZeroRect;
+  NSRect imageRect = NSZeroRect;
+  NSRect rowRect = ns_row_rect (w, row, ANY_AREA);
 
   NSTRACE_WHEN (NSTRACE_GROUP_FRINGE, "ns_draw_fringe_bitmap");
   NSTRACE_MSG ("which:%d cursor:%d overlay:%d width:%d height:%d period:%d",
@@ -2937,86 +2912,95 @@
       nBimgs = max_used_fringe_bitmap;
     }
 
-  /* Must clip because of partially visible lines.  */
-  ns_clip_to_row (w, row, ANY_AREA, YES);
+  /* Work out the rectangle we will composite into.  */
+  if (p->which)
+    imageRect = NSMakeRect (p->x, p->y, p->wd, p->h);
 
-  if (!p->overlay_p)
+  /* Work out the rectangle we will need to clear.  Because we're
+     compositing rather than blitting, we need to clear the area under
+     the image regardless of anything else.  */
+  if (p->bx >= 0 && !p->overlay_p)
     {
-      int bx = p->bx, by = p->by, nx = p->nx, ny = p->ny;
-
-      if (bx >= 0 && nx > 0)
-        {
-          NSRect r = NSMakeRect (bx, by, nx, ny);
-          NSRectClip (r);
-          [ns_lookup_indexed_color (face->background, f) set];
-          NSRectFill (r);
-        }
+      clearRect = NSMakeRect (p->bx, p->by, p->nx, p->ny);
+      clearRect = NSUnionRect (clearRect, imageRect);
     }
-
-  if (p->which)
+  else
     {
-      NSRect r = NSMakeRect (p->x, p->y, p->wd, p->h);
-      EmacsImage *img = bimgs[p->which - 1];
+      clearRect = imageRect;
+    }
+
+  /* Handle partially visible rows.  */
+  clearRect = NSIntersectionRect (clearRect, rowRect);
 
-      if (!img)
+  /* The visible portion of imageRect will always be contained within
+     clearRect.  */
+  if (ns_clip_to_rect (f, &clearRect, 1))
+    {
+      if (! NSIsEmptyRect (clearRect))
         {
-          // Note: For "periodic" images, allocate one EmacsImage for
-          // the base image, and use it for all dh:s.
-          unsigned short *bits = p->bits;
-          int full_height = p->h + p->dh;
-          int i;
-          unsigned char *cbits = xmalloc (full_height);
+          NSTRACE_RECT ("clearRect", clearRect);
 
-          for (i = 0; i < full_height; i++)
-            cbits[i] = bits[i];
-          img = [[EmacsImage alloc] initFromXBM: cbits width: 8
-                                         height: full_height
-                                             fg: 0 bg: 0];
-          bimgs[p->which - 1] = img;
-          xfree (cbits);
+          [ns_lookup_indexed_color(face->background, f) set];
+          NSRectFill (clearRect);
         }
 
-      NSTRACE_RECT ("r", r);
-
-      NSRectClip (r);
-      /* Since we composite the bitmap instead of just blitting it, we need
-         to erase the whole background. */
-      [ns_lookup_indexed_color(face->background, f) set];
-      NSRectFill (r);
+      if (p->which)
+        {
+          EmacsImage *img = bimgs[p->which - 1];
 
-      {
-        NSColor *bm_color;
-        if (!p->cursor_p)
-          bm_color = ns_lookup_indexed_color(face->foreground, f);
-        else if (p->overlay_p)
-          bm_color = ns_lookup_indexed_color(face->background, f);
-        else
-          bm_color = f->output_data.ns->cursor_color;
-        [img setXBMColor: bm_color];
-      }
+          if (!img)
+            {
+              // Note: For "periodic" images, allocate one EmacsImage for
+              // the base image, and use it for all dh:s.
+              unsigned short *bits = p->bits;
+              int full_height = p->h + p->dh;
+              int i;
+              unsigned char *cbits = xmalloc (full_height);
+
+              for (i = 0; i < full_height; i++)
+                cbits[i] = bits[i];
+              img = [[EmacsImage alloc] initFromXBM: cbits width: 8
+                                             height: full_height
+                                                 fg: 0 bg: 0];
+              bimgs[p->which - 1] = img;
+              xfree (cbits);
+            }
 
-#ifdef NS_IMPL_COCOA
-      // Note: For periodic images, the full image height is "h + hd".
-      // By using the height h, a suitable part of the image is used.
-      NSRect fromRect = NSMakeRect(0, 0, p->wd, p->h);
 
-      NSTRACE_RECT ("fromRect", fromRect);
+          {
+            NSColor *bm_color;
+            if (!p->cursor_p)
+              bm_color = ns_lookup_indexed_color(face->foreground, f);
+            else if (p->overlay_p)
+              bm_color = ns_lookup_indexed_color(face->background, f);
+            else
+              bm_color = f->output_data.ns->cursor_color;
+            [img setXBMColor: bm_color];
+          }
 
-      [img drawInRect: r
-              fromRect: fromRect
-             operation: NSCompositingOperationSourceOver
-              fraction: 1.0
-           respectFlipped: YES
-                hints: nil];
+#ifdef NS_IMPL_COCOA
+          // Note: For periodic images, the full image height is "h + hd".
+          // By using the height h, a suitable part of the image is used.
+          NSRect fromRect = NSMakeRect(0, 0, p->wd, p->h);
+
+          NSTRACE_RECT ("fromRect", fromRect);
+
+          [img drawInRect: imageRect
+                 fromRect: fromRect
+                operation: NSCompositingOperationSourceOver
+                 fraction: 1.0
+               respectFlipped: YES
+                    hints: nil];
 #else
-      {
-        NSPoint pt = r.origin;
-        pt.y += p->h;
-        [img compositeToPoint: pt operation: NSCompositingOperationSourceOver];
-      }
+          {
+            NSPoint pt = imageRect.origin;
+            pt.y += p->h;
+            [img compositeToPoint: pt operation: NSCompositingOperationSourceOver];
+          }
 #endif
+        }
+      ns_reset_clipping (f);
     }
-  ns_unfocus (f);
 }
 
 
@@ -3098,67 +3082,62 @@
   r.size.height = h;
   r.size.width = w->phys_cursor_width;
 
-  /* Prevent the cursor from being drawn outside the text area. */
-  ns_clip_to_row (w, glyph_row, TEXT_AREA, NO); /* do ns_focus(f, &r, 1); if remove */
-
-
-  face = FACE_FROM_ID_OR_NULL (f, phys_cursor_glyph->face_id);
-  if (face && NS_FACE_BACKGROUND (face)
-      == ns_index_color (FRAME_CURSOR_COLOR (f), f))
-    {
-      [ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), f) set];
-      hollow_color = FRAME_CURSOR_COLOR (f);
-    }
-  else
-    [FRAME_CURSOR_COLOR (f) set];
-
-#ifdef NS_IMPL_COCOA
-  /* TODO: This makes drawing of cursor plus that of phys_cursor_glyph
-           atomic.  Cleaner ways of doing this should be investigated.
-           One way would be to set a global variable DRAWING_CURSOR
-  	   when making the call to draw_phys..(), don't focus in that
-  	   case, then move the ns_unfocus() here after that call. */
-  NSDisableScreenUpdates ();
-#endif
+  /* Prevent the cursor from being drawn outside the text area.  */
+  r = NSIntersectionRect (r, ns_row_rect (w, glyph_row, TEXT_AREA));
 
-  switch (cursor_type)
+  if (ns_clip_to_rect (f, &r, 1))
     {
-    case DEFAULT_CURSOR:
-    case NO_CURSOR:
-      break;
-    case FILLED_BOX_CURSOR:
-      NSRectFill (r);
-      break;
-    case HOLLOW_BOX_CURSOR:
-      NSRectFill (r);
-      [hollow_color set];
-      NSRectFill (NSInsetRect (r, 1, 1));
-      [FRAME_CURSOR_COLOR (f) set];
-      break;
-    case HBAR_CURSOR:
-      NSRectFill (r);
-      break;
-    case BAR_CURSOR:
-      s = r;
-      /* If the character under cursor is R2L, draw the bar cursor
-         on the right of its glyph, rather than on the left.  */
-      cursor_glyph = get_phys_cursor_glyph (w);
-      if ((cursor_glyph->resolved_level & 1) != 0)
-        s.origin.x += cursor_glyph->pixel_width - s.size.width;
+      face = FACE_FROM_ID_OR_NULL (f, phys_cursor_glyph->face_id);
+      if (face && NS_FACE_BACKGROUND (face)
+          == ns_index_color (FRAME_CURSOR_COLOR (f), f))
+        {
+          [ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), f) set];
+          hollow_color = FRAME_CURSOR_COLOR (f);
+        }
+      else
+        [FRAME_CURSOR_COLOR (f) set];
 
-      NSRectFill (s);
-      break;
-    }
-  ns_unfocus (f);
+      switch (cursor_type)
+        {
+        case DEFAULT_CURSOR:
+        case NO_CURSOR:
+          break;
+        case FILLED_BOX_CURSOR:
+          NSRectFill (r);
+          break;
+        case HOLLOW_BOX_CURSOR:
+          NSRectFill (r);
+          [hollow_color set];
+          NSRectFill (NSInsetRect (r, 1, 1));
+          [FRAME_CURSOR_COLOR (f) set];
+          break;
+        case HBAR_CURSOR:
+          NSRectFill (r);
+          break;
+        case BAR_CURSOR:
+          s = r;
+          /* If the character under cursor is R2L, draw the bar cursor
+             on the right of its glyph, rather than on the left.  */
+          cursor_glyph = get_phys_cursor_glyph (w);
+          if ((cursor_glyph->resolved_level & 1) != 0)
+            s.origin.x += cursor_glyph->pixel_width - s.size.width;
 
-  /* draw the character under the cursor */
-  if (cursor_type != NO_CURSOR)
-    draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR);
+          NSRectFill (s);
+          break;
+        }
 
-#ifdef NS_IMPL_COCOA
-  NSEnableScreenUpdates ();
-#endif
+      /* draw the character under the cursor */
+      if (cursor_type != NO_CURSOR)
+        draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR);
 
+      ns_reset_clipping (f);
+    }
+  else if (! redisplaying_p)
+    {
+      /* If this function is called outside redisplay, it probably
+         means we need an immediate update.  */
+      [FRAME_NS_VIEW (f) display];
+    }
 }
 
 
@@ -3176,12 +3155,14 @@
 
   face = FACE_FROM_ID_OR_NULL (f, VERTICAL_BORDER_FACE_ID);
 
-  ns_focus (f, &r, 1);
-  if (face)
-    [ns_lookup_indexed_color(face->foreground, f) set];
+  if (ns_clip_to_rect (f, &r, 1))
+    {
+      if (face)
+        [ns_lookup_indexed_color(face->foreground, f) set];
 
-  NSRectFill(r);
-  ns_unfocus (f);
+      NSRectFill(r);
+      ns_reset_clipping (f);
+    }
 }
 
 
@@ -3208,39 +3189,40 @@
 
   NSTRACE ("ns_draw_window_divider");
 
-  ns_focus (f, ÷r, 1);
-
-  if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3))
-    /* A vertical divider, at least three pixels wide: Draw first and
-       last pixels differently.  */
-    {
-      [ns_lookup_indexed_color(color_first, f) set];
-      NSRectFill(NSMakeRect (x0, y0, 1, y1 - y0));
-      [ns_lookup_indexed_color(color, f) set];
-      NSRectFill(NSMakeRect (x0 + 1, y0, x1 - x0 - 2, y1 - y0));
-      [ns_lookup_indexed_color(color_last, f) set];
-      NSRectFill(NSMakeRect (x1 - 1, y0, 1, y1 - y0));
-    }
-  else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3))
-    /* A horizontal divider, at least three pixels high: Draw first and
-       last pixels differently.  */
-    {
-      [ns_lookup_indexed_color(color_first, f) set];
-      NSRectFill(NSMakeRect (x0, y0, x1 - x0, 1));
-      [ns_lookup_indexed_color(color, f) set];
-      NSRectFill(NSMakeRect (x0, y0 + 1, x1 - x0, y1 - y0 - 2));
-      [ns_lookup_indexed_color(color_last, f) set];
-      NSRectFill(NSMakeRect (x0, y1 - 1, x1 - x0, 1));
-    }
-  else
+  if (ns_clip_to_rect (f, ÷r, 1))
     {
-      /* In any other case do not draw the first and last pixels
-         differently.  */
-      [ns_lookup_indexed_color(color, f) set];
-      NSRectFill(divider);
-    }
+      if ((y1 - y0 > x1 - x0) && (x1 - x0 >= 3))
+        /* A vertical divider, at least three pixels wide: Draw first and
+           last pixels differently.  */
+        {
+          [ns_lookup_indexed_color(color_first, f) set];
+          NSRectFill(NSMakeRect (x0, y0, 1, y1 - y0));
+          [ns_lookup_indexed_color(color, f) set];
+          NSRectFill(NSMakeRect (x0 + 1, y0, x1 - x0 - 2, y1 - y0));
+          [ns_lookup_indexed_color(color_last, f) set];
+          NSRectFill(NSMakeRect (x1 - 1, y0, 1, y1 - y0));
+        }
+      else if ((x1 - x0 > y1 - y0) && (y1 - y0 >= 3))
+        /* A horizontal divider, at least three pixels high: Draw first and
+           last pixels differently.  */
+        {
+          [ns_lookup_indexed_color(color_first, f) set];
+          NSRectFill(NSMakeRect (x0, y0, x1 - x0, 1));
+          [ns_lookup_indexed_color(color, f) set];
+          NSRectFill(NSMakeRect (x0, y0 + 1, x1 - x0, y1 - y0 - 2));
+          [ns_lookup_indexed_color(color_last, f) set];
+          NSRectFill(NSMakeRect (x0, y1 - 1, x1 - x0, 1));
+        }
+      else
+        {
+          /* In any other case do not draw the first and last pixels
+             differently.  */
+          [ns_lookup_indexed_color(color, f) set];
+          NSRectFill(divider);
+        }
 
-  ns_unfocus (f);
+      ns_reset_clipping (f);
+    }
 }
 
 static void
@@ -3824,83 +3806,84 @@
       n = ns_get_glyph_string_clip_rect (s, r);
       *r = NSMakeRect (s->x, s->y, s->background_width, s->height);
 
-      ns_focus (s->f, r, n);
-
-      if (s->hl == DRAW_MOUSE_FACE)
-       {
-         face = FACE_FROM_ID_OR_NULL (s->f,
-				      MOUSE_HL_INFO (s->f)->mouse_face_face_id);
-         if (!face)
-           face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
-       }
-      else
-       face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
-
-      bgCol = ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f);
-      fgCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f);
-
-      for (i = 0; i < n; ++i)
+      if (ns_clip_to_rect (s->f, r, n))
         {
-          if (!s->row->full_width_p)
+          if (s->hl == DRAW_MOUSE_FACE)
             {
-	      int overrun, leftoverrun;
+              face = FACE_FROM_ID_OR_NULL (s->f,
+                                           MOUSE_HL_INFO (s->f)->mouse_face_face_id);
+              if (!face)
+                face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
+            }
+          else
+            face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
 
-              /* truncate to avoid overwriting fringe and/or scrollbar */
-	      overrun = max (0, (s->x + s->background_width)
-			     - (WINDOW_BOX_RIGHT_EDGE_X (s->w)
-				- WINDOW_RIGHT_FRINGE_WIDTH (s->w)));
-              r[i].size.width -= overrun;
-
-	      /* truncate to avoid overwriting to left of the window box */
-	      leftoverrun = (WINDOW_BOX_LEFT_EDGE_X (s->w)
-			     + WINDOW_LEFT_FRINGE_WIDTH (s->w)) - s->x;
+          bgCol = ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f);
+          fgCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f);
 
-	      if (leftoverrun > 0)
-		{
-		  r[i].origin.x += leftoverrun;
-		  r[i].size.width -= leftoverrun;
-		}
+          for (i = 0; i < n; ++i)
+            {
+              if (!s->row->full_width_p)
+                {
+                  int overrun, leftoverrun;
 
-              /* XXX: Try to work between problem where a stretch glyph on
-                 a partially-visible bottom row will clear part of the
-                 modeline, and another where list-buffers headers and similar
-                 rows erroneously have visible_height set to 0.  Not sure
-                 where this is coming from as other terms seem not to show. */
-              r[i].size.height = min (s->height, s->row->visible_height);
-            }
+                  /* truncate to avoid overwriting fringe and/or scrollbar */
+                  overrun = max (0, (s->x + s->background_width)
+                                 - (WINDOW_BOX_RIGHT_EDGE_X (s->w)
+                                    - WINDOW_RIGHT_FRINGE_WIDTH (s->w)));
+                  r[i].size.width -= overrun;
+
+                  /* truncate to avoid overwriting to left of the window box */
+                  leftoverrun = (WINDOW_BOX_LEFT_EDGE_X (s->w)
+                                 + WINDOW_LEFT_FRINGE_WIDTH (s->w)) - s->x;
+
+                    if (leftoverrun > 0)
+                      {
+                        r[i].origin.x += leftoverrun;
+                        r[i].size.width -= leftoverrun;
+                      }
+
+                    /* XXX: Try to work between problem where a stretch glyph on
+                       a partially-visible bottom row will clear part of the
+                       modeline, and another where list-buffers headers and similar
+                       rows erroneously have visible_height set to 0.  Not sure
+                       where this is coming from as other terms seem not to show.  */
+                    r[i].size.height = min (s->height, s->row->visible_height);
+                }
 
-          [bgCol set];
+              [bgCol set];
 
-          /* NOTE: under NS this is NOT used to draw cursors, but we must avoid
-             overwriting cursor (usually when cursor on a tab) */
-          if (s->hl == DRAW_CURSOR)
-            {
-              CGFloat x, width;
+              /* NOTE: under NS this is NOT used to draw cursors, but we must avoid
+                 overwriting cursor (usually when cursor on a tab).  */
+              if (s->hl == DRAW_CURSOR)
+                {
+                  CGFloat x, width;
 
-              x = r[i].origin.x;
-              width = s->w->phys_cursor_width;
-              r[i].size.width -= width;
-              r[i].origin.x += width;
-
-              NSRectFill (r[i]);
-
-              /* Draw overlining, etc. on the cursor. */
-              if (s->w->phys_cursor_type == FILLED_BOX_CURSOR)
-                ns_draw_text_decoration (s, face, bgCol, width, x);
+                  x = r[i].origin.x;
+                  width = s->w->phys_cursor_width;
+                  r[i].size.width -= width;
+                  r[i].origin.x += width;
+
+                  NSRectFill (r[i]);
+
+                  /* Draw overlining, etc. on the cursor.  */
+                  if (s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+                    ns_draw_text_decoration (s, face, bgCol, width, x);
+                  else
+                    ns_draw_text_decoration (s, face, fgCol, width, x);
+                }
               else
-                ns_draw_text_decoration (s, face, fgCol, width, x);
-            }
-          else
-            {
-              NSRectFill (r[i]);
-            }
+                {
+                  NSRectFill (r[i]);
+                }
 
-          /* Draw overlining, etc. on the stretch glyph (or the part
-             of the stretch glyph after the cursor). */
-          ns_draw_text_decoration (s, face, fgCol, r[i].size.width,
-                                   r[i].origin.x);
+              /* Draw overlining, etc. on the stretch glyph (or the part
+                 of the stretch glyph after the cursor).  */
+              ns_draw_text_decoration (s, face, fgCol, r[i].size.width,
+                                       r[i].origin.x);
+            }
+          ns_reset_clipping (s->f);
         }
-      ns_unfocus (s->f);
       s->background_filled_p = 1;
     }
 }
@@ -4050,9 +4033,11 @@
             if (next->first_glyph->type != STRETCH_GLYPH)
               {
                 n = ns_get_glyph_string_clip_rect (s->next, r);
-                ns_focus (s->f, r, n);
-                ns_maybe_dumpglyphs_background (s->next, 1);
-                ns_unfocus (s->f);
+                if (ns_clip_to_rect (s->f, r, n))
+                  {
+                    ns_maybe_dumpglyphs_background (s->next, 1);
+                    ns_reset_clipping (s->f);
+                  }
               }
             else
               {
@@ -4067,10 +4052,12 @@
 	    || s->first_glyph->type == COMPOSITE_GLYPH))
     {
       n = ns_get_glyph_string_clip_rect (s, r);
-      ns_focus (s->f, r, n);
-      ns_maybe_dumpglyphs_background (s, 1);
-      ns_dumpglyphs_box_or_relief (s);
-      ns_unfocus (s->f);
+      if (ns_clip_to_rect (s->f, r, n))
+        {
+          ns_maybe_dumpglyphs_background (s, 1);
+          ns_dumpglyphs_box_or_relief (s);
+          ns_reset_clipping (s->f);
+        }
       box_drawn_p = 1;
     }
 
@@ -4079,9 +4066,11 @@
 
     case IMAGE_GLYPH:
       n = ns_get_glyph_string_clip_rect (s, r);
-      ns_focus (s->f, r, n);
-      ns_dumpglyphs_image (s, r[0]);
-      ns_unfocus (s->f);
+      if (ns_clip_to_rect (s->f, r, n))
+        {
+          ns_dumpglyphs_image (s, r[0]);
+          ns_reset_clipping (s->f);
+        }
       break;
 
     case STRETCH_GLYPH:
@@ -4091,66 +4080,68 @@
     case CHAR_GLYPH:
     case COMPOSITE_GLYPH:
       n = ns_get_glyph_string_clip_rect (s, r);
-      ns_focus (s->f, r, n);
+      if (ns_clip_to_rect (s->f, r, n))
+        {
+          if (s->for_overlaps || (s->cmp_from > 0
+                                  && ! s->first_glyph->u.cmp.automatic))
+            s->background_filled_p = 1;
+          else
+            ns_maybe_dumpglyphs_background
+              (s, s->first_glyph->type == COMPOSITE_GLYPH);
 
-      if (s->for_overlaps || (s->cmp_from > 0
-			      && ! s->first_glyph->u.cmp.automatic))
-        s->background_filled_p = 1;
-      else
-        ns_maybe_dumpglyphs_background
-          (s, s->first_glyph->type == COMPOSITE_GLYPH);
+          if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+            {
+              unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+              NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+              NS_FACE_FOREGROUND (s->face) = tmp;
+            }
 
-      if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
-        {
-          unsigned long tmp = NS_FACE_BACKGROUND (s->face);
-          NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
-          NS_FACE_FOREGROUND (s->face) = tmp;
-        }
+          {
+            BOOL isComposite = s->first_glyph->type == COMPOSITE_GLYPH;
 
-      {
-        BOOL isComposite = s->first_glyph->type == COMPOSITE_GLYPH;
+            if (isComposite)
+              ns_draw_composite_glyph_string_foreground (s);
+            else
+              ns_draw_glyph_string_foreground (s);
+          }
 
-        if (isComposite)
-          ns_draw_composite_glyph_string_foreground (s);
-        else
-          ns_draw_glyph_string_foreground (s);
-      }
+          {
+            NSColor *col = (NS_FACE_FOREGROUND (s->face) != 0
+                            ? ns_lookup_indexed_color (NS_FACE_FOREGROUND (s->face),
+                                                       s->f)
+                            : FRAME_FOREGROUND_COLOR (s->f));
+            [col set];
 
-      {
-        NSColor *col = (NS_FACE_FOREGROUND (s->face) != 0
-                        ? ns_lookup_indexed_color (NS_FACE_FOREGROUND (s->face),
-                                                   s->f)
-                        : FRAME_FOREGROUND_COLOR (s->f));
-        [col set];
+            /* Draw underline, overline, strike-through.  */
+            ns_draw_text_decoration (s, s->face, col, s->width, s->x);
+          }
 
-        /* Draw underline, overline, strike-through. */
-        ns_draw_text_decoration (s, s->face, col, s->width, s->x);
-      }
+          if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+            {
+              unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+              NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+              NS_FACE_FOREGROUND (s->face) = tmp;
+            }
 
-      if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
-        {
-          unsigned long tmp = NS_FACE_BACKGROUND (s->face);
-          NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
-          NS_FACE_FOREGROUND (s->face) = tmp;
+          ns_reset_clipping (s->f);
         }
-
-      ns_unfocus (s->f);
       break;
 
     case GLYPHLESS_GLYPH:
       n = ns_get_glyph_string_clip_rect (s, r);
-      ns_focus (s->f, r, n);
-
-      if (s->for_overlaps || (s->cmp_from > 0
-			      && ! s->first_glyph->u.cmp.automatic))
-        s->background_filled_p = 1;
-      else
-        ns_maybe_dumpglyphs_background
-          (s, s->first_glyph->type == COMPOSITE_GLYPH);
-      /* ... */
-      /* Not yet implemented.  */
-      /* ... */
-      ns_unfocus (s->f);
+      if (ns_clip_to_rect (s->f, r, n))
+        {
+          if (s->for_overlaps || (s->cmp_from > 0
+                                  && ! s->first_glyph->u.cmp.automatic))
+            s->background_filled_p = 1;
+          else
+            ns_maybe_dumpglyphs_background
+              (s, s->first_glyph->type == COMPOSITE_GLYPH);
+          /* ... */
+          /* Not yet implemented.  */
+          /* ... */
+          ns_reset_clipping (s->f);
+        }
       break;
 
     default:
@@ -4161,9 +4152,11 @@
   if (!s->for_overlaps && !box_drawn_p && s->face->box != FACE_NO_BOX)
     {
       n = ns_get_glyph_string_clip_rect (s, r);
-      ns_focus (s->f, r, n);
-      ns_dumpglyphs_box_or_relief (s);
-      ns_unfocus (s->f);
+      if (ns_clip_to_rect (s->f, r, n))
+        {
+          ns_dumpglyphs_box_or_relief (s);
+          ns_reset_clipping (s->f);
+        }
     }
 
   s->num_clips = 0;
@@ -5186,7 +5179,21 @@
                                       alpha: 1.0]
                   forKey: [NSString stringWithUTF8String: name]];
           }
-        [cl writeToFile: nil];
+
+        /* FIXME: Report any errors writing the color file below.  */
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+        if ([cl respondsToSelector:@selector(writeToURL:error:)])
+#endif
+          [cl writeToURL:nil error:nil];
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+        else
+#endif
+#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 */
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100 \
+  || defined (NS_IMPL_GNUSTEP)
+          [cl writeToFile: nil];
+#endif
       }
   }
 
@@ -6295,14 +6302,20 @@
          by doCommandBySelector: deleteBackward: */
 - (void)insertText: (id)aString
 {
-  int code;
-  int len = [(NSString *)aString length];
-  int i;
+  NSString *s;
+  NSUInteger len;
 
   NSTRACE ("[EmacsView insertText:]");
 
+  if ([aString isKindOfClass:[NSAttributedString class]])
+    s = [aString string];
+  else
+    s = aString;
+
+  len = [s length];
+
   if (NS_KEYLOG)
-    NSLog (@"insertText '%@'\tlen = %d", aString, len);
+    NSLog (@"insertText '%@'\tlen = %lu", aString, (unsigned long) len);
   processingCompose = NO;
 
   if (!emacs_event)
@@ -6312,10 +6325,24 @@
   if (workingText != nil)
     [self deleteWorkingText];
 
+  /* It might be preferable to use getCharacters:range: below,
+     cf. https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CocoaPerformance/Articles/StringDrawing.html#//apple_ref/doc/uid/TP40001445-112378.
+     However, we probably can't use SAFE_NALLOCA here because it might
+     exit nonlocally.  */
+
   /* now insert the string as keystrokes */
-  for (i =0; i<len; i++)
+  for (NSUInteger i = 0; i < len; i++)
     {
-      code = [aString characterAtIndex: i];
+      NSUInteger code = [s characterAtIndex:i];
+      if (UTF_16_HIGH_SURROGATE_P (code) && i < len - 1)
+        {
+          unichar low = [s characterAtIndex:i + 1];
+          if (UTF_16_LOW_SURROGATE_P (low))
+            {
+              code = surrogates_to_codepoint (low, code);
+              ++i;
+            }
+        }
       /* TODO: still need this? */
       if (code == 0x2DC)
         code = '~'; /* 0x7E */
@@ -7004,7 +7031,6 @@
         size_title = xmalloc (strlen (old_title) + 40);
 	esprintf (size_title, "%s  —  (%d x %d)", old_title, cols, rows);
         [window setTitle: [NSString stringWithUTF8String: size_title]];
-        [window display];
         xfree (size_title);
       }
   }
@@ -8051,10 +8077,18 @@
 }
 
 
+- (void)viewWillDraw
+{
+  /* If the frame has been garbaged there's no point in redrawing
+     anything.  */
+  if (FRAME_GARBAGED_P (emacsframe))
+    [self setNeedsDisplay:NO];
+}
+
 - (void)drawRect: (NSRect)rect
 {
-  int x = NSMinX (rect), y = NSMinY (rect);
-  int width = NSWidth (rect), height = NSHeight (rect);
+  const NSRect *rectList;
+  NSInteger numRects;
 
   NSTRACE ("[EmacsView drawRect:" NSTRACE_FMT_RECT "]",
            NSTRACE_ARG_RECT(rect));
@@ -8062,9 +8096,26 @@
   if (!emacsframe || !emacsframe->output_data.ns)
     return;
 
-  ns_clear_frame_area (emacsframe, x, y, width, height);
   block_input ();
-  expose_frame (emacsframe, x, y, width, height);
+
+  /* Get only the precise dirty rectangles to avoid redrawing
+     potentially large areas of the frame that haven't changed.
+
+     I'm not sure this actually provides much of a performance benefit
+     as it's hard to benchmark, but it certainly doesn't seem to
+     hurt.  */
+  [self getRectsBeingDrawn:&rectList count:&numRects];
+  for (int i = 0 ; i < numRects ; i++)
+    {
+      NSRect r = rectList[i];
+
+      NSTRACE_RECT ("r", r);
+
+      expose_frame (emacsframe,
+                    NSMinX (r), NSMinY (r),
+                    NSWidth (r), NSHeight (r));
+    }
+
   unblock_input ();
 
   /*
diff -Nru emacs-26.1+1/src/print.c emacs-26.3+1/src/print.c
--- emacs-26.1+1/src/print.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/print.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Lisp object printing and output streams.
 
-Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2018 Free Software
+Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/process.c emacs-26.3+1/src/process.c
--- emacs-26.1+1/src/process.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/process.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Asynchronous subprocess control for GNU Emacs.
 
-Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2018 Free Software
+Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1268,10 +1268,19 @@
   if (NILP (filter))
     filter = Qinternal_default_process_filter;
 
-  pset_filter (p, filter);
-
   if (p->infd >= 0)
-    set_process_filter_masks (p);
+    {
+      /* If filter WILL be t, stop reading output.  */
+      if (EQ (filter, Qt) && !EQ (p->status, Qlisten))
+        delete_read_fd (p->infd);
+      else if (/* If filter WAS t, then resume reading output.  */
+               EQ (p->filter, Qt)
+               /* Network or serial process not stopped:  */
+               && !EQ (p->command, Qt))
+        add_process_read_fd (p->infd);
+    }
+
+  pset_filter (p, filter);
 
   if (NETCONN1_P (p) || SERIALCONN1_P (p) || PIPECONN1_P (p))
     pset_childp (p, Fplist_put (p->childp, QCfilter, filter));
@@ -1350,7 +1359,7 @@
 
 DEFUN ("process-thread", Fprocess_thread, Sprocess_thread,
        1, 1, 0,
-       doc: /* Ret the locking thread of PROCESS.
+       doc: /* Return the locking thread of PROCESS.
 If PROCESS is unlocked, this function returns nil.  */)
   (Lisp_Object process)
 {
@@ -3321,11 +3330,9 @@
 connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
                         Lisp_Object use_external_socket_p)
 {
-  ptrdiff_t count = SPECPDL_INDEX ();
   int s = -1, outch, inch;
   int xerrno = 0;
   int family;
-  struct sockaddr *sa = NULL;
   int ret;
   ptrdiff_t addrlen;
   struct Lisp_Process *p = XPROCESS (proc);
@@ -3344,6 +3351,11 @@
   /* Do this in case we never enter the while-loop below.  */
   s = -1;
 
+  struct sockaddr *sa = NULL;
+  ptrdiff_t count = SPECPDL_INDEX ();
+  record_unwind_protect_nothing ();
+  ptrdiff_t count1 = SPECPDL_INDEX ();
+
   while (!NILP (addrinfos))
     {
       Lisp_Object addrinfo = XCAR (addrinfos);
@@ -3356,9 +3368,8 @@
 #endif
 
       addrlen = get_lisp_to_sockaddr_size (ip_address, &family);
-      if (sa)
-	free (sa);
-      sa = xmalloc (addrlen);
+      sa = xrealloc (sa, addrlen);
+      set_unwind_protect_ptr (count, xfree, sa);
       conv_lisp_to_sockaddr (family, ip_address, sa, addrlen);
 
       s = socket_to_use;
@@ -3520,7 +3531,7 @@
 #endif /* !WINDOWSNT */
 
       /* Discard the unwind protect closing S.  */
-      specpdl_ptr = specpdl + count;
+      specpdl_ptr = specpdl + count1;
       emacs_close (s);
       s = -1;
       if (0 <= socket_to_use)
@@ -3578,17 +3589,24 @@
 
   if (s < 0)
     {
+      const char *err = (p->is_server
+			 ? "make server process failed"
+			 : "make client process failed");
+
       /* If non-blocking got this far - and failed - assume non-blocking is
 	 not supported after all.  This is probably a wrong assumption, but
 	 the normal blocking calls to open-network-stream handles this error
 	 better.  */
       if (p->is_non_blocking_client)
-	return;
+	{
+	  Lisp_Object data = get_file_errno_data (err, contact, xerrno);
+
+	  pset_status (p, list2 (Fcar (data), Fcdr (data)));
+	  unbind_to (count, Qnil);
+	  return;
+	}
 
-      report_file_errno ((p->is_server
-			  ? "make server process failed"
-			  : "make client process failed"),
-			 contact, xerrno);
+      report_file_errno (err, contact, xerrno);
     }
 
   inch = s;
@@ -3604,7 +3622,7 @@
   p->outfd = outch;
 
   /* Discard the unwind protect for closing S, if any.  */
-  specpdl_ptr = specpdl + count;
+  specpdl_ptr = specpdl + count1;
 
   if (p->is_server && p->socktype != SOCK_DGRAM)
     pset_status (p, Qlisten);
@@ -3665,6 +3683,7 @@
     }
 #endif
 
+  unbind_to (count, Qnil);
 }
 
 /* Create a network stream/datagram client/server process.  Treated
@@ -3890,12 +3909,15 @@
   filter = Fplist_get (contact, QCfilter);
   sentinel = Fplist_get (contact, QCsentinel);
   use_external_socket_p = Fplist_get (contact, QCuse_external_socket);
+  Lisp_Object server = Fplist_get (contact, QCserver);
+  bool nowait = !NILP (Fplist_get (contact, QCnowait));
 
+  if (!NILP (server) && nowait)
+    error ("`:server' is incompatible with `:nowait'");
   CHECK_STRING (name);
 
   /* :local ADDRESS or :remote ADDRESS */
-  tem = Fplist_get (contact, QCserver);
-  if (NILP (tem))
+  if (NILP (server))
     address = Fplist_get (contact, QCremote);
   else
     address = Fplist_get (contact, QClocal);
@@ -4009,7 +4031,7 @@
     }
 
 #ifdef HAVE_GETADDRINFO_A
-  if (!NILP (host) && !NILP (Fplist_get (contact, QCnowait)))
+  if (!NILP (host) && nowait)
     {
       ptrdiff_t hostlen = SBYTES (host);
       struct req
@@ -4154,20 +4176,13 @@
 
   set_network_socket_coding_system (proc, host, service, name);
 
-  /* :server BOOL */
-  tem = Fplist_get (contact, QCserver);
-  if (!NILP (tem))
-    {
-      /* Don't support network sockets when non-blocking mode is
-	 not available, since a blocked Emacs is not useful.  */
-      p->is_server = true;
-      if (TYPE_RANGED_INTEGERP (int, tem))
-	p->backlog = XINT (tem);
-    }
+  /* :server QLEN */
+  p->is_server = !NILP (server);
+  if (TYPE_RANGED_INTEGERP (int, server))
+    p->backlog = XINT (server);
 
   /* :nowait BOOL */
-  if (!p->is_server && socktype != SOCK_DGRAM
-      && !NILP (Fplist_get (contact, QCnowait)))
+  if (!p->is_server && socktype != SOCK_DGRAM && nowait)
     p->is_non_blocking_client = true;
 
   bool postpone_connection = false;
@@ -4575,8 +4590,8 @@
        0, 4, 0,
        doc: /* Allow any pending output from subprocesses to be read by Emacs.
 It is given to their filter functions.
-Optional argument PROCESS means do not return until output has been
-received from PROCESS.
+Optional argument PROCESS means to return only after output is
+received from PROCESS or PROCESS closes the connection.
 
 Optional second argument SECONDS and third argument MILLISEC
 specify a timeout; return after that much time even if there is
@@ -4588,7 +4603,8 @@
 from PROCESS only, suspending reading output from other processes.
 If JUST-THIS-ONE is an integer, don't run any timers either.
 Return non-nil if we received any output from PROCESS (or, if PROCESS
-is nil, from any process) before the timeout expired.  */)
+is nil, from any process) before the timeout expired or the
+corresponding connection was closed.  */)
   (Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec,
    Lisp_Object just_this_one)
 {
@@ -4606,12 +4622,11 @@
 	{
 	  Lisp_Object proc_thread_name = XTHREAD (proc->thread)->name;
 
-	  if (STRINGP (proc_thread_name))
-	    error ("Attempt to accept output from process %s locked to thread %s",
-		   SDATA (proc->name), SDATA (proc_thread_name));
-	  else
-	    error ("Attempt to accept output from process %s locked to thread %p",
-		   SDATA (proc->name), XTHREAD (proc->thread));
+	  error ("Attempt to accept output from process %s locked to thread %s",
+		 SDATA (proc->name),
+		 STRINGP (proc_thread_name)
+		 ? SDATA (proc_thread_name)
+		 : SDATA (Fprin1_to_string (proc->thread, Qt)));
 	}
     }
   else
@@ -4718,19 +4733,24 @@
   service = Qnil;
   Lisp_Object args[11];
   int nargs = 0;
-  AUTO_STRING (procname_format_in, "%s <%d.%d.%d.%d:%d>");
-  AUTO_STRING (procname_format_in6, "%s <[%x:%x:%x:%x:%x:%x:%x:%x]:%d>");
+  #define HOST_FORMAT_IN "%d.%d.%d.%d"
+  #define HOST_FORMAT_IN6 "%x:%x:%x:%x:%x:%x:%x:%x"
+  AUTO_STRING (host_format_in, HOST_FORMAT_IN);
+  AUTO_STRING (host_format_in6, HOST_FORMAT_IN6);
+  AUTO_STRING (procname_format_in, "%s <"HOST_FORMAT_IN":%d>");
+  AUTO_STRING (procname_format_in6, "%s <["HOST_FORMAT_IN6"]:%d>");
   AUTO_STRING (procname_format_default, "%s <%d>");
   switch (saddr.sa.sa_family)
     {
     case AF_INET:
       {
 	args[nargs++] = procname_format_in;
-	nargs++;
+	args[nargs++] = host_format_in;
 	unsigned char *ip = (unsigned char *)&saddr.in.sin_addr.s_addr;
 	service = make_number (ntohs (saddr.in.sin_port));
 	for (int i = 0; i < 4; i++)
 	  args[nargs++] = make_number (ip[i]);
+	host = Fformat (5, args + 1);
 	args[nargs++] = service;
       }
       break;
@@ -4739,11 +4759,12 @@
     case AF_INET6:
       {
 	args[nargs++] = procname_format_in6;
-	nargs++;
+	args[nargs++] = host_format_in6;
 	DECLARE_POINTER_ALIAS (ip6, uint16_t, &saddr.in6.sin6_addr);
 	service = make_number (ntohs (saddr.in.sin_port));
 	for (int i = 0; i < 8; i++)
 	  args[nargs++] = make_number (ip6[i]);
+	host = Fformat (9, args + 1);
 	args[nargs++] = service;
       }
       break;
@@ -5009,6 +5030,7 @@
   struct timespec got_output_end_time = invalid_timespec ();
   enum { MINIMUM = -1, TIMEOUT, INFINITY } wait;
   int got_some_output = -1;
+  uintmax_t prev_wait_proc_nbytes_read = wait_proc ? wait_proc->nbytes_read : 0;
 #if defined HAVE_GETADDRINFO_A || defined HAVE_GNUTLS
   bool retry_for_async;
 #endif
@@ -5463,6 +5485,8 @@
       if (nfds == 0)
 	{
           /* Exit the main loop if we've passed the requested timeout,
+             or have read some bytes from our wait_proc (either directly
+             in this call or indirectly through timers / process filters),
              or aren't skipping processes and got some output and
              haven't lowered our timeout due to timers or SIGIO and
              have waited a long amount of time due to repeated
@@ -5470,7 +5494,9 @@
 	  struct timespec huge_timespec
 	    = make_timespec (TYPE_MAXIMUM (time_t), 2 * TIMESPEC_RESOLUTION);
 	  struct timespec cmp_time = huge_timespec;
-	  if (wait < TIMEOUT)
+	  if (wait < TIMEOUT
+              || (wait_proc
+                  && wait_proc->nbytes_read != prev_wait_proc_nbytes_read))
 	    break;
 	  if (wait == TIMEOUT)
 	    cmp_time = end_time;
@@ -5785,6 +5811,15 @@
       maybe_quit ();
     }
 
+  /* Timers and/or process filters that we have run could have themselves called
+     `accept-process-output' (and by that indirectly this function), thus
+     possibly reading some (or all) output of wait_proc without us noticing it.
+     This could potentially lead to an endless wait (dealt with earlier in the
+     function) and/or a wrong return value (dealt with here).  */
+  if (wait_proc && wait_proc->nbytes_read != prev_wait_proc_nbytes_read)
+    got_some_output = min (INT_MAX, (wait_proc->nbytes_read
+                                     - prev_wait_proc_nbytes_read));
+
   return got_some_output;
 }
 
@@ -5903,6 +5938,9 @@
       coding->mode |= CODING_MODE_LAST_BLOCK;
     }
 
+  /* Ignore carryover, it's been added by a previous iteration already.  */
+  p->nbytes_read += nbytes;
+
   /* Now set NBYTES how many bytes we must decode.  */
   nbytes += carryover;
 
@@ -6434,9 +6472,11 @@
 PROCESS may be a process, a buffer, the name of a process or buffer, or
 nil, indicating the current buffer's process.
 Called from program, takes three arguments, PROCESS, START and END.
-If the region is more than 500 characters long,
-it is sent in several bunches.  This may happen even for shorter regions.
-Output from processes can arrive in between bunches.
+If the region is larger than the input buffer of the process (the
+length of which depends on the process connection type and the
+operating system), it is sent in several bunches.  This may happen
+even for shorter regions.  Output from processes can arrive in between
+bunches.
 
 If PROCESS is a non-blocking network process that hasn't been fully
 set up yet, this function will block until socket setup has completed.  */)
@@ -6467,9 +6507,10 @@
        doc: /* Send PROCESS the contents of STRING as input.
 PROCESS may be a process, a buffer, the name of a process or buffer, or
 nil, indicating the current buffer's process.
-If STRING is more than 500 characters long,
-it is sent in several bunches.  This may happen even for shorter strings.
-Output from processes can arrive in between bunches.
+If STRING is larger than the input buffer of the process (the length
+of which depends on the process connection type and the operating
+system), it is sent in several bunches.  This may happen even for
+shorter strings.  Output from processes can arrive in between bunches.
 
 If PROCESS is a non-blocking network process that hasn't been fully
 set up yet, this function will block until socket setup has completed.  */)
diff -Nru emacs-26.1+1/src/process.h emacs-26.3+1/src/process.h
--- emacs-26.1+1/src/process.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/process.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions for asynchronous process control in GNU Emacs.
-   Copyright (C) 1985, 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -129,6 +129,8 @@
     pid_t pid;
     /* Descriptor by which we read from this process.  */
     int infd;
+    /* Byte-count modulo (UINTMAX_MAX + 1) for process output read from `infd'.  */
+    uintmax_t nbytes_read;
     /* Descriptor by which we write to this process.  */
     int outfd;
     /* Descriptors that were created for this process and that need
diff -Nru emacs-26.1+1/src/profiler.c emacs-26.3+1/src/profiler.c
--- emacs-26.1+1/src/profiler.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/profiler.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Profiler implementation.
 
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/puresize.h emacs-26.3+1/src/puresize.h
--- emacs-26.1+1/src/puresize.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/puresize.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/ralloc.c emacs-26.3+1/src/ralloc.c
--- emacs-26.1+1/src/ralloc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/ralloc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Block-relocating memory allocator.
-   Copyright (C) 1993, 1995, 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/README emacs-26.3+1/src/README
--- emacs-26.1+1/src/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff -Nru emacs-26.1+1/src/regex.c emacs-26.3+1/src/regex.c
--- emacs-26.1+1/src/regex.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/regex.c	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
    0.12.  (Implements POSIX draft P1003.2/D11.2, except for some of the
    internationalization features.)
 
-   Copyright (C) 1993-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/src/regex.h emacs-26.3+1/src/regex.h
--- emacs-26.1+1/src/regex.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/regex.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989-1993, 1995, 2000-2018 Free Software
+   Copyright (C) 1985, 1989-1993, 1995, 2000-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/src/region-cache.c emacs-26.3+1/src/region-cache.c
--- emacs-26.1+1/src/region-cache.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/region-cache.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Caching facts about regions of the buffer, for optimization.
 
-Copyright (C) 1985-1989, 1993, 1995, 2001-2018 Free Software Foundation,
+Copyright (C) 1985-1989, 1993, 1995, 2001-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/region-cache.h emacs-26.3+1/src/region-cache.h
--- emacs-26.1+1/src/region-cache.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/region-cache.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
 
-Copyright (C) 1985-1986, 1993, 1995, 2001-2018 Free Software Foundation,
+Copyright (C) 1985-1986, 1993, 1995, 2001-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/scroll.c emacs-26.3+1/src/scroll.c
--- emacs-26.1+1/src/scroll.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/scroll.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it
 
-Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2018 Free Software
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -47,13 +47,13 @@
     int deletecost;
     /* Number of inserts so far in this run of inserts,
        for the cost in insertcost.  */
-    unsigned char insertcount;
+    int insertcount;
     /* Number of deletes so far in this run of deletes,
        for the cost in deletecost.  */
-    unsigned char deletecount;
+    int deletecount;
     /* Number of writes so far since the last insert
        or delete for the cost in writecost. */
-    unsigned char writecount;
+    int writecount;
   };
 
 static void do_direct_scrolling (struct frame *,
diff -Nru emacs-26.1+1/src/search.c emacs-26.3+1/src/search.c
--- emacs-26.1+1/src/search.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/search.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* String search routines for GNU Emacs.
 
-Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2018 Free Software
+Copyright (C) 1985-1987, 1993-1994, 1997-1999, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1341,12 +1341,7 @@
 	}
       else
 	{
-	  /* Converting multibyte to single-byte.
-
-	     ??? Perhaps this conversion should be done in a special way
-	     by subtracting nonascii-insert-offset from each non-ASCII char,
-	     so that only the multibyte chars which really correspond to
-	     the chosen single-byte character set can possibly match.  */
+	  /* Converting multibyte to single-byte.  */
 	  raw_pattern_size = SCHARS (string);
 	  raw_pattern_size_byte = SCHARS (string);
 	  raw_pattern = SAFE_ALLOCA (raw_pattern_size + 1);
diff -Nru emacs-26.1+1/src/sheap.c emacs-26.3+1/src/sheap.c
--- emacs-26.1+1/src/sheap.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sheap.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
    complete rewrite of xemacs Cygwin `unexec' code
 
-   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/sheap.h emacs-26.3+1/src/sheap.h
--- emacs-26.1+1/src/sheap.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sheap.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Static heap allocation for GNU Emacs.
 
-Copyright 2016-2018 Free Software Foundation, Inc.
+Copyright 2016-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/sound.c emacs-26.3+1/src/sound.c
--- emacs-26.1+1/src/sound.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sound.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* sound.c -- sound support.
 
-Copyright (C) 1998-1999, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1998-1999, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/syntax.c emacs-26.3+1/src/syntax.c
--- emacs-26.1+1/src/syntax.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/syntax.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
-   Copyright (C) 1985, 1987, 1993-1995, 1997-1999, 2001-2018 Free
+   Copyright (C) 1985, 1987, 1993-1995, 1997-1999, 2001-2019 Free
    Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/syntax.h emacs-26.3+1/src/syntax.h
--- emacs-26.1+1/src/syntax.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/syntax.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Declarations having to do with GNU Emacs syntax tables.
 
-Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2018 Free Software
+Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/sysdep.c emacs-26.3+1/src/sysdep.c
--- emacs-26.1+1/src/sysdep.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sysdep.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interfaces to system-dependent kernel and library entries.
-   Copyright (C) 1985-1988, 1993-1995, 1999-2018 Free Software
+   Copyright (C) 1985-1988, 1993-1995, 1999-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -3014,11 +3014,11 @@
 
   Lisp_Object proclist = Qnil;
 
-  if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0)
+  if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0 || len == 0)
     return proclist;
 
   procs = xmalloc (len);
-  if (sysctl (mib, 3, procs, &len, NULL, 0) != 0)
+  if (sysctl (mib, 3, procs, &len, NULL, 0) != 0 || len == 0)
     {
       xfree (procs);
       return proclist;
@@ -3618,7 +3618,7 @@
   CONS_TO_INTEGER (pid, int, proc_id);
   mib[3] = proc_id;
 
-  if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0)
+  if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0 || proclen == 0)
     return attrs;
 
   attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (proc.ki_uid)), attrs);
@@ -3740,7 +3740,7 @@
 
   mib[2] = KERN_PROC_ARGS;
   len = MAXPATHLEN;
-  if (sysctl (mib, 4, args, &len, NULL, 0) == 0)
+  if (sysctl (mib, 4, args, &len, NULL, 0) == 0 && len != 0)
     {
       int i;
       for (i = 0; i < len; i++)
@@ -3798,7 +3798,7 @@
   CONS_TO_INTEGER (pid, int, proc_id);
   mib[3] = proc_id;
 
-  if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0)
+  if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0 || proclen == 0)
     return attrs;
 
   uid = proc.kp_eproc.e_ucred.cr_uid;
diff -Nru emacs-26.1+1/src/sysselect.h emacs-26.3+1/src/sysselect.h
--- emacs-26.1+1/src/sysselect.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sysselect.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/syssignal.h emacs-26.3+1/src/syssignal.h
--- emacs-26.1+1/src/syssignal.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/syssignal.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
 
-Copyright (C) 1993, 1999, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993, 1999, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/sysstdio.h emacs-26.3+1/src/sysstdio.h
--- emacs-26.1+1/src/sysstdio.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/sysstdio.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Standard I/O for Emacs.
 
-Copyright 2013-2018 Free Software Foundation, Inc.
+Copyright 2013-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/systhread.c emacs-26.3+1/src/systhread.c
--- emacs-26.1+1/src/systhread.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/systhread.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* System thread definitions
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/systhread.h emacs-26.3+1/src/systhread.h
--- emacs-26.1+1/src/systhread.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/systhread.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* System thread definitions
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/systime.h emacs-26.3+1/src/systime.h
--- emacs-26.1+1/src/systime.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/systime.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* systime.h - System-dependent definitions for time manipulations.
-   Copyright (C) 1993-1994, 2002-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2002-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/systty.h emacs-26.3+1/src/systty.h
--- emacs-26.1+1/src/systty.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/systty.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* systty.h - System-dependent definitions for terminals.
-   Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/syswait.h emacs-26.3+1/src/syswait.h
--- emacs-26.1+1/src/syswait.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/syswait.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993-1995, 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1995, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/term.c emacs-26.3+1/src/term.c
--- emacs-26.1+1/src/term.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/term.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Terminal control module for terminals described by TERMCAP
-   Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2018 Free Software
+   Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1591,13 +1591,13 @@
 			+ it->continuation_lines_width);
       int x0 = absolute_x;
       /* Adjust for line numbers.  */
-      if (!NILP (Vdisplay_line_numbers))
+      if (!NILP (Vdisplay_line_numbers) && it->line_number_produced_p)
 	absolute_x -= it->lnum_pixel_width;
       int next_tab_x
 	= (((1 + absolute_x + it->tab_width - 1)
 	    / it->tab_width)
 	   * it->tab_width);
-      if (!NILP (Vdisplay_line_numbers))
+      if (!NILP (Vdisplay_line_numbers) && it->line_number_produced_p)
 	next_tab_x += it->lnum_pixel_width;
       int nspaces;
 
@@ -4004,6 +4004,7 @@
 	char const *diagnostic
 	  = (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s";
 	emacs_close (fd);
+        delete_terminal_internal (terminal);
 	maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name);
       }
 
diff -Nru emacs-26.1+1/src/termcap.c emacs-26.3+1/src/termcap.c
--- emacs-26.1+1/src/termcap.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/termcap.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Work-alike for termcap, plus extra features.
-   Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013-2018 Free
+   Copyright (C) 1985-1986, 1993-1995, 2000-2008, 2011, 2013-2019 Free
    Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/src/termchar.h emacs-26.3+1/src/termchar.h
--- emacs-26.1+1/src/termchar.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/termchar.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/termhooks.h emacs-26.3+1/src/termhooks.h
--- emacs-26.1+1/src/termhooks.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/termhooks.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Parameters and display hooks for terminal devices.
 
-Copyright (C) 1985-1986, 1993-1994, 2001-2018 Free Software Foundation,
+Copyright (C) 1985-1986, 1993-1994, 2001-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -729,6 +729,7 @@
 extern struct terminal *create_terminal (enum output_method,
 					 struct redisplay_interface *);
 extern void delete_terminal (struct terminal *);
+extern void delete_terminal_internal (struct terminal *);
 extern Lisp_Object terminal_glyph_code (struct terminal *, int);
 
 /* The initial terminal device, created by initial_term_init.  */
diff -Nru emacs-26.1+1/src/terminal.c emacs-26.3+1/src/terminal.c
--- emacs-26.1+1/src/terminal.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/terminal.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions related to terminal devices.
-   Copyright (C) 2005-2018 Free Software Foundation, Inc.
+   Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -314,7 +314,6 @@
 void
 delete_terminal (struct terminal *terminal)
 {
-  struct terminal **tp;
   Lisp_Object tail, frame;
 
   /* Protect against recursive calls.  delete_frame calls the
@@ -335,6 +334,14 @@
         }
     }
 
+  delete_terminal_internal (terminal);
+}
+
+void
+delete_terminal_internal (struct terminal *terminal)
+{
+  struct terminal **tp;
+
   for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
     if (! *tp)
       emacs_abort ();
diff -Nru emacs-26.1+1/src/terminfo.c emacs-26.3+1/src/terminfo.c
--- emacs-26.1+1/src/terminfo.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/terminfo.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface from Emacs to terminfo.
-   Copyright (C) 1985-1986, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1985-1986, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/termopts.h emacs-26.3+1/src/termopts.h
--- emacs-26.1+1/src/termopts.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/termopts.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Flags and parameters describing user options for handling the terminal.
-   Copyright (C) 1985-1986, 1990, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985-1986, 1990, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/textprop.c emacs-26.3+1/src/textprop.c
--- emacs-26.1+1/src/textprop.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/textprop.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface code for dealing with text properties.
-   Copyright (C) 1993-1995, 1997, 1999-2018 Free Software Foundation,
+   Copyright (C) 1993-1995, 1997, 1999-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
@@ -1350,6 +1350,7 @@
 {
   register INTERVAL i;
   Lisp_Object ostart, oend;
+  bool first_time = true;
 
   ostart = start;
   oend = end;
@@ -1372,6 +1373,7 @@
       return Qt;
     }
 
+ retry:
   i = validate_interval_range (object, &start, &end, soft);
 
   if (!i)
@@ -1391,8 +1393,22 @@
 	return Qnil;
     }
 
-  if (BUFFERP (object) && !NILP (coherent_change_p))
-    modify_text_properties (object, start, end);
+  if (BUFFERP (object) && !NILP (coherent_change_p) && first_time)
+    {
+      ptrdiff_t prev_length = LENGTH (i);
+      ptrdiff_t prev_pos = i->position;
+
+      modify_text_properties (object, start, end);
+      /* If someone called us recursively as a side effect of
+	 modify_text_properties, and changed the intervals behind our
+	 back, we cannot continue with I, because its data changed.
+	 So we restart the interval analysis anew.  */
+      if (LENGTH (i) != prev_length || i->position != prev_pos)
+	{
+	  first_time = false;
+	  goto retry;
+	}
+    }
 
   set_text_properties_1 (start, end, properties, object, i);
 
diff -Nru emacs-26.1+1/src/thread.c emacs-26.3+1/src/thread.c
--- emacs-26.1+1/src/thread.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/thread.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Threading code.
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 
 /* m_specpdl is set when the thread is created and cleared when the
    thread dies.  */
-#define thread_alive_p(STATE) ((STATE)->m_specpdl != NULL)
+#define thread_live_p(STATE) ((STATE)->m_specpdl != NULL)
 
 
 
@@ -656,6 +656,12 @@
   flush_stack_call_func (mark_threads_callback, NULL);
 }
 
+void
+unmark_main_thread (void)
+{
+  main_thread.header.size &= ~ARRAY_MARK_FLAG;
+}
+
 
 
 static void
@@ -884,7 +890,7 @@
   return Qnil;
 }
 
-DEFUN ("thread-alive-p", Fthread_alive_p, Sthread_alive_p, 1, 1, 0,
+DEFUN ("thread-live-p", Fthread_live_p, Sthread_live_p, 1, 1, 0,
        doc: /* Return t if THREAD is alive, or nil if it has exited.  */)
   (Lisp_Object thread)
 {
@@ -893,7 +899,7 @@
   CHECK_THREAD (thread);
   tstate = XTHREAD (thread);
 
-  return thread_alive_p (tstate) ? Qt : Qnil;
+  return thread_live_p (tstate) ? Qt : Qnil;
 }
 
 DEFUN ("thread--blocker", Fthread_blocker, Sthread_blocker, 1, 1, 0,
@@ -923,7 +929,7 @@
   XSETTHREAD (thread, tstate);
   self->event_object = thread;
   self->wait_condvar = &tstate->thread_condvar;
-  while (thread_alive_p (tstate) && NILP (self->error_symbol))
+  while (thread_live_p (tstate) && NILP (self->error_symbol))
     sys_cond_wait (self->wait_condvar, &global_lock);
 
   self->wait_condvar = NULL;
@@ -946,7 +952,7 @@
   if (tstate == current_thread)
     error ("Cannot join current thread");
 
-  if (thread_alive_p (tstate))
+  if (thread_live_p (tstate))
     flush_stack_call_func (thread_join_callback, tstate);
 
   return Qnil;
@@ -961,7 +967,7 @@
 
   for (iter = all_threads; iter; iter = iter->next_thread)
     {
-      if (thread_alive_p (iter))
+      if (thread_live_p (iter))
 	{
 	  Lisp_Object thread;
 
@@ -1051,7 +1057,7 @@
       defsubr (&Scurrent_thread);
       defsubr (&Sthread_name);
       defsubr (&Sthread_signal);
-      defsubr (&Sthread_alive_p);
+      defsubr (&Sthread_live_p);
       defsubr (&Sthread_join);
       defsubr (&Sthread_blocker);
       defsubr (&Sall_threads);
@@ -1068,6 +1074,11 @@
 
       staticpro (&last_thread_error);
       last_thread_error = Qnil;
+
+      Fdefalias (intern_c_string ("thread-alive-p"),
+		 intern_c_string ("thread-live-p"), Qnil);
+
+      Fprovide (intern_c_string ("threads"), Qnil);
     }
 
   DEFSYM (Qthreadp, "threadp");
diff -Nru emacs-26.1+1/src/thread.h emacs-26.3+1/src/thread.h
--- emacs-26.1+1/src/thread.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/thread.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Thread definitions
-Copyright (C) 2012-2018 Free Software Foundation, Inc.
+Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/tparam.c emacs-26.3+1/src/tparam.c
--- emacs-26.1+1/src/tparam.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/tparam.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2018 Free
+   Copyright (C) 1985, 1987, 1993, 1995, 2000-2008, 2013-2019 Free
    Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/src/tparam.h emacs-26.3+1/src/tparam.h
--- emacs-26.1+1/src/tparam.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/tparam.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Interface definitions for termcap entries.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/undo.c emacs-26.3+1/src/undo.c
--- emacs-26.1+1/src/undo.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/undo.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* undo handling for GNU Emacs.
-   Copyright (C) 1990, 1993-1994, 2000-2018 Free Software Foundation,
+   Copyright (C) 1990, 1993-1994, 2000-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/unexaix.c emacs-26.3+1/src/unexaix.c
--- emacs-26.1+1/src/unexaix.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexaix.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Dump an executable image.
-   Copyright (C) 1985-1988, 1999, 2001-2018 Free Software Foundation,
+   Copyright (C) 1985-1988, 1999, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/unexcoff.c emacs-26.3+1/src/unexcoff.c
--- emacs-26.1+1/src/unexcoff.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexcoff.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1985-1988, 1992-1994, 2001-2018 Free Software
+/* Copyright (C) 1985-1988, 1992-1994, 2001-2019 Free Software
  * Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/unexcw.c emacs-26.3+1/src/unexcw.c
--- emacs-26.1+1/src/unexcw.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexcw.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* unexec() support for Cygwin;
    complete rewrite of xemacs Cygwin unexec() code
 
-   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/unexelf.c emacs-26.3+1/src/unexelf.c
--- emacs-26.1+1/src/unexelf.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexelf.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1985-1988, 1990, 1992, 1999-2018 Free Software
+/* Copyright (C) 1985-1988, 1990, 1992, 1999-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -304,6 +304,7 @@
 	      || seg->p_vaddr > old_bss_seg->p_vaddr))
 	old_bss_seg = seg;
     }
+  eassume (old_bss_seg);
 
   /* Note that old_bss_addr may be lower than the first bss section
      address, since the section may need aligning.  */
diff -Nru emacs-26.1+1/src/unexmacosx.c emacs-26.3+1/src/unexmacosx.c
--- emacs-26.1+1/src/unexmacosx.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexmacosx.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Dump Emacs in Mach-O format for use on macOS.
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/unexw32.c emacs-26.3+1/src/unexw32.c
--- emacs-26.1+1/src/unexw32.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/unexw32.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* unexec for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/vm-limit.c emacs-26.3+1/src/vm-limit.c
--- emacs-26.1+1/src/vm-limit.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/vm-limit.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions for memory limit warnings.
-   Copyright (C) 1990, 1992, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1992, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w16select.c emacs-26.3+1/src/w16select.c
--- emacs-26.1+1/src/w16select.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w16select.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* 16-bit Windows Selection processing for emacs on MS-Windows
 
-Copyright (C) 1996-1997, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1996-1997, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32.c emacs-26.3+1/src/w32.c
--- emacs-26.1+1/src/w32.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs on the Microsoft Windows API.
 
-Copyright (C) 1994-1995, 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1995, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -7157,6 +7157,7 @@
 			 code_convert_string_norecord (tem, Vlocale_coding_system, 0)),
 		 attrs);
 
+  memstex.dwLength = sizeof (memstex);
   if (global_memory_status_ex (&memstex))
 #if __GNUC__ || (defined (_MSC_VER) && _MSC_VER >= 1300)
     totphys = memstex.ullTotalPhys / 1024.0;
diff -Nru emacs-26.1+1/src/w32common.h emacs-26.3+1/src/w32common.h
--- emacs-26.1+1/src/w32common.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32common.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Common functions for Microsoft Windows builds of Emacs
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32console.c emacs-26.3+1/src/w32console.c
--- emacs-26.1+1/src/w32console.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32console.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Terminal hooks for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1992, 1999, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -140,23 +140,36 @@
 }
 
 
-static struct glyph glyph_base[256];
+static struct glyph glyph_base[80];
+static struct glyph *glyphs = glyph_base;
+static size_t glyphs_len = ARRAYELTS (glyph_base);
 static BOOL  ceol_initialized = FALSE;
 
 /* Clear from Cursor to end (what's "standout marker"?).  */
 static void
 w32con_clear_end_of_line (struct frame *f, int end)
 {
+  /* Time to reallocate our "empty row"?  With today's large screens,
+     it is not unthinkable to see TTY frames well in excess of
+     80-character width.  */
+  if (end - cursor_coords.X > glyphs_len)
+    {
+      if (glyphs == glyph_base)
+	glyphs = NULL;
+      glyphs = xrealloc (glyphs, FRAME_COLS (f) * sizeof (struct glyph));
+      glyphs_len = FRAME_COLS (f);
+      ceol_initialized = FALSE;
+    }
   if (!ceol_initialized)
     {
       int i;
-      for (i = 0; i < 256; i++)
+      for (i = 0; i < glyphs_len; i++)
         {
-	  memcpy (&glyph_base[i], &space_glyph, sizeof (struct glyph));
+	  memcpy (&glyphs[i], &space_glyph, sizeof (struct glyph));
         }
       ceol_initialized = TRUE;
     }
-  w32con_write_glyphs (f, glyph_base, end - cursor_coords.X);	/* fencepost ?	*/
+  w32con_write_glyphs (f, glyphs, end - cursor_coords.X);
 }
 
 /* Insert n lines at vpos. if n is negative delete -n lines.  */
@@ -772,6 +785,15 @@
       *width = 1 + info.srWindow.Right - info.srWindow.Left;
     }
 
+  /* Force reinitialization of the "empty row" buffer, in case they
+     dumped from a running session.  */
+  if (glyphs != glyph_base)
+    {
+      glyphs = NULL;
+      glyphs_len = 0;
+      ceol_initialized = FALSE;
+    }
+
   if (os_subtype == OS_NT)
     w32_console_unicode_input = 1;
   else
diff -Nru emacs-26.1+1/src/w32fns.c emacs-26.3+1/src/w32fns.c
--- emacs-26.1+1/src/w32fns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32fns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Graphical user interface functions for the Microsoft Windows API.
 
-Copyright (C) 1989, 1992-2018 Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2192,6 +2192,11 @@
  *
  * Some window managers may not honor this parameter.  The value `below'
  * is not supported on Windows.
+ *
+ * Internally, this function also handles a value 'above-suspended'.
+ * That value is used to temporarily remove F from the 'above' group
+ * to make sure that it does not obscure the window of a dialog in
+ * progress.
  */
 static void
 x_set_z_group (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
@@ -4545,13 +4550,13 @@
 	  set_ime_composition_window_fn (context, &form);
 	  release_ime_context_fn (hwnd, context);
 	}
-      /* We should "goto dflt" here to pass WM_IME_STARTCOMPOSITION to
-	 DefWindowProc, so that the composition window will actually
-	 be displayed.  But doing so causes trouble with displaying
-	 dialog boxes, such as the file selection dialog or font
-	 selection dialog.  So something else is needed to fix the
-	 former without breaking the latter.  See bug#11732.  */
-      break;
+      /* FIXME: somehow "goto dflt" here instead of "break" causes
+	 popup dialogs, such as the ones shown by File->Open File and
+	 w32-select-font, to become hidden behind their parent frame,
+	 when focus-follows-mouse is in effect.  See bug#11732.  But
+	 if we don't "goto dflt", users of IME cannot type text
+	 supported by the input method...  */
+      goto dflt;
 
     case WM_IME_ENDCOMPOSITION:
       ignore_ime_char = 0;
@@ -7726,12 +7731,27 @@
   return 0;
 }
 
+/**
+ * w32_dialog_in_progress:
+ *
+ * This function is called by Fx_file_dialog and Fx_select_font and
+ * serves to temporarily remove any Emacs frame currently in the
+ * 'above' z-group from that group to assure that such a frame does
+ * not hide the dialog window.  Frames that are temporarily removed
+ * from the 'above' group have their z_group bit-field set to
+ * z_group_above_suspended.  Any such frame is moved back to the
+ * 'above' group as soon as the dialog finishes and has its z_group
+ * bit-field reset to z_group_above.
+ *
+ * This function does not affect the z-order or the z-group state of
+ * the dialog window itself.
+ */
 void
 w32_dialog_in_progress (Lisp_Object in_progress)
 {
   Lisp_Object frames, frame;
 
-  /* Don't let frames in `above' z-group obscure popups.  */
+  /* Don't let frames in `above' z-group obscure dialog windows.  */
   FOR_EACH_FRAME (frames, frame)
     {
       struct frame *f = XFRAME (frame);
diff -Nru emacs-26.1+1/src/w32font.c emacs-26.3+1/src/w32font.c
--- emacs-26.1+1/src/w32font.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32font.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Font backend for the Microsoft Windows API.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32font.h emacs-26.3+1/src/w32font.h
--- emacs-26.1+1/src/w32font.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32font.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Shared GDI and Uniscribe Font backend declarations for the Windows API.
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32gui.h emacs-26.3+1/src/w32gui.h
--- emacs-26.1+1/src/w32gui.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32gui.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication on the Microsoft Windows API.
-   Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32.h emacs-26.3+1/src/w32.h
--- emacs-26.1+1/src/w32.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32.h	2019-09-10 00:32:49.000000000 +0000
@@ -2,7 +2,7 @@
 #define EMACS_W32_H
 
 /* Support routines for the NT version of Emacs.
-   Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32heap.c emacs-26.3+1/src/w32heap.c
--- emacs-26.1+1/src/w32heap.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32heap.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Heap management routines for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -116,7 +116,7 @@
    to build only the first bootstrap-emacs.exe with the large size,
    and reset that to a lower value afterwards.  */
 #if defined _WIN64 || defined WIDE_EMACS_INT
-# define DUMPED_HEAP_SIZE (22*1024*1024)
+# define DUMPED_HEAP_SIZE (23*1024*1024)
 #else
 # define DUMPED_HEAP_SIZE (13*1024*1024)
 #endif
diff -Nru emacs-26.1+1/src/w32heap.h emacs-26.3+1/src/w32heap.h
--- emacs-26.1+1/src/w32heap.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32heap.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32inevt.c emacs-26.3+1/src/w32inevt.c
--- emacs-26.1+1/src/w32inevt.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32inevt.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Input event support for Emacs on the Microsoft Windows API.
-   Copyright (C) 1992-1993, 1995, 2001-2018 Free Software Foundation,
+   Copyright (C) 1992-1993, 1995, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/w32inevt.h emacs-26.3+1/src/w32inevt.h
--- emacs-26.1+1/src/w32inevt.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32inevt.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Input routines for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32menu.c emacs-26.3+1/src/w32menu.c
--- emacs-26.1+1/src/w32menu.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32menu.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Menu support for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2018 Free
+   Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2019 Free
    Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/w32notify.c emacs-26.3+1/src/w32notify.c
--- emacs-26.1+1/src/w32notify.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32notify.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Filesystem notifications support for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+   Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32proc.c emacs-26.3+1/src/w32proc.c
--- emacs-26.1+1/src/w32proc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32proc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Process support for GNU Emacs on the Microsoft Windows API.
 
-Copyright (C) 1992, 1995, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1992, 1995, 1999-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32reg.c emacs-26.3+1/src/w32reg.c
--- emacs-26.1+1/src/w32reg.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32reg.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Emulate the X Resource Manager through the registry.
-   Copyright (C) 1990, 1993-1994, 2001-2018 Free Software Foundation,
+   Copyright (C) 1990, 1993-1994, 2001-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/w32select.c emacs-26.3+1/src/w32select.c
--- emacs-26.1+1/src/w32select.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32select.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Selection processing for Emacs on the Microsoft Windows API.
 
-Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32select.h emacs-26.3+1/src/w32select.h
--- emacs-26.1+1/src/w32select.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32select.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
 
-Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32term.c emacs-26.3+1/src/w32term.c
--- emacs-26.1+1/src/w32term.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32term.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft Windows API.
 
-Copyright (C) 1989, 1993-2018 Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6672,7 +6672,10 @@
     }
 
   if (!FLOATP (Vx_wait_for_event_timeout))
+    {
+      unblock_input ();
       return;
+    }
 
   /* Synchronize to ensure Emacs knows the frame is visible
      before we do anything else.  We do this loop with input not blocked
diff -Nru emacs-26.1+1/src/w32term.h emacs-26.3+1/src/w32term.h
--- emacs-26.1+1/src/w32term.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32term.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication on the Microsoft Windows API.
-   Copyright (C) 1995, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/w32uniscribe.c emacs-26.3+1/src/w32uniscribe.c
--- emacs-26.1+1/src/w32uniscribe.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32uniscribe.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Font backend for the Microsoft W32 Uniscribe API.
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -176,6 +176,11 @@
   Lisp_Object features;
 
   f = XFRAME (selected_frame);
+  /* Prevent quitting while we cons the lists in otf_features.
+     That's because get_frame_dc acquires the critical section, so we
+     cannot quit before we release it in release_frame_dc.  */
+  Lisp_Object prev_quit = Vinhibit_quit;
+  Vinhibit_quit = Qt;
   context = get_frame_dc (f);
   old_font = SelectObject (context, FONT_HANDLE (font));
 
@@ -186,6 +191,7 @@
 
   SelectObject (context, old_font);
   release_frame_dc (f, context);
+  Vinhibit_quit = prev_quit;
 
   return capability;
 }
diff -Nru emacs-26.1+1/src/w32xfns.c emacs-26.3+1/src/w32xfns.c
--- emacs-26.1+1/src/w32xfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/w32xfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Functions taken directly from X sources for use with the Microsoft Windows API.
-   Copyright (C) 1989, 1992-1995, 1999, 2001-2018 Free Software
+   Copyright (C) 1989, 1992-1995, 1999, 2001-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/widget.c emacs-26.3+1/src/widget.c
--- emacs-26.1+1/src/widget.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/widget.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* The emacs frame widget.
-   Copyright (C) 1992-1993, 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 1992-1993, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/widget.h emacs-26.3+1/src/widget.h
--- emacs-26.1+1/src/widget.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/widget.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/widgetprv.h emacs-26.3+1/src/widgetprv.h
--- emacs-26.1+1/src/widgetprv.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/widgetprv.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/window.c emacs-26.3+1/src/window.c
--- emacs-26.1+1/src/window.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/window.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985-1987, 1993-1998, 2000-2018 Free Software
+   Copyright (C) 1985-1987, 1993-1998, 2000-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1704,7 +1704,12 @@
        doc: /* Make display in WINDOW start at position POS in WINDOW's buffer.
 WINDOW must be a live window and defaults to the selected one.  Return
 POS.  Optional third arg NOFORCE non-nil inhibits next redisplay from
-overriding motion of point in order to display at this exact start.  */)
+overriding motion of point in order to display at this exact start.
+
+For reliable setting of WINDOW start position, make sure point is
+at a position that will be visible when that start is in effect,
+otherwise there's a chance POS will be disregarded, e.g., if point
+winds up in a partially-visible line.  */)
   (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce)
 {
   register struct window *w = decode_live_window (window);
@@ -3632,7 +3637,7 @@
       return Qt;
     }
 
-  if (WINDOWP (object))
+  if (WINDOW_LIVE_P (object))
     {
       struct window *w = XWINDOW (object);
       mark_window_display_accurate (object, false);
@@ -4934,25 +4939,21 @@
 	  : 0);
 }
 
-/* Return number of lines of text (not counting mode lines) in W.  */
+/* Return number of lines of text in window W, not counting the mode
+   line and header line, if any.  Do NOT use this for windows on GUI
+   frames; use window_body_height instead.  This function is only for
+   windows on TTY frames, where it is much more efficient.  */
 
 int
 window_internal_height (struct window *w)
 {
   int ht = w->total_lines;
 
-  if (!MINI_WINDOW_P (w))
-    {
-      if (!NILP (w->parent)
-	  || WINDOWP (w->contents)
-	  || !NILP (w->next)
-	  || !NILP (w->prev)
-	  || window_wants_mode_line (w))
-	--ht;
+  if (window_wants_mode_line (w))
+    --ht;
 
-      if (window_wants_header_line (w))
-	--ht;
-    }
+  if (window_wants_header_line (w))
+    --ht;
 
   return ht;
 }
@@ -4981,8 +4982,8 @@
   if (whole && Vfast_but_imprecise_scrolling)
     specbind (Qfontification_functions, Qnil);
 
-  /* If we must, use the pixel-based version which is much slower than
-     the line-based one but can handle varying line heights.  */
+  /* On GUI frames, use the pixel-based version which is much slower
+     than the line-based one but can handle varying line heights.  */
   if (FRAME_WINDOW_P (XFRAME (XWINDOW (window)->frame)))
     window_scroll_pixel_based (window, n, whole, noerror);
   else
@@ -6610,10 +6611,10 @@
 			       make_number (old_point),
 			       XWINDOW (data->current_window)->contents);
 
-      /* In the following call to `select-window', prevent "swapping out
+      /* In the following call to select_window, prevent "swapping out
 	 point" in the old selected window using the buffer that has
-	 been restored into it.  We already swapped out that point from
-	 that window's old buffer.
+	 been restored into it.  We already swapped out that point
+	 from that window's old buffer.
 
 	 Do not record the buffer here.  We do that in a separate call
 	 to select_window below.  See also Bug#16207.  */
@@ -6656,10 +6657,10 @@
       if (WINDOW_LIVE_P (data->current_window))
 	select_window (data->current_window, Qnil, false);
 
-      /* Fselect_window will have made f the selected frame, so we
-	 reselect the proper frame here.  Fhandle_switch_frame will change the
-	 selected window too, but that doesn't make the call to
-	 Fselect_window above totally superfluous; it still sets f's
+      /* select_window will have made f the selected frame, so we
+	 reselect the proper frame here.  do_switch_frame will change
+	 the selected window too, but that doesn't make the call to
+	 select_window above totally superfluous; it still sets f's
 	 selected window.  */
       if (FRAME_LIVE_P (XFRAME (data->selected_frame)))
 	do_switch_frame (data->selected_frame, 0, 0, Qnil);
@@ -6696,8 +6697,21 @@
     {
       Fset_buffer (new_current_buffer);
       /* If the new current buffer doesn't appear in the selected
-	 window, go to its old point (see bug#12208).  */
-      if (!EQ (XWINDOW (data->current_window)->contents, new_current_buffer))
+	 window, go to its old point (Bug#12208).
+
+	 The original fix used data->current_window below which caused
+	 false positives (compare Bug#31695) when data->current_window
+	 is not on data->selected_frame.  This happens, for example,
+	 when read_minibuf restores the configuration of a stand-alone
+	 minibuffer frame: After switching to the previously selected
+	 "normal" frame, point of that frame's selected window jumped
+	 unexpectedly because new_current_buffer is usually *not*
+	 shown in data->current_window - the minibuffer frame's
+	 selected window.  Using selected_window instead fixes this
+	 because do_switch_frame has set up selected_window already to
+	 the "normal" frame's selected window and that window *does*
+	 show new_current_buffer.  */
+      if (!EQ (XWINDOW (selected_window)->contents, new_current_buffer))
 	Fgoto_char (make_number (old_point));
     }
 
@@ -7067,7 +7081,9 @@
 does the same for the right marginal area.  A nil width parameter
 means no margin.
 
-Return t if any margin was actually changed and nil otherwise.  */)
+Leave margins unchanged if WINDOW is not large enough to accommodate
+margins of the desired width.  Return t if any margin was actually
+changed and nil otherwise.  */)
   (Lisp_Object window, Lisp_Object left_width, Lisp_Object right_width)
 {
   struct window *w = set_window_margins (decode_live_window (window),
@@ -7128,6 +7144,11 @@
       w->right_fringe_width = right;
       w->fringes_outside_margins = outside;
 
+      /* This is needed to trigger immediate redisplay of the window
+	 when its fringes are changed, because fringes are redrawn
+	 only if update_window is called, so we must trigger that even
+	 if the window's glyph matrices did not change at all.  */
+      windows_or_buffers_changed = 35;
       return w;
     }
   else
@@ -7144,11 +7165,14 @@
 fringe width.  If a fringe width arg is nil, that means to use the
 frame's default fringe width.  Default fringe widths can be set with
 the command `set-fringe-style'.
+
 If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes
 outside of the display margins.  By default, fringes are drawn between
 display marginal areas and the text area.
 
-Return t if any fringe was actually changed and nil otherwise.  */)
+Leave fringes unchanged if WINDOW is not large enough to accommodate
+fringes of the desired width.  Return t if any fringe was actually
+changed and nil otherwise.  */)
   (Lisp_Object window, Lisp_Object left_width,
    Lisp_Object right_width, Lisp_Object outside_margins)
 {
@@ -7245,6 +7269,12 @@
   wset_horizontal_scroll_bar_type (w, Qnil);
 #endif
 
+  /* This is needed to trigger immediate redisplay of the window when
+     scroll bars are changed, because scroll bars are redisplayed only
+     if more than a single window needs to be considered, see
+     redisplay_internal.  */
+  if (changed)
+    windows_or_buffers_changed = 31;
   return changed ? w : NULL;
 }
 
@@ -7267,6 +7297,8 @@
 a horizontal scroll bar on WINDOW and t means to use WINDOW frame's
 horizontal scroll bar type.
 
+If WINDOW is not large enough to accommodate a scroll bar of the
+desired dimension, leave the corresponding scroll bar unchanged.
 Return t if scroll bars were actually changed and nil otherwise.  */)
   (Lisp_Object window, Lisp_Object width, Lisp_Object vertical_type,
    Lisp_Object height, Lisp_Object horizontal_type)
@@ -7309,6 +7341,8 @@
 
 DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 0, 2, 0,
        doc: /* Return the amount by which WINDOW is scrolled vertically.
+This takes effect when displaying tall lines or images.
+
 If WINDOW is omitted or nil, it defaults to the selected window.
 Normally, value is a multiple of the canonical character height of WINDOW;
 optional second arg PIXELS-P means value is measured in pixels.  */)
@@ -7331,6 +7365,8 @@
 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll,
        2, 3, 0,
        doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL.
+This takes effect when displaying tall lines or images.
+
 WINDOW nil means use the selected window.  Normally, VSCROLL is a
 non-negative multiple of the canonical character height of WINDOW;
 optional third arg PIXELS-P non-nil means that VSCROLL is in pixels.
@@ -7622,7 +7658,7 @@
   DEFVAR_LISP ("window-point-insertion-type", Vwindow_point_insertion_type,
 	       doc: /* Type of marker to use for `window-point'.  */);
   Vwindow_point_insertion_type = Qnil;
-  DEFSYM (Qwindow_point_insertion_type, "window_point_insertion_type");
+  DEFSYM (Qwindow_point_insertion_type, "window-point-insertion-type");
 
   DEFVAR_LISP ("window-configuration-change-hook",
 	       Vwindow_configuration_change_hook,
diff -Nru emacs-26.1+1/src/window.h emacs-26.3+1/src/window.h
--- emacs-26.1+1/src/window.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/window.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Window definitions for GNU Emacs.
-   Copyright (C) 1985-1986, 1993, 1995, 1997-2018 Free Software
+   Copyright (C) 1985-1986, 1993, 1995, 1997-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -24,57 +24,69 @@
 
 INLINE_HEADER_BEGIN
 
-/* Windows are allocated as if they were vectors, but then the
-Lisp data type is changed to Lisp_Window.  They are garbage
-collected along with the vectors.
+/* Windows are allocated as if they were vectors, but then the Lisp
+data type is changed to Lisp_Window.  They are garbage collected along
+with the vectors.
 
 All windows in use are arranged into a tree, with pointers up and down.
 
-Windows that are leaves of the tree are actually displayed
-and show the contents of buffers.  Windows that are not leaves
-are used for representing the way groups of leaf windows are
-arranged on the frame.  Leaf windows never become non-leaves.
-They are deleted only by calling delete-window on them (but
-this can be done implicitly).  Combination windows can be created
-and deleted at any time.
-
-A leaf window has a buffer stored in contents field and markers in its start
-and pointm fields.  Non-leaf windows have nil in the latter two fields.
-
-Non-leaf windows are either vertical or horizontal combinations.
-
-A vertical combination window has children that are arranged on the frame
-one above the next.  Its contents field points to the uppermost child.
-The parent field of each of the children points to the vertical
-combination window.  The next field of each child points to the
-child below it, or is nil for the lowest child.  The prev field
-of each child points to the child above it, or is nil for the
-highest child.
-
-A horizontal combination window has children that are side by side.
-Its contents field points to the leftmost child.  In each child
-the next field points to the child to the right and the prev field
-points to the child to the left.
-
-The children of a vertical combination window may be leaf windows
-or horizontal combination windows.  The children of a horizontal
-combination window may be leaf windows or vertical combination windows.
-
-At the top of the tree are two windows which have nil as parent.
-The second of these is minibuf_window.  The first one manages all
-the frame area that is not minibuffer, and is called the root window.
-Different windows can be the root at different times;
-initially the root window is a leaf window, but if more windows
-are created then that leaf window ceases to be root and a newly
-made combination window becomes root instead.
-
-In any case, on screens which have an ordinary window and a
-minibuffer, prev of the minibuf window is the root window and next of
-the root window is the minibuf window.  On minibufferless screens or
-minibuffer-only screens, the root window and the minibuffer window are
-one and the same, so its prev and next members are nil.
-
-A dead window has its contents field set to nil.  */
+Windows that are leaves of the tree are actually displayed and show
+the contents of buffers.  Windows that are not leaves are used for
+representing the way groups of leaf windows are arranged on the frame.
+Leaf windows never become non-leaves.  They are deleted only by
+calling `delete-window' on them (but this can be done implicitly).
+Non-leaf windows never become leaf windows and can be created and
+deleted at any time by the window management code.  Non-leaf windows
+can be seen but not directly manipulated by Lisp functions.
+
+A leaf window has a buffer stored in its contents field and markers in
+its 'start' and 'pointm' fields.  Non-leaf windows have nil in the
+latter two fields.  Non-leaf windows are either vertical or horizontal
+combinations.
+
+A vertical combination window has children that are arranged on the
+frame one above the next.  Its 'contents' field points to the
+uppermost child.  The 'parent' field of each of the children points to
+the vertical combination window.  The 'next' field of each child
+points to the child below it, or is nil for the lowest child.  The
+'prev' field of each child points to the child above it, or is nil for
+the highest child.
+
+A horizontal combination window has children that are arranged side by
+side.  Its 'contents' field points to the leftmost child.  In each
+child the 'next' field points to the child to the right and the 'prev'
+field points to the child to the left.
+
+On each frame there are at least one and at most two windows which
+have nil as parent.  The second of these, if present, is the frame's
+minibuffer window and shows the minibuffer or the echo area.  The
+first one manages the remaining frame area and is called the frame's
+root window.  Different windows can be the root at different times;
+initially the root window is a leaf window, but if more windows are
+created, then that leaf window ceases to be root and a newly made
+combination window becomes the root instead.
+
+On frames which have an ordinary window and a minibuffer window,
+'prev' of the minibuffer window is the root window and 'next' of the
+root window is the minibuffer window.  On minibuffer-less frames there
+is only a root window and 'next' of the root window is nil.  On
+minibuffer-only frames, the root window and the minibuffer window are
+one and the same, so its 'prev' and 'next' members are nil.  In any
+case, 'prev' of a root window and 'next' of a minibuffer window are
+always nil.
+
+In Lisp parlance, leaf windows are called "live windows" and non-leaf
+windows are called "internal windows".  Together, live and internal
+windows form the set of "valid windows".  A window that has been
+deleted is considered "dead" regardless of whether it formerly was a
+leaf or a non-leaf window.  A dead window has its 'contents' field set
+to nil.
+
+Frames may also contain pseudo windows, windows that are not exposed
+directly to Lisp code.  Pseudo windows are currently either used to
+display the menu bar or the tool bar (when Emacs uses toolkits that
+don't display their own menu bar and tool bar) or a tooltip in a
+tooltip frame (when tooltips are not display by the toolkit).  */
 
 struct cursor_pos
 {
@@ -93,27 +105,41 @@
     /* The frame this window is on.  */
     Lisp_Object frame;
 
-    /* Following (to right or down) and preceding (to left or up) child
-       at same level of tree.  */
+    /* Following (to right or down) and preceding (to left or up)
+       child at same level of tree.  Whether this is left/right or
+       up/down is determined by the parent window's 'horizontal' flag,
+       see below.  On a frame that is neither a minibuffer-only nor a
+       minibuffer-less frame, 'next' of the root window points to the
+       frame's minibuffer window and 'prev' of the minibuffer window
+       points to the frame's root window.  In all other cases, 'next'
+       of the root window and 'prev' of the minibuffer window, if
+       present, are nil.  'prev' of the root window and 'next' of the
+       minibuffer window are always nil.  */
     Lisp_Object next;
     Lisp_Object prev;
 
-    /* The window this one is a child of.  */
+    /* The window this one is a child of.  For the root and a
+       minibuffer window this is always nil.  */
     Lisp_Object parent;
 
-    /* The normal size of the window.  These are fractions, but we do
-       not use C doubles to avoid creating new Lisp_Float objects while
-       interfacing Lisp in Fwindow_normal_size.  */
+    /* The "normal" size of the window.  These are fractions, but we
+       do not use C doubles to avoid creating new Lisp_Float objects
+       while interfacing Lisp in Fwindow_normal_size.  */
     Lisp_Object normal_lines;
     Lisp_Object normal_cols;
 
-    /* New sizes of the window.  Note that Lisp code may set new_normal
-       to something beyond an integer, so C int can't be used here.  */
+    /* The new sizes of the window as proposed by the window resizing
+       functions.  Note that Lisp code may set new_normal to something
+       beyond an integer, so C int can't be used here.  */
     Lisp_Object new_total;
     Lisp_Object new_normal;
     Lisp_Object new_pixel;
 
-    /* May be buffer, window, or nil.  */
+    /* For a leaf window or a tooltip window this is the buffer shown
+       in the window; for a combination window this is the first of
+       its child windows; for a pseudo window showing the menu bar or
+       tool bar this is nil.  It is a buffer for a minibuffer window
+       as well.  */
     Lisp_Object contents;
 
     /* A marker pointing to where in the text to start displaying.
@@ -188,7 +214,7 @@
 
     /* The two Lisp_Object fields below are marked in a special way,
        which is why they're placed after `current_matrix'.  */
-    /* Alist of <buffer, window-start, window-point> triples listing
+    /* A list of <buffer, window-start, window-point> triples listing
        buffers previously shown in this window.  */
     Lisp_Object prev_buffers;
     /* List of buffers re-shown in this window.  */
diff -Nru emacs-26.1+1/src/xdisp.c emacs-26.3+1/src/xdisp.c
--- emacs-26.1+1/src/xdisp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xdisp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Display generation from window structure and buffer text.
 
-Copyright (C) 1985-1988, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1988, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
@@ -152,6 +152,8 @@
    description of the environment in which the text is to be
    displayed.  But this is too early, read on.
 
+   Iteration over buffer and strings.
+
    Characters and pixmaps displayed for a range of buffer text depend
    on various settings of buffers and windows, on overlays and text
    properties, on display tables, on selective display.  The good news
@@ -176,6 +178,46 @@
    current X and Y position, and lots of other stuff you can better
    see in dispextern.h.
 
+   The "stop position".
+
+   Some of the fields maintained by the iterator change relatively
+   infrequently.  These include the face of the characters, whether
+   text is invisible, the object (buffer or display or overlay string)
+   being iterated, character composition info, etc.  For any given
+   buffer or string position, these sources of information that
+   affects the display can be determined by calling the appropriate
+   primitives, such as Fnext_single_property_change, but both these
+   calls and the processing of their return values is relatively
+   expensive.  To optimize redisplay, the display engine checks these
+   sources of display information only when needed.  To that end, it
+   always maintains the position of the next place where it must stop
+   and re-examine all those potential sources.  This is called "stop
+   position" and is stored in the stop_charpos field of the iterator.
+   The stop position is updated by compute_stop_pos, which is called
+   whenever the iteration reaches the current stop position and
+   processes it.  Processing a stop position is done by handle_stop,
+   which invokes a series of handlers, one each for every potential
+   source of display-related information; see the it_props array for
+   those handlers.  For example, one handler is handle_face_prop,
+   which detects changes in face properties, and supplies the face ID
+   that the iterator will use for all the glyphs it generates up to
+   the next stop position; this face ID is the result of realizing the
+   face specified by the relevant text properties at this position.
+   Each handler called by handle_stop processes the sources of display
+   information for which it is "responsible", and returns a value
+   which tells handle_stop what to do next.
+
+   Once handle_stop returns, the information it stores in the iterator
+   fields will not be refreshed until the iteration reaches the next
+   stop position, which is computed by compute_stop_pos called at the
+   end of handle_stop.  compute_stop_pos examines the buffer's or
+   string's interval tree to determine where the text properties
+   change, finds the next position where overlays and character
+   composition can change, and stores in stop_charpos the closest
+   position where any of these factors should be reconsider.
+
+   Producing glyphs.
+
    Glyphs in a desired matrix are normally constructed in a loop
    calling get_next_display_element and then PRODUCE_GLYPHS.  The call
    to PRODUCE_GLYPHS will fill the iterator structure with pixel
@@ -191,23 +233,28 @@
    Frame matrices.
 
    That just couldn't be all, could it?  What about terminal types not
-   supporting operations on sub-windows of the screen?  To update the
-   display on such a terminal, window-based glyph matrices are not
-   well suited.  To be able to reuse part of the display (scrolling
-   lines up and down), we must instead have a view of the whole
-   screen.  This is what `frame matrices' are for.  They are a trick.
+   supporting operations on sub-windows of the screen (a.k.a. "TTY" or
+   "text-mode terminal")?  To update the display on such a terminal,
+   window-based glyph matrices are not well suited.  To be able to
+   reuse part of the display (scrolling lines up and down), we must
+   instead have a view of the whole screen.  This is what `frame
+   matrices' are for.  They are a trick.
 
-   Frames on terminals like above have a glyph pool.  Windows on such
-   a frame sub-allocate their glyph memory from their frame's glyph
+   Frames on text terminals have a glyph pool.  Windows on such a
+   frame sub-allocate their glyph memory from their frame's glyph
    pool.  The frame itself is given its own glyph matrices.  By
    coincidence---or maybe something else---rows in window glyph
    matrices are slices of corresponding rows in frame matrices.  Thus
    writing to window matrices implicitly updates a frame matrix which
    provides us with the view of the whole screen that we originally
-   wanted to have without having to move many bytes around.  To be
-   honest, there is a little bit more done, but not much more.  If you
-   plan to extend that code, take a look at dispnew.c.  The function
-   build_frame_matrix is a good starting point.
+   wanted to have without having to move many bytes around.  Then
+   updating all the visible windows on text-terminal frames is done by
+   using the frame matrices, which allows frame-global optimization of
+   what is actually written to the glass.
+
+   To be honest, there is a little bit more done, but not much more.
+   If you plan to extend that code, take a look at dispnew.c.  The
+   function build_frame_matrix is a good starting point.
 
    Bidirectional display.
 
@@ -220,9 +267,10 @@
    concerned, the effect of calling bidi_move_to_visually_next, the
    main interface of the reordering engine, is that the iterator gets
    magically placed on the buffer or string position that is to be
-   displayed next.  In other words, a linear iteration through the
-   buffer/string is replaced with a non-linear one.  All the rest of
-   the redisplay is oblivious to the bidi reordering.
+   displayed next in the visual order.  In other words, a linear
+   iteration through the buffer/string is replaced with a non-linear
+   one.  All the rest of the redisplay is oblivious to the bidi
+   reordering.
 
    Well, almost oblivious---there are still complications, most of
    them due to the fact that buffer and string positions no longer
@@ -231,7 +279,8 @@
    monotonously changing with vertical positions.  Also, accounting
    for face changes, overlays, etc. becomes more complex because
    non-linear iteration could potentially skip many positions with
-   changes, and then cross them again on the way back...
+   changes, and then cross them again on the way back (see
+   handle_stop_backwards)...
 
    One other prominent effect of bidirectional display is that some
    paragraphs of text need to be displayed starting at the right
@@ -252,7 +301,7 @@
    This way, the terminal-specific back-end can still draw the glyphs
    left to right, even for R2L lines.
 
-   Bidirectional display and character compositions
+   Bidirectional display and character compositions.
 
    Some scripts cannot be displayed by drawing each character
    individually, because adjacent characters change each other's shape
@@ -272,15 +321,15 @@
    Each of these grapheme clusters is then delivered to PRODUCE_GLYPHS
    in the direction corresponding to the current bidi scan direction
    (recorded in the scan_dir member of the `struct bidi_it' object
-   that is part of the buffer iterator).  In particular, if the bidi
-   iterator currently scans the buffer backwards, the grapheme
-   clusters are delivered back to front.  This reorders the grapheme
-   clusters as appropriate for the current bidi context.  Note that
-   this means that the grapheme clusters are always stored in the
-   LGSTRING object (see composite.c) in the logical order.
+   that is part of the iterator).  In particular, if the bidi iterator
+   currently scans the buffer backwards, the grapheme clusters are
+   delivered back to front.  This reorders the grapheme clusters as
+   appropriate for the current bidi context.  Note that this means
+   that the grapheme clusters are always stored in the LGSTRING object
+   (see composite.c) in the logical order.
 
    Moving an iterator in bidirectional text
-   without producing glyphs
+   without producing glyphs.
 
    Note one important detail mentioned above: that the bidi reordering
    engine, driven by the iterator, produces characters in R2L rows
@@ -1383,6 +1432,29 @@
   move_it_to (&it, charpos, -1, it.last_visible_y - 1, -1,
 	      (charpos >= 0 ? MOVE_TO_POS : 0) | MOVE_TO_Y);
 
+  /* Adjust for line numbers, if CHARPOS is at or beyond first_visible_x,
+     but we didn't yet produce the line-number glyphs.  */
+  if (!NILP (Vdisplay_line_numbers)
+      && it.current_x >= it.first_visible_x
+      && IT_CHARPOS (it) == charpos
+      && !it.line_number_produced_p)
+    {
+      /* If the pixel width of line numbers was not yet known, compute
+	 it now.  This usually happens in the first display line of a
+	 window.  */
+      if (!it.lnum_pixel_width)
+	{
+	  struct it it2;
+	  void *it2data = NULL;
+
+	  SAVE_IT (it2, it, it2data);
+	  move_it_by_lines (&it, 1);
+	  it2.lnum_pixel_width = it.lnum_pixel_width;
+	  RESTORE_IT (&it, &it2, it2data);
+	}
+      it.current_x += it.lnum_pixel_width;
+    }
+
   if (charpos >= 0
       && (((!it.bidi_p || it.bidi_it.scan_dir != -1)
 	   && IT_CHARPOS (it) >= charpos)
@@ -2281,7 +2353,10 @@
      ascent value, lest the hollow cursor looks funny.  */
   y = w->phys_cursor.y;
   ascent = row->ascent;
-  if (row->ascent < glyph->ascent)
+  /* The test for row at ZV is for when line numbers are displayed and
+     point is at EOB: the cursor could then be smaller or larger than
+     the default face's font.  */
+  if (!row->ends_at_zv_p && row->ascent < glyph->ascent)
     {
       y -= glyph->ascent - row->ascent;
       ascent = glyph->ascent;
@@ -2291,6 +2366,9 @@
   h0 = min (FRAME_LINE_HEIGHT (f), row->visible_height);
 
   h = max (h0, ascent + glyph->descent);
+  /* Don't let the cursor exceed the dimensions of the row, so that
+     the upper/lower side of the box aren't clipped.  */
+  h = min (h, row->height);
   h0 = min (h0, ascent + glyph->descent);
 
   y0 = WINDOW_HEADER_LINE_HEIGHT (w);
@@ -8718,8 +8796,12 @@
 
   if (it->hpos == 0)
     {
-      /* If line numbers are being displayed, produce a line number.  */
-      if (should_produce_line_number (it))
+      /* If line numbers are being displayed, produce a line number.
+	 But don't do that if we are to reach first_visible_x, because
+	 line numbers are not relevant to stuff that is not visible on
+	 display.  */
+      if (!((op && MOVE_TO_X) && to_x == it->first_visible_x)
+	  && should_produce_line_number (it))
 	{
 	  if (it->current_x == it->first_visible_x)
 	    maybe_produce_line_number (it);
@@ -8790,7 +8872,16 @@
 
       if (it->line_wrap == TRUNCATE)
 	{
-	  if (BUFFER_POS_REACHED_P ())
+	  /* If it->pixel_width is zero, the last PRODUCE_GLYPHS call
+	     produced something that doesn't consume any screen estate
+	     in the text area, so we don't want to exit the loop at
+	     TO_CHARPOS, before we produce the glyph for that buffer
+	     position.  This happens, e.g., when there's an overlay at
+	     TO_CHARPOS that draws a fringe bitmap.  */
+	  if (BUFFER_POS_REACHED_P ()
+	      && (it->pixel_width > 0
+		  || IT_CHARPOS (*it) > to_charpos
+		  || it->area != TEXT_AREA))
 	    {
 	      result = MOVE_POS_MATCH_OR_ZV;
 	      break;
@@ -9175,9 +9266,25 @@
       prev_method = it->method;
       if (it->method == GET_FROM_BUFFER)
 	prev_pos = IT_CHARPOS (*it);
+
+      /* Detect overly-wide wrap-prefixes made of (space ...) display
+	 properties.  When such a wrap prefix reaches past the right
+	 margin of the window, we need to avoid the call to
+	 set_iterator_to_next below, so that it->line_wrap is left at
+	 its TRUNCATE value wisely set by handle_line_prefix.
+	 Otherwise, set_iterator_to_next will pop the iterator stack,
+	 restore it->line_wrap, and we might miss the opportunity to
+	 exit the loop and return.  */
+      bool overwide_wrap_prefix =
+	CONSP (it->object) && EQ (XCAR (it->object), Qspace)
+	&& it->sp > 0 && it->method == GET_FROM_STRETCH
+	&& it->current_x >= it->last_visible_x
+	&& it->continuation_lines_width > 0
+	&& it->line_wrap == TRUNCATE && it->stack[0].line_wrap != TRUNCATE;
       /* The current display element has been consumed.  Advance
 	 to the next.  */
-      set_iterator_to_next (it, true);
+      if (!overwide_wrap_prefix)
+	set_iterator_to_next (it, true);
       if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
 	SET_TEXT_POS (this_line_min_pos, IT_CHARPOS (*it), IT_BYTEPOS (*it));
       if (IT_CHARPOS (*it) < to_charpos)
@@ -9587,6 +9694,7 @@
       it->current_x = line_start_x;
       line_start_x = 0;
       it->hpos = 0;
+      it->line_number_produced_p = false;
       it->current_y += it->max_ascent + it->max_descent;
       ++it->vpos;
       last_height = it->max_ascent + it->max_descent;
@@ -10125,17 +10233,53 @@
   itdata = bidi_shelve_cache ();
   SET_TEXT_POS (startp, start, CHAR_TO_BYTE (start));
   start_display (&it, w, startp);
-
-  if (NILP (x_limit))
-    x = move_it_to (&it, end, -1, max_y, -1, MOVE_TO_POS | MOVE_TO_Y);
-  else
+  /* It makes no sense to measure dimensions of region of text that
+     crosses the point where bidi reordering changes scan direction.
+     By using unidirectional movement here we at least support the use
+     case of measuring regions of text that have a uniformly R2L
+     directionality, and regions that begin and end in text of the
+     same directionality.  */
+  it.bidi_p = false;
+
+  int move_op = MOVE_TO_POS | MOVE_TO_Y;
+  int to_x = -1;
+  if (!NILP (x_limit))
     {
       it.last_visible_x = max_x;
       /* Actually, we never want move_it_to stop at to_x.  But to make
 	 sure that move_it_in_display_line_to always moves far enough,
-	 we set it to INT_MAX and specify MOVE_TO_X.  */
-      x = move_it_to (&it, end, INT_MAX, max_y, -1,
-		      MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
+	 we set to_x to INT_MAX and specify MOVE_TO_X.  */
+      move_op |= MOVE_TO_X;
+      to_x = INT_MAX;
+    }
+
+  void *it2data = NULL;
+  struct it it2;
+  SAVE_IT (it2, it, it2data);
+
+  x = move_it_to (&it, end, to_x, max_y, -1, move_op);
+
+  /* We could have a display property at END, in which case asking
+     move_it_to to stop at END will overshoot and stop at position
+     after END.  So we try again, stopping before END, and account for
+     the width of the last buffer position manually.  */
+  if (IT_CHARPOS (it) > end)
+    {
+      end--;
+      RESTORE_IT (&it, &it2, it2data);
+      x = move_it_to (&it, end, to_x, max_y, -1, move_op);
+      /* Add the width of the thing at TO, but only if we didn't
+	 overshoot it; if we did, it is already accounted for.  Also,
+	 account for the height of the thing at TO.  */
+      if (IT_CHARPOS (it) == end)
+	{
+	  x += it.pixel_width;
+	  it.max_ascent = max (it.max_ascent, it.ascent);
+	  it.max_descent = max (it.max_descent, it.descent);
+	}
+    }
+  if (!NILP (x_limit))
+    {
       /* Don't return more than X-LIMIT.  */
       if (x > max_x)
         x = max_x;
@@ -16808,6 +16952,7 @@
       /* We used to issue a CHECK_MARGINS argument to try_window here,
 	 but this causes scrolling to fail when point begins inside
 	 the scroll margin (bug#148) -- cyd  */
+      clear_glyph_matrix (w->desired_matrix);
       if (!try_window (window, startp, 0))
 	{
 	  w->force_start = true;
@@ -21076,19 +21221,23 @@
      an L2R paragraph.  */
   tem_it.bidi_it.resolved_level = 2;
 
+  /* We must leave space for 2 glyphs for continuation and truncation,
+     and at least one glyph for buffer text.  */
+  int width_limit =
+    tem_it.last_visible_x - tem_it.first_visible_x
+    - 3 * FRAME_COLUMN_WIDTH (it->f);
   /* Produce glyphs for the line number in a scratch glyph_row.  */
-  int n_glyphs_before;
   for (const char *p = lnum_buf; *p; p++)
     {
       /* For continuation lines and lines after ZV, instead of a line
-	 number, produce a blank prefix of the same width.  Use the
-	 default face for the blank field beyond ZV.  */
-      if (beyond_zv)
-	tem_it.face_id = it->base_face_id;
-      else if (lnum_face_id != current_lnum_face_id
-	       && (EQ (Vdisplay_line_numbers, Qvisual)
-		   ? this_line == 0
-		   : this_line == it->pt_lnum))
+	 number, produce a blank prefix of the same width.  */
+      if (lnum_face_id != current_lnum_face_id
+	  && (EQ (Vdisplay_line_numbers, Qvisual)
+	      ? this_line == 0
+	      : this_line == it->pt_lnum)
+	  /* Avoid displaying the line-number-current-line face on
+	     empty lines beyond EOB.  */
+	  && it->what != IT_EOB)
 	tem_it.face_id = current_lnum_face_id;
       else
 	tem_it.face_id = lnum_face_id;
@@ -21101,18 +21250,18 @@
       else
 	tem_it.c = tem_it.char_to_display = *p;
       tem_it.len = 1;
-      n_glyphs_before = scratch_glyph_row.used[TEXT_AREA];
       /* Make sure these glyphs will have a "position" of -1.  */
       SET_TEXT_POS (tem_it.position, -1, -1);
       PRODUCE_GLYPHS (&tem_it);
 
-      /* Stop producing glyphs if we don't have enough space on
-	 this line.  FIXME: should we refrain from producing the
-	 line number at all in that case?  */
-      if (tem_it.current_x > tem_it.last_visible_x)
-	{
-	  scratch_glyph_row.used[TEXT_AREA] = n_glyphs_before;
-	  break;
+      /* Stop producing glyphs, and refrain from producing the line
+	 number, if we don't have enough space on this line.  */
+      if (tem_it.current_x >= width_limit)
+	{
+	  it->lnum_width = 0;
+	  it->lnum_pixel_width = 0;
+	  bidi_unshelve_cache (itdata, false);
+	  return;
 	}
     }
 
@@ -21141,25 +21290,34 @@
 	}
     }
 
-  /* Update IT's metrics due to glyphs produced for line numbers.  */
-  if (it->glyph_row)
+  /* Update IT's metrics due to glyphs produced for line numbers.
+     Don't do that for rows beyond ZV, to avoid displaying a cursor of
+     different dimensions there.  */
+  if (!beyond_zv)
     {
-      struct glyph_row *row = it->glyph_row;
+      if (it->glyph_row)
+	{
+	  struct glyph_row *row = it->glyph_row;
 
-      it->max_ascent = max (row->ascent, tem_it.max_ascent);
-      it->max_descent = max (row->height - row->ascent, tem_it.max_descent);
-      it->max_phys_ascent = max (row->phys_ascent, tem_it.max_phys_ascent);
-      it->max_phys_descent = max (row->phys_height - row->phys_ascent,
-				  tem_it.max_phys_descent);
-    }
-  else
-    {
-      it->max_ascent = max (it->max_ascent, tem_it.max_ascent);
-      it->max_descent = max (it->max_descent, tem_it.max_descent);
-      it->max_phys_ascent = max (it->max_phys_ascent, tem_it.max_phys_ascent);
-      it->max_phys_descent = max (it->max_phys_descent, tem_it.max_phys_descent);
+	  it->max_ascent = max (row->ascent, tem_it.max_ascent);
+	  it->max_descent = max (row->height - row->ascent, tem_it.max_descent);
+	  it->max_phys_ascent = max (row->phys_ascent, tem_it.max_phys_ascent);
+	  it->max_phys_descent = max (row->phys_height - row->phys_ascent,
+				      tem_it.max_phys_descent);
+	}
+      else
+	{
+	  it->max_ascent = max (it->max_ascent, tem_it.max_ascent);
+	  it->max_descent = max (it->max_descent, tem_it.max_descent);
+	  it->max_phys_ascent = max (it->max_phys_ascent,
+				     tem_it.max_phys_ascent);
+	  it->max_phys_descent = max (it->max_phys_descent,
+				      tem_it.max_phys_descent);
+	}
     }
 
+  it->line_number_produced_p = true;
+
   bidi_unshelve_cache (itdata, false);
 }
 
@@ -21283,6 +21441,8 @@
   row->displays_text_p = true;
   row->starts_in_middle_of_char_p = it->starts_in_middle_of_char_p;
   it->starts_in_middle_of_char_p = false;
+  it->tab_offset = 0;
+  it->line_number_produced_p = false;
 
   /* Arrange the overlays nicely for our purposes.  Usually, we call
      display_line on only one line at a time, in which case this
@@ -21327,6 +21487,10 @@
 	      || move_result == MOVE_POS_MATCH_OR_ZV))
 	it->current_x = it->first_visible_x;
 
+      /* In case move_it_in_display_line_to above "produced" the line
+	 number.  */
+      it->line_number_produced_p = false;
+
       /* Record the smallest positions seen while we moved over
 	 display elements that are not visible.  This is needed by
 	 redisplay_internal for optimizing the case where the cursor
@@ -21546,6 +21710,10 @@
 	  row->extra_line_spacing = max (row->extra_line_spacing,
 					 it->max_extra_line_spacing);
 	  if (it->current_x - it->pixel_width < it->first_visible_x
+	      /* When line numbers are displayed, row->x should not be
+		 offset, as the first glyph after the line number can
+		 never be partially visible.  */
+	      && !line_number_needed
 	      /* In R2L rows, we arrange in extend_face_to_end_of_line
 		 to add a right offset to the line, by a suitable
 		 change to the stretch glyph that is the leftmost
@@ -21787,7 +21955,8 @@
 		  if (it->bidi_p)
 		    RECORD_MAX_MIN_POS (it);
 
-		  if (x < it->first_visible_x && !row->reversed_p)
+		  if (x < it->first_visible_x && !row->reversed_p
+		      && !line_number_needed)
 		    /* Glyph is partially visible, i.e. row starts at
 		       negative X position.  Don't do that in R2L
 		       rows, where we arrange to add a right offset to
@@ -21803,6 +21972,7 @@
 		     be taken care of in produce_special_glyphs.  */
 		  if (row->reversed_p
 		      && new_x > it->last_visible_x
+		      && !line_number_needed
 		      && !(it->line_wrap == TRUNCATE
 			   && WINDOW_LEFT_FRINGE_WIDTH (it->w) == 0))
 		    {
@@ -21870,9 +22040,24 @@
 	  break;
 	}
 
+      /* Detect overly-wide wrap-prefixes made of (space ...) display
+	 properties.  When such a wrap prefix reaches past the right
+	 margin of the window, we need to avoid the call to
+	 set_iterator_to_next below, so that it->line_wrap is left at
+	 its TRUNCATE value wisely set by handle_line_prefix.
+	 Otherwise, set_iterator_to_next will pop the iterator stack,
+	 restore it->line_wrap, and redisplay might infloop.  */
+      bool overwide_wrap_prefix =
+	CONSP (it->object) && EQ (XCAR (it->object), Qspace)
+	&& it->sp > 0 && it->method == GET_FROM_STRETCH
+	&& it->current_x >= it->last_visible_x
+	&& it->continuation_lines_width > 0
+	&& it->line_wrap == TRUNCATE && it->stack[0].line_wrap != TRUNCATE;
+
       /* Proceed with next display element.  Note that this skips
 	 over lines invisible because of selective display.  */
-      set_iterator_to_next (it, true);
+      if (!overwide_wrap_prefix)
+	set_iterator_to_next (it, true);
 
       /* If we truncate lines, we are done when the last displayed
 	 glyphs reach past the right margin of the window.  */
@@ -25483,22 +25668,28 @@
    face-override for drawing S.  */
 
 #ifdef HAVE_NTGUI
-#define OPTIONAL_HDC(hdc)  HDC hdc,
-#define DECLARE_HDC(hdc)   HDC hdc;
-#define ALLOCATE_HDC(hdc, f) hdc = get_frame_dc ((f))
-#define RELEASE_HDC(hdc, f)  release_frame_dc ((f), (hdc))
-#endif
-
-#ifndef OPTIONAL_HDC
-#define OPTIONAL_HDC(hdc)
-#define DECLARE_HDC(hdc)
-#define ALLOCATE_HDC(hdc, f)
-#define RELEASE_HDC(hdc, f)
+/* We set inhibit-quit here due to paranoia: get_frame_dc acquires the
+   critical section, and we cannot QUIT while we hold the critical
+   section.  If any of the code run by callers of ALLOCATE_HDC happens
+   to call Lisp (might be possible due to all the hooks lying around),
+   we must prevent it from quitting.  */
+# define ALLOCATE_HDC(hdc, f)			\
+  Lisp_Object prev_quit = Vinhibit_quit;	\
+  Vinhibit_quit = Qt;				\
+  HDC hdc = get_frame_dc ((f))
+# define RELEASE_HDC(hdc, f)			\
+  release_frame_dc ((f), (hdc));		\
+  Vinhibit_quit = prev_quit
+#else
+# define ALLOCATE_HDC(hdc, f)
+# define RELEASE_HDC(hdc, f)
 #endif
 
 static void
 init_glyph_string (struct glyph_string *s,
-		   OPTIONAL_HDC (hdc)
+#ifdef HAVE_NTGUI
+		   HDC hdc,
+#endif
 		   XChar2b *char2b, struct window *w, struct glyph_row *row,
 		   enum glyph_row_area area, int start, enum draw_glyphs_face hl)
 {
@@ -26538,7 +26729,6 @@
   struct glyph_string *clip_head = NULL, *clip_tail = NULL;
   int i, j, x_reached, last_x, area_left = 0;
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-  DECLARE_HDC (hdc);
 
   ALLOCATE_HDC (hdc, f);
 
@@ -28255,8 +28445,14 @@
 	      int x = it->current_x + it->continuation_lines_width;
 	      int x0 = x;
 	      /* Adjust for line numbers, if needed.   */
-	      if (!NILP (Vdisplay_line_numbers) && x0 >= it->lnum_pixel_width)
-		x -= it->lnum_pixel_width;
+	      if (!NILP (Vdisplay_line_numbers) && it->line_number_produced_p)
+		{
+		  x -= it->lnum_pixel_width;
+		  /* Restore the original TAB width, if required.  */
+		  if (x + it->tab_offset >= it->first_visible_x)
+		    x += it->tab_offset;
+		}
+
 	      int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
 
 	      /* If the distance from the current position to the next tab
@@ -28264,10 +28460,19 @@
 		 tab stop after that.  */
 	      if (next_tab_x - x < font->space_width)
 		next_tab_x += tab_width;
-	      if (!NILP (Vdisplay_line_numbers) && x0 >= it->lnum_pixel_width)
-		next_tab_x += (it->lnum_pixel_width
-			       - ((it->w->hscroll * font->space_width)
-				  % tab_width));
+	      if (!NILP (Vdisplay_line_numbers) && it->line_number_produced_p)
+		{
+		  next_tab_x += it->lnum_pixel_width;
+		  /* If the line is hscrolled, and the TAB starts before
+		     the first visible pixel, simulate negative row->x.  */
+		  if (x < it->first_visible_x)
+		    {
+		      next_tab_x -= it->first_visible_x - x;
+		      it->tab_offset = it->first_visible_x - x;
+		    }
+		  else
+		    next_tab_x -= it->tab_offset;
+		}
 
 	      it->pixel_width = next_tab_x - x0;
 	      it->nglyphs = 1;
@@ -31370,7 +31575,9 @@
 	     is currently hidden to avoid Bug#30519.  */
 	  || (!hlinfo->mouse_face_hidden
 	      && OVERLAYP (hlinfo->mouse_face_overlay)
-	      && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
+	      /* It's possible the overlay was deleted (Bug#35273).  */
+              && XMARKER (OVERLAY_START (hlinfo->mouse_face_overlay))->buffer
+              && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
 	{
 	  /* Find the highest priority overlay with a mouse-face.  */
 	  Lisp_Object overlay = Qnil;
@@ -32138,7 +32345,6 @@
 
   TRACE ((stderr, "expose_frame "));
 
-  /* No need to redraw if frame will be redrawn soon.  */
   if (FRAME_GARBAGED_P (f))
     {
       TRACE ((stderr, " garbaged\n"));
@@ -32291,7 +32497,12 @@
 
   DEFVAR_BOOL("inhibit-message", inhibit_message,
               doc:  /* Non-nil means calls to `message' are not displayed.
-They are still logged to the *Messages* buffer.  */);
+They are still logged to the *Messages* buffer.
+
+Do NOT set this globally to a non-nil value, as doing that will
+disable messages everywhere, including in I-search and other
+places where they are necessary.  This variable is intended to
+be let-bound around code that needs to disable messages temporarily. */);
   inhibit_message = 0;
 
   message_dolog_marker1 = Fmake_marker ();
@@ -32684,8 +32895,10 @@
 Autoselection selects the minibuffer only if it is active, and never
 unselects the minibuffer if it is active.
 
-When customizing this variable make sure that the actual value of
-`focus-follows-mouse' matches the behavior of your window manager.  */);
+If you want to use the mouse to autoselect a window on another frame,
+make sure that (1) your window manager has focus follow the mouse and
+(2) the value of the option `focus-follows-mouse' matches the policy
+of your window manager.  */);
   Vmouse_autoselect_window = Qnil;
 
   DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars,
diff -Nru emacs-26.1+1/src/xfaces.c emacs-26.3+1/src/xfaces.c
--- emacs-26.1+1/src/xfaces.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xfaces.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* xfaces.c -- "Face" primitives.
 
-Copyright (C) 1993-1994, 1998-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 1998-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -5943,7 +5943,14 @@
     int face_id;
 
     if (base_face_id >= 0)
-      face_id = base_face_id;
+      {
+	face_id = base_face_id;
+	/* Make sure the base face ID is usable: if someone freed the
+	   cached faces since we've looked up the base face, we need
+	   to look it up again.  */
+	if (!FACE_FROM_ID_OR_NULL (f, face_id))
+	  face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+      }
     else if (NILP (Vface_remapping_alist))
       face_id = DEFAULT_FACE_ID;
     else
diff -Nru emacs-26.1+1/src/xfns.c emacs-26.3+1/src/xfns.c
--- emacs-26.1+1/src/xfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for the X window system.
 
-Copyright (C) 1989, 1992-2018 Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -5009,7 +5009,7 @@
       mi->mm_height = height_mm;
 
 #if GTK_CHECK_VERSION (3, 22, 0)
-      mi->name = g_strdup (gdk_monitor_get_model (monitor));
+      dupstring (&mi->name, (gdk_monitor_get_model (monitor)));
 #elif GTK_CHECK_VERSION (2, 14, 0)
       mi->name = gdk_screen_get_monitor_plug_name (gscreen, i);
 #endif
@@ -5020,6 +5020,11 @@
                                                  primary_monitor,
                                                  monitor_frames,
                                                  source);
+#if GTK_CHECK_VERSION (2, 14, 0)
+  free_monitors (monitors, n_monitors);
+#else
+  xfree (monitors);
+#endif
   unblock_input ();
 #else  /* not USE_GTK */
 
@@ -5054,7 +5059,7 @@
   int menu_bar_height = 0, menu_bar_width = 0;
   int tool_bar_height = 0, tool_bar_width = 0;
 
-  if (FRAME_INITIAL_P (f) || !FRAME_X_P (f))
+  if (FRAME_INITIAL_P (f) || !FRAME_X_P (f) || !FRAME_OUTER_WINDOW (f))
     return Qnil;
 
   block_input ();
diff -Nru emacs-26.1+1/src/xfont.c emacs-26.3+1/src/xfont.c
--- emacs-26.1+1/src/xfont.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xfont.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* xfont.c -- X core font driver.
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
diff -Nru emacs-26.1+1/src/xftfont.c emacs-26.3+1/src/xftfont.c
--- emacs-26.1+1/src/xftfont.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xftfont.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* xftfont.c -- XFT font driver.
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -42,8 +42,9 @@
 struct xftfont_info
 {
   struct font font;
-  /* The following five members must be here in this order to be
-     compatible with struct ftfont_info (in ftfont.c).  */
+  /* The following members up to and including 'matrix' must be here
+     in this order to be compatible with struct ftfont_info (in
+     ftfont.c).  */
 #ifdef HAVE_LIBOTF
   bool maybe_otf;	  /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
@@ -51,6 +52,7 @@
   FT_Size ft_size;
   int index;
   FT_Matrix matrix;
+
   Display *display;
   XftFont *xftfont;
   unsigned x_display_id;
diff -Nru emacs-26.1+1/src/xgselect.c emacs-26.3+1/src/xgselect.c
--- emacs-26.1+1/src/xgselect.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xgselect.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Function for handling the GLib event loop.
 
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
+Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xgselect.h emacs-26.3+1/src/xgselect.h
--- emacs-26.1+1/src/xgselect.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xgselect.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Header for xg_select.
 
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
+Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xmenu.c emacs-26.3+1/src/xmenu.c
--- emacs-26.1+1/src/xmenu.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xmenu.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
 
-Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2018 Free Software
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2019 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1162,11 +1162,17 @@
   GtkRequisition req;
   int max_x = -1;
   int max_y = -1;
+#ifdef HAVE_GTK3
+  int scale;
+#endif
 
   Lisp_Object frame, workarea;
 
   XSETFRAME (frame, data->f);
 
+#ifdef HAVE_GTK3
+  scale = xg_get_scale (data->f);
+#endif
   /* TODO: Get the monitor workarea directly without calculating other
      items in x-display-monitor-attributes-list. */
   workarea = call3 (Qframe_monitor_workarea,
@@ -1192,11 +1198,20 @@
       max_y = x_display_pixel_height (dpyinfo);
     }
 
+  /* frame-monitor-workarea and {x,y}_display_pixel_width/height all
+     return device pixels, but GTK wants scaled pixels.  The positions
+     passed in via data were already scaled for us.  */
+#ifdef HAVE_GTK3
+  max_x /= scale;
+  max_y /= scale;
+#endif
   *x = data->x;
   *y = data->y;
 
   /* Check if there is room for the menu.  If not, adjust x/y so that
-     the menu is fully visible.  */
+     the menu is fully visible.  gtk_widget_get_preferred_size returns
+     scaled pixels, so there is no need to apply the scaling
+     factor.  */
   gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL, &req);
   if (data->x + req.width > max_x)
     *x -= data->x + req.width - max_x;
diff -Nru emacs-26.1+1/src/xml.c emacs-26.3+1/src/xml.c
--- emacs-26.1+1/src/xml.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xml.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Interface to libxml2.
-   Copyright (C) 2010-2018 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xrdb.c emacs-26.3+1/src/xrdb.c
--- emacs-26.1+1/src/xrdb.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xrdb.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Deal with the X Resource Manager.
-   Copyright (C) 1990, 1993-1994, 2000-2018 Free Software Foundation,
+   Copyright (C) 1990, 1993-1994, 2000-2019 Free Software Foundation,
    Inc.
 
 Author: Joseph Arceneaux
diff -Nru emacs-26.1+1/src/xselect.c emacs-26.3+1/src/xselect.c
--- emacs-26.1+1/src/xselect.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xselect.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* X Selection processing for Emacs.
-   Copyright (C) 1993-1997, 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 1993-1997, 2000-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xsettings.c emacs-26.3+1/src/xsettings.c
--- emacs-26.1+1/src/xsettings.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xsettings.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for handling font and other changes dynamically.
 
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
+Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xsettings.h emacs-26.3+1/src/xsettings.h
--- emacs-26.1+1/src/xsettings.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xsettings.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Functions for handle font changes dynamically.
 
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
+Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xsmfns.c emacs-26.3+1/src/xsmfns.c
--- emacs-26.1+1/src/xsmfns.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xsmfns.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Session management module for systems which understand the X Session
    management protocol.
 
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/src/xterm.c emacs-26.3+1/src/xterm.c
--- emacs-26.1+1/src/xterm.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xterm.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
 
-Copyright (C) 1989, 1993-2018 Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -360,17 +360,17 @@
 
       if (! FRAME_CR_SURFACE (f))
         {
-          cairo_surface_t *surface;
-          surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f),
-                                               FRAME_X_DRAWABLE (f),
-                                               FRAME_DISPLAY_INFO (f)->visual,
-                                               FRAME_PIXEL_WIDTH (f),
-                                               FRAME_PIXEL_HEIGHT (f));
-          cr = cairo_create (surface);
-          cairo_surface_destroy (surface);
-        }
-      else
-        cr = cairo_create (FRAME_CR_SURFACE (f));
+	  int scale = 1;
+#ifdef USE_GTK
+	  scale = xg_get_scale (f);
+#endif
+
+	  FRAME_CR_SURFACE (f) =
+	    cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+					scale * FRAME_PIXEL_WIDTH (f),
+					scale * FRAME_PIXEL_HEIGHT (f));
+	}
+      cr = cairo_create (FRAME_CR_SURFACE (f));
       FRAME_CR_CONTEXT (f) = cr;
     }
   cairo_save (cr);
@@ -1011,8 +1011,9 @@
       if (FRAME_GTK_WIDGET (f))
         {
           GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f));
-          width = gdk_window_get_width (w);
-          height = gdk_window_get_height (w);
+	  int scale = xg_get_scale (f);
+	  width = scale * gdk_window_get_width (w);
+	  height = scale * gdk_window_get_height (w);
         }
       else
 #endif
@@ -1239,32 +1240,24 @@
 #ifdef USE_CAIRO
   if (FRAME_CR_SURFACE (f))
     {
-      cairo_t *cr = 0;
-      block_input();
-#if defined (USE_GTK) && defined (HAVE_GTK3)
-      if (FRAME_GTK_WIDGET (f))
-        {
-          GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f));
-          cr = gdk_cairo_create (w);
-        }
-      else
-#endif
-        {
-          cairo_surface_t *surface;
-          int width = FRAME_PIXEL_WIDTH (f);
-          int height = FRAME_PIXEL_HEIGHT (f);
-          if (! FRAME_EXTERNAL_TOOL_BAR (f))
-            height += FRAME_TOOL_BAR_HEIGHT (f);
-          if (! FRAME_EXTERNAL_MENU_BAR (f))
-            height += FRAME_MENU_BAR_HEIGHT (f);
-          surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f),
-                                               FRAME_X_DRAWABLE (f),
-                                               FRAME_DISPLAY_INFO (f)->visual,
-                                               width,
-                                               height);
-          cr = cairo_create (surface);
-          cairo_surface_destroy (surface);
-        }
+      cairo_t *cr;
+      cairo_surface_t *surface;
+      int width, height;
+
+      block_input ();
+      width = FRAME_PIXEL_WIDTH (f);
+      height = FRAME_PIXEL_HEIGHT (f);
+      if (! FRAME_EXTERNAL_TOOL_BAR (f))
+	height += FRAME_TOOL_BAR_HEIGHT (f);
+      if (! FRAME_EXTERNAL_MENU_BAR (f))
+	height += FRAME_MENU_BAR_HEIGHT (f);
+      surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f),
+					   FRAME_X_DRAWABLE (f),
+					   FRAME_DISPLAY_INFO (f)->visual,
+					   width,
+					   height);
+      cr = cairo_create (surface);
+      cairo_surface_destroy (surface);
 
       cairo_set_source_surface (cr, FRAME_CR_SURFACE (f), 0, 0);
       cairo_paint (cr);
@@ -4256,7 +4249,29 @@
   x_clear_cursor (w);
 
 #ifdef USE_CAIRO
-  SET_FRAME_GARBAGED (f);
+  if (FRAME_CR_CONTEXT (f))
+    {
+      int wx = WINDOW_LEFT_EDGE_X (w);
+      cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+						       width, height);
+      cairo_t *cr = cairo_create (s);
+      cairo_set_source_surface (cr, cairo_get_target (FRAME_CR_CONTEXT (f)),
+				-x, -from_y);
+      cairo_paint (cr);
+      cairo_destroy (cr);
+
+      cr = FRAME_CR_CONTEXT (f);
+      cairo_save (cr);
+      cairo_set_source_surface (cr, s, wx, to_y);
+      cairo_rectangle (cr, wx, to_y, width, height);
+      cairo_fill (cr);
+      cairo_restore (cr);
+      cairo_surface_destroy (s);
+    }
+  else
+    {
+      SET_FRAME_GARBAGED (f);
+    }
 #else
   XCopyArea (FRAME_X_DISPLAY (f),
              FRAME_X_DRAWABLE (f), FRAME_X_DRAWABLE (f),
@@ -9804,13 +9819,13 @@
          current Xt versions, this isn't needed either.  */
 #ifdef USE_GTK
       /* A long-standing GTK bug prevents proper disconnect handling
-	 (https://bugzilla.gnome.org/show_bug.cgi?id=85715).  Once,
+	 (https://gitlab.gnome.org/GNOME/gtk/issues/221).  Once,
 	 the resulting Glib error message loop filled a user's disk.
 	 To avoid this, kill Emacs unconditionally on disconnect.  */
       shut_down_emacs (0, Qnil);
       fprintf (stderr, "%s\n\
 When compiled with GTK, Emacs cannot recover from X disconnects.\n\
-This is a GTK bug: https://bugzilla.gnome.org/show_bug.cgi?id=85715\n\
+This is a GTK bug: https://gitlab.gnome.org/GNOME/gtk/issues/221\n\
 For details, see etc/PROBLEMS.\n",
 	       error_msg);
       emacs_abort ();
@@ -10552,6 +10567,10 @@
  * windows that do not have the `below' property set.
  *
  * Some window managers may not honor this parameter.
+ *
+ * Internally, this function also handles a value 'above-suspended'.
+ * That value is used to temporarily remove F from the 'above' group
+ * to make sure that it does not obscure a menu currently popped up.
  */
 void
 x_set_z_group (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
@@ -11540,7 +11559,8 @@
     poll_for_input_1 ();
     poll_suppress_count = old_poll_suppress_count;
 #endif
-    x_wait_for_event (f, MapNotify);
+    if (! FRAME_VISIBLE_P (f))
+      x_wait_for_event (f, MapNotify);
   }
 }
 
diff -Nru emacs-26.1+1/src/xterm.h emacs-26.3+1/src/xterm.h
--- emacs-26.1+1/src/xterm.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xterm.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication with X protocol.
-   Copyright (C) 1989, 1993-1994, 1998-2018 Free Software Foundation,
+   Copyright (C) 1989, 1993-1994, 1998-2019 Free Software Foundation,
    Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/src/xwidget.c emacs-26.3+1/src/xwidget.c
--- emacs-26.1+1/src/xwidget.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xwidget.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Support for embedding graphical components in a buffer.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -78,6 +78,8 @@
    Lisp_Object title, Lisp_Object width, Lisp_Object height,
    Lisp_Object arguments, Lisp_Object buffer)
 {
+  if (!xg_gtk_initialized)
+    error ("make-xwidget: GTK has not been initialized");
   CHECK_SYMBOL (type);
   CHECK_NATNUM (width);
   CHECK_NATNUM (height);
@@ -508,6 +510,10 @@
                    struct glyph_string *s,
                    int x, int y)
 {
+
+  if (!xg_gtk_initialized)
+    error ("xwidget_init_view: GTK has not been initialized");
+
   struct xwidget_view *xv = allocate_xwidget_view ();
   Lisp_Object val;
 
@@ -992,8 +998,6 @@
   defsubr (&Sxwidget_buffer);
   defsubr (&Sset_xwidget_plist);
 
-  DEFSYM (Qxwidget, "xwidget");
-
   DEFSYM (QCxwidget, ":xwidget");
   DEFSYM (QCtitle, ":title");
 
diff -Nru emacs-26.1+1/src/xwidget.h emacs-26.3+1/src/xwidget.h
--- emacs-26.1+1/src/xwidget.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/src/xwidget.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Support for embedding graphical components in a buffer.
 
-Copyright (C) 2011-2018 Free Software Foundation, Inc.
+Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/ChangeLog.1 emacs-26.3+1/test/ChangeLog.1
--- emacs-26.1+1/test/ChangeLog.1	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/ChangeLog.1	2019-09-10 00:32:49.000000000 +0000
@@ -2952,7 +2952,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008-2018 Free Software Foundation, Inc.
+  Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/data/emacs-module/mod-test.c emacs-26.3+1/test/data/emacs-module/mod-test.c
--- emacs-26.1+1/test/data/emacs-module/mod-test.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/data/emacs-module/mod-test.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Test GNU Emacs modules.
 
-Copyright 2015-2018 Free Software Foundation, Inc.
+Copyright 2015-2019 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -156,6 +156,24 @@
   return env->make_global_ref (env, lisp_str);
 }
 
+/* Create a few global references from arguments and free them.  */
+static emacs_value
+Fmod_test_globref_free (emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+			void *data)
+{
+  emacs_value refs[10];
+  for (int i = 0; i < 10; i++)
+    {
+      refs[i] = env->make_global_ref (env, args[i % nargs]);
+    }
+  for (int i = 0; i < 10; i++)
+    {
+      env->free_global_ref (env, refs[i]);
+    }
+  return env->intern (env, "ok");
+}
+
+
 
 /* Return a copy of the argument string where every 'a' is replaced
    with 'b'.  */
@@ -339,6 +357,7 @@
   DEFUN ("mod-test-non-local-exit-funcall", Fmod_test_non_local_exit_funcall,
 	 1, 1, NULL, NULL);
   DEFUN ("mod-test-globref-make", Fmod_test_globref_make, 0, 0, NULL, NULL);
+  DEFUN ("mod-test-globref-free", Fmod_test_globref_free, 4, 4, NULL, NULL);
   DEFUN ("mod-test-string-a-to-b", Fmod_test_string_a_to_b, 1, 1, NULL, NULL);
   DEFUN ("mod-test-userptr-make", Fmod_test_userptr_make, 1, 1, NULL, NULL);
   DEFUN ("mod-test-userptr-get", Fmod_test_userptr_get, 1, 1, NULL, NULL);
diff -Nru emacs-26.1+1/test/lib-src/emacsclient-tests.el emacs-26.3+1/test/lib-src/emacsclient-tests.el
--- emacs-26.1+1/test/lib-src/emacsclient-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lib-src/emacsclient-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; emacsclient-tests.el --- Test emacsclient
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/abbrev-tests.el emacs-26.3+1/test/lisp/abbrev-tests.el
--- emacs-26.1+1/test/lisp/abbrev-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/abbrev-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; abbrev-tests.el --- Test suite for abbrevs  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii <eliz@gnu.org>
 ;; Keywords: abbrevs
diff -Nru emacs-26.1+1/test/lisp/arc-mode-tests.el emacs-26.3+1/test/lisp/arc-mode-tests.el
--- emacs-26.1+1/test/lisp/arc-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/arc-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; arc-mode-tests.el --- Test suite for arc-mode. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/auth-source-pass-tests.el emacs-26.3+1/test/lisp/auth-source-pass-tests.el
--- emacs-26.1+1/test/lisp/auth-source-pass-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/auth-source-pass-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; auth-source-pass-tests.el --- Tests for auth-source-pass.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Damien Cassou <damien.cassou@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/auth-source-tests.el emacs-26.3+1/test/lisp/auth-source-tests.el
--- emacs-26.1+1/test/lisp/auth-source-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/auth-source-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; auth-source-tests.el --- Tests for auth-source.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Damien Cassou <damien@cassou.me>,
 ;;         Nicolas Petton <nicolas@petton.fr>
@@ -210,6 +210,25 @@
                     ("login" . "user1")
                     ("machine" . "mymachine1"))))))
 
+(ert-deftest auth-source-test-netrc-parse-one ()
+  (should (equal (auth-source--test-netrc-parse-one--all
+                  "machine host1\n# comment\n")
+                 '("machine" "host1")))
+  (should (equal (auth-source--test-netrc-parse-one--all
+                  "machine host1\n  \n  \nmachine host2\n")
+                 '("machine" "host1" "machine" "host2"))))
+
+(defun auth-source--test-netrc-parse-one--all (text)
+  "Parse TEXT with `auth-source-netrc-parse-one' until end,return list."
+  (with-temp-buffer
+    (insert text)
+    (goto-char (point-min))
+    (let ((one (auth-source-netrc-parse-one)) all)
+      (while one
+        (push one all)
+        (setq one (auth-source-netrc-parse-one)))
+      (nreverse all))))
+
 (ert-deftest auth-source-test-format-prompt ()
   (should (equal (auth-source-format-prompt "test %u %h %p" '((?u "user") (?h "host")))
                  "test user host %p")))
@@ -289,5 +308,25 @@
         (should (equal found-as-string (concat testname ": " needed)))))
     (delete-file netrc-file)))
 
+(ert-deftest auth-source-delete ()
+  (let* ((netrc-file (make-temp-file "auth-source-test" nil nil "\
+machine a1 port a2 user a3 password a4
+machine b1 port b2 user b3 password b4
+machine c1 port c2 user c3 password c4\n"))
+         (auth-sources (list netrc-file))
+         (auth-source-do-cache nil)
+         (expected '((:host "a1" :port "a2" :user "a3" :secret "a4")))
+         (parameters '(:max 1 :host t)))
+    (unwind-protect
+        (let ((found (apply #'auth-source-delete parameters)))
+          (dolist (f found)
+            (let ((s (plist-get f :secret)))
+              (setf f (plist-put f :secret
+                                 (if (functionp s) (funcall s) s)))))
+          ;; Note: The netrc backend doesn't delete anything, so
+          ;; this is actually the same as `auth-source-search'.
+          (should (equal found expected)))
+      (delete-file netrc-file))))
+
 (provide 'auth-source-tests)
 ;;; auth-source-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/autorevert-tests.el emacs-26.3+1/test/lisp/autorevert-tests.el
--- emacs-26.1+1/test/lisp/autorevert-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/autorevert-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; auto-revert-tests.el --- Tests of auto-revert
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
diff -Nru emacs-26.1+1/test/lisp/buff-menu-tests.el emacs-26.3+1/test/lisp/buff-menu-tests.el
--- emacs-26.1+1/test/lisp/buff-menu-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/buff-menu-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; buff-menu-tests.el --- Test suite for buff-menu.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/calc/calc-tests.el emacs-26.3+1/test/lisp/calc/calc-tests.el
--- emacs-26.1+1/test/lisp/calc/calc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/calc/calc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; calc-tests.el --- tests for calc                 -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: maint
@@ -86,6 +86,13 @@
 					       (math-read-expr "1m") "cm")
 			    '(* -100 (var cm var-cm)))))
 
+(ert-deftest calc-imaginary-i ()
+  "Test `math-imaginary-i' for non-special-const values."
+  (let ((var-i (calcFunc-polar (calcFunc-sqrt -1))))
+    (should (math-imaginary-i)))
+  (let ((var-i (calcFunc-sqrt -1)))
+    (should (math-imaginary-i))))
+
 (ert-deftest test-calc-23889 ()
   "Test for https://debbugs.gnu.org/23889 and 25652."
   (skip-unless (>= math-bignum-digit-length 9))
diff -Nru emacs-26.1+1/test/lisp/calendar/icalendar-tests.el emacs-26.3+1/test/lisp/calendar/icalendar-tests.el
--- emacs-26.1+1/test/lisp/calendar/icalendar-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/calendar/icalendar-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; icalendar-tests.el --- Test suite for icalendar.el
 
-;; Copyright (C) 2005, 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008-2019 Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        March 2005
diff -Nru emacs-26.1+1/test/lisp/calendar/parse-time-tests.el emacs-26.3+1/test/lisp/calendar/parse-time-tests.el
--- emacs-26.1+1/test/lisp/calendar/parse-time-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/calendar/parse-time-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;; parse-time-tests.el --- Test suite for parse-time.el
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
 
diff -Nru emacs-26.1+1/test/lisp/calendar/todo-mode-tests.el emacs-26.3+1/test/lisp/calendar/todo-mode-tests.el
--- emacs-26.1+1/test/lisp/calendar/todo-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/calendar/todo-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; todo-mode-tests.el --- tests for todo-mode.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Stephen Berman <stephen.berman@gmx.net>
 ;; Keywords: calendar
diff -Nru emacs-26.1+1/test/lisp/char-fold-tests.el emacs-26.3+1/test/lisp/char-fold-tests.el
--- emacs-26.1+1/test/lisp/char-fold-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/char-fold-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; char-fold-tests.el --- Tests for char-fold.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/color-tests.el emacs-26.3+1/test/lisp/color-tests.el
--- emacs-26.1+1/test/lisp/color-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/color-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; color-tests.el --- Tests for color.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/comint-tests.el emacs-26.3+1/test/lisp/comint-tests.el
--- emacs-26.1+1/test/lisp/comint-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/comint-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; comint-testsuite.el
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/dabbrev-tests.el emacs-26.3+1/test/lisp/dabbrev-tests.el
--- emacs-26.1+1/test/lisp/dabbrev-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/dabbrev-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dabbrev-tests.el --- Test suite for dabbrev.
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Alan Third <alan@idiocy.org>
 ;; Keywords: dabbrev
diff -Nru emacs-26.1+1/test/lisp/descr-text-tests.el emacs-26.3+1/test/lisp/descr-text-tests.el
--- emacs-26.1+1/test/lisp/descr-text-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/descr-text-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; descr-text-test.el --- ERT tests for descr-text.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014, 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2016-2019 Free Software Foundation, Inc.
 
 ;; Author:     Michal Nazarewicz <mina86@mina86.com>
 
diff -Nru emacs-26.1+1/test/lisp/dired-aux-tests.el emacs-26.3+1/test/lisp/dired-aux-tests.el
--- emacs-26.1+1/test/lisp/dired-aux-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/dired-aux-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired-aux-tests.el --- Test suite for dired-aux. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/dired-tests.el emacs-26.3+1/test/lisp/dired-tests.el
--- emacs-26.1+1/test/lisp/dired-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/dired-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired-tests.el --- Test suite. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -384,9 +384,9 @@
   (dired-test-with-temp-dirs
    'just-empty-dirs
    (let (asked)
-     (advice-add 'dired--yes-no-all-quit-help
+     (advice-add 'read-answer
                  :override
-                 (lambda (_) (setq asked t) "")
+                 (lambda (_q _a) (setq asked t) "")
                  '((name . dired-test-bug27940-advice)))
      (dired default-directory)
      (dired-toggle-marks)
@@ -395,44 +395,44 @@
          (progn
            (should-not asked)
            (should-not (dired-get-marked-files))) ; All dirs deleted.
-       (advice-remove 'dired--yes-no-all-quit-help 'dired-test-bug27940-advice))))
+       (advice-remove 'read-answer 'dired-test-bug27940-advice))))
   ;; Answer yes
   (dired-test-with-temp-dirs
    nil
-   (advice-add 'dired--yes-no-all-quit-help :override (lambda (_) "yes")
+   (advice-add 'read-answer :override (lambda (_q _a) "yes")
                '((name . dired-test-bug27940-advice)))
    (dired default-directory)
    (dired-toggle-marks)
    (dired-do-delete nil)
    (unwind-protect
        (should-not (dired-get-marked-files)) ; All dirs deleted.
-     (advice-remove 'dired--yes-no-all-quit-help 'dired-test-bug27940-advice)))
+     (advice-remove 'read-answer 'dired-test-bug27940-advice)))
   ;; Answer no
   (dired-test-with-temp-dirs
    nil
-   (advice-add 'dired--yes-no-all-quit-help :override (lambda (_) "no")
+   (advice-add 'read-answer :override (lambda (_q _a) "no")
                '((name . dired-test-bug27940-advice)))
    (dired default-directory)
    (dired-toggle-marks)
    (dired-do-delete nil)
    (unwind-protect
        (should (= 5 (length (dired-get-marked-files)))) ; Just the empty dirs deleted.
-     (advice-remove 'dired--yes-no-all-quit-help 'dired-test-bug27940-advice)))
+     (advice-remove 'read-answer 'dired-test-bug27940-advice)))
   ;; Answer all
   (dired-test-with-temp-dirs
    nil
-   (advice-add 'dired--yes-no-all-quit-help :override (lambda (_) "all")
+   (advice-add 'read-answer :override (lambda (_q _a) "all")
                '((name . dired-test-bug27940-advice)))
    (dired default-directory)
    (dired-toggle-marks)
    (dired-do-delete nil)
    (unwind-protect
        (should-not (dired-get-marked-files)) ; All dirs deleted.
-     (advice-remove 'dired--yes-no-all-quit-help 'dired-test-bug27940-advice)))
+     (advice-remove 'read-answer 'dired-test-bug27940-advice)))
   ;; Answer quit
   (dired-test-with-temp-dirs
    nil
-   (advice-add 'dired--yes-no-all-quit-help :override (lambda (_) "quit")
+   (advice-add 'read-answer :override (lambda (_q _a) "quit")
                '((name . dired-test-bug27940-advice)))
    (dired default-directory)
    (dired-toggle-marks)
@@ -440,7 +440,7 @@
      (dired-do-delete nil))
    (unwind-protect
        (should (= 6 (length (dired-get-marked-files)))) ; All empty dirs but zeta-empty-dir deleted.
-     (advice-remove 'dired--yes-no-all-quit-help 'dired-test-bug27940-advice))))
+     (advice-remove 'read-answer 'dired-test-bug27940-advice))))
 
 
 (provide 'dired-tests)
diff -Nru emacs-26.1+1/test/lisp/dired-x-tests.el emacs-26.3+1/test/lisp/dired-x-tests.el
--- emacs-26.1+1/test/lisp/dired-x-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/dired-x-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dired-x-tests.el --- Test suite for dired-x. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/dom-tests.el emacs-26.3+1/test/lisp/dom-tests.el
--- emacs-26.1+1/test/lisp/dom-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/dom-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dom-tests.el --- Tests for dom.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/electric-tests.el emacs-26.3+1/test/lisp/electric-tests.el
--- emacs-26.1+1/test/lisp/electric-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/electric-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; electric-tests.el --- tests for electric.el
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: João Távora <joaotavora@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/benchmark-tests.el emacs-26.3+1/test/lisp/emacs-lisp/benchmark-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/benchmark-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/benchmark-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; benchmark-tests.el --- Test suite for benchmark.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/bytecomp-tests.el emacs-26.3+1/test/lisp/emacs-lisp/bytecomp-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/bytecomp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/bytecomp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bytecomp-tests.el
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Shigeru Fukaya <shigeru.fukaya@gmail.com>
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -286,7 +286,14 @@
             (t)))
     (let ((a))
       (cond ((eq a 'foo) 'incorrect)
-            ('correct))))
+            ('correct)))
+    ;; Bug#31734
+    (let ((variable 0))
+      (cond
+       ((eq variable 'default)
+	(message "equal"))
+       (t
+	(message "not equal")))))
   "List of expression for test.
 Each element will be executed by interpreter and with
 bytecompiled code, and their results compared.")
@@ -431,6 +438,20 @@
     ;; Should not warn that mt--test2 is not known to be defined.
     (should-not (re-search-forward "my--test2" nil t))))
 
+(ert-deftest bytecomp-warn-wrong-args ()
+  (with-current-buffer (get-buffer-create "*Compile-Log*")
+    (let ((inhibit-read-only t)) (erase-buffer))
+    (byte-compile '(remq 1 2 3))
+    (ert-info ((buffer-string) :prefix "buffer: ")
+      (should (re-search-forward "remq.*3.*2")))))
+
+(ert-deftest bytecomp-warn-wrong-args-subr ()
+  (with-current-buffer (get-buffer-create "*Compile-Log*")
+    (let ((inhibit-read-only t)) (erase-buffer))
+    (byte-compile '(safe-length 1 2 3))
+    (ert-info ((buffer-string) :prefix "buffer: ")
+      (should (re-search-forward "safe-length.*3.*1")))))
+
 (ert-deftest test-eager-load-macro-expansion ()
   (test-byte-comp-compile-and-load nil
     '(progn (defmacro abc (arg) 1) (defun def () (abc 2))))
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/checkdoc-tests.el emacs-26.3+1/test/lisp/emacs-lisp/checkdoc-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/checkdoc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/checkdoc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; checkdoc-tests.el --- unit tests for checkdoc.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani <phst@google.com>
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-extra-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-extra-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-extra-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-extra-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-extra-tests.el --- tests for emacs-lisp/cl-extra.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -94,4 +94,9 @@
     (should (equal (list lst3 (cdr lst3) (cddr lst3))
                    (cl-maplist fn3 lst lst2 lst3)))))
 
+(ert-deftest cl-extra-test-cl-make-random-state ()
+  (let ((s (cl-make-random-state)))
+    ;; Test for Bug#33731.
+    (should-not (eq s (cl-make-random-state s)))))
+
 ;;; cl-extra-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-generic-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-generic-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-generic-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-generic-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-generic-tests.el --- Tests for cl-generic.el functionality  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-lib-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-lib-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-lib-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-lib-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-lib-tests.el --- tests for emacs-lisp/cl-lib.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-macs-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-macs-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-macs-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-macs-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-macs-tests.el --- tests for emacs-lisp/cl-macs.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-print-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-print-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-print-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-print-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-print-tests.el --- Test suite for the cl-print facility.  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -47,6 +47,41 @@
                "\\`(#1=#s(foo 1 2 3) #1#)\\'"
                (cl-prin1-to-string (list x x)))))))
 
+(cl-defstruct (cl-print-tests-struct
+               (:constructor cl-print-tests-con))
+  a b c d e)
+
+(ert-deftest cl-print-tests-3 ()
+  "CL printing observes `print-length'."
+  (let ((long-list (make-list 5 'a))
+        (long-vec (make-vector 5 'b))
+        (long-struct (cl-print-tests-con))
+        (print-length 4))
+    (should (equal "(a a a a ...)" (cl-prin1-to-string long-list)))
+    (should (equal "[b b b b ...]" (cl-prin1-to-string long-vec)))
+    (should (equal "#s(cl-print-tests-struct :a nil :b nil :c nil :d nil ...)"
+                   (cl-prin1-to-string long-struct)))))
+
+(ert-deftest cl-print-tests-4 ()
+  "CL printing observes `print-level'."
+  (let ((deep-list '(a (b (c (d (e))))))
+        (deep-struct (cl-print-tests-con))
+        (print-level 4))
+    (setf (cl-print-tests-struct-a deep-struct) deep-list)
+    (should (equal "(a (b (c (d ...))))" (cl-prin1-to-string deep-list)))
+    (should (equal "#s(cl-print-tests-struct :a (a (b (c ...))) :b nil :c nil :d nil :e nil)"
+                   (cl-prin1-to-string deep-struct)))))
+
+(ert-deftest cl-print-tests-5 ()
+  "CL printing observes `print-quoted'."
+  (let ((quoted-stuff '('a #'b `(,c ,@d))))
+    (let ((print-quoted t))
+      (should (equal "('a #'b `(,c ,@d))"
+                     (cl-prin1-to-string quoted-stuff))))
+    (let ((print-quoted nil))
+      (should (equal "((quote a) (function b) (\\` ((\\, c) (\\,@ d))))"
+                     (cl-prin1-to-string quoted-stuff))))))
+
 (ert-deftest cl-print-circle ()
   (let ((x '(#1=(a . #1#) #1#)))
     (let ((print-circle nil))
@@ -55,4 +90,14 @@
     (let ((print-circle t))
       (should (equal "(#1=(a . #1#) #1#)" (cl-prin1-to-string x))))))
 
+(ert-deftest cl-print-circle-2 ()
+  ;; Bug#31146.
+  (let ((x '(0 . #1=(0 . #1#))))
+    (let ((print-circle nil))
+      (should (string-match "\\`(0 0 . #[0-9])\\'"
+                            (cl-prin1-to-string x))))
+    (let ((print-circle t))
+      (should (equal "(0 . #1=(0 . #1#))" (cl-prin1-to-string x))))))
+
+
 ;;; cl-print-tests.el ends here.
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-seq-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-seq-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-seq-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-seq-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cl-seq-tests.el --- Tests for cl-seq.el functionality  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Richard <youngfrog@members.fsf.org>
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/cl-tests.el emacs-26.3+1/test/lisp/emacs-lisp/cl-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/cl-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/cl-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,35 @@
+;;; cl-tests.el --- tests for emacs-lisp/cl.el  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; This program 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.
+;;
+;; This program 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 this program.  If not, see `https://www.gnu.org/licenses/'.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'cl)
+(require 'ert)
+
+
+
+(ert-deftest labels-function-quoting ()
+  "Test that #'foo does the right thing in `labels'." ; Bug#31792.
+  (should (eq (funcall (labels ((foo () t))
+                         #'foo))
+              t)))
+
+;;; cl-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/derived-tests.el emacs-26.3+1/test/lisp/emacs-lisp/derived-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/derived-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/derived-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; derived-tests.el --- tests for derived.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el emacs-26.3+1/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
--- emacs-26.1+1/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edebug-test-code.el --- Sample code for the Edebug test suite
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/edebug-tests.el emacs-26.3+1/test/lisp/emacs-lisp/edebug-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/edebug-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/edebug-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; edebug-tests.el --- Edebug test suite   -*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
--- emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-testsinvoke.el -- eieio tests for method invocation
 
-;; Copyright (C) 2005, 2008, 2010, 2013-2018 Free Software Foundation,
+;; Copyright (C) 2005, 2008, 2010, 2013-2019 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
--- emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-test-persist.el --- Tests for eieio-persistent class
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -277,7 +277,7 @@
     :type vector
     :initarg :random-vector)))
 
-(ert-deftest eieio-test-persist-hash-and-vector ()
+(defun eieio-test-persist-hash-and-vector ()
   (let* ((jane (make-instance 'person :name "Jane"))
          (bob  (make-instance 'person :name "Bob"))
          (hans (make-instance 'person :name "Hans"))
@@ -297,10 +297,18 @@
     (aset (car (slot-value class 'janitors)) 1 hans)
     (aset (nth 1 (slot-value class 'janitors)) 1 dierdre)
     (unwind-protect
-        ;; FIXME: This should not error.
-        (should-error (persist-test-save-and-compare class))
+        (persist-test-save-and-compare class)
       (delete-file (oref class file)))))
 
+(ert-deftest eieio-persist-hash-and-vector-backward-compatibility ()
+  (let ((eieio-backward-compatibility t)) ; The default.
+    (eieio-test-persist-hash-and-vector)))
+
+(ert-deftest eieio-persist-hash-and-vector-no-backward-compatibility ()
+  :expected-result :failed ;; Bug#29220.
+  (let ((eieio-backward-compatibility nil))
+    (eieio-test-persist-hash-and-vector)))
+
 ;; Extra quotation of lists inside other objects (Gnus registry), also
 ;; bug#29220.
 
@@ -315,7 +323,7 @@
     :initarg :htab
     :type hash-table)))
 
-(ert-deftest eieio-test-persist-interior-lists ()
+(defun eieio-test-persist-interior-lists ()
   (let* ((thing (make-instance
                  'eieio-container
                  :vec [nil]
@@ -335,8 +343,16 @@
     (setf (nth 2 (cadar alst)) john
           (nth 2 (cadadr alst)) alexie)
     (unwind-protect
-        ;; FIXME: Should not error.
-        (should-error (persist-test-save-and-compare thing))
+        (persist-test-save-and-compare thing)
       (delete-file (slot-value thing 'file)))))
 
+(ert-deftest eieio-test-persist-interior-lists-backward-compatibility ()
+  (let ((eieio-backward-compatibility t)) ; The default.
+    (eieio-test-persist-interior-lists)))
+
+(ert-deftest eieio-test-persist-interior-lists-no-backward-compatibility ()
+  :expected-result :failed ;; Bug#29220.
+  (let ((eieio-backward-compatibility nil))
+    (eieio-test-persist-interior-lists)))
+
 ;;; eieio-test-persist.el ends here
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eieio-tests.el -- eieio tests routines
 
-;; Copyright (C) 1999-2003, 2005-2010, 2012-2018 Free Software
+;; Copyright (C) 1999-2003, 2005-2010, 2012-2019 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -696,6 +696,17 @@
   (setq eitest-II3 (clone eitest-II2 "eitest-II3 Test."))
   (oset eitest-II3 slot3 'penguin)
 
+  ;; Test that slots are non-initialized slots are unbounded
+  (oref eitest-II2 slot1)
+  (should (slot-boundp eitest-II2 'slot1))
+  (should-not (slot-boundp eitest-II2 'slot2))
+  (should-not (slot-boundp eitest-II2 'slot3))
+  (should-not (slot-boundp eitest-II3 'slot2))
+  (should-not (slot-boundp eitest-II3 'slot1))
+  (should-not (slot-boundp eitest-II3 'slot2))
+  (should (eieio-instance-inheritor-slot-boundp eitest-II3 'slot2))
+  (should (slot-boundp eitest-II3 'slot3))
+
   ;; Test level 1 inheritance
   (should (eq (oref eitest-II3 slot1) 'moose))
   ;; Test level 2 inheritance
@@ -862,8 +873,7 @@
     (should (oref obj1 a-slot))))
 
 (defclass NAMED (eieio-named)
-  ((some-slot :initform nil)
-   )
+  ((some-slot :initform nil))
   "A class inheriting from eieio-named.")
 
 (ert-deftest eieio-test-35-named-object ()
@@ -902,6 +912,48 @@
   (should
    (fboundp 'eieio--defalias)))
 
+(ert-deftest eieio-test-38-clone-named-object ()
+  (let* ((A (NAMED :object-name "aa"))
+         (B (clone A :object-name "bb"))
+         (C (clone A "cc"))
+         (D (clone A))
+         (E (clone D)))
+    (should (string= "aa" (oref A object-name)))
+    (should (string= "bb" (oref B object-name)))
+    (should (string= "cc" (oref C object-name)))
+    (should (string= "aa-1" (oref D object-name)))
+    (should (string= "aa-2" (oref E object-name)))))
+
+(defclass TII (eieio-instance-inheritor)
+  ((a :initform 1 :initarg :a)
+   (b :initarg :b)
+   (c :initarg :c))
+  "Instance Inheritor test class.")
+
+(ert-deftest eieio-test-39-clone-instance-inheritor-with-args ()
+  (let* ((A (TII))
+         (B (clone A :b "bb"))
+         (C (clone B :a "aa")))
+
+    (should (string= "aa" (oref C :a)))
+    (should (string= "bb" (oref C :b)))
+
+    (should (slot-boundp A :a))
+    (should-not (slot-boundp A :b))
+    (should-not (slot-boundp A :c))
+
+    (should-not (slot-boundp B :a))
+    (should (slot-boundp B :b))
+    (should-not (slot-boundp A :c))
+
+    (should (slot-boundp C :a))
+    (should-not (slot-boundp C :b))
+    (should-not (slot-boundp C :c))
+
+    (should (eieio-instance-inheritor-slot-boundp C :a))
+    (should (eieio-instance-inheritor-slot-boundp C :b))
+    (should-not (eieio-instance-inheritor-slot-boundp C :c))))
+
 
 (provide 'eieio-tests)
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/ert-tests.el emacs-26.3+1/test/lisp/emacs-lisp/ert-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/ert-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/ert-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ert-tests.el --- ERT's self-tests  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Christian Ohler <ohler@gnu.org>
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/ert-x-tests.el emacs-26.3+1/test/lisp/emacs-lisp/ert-x-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/ert-x-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/ert-x-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ert-x-tests.el --- Tests for ert-x.el
 
-;; Copyright (C) 2008, 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Phil Hagelberg
 ;; 	   Christian Ohler <ohler@gnu.org>
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/generator-tests.el emacs-26.3+1/test/lisp/emacs-lisp/generator-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/generator-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/generator-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; generator-tests.el --- Testing generators -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Colascione <dancol@dancol.org>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/gv-tests.el emacs-26.3+1/test/lisp/emacs-lisp/gv-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/gv-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/gv-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gv-tests.el --- tests for gv.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/let-alist-tests.el emacs-26.3+1/test/lisp/emacs-lisp/let-alist-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/let-alist-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/let-alist-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; let-alist.el --- tests for file handling. -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/lisp-mode-tests.el emacs-26.3+1/test/lisp/emacs-lisp/lisp-mode-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/lisp-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/lisp-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lisp-mode-tests.el --- Test Lisp editing commands  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; 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
@@ -113,6 +113,57 @@
       ;; we're indenting ends on the previous line.
       (should (equal (buffer-string) original)))))
 
+(ert-deftest indent-sexp-go ()
+  "Make sure `indent-sexp' doesn't stop after #s."
+  ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31984.
+  (with-temp-buffer
+    (emacs-lisp-mode)
+    (insert "#s(foo\nbar)\n")
+    (goto-char (point-min))
+    (indent-sexp)
+    (should (equal (buffer-string) "\
+#s(foo
+   bar)\n"))))
+
+(ert-deftest indent-sexp-cant-go ()
+  "`indent-sexp' shouldn't error before a sexp."
+  ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31984#32.
+  (with-temp-buffer
+    (emacs-lisp-mode)
+    (insert "(())")
+    (goto-char (1+ (point-min)))
+    ;; Paredit calls `indent-sexp' from this position.
+    (indent-sexp)
+    (should (equal (buffer-string) "(())"))))
+
+(ert-deftest indent-sexp-stop-before-eol-comment ()
+  "`indent-sexp' shouldn't look for more sexps after an eol comment."
+  ;; See https://debbugs.gnu.org/35286.
+  (with-temp-buffer
+    (emacs-lisp-mode)
+    (let ((str "() ;;\n  x"))
+      (insert str)
+      (goto-char (point-min))
+      (indent-sexp)
+      ;; The "x" is in the next sexp, so it shouldn't get indented.
+      (should (equal (buffer-string) str)))))
+
+(ert-deftest indent-sexp-stop-before-eol-non-lisp ()
+  "`indent-sexp' shouldn't be too agressive in non-Lisp modes."
+  ;; See https://debbugs.gnu.org/35286#13.
+  (with-temp-buffer
+    (prolog-mode)
+    (let ((str "\
+x(H) -->
+    {y(H)}.
+a(A) -->
+    b(A)."))
+      (insert str)
+      (search-backward "{")
+      (indent-sexp)
+      ;; There's no line-spanning sexp, so nothing should be indented.
+      (should (equal (buffer-string) str)))))
+
 (ert-deftest lisp-indent-region ()
   "Test basics of `lisp-indent-region'."
   (with-temp-buffer
@@ -224,6 +275,20 @@
       (comment-indent)
       (should (equal (buffer-string) correct)))))
 
+(ert-deftest lisp-indent-with-read-only-field ()
+  "Test indentation on line with read-only field (Bug#32014)."
+  (with-temp-buffer
+    (insert (propertize "prompt> " 'field 'output 'read-only t
+                        'rear-nonsticky t 'front-sticky '(read-only)))
+    (insert " foo")
+    (lisp-indent-line)
+    (should (equal (buffer-string) "prompt> foo"))))
+
+(ert-deftest lisp-indent-unfinished-string ()
+  "Don't infloop on unfinished string (Bug#37045)."
+  (with-temp-buffer
+    (insert "\"\n")
+    (lisp-indent-region (point-min) (point-max))))
 
 (provide 'lisp-mode-tests)
 ;;; lisp-mode-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/lisp-tests.el emacs-26.3+1/test/lisp/emacs-lisp/lisp-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/lisp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/lisp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lisp-tests.el --- Test Lisp editing commands     -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/map-tests.el emacs-26.3+1/test/lisp/emacs-lisp/map-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/map-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/map-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; map-tests.el --- Tests for map.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/nadvice-tests.el emacs-26.3+1/test/lisp/emacs-lisp/nadvice-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/nadvice-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/nadvice-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; advice-tests.el --- Test suite for the new advice thingy.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/package-tests.el emacs-26.3+1/test/lisp/emacs-lisp/package-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/package-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/package-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; package-test.el --- Tests for the Emacs package system
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Hackney <dan@haxney.org>
 ;; Version: 1.0
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/pcase-tests.el emacs-26.3+1/test/lisp/emacs-lisp/pcase-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/pcase-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/pcase-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pcase-tests.el --- Test suite for pcase macro.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/pp-tests.el emacs-26.3+1/test/lisp/emacs-lisp/pp-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/pp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/pp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; pp-tests.el --- Test suite for pretty printer.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/regexp-opt-tests.el emacs-26.3+1/test/lisp/emacs-lisp/regexp-opt-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/regexp-opt-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/regexp-opt-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; regexp-tests.el --- Test suite for regular expression handling.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/ring-tests.el emacs-26.3+1/test/lisp/emacs-lisp/ring-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/ring-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/ring-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ring-tests.el --- Tests for ring.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/rmc-tests.el emacs-26.3+1/test/lisp/emacs-lisp/rmc-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/rmc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/rmc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmc-tests.el --- Test suite for rmc.el  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/rx-tests.el emacs-26.3+1/test/lisp/emacs-lisp/rx-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/rx-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/rx-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rx-tests.el --- test for rx.el functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/seq-tests.el emacs-26.3+1/test/lisp/emacs-lisp/seq-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/seq-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/seq-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; seq-tests.el --- Tests for sequences.el
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/shadow-tests.el emacs-26.3+1/test/lisp/emacs-lisp/shadow-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/shadow-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/shadow-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shadow-tests.el --- Test suite for shadow.  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/subr-x-tests.el emacs-26.3+1/test/lisp/emacs-lisp/subr-x-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/subr-x-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/subr-x-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subr-x-tests.el --- Testing the extended lisp routines
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Fabián E. Gallina <fgallina@gnu.org>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/tabulated-list-test.el emacs-26.3+1/test/lisp/emacs-lisp/tabulated-list-test.el
--- emacs-26.1+1/test/lisp/emacs-lisp/tabulated-list-test.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/tabulated-list-test.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tabulated-list-test.el --- Tests for emacs-lisp/tabulated-list.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/testcover-resources/testcases.el emacs-26.3+1/test/lisp/emacs-lisp/testcover-resources/testcases.el
--- emacs-26.1+1/test/lisp/emacs-lisp/testcover-resources/testcases.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/testcover-resources/testcases.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;;; testcases.el -- Test cases for testcover-tests.el
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/testcover-tests.el emacs-26.3+1/test/lisp/emacs-lisp/testcover-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/testcover-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/testcover-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; testcover-tests.el --- Testcover test suite   -*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell
 
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/thunk-tests.el emacs-26.3+1/test/lisp/emacs-lisp/thunk-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/thunk-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/thunk-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thunk-tests.el --- Tests for thunk.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/emacs-lisp/timer-tests.el emacs-26.3+1/test/lisp/emacs-lisp/timer-tests.el
--- emacs-26.1+1/test/lisp/emacs-lisp/timer-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emacs-lisp/timer-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; timer-tests.el --- tests for timers -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/emulation/viper-tests.el emacs-26.3+1/test/lisp/emulation/viper-tests.el
--- emacs-26.1+1/test/lisp/emulation/viper-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/emulation/viper-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; viper-tests.el --- tests for viper.
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/epg-tests.el emacs-26.3+1/test/lisp/epg-tests.el
--- emacs-26.1+1/test/lisp/epg-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/epg-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; epg-tests.el --- Test suite for epg.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -87,6 +87,8 @@
 (ert-deftest epg-decrypt-1 ()
   (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
   (with-epg-tests (:require-passphrase t)
+    (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
+      (insert "ignore-mdc-error"))
     (should (equal "test"
 		   (epg-decrypt-string epg-tests-context "\
 -----BEGIN PGP MESSAGE-----
diff -Nru emacs-26.1+1/test/lisp/erc/erc-track-tests.el emacs-26.3+1/test/lisp/erc/erc-track-tests.el
--- emacs-26.1+1/test/lisp/erc/erc-track-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/erc/erc-track-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; erc-track-tests.el --- Tests for erc-track.
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Author: Vivek Dasmohapatra <vivek@etla.org>
diff -Nru emacs-26.1+1/test/lisp/eshell/em-hist-tests.el emacs-26.3+1/test/lisp/eshell/em-hist-tests.el
--- emacs-26.1+1/test/lisp/eshell/em-hist-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/eshell/em-hist-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tests/em-hist-tests.el --- em-hist test suite
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/eshell/em-ls-tests.el emacs-26.3+1/test/lisp/eshell/em-ls-tests.el
--- emacs-26.1+1/test/lisp/eshell/em-ls-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/eshell/em-ls-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tests/em-ls-tests.el --- em-ls test suite
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/eshell/eshell-tests.el emacs-26.3+1/test/lisp/eshell/eshell-tests.el
--- emacs-26.1+1/test/lisp/eshell/eshell-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/eshell/eshell-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tests/eshell-tests.el --- Eshell test suite
 
-;; Copyright (C) 1999-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff -Nru emacs-26.1+1/test/lisp/faces-tests.el emacs-26.3+1/test/lisp/faces-tests.el
--- emacs-26.1+1/test/lisp/faces-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/faces-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; faces-tests.el --- Tests for faces.el            -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/ffap-tests.el emacs-26.3+1/test/lisp/ffap-tests.el
--- emacs-26.1+1/test/lisp/ffap-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ffap-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ffap-tests.el --- Test suite for ffap.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/filenotify-tests.el emacs-26.3+1/test/lisp/filenotify-tests.el
--- emacs-26.1+1/test/lisp/filenotify-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/filenotify-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; filenotify-tests.el --- Tests of file notifications  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
@@ -649,6 +649,10 @@
 		'(created deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed deleted))
 	       (t '(created changed deleted deleted stopped)))
 	    (write-region
 	     "any text" nil file-notify--test-tmpfile nil 'no-message)
@@ -687,6 +691,10 @@
 		'(created created changed changed deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed created changed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed created changed deleted deleted))
 	       (t '(created changed created changed
 		    deleted deleted deleted stopped)))
 	    (write-region
@@ -732,6 +740,10 @@
 		'(created created deleted deleted stopped))
 	       ((string-equal (file-notify--test-library) "kqueue")
 		'(created changed renamed deleted stopped))
+               ;; On emba, `deleted' and `stopped' events of the
+               ;; directory are not detected.
+               ((getenv "EMACS_EMBA_CI")
+                '(created changed renamed deleted))
 	       (t '(created changed renamed deleted deleted stopped)))
 	    (write-region
 	     "any text" nil file-notify--test-tmpfile nil 'no-message)
@@ -940,51 +952,55 @@
     (file-notify--test-cleanup))
 
   (unwind-protect
-      (let ((file-notify--test-tmpdir
-	     (make-temp-file "file-notify-test-parent" t)))
-	(should
-	 (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
-	       file-notify--test-desc
-	       (file-notify-add-watch
-		file-notify--test-tmpdir
-		'(change) #'file-notify--test-event-handler)))
-	(should (file-notify-valid-p file-notify--test-desc))
-	(file-notify--test-with-events
-	 (cond
-	  ;; w32notify does not raise `deleted' and `stopped' events
-	  ;; for the watched directory.
-	  ((string-equal (file-notify--test-library) "w32notify")
-	   '(created changed deleted))
-          ;; gvfs-monitor-dir on cygwin does not detect the `created'
-          ;; event reliably.
-	  ((string-equal (file-notify--test-library) "gvfs-monitor-dir.exe")
-	   '((deleted stopped)
-	     (created deleted stopped)))
-	  ;; There are two `deleted' events, for the file and for the
-	  ;; directory.  Except for cygwin and kqueue.  And cygwin
-	  ;; does not raise a `changed' event.
-	  ((eq system-type 'cygwin)
-	   '(created deleted stopped))
-	  ((string-equal (file-notify--test-library) "kqueue")
-	   '(created changed deleted stopped))
-	  (t '(created changed deleted deleted stopped)))
-	 (write-region
-	  "any text" nil file-notify--test-tmpfile nil 'no-message)
-	 (file-notify--test-read-event)
-	 (delete-directory file-notify--test-tmpdir 'recursive))
-	;; After deleting the parent directory, the descriptor must
-	;; not be valid anymore.
-	(should-not (file-notify-valid-p file-notify--test-desc))
-        ;; w32notify doesn't generate `stopped' events when the parent
-        ;; directory is deleted, which doesn't provide a chance for
-        ;; filenotify.el to remove the descriptor from the internal
-        ;; hash table it maintains.  So we must remove the descriptor
-        ;; manually.
-        (if (string-equal (file-notify--test-library) "w32notify")
-            (file-notify--rm-descriptor file-notify--test-desc))
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
+        (let ((file-notify--test-tmpdir
+	       (make-temp-file "file-notify-test-parent" t)))
+	  (should
+	   (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
+	         file-notify--test-desc
+	         (file-notify-add-watch
+		  file-notify--test-tmpdir
+		  '(change) #'file-notify--test-event-handler)))
+	  (should (file-notify-valid-p file-notify--test-desc))
+	  (file-notify--test-with-events
+	      (cond
+	       ;; w32notify does not raise `deleted' and `stopped'
+	       ;; events for the watched directory.
+	       ((string-equal (file-notify--test-library) "w32notify")
+	        '(created changed deleted))
+               ;; gvfs-monitor-dir on cygwin does not detect the
+               ;; `created' event reliably.
+	       ((string-equal
+                 (file-notify--test-library) "gvfs-monitor-dir.exe")
+	        '((deleted stopped)
+	          (created deleted stopped)))
+	       ;; There are two `deleted' events, for the file and for
+	       ;; the directory.  Except for cygwin and kqueue.  And
+	       ;; cygwin does not raise a `changed' event.
+	       ((eq system-type 'cygwin)
+	        '(created deleted stopped))
+	       ((string-equal (file-notify--test-library) "kqueue")
+	        '(created changed deleted stopped))
+	       (t '(created changed deleted deleted stopped)))
+	    (write-region
+	     "any text" nil file-notify--test-tmpfile nil 'no-message)
+	    (file-notify--test-read-event)
+	    (delete-directory file-notify--test-tmpdir 'recursive))
+	  ;; After deleting the parent directory, the descriptor must
+	  ;; not be valid anymore.
+	  (should-not (file-notify-valid-p file-notify--test-desc))
+          ;; w32notify doesn't generate `stopped' events when the
+          ;; parent directory is deleted, which doesn't provide a
+          ;; chance for filenotify.el to remove the descriptor from
+          ;; the internal hash table it maintains.  So we must remove
+          ;; the descriptor manually.
+          (if (string-equal (file-notify--test-library) "w32notify")
+              (file-notify--rm-descriptor file-notify--test-desc))
 
-        ;; The environment shall be cleaned up.
-        (file-notify--test-cleanup-p))
+          ;; The environment shall be cleaned up.
+          (file-notify--test-cleanup-p)))
 
     ;; Cleanup.
     (file-notify--test-cleanup)))
@@ -1022,7 +1038,9 @@
     (file-notify--test-cleanup))
 
   (unwind-protect
-      (progn
+      ;; On emba, `deleted' and `stopped' events of the directory are
+      ;; not detected.
+      (unless (getenv "EMACS_EMBA_CI")
 	(should
 	 (setq file-notify--test-tmpfile
 	       (make-temp-file "file-notify-test-parent" t)))
@@ -1109,7 +1127,8 @@
             (file-notify--test-read-event)
             (delete-file file)))
         (delete-directory file-notify--test-tmpfile)
-        (if (string-equal (file-notify--test-library) "w32notify")
+        (if (or (string-equal (file-notify--test-library) "w32notify")
+                (getenv "EMACS_EMBA_CI"))
             (file-notify--rm-descriptor file-notify--test-desc))
 
         ;; The environment shall be cleaned up.
@@ -1316,11 +1335,17 @@
 		  ;; w32notify does not raise `deleted' and `stopped'
 		  ;; events for the watched directory.
                   ((string-equal (file-notify--test-library) "w32notify") '())
+                  ;; On emba, `deleted' and `stopped' events of the
+                  ;; directory are not detected.
+                  ((getenv "EMACS_EMBA_CI")
+                   '())
                   (t '(deleted stopped))))))
           (delete-directory file-notify--test-tmpfile 'recursive))
-        (should-not (file-notify-valid-p file-notify--test-desc1))
-        (should-not (file-notify-valid-p file-notify--test-desc2))
-        (when (string-equal (file-notify--test-library) "w32notify")
+        (unless (getenv "EMACS_EMBA_CI")
+          (should-not (file-notify-valid-p file-notify--test-desc1))
+          (should-not (file-notify-valid-p file-notify--test-desc2)))
+        (when (or (string-equal (file-notify--test-library) "w32notify")
+                  (getenv "EMACS_EMBA_CI"))
           (file-notify--rm-descriptor file-notify--test-desc1)
           (file-notify--rm-descriptor file-notify--test-desc2))
 
diff -Nru emacs-26.1+1/test/lisp/files-tests.el emacs-26.3+1/test/lisp/files-tests.el
--- emacs-26.1+1/test/lisp/files-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/files-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; files-tests.el --- tests for files.el.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/files-x-tests.el emacs-26.3+1/test/lisp/files-x-tests.el
--- emacs-26.1+1/test/lisp/files-x-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/files-x-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; files-x-tests.el --- tests for files-x.el.
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
@@ -101,15 +101,19 @@
     (setq files-x-test--criteria
           (append files-x-test--application files-x-test--protocol
                   files-x-test--user files-x-test--machine))
+
     ;; An empty variable list is accepted (but makes no sense).
     (connection-local-set-profiles files-x-test--criteria)
     (should-not (connection-local-get-profiles files-x-test--criteria))
+
+    ;; First test, all declared properties.
     (connection-local-set-profiles
      files-x-test--criteria 'remote-bash 'remote-ksh)
     (should
      (equal
       (connection-local-get-profiles files-x-test--criteria)
       '(remote-bash remote-ksh)))
+
     ;; Changing the order of properties doesn't matter.
     (setq files-x-test--criteria
           (append files-x-test--protocol files-x-test--application
@@ -118,12 +122,14 @@
      (equal
       (connection-local-get-profiles files-x-test--criteria)
       '(remote-bash remote-ksh)))
-     ;; A further call adds profiles.
+
+    ;; A further call adds profiles.
     (connection-local-set-profiles files-x-test--criteria 'remote-nullfile)
     (should
      (equal
       (connection-local-get-profiles files-x-test--criteria)
       '(remote-bash remote-ksh remote-nullfile)))
+
     ;; Adding existing profiles doesn't matter.
     (connection-local-set-profiles
      files-x-test--criteria 'remote-bash 'remote-nullfile)
@@ -132,31 +138,38 @@
       (connection-local-get-profiles files-x-test--criteria)
       '(remote-bash remote-ksh remote-nullfile)))
 
-    ;; Use a criteria without application.
-    (setq files-x-test--criteria
-          (append files-x-test--protocol
-                  files-x-test--user files-x-test--machine))
-    (connection-local-set-profiles files-x-test--criteria 'remote-ksh)
-    (should
-     (equal
-      (connection-local-get-profiles files-x-test--criteria)
-      '(remote-ksh)))
-    ;; An application not used in any registered criteria matches also this.
-    (setq files-x-test--criteria
-          (append files-x-test--another-application files-x-test--protocol
-                  files-x-test--user files-x-test--machine))
-    (should
-     (equal
-      (connection-local-get-profiles files-x-test--criteria)
-      '(remote-ksh)))
+    ;; Use different properties.
+    (dolist (criteria
+             `(;; All properties.
+               ,(append files-x-test--application files-x-test--protocol
+                        files-x-test--user files-x-test--machine)
+               ;; Without :application.
+               ,(append files-x-test--protocol
+                        files-x-test--user files-x-test--machine)
+               ;; Without :protocol.
+               ,(append files-x-test--application
+                        files-x-test--user files-x-test--machine)
+               ;; Without :user.
+               ,(append files-x-test--application files-x-test--protocol
+                        files-x-test--machine)
+               ;; Without :machine.
+               ,(append files-x-test--application files-x-test--protocol
+                        files-x-test--user)
+               ;; No property at all.
+               nil))
+      (should
+       (equal
+        (connection-local-get-profiles criteria)
+        '(remote-bash remote-ksh remote-nullfile))))
 
     ;; Using a nil criteria also works.  Duplicate profiles are trashed.
     (connection-local-set-profiles
      nil 'remote-bash 'remote-ksh 'remote-ksh 'remote-bash)
+    ;; This matches also the existing profiles from other criteria.
     (should
      (equal
       (connection-local-get-profiles nil)
-      '(remote-bash remote-ksh)))
+      '(remote-bash remote-ksh remote-nullfile)))
 
     ;; A criteria other than plist is wrong.
     (should-error (connection-local-set-profiles 'dummy))))
@@ -235,7 +248,9 @@
         ;; declare same variables as in `remote-bash'.
         (should
          (equal connection-local-variables-alist
-                (nreverse (copy-tree files-x-test--variables1))))
+                (append
+                 (nreverse (copy-tree files-x-test--variables3))
+                 (nreverse (copy-tree files-x-test--variables1)))))
         ;; The variables exist also as local variables.
         (should (local-variable-p 'remote-shell-file-name))
         ;; The proper variable value is set.
diff -Nru emacs-26.1+1/test/lisp/gnus/gnus-tests.el emacs-26.3+1/test/lisp/gnus/gnus-tests.el
--- emacs-26.1+1/test/lisp/gnus/gnus-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/gnus/gnus-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnus-tests.el --- Wrapper for the Gnus tests
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 
diff -Nru emacs-26.1+1/test/lisp/gnus/message-tests.el emacs-26.3+1/test/lisp/gnus/message-tests.el
--- emacs-26.1+1/test/lisp/gnus/message-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/gnus/message-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; message-mode-tests.el --- Tests for message-mode  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: João Távora <joaotavora@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/help-fns-tests.el emacs-26.3+1/test/lisp/help-fns-tests.el
--- emacs-26.1+1/test/lisp/help-fns-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/help-fns-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; help-fns.el --- tests for help-fns.el
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/test/lisp/hi-lock-tests.el emacs-26.3+1/test/lisp/hi-lock-tests.el
--- emacs-26.1+1/test/lisp/hi-lock-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/hi-lock-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; hi-lock-tests.el --- Tests for hi-lock.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/htmlfontify-tests.el emacs-26.3+1/test/lisp/htmlfontify-tests.el
--- emacs-26.1+1/test/lisp/htmlfontify-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/htmlfontify-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; htmlfontify-tests.el --- Test suite. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/ibuffer-tests.el emacs-26.3+1/test/lisp/ibuffer-tests.el
--- emacs-26.1+1/test/lisp/ibuffer-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ibuffer-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ibuffer-tests.el --- Test suite. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -312,8 +312,8 @@
                 (funcall create-non-file-buffer "ibuf-test-3.b" :size 50
                          :mode #'text-mode
                          :include-content "...but a multitude of drops?\n"))
-               (dirA (with-current-buffer bufA default-directory))
-               (dirB (with-current-buffer bufB default-directory)))
+               (dirA (regexp-quote (with-current-buffer bufA default-directory)))
+               (dirB (regexp-quote (with-current-buffer bufB default-directory))))
           (should (ibuffer-included-in-filters-p
                    bufA '((basename . "ibuf-test-3"))))
           (should (ibuffer-included-in-filters-p
diff -Nru emacs-26.1+1/test/lisp/ido-tests.el emacs-26.3+1/test/lisp/ido-tests.el
--- emacs-26.1+1/test/lisp/ido-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ido-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ido-tests.el --- unit tests for ido.el           -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani <phst@google.com>
 
diff -Nru emacs-26.1+1/test/lisp/image-tests.el emacs-26.3+1/test/lisp/image-tests.el
--- emacs-26.1+1/test/lisp/image-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/lisp/image-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,45 @@
+;;; image-tests.el --- tests for image.el -*- lexical-binding: t -*-
+
+;; Copyright (C) 2019 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/>.
+
+;;; Code:
+
+(require 'ert)
+(require 'image)
+
+(ert-deftest image--set-property ()
+  "Test `image--set-property' behavior."
+  (let ((image (list 'image)))
+    ;; Add properties.
+    (setf (image-property image :scale) 1)
+    (should (equal image '(image :scale 1)))
+    (setf (image-property image :width) 8)
+    (should (equal image '(image :scale 1 :width 8)))
+    (setf (image-property image :height) 16)
+    (should (equal image '(image :scale 1 :width 8 :height 16)))
+    ;; Delete properties.
+    (setf (image-property image :type) nil)
+    (should (equal image '(image :scale 1 :width 8 :height 16)))
+    (setf (image-property image :scale) nil)
+    (should (equal image '(image :width 8 :height 16)))
+    (setf (image-property image :height) nil)
+    (should (equal image '(image :width 8)))
+    (setf (image-property image :width) nil)
+    (should (equal image '(image)))))
+
+;;; image-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/imenu-tests.el emacs-26.3+1/test/lisp/imenu-tests.el
--- emacs-26.1+1/test/lisp/imenu-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/imenu-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; imenu-tests.el --- Test suite for imenu.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO <yamato@redhat.com>
 ;; Keywords: tools convenience
diff -Nru emacs-26.1+1/test/lisp/info-xref-tests.el emacs-26.3+1/test/lisp/info-xref-tests.el
--- emacs-26.1+1/test/lisp/info-xref-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/info-xref-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; info-xref.el --- tests for info-xref.el
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/international/mule-tests.el emacs-26.3+1/test/lisp/international/mule-tests.el
--- emacs-26.1+1/test/lisp/international/mule-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/international/mule-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-tests.el --- unit tests for mule.el         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/international/mule-util-tests.el emacs-26.3+1/test/lisp/international/mule-util-tests.el
--- emacs-26.1+1/test/lisp/international/mule-util-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/international/mule-util-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mule-util --- tests for international/mule-util.el
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/international/ucs-normalize-tests.el emacs-26.3+1/test/lisp/international/ucs-normalize-tests.el
--- emacs-26.1+1/test/lisp/international/ucs-normalize-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/international/ucs-normalize-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ucs-normalize --- tests for international/ucs-normalize.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2002-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -181,26 +181,25 @@
   (should-not (ucs-normalize-tests--rule1-failing-for-partX 0)))
 
 (defconst ucs-normalize-tests--failing-lines-part1
-  (list 15131 15132 15133 15134 15135 15136 15137 15138
-        15139
-        16149 16150 16151 16152 16153 16154 16155 16156
-        16157 16158 16159 16160 16161 16162 16163 16164
-        16165 16166 16167 16168 16169 16170 16171 16172
-        16173 16174 16175 16176 16177 16178 16179 16180
-        16181 16182 16183 16184 16185 16186 16187 16188
-        16189 16190 16191 16192 16193 16194 16195 16196
-        16197 16198 16199 16200 16201 16202 16203 16204
-        16205 16206 16207 16208 16209 16210 16211 16212
-        16213 16214 16215 16216 16217 16218 16219 16220
-        16221 16222 16223 16224 16225 16226 16227 16228
-        16229 16230 16231 16232 16233 16234 16235 16236
-        16237 16238 16239 16240 16241 16242 16243 16244
-        16245 16246 16247 16248 16249 16250 16251 16252
-        16253 16254 16255 16256 16257 16258 16259 16260
-        16261 16262 16263 16264 16265 16266 16267 16268
-        16269 16270 16271 16272 16273 16274 16275 16276
-        16277 16278 16279 16280 16281 16282 16283 16284
-        16285 16286 16287 16288 16289))
+  (list 2152 15132 15133 15134 15135 15136 15137 15138
+        15139 15140 16150 16151 16152 16153 16154 16155
+        16156 16157 16158 16159 16160 16161 16162 16163
+        16164 16165 16166 16167 16168 16169 16170 16171
+        16172 16173 16174 16175 16176 16177 16178 16179
+        16180 16181 16182 16183 16184 16185 16186 16187
+        16188 16189 16190 16191 16192 16193 16194 16195
+        16196 16197 16198 16199 16200 16201 16202 16203
+        16204 16205 16206 16207 16208 16209 16210 16211
+        16212 16213 16214 16215 16216 16217 16218 16219
+        16220 16221 16222 16223 16224 16225 16226 16227
+        16228 16229 16230 16231 16232 16233 16234 16235
+        16236 16237 16238 16239 16240 16241 16242 16243
+        16244 16245 16246 16247 16248 16249 16250 16251
+        16252 16253 16254 16255 16256 16257 16258 16259
+        16260 16261 16262 16263 16264 16265 16266 16267
+        16268 16269 16270 16271 16272 16273 16274 16275
+        16276 16277 16278 16279 16280 16281 16282 16283
+        16284 16285 16286 16287 16288 16289 16290))
 
 ;; Keep a record of failures, for consulting afterwards (the ert
 ;; backtrace only shows a truncated version of these lists).
@@ -258,21 +257,21 @@
     ucs-normalize-tests--failing-lines-part1)))
 
 (defconst ucs-normalize-tests--failing-lines-part2
-  (list 17656 17658 18006 18007 18008 18009 18010 18011
-        18012 18340 18342 18344 18346 18348 18350 18352
-        18354 18356 18358 18360 18362 18364 18366 18368
-        18370 18372 18374 18376 18378 18380 18382 18384
-        18386 18388 18390 18392 18394 18396 18398 18400
-        18402 18404 18406 18408 18410 18412 18414 18416
-        18418 18420 18422 18424 18426 18428 18430 18432
-        18434 18436 18438 18440 18442 18444 18446 18448
-        18450 18518 18520 18522 18524 18526 18528 18530
-        18532 18534 18536 18538 18540 18542 18544 18546
-        18548 18550 18552 18554 18556 18558 18560 18562
-        18564 18566 18568 18570 18572 18574 18576 18578
-        18580 18582 18584 18586 18588 18590 18592 18594
-        18596 18598 18600 18602 18604 18606 18608 18610
-        18612 18614 18616 18618 18620))
+  (list 18377 18379 18381 18383 18385 18387 18389 18391
+        18393 18395 18397 18399 18401 18403 18405 18407
+        18409 18411 18413 18415 18417 18419 18421 18423
+        18425 18427 18429 18431 18433 18435 18437 18439
+        18441 18443 18445 18447 18449 18451 18453 18455
+        18457 18459 18461 18463 18465 18467 18469 18471
+        18473 18475 18477 18479 18481 18483 18485 18487
+        18489 18491 18493 18495 18497 18565 18567 18569
+        18571 18573 18575 18577 18579 18581 18583 18585
+        18587 18589 18591 18593 18595 18597 18599 18601
+        18603 18605 18607 18609 18611 18613 18615 18617
+        18619 18621 18623 18625 18627 18629 18631 18633
+        18635 18637 18639 18641 18643 18645 18647 18649
+        18651 18653 18655 18657 18659 18661 18663 18665
+        18667))
 
 (ert-deftest ucs-normalize-part2 ()
   :tags '(:expensive-test)
diff -Nru emacs-26.1+1/test/lisp/isearch-tests.el emacs-26.3+1/test/lisp/isearch-tests.el
--- emacs-26.1+1/test/lisp/isearch-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/isearch-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; isearch-tests.el --- Tests for isearch.el        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/jit-lock-tests.el emacs-26.3+1/test/lisp/jit-lock-tests.el
--- emacs-26.1+1/test/lisp/jit-lock-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/jit-lock-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; jit-lock-tests.el --- tests for jit-lock
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 
diff -Nru emacs-26.1+1/test/lisp/json-tests.el emacs-26.3+1/test/lisp/json-tests.el
--- emacs-26.1+1/test/lisp/json-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/json-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; json-tests.el --- Test suite for json.el
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 
diff -Nru emacs-26.1+1/test/lisp/kmacro-tests.el emacs-26.3+1/test/lisp/kmacro-tests.el
--- emacs-26.1+1/test/lisp/kmacro-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/kmacro-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; kmacro-tests.el --- Tests for kmacro.el       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Gemini Lasswell <gazally@runbox.com>
 
diff -Nru emacs-26.1+1/test/lisp/ls-lisp-tests.el emacs-26.3+1/test/lisp/ls-lisp-tests.el
--- emacs-26.1+1/test/lisp/ls-lisp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ls-lisp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ls-lisp-tests.el --- tests for ls-lisp.el  -*- lexical-binding: t-*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/mail/rmail-tests.el emacs-26.3+1/test/lisp/mail/rmail-tests.el
--- emacs-26.1+1/test/lisp/mail/rmail-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/mail/rmail-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmail-tests.el --- Test suite. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/man-tests.el emacs-26.3+1/test/lisp/man-tests.el
--- emacs-26.1+1/test/lisp/man-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/man-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; man-tests.el --- Test suite for man.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Jenkner <wjenkner@inode.at>
 ;; Keywords: help, internal, unix
diff -Nru emacs-26.1+1/test/lisp/md4-tests.el emacs-26.3+1/test/lisp/md4-tests.el
--- emacs-26.1+1/test/lisp/md4-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/md4-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; md4-tests.el --- tests for md4.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/minibuffer-tests.el emacs-26.3+1/test/lisp/minibuffer-tests.el
--- emacs-26.1+1/test/lisp/minibuffer-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/minibuffer-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; completion-tests.el --- Tests for completion functions  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/mouse-tests.el emacs-26.3+1/test/lisp/mouse-tests.el
--- emacs-26.1+1/test/lisp/mouse-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/mouse-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mouse-tests.el --- unit tests for mouse.el       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani <phst@google.com>
 
diff -Nru emacs-26.1+1/test/lisp/net/dbus-tests.el emacs-26.3+1/test/lisp/net/dbus-tests.el
--- emacs-26.1+1/test/lisp/net/dbus-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/dbus-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dbus-tests.el --- Tests of D-Bus integration into Emacs
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
@@ -133,7 +133,7 @@
   ;; Start bus.
   (let ((output
 	 (ignore-errors
-	   (shell-command-to-string "dbus-launch --sh-syntax")))
+	   (shell-command-to-string "env DISPLAY= dbus-launch --sh-syntax")))
 	bus pid)
     (skip-unless (stringp output))
     (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output)
diff -Nru emacs-26.1+1/test/lisp/net/gnutls-tests.el emacs-26.3+1/test/lisp/net/gnutls-tests.el
--- emacs-26.1+1/test/lisp/net/gnutls-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/gnutls-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; gnutls-tests.el --- Test suite for gnutls.el
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 
diff -Nru emacs-26.1+1/test/lisp/net/mailcap-tests.el emacs-26.3+1/test/lisp/net/mailcap-tests.el
--- emacs-26.1+1/test/lisp/net/mailcap-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/mailcap-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mailcap-tests.el --- tests for mailcap.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Mark Oteiza <mvoteiza@udel.edu>
 
diff -Nru emacs-26.1+1/test/lisp/net/network-stream-tests.el emacs-26.3+1/test/lisp/net/network-stream-tests.el
--- emacs-26.1+1/test/lisp/net/network-stream-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/network-stream-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; network-stream-tests.el --- tests for network processes       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
 
diff -Nru emacs-26.1+1/test/lisp/net/newsticker-tests.el emacs-26.3+1/test/lisp/net/newsticker-tests.el
--- emacs-26.1+1/test/lisp/net/newsticker-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/newsticker-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; newsticker-testsuite.el --- Test suite for newsticker.
 
-;; Copyright (C) 2003-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Keywords:    News, RSS, Atom
diff -Nru emacs-26.1+1/test/lisp/net/puny-tests.el emacs-26.3+1/test/lisp/net/puny-tests.el
--- emacs-26.1+1/test/lisp/net/puny-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/puny-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; puny-tests.el --- tests for net/puny.el  -*- coding: utf-8; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/net/sasl-scram-rfc-tests.el emacs-26.3+1/test/lisp/net/sasl-scram-rfc-tests.el
--- emacs-26.1+1/test/lisp/net/sasl-scram-rfc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/sasl-scram-rfc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sasl-scram-rfc-tests.el --- tests for SCRAM-SHA-1       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Magnus Henoch <magnus.henoch@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/net/shr-tests.el emacs-26.3+1/test/lisp/net/shr-tests.el
--- emacs-26.1+1/test/lisp/net/shr-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/shr-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; network-stream-tests.el --- tests for network processes       -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
 
diff -Nru emacs-26.1+1/test/lisp/net/tramp-tests.el emacs-26.3+1/test/lisp/net/tramp-tests.el
--- emacs-26.1+1/test/lisp/net/tramp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/net/tramp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-tests.el --- Tests of remote file access  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 
@@ -33,12 +33,17 @@
 ;; remote host, set this environment variable to "/dev/null" or
 ;; whatever is appropriate on your system.
 
+;; For slow remote connections, `tramp-test41-asynchronous-requests'
+;; might be too heavy.  Setting $REMOTE_PARALLEL_PROCESSES to a proper
+;; value less than 10 could help.
+
 ;; A whole test run can be performed calling the command `tramp-test-all'.
 
 ;;; Code:
 
 (require 'dired)
 (require 'ert)
+(require 'ert-x)
 (require 'tramp)
 (require 'vc)
 (require 'vc-bzr)
@@ -1862,6 +1867,23 @@
 	      (insert-file-contents tmp-name)
 	      (should (string-equal (buffer-string) "34")))
 
+	    ;; Check message.
+	    ;; Macro `ert-with-message-capture' was introduced in Emacs 26.1.
+	    (with-no-warnings (when (symbol-plist 'ert-with-message-capture)
+	      (let ((tramp-message-show-message t))
+		(dolist (noninteractive '(nil t))
+		  (dolist (visit '(nil t "string" no-message))
+		    (ert-with-message-capture tramp--test-messages
+		      (write-region "foo" nil tmp-name nil visit)
+		      ;; We must check the last line.  There could be
+		      ;; other messages from the progress reporter.
+		      (should
+		       (string-match
+			(if (and (null noninteractive)
+				 (or (eq visit t) (null visit) (stringp visit)))
+			    (format "^Wrote %s\n\\'" tmp-name) "^\\'")
+			tramp--test-messages))))))))
+
 	    ;; Do not overwrite if excluded.
 	    (cl-letf (((symbol-function 'y-or-n-p) (lambda (_prompt) t)))
 	      (write-region "foo" nil tmp-name nil nil nil 'mustbenew))
@@ -1882,9 +1904,9 @@
   "Check `copy-file'."
   (skip-unless (tramp--test-enabled))
 
-  ;; TODO: The quoted case does not work.  Copy local file to remote.
-  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
-  (let (quoted)
+  ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
+  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs27-p))
+		      '(nil t) '(nil)))
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name2 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -1984,9 +2006,9 @@
   "Check `rename-file'."
   (skip-unless (tramp--test-enabled))
 
-  ;; TODO: The quoted case does not work.
-  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
-  (let (quoted)
+  ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
+  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs27-p))
+		      '(nil t) '(nil)))
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name2 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -2718,9 +2740,11 @@
 	      (file-symlink-p tmp-name2)))
 	    ;; `tmp-name3' is a local file name.  Therefore, the link
 	    ;; target remains unchanged, even if quoted.
-	    (make-symbolic-link tmp-name1 tmp-name3)
-	    (should
-	     (string-equal tmp-name1 (file-symlink-p tmp-name3)))
+	    ;; `make-symbolic-link' might not be permitted on w32 systems.
+	    (unless (tramp--test-windows-nt)
+	      (make-symbolic-link tmp-name1 tmp-name3)
+	      (should
+	       (string-equal tmp-name1 (file-symlink-p tmp-name3))))
 	    ;; Check directory as newname.
 	    (make-directory tmp-name4)
 	    (should-error
@@ -2747,7 +2771,7 @@
 
       ;; Check `add-name-to-file'.
       (unwind-protect
-	  (progn
+	  (unless (tramp-smb-file-name-p tramp-test-temporary-file-directory)
 	    (write-region "foo" nil tmp-name1)
 	    (should (file-exists-p tmp-name1))
 	    (add-name-to-file tmp-name1 tmp-name2)
@@ -2810,7 +2834,11 @@
 	    ;; Symbolic links could look like a remote file name.
 	    ;; They must be quoted then.
 	    (delete-file tmp-name2)
-	    (make-symbolic-link "/penguin:motd:" tmp-name2)
+	    (make-symbolic-link
+	     (funcall
+	      (if quoted 'tramp-compat-file-name-unquote 'identity)
+	      "/penguin:motd:")
+	     tmp-name2)
 	    (should (file-symlink-p tmp-name2))
 	    (should
 	     (string-equal
@@ -2818,15 +2846,17 @@
 	      (tramp-compat-file-name-quote
 	       (concat (file-remote-p tmp-name2) "/penguin:motd:"))))
 	    ;; `tmp-name3' is a local file name.
-	    (make-symbolic-link tmp-name1 tmp-name3)
-	    (should (file-symlink-p tmp-name3))
-            (should-not (string-equal tmp-name3 (file-truename tmp-name3)))
-	    ;; `file-truename' returns a quoted file name for `tmp-name3'.
-	    ;; We must unquote it.
-	    (should
-	     (string-equal
-	      (file-truename tmp-name1)
-	      (tramp-compat-file-name-unquote (file-truename tmp-name3)))))
+	    ;; `make-symbolic-link' might not be permitted on w32 systems.
+	    (unless (tramp--test-windows-nt)
+	      (make-symbolic-link tmp-name1 tmp-name3)
+	      (should (file-symlink-p tmp-name3))
+              (should-not (string-equal tmp-name3 (file-truename tmp-name3)))
+	      ;; `file-truename' returns a quoted file name for `tmp-name3'.
+	      ;; We must unquote it.
+	      (should
+	       (string-equal
+		(file-truename tmp-name1)
+		(tramp-compat-file-name-unquote (file-truename tmp-name3))))))
 
 	;; Cleanup.
 	(ignore-errors
@@ -2951,9 +2981,9 @@
   (skip-unless (tramp--test-enabled))
   (skip-unless (file-acl tramp-test-temporary-file-directory))
 
-  ;; TODO: The quoted case does not work.  Copy local file to remote.
-  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
-  (let (quoted)
+  ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
+  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs27-p))
+		      '(nil t) '(nil)))
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name2 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -3029,9 +3059,9 @@
    (not (equal (file-selinux-context tramp-test-temporary-file-directory)
 	       '(nil nil nil nil))))
 
-  ;; TODO: The quoted case does not work.  Copy local file to remote.
-  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
-  (let (quoted)
+  ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
+  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs27-p))
+		      '(nil t) '(nil)))
     (let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name2 (tramp--test-make-temp-name nil quoted))
 	  (tmp-name3 (tramp--test-make-temp-name 'local quoted)))
@@ -3769,11 +3799,9 @@
 		  (vc-register
 		   (list (car vc-handled-backends)
 			 (list (file-name-nondirectory tmp-name2))))
-		;; `vc-register' has changed its arguments in Emacs 25.1.
-		(error
-		 (vc-register
-		  nil (list (car vc-handled-backends)
-			    (list (file-name-nondirectory tmp-name2))))))
+		;; `vc-register' has changed its arguments in Emacs
+		;; 25.1.  Let's skip it for older Emacsen.
+		(error (skip-unless (tramp--test-emacs25-p))))
 	      ;; vc-git uses an own process sentinel, Tramp's sentinel
 	      ;; for flushing the cache isn't used.
 	      (dired-uncache (concat (file-remote-p default-directory) "/"))
@@ -3911,9 +3939,14 @@
 		(expand-file-name
 		 (format
 		  "%s~"
-		  ;; This is taken from `make-backup-file-name-1'.
+		  ;; This is taken from `make-backup-file-name-1'.  We
+		  ;; call `convert-standard-filename', because on MS
+		  ;; Windows the (local) colons must be replaced by
+		  ;; exclamation marks.
 		  (subst-char-in-string
-		   ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1)))
+		   ?/ ?!
+		   (replace-regexp-in-string
+		    "!" "!!" (convert-standard-filename tmp-name1))))
 		 tmp-name2)))))
 	    ;; The backup directory is created.
 	    (should (file-directory-p tmp-name2)))
@@ -3934,9 +3967,14 @@
 		(expand-file-name
 		 (format
 		  "%s~"
-		  ;; This is taken from `make-backup-file-name-1'.
+		  ;; This is taken from `make-backup-file-name-1'.  We
+		  ;; call `convert-standard-filename', because on MS
+		  ;; Windows the (local) colons must be replaced by
+		  ;; exclamation marks.
 		  (subst-char-in-string
-		   ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1)))
+		   ?/ ?!
+		   (replace-regexp-in-string
+		    "!" "!!" (convert-standard-filename tmp-name1))))
 		 tmp-name2)))))
 	    ;; The backup directory is created.
 	    (should (file-directory-p tmp-name2)))
@@ -3958,9 +3996,14 @@
 		(expand-file-name
 		 (format
 		  "%s~"
-		  ;; This is taken from `make-backup-file-name-1'.
+		  ;; This is taken from `make-backup-file-name-1'.  We
+		  ;; call `convert-standard-filename', because on MS
+		  ;; Windows the (local) colons must be replaced by
+		  ;; exclamation marks.
 		  (subst-char-in-string
-		   ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1)))
+		   ?/ ?!
+		   (replace-regexp-in-string
+		    "!" "!!" (convert-standard-filename tmp-name1))))
 		 tmp-name2)))))
 	    ;; The backup directory is created.
 	    (should (file-directory-p tmp-name2)))
@@ -4005,12 +4048,24 @@
     (delete-directory tmp-file)
     (should-not (file-exists-p tmp-file))))
 
+(defun tramp--test-emacs25-p ()
+  "Check for Emacs version >= 25.1.
+Some semantics has been changed for there, w/o new functions or
+variables, so we check the Emacs version directly."
+  (>= emacs-major-version 25))
+
 (defun tramp--test-emacs26-p ()
   "Check for Emacs version >= 26.1.
 Some semantics has been changed for there, w/o new functions or
 variables, so we check the Emacs version directly."
   (>= emacs-major-version 26))
 
+(defun tramp--test-emacs27-p ()
+  "Check for Emacs version >= 27.1.
+Some semantics has been changed for there, w/o new functions or
+variables, so we check the Emacs version directly."
+  (>= emacs-major-version 27))
+
 (defun tramp--test-adb-p ()
   "Check, whether the remote host runs Android.
 This requires restrictions of file name syntax."
@@ -4061,6 +4116,10 @@
    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
    'tramp-sh-file-name-handler))
 
+(defun tramp--test-windows-nt ()
+  "Check, whether the locale host runs MS Windows."
+  (eq system-type 'windows-nt))
+
 (defun tramp--test-windows-nt-and-batch ()
   "Check, whether the locale host runs MS Windows in batch mode.
 This does not support special characters."
@@ -4082,9 +4141,9 @@
 
 (defun tramp--test-check-files (&rest files)
   "Run a simple but comprehensive test over every file in FILES."
-  ;; TODO: The quoted case does not work.
-  ;;(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
-  (let (quoted)
+  ;; `filename-non-special' has been fixed in Emacs 27.1, see Bug#29579.
+  (dolist (quoted (if (and tramp--test-expensive-test (tramp--test-emacs27-p))
+		      '(nil t) '(nil)))
     ;; We must use `file-truename' for the temporary directory,
     ;; because it could be located on a symlinked directory.  This
     ;; would let the test fail.
@@ -4493,8 +4552,13 @@
            (inhibit-message t)
 	   ;; Do not run delayed timers.
 	   (timer-max-repeats 0)
-	   ;; Number of asynchronous processes for test.
-           (number-proc 10)
+	   ;; Number of asynchronous processes for test.  Tests on
+	   ;; some machines handle less parallel processes.
+           (number-proc
+            (or
+             (ignore-errors
+               (string-to-number (getenv "REMOTE_PARALLEL_PROCESSES")))
+             10))
            ;; On hydra, timings are bad.
            (timer-repeat
             (cond
@@ -4558,11 +4622,13 @@
                    (with-current-buffer (process-buffer proc)
                      (insert string))
                    (unless (zerop (length string))
+		     (dired-uncache (process-get proc 'foo))
                      (should (file-attributes (process-get proc 'foo))))))
                 ;; Add process sentinel.
                 (set-process-sentinel
                  proc
                  (lambda (proc _state)
+		   (dired-uncache (process-get proc 'foo))
                    (should-not (file-attributes (process-get proc 'foo)))))))
 
             ;; Send a string.  Use a random order of the buffers.  Mix
@@ -4576,6 +4642,7 @@
                        (file (process-get proc 'foo))
                        (count (process-get proc 'bar)))
                   ;; Regular operation prior process action.
+		  (dired-uncache file)
                   (if (= count 0)
                       (should-not (file-attributes file))
                     (should (file-attributes file)))
@@ -4585,6 +4652,7 @@
                   ;; Give the watchdog a chance.
                   (read-event nil nil 0.01)
                   ;; Regular operation post process action.
+		  (dired-uncache file)
                   (if (= count 2)
                       (should-not (file-attributes file))
                     (should (file-attributes file)))
@@ -4614,6 +4682,8 @@
 ;; This test is inspired by Bug#29163.
 (ert-deftest tramp-test42-auto-load ()
   "Check that Tramp autoloads properly."
+  (skip-unless (tramp--test-enabled))
+
   (let ((default-directory (expand-file-name temporary-file-directory))
 	(code
 	 (format
@@ -4625,7 +4695,8 @@
       (shell-command-to-string
        (format
 	"%s -batch -Q -L %s --eval %s"
-	(expand-file-name invocation-name invocation-directory)
+	(shell-quote-argument
+	 (expand-file-name invocation-name invocation-directory))
 	(mapconcat 'shell-quote-argument load-path " -L ")
 	(shell-quote-argument code)))))))
 
@@ -4657,7 +4728,8 @@
 	(shell-command-to-string
 	 (format
 	  "%s -batch -Q -L %s --eval %s"
-	  (expand-file-name invocation-name invocation-directory)
+	  (shell-quote-argument
+	   (expand-file-name invocation-name invocation-directory))
 	  (mapconcat 'shell-quote-argument load-path " -L ")
 	  (shell-quote-argument (format code tm)))))))))
 
@@ -4680,7 +4752,8 @@
 	(shell-command-to-string
 	 (format
 	  "%s -batch -Q -L %s --eval %s"
-	  (expand-file-name invocation-name invocation-directory)
+	  (shell-quote-argument
+	   (expand-file-name invocation-name invocation-directory))
 	  (mapconcat 'shell-quote-argument load-path " -L ")
 	  (shell-quote-argument code))))))))
 
@@ -4702,12 +4775,14 @@
      (string-match
       (format
        "Loading %s"
-       (expand-file-name
-	"tramp-cmds" (file-name-directory (locate-library "tramp"))))
+       (regexp-quote
+        (expand-file-name
+         "tramp-cmds" (file-name-directory (locate-library "tramp")))))
       (shell-command-to-string
        (format
 	"%s -batch -Q -L %s -l tramp-sh --eval %s"
-	(expand-file-name invocation-name invocation-directory)
+	(shell-quote-argument
+	 (expand-file-name invocation-name invocation-directory))
 	(mapconcat 'shell-quote-argument load-path " -L ")
 	(shell-quote-argument code)))))))
 
diff -Nru emacs-26.1+1/test/lisp/nxml/nxml-mode-tests.el emacs-26.3+1/test/lisp/nxml/nxml-mode-tests.el
--- emacs-26.1+1/test/lisp/nxml/nxml-mode-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/lisp/nxml/nxml-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,82 @@
+;;; nxml-mode-tests.el --- Test NXML Mode -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; 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/>.
+
+;;; Code:
+
+(require 'ert)
+(require 'nxml-mode)
+
+(defun nxml-mode-tests-correctly-indented-string (str)
+  (with-temp-buffer
+    (nxml-mode)
+    (insert str)
+    (indent-region (point-min) (point-max))
+    (equal (buffer-string) str)))
+
+(ert-deftest nxml-indent-line-after-attribute ()
+  (should (nxml-mode-tests-correctly-indented-string "
+<settings
+    xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\"
+    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+    xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
+                        https://maven.apache.org/xsd/settings-1.0.0.xsd\">
+  <mirrors>
+    ...
+  </mirrors>
+</settings>
+"))
+  (should (nxml-mode-tests-correctly-indented-string "\
+<x>
+  <abc xx=\"x/x/x/x/x/x/x/
+           y/y/y/y/y/y/
+           \">
+    <zzz/>
+  </abc>
+  <nl>
</nl>
+</x>
+")))
+
+(ert-deftest nxml-balanced-close-start-tag-inline ()
+  (with-temp-buffer
+    (nxml-mode)
+    (insert "<a><b c=\"\"</a>")
+    (search-backward "</a>")
+    (nxml-balanced-close-start-tag-inline)
+    (should (equal (buffer-string) "<a><b c=\"\"></b></a>"))))
+
+(ert-deftest nxml-mode-font-lock-quotes ()
+  (with-temp-buffer
+    (nxml-mode)
+    (insert "<x a=\"dquote attr\" b='squote attr'>\"dquote text\"'squote text'</x>")
+    (font-lock-ensure)
+    (let ((squote-txt-pos (search-backward "squote text"))
+          (dquote-txt-pos (search-backward "dquote text"))
+          (squote-att-pos (search-backward "squote attr"))
+          (dquote-att-pos (search-backward "dquote attr")))
+      ;; Just make sure that each quote uses the same face for quoted
+      ;; attribute values, and a different face for quoted text
+      ;; outside tags.  Don't test `font-lock-string-face' vs
+      ;; `nxml-attribute-value' here.
+      (should (equal (get-text-property squote-att-pos 'face)
+                     (get-text-property dquote-att-pos 'face)))
+      (should (equal (get-text-property squote-txt-pos 'face)
+                     (get-text-property dquote-txt-pos 'face)))
+      (should-not (equal (get-text-property squote-txt-pos 'face)
+                         (get-text-property dquote-att-pos 'face))))))
+
+(provide 'nxml-mode-tests)
+;;; nxml-mode-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/obarray-tests.el emacs-26.3+1/test/lisp/obarray-tests.el
--- emacs-26.1+1/test/lisp/obarray-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/obarray-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; obarray-tests.el --- Tests for obarray -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Przemysław Wojnowski <esperanto@cumego.com>
 
diff -Nru emacs-26.1+1/test/lisp/org/org-tests.el emacs-26.3+1/test/lisp/org/org-tests.el
--- emacs-26.1+1/test/lisp/org/org-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/org/org-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; org-tests.el --- tests for org/org.el
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/bat-mode-tests.el emacs-26.3+1/test/lisp/progmodes/bat-mode-tests.el
--- emacs-26.1+1/test/lisp/progmodes/bat-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/bat-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; bat-mode-tests.el --- Tests for bat-mode.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Vladimir Panteleev <vladimir@thecybershadow.net>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/progmodes/cc-mode-tests.el emacs-26.3+1/test/lisp/progmodes/cc-mode-tests.el
--- emacs-26.1+1/test/lisp/progmodes/cc-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/cc-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cc-mode-tests.el --- Test suite for cc-mode.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Michal Nazarewicz <mina86@mina86.com>
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/lisp/progmodes/compile-tests.el emacs-26.3+1/test/lisp/progmodes/compile-tests.el
--- emacs-26.1+1/test/lisp/progmodes/compile-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/compile-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; compile-tests.el --- Test suite for compile.el.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
@@ -343,6 +343,29 @@
 END-LINE, if that matched.  TYPE can be left out, in which case
 any message type is accepted.")
 
+(defconst compile-tests--grep-regexp-testcases
+  ;; Bug#32051.
+  '(("c:/Users/my.name/src/project\\src\\kbhit.hpp\0\ 29:#include <termios.h>"
+     1 nil 29 "c:/Users/my.name/src/project\\src\\kbhit.hpp")
+    ("d:/gnu/emacs/branch/src/callproc.c\0\ 214:#ifdef DOS_NT"
+     1 nil 214 "d:/gnu/emacs/branch/src/callproc.c")
+    ("/gnu/emacs/branch/src/callproc.c\0\ 214:#ifdef DOS_NT"
+     1 nil 214 "/gnu/emacs/branch/src/callproc.c"))
+  "List of tests for `grep-regexp-list'.
+The format is the same as `compile-tests--test-regexps-data', but
+the match is expected to be the same when NUL bytes are replaced
+with colon.")
+
+(defconst compile-tests--grep-regexp-tricky-testcases
+  ;; Bug#7378.
+  '(("./x11-libs---nx/3.4.0:0:C.30253.1289557929.792611.C/nx-3.4.0.exheres-0\0\ 42:some text"
+     1 nil 42 "./x11-libs---nx/3.4.0:0:C.30253.1289557929.792611.C/nx-3.4.0.exheres-0")
+    ("2011-08-31_11:57:03_1\0\ 7:Date: Wed, 31 Aug 2011 11:57:03 +0000"
+     1 nil 7 "2011-08-31_11:57:03_1"))
+  "List of tricky tests for `grep-regexp-list'.
+Same as `compile-tests--grep-regexp-testcases', but these cases
+can only work with the NUL byte to disambiguate colons.")
+
 (defun compile--test-error-line (test)
   (erase-buffer)
   (setq compilation-locs (make-hash-table))
@@ -370,7 +393,8 @@
       (should (equal (car (nth 2 (compilation--loc->file-struct loc)))
                      (or end-line line)))
       (when type
-        (should (equal type (compilation--message->type msg)))))))
+        (should (equal type (compilation--message->type msg)))))
+    msg))
 
 (ert-deftest compile-test-error-regexps ()
   "Test the `compilation-error-regexp-alist' regexps.
@@ -379,4 +403,24 @@
     (font-lock-mode -1)
     (mapc #'compile--test-error-line compile-tests--test-regexps-data)))
 
+(ert-deftest compile-test-grep-regexps ()
+  "Test the `grep-regexp-alist' regexps.
+The test data is in `compile-tests--grep-regexp-testcases'."
+  (with-temp-buffer
+    (grep-mode)
+    (setq buffer-read-only nil)
+    (font-lock-mode -1)
+    (dolist (testcase compile-tests--grep-regexp-testcases)
+      (let (msg1 msg2)
+        (setq msg1 (ert-info ((format "%S" testcase) :prefix "testcase: ")
+                     (compile--test-error-line testcase)))
+        ;; Make sure replacing the NUL character with a colon still matches.
+        (setf (car testcase) (replace-regexp-in-string "\0" ":" (car testcase)))
+        (setq msg2 (ert-info ((format "%S" testcase) :prefix "testcase: ")
+                     (compile--test-error-line testcase)))
+        (should (equal msg1 msg2))))
+    (dolist (testcase compile-tests--grep-regexp-tricky-testcases)
+      (ert-info ((format "%S" testcase) :prefix "testcase: ")
+        (compile--test-error-line testcase)))))
+
 ;;; compile-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/progmodes/elisp-mode-tests.el emacs-26.3+1/test/lisp/progmodes/elisp-mode-tests.el
--- emacs-26.1+1/test/lisp/progmodes/elisp-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/elisp-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; elisp-mode-tests.el --- Tests for emacs-lisp-mode  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
@@ -298,6 +298,16 @@
       )))
 
 
+;; tmp may be on a different filesystem to the tests, but, ehh.
+(defvar xref--case-insensitive
+  (let ((dir (make-temp-file "xref-test" t)))
+    (unwind-protect
+        (progn
+          (with-temp-file (expand-file-name "hElLo" dir) "hello")
+          (file-exists-p (expand-file-name "HELLO" dir)))
+      (delete-directory dir t)))
+  "Non-nil if file system seems to be case-insensitive.")
+
 (defun xref-elisp-test-run (xrefs expected-xrefs)
   (should (= (length xrefs) (length expected-xrefs)))
   (while xrefs
@@ -307,11 +317,13 @@
            (expected-source (when (consp expected) (cdr expected))))
 
       ;; Downcase the filenames for case-insensitive file systems.
-      (setf (xref-elisp-location-file (oref xref location))
-            (downcase (xref-elisp-location-file (oref xref location))))
-
-      (setf (xref-elisp-location-file (oref expected-xref location))
-            (downcase (xref-elisp-location-file (oref expected-xref location))))
+      (when xref--case-insensitive
+        (setf (xref-elisp-location-file (oref xref location))
+              (downcase (xref-elisp-location-file (oref xref location))))
+
+        (setf (xref-elisp-location-file (oref expected-xref location))
+              (downcase (xref-elisp-location-file
+                         (oref expected-xref location)))))
 
       (should (equal xref expected-xref))
 
@@ -346,10 +358,10 @@
 ;; `load-path' has the correct case, so this causes the expected test
 ;; values to have the wrong case). This is handled in
 ;; `xref-elisp-test-run'.
-(defconst emacs-test-dir
-  (downcase
-   (file-truename (file-name-directory
-		   (or load-file-name (buffer-file-name))))))
+(defvar emacs-test-dir
+  (funcall (if xref--case-insensitive 'downcase 'identity)
+           (file-truename (file-name-directory
+                           (or load-file-name (buffer-file-name))))))
 
 
 ;; alphabetical by test name
diff -Nru emacs-26.1+1/test/lisp/progmodes/etags-tests.el emacs-26.3+1/test/lisp/progmodes/etags-tests.el
--- emacs-26.1+1/test/lisp/progmodes/etags-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/etags-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; etags-tests.el --- Test suite for etags.el.
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii <eliz@gnu.org>
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/f90-tests.el emacs-26.3+1/test/lisp/progmodes/f90-tests.el
--- emacs-26.1+1/test/lisp/progmodes/f90-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/f90-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; f90-tests.el --- tests for progmodes/f90.el
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris <rgm@gnu.org>
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/flymake-tests.el emacs-26.3+1/test/lisp/progmodes/flymake-tests.el
--- emacs-26.1+1/test/lisp/progmodes/flymake-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/flymake-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; flymake-tests.el --- Test suite for flymake -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Eduard Wiebe <usenet@pusto.de>
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/js-tests.el emacs-26.3+1/test/lisp/progmodes/js-tests.el
--- emacs-26.1+1/test/lisp/progmodes/js-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/js-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; js-tests.el --- Test suite for js-mode
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/python-tests.el emacs-26.3+1/test/lisp/progmodes/python-tests.el
--- emacs-26.1+1/test/lisp/progmodes/python-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/python-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; python-tests.el --- Test suite for python.el
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -134,6 +134,16 @@
                            (overlay-end overlay))))
       (buffer-substring-no-properties (point-min) (point-max)))))
 
+(defun python-virt-bin (&optional virt-root)
+  "Return the virtualenv bin dir, starting from VIRT-ROOT.
+If nil, VIRT-ROOT defaults to `python-shell-virtualenv-root'.
+The name of this directory depends on `system-type'."
+  (expand-file-name
+   (concat
+    (file-name-as-directory (or virt-root
+                                python-shell-virtualenv-root))
+    (if (eq system-type 'windows-nt) "Scripts" "bin"))))
+
 
 ;;; Tests for your tests, so you can test while you test.
 
@@ -2664,7 +2674,7 @@
          (python-shell-virtualenv-root "/env")
          (new-exec-path (python-shell-calculate-exec-path)))
     (should (equal new-exec-path
-                   (list (expand-file-name "/env/bin") "/path0")))))
+                   (list (python-virt-bin) "/path0")))))
 
 (ert-deftest python-shell-calculate-exec-path-3 ()
   "Test complete `python-shell-virtualenv-root' modification."
@@ -2673,7 +2683,7 @@
          (python-shell-virtualenv-root "/env")
          (new-exec-path (python-shell-calculate-exec-path)))
     (should (equal new-exec-path
-                   (list (expand-file-name "/env/bin")
+                   (list (python-virt-bin)
                          "/path1" "/path2" "/path0")))))
 
 (ert-deftest python-shell-calculate-exec-path-4 ()
@@ -2684,7 +2694,7 @@
          (python-shell-virtualenv-root "/env")
          (new-exec-path (python-shell-calculate-exec-path)))
     (should (equal new-exec-path
-                   (list (expand-file-name "/env/bin")
+                   (list (python-virt-bin)
                          "/path1" "/path2" "/path0")))))
 
 (ert-deftest python-shell-calculate-exec-path-5 ()
@@ -2714,7 +2724,7 @@
          (python-shell-virtualenv-root "/env"))
     (python-shell-with-environment
      (should (equal exec-path
-                    (list (expand-file-name "/env/bin")
+                    (list (python-virt-bin)
                           "/path1" "/path2" "/path0")))
       (should (not (getenv "PYTHONHOME")))
       (should (string= (getenv "VIRTUAL_ENV") "/env")))
@@ -2730,7 +2740,7 @@
          (python-shell-virtualenv-root "/env"))
     (python-shell-with-environment
       (should (equal (python-shell-calculate-exec-path)
-                     (list (expand-file-name "/env/bin")
+                     (list (python-virt-bin)
                            "/path1" "/path2" "/remote1" "/remote2")))
       (let ((process-environment (python-shell-calculate-process-environment)))
         (should (not (getenv "PYTHONHOME")))
diff -Nru emacs-26.1+1/test/lisp/progmodes/ruby-mode-tests.el emacs-26.3+1/test/lisp/progmodes/ruby-mode-tests.el
--- emacs-26.1+1/test/lisp/progmodes/ruby-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/ruby-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ruby-mode-tests.el --- Test suite for ruby-mode
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/progmodes/sql-tests.el emacs-26.3+1/test/lisp/progmodes/sql-tests.el
--- emacs-26.1+1/test/lisp/progmodes/sql-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/sql-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sql-tests.el --- Tests for sql.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/progmodes/subword-tests.el emacs-26.3+1/test/lisp/progmodes/subword-tests.el
--- emacs-26.1+1/test/lisp/progmodes/subword-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/subword-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subword-tests.el --- Testing the subword rules
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/progmodes/xref-tests.el emacs-26.3+1/test/lisp/progmodes/xref-tests.el
--- emacs-26.1+1/test/lisp/progmodes/xref-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/progmodes/xref-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xref-tests.el --- tests for xref
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 
diff -Nru emacs-26.1+1/test/lisp/ps-print-tests.el emacs-26.3+1/test/lisp/ps-print-tests.el
--- emacs-26.1+1/test/lisp/ps-print-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ps-print-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ps-print-tests.el --- Test suite for ps-print.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Phillip Lord <phillip.lord@russet.org.uk>
 
diff -Nru emacs-26.1+1/test/lisp/register-tests.el emacs-26.3+1/test/lisp/register-tests.el
--- emacs-26.1+1/test/lisp/register-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/register-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; register-tests.el --- tests for register.el  -*- lexical-binding: t-*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha <tino.calancha@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/replace-tests.el emacs-26.3+1/test/lisp/replace-tests.el
--- emacs-26.1+1/test/lisp/replace-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/replace-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; replace-tests.el --- tests for replace.el.
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Richard <youngfrog@members.fsf.org>
 ;; Author: Juri Linkov <juri@jurta.org>
@@ -23,6 +23,7 @@
 ;;; Code:
 
 (require 'ert)
+(eval-when-compile (require 'subr-x))
 
 (ert-deftest query-replace--split-string-tests ()
   (let ((sep (propertize "\0" 'separator t)))
@@ -358,26 +359,124 @@
 (dotimes (i (length replace-occur-tests))
   (replace-occur-test-create i))
 
+
+;;; Tests for `query-replace' undo feature.
+
+(defvar replace-tests-bind-read-string nil
+  "A string to bind `read-string' and avoid the prompt.")
+
+(defvar replace-tests-perform-replace-regexp-flag t
+  "Value for regexp-flag argument passed to `perform-replace' in undo tests.")
+
+(defmacro replace-tests-with-undo (input from to char-nums def-chr &rest body)
+  "Helper to test `query-replace' undo feature.
+INPUT is a string to insert in a temporary buffer.
+FROM is the string to match and replace.
+TO is the replacement string.
+CHAR-NUMS is a list of elements (CHAR . NUMS), where CHAR is
+one of the characters `,', `?\\s', `u', `U', `E' or `q'
+and NUMS a list of integers.
+DEF-CHAR is the character `?\\s' or `q'.
+BODY is a list of forms to evaluate.
+
+Use CHAR-NUMS and DEF-CHAR to temporary bind the function value of
+`read-event', thus avoiding the prompt.
+For instance, if CHAR-NUMS is the lists ((?\\s . (1 2 3)) (?u . (4))),
+then replace 3 matches of FROM with TO, and undo the last replacement.
+
+Return the last evalled form in BODY."
+  (declare (indent 5) (debug (stringp stringp stringp form characterp body)))
+  (let ((text (gensym "text"))
+        (count (gensym "count")))
+    `(let* ((,text ,input)
+            (,count 0)
+            (inhibit-message t))
+       (with-temp-buffer
+         (insert ,text)
+         (goto-char 1)
+         ;; Bind `read-event' to simulate user input.
+         ;; If `replace-tests-bind-read-string' is non-nil, then
+         ;; bind `read-string' as well.
+         (cl-letf (((symbol-function 'read-event)
+                    (lambda (&rest args)
+                      (cl-incf ,count)
+                      (pcase ,count ; Build the clauses from CHAR-NUMS
+                        ,@(append
+                           (delq nil
+                                 (mapcar
+                                  (lambda (chr)
+                                    (when-let (it (alist-get chr char-nums))
+                                      (if (cdr it)
+                                          `(,(cons 'or it) ,chr)
+                                        `(,(car it) ,chr))))
+                                  '(?, ?\s ?u ?U ?E ?q)))
+                           `((_ ,def-chr))))))
+                   ((symbol-function 'read-string)
+                    (if replace-tests-bind-read-string
+                        (lambda (&rest args) replace-tests-bind-read-string)
+                      (symbol-function 'read-string))))
+           (perform-replace ,from ,to t replace-tests-perform-replace-regexp-flag nil))
+         ,@body))))
+
 (defun replace-tests--query-replace-undo (&optional comma)
-  (with-temp-buffer
-    (insert "111")
-    (goto-char 1)
-    (let ((count 0))
-      ;; Don't wait for user input.
-      (cl-letf (((symbol-function 'read-event)
-                 (lambda (&rest args)
-                   (cl-incf count)
-                   (let ((val (pcase count
-                                ('2 (if comma ?, ?\s)) ; replace and: ',' no move; '\s' go next
-                                ('3 ?u) ; undo
-                                ('4 ?q) ; exit
-                                (_ ?\s)))) ; replace current and go next
-                     val))))
-        (perform-replace "1" "2" t nil nil)))
-    (buffer-string)))
+  (let ((input "111"))
+    (if comma
+        (should
+         (replace-tests-with-undo
+          input "1" "2" ((?, . (2)) (?u . (3)) (?q . (4))) ?\s (buffer-string)))
+      (should
+       (replace-tests-with-undo
+        input "1" "2" ((?\s . (2)) (?u . (3)) (?q . (4))) ?\s (buffer-string))))))
 
 (ert-deftest query-replace--undo ()
   (should (string= "211" (replace-tests--query-replace-undo)))
   (should (string= "211" (replace-tests--query-replace-undo 'comma))))
 
+(ert-deftest query-replace-undo-bug31073 ()
+  "Test for https://debbugs.gnu.org/31073 ."
+  (let ((input "aaa aaa"))
+    (should
+     (replace-tests-with-undo
+      input "a" "B" ((?\s . (1 2 3)) (?U . (4))) ?q
+      (string= input (buffer-string))))))
+
+(ert-deftest query-replace-undo-bug31492 ()
+  "Test for https://debbugs.gnu.org/31492 ."
+  (let ((input "a\nb\nc\n"))
+    (should
+     (replace-tests-with-undo
+      input "^\\|\b\\|$" "foo" ((?\s . (1 2)) (?U . (3))) ?q
+      (string= input (buffer-string))))))
+
+(ert-deftest query-replace-undo-bug31538 ()
+  "Test for https://debbugs.gnu.org/31538 ."
+  (let ((input "aaa aaa")
+        (replace-tests-bind-read-string "Bfoo"))
+    (should
+     (replace-tests-with-undo
+      input "a" "B" ((?\s . (1 2 3)) (?E . (4)) (?U . (5))) ?q
+      (string= input (buffer-string))))))
+
+(ert-deftest query-replace-undo-bug37073 ()
+  "Test for https://debbugs.gnu.org/37073 ."
+  (let ((input "theorem 1\ntheorem 2\ntheorem 3"))
+    (should
+     (replace-tests-with-undo
+         input "theorem \\([0-9]+\\)"
+         "theorem \\\\ref{theo_\\1}"
+         ((?\s . (1 2)) (?U . (3)))
+         ?q
+       (string= input (buffer-string)))))
+  ;; Now run a test with regexp-flag arg in `perform-replace' set to nil
+  (let ((input " ^theorem$ 1\n ^theorem$ 2\n ^theorem$ 3")
+        (replace-tests-perform-replace-regexp-flag nil)
+        (expected " theo 1\n ^theorem$ 2\n ^theorem$ 3"))
+    (should
+     (replace-tests-with-undo
+         input "^theorem$"
+         "theo"
+         ((?\s . (1 2 4)) (?U . (3)))
+         ?q
+       (string= expected (buffer-string))))))
+
 ;;; replace-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/rot13-tests.el emacs-26.3+1/test/lisp/rot13-tests.el
--- emacs-26.1+1/test/lisp/rot13-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/rot13-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rot13-tests.el --- Tests for rot13.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
diff -Nru emacs-26.1+1/test/lisp/ses-tests.el emacs-26.3+1/test/lisp/ses-tests.el
--- emacs-26.1+1/test/lisp/ses-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/ses-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ses-tests.el --- Tests for ses.el              -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
 
diff -Nru emacs-26.1+1/test/lisp/shadowfile-tests.el emacs-26.3+1/test/lisp/shadowfile-tests.el
--- emacs-26.1+1/test/lisp/shadowfile-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/lisp/shadowfile-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,920 @@
+;;; shadowfile-tests.el --- Tests of shadowfile
+
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
+
+;; Author: Michael Albinus <michael.albinus@gmx.de>
+
+;; This program 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.
+;;
+;; This program 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 this program.  If not, see `https://www.gnu.org/licenses/'.
+
+;;; Commentary:
+
+;; Some of the tests require access to a remote host files.  Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used.  Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
+
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value.  If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
+
+;; A whole test run can be performed calling the command `shadowfile-test-all'.
+
+;;; Code:
+
+(require 'ert)
+(require 'shadowfile)
+(require 'tramp)
+
+;; There is no default value on w32 systems, which could work out of the box.
+(defconst shadow-test-remote-temporary-file-directory
+  (cond
+   ((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
+   ((eq system-type 'windows-nt) null-device)
+   (t (add-to-list
+       'tramp-methods
+       '("mock"
+	 (tramp-login-program        "sh")
+	 (tramp-login-args           (("-i")))
+	 (tramp-remote-shell         "/bin/sh")
+	 (tramp-remote-shell-args    ("-c"))
+	 (tramp-connection-timeout   10)))
+      (add-to-list
+       'tramp-default-host-alist
+       `("\\`mock\\'" nil ,(system-name)))
+      ;; Emacs' Makefile sets $HOME to a nonexistent value.  Needed in
+      ;; batch mode only, therefore.  It cannot be
+      ;; `temporary-directory', because the tests with "~" would fail.
+      (unless (and (null noninteractive) (file-directory-p "~/"))
+        (setenv "HOME" invocation-directory))
+      (format "/mock::%s" temporary-file-directory)))
+  "Temporary directory for Tramp tests.")
+
+(setq password-cache-expiry nil
+      tramp-verbose 0
+      tramp-message-show-message nil)
+
+;; This should happen on hydra only.
+(when (getenv "EMACS_HYDRA_CI")
+  (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
+
+(defconst shadow-test-info-file
+  (expand-file-name "shadows_test" temporary-file-directory)
+  "File to keep shadow information in during tests.")
+
+(defconst shadow-test-todo-file
+  (expand-file-name "shadow_todo_test" temporary-file-directory)
+  "File to store the list of uncopied shadows in during tests.")
+
+(ert-deftest shadow-test00-clusters ()
+  "Check cluster definitions.
+Per definition, all files are identical on the different hosts of
+a cluster (or site).  This is not tested here; it must be
+guaranteed by the originator of a cluster definition."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((text-quoting-style 'grave) ;; We inspect the *Messages* buffer!
+        (inhibit-message t)
+        (shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster primary regexp mocked-input)
+    (unwind-protect
+	;; We must mock `read-from-minibuffer' and `read-string', in
+	;; order to avoid interactive arguments.
+	(cl-letf* (((symbol-function 'read-from-minibuffer)
+		    (lambda (&rest args) (pop mocked-input)))
+		   ((symbol-function 'read-string)
+		    (lambda (&rest args) (pop mocked-input))))
+
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster "cluster"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary)
+		mocked-input `(,cluster ,primary ,regexp))
+	  (call-interactively 'shadow-define-cluster)
+	  (should
+	   (string-equal
+	    (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
+	  (should
+	   (string-equal
+	    (shadow-cluster-primary (shadow-get-cluster cluster)) primary))
+	  (should
+	   (string-equal
+	    (shadow-cluster-regexp (shadow-get-cluster cluster)) regexp))
+          (should-not (shadow-get-cluster "non-existent-cluster-name"))
+
+          ;; Test `shadow-set-cluster' and `make-shadow-cluster'.
+	  (shadow-set-cluster cluster primary regexp)
+	  (should
+	   (equal (shadow-get-cluster cluster)
+		  (make-shadow-cluster
+		   :name cluster :primary primary :regexp regexp)))
+
+	  ;; The primary must be either `shadow-system-name', or a remote file.
+	  (setq ;; The second "cluster" is wrong.
+		mocked-input `(,cluster ,cluster ,primary ,regexp))
+          (with-current-buffer (messages-buffer)
+            (narrow-to-region (point-max) (point-max)))
+	  (call-interactively 'shadow-define-cluster)
+	  (should
+           (string-match
+            (regexp-quote "Not a valid primary!")
+            (with-current-buffer (messages-buffer) (buffer-string))))
+	  ;; The first cluster definition is still valid.
+	  (should
+	   (string-equal
+	    (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
+	  (should
+	   (string-equal
+	    (shadow-cluster-primary (shadow-get-cluster cluster)) primary))
+	  (should
+	   (string-equal
+	    (shadow-cluster-regexp (shadow-get-cluster cluster)) regexp))
+
+	  ;; The regexp must match the primary name.
+	  (setq ;; The second "cluster" is wrong.
+		mocked-input `(,cluster ,primary ,cluster ,regexp))
+          (with-current-buffer (messages-buffer)
+            (narrow-to-region (point-max) (point-max)))
+	  (call-interactively 'shadow-define-cluster)
+	  (should
+           (string-match
+            (regexp-quote "Regexp doesn't include the primary host!")
+            (with-current-buffer (messages-buffer) (buffer-string))))
+	  ;; The first cluster definition is still valid.
+	  (should
+	   (string-equal
+	    (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
+	  (should
+	   (string-equal
+	    (shadow-cluster-primary (shadow-get-cluster cluster)) primary))
+	  (should
+	   (string-equal
+	    (shadow-cluster-regexp (shadow-get-cluster cluster)) regexp))
+
+	  ;; Redefine the cluster.
+	  (setq primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary)
+		mocked-input `(,cluster ,primary ,regexp))
+	  (call-interactively 'shadow-define-cluster)
+	  (should
+	   (string-equal
+	    (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
+	  (should
+	   (string-equal
+	    (shadow-cluster-primary (shadow-get-cluster cluster)) primary))
+	  (should
+	   (string-equal
+	    (shadow-cluster-regexp (shadow-get-cluster cluster)) regexp))
+
+          ;; Test `shadow-set-cluster' and `make-shadow-cluster'.
+	  (shadow-set-cluster cluster primary regexp)
+	  (should
+	   (equal (shadow-get-cluster cluster)
+		  (make-shadow-cluster
+		   :name cluster :primary primary :regexp regexp))))
+
+      ;; Cleanup.
+      (with-current-buffer (messages-buffer) (widen))
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test01-sites ()
+  "Check site definitions.
+Per definition, all files are identical on the different hosts of
+a cluster (or site).  This is not tested here; it must be
+guaranteed by the originator of a cluster definition."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster1 cluster2 primary1 primary2 regexp1 regexp2 mocked-input)
+    (unwind-protect
+	;; We must mock `read-from-minibuffer' and `read-string', in
+	;; order to avoid interactive arguments.
+	(cl-letf* (((symbol-function 'read-from-minibuffer)
+		    (lambda (&rest args) (pop mocked-input)))
+		   ((symbol-function 'read-string)
+		    (lambda (&rest args) (pop mocked-input))))
+
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster1 "cluster1"
+		primary1 shadow-system-name
+		regexp1 (shadow-regexp-superquote primary1))
+	  (shadow-set-cluster cluster1 primary1 regexp1)
+
+	  ;; A site is either a cluster identification, or a primary host.
+          (should (string-equal cluster1 (shadow-site-name cluster1)))
+          (should (string-equal primary1 (shadow-name-site primary1)))
+          (should
+           (string-equal (format "/%s:" cluster1) (shadow-name-site cluster1)))
+          (should (string-equal (system-name) (shadow-site-name primary1)))
+          (should
+           (string-equal
+            (file-remote-p shadow-test-remote-temporary-file-directory)
+            (shadow-name-site
+             (file-remote-p shadow-test-remote-temporary-file-directory))))
+          (should
+           (string-equal
+            (file-remote-p shadow-test-remote-temporary-file-directory)
+            (shadow-site-name
+             (file-remote-p shadow-test-remote-temporary-file-directory))))
+
+          (should (equal (shadow-site-cluster cluster1)
+			 (shadow-get-cluster cluster1)))
+	  (should (equal (shadow-site-cluster (shadow-name-site cluster1))
+			 (shadow-get-cluster cluster1)))
+	  (should (equal (shadow-site-cluster primary1)
+			 (shadow-get-cluster cluster1)))
+	  (should (equal (shadow-site-cluster (shadow-site-name primary1))
+			 (shadow-get-cluster cluster1)))
+	  (should (string-equal (shadow-site-primary cluster1) primary1))
+	  (should (string-equal (shadow-site-primary primary1) primary1))
+
+          ;; `shadow-read-site' accepts "cluster", "/cluster:",
+          ;; "system", "/system:".  It shall reject bad site names.
+	  (setq mocked-input
+                `(,cluster1 ,(shadow-name-site cluster1)
+                  ,primary1 ,(shadow-site-name primary1)
+                  ,shadow-system-name "" "bad" "/bad:"))
+	  (should (string-equal (shadow-read-site) cluster1))
+	  (should (string-equal (shadow-read-site) (shadow-name-site cluster1)))
+	  (should (string-equal (shadow-read-site) primary1))
+	  (should (string-equal (shadow-read-site) (shadow-site-name primary1)))
+	  (should (string-equal (shadow-read-site) shadow-system-name))
+	  (should-not (shadow-read-site)) ; ""
+	  (should-not (shadow-read-site)) ; "bad"
+	  (should-not (shadow-read-site)) ; "/bad:"
+	  (should-error (shadow-read-site)) ; no input at all
+
+	  ;; Define a second cluster.
+          (setq cluster2 "cluster2"
+		primary2
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp2 (format "^\\(%s\\|%s\\)$" shadow-system-name primary2))
+	  (shadow-set-cluster cluster2 primary2 regexp2)
+
+          ;; `shadow-site-match' shall know all different kind of site names.
+          (should (shadow-site-match cluster1 cluster1))
+          (should (shadow-site-match primary1 primary1))
+          (should (shadow-site-match cluster1 primary1))
+          (should (shadow-site-match primary1 cluster1))
+          (should (shadow-site-match cluster2 cluster2))
+          (should (shadow-site-match primary2 primary2))
+          (should (shadow-site-match cluster2 primary2))
+          (should (shadow-site-match primary2 cluster2))
+
+          ;; The regexp of `cluster2' matches the primary of
+          ;; `cluster1'.  Not vice versa.
+          (should (shadow-site-match cluster2 cluster1))
+          (should-not (shadow-site-match cluster1 cluster2))
+
+          ;; If we use the primaries of a cluster, it doesn't match.
+          (should-not
+           (shadow-site-match (shadow-site-primary cluster2) cluster1))
+          (should-not
+           (shadow-site-match (shadow-site-primary cluster1) cluster2)))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test02-files ()
+  "Check file manipulation functions."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster primary regexp file hup)
+    (unwind-protect
+	(progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster "cluster"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary)
+                file (make-temp-name
+                      (expand-file-name
+                       "shadowfile-tests" temporary-file-directory)))
+	  (shadow-set-cluster cluster primary regexp)
+
+          ;; The constant structure to compare with.
+          (setq hup (make-tramp-file-name :host (system-name) :localname file))
+
+          ;; The structure a local file is transformed in.
+          (should (equal (shadow-parse-name file) hup))
+          (should (equal (shadow-parse-name (concat "/" cluster ":" file)) hup))
+          (should (equal (shadow-parse-name (concat primary file)) hup))
+
+          ;; A local file name is kept.
+          (should
+           (string-equal (shadow-local-file file) file))
+          ;; A file on this cluster is also local.
+          (should
+           (string-equal
+	    (shadow-local-file (concat "/" cluster ":" file)) file))
+          ;; A file on the primary host is also local.
+          (should
+           (string-equal (shadow-local-file (concat primary file)) file))
+
+	  ;; Redefine the cluster.
+	  (setq primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster primary regexp)
+
+          ;; The structure of the local file is still the same.
+          (should (equal (shadow-parse-name file) hup))
+          ;; The cluster name must be used.
+          (setf (tramp-file-name-host hup) cluster)
+          (should (equal (shadow-parse-name (concat "/" cluster ":" file)) hup))
+          ;; The structure of a remote file is different.
+          (should
+           (equal (shadow-parse-name (concat primary file))
+                  (tramp-dissect-file-name (concat primary file))))
+
+          ;; A local file is still local.
+          (should (shadow-local-file file))
+          ;; A file on this cluster is not local.
+          (should-not (shadow-local-file (concat "/" cluster ":" file)))
+          ;; A file on the primary host is not local.
+          (should-not (shadow-local-file (concat primary file)))
+	  ;; There's no error on wrong FILE.
+	  (should-not (shadow-local-file nil)))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test03-expand-cluster-in-file-name ()
+  "Check canonical file name of a cluster or site."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster primary regexp file1 file2)
+    (unwind-protect
+	(progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster "cluster"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster primary regexp)
+
+	  (setq file1
+		(make-temp-name
+		 (expand-file-name "shadowfile-tests" temporary-file-directory))
+		file2
+		(make-temp-name
+		 (expand-file-name
+		  "shadowfile-tests"
+		  shadow-test-remote-temporary-file-directory)))
+
+          ;; A local file name is kept.
+          (should
+           (string-equal (shadow-expand-cluster-in-file-name file1) file1))
+          ;; A remote file is kept.
+          (should
+           (string-equal (shadow-expand-cluster-in-file-name file2) file2))
+          ;; A cluster name is expanded to the primary name.
+          (should
+           (string-equal
+            (shadow-expand-cluster-in-file-name (format "/%s:%s" cluster file1))
+            (shadow-expand-cluster-in-file-name (concat primary file1))))
+          ;; A primary name is expanded if it is a local file name.
+          (should
+           (string-equal
+            (shadow-expand-cluster-in-file-name (concat primary file1)) file1))
+
+	  ;; Redefine the cluster.
+	  (setq primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster primary regexp)
+
+          ;; A cluster name is expanded to the primary name.
+          (should
+           (string-equal
+            (shadow-expand-cluster-in-file-name (format "/%s:%s" cluster file1))
+            (shadow-expand-cluster-in-file-name (concat primary file1))))
+          ;; A primary name is not expanded if it isn't is a local file name.
+          (should
+           (string-equal
+            (shadow-expand-cluster-in-file-name (concat primary file1))
+            (concat primary file1))))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test04-contract-file-name ()
+  "Check canonical file name of a cluster or site."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster primary regexp file)
+    (unwind-protect
+	(progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster "cluster"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary)
+                file (make-temp-name
+                      (expand-file-name
+                       "shadowfile-tests" temporary-file-directory)))
+	  (shadow-set-cluster cluster primary regexp)
+
+          ;; The cluster name is prepended for local files.
+          (should
+           (string-equal
+            (shadow-contract-file-name file) (concat "/cluster:" file)))
+          ;; A cluster file name is preserved.
+          (should
+           (string-equal
+            (shadow-contract-file-name (concat "/cluster:" file))
+            (concat "/cluster:" file)))
+          ;; `shadow-system-name' is mapped to the cluster.
+          (should
+           (string-equal
+            (shadow-contract-file-name (concat shadow-system-name file))
+            (concat "/cluster:" file)))
+
+	  ;; Redefine the cluster.
+	  (setq primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster primary regexp)
+
+          ;; A remote file name is mapped to the cluster.
+          (should
+           (string-equal
+            (shadow-contract-file-name
+             (concat
+              (file-remote-p shadow-test-remote-temporary-file-directory) file))
+            (concat "/cluster:" file))))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test05-file-match ()
+  "Check `shadow-same-site' and `shadow-file-match'."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters
+	cluster primary regexp file)
+    (unwind-protect
+	(progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define a cluster.
+	  (setq cluster "cluster"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary)
+                file (make-temp-name
+                      (expand-file-name
+                       "shadowfile-tests" temporary-file-directory)))
+	  (shadow-set-cluster cluster primary regexp)
+
+          (should (shadow-same-site (shadow-parse-name "/cluster:") file))
+          (should
+	   (shadow-same-site (shadow-parse-name shadow-system-name) file))
+          (should (shadow-same-site (shadow-parse-name file) file))
+
+          (should
+	   (shadow-file-match
+	    (shadow-parse-name (concat "/cluster:" file)) file))
+          (should
+	   (shadow-file-match
+	    (shadow-parse-name (concat shadow-system-name file)) file))
+          (should (shadow-file-match (shadow-parse-name file) file))
+
+	  ;; Redefine the cluster.
+	  (setq primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster primary regexp)
+
+          (should
+	   (shadow-file-match
+	    (shadow-parse-name
+	     (concat
+	      (file-remote-p shadow-test-remote-temporary-file-directory)
+	      file))
+	    file)))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test06-literal-groups ()
+  "Check literal group definitions."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters shadow-literal-groups
+	cluster1 cluster2 primary regexp file1 file2 mocked-input)
+    (unwind-protect
+	;; We must mock `read-from-minibuffer' and `read-string', in
+	;; order to avoid interactive arguments.
+	(cl-letf* (((symbol-function 'read-from-minibuffer)
+		    (lambda (&rest args) (pop mocked-input)))
+		   ((symbol-function 'read-string)
+		    (lambda (&rest args) (pop mocked-input))))
+
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define clusters.
+	  (setq cluster1 "cluster1"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster1 primary regexp)
+
+	  (setq cluster2 "cluster2"
+		primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (format "^\\(%s\\|%s\\)$" shadow-system-name primary))
+	  (shadow-set-cluster cluster2 primary regexp)
+
+	  ;; Define a literal group.
+	  (setq file1
+		(make-temp-name
+		 (expand-file-name "shadowfile-tests" temporary-file-directory))
+		file2
+		(make-temp-name
+		 (expand-file-name
+		  "shadowfile-tests"
+		  shadow-test-remote-temporary-file-directory))
+		mocked-input `(,cluster1 ,file1 ,cluster2 ,file2 ,(kbd "RET")))
+	  (with-temp-buffer
+            (set-visited-file-name file1)
+	    (call-interactively 'shadow-define-literal-group))
+
+          ;; `shadow-literal-groups' is a list of lists.
+          (should (consp shadow-literal-groups))
+          (should (consp (car shadow-literal-groups)))
+          (should-not (cdr shadow-literal-groups))
+
+	  (should (member (format "/%s:%s" cluster1 (file-local-name file1))
+                          (car shadow-literal-groups)))
+	  (should (member (format "/%s:%s" cluster2 (file-local-name file2))
+                          (car shadow-literal-groups))))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test07-regexp-groups ()
+  "Check regexp group definitions."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+
+  (let ((shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+	shadow-clusters shadow-regexp-groups
+	cluster1 cluster2 primary regexp file mocked-input)
+    (unwind-protect
+	;; We must mock `read-from-minibuffer' and `read-string', in
+	;; order to avoid interactive arguments.
+	(cl-letf* (((symbol-function 'read-from-minibuffer)
+		    (lambda (&rest args) (pop mocked-input)))
+		   ((symbol-function 'read-string)
+		    (lambda (&rest args) (pop mocked-input))))
+
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+	  ;; Define clusters.
+	  (setq cluster1 "cluster1"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster1 primary regexp)
+
+	  (setq cluster2 "cluster2"
+		primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (format "^\\(%s\\|%s\\)$" shadow-system-name primary))
+	  (shadow-set-cluster cluster2 primary regexp)
+
+	  ;; Define a regexp group.
+	  (setq file
+		(make-temp-name
+		 (expand-file-name "shadowfile-tests" temporary-file-directory))
+		mocked-input `(,(shadow-regexp-superquote file)
+                               ,cluster1 ,cluster2 ,(kbd "RET")))
+	  (with-temp-buffer
+            (set-visited-file-name nil)
+	    (call-interactively 'shadow-define-regexp-group))
+
+          ;; `shadow-regexp-groups' is a list of lists.
+          (should (consp shadow-regexp-groups))
+          (should (consp (car shadow-regexp-groups)))
+          (should-not (cdr shadow-regexp-groups))
+
+	  (should
+           (member
+            (concat
+             (shadow-site-primary cluster1) (shadow-regexp-superquote file))
+            (car shadow-regexp-groups)))
+	  (should
+           (member
+            (concat
+             (shadow-site-primary cluster2) (shadow-regexp-superquote file))
+            (car shadow-regexp-groups))))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file)))))
+
+(ert-deftest shadow-test08-shadow-todo ()
+  "Check that needed shadows are added to todo."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+  (skip-unless (file-writable-p shadow-test-remote-temporary-file-directory))
+
+  (let ((backup-inhibited t)
+        (shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+        (shadow-inhibit-message t)
+	shadow-clusters shadow-literal-groups shadow-regexp-groups
+        shadow-files-to-copy
+	cluster1 cluster2 primary regexp file)
+    (unwind-protect
+        (progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+
+          ;; Define clusters.
+	  (setq cluster1 "cluster1"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster1 primary regexp)
+
+	  (setq cluster2 "cluster2"
+		primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster2 primary regexp)
+
+	  ;; Define a literal group.
+	  (setq file
+		(make-temp-name
+		 (expand-file-name "shadowfile-tests" temporary-file-directory))
+                shadow-literal-groups
+                `((,(concat "/cluster1:" file) ,(concat "/cluster2:" file))))
+
+          ;; Save file from "cluster1" definition.
+          (with-temp-buffer
+            (set-visited-file-name file)
+            (insert "foo")
+            (save-buffer))
+	  (should
+           (member
+            (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
+            shadow-files-to-copy))
+
+          ;; Save file from "cluster2" definition.
+          (with-temp-buffer
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
+            (insert "foo")
+            (save-buffer))
+	  (should
+           (member
+            (cons
+             (concat (shadow-site-primary cluster2) file)
+             (shadow-contract-file-name (concat "/cluster1:" file)))
+            shadow-files-to-copy))
+
+	  ;; Define a regexp group.
+	  (setq shadow-files-to-copy nil
+                shadow-regexp-groups
+                `((,(concat (shadow-site-primary cluster1)
+                            (shadow-regexp-superquote file))
+                   ,(concat (shadow-site-primary cluster2)
+                            (shadow-regexp-superquote file)))))
+
+          ;; Save file from "cluster1" definition.
+          (with-temp-buffer
+            (set-visited-file-name file)
+            (insert "foo")
+            (save-buffer))
+	  (should
+           (member
+            (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
+            shadow-files-to-copy))
+
+          ;; Save file from "cluster2" definition.
+          (with-temp-buffer
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
+            (insert "foo")
+            (save-buffer))
+	  (should
+           (member
+            (cons
+             (concat (shadow-site-primary cluster2) file)
+             (shadow-contract-file-name (concat "/cluster1:" file)))
+            shadow-files-to-copy)))
+
+      ;; Cleanup.
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file))
+      (ignore-errors
+        (when (file-exists-p file)
+	  (delete-file file)))
+      (ignore-errors
+        (when (file-exists-p (concat (shadow-site-primary cluster2) file))
+	  (delete-file (concat (shadow-site-primary cluster2) file)))))))
+
+(ert-deftest shadow-test09-shadow-copy-files ()
+  "Check that needed shadow files are copied."
+  (skip-unless (not (memq system-type '(windows-nt ms-dos))))
+  (skip-unless (file-remote-p shadow-test-remote-temporary-file-directory))
+  (skip-unless (file-writable-p shadow-test-remote-temporary-file-directory))
+
+  (let ((backup-inhibited t)
+        (shadow-info-file shadow-test-info-file)
+	(shadow-todo-file shadow-test-todo-file)
+        (shadow-inhibit-message t)
+        (shadow-noquery t)
+        shadow-clusters shadow-files-to-copy
+	cluster1 cluster2 primary regexp file mocked-input)
+    (unwind-protect
+	(progn
+	  ;; Cleanup.
+	  (when (file-exists-p shadow-info-file)
+	    (delete-file shadow-info-file))
+	  (when (file-exists-p shadow-todo-file)
+	    (delete-file shadow-todo-file))
+          (when (buffer-live-p shadow-todo-buffer)
+            (with-current-buffer shadow-todo-buffer (erase-buffer)))
+
+          ;; Define clusters.
+	  (setq cluster1 "cluster1"
+		primary shadow-system-name
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster1 primary regexp)
+
+	  (setq cluster2 "cluster2"
+		primary
+		(file-remote-p shadow-test-remote-temporary-file-directory)
+		regexp (shadow-regexp-superquote primary))
+	  (shadow-set-cluster cluster2 primary regexp)
+
+	  ;; Define files to copy.
+	  (setq file
+		(make-temp-name
+		 (expand-file-name "shadowfile-tests" temporary-file-directory))
+                shadow-literal-groups
+                `((,(concat "/cluster1:" file) ,(concat "/cluster2:" file)))
+                shadow-regexp-groups
+                `((,(concat (shadow-site-primary cluster1)
+                            (shadow-regexp-superquote file))
+                   ,(concat (shadow-site-primary cluster2)
+                            (shadow-regexp-superquote file))))
+		mocked-input `(,(concat (shadow-site-primary cluster2) file)
+                               ,file))
+
+          ;; Save files.
+          (with-temp-buffer
+            (set-visited-file-name file)
+            (insert "foo")
+            (save-buffer))
+          (with-temp-buffer
+            (set-visited-file-name (concat (shadow-site-primary cluster2) file))
+            (insert "foo")
+            (save-buffer))
+
+	  ;; We must mock `write-region', in order to check proper
+	  ;; action.
+          (add-function
+           :before (symbol-function 'write-region)
+	   (lambda (&rest args)
+             (when (and (buffer-file-name) mocked-input)
+               (should (equal (buffer-file-name) (pop mocked-input)))))
+           '((name . "write-region-mock")))
+
+          ;; Copy the files.
+          (shadow-copy-files 'noquery)
+          (should-not shadow-files-to-copy)
+          (with-current-buffer shadow-todo-buffer
+            (goto-char (point-min))
+            (should
+             (looking-at (regexp-quote "(setq shadow-files-to-copy nil)")))))
+
+      ;; Cleanup.
+      (remove-function (symbol-function 'write-region) "write-region-mock")
+      (when (file-exists-p shadow-info-file)
+	(delete-file shadow-info-file))
+      (when (file-exists-p shadow-todo-file)
+	(delete-file shadow-todo-file))
+      (ignore-errors
+        (when (file-exists-p file)
+	  (delete-file file)))
+      (ignore-errors
+        (when (file-exists-p (concat (shadow-site-primary cluster2) file))
+	  (delete-file (concat (shadow-site-primary cluster2) file)))))))
+
+(defun shadowfile-test-all (&optional interactive)
+  "Run all tests for \\[shadowfile]."
+  (interactive "p")
+  (if interactive
+      (ert-run-tests-interactively "^shadowfile-")
+    (ert-run-tests-batch "^shadowfile-")))
+
+(let ((shadow-info-file shadow-test-info-file)
+      (shadow-todo-file shadow-test-todo-file))
+  (shadow-initialize))
+
+(provide 'shadowfile-tests)
+;;; shadowfile-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/shell-tests.el emacs-26.3+1/test/lisp/shell-tests.el
--- emacs-26.1+1/test/lisp/shell-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/shell-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; shell-tests.el  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/simple-tests.el emacs-26.3+1/test/lisp/simple-tests.el
--- emacs-26.1+1/test/lisp/simple-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/simple-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; simple-test.el --- Tests for simple.el           -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/sort-tests.el emacs-26.3+1/test/lisp/sort-tests.el
--- emacs-26.1+1/test/lisp/sort-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/sort-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sort-tests.el --- Tests for sort.el              -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 
diff -Nru emacs-26.1+1/test/lisp/soundex-tests.el emacs-26.3+1/test/lisp/soundex-tests.el
--- emacs-26.1+1/test/lisp/soundex-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/soundex-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; soundex-tests.el --- tests for soundex.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/test/lisp/subr-tests.el emacs-26.3+1/test/lisp/subr-tests.el
--- emacs-26.1+1/test/lisp/subr-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/subr-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; subr-tests.el --- Tests for subr.el
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>,
 ;;         Nicolas Petton <nicolas@petton.fr>
diff -Nru emacs-26.1+1/test/lisp/tar-mode-tests.el emacs-26.3+1/test/lisp/tar-mode-tests.el
--- emacs-26.1+1/test/lisp/tar-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/tar-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tar-mode-tests.el --- Test suite for tar-mode. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/term-tests.el emacs-26.3+1/test/lisp/term-tests.el
--- emacs-26.1+1/test/lisp/term-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/term-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; term-tests.el --- tests for term.el  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -124,6 +124,46 @@
                     40 12 (list "\eAnSiTc /f" "oo/\n") 'default-directory)
                    "/foo/"))))
 
+(ert-deftest term-to-margin ()
+  "Test cursor movement at the scroll margin.
+This is a reduced example from GNU nano's initial screen."
+  (let* ((width 10)
+         (x (make-string width ?x))
+         (y (make-string width ?y)))
+    (should (equal (term-test-screen-from-input
+                    width 3
+                    `("\e[1;3r"       ; Setup 3 line scrolling region.
+                      "\e[2;1H"       ; Move to 2nd last line.
+                      ,x              ; Fill with 'x'.
+                      "\r\e[1B"       ; Next line.
+                      ,y))            ; Fill with 'y'.
+                   (concat "\n" x "\n" y)))
+    ;; Same idea, but moving upwards.
+    (should (equal (term-test-screen-from-input
+                    width 3
+                    `("\e[1;3r" "\e[2;1H" ,x "\r\e[1A" ,y))
+                   (concat y "\n" x)))))
+
+(ert-deftest term-decode-partial () ;; Bug#25288.
+  "Test multibyte characters sent into multiple chunks."
+  ;; Set `locale-coding-system' so test will be deterministic.
+  (let* ((locale-coding-system 'utf-8-unix)
+         (string (make-string 7 ?ш))
+         (bytes (encode-coding-string string locale-coding-system)))
+    (should (equal string
+                   (term-test-screen-from-input
+                    40 1 `(,(substring bytes 0 (/ (length bytes) 2))
+                           ,(substring bytes (/ (length bytes) 2))))))))
+
+(ert-deftest term-undecodable-input () ;; Bug#29918.
+  "Undecodable bytes should be passed through without error."
+  (let* ((locale-coding-system 'utf-8-unix) ; As above.
+         (bytes "\376\340\360\370")
+         (string (decode-coding-string bytes locale-coding-system)))
+    (should (equal string
+                   (term-test-screen-from-input
+                    40 1 bytes)))))
+
 (provide 'term-tests)
 
 ;;; term-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/textmodes/css-mode-tests.el emacs-26.3+1/test/lisp/textmodes/css-mode-tests.el
--- emacs-26.1+1/test/lisp/textmodes/css-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/css-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; css-mode-tests.el --- Test suite for CSS mode  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords: internal
diff -Nru emacs-26.1+1/test/lisp/textmodes/dns-mode-tests.el emacs-26.3+1/test/lisp/textmodes/dns-mode-tests.el
--- emacs-26.1+1/test/lisp/textmodes/dns-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/dns-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; dns-mode-tests.el --- Test suite for dns-mode  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Peder O. Klingenberg <peder@klingenberg.no>
 ;; Keywords: dns zone
diff -Nru emacs-26.1+1/test/lisp/textmodes/mhtml-mode-tests.el emacs-26.3+1/test/lisp/textmodes/mhtml-mode-tests.el
--- emacs-26.1+1/test/lisp/textmodes/mhtml-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/mhtml-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; mhtml-mode-tests.el --- Tests for mhtml-mode
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Keywords: tests
 
diff -Nru emacs-26.1+1/test/lisp/textmodes/reftex-tests.el emacs-26.3+1/test/lisp/textmodes/reftex-tests.el
--- emacs-26.1+1/test/lisp/textmodes/reftex-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/reftex-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-tests.el --- Test suite for reftex. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/lisp/textmodes/sgml-mode-tests.el emacs-26.3+1/test/lisp/textmodes/sgml-mode-tests.el
--- emacs-26.1+1/test/lisp/textmodes/sgml-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/sgml-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; sgml-mode-tests.el --- Tests for sgml-mode
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Przemysław Wojnowski <esperanto@cumego.com>
 ;; Keywords: tests
@@ -125,11 +125,32 @@
      (should (string= content (buffer-string))))))
 
 (ert-deftest sgml-delete-tag-bug-8203-should-not-delete-apostrophe ()
-  :expected-result :failed
   (sgml-with-content
    "<title>Winter is comin'"
    (sgml-delete-tag 1)
    (should (string= "Winter is comin'" (buffer-string)))))
 
+(ert-deftest sgml-tests--quotes-syntax ()
+  (dolist (str '("a\"b c'd"
+                 "a'b c\"d"
+                 "\"a'"
+                 "'a\""
+                 "\"a'\""
+                 "'a\"'"
+                 "a\"b c'd"
+                 ;;"c>'d" Fixed in master.
+                 ""
+                 ""
+                 "(')"
+                 "(\")"
+                 ))
+   (with-temp-buffer
+     (sgml-mode)
+     (insert str)
+     (ert-info ((format "%S" str) :prefix "Test case: ")
+       ;; Check that last tag is parsed as a tag.
+       (should (= 1 (car (syntax-ppss (1- (point-max))))))
+       (should (= 0 (car (syntax-ppss (point-max)))))))))
+
 (provide 'sgml-mode-tests)
 ;;; sgml-mode-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/textmodes/tildify-tests.el emacs-26.3+1/test/lisp/textmodes/tildify-tests.el
--- emacs-26.1+1/test/lisp/textmodes/tildify-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/textmodes/tildify-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; tildify-test.el --- ERT tests for tildify.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author:     Michal Nazarewicz 
 ;; Version:    4.5
diff -Nru emacs-26.1+1/test/lisp/thingatpt-tests.el emacs-26.3+1/test/lisp/thingatpt-tests.el
--- emacs-26.1+1/test/lisp/thingatpt-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/thingatpt-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; thingatpt.el --- tests for thing-at-point.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -20,6 +20,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'thingatpt)
 
 (defvar thing-at-point-test-data
   '(("https://1.gnu.org" 1  url "https://1.gnu.org")
@@ -84,41 +85,43 @@
       (goto-char (nth 1 test))
       (should (equal (thing-at-point (nth 2 test)) (nth 3 test))))))
 
-;; These tests reflect the actual behavior of
-;; `thing-at-point-bounds-of-list-at-point'.
-(ert-deftest thing-at-point-bug24627 ()
-  "Test for https://debbugs.gnu.org/24627 ."
-  (let ((string-result '(("(a \"b\" c)" . (a "b" c))
-                         (";(a \"b\" c)")
-                         ("(a \"b\" c\n)" . (a "b" c))
-                         ("\"(a b c)\"")
-                         ("(a ;(b c d)\ne)" . (a e))
-                         ("(foo\n(a ;(b c d)\ne) bar)" . (a e))
-                         ("(foo\na ;(b c d)\ne bar)" . (foo a e bar))
-                         ("(foo\n(a \"(b c d)\"\ne) bar)" . (a "(b c d)" e))
-                         ("(b\n(a ;(foo c d)\ne) bar)" . (a e))
-                         ("(princ \"(a b c)\")" . (princ "(a b c)"))
-                         ("(defun foo ()\n  \"Test function.\"\n  ;;(a b)\n  nil)" . (defun foo nil "Test function." nil))))
-        (file
-         (expand-file-name "lisp/thingatpt.el" source-directory))
-        buf)
-    ;; Test for `thing-at-point'.
-    (when (file-exists-p file)
-      (unwind-protect
-          (progn
-            (setq buf (find-file file))
-            (goto-char (point-max))
-            (forward-line -1)
-            (should-not (thing-at-point 'list)))
-        (kill-buffer buf)))
-    ;; Tests for `list-at-point'.
-    (dolist (str-res string-result)
-      (with-temp-buffer
-        (emacs-lisp-mode)
-        (insert (car str-res))
-        (re-search-backward "\\((a\\|^a\\)")
-        (should (equal (list-at-point)
-                       (cdr str-res)))))))
+;; See bug#24627 and bug#31772.
+(ert-deftest thing-at-point-bounds-of-list-at-point ()
+  (cl-macrolet ((with-test-buffer (str &rest body)
+                  `(with-temp-buffer
+                     (emacs-lisp-mode)
+                     (insert ,str)
+                     (search-backward "|")
+                     (delete-char 1)
+                     ,@body)))
+    (let ((tests1
+           '(("|(a \"b\" c)" (a "b" c))
+             (";|(a \"b\" c)" (a "b" c) nil)
+             ("|(a \"b\" c\n)" (a "b" c))
+             ("\"|(a b c)\"" (a b c) nil)
+             ("|(a ;(b c d)\ne)" (a e))
+             ("(foo\n|(a ;(b c d)\ne) bar)" (foo (a e) bar))
+             ("(foo\n|a ;(b c d)\ne bar)" (foo a e bar))
+             ("(foo\n|(a \"(b c d)\"\ne) bar)" (foo (a "(b c d)" e) bar))
+             ("(b\n|(a ;(foo c d)\ne) bar)" (b (a e) bar))
+             ("(princ \"|(a b c)\")" (a b c) (princ "(a b c)"))
+             ("(defun foo ()\n  \"Test function.\"\n  ;;|(a b)\n  nil)"
+              (defun foo nil "Test function." nil)
+              (defun foo nil "Test function." nil))))
+          (tests2
+           '(("|list-at-point" . "list-at-point")
+             ("list-|at-point" . "list-at-point")
+             ("list-at-point|" . nil)
+             ("|(a b c)" . "(a b c)")
+             ("(a b c)|" . nil))))
+      (dolist (test tests1)
+        (with-test-buffer (car test)
+          (should (equal (list-at-point) (cl-second test)))
+          (when (cddr test)
+            (should (equal (list-at-point t) (cl-third test))))))
+      (dolist (test tests2)
+        (with-test-buffer (car test)
+          (should (equal (thing-at-point 'list) (cdr test))))))))
 
 (ert-deftest thing-at-point-url-in-comment ()
   (with-temp-buffer
@@ -129,4 +132,15 @@
     (goto-char 23)
     (should (equal (thing-at-point 'url) "http://foo/bar(baz)"))))
 
+(ert-deftest thing-at-point-looking-at ()
+  (with-temp-buffer
+    (insert "1abcd 2abcd 3abcd")
+    (goto-char (point-min))
+    (let ((m2 (progn (search-forward "2abcd")
+                     (match-data))))
+      (goto-char (point-min))
+      (search-forward "2ab")
+      (should (thing-at-point-looking-at "2abcd"))
+      (should (equal (match-data) m2)))))
+
 ;;; thingatpt.el ends here
diff -Nru emacs-26.1+1/test/lisp/url/url-auth-tests.el emacs-26.3+1/test/lisp/url/url-auth-tests.el
--- emacs-26.1+1/test/lisp/url/url-auth-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-auth-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-auth-tests.el --- Test suite for url-auth.
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Jarno Malmari 
 
diff -Nru emacs-26.1+1/test/lisp/url/url-expand-tests.el emacs-26.3+1/test/lisp/url/url-expand-tests.el
--- emacs-26.1+1/test/lisp/url/url-expand-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-expand-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-expand-tests.el --- Test suite for relative URI/URL resolution.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Alain Schneble 
 ;; Version: 1.0
diff -Nru emacs-26.1+1/test/lisp/url/url-file-tests.el emacs-26.3+1/test/lisp/url/url-file-tests.el
--- emacs-26.1+1/test/lisp/url/url-file-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-file-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-file-tests.el --- Test suite for url-file. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -33,11 +33,12 @@
   "Directory for url-file test files.")
 
 (ert-deftest url-file ()
-  "Test reading file via file:// URL."
-  (let ((file (expand-file-name "file.txt" url-file-tests-data-directory)))
+  "Test reading file via file:/// URL."
+  (let* ((file (expand-file-name "file.txt" url-file-tests-data-directory))
+         (uri-prefix (if (eq (aref file 0) ?/) "file://" "file:///")))
     (should (equal
              (with-current-buffer
-                 (url-file (url-generic-parse-url (concat "file://" file))
+                 (url-file (url-generic-parse-url (concat uri-prefix file))
                            #'ignore nil)
                (prog1 (buffer-substring (point) (point-max))
                  (kill-buffer)))
diff -Nru emacs-26.1+1/test/lisp/url/url-future-tests.el emacs-26.3+1/test/lisp/url/url-future-tests.el
--- emacs-26.1+1/test/lisp/url/url-future-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-future-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-future-tests.el --- Test suite for url-future.
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov 
 ;; Keywords: data
diff -Nru emacs-26.1+1/test/lisp/url/url-misc-tests.el emacs-26.3+1/test/lisp/url/url-misc-tests.el
--- emacs-26.1+1/test/lisp/url/url-misc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-misc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-misc-tests.el --- Test suite for url-misc. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/url/url-parse-tests.el emacs-26.3+1/test/lisp/url/url-parse-tests.el
--- emacs-26.1+1/test/lisp/url/url-parse-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-parse-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-parse-tests.el --- Test suite for URI/URL parsing.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Alain Schneble 
 ;; Version: 1.0
diff -Nru emacs-26.1+1/test/lisp/url/url-tramp-tests.el emacs-26.3+1/test/lisp/url/url-tramp-tests.el
--- emacs-26.1+1/test/lisp/url/url-tramp-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-tramp-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-tramp-tests.el --- Test suite for Tramp / URL conversion.
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus 
 
diff -Nru emacs-26.1+1/test/lisp/url/url-util-tests.el emacs-26.3+1/test/lisp/url/url-util-tests.el
--- emacs-26.1+1/test/lisp/url/url-util-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/url/url-util-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; url-util-tests.el --- Test suite for url-util.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov 
 ;; Keywords: data
diff -Nru emacs-26.1+1/test/lisp/vc/add-log-tests.el emacs-26.3+1/test/lisp/vc/add-log-tests.el
--- emacs-26.1+1/test/lisp/vc/add-log-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/add-log-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; add-log-tests.el --- Test suite for add-log.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO 
 ;; Keywords: vc tools
diff -Nru emacs-26.1+1/test/lisp/vc/diff-mode-tests.el emacs-26.3+1/test/lisp/vc/diff-mode-tests.el
--- emacs-26.1+1/test/lisp/vc/diff-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/diff-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Dima Kogan 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/vc/ediff-diff-tests.el emacs-26.3+1/test/lisp/vc/ediff-diff-tests.el
--- emacs-26.1+1/test/lisp/vc/ediff-diff-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/ediff-diff-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-diff-tests.el --- Unit tests for ediff-diff.el  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani 
 
diff -Nru emacs-26.1+1/test/lisp/vc/ediff-ptch-tests.el emacs-26.3+1/test/lisp/vc/ediff-ptch-tests.el
--- emacs-26.1+1/test/lisp/vc/ediff-ptch-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/ediff-ptch-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ediff-ptch-tests.el --- Tests for ediff-ptch.el
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Tino Calancha 
 
diff -Nru emacs-26.1+1/test/lisp/vc/smerge-mode-tests.el emacs-26.3+1/test/lisp/vc/smerge-mode-tests.el
--- emacs-26.1+1/test/lisp/vc/smerge-mode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/smerge-mode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/test/lisp/vc/vc-bzr-tests.el emacs-26.3+1/test/lisp/vc/vc-bzr-tests.el
--- emacs-26.1+1/test/lisp/vc/vc-bzr-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/vc-bzr-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-bzr.el --- tests for vc/vc-bzr.el
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris 
 ;; Maintainer: emacs-devel@gnu.org
@@ -112,6 +112,9 @@
 (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
   "Test we can generate autoloads in a bzr directory when bzr is faulty."
   (skip-unless (executable-find vc-bzr-program))
+  ;; Avoid vc-mode-line bug;
+  ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html
+  (skip-unless (not (eq 0 (user-real-uid))))
   (let* ((homedir (make-temp-file "vc-bzr-test" t))
          (bzrdir (expand-file-name "bzr" homedir))
          (file (progn
diff -Nru emacs-26.1+1/test/lisp/vc/vc-hg-tests.el emacs-26.3+1/test/lisp/vc/vc-hg-tests.el
--- emacs-26.1+1/test/lisp/vc/vc-hg-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/vc-hg-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-hg-tests.el --- tests for vc/vc-hg.el
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Dmitry Gutov 
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/lisp/vc/vc-tests.el emacs-26.3+1/test/lisp/vc/vc-tests.el
--- emacs-26.1+1/test/lisp/vc/vc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/vc/vc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; vc-tests.el --- Tests of different backends of vc.el
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus 
 
diff -Nru emacs-26.1+1/test/lisp/wdired-tests.el emacs-26.3+1/test/lisp/wdired-tests.el
--- emacs-26.1+1/test/lisp/wdired-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/lisp/wdired-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,133 @@
+;;; wdired-tests.el --- tests for wdired.el          -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see .
+
+;;; Code:
+
+(require 'ert)
+(require 'dired)
+(require 'wdired)
+
+(defvar dired-query)                    ; Pacify byte compiler.
+
+(ert-deftest wdired-test-bug32173-01 ()
+  "Test using non-nil wdired-use-interactive-rename.
+Partially modifying a file name should succeed."
+  (let* ((test-dir (make-temp-file "test-dir-" t))
+	 (test-file (concat (file-name-as-directory test-dir) "foo.c"))
+	 (replace "bar")
+	 (new-file (replace-regexp-in-string "foo" replace test-file))
+	 (wdired-use-interactive-rename t))
+    (write-region "" nil test-file nil 'silent)
+    (advice-add 'dired-query ; Don't ask confirmation to overwrite a file.
+                :override
+                (lambda (_sym _prompt &rest _args) (setq dired-query t))
+                '((name . "advice-dired-query")))
+    (let ((buf (find-file-noselect test-dir)))
+      (unwind-protect
+	  (with-current-buffer buf
+	    (should (equal (dired-file-name-at-point) test-file))
+	    (dired-toggle-read-only)
+	    (kill-region (point) (progn (search-forward ".")
+					(forward-char -1) (point)))
+	    (insert replace)
+	    (wdired-finish-edit)
+	    (should (equal (dired-file-name-at-point) new-file)))
+	(if buf (kill-buffer buf))
+	(delete-directory test-dir t)))))
+
+(ert-deftest wdired-test-bug32173-02 ()
+  "Test using non-nil wdired-use-interactive-rename.
+Aborting an edit should leaving original file name unchanged."
+  (let* ((test-dir (make-temp-file "test-dir-" t))
+	 (test-file (concat (file-name-as-directory test-dir) "foo.c"))
+	 (wdired-use-interactive-rename t))
+    (write-region "" nil test-file nil 'silent)
+    ;; Make dired-do-create-files-regexp a noop to mimic typing C-g
+    ;; at its prompt before wdired-finish-edit returns.
+    (advice-add 'dired-do-create-files-regexp
+                :override
+                (lambda (&rest _) (ignore))
+                '((name . "advice-dired-do-create-files-regexp")))
+    (let ((buf (find-file-noselect test-dir)))
+      (unwind-protect
+	  (with-current-buffer buf
+	    (should (equal (dired-file-name-at-point) test-file))
+	    (dired-toggle-read-only)
+	    (kill-region (point) (progn (search-forward ".")
+					(forward-char -1) (point)))
+	    (insert "bar")
+	    (wdired-finish-edit)
+	    (should (equal (dired-get-filename) test-file)))
+	(if buf (kill-buffer buf))
+	(delete-directory test-dir t)))))
+
+(ert-deftest wdired-test-symlink-name ()
+  "Test the file name of a symbolic link.
+The Dired and WDired functions returning the name should include
+only the name before the link arrow."
+  (let* ((test-dir (make-temp-file "test-dir-" t))
+         (link-name "foo"))
+    (let ((buf (find-file-noselect test-dir)))
+      (unwind-protect
+	  (with-current-buffer buf
+            (skip-unless
+             ;; This check is for wdired, not symbolic links, so skip
+             ;; it when make-symbolic-link fails for any reason (like
+             ;; insufficient privileges).
+             (ignore-errors (make-symbolic-link "./bar/baz" link-name) t))
+            (revert-buffer)
+            (let* ((file-name (dired-get-filename))
+                   (dir-part (file-name-directory file-name))
+                   (lf-name (concat dir-part link-name)))
+	      (should (equal file-name lf-name))
+	      (dired-toggle-read-only)
+	      (should (equal (wdired-get-filename) lf-name))
+	      (dired-toggle-read-only)))
+	(if buf (kill-buffer buf))
+	(delete-directory test-dir t)))))
+
+(ert-deftest wdired-test-unfinished-edit-01 ()
+  "Test editing a file name without saving the change.
+Finding the new name should be possible while still in
+wdired-mode."
+  :expected-result (if (< emacs-major-version 27) :failed :passed)
+  (let* ((test-dir (make-temp-file "test-dir-" t))
+	 (test-file (concat (file-name-as-directory test-dir) "foo.c"))
+	 (replace "bar")
+	 (new-file (replace-regexp-in-string "foo" replace test-file)))
+    (write-region "" nil test-file nil 'silent)
+    (let ((buf (find-file-noselect test-dir)))
+      (unwind-protect
+	  (with-current-buffer buf
+	    (should (equal (dired-file-name-at-point) test-file))
+	    (dired-toggle-read-only)
+	    (kill-region (point) (progn (search-forward ".")
+					(forward-char -1) (point)))
+	    (insert replace)
+	    (should (equal (dired-get-filename) new-file)))
+	(when buf
+	  (with-current-buffer buf
+            ;; Prevent kill-buffer-query-functions from chiming in.
+	    (set-buffer-modified-p nil)
+	    (kill-buffer buf)))
+	(delete-directory test-dir t)))))
+
+
+(provide 'wdired-tests)
+;;; wdired-tests.el ends here
diff -Nru emacs-26.1+1/test/lisp/whitespace-tests.el emacs-26.3+1/test/lisp/whitespace-tests.el
--- emacs-26.1+1/test/lisp/whitespace-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/whitespace-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; whitespace-tests.el --- Test suite for whitespace -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/lisp/xdg-tests.el emacs-26.3+1/test/lisp/xdg-tests.el
--- emacs-26.1+1/test/lisp/xdg-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/xdg-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xdg-tests.el --- tests for xdg.el -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Author: Mark Oteiza 
diff -Nru emacs-26.1+1/test/lisp/xml-tests.el emacs-26.3+1/test/lisp/xml-tests.el
--- emacs-26.1+1/test/lisp/xml-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/xml-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xml-parse-tests.el --- Test suite for XML parsing.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong 
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/lisp/xt-mouse-tests.el emacs-26.3+1/test/lisp/xt-mouse-tests.el
--- emacs-26.1+1/test/lisp/xt-mouse-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/lisp/xt-mouse-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; xt-mouse-tests.el --- Test suite for xt-mouse.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani 
 
diff -Nru emacs-26.1+1/test/Makefile.in emacs-26.3+1/test/Makefile.in
--- emacs-26.1+1/test/Makefile.in	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/Makefile.in	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2010-2018 Free Software Foundation, Inc.
+# Copyright (C) 2010-2019 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -81,7 +81,7 @@
 # Command line flags for Emacs.
 # Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
 # but we might as well be explicit.
-EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(EMACS_EXTRAOPT)
+EMACSOPT = --no-init-file --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(EMACS_EXTRAOPT)
 
 # Prevent any settings in the user environment causing problems.
 unexport EMACSDATA EMACSDOC EMACSPATH GREP_OPTIONS
@@ -94,6 +94,15 @@
 # supported everywhere.
 TEST_LOCALE = C
 
+# Set this to 'yes' to run the tests in an interactive instance.
+TEST_INTERACTIVE ?= no
+
+ifeq ($(TEST_INTERACTIVE),yes)
+TEST_RUN_ERT = --eval '(ert (quote ${SELECTOR_ACTUAL}))'
+else
+TEST_RUN_ERT = --batch --eval '(ert-run-tests-batch-and-exit (quote ${SELECTOR_ACTUAL}))' ${WRITE_LOG}
+endif
+
 # Whether to run tests from .el files in preference to .elc, we do
 # this by default since it gives nicer stacktraces.
 TEST_LOAD_EL ?= yes
@@ -120,15 +129,20 @@
  EMACS_TEST_DIRECTORY=$(abspath $(srcdir)) \
  $(GDB) "$(EMACS)" $(MODULES_EMACSOPT) $(EMACSOPT)
 
+# Set HOME to a nonexistent directory to prevent tests from accessing
+# it accidentally (e.g., popping up a gnupg dialog if ~/.authinfo.gpg
+# exists, or writing to ~/.bzr.log when running bzr commands).
+TEST_HOME = /nonexistent
+
 test_module_dir := $(srcdir)/data/emacs-module
 
 .PHONY: all check
 
 all: check
 
-SELECTOR_DEFAULT = (quote (not (or (tag :expensive-test) (tag :unstable))))
-SELECTOR_EXPENSIVE = (quote (not (tag :unstable)))
-SELECTOR_ALL = nil
+SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable)))
+SELECTOR_EXPENSIVE = (not (tag :unstable))
+SELECTOR_ALL = t
 ifdef SELECTOR
 SELECTOR_ACTUAL=$(SELECTOR)
 else ifndef MAKECMDGOALS
@@ -145,7 +159,7 @@
 
 ## Byte-compile all test files to test for errors.
 %.elc: %.el
-	$(AM_V_ELC)$(emacs) -f batch-byte-compile $<
+	$(AM_V_ELC)$(emacs) --batch -f batch-byte-compile $<
 
 ## Save logs, and show logs for failed tests.
 WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; }
@@ -158,9 +172,9 @@
 
 %.log: %.elc
 	$(AM_V_at)${MKDIR_P} $(dir $@)
-	$(AM_V_GEN)HOME=/nonexistent $(emacs) \
+	$(AM_V_GEN)HOME=$(TEST_HOME) $(emacs) \
 	  -l ert ${ert_opts} -l $(testloadfile) \
-	  --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
+	  $(TEST_RUN_ERT)
 
 ifeq (@HAVE_MODULES@, yes)
 maybe_exclude_module_tests :=
@@ -217,12 +231,14 @@
 FPIC_CFLAGS = -fPIC
 endif
 
-MODULE_CFLAGS = -I$(srcdir)/../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
+# Note: emacs-module.h is generated from emacs-module.h.in, hence we
+# look in ../src, not $(srcdir)/../src.
+MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
 
 test_module = $(test_module_dir)/mod-test${SO}
 src/emacs-module-tests.log: $(test_module)
-$(test_module): $(test_module:${SO}=.c) $(srcdir)/../src/emacs-module.h
+$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
 	$(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
 	  -o $@ $<
 endif
@@ -260,8 +276,15 @@
 ## We can't put LOGFILES as prerequisites, because that would stop the
 ## summarizing step from running when there is an error.
 check-doit:
+ifeq ($(TEST_INTERACTIVE), yes)
+	HOME=$(TEST_HOME) $(emacs) \
+	  -l ert ${ert_opts} \
+	  $(patsubst %,-l %,$(if $(findstring $(TEST_LOAD_EL),yes),$ELFILES,$(ELFILES:.el=)))  \
+	  $(TEST_RUN_ERT)
+else
 	-@${MAKE} -k  ${LOGFILES}
-	@$(emacs) -l ert -f ert-summarize-tests-batch-and-exit ${LOGFILES}
+	@$(emacs) --batch -l ert -f ert-summarize-tests-batch-and-exit ${LOGFILES}
+endif
 
 .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
 
diff -Nru emacs-26.1+1/test/manual/BidiCharacterTest.txt emacs-26.3+1/test/manual/BidiCharacterTest.txt
--- emacs-26.1+1/test/manual/BidiCharacterTest.txt	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/BidiCharacterTest.txt	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-# BidiCharacterTest-10.0.0.txt
-# Date: 2017-03-09, 00:30:00 GMT [LI]
-# © 2017 Unicode®, Inc.
+# BidiCharacterTest-11.0.0.txt
+# Date: 2018-02-18, 05:50:00 GMT [LI]
+# © 2018 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
diff -Nru emacs-26.1+1/test/manual/biditest.el emacs-26.3+1/test/manual/biditest.el
--- emacs-26.1+1/test/manual/biditest.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/biditest.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; biditest.el --- test bidi reordering in GNU Emacs display engine.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: emacs-devel@gnu.org
diff -Nru emacs-26.1+1/test/manual/cedet/cedet-utests.el emacs-26.3+1/test/manual/cedet/cedet-utests.el
--- emacs-26.1+1/test/manual/cedet/cedet-utests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/cedet-utests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/ede-tests.el emacs-26.3+1/test/manual/cedet/ede-tests.el
--- emacs-26.1+1/test/manual/cedet/ede-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/ede-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; ede-tests.el --- Some tests for the Emacs Development Environment
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/semantic-ia-utest.el emacs-26.3+1/test/manual/cedet/semantic-ia-utest.el
--- emacs-26.1+1/test/manual/cedet/semantic-ia-utest.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/semantic-ia-utest.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic-ia-utest.el --- Analyzer unit tests
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/semantic-tests.el emacs-26.3+1/test/manual/cedet/semantic-tests.el
--- emacs-26.1+1/test/manual/cedet/semantic-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/semantic-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Miscellaneous Semantic tests.
 
-;;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/semantic-utest-c.el emacs-26.3+1/test/manual/cedet/semantic-utest-c.el
--- emacs-26.1+1/test/manual/cedet/semantic-utest-c.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/semantic-utest-c.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic-utest-c.el --- C based parsing tests.
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/semantic-utest.el emacs-26.3+1/test/manual/cedet/semantic-utest.el
--- emacs-26.1+1/test/manual/cedet/semantic-utest.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/semantic-utest.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Tests for semantic's parsing system.
 
-;;; Copyright (C) 2003-2004, 2007-2018 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/srecode-tests.el emacs-26.3+1/test/manual/cedet/srecode-tests.el
--- emacs-26.1+1/test/manual/cedet/srecode-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/srecode-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; srecode-tests.el --- Some tests for CEDET's srecode
 
-;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/test.c emacs-26.3+1/test/manual/cedet/tests/test.c
--- emacs-26.1+1/test/manual/cedet/tests/test.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/test.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* test.c --- Semantic unit test for C.
 
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testdoublens.cpp emacs-26.3+1/test/manual/cedet/tests/testdoublens.cpp
--- emacs-26.1+1/test/manual/cedet/tests/testdoublens.cpp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testdoublens.cpp	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 // testdoublens.cpp --- semantic-ia-utest completion engine unit tests
 
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
+// Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testdoublens.hpp emacs-26.3+1/test/manual/cedet/tests/testdoublens.hpp
--- emacs-26.1+1/test/manual/cedet/tests/testdoublens.hpp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testdoublens.hpp	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 // testdoublens.hpp --- Header file used in one of the Semantic tests
 
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
+// Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/test.el emacs-26.3+1/test/manual/cedet/tests/test.el
--- emacs-26.1+1/test/manual/cedet/tests/test.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/test.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; test.el --- Unit test file for Semantic Emacs Lisp support.
 
-;; Copyright (C) 2005-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testjavacomp.java emacs-26.3+1/test/manual/cedet/tests/testjavacomp.java
--- emacs-26.1+1/test/manual/cedet/tests/testjavacomp.java	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testjavacomp.java	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 //  testjavacomp.java --- Semantic unit test for Java
 
-// Copyright (C) 2009-2018 Free Software Foundation, Inc.
+// Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 //  Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/test.make emacs-26.3+1/test/manual/cedet/tests/test.make
--- emacs-26.1+1/test/manual/cedet/tests/test.make	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/test.make	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 # test.make --- Semantic unit test for Make -*- makefile -*-
 
-# Copyright (C) 2001-2002, 2010-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2010-2019 Free Software Foundation, Inc.
 
 # Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testpolymorph.cpp emacs-26.3+1/test/manual/cedet/tests/testpolymorph.cpp
--- emacs-26.1+1/test/manual/cedet/tests/testpolymorph.cpp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testpolymorph.cpp	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /** testpolymorph.cpp --- A sequence of polymorphism examples.
  *
- * Copyright (C) 2009-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2009-2019 Free Software Foundation, Inc.
  *
  * Author: Eric M. Ludlam 
  *
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testspp.c emacs-26.3+1/test/manual/cedet/tests/testspp.c
--- emacs-26.1+1/test/manual/cedet/tests/testspp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testspp.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* testspp.cpp --- Semantic unit test for the C preprocessor
 
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testsppreplace.c emacs-26.3+1/test/manual/cedet/tests/testsppreplace.c
--- emacs-26.1+1/test/manual/cedet/tests/testsppreplace.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testsppreplace.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* testsppreplace.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testsppreplaced.c emacs-26.3+1/test/manual/cedet/tests/testsppreplaced.c
--- emacs-26.1+1/test/manual/cedet/tests/testsppreplaced.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testsppreplaced.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* testsppreplaced.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testsubclass.cpp emacs-26.3+1/test/manual/cedet/tests/testsubclass.cpp
--- emacs-26.1+1/test/manual/cedet/tests/testsubclass.cpp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testsubclass.cpp	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 // testsubclass.cpp --- unit test for analyzer and complex C++ inheritance
 
-// Copyright (C) 2007-2018 Free Software Foundation, Inc.
+// Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testsubclass.hh emacs-26.3+1/test/manual/cedet/tests/testsubclass.hh
--- emacs-26.1+1/test/manual/cedet/tests/testsubclass.hh	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testsubclass.hh	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 // testsubclass.hh --- unit test for analyzer and complex C++ inheritance
 
-// Copyright (C) 2007-2018 Free Software Foundation, Inc.
+// Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testtypedefs.cpp emacs-26.3+1/test/manual/cedet/tests/testtypedefs.cpp
--- emacs-26.1+1/test/manual/cedet/tests/testtypedefs.cpp	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testtypedefs.cpp	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 // testtypedefs.cpp --- Sample with some fake bits out of std::string
 
-// Copyright (C) 2008-2018 Free Software Foundation, Inc.
+// Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/cedet/tests/testvarnames.c emacs-26.3+1/test/manual/cedet/tests/testvarnames.c
--- emacs-26.1+1/test/manual/cedet/tests/testvarnames.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/cedet/tests/testvarnames.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* testvarnames.cpp
    Test variable and function names, lists of variables on one line, etc.
 
-   Copyright (C) 2008-2018 Free Software Foundation, Inc.
+   Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam 
 
diff -Nru emacs-26.1+1/test/manual/etags/c-src/abbrev.c emacs-26.3+1/test/manual/etags/c-src/abbrev.c
--- emacs-26.1+1/test/manual/etags/c-src/abbrev.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/abbrev.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Primitives for word-abbrev mode.
-   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2018 Free Software
+   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2019 Free Software
    Foundation, Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/test/manual/etags/c-src/emacs/src/gmalloc.c emacs-26.3+1/test/manual/etags/c-src/emacs/src/gmalloc.c
--- emacs-26.1+1/test/manual/etags/c-src/emacs/src/gmalloc.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/emacs/src/gmalloc.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for `malloc' and friends.
-   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2018 Free
+   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2019 Free
    Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
diff -Nru emacs-26.1+1/test/manual/etags/c-src/emacs/src/keyboard.c emacs-26.3+1/test/manual/etags/c-src/emacs/src/keyboard.c
--- emacs-26.1+1/test/manual/etags/c-src/emacs/src/keyboard.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/emacs/src/keyboard.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
 
-Copyright (C) 1985-1989, 1993-1997, 1999-2018 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1997, 1999-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/test/manual/etags/c-src/emacs/src/lisp.h emacs-26.3+1/test/manual/etags/c-src/emacs/src/lisp.h
--- emacs-26.1+1/test/manual/etags/c-src/emacs/src/lisp.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/emacs/src/lisp.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-2018 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1997-2019 Free Software Foundation,
 Inc.
 
 This file is part of GNU Emacs.
diff -Nru emacs-26.1+1/test/manual/etags/c-src/emacs/src/regex.h emacs-26.3+1/test/manual/etags/c-src/emacs/src/regex.h
--- emacs-26.1+1/test/manual/etags/c-src/emacs/src/regex.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/emacs/src/regex.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,7 +1,7 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989-1993, 1995, 2000-2018 Free Software
+   Copyright (C) 1985, 1989-1993, 1995, 2000-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/test/manual/etags/c-src/etags.c emacs-26.3+1/test/manual/etags/c-src/etags.c
--- emacs-26.1+1/test/manual/etags/c-src/etags.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/etags.c	2019-09-10 00:32:49.000000000 +0000
@@ -28,7 +28,7 @@
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2018 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2019 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff -Nru emacs-26.1+1/test/manual/etags/c-src/exit.c emacs-26.3+1/test/manual/etags/c-src/exit.c
--- emacs-26.1+1/test/manual/etags/c-src/exit.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/exit.c	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2019 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/test/manual/etags/c-src/exit.strange_suffix emacs-26.3+1/test/manual/etags/c-src/exit.strange_suffix
--- emacs-26.1+1/test/manual/etags/c-src/exit.strange_suffix	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/exit.strange_suffix	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2019 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/test/manual/etags/c-src/getopt.h emacs-26.3+1/test/manual/etags/c-src/getopt.h
--- emacs-26.1+1/test/manual/etags/c-src/getopt.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/getopt.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1992, 2016-2018 Free Software Foundation, Inc.
+   Copyright (C) 1989-1992, 2016-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff -Nru emacs-26.1+1/test/manual/etags/c-src/sysdep.h emacs-26.3+1/test/manual/etags/c-src/sysdep.h
--- emacs-26.1+1/test/manual/etags/c-src/sysdep.h	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/c-src/sysdep.h	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-1993, 2016-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1993, 2016-2019 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el emacs-26.3+1/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
--- emacs-26.1+1/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; etags.el --- etags facility for Emacs  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2018 Free
+;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2019 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Roland McGrath 
diff -Nru emacs-26.1+1/test/manual/etags/tex-src/texinfo.tex emacs-26.3+1/test/manual/etags/tex-src/texinfo.tex
--- emacs-26.1+1/test/manual/etags/tex-src/texinfo.tex	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/tex-src/texinfo.tex	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 %% TeX macros to handle texinfo files
 
-%   Copyright (C) 1985-1986, 1988, 1990-1991, 2016-2018 Free Software
+%   Copyright (C) 1985-1986, 1988, 1990-1991, 2016-2019 Free Software
 %   Foundation, Inc.
 
 %This texinfo.tex file is free software; you can redistribute it and/or
diff -Nru emacs-26.1+1/test/manual/etags/y-src/cccp.c emacs-26.3+1/test/manual/etags/y-src/cccp.c
--- emacs-26.1+1/test/manual/etags/y-src/cccp.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/y-src/cccp.c	2019-09-10 00:32:49.000000000 +0000
@@ -320,7 +320,7 @@
 #line 3 "/usr/share/bison/bison.simple"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2018 Free Software
+   Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2019 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff -Nru emacs-26.1+1/test/manual/etags/y-src/parse.c emacs-26.3+1/test/manual/etags/y-src/parse.c
--- emacs-26.1+1/test/manual/etags/y-src/parse.c	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/y-src/parse.c	2019-09-10 00:32:49.000000000 +0000
@@ -28,7 +28,7 @@
 
 #line 1 "y-src/parse.y"
 
-/*	Copyright (C) 1990, 1992-1993, 2016-2018 Free Software Foundation,
+/*	Copyright (C) 1990, 1992-1993, 2016-2019 Free Software Foundation,
  *	Inc.
 
 This file is part of Oleo, the GNU Spreadsheet.
diff -Nru emacs-26.1+1/test/manual/etags/y-src/parse.y emacs-26.3+1/test/manual/etags/y-src/parse.y
--- emacs-26.1+1/test/manual/etags/y-src/parse.y	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/etags/y-src/parse.y	2019-09-10 00:32:49.000000000 +0000
@@ -1,5 +1,5 @@
 %{
-/*	Copyright (C) 1990, 1992-1993, 2016-2018 Free Software Foundation,
+/*	Copyright (C) 1990, 1992-1993, 2016-2019 Free Software Foundation,
  *	Inc.
 
 This file is part of Oleo, the GNU Spreadsheet.
diff -Nru emacs-26.1+1/test/manual/image-size-tests.el emacs-26.3+1/test/manual/image-size-tests.el
--- emacs-26.1+1/test/manual/image-size-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/image-size-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; image-size-tests.el -- tests for image scaling
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/manual/indent/js.js emacs-26.3+1/test/manual/indent/js.js
--- emacs-26.1+1/test/manual/indent/js.js	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/indent/js.js	2019-09-10 00:32:49.000000000 +0000
@@ -144,6 +144,13 @@
   /abc/
 )
 
+// No infloop inside js--re-search-backward-inner
+let b = {
+  a : `
+  //1
+  `
+}
+
 // Local Variables:
 // indent-tabs-mode: nil
 // js-indent-level: 2
diff -Nru emacs-26.1+1/test/manual/indent/pascal.pas emacs-26.3+1/test/manual/indent/pascal.pas
--- emacs-26.1+1/test/manual/indent/pascal.pas	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/indent/pascal.pas	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
 
-Copyright (C) 1999-2006, 2013-2018 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013-2019 Free Software Foundation, Inc.
 
 Author: Frank Heckenbach 
 
diff -Nru emacs-26.1+1/test/manual/redisplay-testsuite.el emacs-26.3+1/test/manual/redisplay-testsuite.el
--- emacs-26.1+1/test/manual/redisplay-testsuite.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/redisplay-testsuite.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; redisplay-testsuite.el --- Test suite for redisplay.
 
-;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong 
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/manual/rmailmm.el emacs-26.3+1/test/manual/rmailmm.el
--- emacs-26.1+1/test/manual/rmailmm.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/rmailmm.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; rmailmm.el --- tests for mail/rmailmm.el
 
-;; Copyright (C) 2006-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/manual/scroll-tests.el emacs-26.3+1/test/manual/scroll-tests.el
--- emacs-26.1+1/test/manual/scroll-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/manual/scroll-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; scroll-tests.el -- tests for scrolling -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/README emacs-26.3+1/test/README
--- emacs-26.1+1/test/README	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/README	2019-09-10 00:32:49.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2018 Free Software Foundation, Inc.
+Copyright (C) 2008-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This directory contains files intended to test various aspects of
@@ -42,7 +42,10 @@
 
 If your test file contains the tests "test-foo", "test2-foo" and
 "test-foo-remote", and you want to run only the former two tests, you
-could use a selector regexp: "make  SELECTOR='\"foo$$\"'".
+could use a selector regexp (note that the "$" needs to be doubled to
+protect against "make" variable expansion):
+
+    make  SELECTOR='"foo$$"'
 
 Note that although the test files are always compiled (unless they set
 no-byte-compile), the source files will be run by default, to give
@@ -50,6 +53,21 @@
 
     make TEST_LOAD_EL=no ...
 
+The tests are run in batch mode by default; sometimes it's useful to
+get precisely the same environment but run in interactive mode for
+debugging.  To do that, use
+
+    make TEST_INTERACTIVE=yes ...
+
+Some of the tests require a remote temporary directory
+(filenotify-tests.el, shadowfile-tests.el and tramp-tests.el).  Per
+default, a mock-up connection method is used (this might not be
+possible when running on MS Windows).  If you want to test a real
+remote connection, set $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable
+value in order to overwrite the default value:
+
+  env REMOTE_TEMPORARY_FILE_DIRECTORY=/ssh:host:/tmp make ...
+
 
 (Also, see etc/compilation.txt for compilation mode font lock tests.)
 
diff -Nru emacs-26.1+1/test/src/alloc-tests.el emacs-26.3+1/test/src/alloc-tests.el
--- emacs-26.1+1/test/src/alloc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/alloc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; alloc-tests.el --- alloc tests -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Daniel Colascione 
 ;; Keywords:
diff -Nru emacs-26.1+1/test/src/buffer-tests.el emacs-26.3+1/test/src/buffer-tests.el
--- emacs-26.1+1/test/src/buffer-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/buffer-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; buffer-tests.el --- tests for buffer.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -45,6 +45,25 @@
             (should (eq buf (current-buffer))))
         (when msg-ov (delete-overlay msg-ov))))))
 
+(ert-deftest overlay-modification-hooks-deleted-overlay ()
+  "Test for bug#30823."
+  (let ((check-point nil)
+	(ov-delete nil)
+	(ov-set nil))
+    (with-temp-buffer
+      (insert "abc")
+      (setq ov-set (make-overlay 1 3))
+      (overlay-put ov-set 'modification-hooks
+		   (list (lambda (_o after &rest _args)
+			   (and after (setq check-point t)))))
+      (setq ov-delete (make-overlay 1 3))
+      (overlay-put ov-delete 'modification-hooks
+		   (list (lambda (o after &rest _args)
+			   (and (not after) (delete-overlay o)))))
+      (goto-char 2)
+      (insert "1")
+      (should (eq check-point t)))))
+
 (ert-deftest test-generate-new-buffer-name-bug27966 ()
   (should-not (string-equal "nil"
                             (progn (get-buffer-create "nil")
diff -Nru emacs-26.1+1/test/src/callproc-tests.el emacs-26.3+1/test/src/callproc-tests.el
--- emacs-26.1+1/test/src/callproc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/callproc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; callproc-tests.el --- callproc.c tests -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/casefiddle-tests.el emacs-26.3+1/test/src/casefiddle-tests.el
--- emacs-26.1+1/test/src/casefiddle-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/casefiddle-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; casefiddle-tests.el --- tests for casefiddle.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2016, 2018-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/charset-tests.el emacs-26.3+1/test/src/charset-tests.el
--- emacs-26.1+1/test/src/charset-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/charset-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; charset-tests.el --- Tests for charset.c
 
-;; Copyright 2017-2018 Free Software Foundation, Inc.
+;; Copyright 2017-2019 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
diff -Nru emacs-26.1+1/test/src/chartab-tests.el emacs-26.3+1/test/src/chartab-tests.el
--- emacs-26.1+1/test/src/chartab-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/chartab-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; chartab-tests.el --- Tests for char-tab.c
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii 
 
diff -Nru emacs-26.1+1/test/src/cmds-tests.el emacs-26.3+1/test/src/cmds-tests.el
--- emacs-26.1+1/test/src/cmds-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/cmds-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; cmds-tests.el --- Testing some Emacs commands
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Richard 
 ;; Keywords:
diff -Nru emacs-26.1+1/test/src/coding-tests.el emacs-26.3+1/test/src/coding-tests.el
--- emacs-26.1+1/test/src/coding-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/coding-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; coding-tests.el --- tests for text encoding and decoding
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii 
 ;; Author: Kenichi Handa 
diff -Nru emacs-26.1+1/test/src/data-tests.el emacs-26.3+1/test/src/data-tests.el
--- emacs-26.1+1/test/src/data-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/data-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
-;;; data-tests.el --- tests for src/data.c
+;;; data-tests.el --- tests for src/data.c  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -23,13 +23,21 @@
 
 (require 'cl-lib)
 
+(defconst data-tests--float-greater-than-fixnums (+ 1.0 most-positive-fixnum)
+  "A floating-point value that is greater than all fixnums.
+It is also as small as conveniently possible, to make the tests sharper.
+Adding 1.0 to most-positive-fixnum should suffice on all
+practical Emacs platforms, since the result is a power of 2 and
+this is exactly representable and is greater than
+most-positive-fixnum, which is just less than a power of 2.")
+
 (ert-deftest data-tests-= ()
   (should-error (=))
   (should (= 1))
   (should (= 2 2))
   (should (= 9 9 9 9 9 9 9 9 9))
   (should (= most-negative-fixnum (float most-negative-fixnum)))
-  (should-not (= most-positive-fixnum (+ 1.0 most-positive-fixnum)))
+  (should-not (= most-positive-fixnum data-tests--float-greater-than-fixnums))
   (should-not (apply #'= '(3 8 3)))
   (should-error (= 9 9 'foo))
   ;; Short circuits before getting to bad arg
@@ -40,7 +48,7 @@
   (should (< 1))
   (should (< 2 3))
   (should (< -6 -1 0 2 3 4 8 9 999))
-  (should (< 0.5 most-positive-fixnum (+ 1.0 most-positive-fixnum)))
+  (should (< 0.5 most-positive-fixnum data-tests--float-greater-than-fixnums))
   (should-not (apply #'< '(3 8 3)))
   (should-error (< 9 10 'foo))
   ;; Short circuits before getting to bad arg
@@ -51,7 +59,7 @@
   (should (> 1))
   (should (> 3 2))
   (should (> 6 1 0 -2 -3 -4 -8 -9 -999))
-  (should (> (+ 1.0 most-positive-fixnum) most-positive-fixnum 0.5))
+  (should (> data-tests--float-greater-than-fixnums most-positive-fixnum 0.5))
   (should-not (apply #'> '(3 8 3)))
   (should-error (> 9 8 'foo))
   ;; Short circuits before getting to bad arg
@@ -62,7 +70,7 @@
   (should (<= 1))
   (should (<= 2 3))
   (should (<= -6 -1 -1 0 0 0 2 3 4 8 999))
-  (should (<= 0.5 most-positive-fixnum (+ 1.0 most-positive-fixnum)))
+  (should (<= 0.5 most-positive-fixnum data-tests--float-greater-than-fixnums))
   (should-not (apply #'<= '(3 8 3 3)))
   (should-error (<= 9 10 'foo))
   ;; Short circuits before getting to bad arg
@@ -73,7 +81,7 @@
   (should (>= 1))
   (should (>= 3 2))
   (should (>= 666 1 0 0 -2 -3 -3 -3 -4 -8 -8 -9 -999))
-  (should (>= (+ 1.0 most-positive-fixnum) most-positive-fixnum))
+  (should (>= data-tests--float-greater-than-fixnums most-positive-fixnum))
   (should-not (apply #'>= '(3 8 3)))
   (should-error (>= 9 8 'foo))
   ;; Short circuits before getting to bad arg
@@ -97,7 +105,7 @@
   (should (= 2 (min 3 2)))
   (should (= -999 (min 666 1 0 0 -2 -3 -3 -3 -4 -8 -8 -9 -999)))
   (should (= most-positive-fixnum
-             (min (+ 1.0 most-positive-fixnum) most-positive-fixnum)))
+             (min data-tests--float-greater-than-fixnums most-positive-fixnum)))
   (should (= 3 (apply #'min '(3 8 3))))
   (should-error (min 9 8 'foo))
   (should-error (min (make-marker)))
@@ -484,3 +492,38 @@
       (remove-variable-watcher 'data-tests-lvar collect-watch-data)
       (setq data-tests-lvar 6)
       (should (null watch-data)))))
+
+(ert-deftest data-tests-kill-all-local-variables () ;bug#30846
+  (with-temp-buffer
+    (setq-local data-tests-foo1 1)
+    (setq-local data-tests-foo2 2)
+    (setq-local data-tests-foo3 3)
+    (let ((oldfoo2 nil))
+      (add-variable-watcher 'data-tests-foo2
+                            (lambda (&rest _)
+                              (setq oldfoo2 (bound-and-true-p data-tests-foo2))))
+      (kill-all-local-variables)
+      (should (equal oldfoo2 '2)) ;Watcher is run before changing the var.
+      (should (not (or (bound-and-true-p data-tests-foo1)
+                       (bound-and-true-p data-tests-foo2)
+                       (bound-and-true-p data-tests-foo3)))))))
+
+(ert-deftest data-tests-make-local-forwarded-var () ;bug#34318
+  ;; Boy, this bug is tricky to trigger.  You need to:
+  ;; - call make-local-variable on a forwarded var (i.e. one that
+  ;;   has a corresponding C var linked via DEFVAR_(LISP|INT|BOOL))
+  ;; - cause the C code to modify this variable from the C side of the
+  ;;   forwarding, but this needs to happen before the var is accessed
+  ;;   from the Lisp side and before we switch to another buffer.
+  ;; The trigger in bug#34318 doesn't exist any more because the C code has
+  ;; changes.  Instead I found the trigger below.
+  (with-temp-buffer
+    (setq last-coding-system-used 'bug34318)
+    (make-local-variable 'last-coding-system-used)
+    ;; This should set last-coding-system-used to `no-conversion'.
+    (decode-coding-string "hello" nil)
+    (should (equal (list last-coding-system-used
+                         (default-value 'last-coding-system-used))
+                   '(no-conversion bug34318)))))
+
+;;; data-tests.el ends here
diff -Nru emacs-26.1+1/test/src/decompress-tests.el emacs-26.3+1/test/src/decompress-tests.el
--- emacs-26.1+1/test/src/decompress-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/decompress-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; decompress-tests.el --- Test suite for decompress.
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; Author: Lars Ingebrigtsen 
 
diff -Nru emacs-26.1+1/test/src/doc-tests.el emacs-26.3+1/test/src/doc-tests.el
--- emacs-26.1+1/test/src/doc-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/doc-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; doc-tests.el --- Tests for doc.c
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii 
 
diff -Nru emacs-26.1+1/test/src/editfns-tests.el emacs-26.3+1/test/src/editfns-tests.el
--- emacs-26.1+1/test/src/editfns-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/editfns-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; editfns-tests.el -- tests for editfns.c
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -88,7 +88,21 @@
            (format "%-10s" (concat (propertize "01" 'face 'bold)
                                    (propertize "23" 'face 'underline)
                                    (propertize "45" 'face 'italic)))
-           #("012345    " 0 2 (face bold) 2 4 (face underline) 4 10 (face italic)))))
+           #("012345    "
+             0 2 (face bold) 2 4 (face underline) 4 10 (face italic))))
+  ;; Bug #32404
+  (should (ert-equal-including-properties
+           (format (concat (propertize "%s" 'face 'bold)
+                           ""
+                           (propertize "%s" 'face 'error))
+                   "foo" "bar")
+           #("foobar" 0 3 (face bold) 3 6 (face error))))
+  (should (ert-equal-including-properties
+           (format (concat "%s" (propertize "%s" 'face 'error)) "foo" "bar")
+           #("foobar" 3 6 (face error))))
+  (should (ert-equal-including-properties
+           (format (concat "%s " (propertize "%s" 'face 'error)) "foo" "bar")
+           #("foo bar" 4 7 (face error)))))
 
 ;; Tests for bug#5131.
 (defun transpose-test-reverse-word (start end)
@@ -247,4 +261,66 @@
                  (buffer-string)
                  "foo bar baz qux"))))))
 
+(ert-deftest replace-buffer-contents-bug31837 ()
+  (switch-to-buffer "a")
+  (insert-char (char-from-name "SMILE"))
+  (insert "1234")
+  (switch-to-buffer "b")
+  (insert-char (char-from-name "SMILE"))
+  (insert "5678")
+  (replace-buffer-contents "a")
+  (should (equal (buffer-substring-no-properties (point-min) (point-max))
+                 (concat (string (char-from-name "SMILE")) "1234"))))
+
+(ert-deftest delete-region-undo-markers-1 ()
+  "Make sure we don't end up with freed markers reachable from Lisp."
+  ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30931#40
+  (with-temp-buffer
+    (insert "1234567890")
+    (setq buffer-undo-list nil)
+    (narrow-to-region 2 5)
+    ;; `save-restriction' in a narrowed buffer creates two markers
+    ;; representing the current restriction.
+    (save-restriction
+      (widen)
+      ;; Any markers *within* the deleted region are put onto the undo
+      ;; list.
+      (delete-region 1 6))
+    ;; (princ (format "%S" buffer-undo-list) #'external-debugging-output)
+    ;; `buffer-undo-list' is now
+    ;; (("12345" . 1) (# . -1) (# . 1))
+    ;;
+    ;; If temp-marker1 or temp-marker2 are freed prematurely, calling
+    ;; `type-of' on them will cause Emacs to abort.  Calling
+    ;; `garbage-collect' will also abort if it finds any reachable
+    ;; freed objects.
+    (should (eq (type-of (car (nth 1 buffer-undo-list))) 'marker))
+    (should (eq (type-of (car (nth 2 buffer-undo-list))) 'marker))
+    (garbage-collect)))
+
+(ert-deftest delete-region-undo-markers-2 ()
+  "Make sure we don't end up with freed markers reachable from Lisp."
+  ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30931#55
+  (with-temp-buffer
+    (insert "1234567890")
+    (setq buffer-undo-list nil)
+    ;; signal_before_change creates markers delimiting a change
+    ;; region.
+    (let ((before-change-functions
+           (list (lambda (beg end)
+                   (delete-region (1- beg) (1+ end))))))
+      (delete-region 2 5))
+    ;; (princ (format "%S" buffer-undo-list) #'external-debugging-output)
+    ;; `buffer-undo-list' is now
+    ;; (("678" . 1) ("12345" . 1) (# . -1)
+    ;;  (# . -1) (# . -4))
+    ;;
+    ;; If temp-marker1 or temp-marker2 are freed prematurely, calling
+    ;; `type-of' on them will cause Emacs to abort.  Calling
+    ;; `garbage-collect' will also abort if it finds any reachable
+    ;; freed objects.
+    (should (eq (type-of (car (nth 3 buffer-undo-list))) 'marker))
+    (should (eq (type-of (car (nth 4 buffer-undo-list))) 'marker))
+    (garbage-collect)))
+
 ;;; editfns-tests.el ends here
diff -Nru emacs-26.1+1/test/src/emacs-module-tests.el emacs-26.3+1/test/src/emacs-module-tests.el
--- emacs-26.1+1/test/src/emacs-module-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/emacs-module-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; Test GNU Emacs modules.
 
-;; Copyright 2015-2018 Free Software Foundation, Inc.
+;; Copyright 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -136,6 +136,9 @@
     (garbage-collect) ;; XXX: not enough to really test but it's something..
     (should (string= ref-str mod-str))))
 
+(ert-deftest mod-test-globref-free-test ()
+  (should (eq (mod-test-globref-free 1 'a "test" 'b) 'ok)))
+
 (ert-deftest mod-test-string-a-to-b-test ()
   (should (string= (mod-test-string-a-to-b "aaa") "bbb")))
 
diff -Nru emacs-26.1+1/test/src/eval-tests.el emacs-26.3+1/test/src/eval-tests.el
--- emacs-26.1+1/test/src/eval-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/eval-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; eval-tests.el --- unit tests for src/eval.c      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani 
 
@@ -99,4 +99,34 @@
         (signal-hook-function #'ignore))
     (should-error (eval-tests--exceed-specbind-limit))))
 
+(ert-deftest eval-tests-byte-code-being-evaluated-is-protected-from-gc ()
+  "Regression test for Bug#33014.
+Check that byte-compiled objects being executed by exec-byte-code
+are found on the stack and therefore not garbage collected."
+  (should (string= (eval-tests-33014-func)
+                   "before after: ok foo: (e) bar: (a b c d e) baz: a bop: c")))
+
+(defvar eval-tests-33014-var "ok")
+(defun eval-tests-33014-func ()
+  "A function which has a non-trivial constants vector when byte-compiled."
+  (let ((result "before "))
+    (eval-tests-33014-redefine)
+    (garbage-collect)
+    (setq result (concat result (format "after: %s" eval-tests-33014-var)))
+    (let ((vals '(0 1 2 3))
+          (things '(a b c d e)))
+      (dolist (val vals)
+        (setq result
+              (concat result " "
+                      (cond
+                       ((= val 0) (format "foo: %s" (last things)))
+                       ((= val 1) (format "bar: %s" things))
+                       ((= val 2) (format "baz: %s" (car things)))
+                       (t (format "bop: %s" (nth 2 things))))))))
+    result))
+
+(defun eval-tests-33014-redefine ()
+  "Remove the Lisp reference to the byte-compiled object."
+  (setf (symbol-function #'eval-tests-33014-func) nil))
+
 ;;; eval-tests.el ends here
diff -Nru emacs-26.1+1/test/src/fileio-tests.el emacs-26.3+1/test/src/fileio-tests.el
--- emacs-26.1+1/test/src/fileio-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/fileio-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; unit tests for src/fileio.c      -*- lexical-binding: t; -*-
 
-;; Copyright 2017-2018 Free Software Foundation, Inc.
+;; Copyright 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/floatfns-tests.el emacs-26.3+1/test/src/floatfns-tests.el
--- emacs-26.1+1/test/src/floatfns-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/floatfns-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; floatfns-tests.el --- tests for floating point operations
 
-;; Copyright 2017-2018 Free Software Foundation, Inc.
+;; Copyright 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/fns-tests.el emacs-26.3+1/test/src/fns-tests.el
--- emacs-26.1+1/test/src/fns-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/fns-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; fns-tests.el --- tests for src/fns.c
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/font-tests.el emacs-26.3+1/test/src/font-tests.el
--- emacs-26.1+1/test/src/font-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/font-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; font-tests.el --- Test suite for font-related functions.
 
-;; Copyright (C) 2011-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong 
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/src/inotify-tests.el emacs-26.3+1/test/src/inotify-tests.el
--- emacs-26.1+1/test/src/inotify-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/inotify-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; inotify-tests.el --- Test suite for inotify. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Rüdiger Sonderfeld 
 ;; Keywords:       internal
diff -Nru emacs-26.1+1/test/src/keyboard-tests.el emacs-26.3+1/test/src/keyboard-tests.el
--- emacs-26.1+1/test/src/keyboard-tests.el	1970-01-01 00:00:00.000000000 +0000
+++ emacs-26.3+1/test/src/keyboard-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -0,0 +1,36 @@
+;;; keyboard-tests.el --- Tests for keyboard.c -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017-2019 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 .
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest keyboard-unread-command-events ()
+  "Test `unread-command-events'."
+  (should (equal (progn (push ?\C-a unread-command-events)
+                        (read-event nil nil 1))
+                 ?\C-a))
+  (should (equal (progn (run-with-timer
+                         1 nil
+                         (lambda () (push '(t . ?\C-b) unread-command-events)))
+                        (read-event nil nil 2))
+                 ?\C-b)))
+
+(provide 'keyboard-tests)
+;;; keyboard-tests.el ends here
diff -Nru emacs-26.1+1/test/src/keymap-tests.el emacs-26.3+1/test/src/keymap-tests.el
--- emacs-26.1+1/test/src/keymap-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/keymap-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; keymap-tests.el --- Test suite for src/keymap.c
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Juanma Barranquero 
 
diff -Nru emacs-26.1+1/test/src/lcms-tests.el emacs-26.3+1/test/src/lcms-tests.el
--- emacs-26.1+1/test/src/lcms-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/lcms-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lcms-tests.el --- tests for Little CMS interface -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 
diff -Nru emacs-26.1+1/test/src/lread-tests.el emacs-26.3+1/test/src/lread-tests.el
--- emacs-26.1+1/test/src/lread-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/lread-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; lread-tests.el --- tests for lread.c -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; Author: Philipp Stephani 
 
diff -Nru emacs-26.1+1/test/src/marker-tests.el emacs-26.3+1/test/src/marker-tests.el
--- emacs-26.1+1/test/src/marker-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/marker-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; marker-tests.el --- tests for marker.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/minibuf-tests.el emacs-26.3+1/test/src/minibuf-tests.el
--- emacs-26.1+1/test/src/minibuf-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/minibuf-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; minibuf-tests.el --- tests for minibuf.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2016-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/print-tests.el emacs-26.3+1/test/src/print-tests.el
--- emacs-26.1+1/test/src/print-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/print-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; print-tests.el --- tests for src/print.c         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/process-tests.el emacs-26.3+1/test/src/process-tests.el
--- emacs-26.1+1/test/src/process-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/process-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; process-tests.el --- Testing the process facilities
 
-;; Copyright (C) 2013-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2019 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -144,6 +144,35 @@
     (should (equal "hello stderr!\n"
 		   (mapconcat #'identity (nreverse stderr-output) "")))))
 
+(ert-deftest set-process-filter-t ()
+  "Test setting process filter to t and back." ;; Bug#36591
+  (with-temp-buffer
+    (let* ((print-level nil)
+           (print-length nil)
+           (proc (start-process
+                  "test proc" (current-buffer)
+                  (concat invocation-directory invocation-name)
+                  "-Q" "--batch" "--eval"
+                  (prin1-to-string
+                   '(let (s)
+                      (while (setq s (read-from-minibuffer "$ "))
+                        (princ s)
+                        (princ "\n")))))))
+      (set-process-query-on-exit-flag proc nil)
+      (send-string proc "one\n")
+      (should
+       (accept-process-output proc 1))  ; Read "one".
+      (should (equal (buffer-string) "$ one\n$ "))
+      (set-process-filter proc t)       ; Stop reading from proc.
+      (send-string proc "two\n")
+      (should-not
+       (accept-process-output proc 1))  ; Can't read "two" yet.
+      (should (equal (buffer-string) "$ one\n$ "))
+      (set-process-filter proc nil)     ; Resume reading from proc.
+      (should
+       (accept-process-output proc 1))  ; Read "two" from proc.
+      (should (equal (buffer-string) "$ one\n$ two\n$ ")))))
+
 (ert-deftest start-process-should-not-modify-arguments ()
   "`start-process' must not modify its arguments in-place."
   ;; See bug#21831.
diff -Nru emacs-26.1+1/test/src/regex-tests.el emacs-26.3+1/test/src/regex-tests.el
--- emacs-26.1+1/test/src/regex-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/regex-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; regex-tests.el --- tests for regex.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/syntax-tests.el emacs-26.3+1/test/src/syntax-tests.el
--- emacs-26.1+1/test/src/syntax-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/syntax-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; syntax-tests.el --- tests for syntax.c functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff -Nru emacs-26.1+1/test/src/textprop-tests.el emacs-26.3+1/test/src/textprop-tests.el
--- emacs-26.1+1/test/src/textprop-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/textprop-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; textprop-tests.el --- Test suite for text properties.
 
-;; Copyright (C) 2015-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Jenkner 
 ;; Keywords: internal
diff -Nru emacs-26.1+1/test/src/thread-tests.el emacs-26.3+1/test/src/thread-tests.el
--- emacs-26.1+1/test/src/thread-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/thread-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; threads.el --- tests for threads.
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -19,36 +19,56 @@
 
 ;;; Code:
 
+;; Declare the functions in case Emacs has been configured --without-threads.
+(declare-function all-threads "thread.c" ())
+(declare-function condition-mutex "thread.c" (cond))
+(declare-function condition-name "thread.c" (cond))
+(declare-function condition-notify "thread.c" (cond &optional all))
+(declare-function condition-wait "thread.c" (cond))
+(declare-function current-thread "thread.c" ())
+(declare-function make-condition-variable "thread.c" (mutex &optional name))
+(declare-function make-mutex "thread.c" (&optional name))
+(declare-function make-thread "thread.c" (function &optional name))
+(declare-function mutex-lock "thread.c" (mutex))
+(declare-function mutex-unlock "thread.c" (mutex))
+(declare-function thread--blocker "thread.c" (thread))
+(declare-function thread-live-p "thread.c" (thread))
+(declare-function thread-join "thread.c" (thread))
+(declare-function thread-last-error "thread.c" ())
+(declare-function thread-name "thread.c" (thread))
+(declare-function thread-signal "thread.c" (thread error-symbol data))
+(declare-function thread-yield "thread.c" ())
+
 (ert-deftest threads-is-one ()
   "Test for existence of a thread."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (current-thread)))
 
 (ert-deftest threads-threadp ()
   "Test of threadp."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (threadp (current-thread))))
 
 (ert-deftest threads-type ()
   "Test of thread type."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (eq (type-of (current-thread)) 'thread)))
 
 (ert-deftest threads-name ()
   "Test for name of a thread."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (string= "hi bob" (thread-name (make-thread #'ignore "hi bob")))))
 
-(ert-deftest threads-alive ()
+(ert-deftest threads-live ()
   "Test for thread liveness."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
-   (thread-alive-p (make-thread #'ignore))))
+   (thread-live-p (make-thread #'ignore))))
 
 (ert-deftest threads-all-threads ()
   "Simple test for all-threads."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (listp (all-threads))))
 
 (defvar threads-test-global nil)
@@ -58,7 +78,7 @@
 
 (ert-deftest threads-basic ()
   "Basic thread test."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-test-global nil)
@@ -69,18 +89,18 @@
 
 (ert-deftest threads-join ()
   "Test of `thread-join'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-test-global nil)
      (let ((thread (make-thread #'threads-test-thread1)))
        (thread-join thread)
        (and threads-test-global
-	    (not (thread-alive-p thread)))))))
+	    (not (thread-live-p thread)))))))
 
 (ert-deftest threads-join-self ()
   "Cannot `thread-join' the current thread."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should-error (thread-join (current-thread))))
 
 (defvar threads-test-binding nil)
@@ -92,7 +112,7 @@
 
 (ert-deftest threads-let-binding ()
   "Simple test of threads and let bindings."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-test-global nil)
@@ -104,22 +124,22 @@
 
 (ert-deftest threads-mutexp ()
   "Simple test of `mutexp'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should-not (mutexp 'hi)))
 
 (ert-deftest threads-mutexp-2 ()
   "Another simple test of `mutexp'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (mutexp (make-mutex))))
 
 (ert-deftest threads-mutex-type ()
   "type-of mutex."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (eq (type-of (make-mutex)) 'mutex)))
 
 (ert-deftest threads-mutex-lock-unlock ()
   "Test mutex-lock and unlock."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (let ((mx (make-mutex)))
      (mutex-lock mx)
@@ -128,7 +148,7 @@
 
 (ert-deftest threads-mutex-recursive ()
   "Test mutex recursion."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (let ((mx (make-mutex)))
      (mutex-lock mx)
@@ -149,7 +169,7 @@
 
 (ert-deftest threads-mutex-contention ()
   "Test of mutex contention."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-mutex (make-mutex))
@@ -170,7 +190,7 @@
 
 (ert-deftest threads-mutex-signal ()
   "Test signaling a blocked thread."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-mutex (make-mutex))
@@ -188,7 +208,7 @@
 
 (ert-deftest threads-io-switch ()
   "Test that `accept-process-output' causes thread switch."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (progn
      (setq threads-test-global nil)
@@ -199,67 +219,68 @@
 
 (ert-deftest threads-condvarp ()
   "Simple test of `condition-variable-p'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should-not (condition-variable-p 'hi)))
 
 (ert-deftest threads-condvarp-2 ()
   "Another simple test of `condition-variable-p'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (condition-variable-p (make-condition-variable (make-mutex)))))
 
 (ert-deftest threads-condvar-type ()
   "type-of condvar"
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should (eq (type-of (make-condition-variable (make-mutex)))
 	      'condition-variable)))
 
 (ert-deftest threads-condvar-mutex ()
   "Simple test of `condition-mutex'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
    (let ((m (make-mutex)))
      (eq m (condition-mutex (make-condition-variable m))))))
 
 (ert-deftest threads-condvar-name ()
   "Simple test of `condition-name'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
      (eq nil (condition-name (make-condition-variable (make-mutex))))))
 
 (ert-deftest threads-condvar-name-2 ()
   "Another simple test of `condition-name'."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (should
      (string= "hi bob"
 	      (condition-name (make-condition-variable (make-mutex)
 						       "hi bob")))))
-(defun call-error ()
+
+(defun threads-call-error ()
   "Call `error'."
   (error "Error is called"))
 
 ;; This signals an error internally; the error should be caught.
-(defun thread-custom ()
-  (defcustom thread-custom-face 'highlight
+(defun threads-custom ()
+  (defcustom threads-custom-face 'highlight
     "Face used for thread customizations."
     :type 'face
     :group 'widget-faces))
 
-(ert-deftest thread-errors ()
+(ert-deftest threads-errors ()
   "Test what happens when a thread signals an error."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (let (th1 th2)
-    (setq th1 (make-thread #'call-error "call-error"))
+    (setq th1 (make-thread #'threads-call-error "call-error"))
     (should (threadp th1))
-    (while (thread-alive-p th1)
+    (while (thread-live-p th1)
       (thread-yield))
     (should (equal (thread-last-error)
                    '(error "Error is called")))
-    (setq th2 (make-thread #'thread-custom "thread-custom"))
+    (setq th2 (make-thread #'threads-custom "threads-custom"))
     (should (threadp th2))))
 
-(ert-deftest thread-sticky-point ()
+(ert-deftest threads-sticky-point ()
   "Test bug #25165 with point movement in cloned buffer."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (with-temp-buffer
     (insert "Lorem ipsum dolor sit amet, consectetur adipiscing elit.")
     (goto-char (point-min))
@@ -268,15 +289,15 @@
     (sit-for 1)
     (should (= (point) 21))))
 
-(ert-deftest thread-signal-early ()
+(ert-deftest threads-signal-early ()
   "Test signaling a thread as soon as it is started by the OS."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (let ((thread
          (make-thread #'(lambda ()
                           (while t (thread-yield))))))
     (thread-signal thread 'error nil)
     (sit-for 1)
-    (should-not (thread-alive-p thread))
+    (should-not (thread-live-p thread))
     (should (equal (thread-last-error) '(error)))))
 
 (defvar threads-condvar nil)
@@ -291,7 +312,7 @@
 
 (ert-deftest threads-condvar-wait ()
   "Test waiting on conditional variable."
-  (skip-unless (fboundp 'make-thread))
+  (skip-unless (featurep 'threads))
   (let ((cv-mutex (make-mutex))
         new-thread)
     ;; We could have spurious threads from the previous tests still
@@ -302,7 +323,7 @@
     (setq new-thread (make-thread #'threads-test-condvar-wait))
 
     ;; Make sure new-thread is alive.
-    (should (thread-alive-p new-thread))
+    (should (thread-live-p new-thread))
     (should (= (length (all-threads)) 2))
     ;; Wait for new-thread to become blocked on the condvar.
     (while (not (eq (thread--blocker new-thread) threads-condvar))
@@ -315,7 +336,7 @@
     (sleep-for 0.1)
     ;; Make sure the thread is still there.  This used to fail due to
     ;; a bug in thread.c:condition_wait_callback.
-    (should (thread-alive-p new-thread))
+    (should (thread-live-p new-thread))
     (should (= (length (all-threads)) 2))
     (should (eq (thread--blocker new-thread) threads-condvar))
 
diff -Nru emacs-26.1+1/test/src/undo-tests.el emacs-26.3+1/test/src/undo-tests.el
--- emacs-26.1+1/test/src/undo-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/undo-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; undo-tests.el --- Tests of primitive-undo
 
-;; Copyright (C) 2012-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
 
 ;; Author: Aaron S. Hawley 
 
diff -Nru emacs-26.1+1/test/src/xml-tests.el emacs-26.3+1/test/src/xml-tests.el
--- emacs-26.1+1/test/src/xml-tests.el	2018-12-15 19:02:06.000000000 +0000
+++ emacs-26.3+1/test/src/xml-tests.el	2019-09-10 00:32:49.000000000 +0000
@@ -1,6 +1,6 @@
 ;;; libxml-parse-tests.el --- Test suite for libxml parsing.
 
-;; Copyright (C) 2014-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
 ;; Author: Ulf Jasper 
 ;; Keywords:       internal