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

44 files changed, 104 insertions, 61 deletions

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index e51b4addc06..74a5012552c 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3536,4 +3536,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/src/ChangeLog.10 b/src/ChangeLog.10
index 65a8587bf99..1bd822d492f 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -27927,4 +27927,4 @@ See ChangeLog.9 for earlier changes.
   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/src/ChangeLog.11 b/src/ChangeLog.11
index 365fc277a9a..eb1aeb1eeaf 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -31400,4 +31400,4 @@ See ChangeLog.10 for earlier changes.
   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/src/ChangeLog.12 b/src/ChangeLog.12
index 367e0d61d8c..35993adb667 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -22951,4 +22951,4 @@ See ChangeLog.11 for earlier changes.
   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/src/ChangeLog.13 b/src/ChangeLog.13
index 66f062d3d3f..6f5ea036263 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -17920,4 +17920,4 @@ See ChangeLog.12 for earlier changes.
   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/src/ChangeLog.2 b/src/ChangeLog.2
index 56015d56175..42e1e8345d8 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4786,4 +4786,4 @@ See ChangeLog.1 for earlier changes.
   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/src/ChangeLog.3 b/src/ChangeLog.3
index 8f9b38e25d1..17fd69c9f11 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16518,4 +16518,4 @@ See ChangeLog.2 for earlier changes.
   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/src/ChangeLog.4 b/src/ChangeLog.4
index bb13c9a5f68..2935ee52cca 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6921,4 +6921,4 @@ See ChangeLog.3 for earlier changes.
   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/src/ChangeLog.5 b/src/ChangeLog.5
index f0fde023ff2..489ccfa5323 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7163,4 +7163,4 @@ See ChangeLog.4 for earlier changes.
   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/src/ChangeLog.6 b/src/ChangeLog.6
index 2282916205d..f2b9e609b14 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5373,4 +5373,4 @@ See ChangeLog.5 for earlier changes.
   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/src/ChangeLog.7 b/src/ChangeLog.7
index eb4833ccb0e..32472ac074c 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11106,4 +11106,4 @@ See ChangeLog.6 for earlier changes.
   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/src/ChangeLog.8 b/src/ChangeLog.8
index ae971b52e1d..cf7c926cc2d 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13994,4 +13994,4 @@ See ChangeLog.7 for earlier changes.
   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/src/ChangeLog.9 b/src/ChangeLog.9
index 7b8f500b603..6de10c493f7 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13309,4 +13309,4 @@ See ChangeLog.8 for earlier changes.
   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/src/cygw32.c b/src/cygw32.c
index 962b6a2f8b5..724363d64c4 100644
--- a/src/cygw32.c
+++ b/src/cygw32.c
@@ -14,7 +14,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/>.  */
 
 
 #include "cygw32.h"
diff --git a/src/cygw32.h b/src/cygw32.h
index a10b830e6b6..f006c112d8f 100644
--- a/src/cygw32.h
+++ b/src/cygw32.h
@@ -14,7 +14,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 CYGW32_H
 #define CYGW32_H
diff --git a/src/dosfns.c b/src/dosfns.c
index 7bf1dee587a..86870496397 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -16,7 +16,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/>.  */
 
 #include <config.h>
 
