Merge from origin/emacs-26

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...
26d58f0c58 ; Standardize license notices
61225964ed Revert "bug#28609: simple.el"
a75ab3b3fb bug#28609: simple.el
c7a21430c1 ; * etc/NEWS: Fix last change.
33401b26b1 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
d4b2bbdc73 Merge branch 'emacs-26' into scratch/org-mode-merge
c1ac8c170f Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
af130f900f Fix ert backtrace saving for non-`signal'ed errors (Bug#28...
7476eeaa23 Revert "Fix build on macOS (bug#28571)"
fec63089d5 Fix build on macOS (bug#28571)
0f9a78e770 Add tests for `css-current-defun-name'
88a0dd71f1 In w32fullscreen_hook don't add decorations to undecorated...
18073beb14 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
1eef11b7be Fix doc string of 'dired-listing-switches'
eaefbc26d5 ; Add files missing in ab351d442d7
ab351d442d Update Org to v9.1.1

6 files changed, 6 insertions, 6 deletions

diff --git a/msdos/ChangeLog.1 b/msdos/ChangeLog.1
index e8e6ec3af52..6fe88d119bb 100644
--- a/msdos/ChangeLog.1
+++ b/msdos/ChangeLog.1
@@ -1565,4 +1565,4 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/msdos/INSTALL b/msdos/INSTALL
index ca4ab85f1d1..41e36545f7e 100644
--- a/msdos/INSTALL
+++ b/msdos/INSTALL
@@ -151,4 +151,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/msdos/README b/msdos/README
index 122e8150e47..1add1c46e97 100644
--- a/msdos/README
+++ b/msdos/README
@@ -38,4 +38,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat
index b2c7bc8230a..31c8622f792 100644
--- a/msdos/depfiles.bat
+++ b/msdos/depfiles.bat
@@ -16,7 +16,7 @@ rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem   GNU General Public License for more details.

 

 rem   You should have received a copy of the GNU General Public License

-rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.

+rem   along with GNU Emacs.  If not, see https://www.gnu.org/licenses/.

 

 rem   ----------------------------------------------------------------------

 

diff --git a/msdos/inttypes.h b/msdos/inttypes.h
index 7996d056583..ce7797a933e 100644
--- a/msdos/inttypes.h
+++ b/msdos/inttypes.h
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _REPL_INTTYPES_H
 #define _REPL_INTTYPES_H
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index dc2b0b6e8ac..e8391bcf918 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 # make all	to compile and build Emacs.
 # make install	to install it (installs in-place, in `bin' subdir of top dir).