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

6 files changed, 23 insertions, 23 deletions

diff --git a/nt/COPYING b/nt/COPYING
index 94a9ed024d3..f288702d2fa 100644
--- a/nt/COPYING
+++ b/nt/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/nt/ChangeLog.1 b/nt/ChangeLog.1
index adfdea286f0..7502156b1ff 100644
--- a/nt/ChangeLog.1
+++ b/nt/ChangeLog.1
@@ -297,8 +297,8 @@
 	to avoid gnulib replacement of 'struct timeval' and the resulting
 	compilation of lib/gettimeofday.c with incompatible version of
 	gettimeofday.  Related discussions on emacs-devel:
-	http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html
-	http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html
+	https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html
+	https://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html
 
 2013-08-31  Glenn Morris  <rgm@gnu.org>
 
@@ -373,7 +373,7 @@
 
 	* inc/sys/time.h (gettimeofday): Use '__restrict' instead of
 	'restrict', which is a C99 extension.  See
-	http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
+	https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
 	and the following discussion for the problem this caused in the
 	old nt/configure.bat build.
 
@@ -524,10 +524,10 @@
 
 	Fix more incompatibilities between MinGW.org and MinGW64 headers
 	reported by Óscar Fuentes in
-	http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html
-	http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
+	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html
+	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
 	and in
-	http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
+	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
 	* inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
 	For MinGW64, include sys/types.h and time.h.
 	(_WIN32_WINNT) [!_W64]: Don't define for MinGW64.
@@ -548,7 +548,7 @@
 
 	Fix incompatibilities between MinGW.org and MinGW64 headers
 	reported by Óscar Fuentes in
-	http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00611.html.
+	https://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00611.html.
 	* inc/ms-w32.h (struct timespec): Don't define if
 	_TIMESPEC_DEFINED is already defined.
 	(sigset_t) [!_POSIX]: Typedef for MinGW64.
@@ -724,7 +724,7 @@
 2012-11-21  Eli Zaretskii  <eliz@gnu.org>
 
 	* nmake.defs: Use !if, not !ifdef.  For the details, see
-	http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+	https://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
 
 	* inc/stdint.h (INTPTR_MIN)
 	(PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
@@ -1184,7 +1184,7 @@
 	(dist): Depend on it.
 	(install-shortcuts): Depend on install-addpm instead of copying
 	addpm.exe as part of the recipe.  See
-	http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
+	https://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00171.html
 	for the related problem and discussions.
 
 2012-06-11  Glenn Morris  <rgm@gnu.org>
diff --git a/nt/INSTALL b/nt/INSTALL
index 662a30406f5..30e14293f5c 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -630,7 +630,7 @@ build will run on Windows 9X and newer systems).
   To support XPM images (required for color tool-bar icons), you will
   need the libXpm library.  It is available from the ezwinports site,
   http://sourceforge.net/projects/ezwinports/files/ and from
-  http://ftp.gnu.org/gnu/emacs/windows/.
+  https://ftp.gnu.org/gnu/emacs/windows/.
 
   For PNG images, we recommend to use versions 1.4.x and later of
   libpng, because previous versions had security issues.  You can find
@@ -653,7 +653,7 @@ build will run on Windows 9X and newer systems).
   giflib, as it is much enhanced wrt previous versions.  You can find
   precompiled binaries and headers for giflib on the ezwinports site,
   http://sourceforge.net/projects/ezwinports/files/ and on
-  http://ftp.gnu.org/gnu/emacs/windows/.
+  https://ftp.gnu.org/gnu/emacs/windows/.
 
   Version 5.0.0 and later of giflib are binary incompatible with
   previous versions (the signatures of several functions have
@@ -694,7 +694,7 @@ build will run on Windows 9X and newer systems).
     because the compiler needs to see their header files when building
     Emacs.
 
-    http://ftp.gnu.org/gnu/emacs/windows/
+    https://ftp.gnu.org/gnu/emacs/windows/
 
     More fat ports, from the MSYS2 project.
 
@@ -755,7 +755,7 @@ build will run on Windows 9X and newer systems).
 
   You can get pre-built binaries (including any required DLL and the
   header files) at http://sourceforge.net/projects/ezwinports/files/
-  and on http://ftp.gnu.org/gnu/emacs/windows/.
+  and on https://ftp.gnu.org/gnu/emacs/windows/.
 
 * Optional libxml2 support
 
@@ -777,7 +777,7 @@ build will run on Windows 9X and newer systems).
   (including any required DLL and the header files) is here:
 
      http://sourceforge.net/projects/ezwinports/files/
-     http://ftp.gnu.org/gnu/emacs/windows/
+     https://ftp.gnu.org/gnu/emacs/windows/
 
   For runtime support of libxml2, you will also need to install the
   libiconv "development" tarball, because the libiconv headers need to
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 5b7efdc8594..4a93dc02c8b 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -101,7 +101,7 @@ Savannah Emacs site, https://savannah.gnu.org/projects/emacs.
 
 ** From the FTP site
 
-The Emacs ftp site is located at http://ftp.gnu.org/gnu/emacs/ - download the
+The Emacs ftp site is located at https://ftp.gnu.org/gnu/emacs/ - download the
 version you want to build and put the file into a location like C:\emacs\,
 then uncompress it with tar.  This will put the Emacs source into a folder like
 C:\emacs\emacs-24.5:
diff --git a/nt/README b/nt/README
index f4cca8efe7b..c4d5b95340c 100644
--- a/nt/README
+++ b/nt/README
@@ -92,12 +92,12 @@
   issues related to the Windows port of Emacs.  For information about
   the list, see this Web page:
 
-	http://mail.gnu.org/mailman/listinfo/help-emacs-windows
+	https://mail.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on the mailing list, send email to
   help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
   To subscribe to the list or unsubscribe from it, fill the form you
-  find at http://mail.gnu.org/mailman/listinfo/help-emacs-windows as
+  find at https://mail.gnu.org/mailman/listinfo/help-emacs-windows as
   explained there.
 
   Another valuable source of information and help which should not be
diff --git a/nt/README.W32 b/nt/README.W32
index 829ccf7ba6c..e996c8e672c 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -280,7 +280,7 @@ See the end of the file for license conditions.
   In addition to the manual, there is a mailing list for help with
   Emacs here:
 
-       http://lists.gnu.org/mailman/listinfo/help-gnu-emacs
+       https://lists.gnu.org/mailman/listinfo/help-gnu-emacs
 
   To ask questions on this mailing list, send email to
   help-gnu-emacs@gnu.org.
@@ -288,7 +288,7 @@ See the end of the file for license conditions.
   A mailing list for issues specifically related to the MS-Windows port
   of Emacs is here:
 
-	http://lists.gnu.org/mailman/listinfo/help-emacs-windows
+	https://lists.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on this mailing list, send email to
   help-emacs-windows@gnu.org.