Merge from origin/emacs-26

5172fa02cc Prefer HTTPS to HTTP for gnu.org
8cdd8b920a Merge from Gnulib
60b7668b89 Keep eww buffer current when looking up CSS on MDN
bd49b6f1b3 Workaround for faulty localtime() under macOS 10.6
913808e224 Doc amendment for syntax-ppss.
98dc91fda8 Remove incorrect NEWS entry about 'find-library'
539d8626cd Remove inadvertent changes to syntax.texi in last commit.
8c18dcbc78 Amend documentation for text-quoting-style becoming a user...
5f76ac150a Make the value nil in text-quoting-style mean what it does...
d5e4e004fa Make text-quoting-style customizable.  Introduce t and new...
1ba3471b9b eshell.texi improvements
7abb5c3960 Fix ns-win.el on GNUstep
07ea5ef99a Fix reference style in org.texi
b03b4f6d79 Improve handling of iconification of child frames (Bug#28611)
ba9139c501 Revert "Don't lose arguments to eshell aliases (Bug#27954)"
43fac3beae Make "unsafe directory" error message more informative (Bu...
c59ddb2120 Fix slot typecheck in eieio-persistent
8b2ab5014b Fix semantic-ia-fast-jump
5b45e7e1c3 Bind vc-region-history
f172894595 Exit macro definition on undefined keys
289fe6c0d1 Reset bidi-paragraph-direction on article rendering
a4f7518817 Fix url-http use of url-current-object
4a755ed421 Avoid assertions in vc-hg.el on MS-Windows
cb93a6ce72 Improve documentation of 'copy-sequence'
200ef6f721 Minor update of ack.texi
cb407d3e87 * doc/emacs/emacs.texi (Acknowledgments): Add more contrib...
82b6c765ff Improve indexing of multi-file/buffer Isearch commands
645ff6c702 Add CAM02 JCh and CAM02-UCS J'a'b' conversions
157007b58e Fix uses of @kindex in the Emacs manual
63a45e8837 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
3ab2f9bbb9 Merge from gnulib
cbc8324488 Prefer HTTPS to HTTP for gnu.org
bbda601d1d ; Spelling fixes
695cf5300b Wait for frame visibility with timeout in w32term too
e1f6e3127a Bring back the busy wait after x_make_frame_visible (Bug#2...
bccf635217 ; * src/gtkutil.c (xg_check_special_colors): Add another G...
f428757cdb Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
26d58f0c58 ; Standardize license notices
73dba0f466 Fix last doc string change in simple.el

3 files changed, 15 insertions, 15 deletions

diff --git a/lib-src/COPYING b/lib-src/COPYING
index 94a9ed024d3..f288702d2fa 100644
--- a/lib-src/COPYING
+++ b/lib-src/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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 <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 417e57f3bb8..4b5422e712c 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -5,7 +5,7 @@
         is not part of Emacs and is typically not installed.
         Instead, just invoke xmalloc and xrealloc as usual.
         Problem reported by Nicolas Richard in:
-        http://bugs.gnu.org/20191#20
+        https://bugs.gnu.org/20191#20
         (xrnew): Avoid no-longer-needed cast to 'char *'.
         (xrealloc): First arg is now void *, not char *.
 
@@ -65,7 +65,7 @@
 
         Better support for future plugins
         See the thread containing:
-        http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html
+        https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html
         * make-docfile.c (write_globals): Generate code that #defines
         Qxxx macros other than Qnil only if DEFINE_NONNIL_Q_SYMBOL_MACROS.
         Qnil is safe to define even in plugins, since it must be zero for
@@ -329,7 +329,7 @@
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix rcs2log problems with CVS.  Reported by Glenn Morris in
-        <http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
+        <https://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
         Plus, fix some security and filename quoting problems.
         * rcs2log (logdir): Prefer mktemp if available.
         (logdir, llogdir): Work even if TMPDIR begins with '-' or has spaces.
@@ -937,13 +937,13 @@
 
         * movemail.c: Add missing 'defined'.
         Suggested by Sven Joachim in
-        <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00218.html>.
+        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00218.html>.
 
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port 'movemail' again to Solaris and similar hosts.
         See Susan Cragin's report in
-        <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00199.html>.
+        <https://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00199.html>.
         * movemail.c (xmalloc): Also define if !DISABLE_DIRECT_ACCESS &&
         !MAIL_USE_MMDF && !MAIL_USE_SYSTEM_LOCK.  Move up, so it doesn't
         need a forward declaration.
@@ -1212,7 +1212,7 @@
         Assume less-ancient POSIX support.
         * update-game-score.c: Include <getopt.h> rather than rolling our
         own decls for optarg, optind, opterr.  See
-        <http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
+        <https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
 
 2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -1271,7 +1271,7 @@
         instead, treat both -c and -t as always requesting a new "tty" frame,
         and let server.el decide which kind is actually required.
         Reported by Uwe Siart <usenet@siart.de> in this thread:
-        http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html
+        https://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html
 
 2011-11-30  Chong Yidong  <cyd@gnu.org>
 
@@ -3684,7 +3684,7 @@
 
         * rcs2log (Help): Clarify wording of the usage message.
         Reported by Alan Mackenzie in
-        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
+        <https://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -3715,7 +3715,7 @@
         and the path.  Allow :/ in repository path, since CVS does.
         Fix typo: "pository" should be set from $CVSROOT, not $repository.
         This fixes a bug reported by Wolfgang Scherer in
-        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-02/msg00085.html>,
+        <https://mail.gnu.org/archive/html/bug-gnu-emacs/2004-02/msg00085.html>,
         along with some related bugs I discovered by inspecting how
         CVS itself parses $CVSROOT.
 
@@ -3752,7 +3752,7 @@
         * rcs2log (rlog_options): Append -rbranchtag if CVS/Tag indicates
         a tag, and if the user has not specified an rlog option.
         Adapted from a suggestion by Martin Stjernholm in
-        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2003-07/msg00066.html>.
+        <https://mail.gnu.org/archive/html/bug-gnu-emacs/2003-07/msg00066.html>.
         (Copyright): Update to 2003.
 
 2003-12-24  Thien-Thi Nguyen  <ttn@gnu.org>
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 5e5709201e3..50276f245de 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -45,7 +45,7 @@ Each entry looks something like this:
 
         * rcs2log (Help): Clarify wording of the usage message.
         Problem reported by Alan Mackenzie in
-        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
+        <https://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
 
 ChangeLog entries contain the current date, full name, email address
 including hostname, the name of the affected file, and commentary.