diff --git a/src/dosfns.h b/src/dosfns.h
index 266430d71e5..2846010c222 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -18,7 +18,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/>.  */
 
 #define DOS_COUNTRY_INFO 34     /* no of bytes returned by dos int 38h */
 extern unsigned char dos_country_info[DOS_COUNTRY_INFO];
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 46d3d1d93d2..3f22a4c93f8 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -577,6 +577,10 @@ xg_check_special_colors (struct frame *f,
     if (get_fg)
       gtk_style_context_get_color (gsty, state, &col);
     else
+      /* FIXME: gtk_style_context_get_background_color is deprecated
+         in GTK+ 3.16.  New versions of GTK+ don’t use the concept of
+         a single background color any more, so we shouldn’t query for
+         it.  */
       gtk_style_context_get_background_color (gsty, state, &col);
 
     unsigned short
diff --git a/src/msdos.c b/src/msdos.c
index ae9cbeefafd..a8aef9ac405 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -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/>.  */
 
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
diff --git a/src/msdos.h b/src/msdos.h
index f4312c5c86d..16292c551d9 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -14,7 +14,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 EMACS_MSDOS_H
 #define EMACS_MSDOS_H
diff --git a/src/w16select.c b/src/w16select.c
index 70037f3ca7d..0ecd39b7afa 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -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/>.  */
 
 /* These functions work by using WinOldAp interface.  WinOldAp
    (WINOLDAP.MOD) is a Microsoft Windows extension supporting
diff --git a/src/w32.c b/src/w32.c
index eb531aa60c3..fb13bd7d070 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -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/>.  */
 
 /*
    Geoff Voelker (voelker@cs.washington.edu)                         7-29-94
diff --git a/src/w32.h b/src/w32.h
index 1727f8bc629..cd782883c6d 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -17,7 +17,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/>.  */
 
 #ifdef CYGWIN
 #error "w32.h is not compatible with Cygwin"
diff --git a/src/w32common.h b/src/w32common.h
index 30718e0074b..6de4ab4bfd8 100644
--- a/src/w32common.h
+++ b/src/w32common.h
@@ -14,7 +14,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/>.
 
 */
 
diff --git a/src/w32console.c b/src/w32console.c
index a4c089fa964..15d11d56ad7 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -14,7 +14,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/>.  */
 
 /*
    Tim Fleehart (apollo@online.com)             1-17-92
diff --git a/src/w32fns.c b/src/w32fns.c
index a77464465ec..efbd81b22d9 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -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/>.  */
 
 /* Added by Kevin Gallo */
 
diff --git a/src/w32font.c b/src/w32font.c
index 98811192029..d6bd7d6a2b3 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -14,7 +14,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/>.  */
 
 #include <config.h>
 #include <windows.h>
diff --git a/src/w32font.h b/src/w32font.h
index 42b425f35fd..2d84950f0dc 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -14,7 +14,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 EMACS_W32FONT_H
 #define EMACS_W32FONT_H
diff --git a/src/w32gui.h b/src/w32gui.h
index 4f142b09cc3..00d5d1f57c7 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -14,7 +14,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 EMACS_W32GUI_H
 #define EMACS_W32GUI_H
diff --git a/src/w32heap.c b/src/w32heap.c
index 510f6762bbe..85ed050d997 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -14,7 +14,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/>. */
 
 /*
   Geoff Voelker (voelker@cs.washington.edu)                          7-29-94
diff --git a/src/w32heap.h b/src/w32heap.h
index 0b3e9dd888d..1cabbd84dff 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -14,7 +14,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/>.
 
    Geoff Voelker (voelker@cs.washington.edu)                         7-29-94
 */
diff --git a/src/w32inevt.c b/src/w32inevt.c
index ed1f1d2e9ae..0b0f3f9e669 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -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/>.  */
 
 /*
    Drew Bliss                   01-Oct-93
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 87442cd5f3e..b761d952eb4 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -14,7 +14,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 EMACS_W32INEVT_H
 #define EMACS_W32INEVT_H
diff --git a/src/w32menu.c b/src/w32menu.c
index de5c4b46b54..d3946285212 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -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/>.  */
 
 #include <config.h>
 
diff --git a/src/w32notify.c b/src/w32notify.c
index 7987d9f6562..4e0e5804a55 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -14,7 +14,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/>.  */
 
 /* Written by Eli Zaretskii <eliz@gnu.org>.
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 4459ebe324b..ca59f995e63 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -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/>.  */
 
 /*
    Drew Bliss                   Oct 14, 1993
diff --git a/src/w32reg.c b/src/w32reg.c
index de19ae14858..040857e87b3 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -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/>.  */
 
 /* Written by Kevin Gallo */
 
diff --git a/src/w32select.c b/src/w32select.c
index 03bcc1c21da..003bef2ddad 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -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/>.  */
 
 /* Written by Kevin Gallo, Benjamin Riefenstahl */
 
diff --git a/src/w32select.h b/src/w32select.h
index 5cf2d6f6381..da2057a0e8d 100644
--- a/src/w32select.h
+++ b/src/w32select.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 W32SELECT_H
 #define W32SELECT_H
diff --git a/src/w32term.c b/src/w32term.c
index a7a510b9ecb..c15cbbfa847 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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/>.  */
 
 #include <config.h>
 #include <signal.h>
@@ -163,10 +163,6 @@ int last_scroll_bar_drag_pos;
 /* Keyboard code page - may be changed by language-change events.  */
 int w32_keyboard_codepage;
 
-/* Incremented by w32_read_socket whenever it really tries to read
-   events.  */
-static int volatile input_signal_count;
-
 #ifdef CYGWIN
 int w32_message_fd = -1;
 #endif /* CYGWIN */
@@ -4658,9 +4654,6 @@ w32_read_socket (struct terminal *terminal,
 
   block_input ();
 
-  /* So people can tell when we have read the available input.  */
-  input_signal_count++;
-
   /* Process any incoming thread messages.  */
   drain_message_queue ();
 
@@ -6252,7 +6245,8 @@ w32fullscreen_hook (struct frame *f)
 
       if (FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH)
         {
-          SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW);
+          if (!FRAME_UNDECORATED (f))
+            SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW);
           SetWindowPlacement (hwnd, &FRAME_NORMAL_PLACEMENT (f));
         }
       else if (FRAME_PREV_FSMODE (f) == FULLSCREEN_HEIGHT
@@ -6278,7 +6272,8 @@ w32fullscreen_hook (struct frame *f)
 
           w32_fullscreen_rect (hwnd, f->want_fullscreen,
                                FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect);
-          SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
+          if (!FRAME_UNDECORATED (f))
+            SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
           SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
                         rect.right - rect.left, rect.bottom - rect.top,
                         SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
@@ -6612,7 +6607,8 @@ w32_frame_raise_lower (struct frame *f, bool raise_flag)
 
 /* Change of visibility.  */
 
-/* This tries to wait until the frame is really visible.
+/* This tries to wait until the frame is really visible, depending on
+   the value of Vx_visible_frame_timeout.
    However, if the window manager asks the user where to position
    the frame, this will return before the user finishes doing that.
    The frame will not actually be visible at that time,
@@ -6671,12 +6667,16 @@ x_make_frame_visible (struct frame *f)
                       : SW_SHOWNORMAL);
     }
 
+  if (!FLOATP (Vx_wait_for_event_timeout))
+      return;
+
   /* Synchronize to ensure Emacs knows the frame is visible
      before we do anything else.  We do this loop with input not blocked
      so that incoming events are handled.  */
   {
     Lisp_Object frame;
-    int count;
+    double timeout = XFLOAT_DATA (Vx_wait_for_event_timeout);
+    double start_time = XFLOAT_DATA (Ffloat_time (Qnil));
 
     /* This must come after we set COUNT.  */
     unblock_input ();
@@ -6686,8 +6686,8 @@ x_make_frame_visible (struct frame *f)
     /* Wait until the frame is visible.  Process X events until a
        MapNotify event has been seen, or until we think we won't get a
        MapNotify at all..  */
-    for (count = input_signal_count + 10;
-         input_signal_count < count && !FRAME_VISIBLE_P (f);)
+    while (timeout > (XFLOAT_DATA (Ffloat_time (Qnil)) - start_time) &&
+           !FRAME_VISIBLE_P (f))
       {
         /* Force processing of queued events.  */
         /* TODO: x_sync equivalent?  */
@@ -7319,6 +7319,17 @@ syms_of_w32term (void)
   DEFSYM (Qrenamed_from, "renamed-from");
   DEFSYM (Qrenamed_to, "renamed-to");
 
+  DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout,
+    doc: /* How long to wait for X events.
+
+Emacs will wait up to this many seconds to receive X events after
+making changes which affect the state of the graphical interface.
+Under some window managers this can take an indefinite amount of time,
+so it is important to limit the wait.
+
+If set to a non-float value, there will be no wait at all.  */);
+  Vx_wait_for_event_timeout = make_float (0.1);
+
   DEFVAR_INT ("w32-num-mouse-buttons",
               w32_num_mouse_buttons,
               doc: /* Number of physical mouse buttons.  */);
diff --git a/src/w32term.h b/src/w32term.h
index 9956682c5cd..16b44b0ca2f 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -14,7 +14,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/>.  */
 
 /* Added by Kevin Gallo */
 
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index e4055638cc4..ca030ad5ae6 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -14,7 +14,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/>.  */
 
 
 #include <config.h>
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 587a24125bb..39a69d14db9 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -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/>.  */
 
 #include <config.h>
 #include <signal.h>
diff --git a/src/xterm.c b/src/xterm.c
index 0b321909c85..90275763cbe 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11029,17 +11029,22 @@ x_sync_with_move (struct frame *f, int left, int top, bool fuzzy)
 void
 x_wait_for_event (struct frame *f, int eventtype)
 {
-  int level = interrupt_input_blocked;
+  if (!FLOATP (Vx_wait_for_event_timeout))
+    return;
 
+  int level = interrupt_input_blocked;
   fd_set fds;
   struct timespec tmo, tmo_at, time_now;
   int fd = ConnectionNumber (FRAME_X_DISPLAY (f));
 
   f->wait_event_type = eventtype;
 
-  /* Set timeout to 0.1 second.  Hopefully not noticeable.
-     Maybe it should be configurable.  */
-  tmo = make_timespec (0, 100 * 1000 * 1000);
+  /* Default timeout is 0.1 second.  Hopefully not noticeable.  */
+  double timeout = XFLOAT_DATA (Vx_wait_for_event_timeout);
+  time_t timeout_seconds = (time_t) timeout;
+  tmo = make_timespec
+    (timeout_seconds, (long int) ((timeout - timeout_seconds)
+                                  * 1000 * 1000 * 1000));
   tmo_at = timespec_add (current_timespec (), tmo);
 
   while (f->wait_event_type)
@@ -11365,8 +11370,13 @@ xembed_send_message (struct frame *f, Time t, enum xembed_message msg,
 
 /* Change of visibility.  */
 
-/* This function sends the request to make the frame visible, but may
-   return before it the frame's visibility is changed.  */
+/* This tries to wait until the frame is really visible, depending on
+   the value of Vx_wait_for_event_timeout.
+   However, if the window manager asks the user where to position
+   the frame, this will return before the user finishes doing that.
+   The frame will not actually be visible at that time,
+   but it will become visible later when the window manager
+   finishes with it.  */
 
 void
 x_make_frame_visible (struct frame *f)
@@ -11437,11 +11447,14 @@ x_make_frame_visible (struct frame *f)
      before we do anything else.  We do this loop with input not blocked
      so that incoming events are handled.  */
   {
+    Lisp_Object frame;
     /* This must be before UNBLOCK_INPUT
        since events that arrive in response to the actions above
        will set it when they are handled.  */
     bool previously_visible = f->output_data.x->has_been_visible;
 
+    XSETFRAME (frame, f);
+
     int original_left = f->left_pos;
     int original_top = f->top_pos;
 
@@ -11488,6 +11501,10 @@ x_make_frame_visible (struct frame *f)
 
         unblock_input ();
       }
+
+    /* Try to wait for a MapNotify event (that is what tells us when a
+       frame becomes visible).  */
+    x_wait_for_event (f, MapNotify);
   }
 }
 
@@ -13283,6 +13300,17 @@ This should be one of the symbols `ctrl', `alt', `hyper', `meta',
 keysyms.  The default is nil, which is the same as `super'.  */);
   Vx_super_keysym = Qnil;
 
+  DEFVAR_LISP ("x-wait-for-event-timeout", Vx_wait_for_event_timeout,
+    doc: /* How long to wait for X events.
+
+Emacs will wait up to this many seconds to receive X events after
+making changes which affect the state of the graphical interface.
+Under some window managers this can take an indefinite amount of time,
+so it is important to limit the wait.
+
+If set to a non-float value, there will be no wait at all.  */);
+  Vx_wait_for_event_timeout = make_float (0.1);
+
   DEFVAR_LISP ("x-keysym-table", Vx_keysym_table,
     doc: /* Hash table of character codes indexed by X keysym codes.  */);
   Vx_keysym_table = make_hash_table (hashtest_eql, 900,