Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

11 files changed, 92 insertions, 77 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 8e33162989b..9e417bf555c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5390,17 +5390,24 @@ init_buffer (void)
          recorded by temacs, that cannot be used by the dumped Emacs.
          We map new memory for their text here.
 
-         Implementation note: the buffers we carry from temacs are:
+         Implementation notes: the buffers we carry from temacs are:
          " prin1", "*scratch*", " *Minibuf-0*", "*Messages*", and
          " *code-conversion-work*".  They are created by
          init_buffer_once and init_window_once (which are not called
-         in the dumped Emacs), and by the first call to coding.c routines.  */
+         in the dumped Emacs), and by the first call to coding.c
+         routines.  Since FOR_EACH_LIVE_BUFFER only walks the buffers
+         in Vbuffer_alist, any buffer we carry from temacs that is
+         not in the alist (a.k.a. "magic invisible buffers") should
+         be handled here explicitly.  */
       FOR_EACH_LIVE_BUFFER (tail, buffer)
         {
           struct buffer *b = XBUFFER (buffer);
           b->text->beg = NULL;
           enlarge_buffer_text (b, 0);
         }
+      /* The " prin1" buffer is not in Vbuffer_alist.  */
+      XBUFFER (Vprin1_to_string_buffer)->text->beg = NULL;
+      enlarge_buffer_text (XBUFFER (Vprin1_to_string_buffer), 0);
     }
 #endif /* USE_MMAP_FOR_BUFFERS */
 
diff --git a/src/comp.c b/src/comp.c
index 5309be46dec..a4dba435b4a 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1,4 +1,4 @@
-/* Compile elisp into native code.
+/* Compile Emacs Lisp into native code.
    Copyright (C) 2019-2021 Free Software Foundation, Inc.
 
 Author: Andrea Corallo <akrl@sdf.org>
@@ -4716,7 +4716,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
         return;
     }
 
-  /* This is to have deferred compilaiton able to compile comp
+  /* This is so deferred compilation is able to compile comp
      dependencies breaking circularity.  */
   if (!NILP (Ffeaturep (Qcomp, Qnil)))
     {
@@ -4949,7 +4949,7 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump,
       /* In case another load of the same CU is active on the stack
          all ephemeral data is hold by that frame.  Re-writing
          'data_ephemeral_vec' would be not only a waste of cycles but
-         more importanly would lead to crashed if the contained data
+         more importantly would lead to crashes if the contained data
          is not cons hashed.  */
       if (!recursive_load)
         {
diff --git a/src/dispextern.h b/src/dispextern.h
index baf92127b3d..c8cefec37f4 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1270,8 +1270,6 @@ extern struct glyph space_glyph;
 /* True means last display completed.  False means it was preempted.  */
 
 extern bool display_completed;
-extern bool delayed_size_change;
-
 
 /************************************************************************
                           Glyph Strings
diff --git a/src/dispnew.c b/src/dispnew.c
index 27603664638..ab420bc9460 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -102,7 +102,7 @@ bool display_completed;
 
 /* True means SIGWINCH happened when not safe.  */
 
-bool delayed_size_change;
+static bool delayed_size_change;
 
 /* A glyph for a space.  */
 
@@ -5815,7 +5815,6 @@ deliver_window_change_signal (int sig)
 void
 do_pending_window_change (bool safe)
 {
-  /* If window change signal handler should have run before, run it now.  */
   if (redisplaying_p && !safe)
     return;
 
@@ -5830,8 +5829,11 @@ do_pending_window_change (bool safe)
           struct frame *f = XFRAME (frame);
 
           /* Negative new_width or new_height values mean no change is
-             required (a native size can never drop below zero).  */
-          if (f->new_height >= 0 || f->new_width >= 0)
+             required (a native size can never drop below zero).  If
+             new_size_p is not set, this means the size change was
+             requested by adjust_frame_size but has not been honored by
+             the window manager yet.  */
+          if (f->new_size_p && (f->new_height >= 0 || f->new_width >= 0))
             change_frame_size (f, f->new_width, f->new_height,
                                false, false, safe);
         }
@@ -5858,14 +5860,17 @@ change_frame_size_1 (struct frame *f, int new_width, int new_height,
       /* We can't deal with the change now, queue it for later.  */
       f->new_width = new_width;
       f->new_height = new_height;
+      f->new_size_p = true;
       delayed_size_change = true;
     }
   else
     {
       /* Storing -1 in the new_width/new_height slots means that no size
-         change is pending.  Native sizes are always non-negative.  */
+         change is pending.  Native sizes are always non-negative.
+         Reset the new_size_p slot as well.  */
       f->new_height = -1;
       f->new_width = -1;
+      f->new_size_p = false;
       /* adjust_frame_size wants its arguments in terms of text_width
          and text_height, so convert them here.  For pathologically
          small frames, the resulting values may be negative though.  */
diff --git a/src/doc.c b/src/doc.c
index 01f4368e3b6..e179a126184 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -550,7 +550,7 @@ the same file name is found in the `doc-directory'.  */)
   Lisp_Object delayed_init =
     find_symbol_value (intern ("custom-delayed-init-variables"));
 
-  if (EQ (delayed_init, Qunbound)) delayed_init = Qnil;
+  if (!CONSP (delayed_init)) delayed_init = Qnil;
 
   CHECK_STRING (filename);
 
diff --git a/src/frame.c b/src/frame.c
index baa0e47f437..177022f6ebc 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -621,12 +621,8 @@ frame_size_history_extra (struct frame *f, Lisp_Object parameter,
  *   must be preserved.  The code for setting up window dividers and
  *   that responsible for wrapping the (internal) tool bar use this.
  *
- * 5 means to never call set_window_size_hook.  change_frame_size uses
- *   this.
- *
- * Note that even when set_window_size_hook is not called, individual
- * windows may have to be resized (via `window--sanitize-window-sizes')
- * in order to support minimum size constraints.
+ * 5 means to never call set_window_size_hook.  Usually this means to
+ *   call resize_frame_windows.  change_frame_size uses this.
  *
  * PRETEND is as for change_frame_size.  PARAMETER, if non-nil, is the
  * symbol of the parameter changed (like `menu-bar-lines', `font', ...).
@@ -718,6 +714,9 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
 
   if (FRAME_WINDOW_P (f)
       && f->can_set_window_size
+      /* For inhibit == 1 call the window_size_hook only if a native
+         size changes.  For inhibit == 0 or inhibit == 2 always call
+         it.  */
       && ((!inhibit_horizontal
            && (new_native_width != old_native_width
                || inhibit == 0 || inhibit == 2))
@@ -725,29 +724,25 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
               && (new_native_height != old_native_height
                   || inhibit == 0 || inhibit == 2))))
     {
-      /* Make sure we respect fullheight and fullwidth.  */
-      if (inhibit_horizontal)
-        new_native_width = old_native_width;
-      else if (inhibit_vertical)
-        new_native_height = old_native_height;
-
-      if (inhibit == 2 && f->new_width > 0 && f->new_height > 0)
+      if (inhibit == 2
+#ifdef USE_MOTIF
+          && !EQ (parameter, Qmenu_bar_lines)
+#endif
+          && (f->new_width >= 0 || f->new_height >= 0))
         /* For implied resizes with inhibit 2 (external menu and tool
            bar) pick up any new sizes the display engine has not
            processed yet.  Otherwsie, we would request the old sizes
            which will make this request appear as a request to set new
-           sizes and have the WM react accordingly which is not TRT.  */
+           sizes and have the WM react accordingly which is not TRT.
+
+           We don't that for the external menu bar on Motif.
+           Otherwise, switching off the menu bar will shrink the frame
+           and switching it on will not enlarge it.  */
         {
-          /* But don't that for the external menu bar on Motif.
-             Otherwise, switching off the menu bar will shrink the frame
-             and switching it on will not enlarge it.  */
-#ifdef USE_MOTIF
-          if (!EQ (parameter, Qmenu_bar_lines))
-#endif
-            {
-              new_native_width = f->new_width;
-              new_native_height = f->new_height;
-            }
+          if (f->new_width >= 0)
+            new_native_width = f->new_width;
+          if (f->new_height >= 0)
+            new_native_height = f->new_height;
         }
 
       if (CONSP (frame_size_history))
@@ -763,6 +758,17 @@ adjust_frame_size (struct frame *f, int new_text_width, int new_text_height,
                                    min_inner_width, min_inner_height,
                                    inhibit_horizontal, inhibit_vertical);
 
+      if (inhibit == 0 || inhibit == 1)
+        {
+          f->new_width = new_native_width;
+          f->new_height = new_native_height;
+          /* Resetting f->new_size_p is controversial: It might cause
+             do_pending_window_change drop a previous request and we are
+             in troubles when the window manager does not honor the
+             request we issue here.  */
+          f->new_size_p = false;
+        }
+
       if (FRAME_TERMINAL (f)->set_window_size_hook)
         FRAME_TERMINAL (f)->set_window_size_hook
           (f, 0, new_native_width, new_native_height);
diff --git a/src/frame.h b/src/frame.h
index f89151c40ed..399948fa7ed 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -453,6 +453,11 @@ struct frame
      frame is in the process of being redisplayed.  */
   bool_bf inhibit_clear_image_cache : 1;
 
+  /* True when new_width or new_height were set by change_frame_size,
+     false when they were set by adjust_frame_size internally or not
+     set.  */
+  bool_bf new_size_p;
+
   /* Bitfield area ends here.  */
 
   /* This frame's change stamp, set the last time window change
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 897eade8503..81033b2b12b 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1004,16 +1004,18 @@ void
 xg_frame_resized (struct frame *f, int width, int height)
 {
   /* Ignore case where size of native rectangle didn't change.  */
-  if (width != FRAME_PIXEL_WIDTH (f) || height != FRAME_PIXEL_HEIGHT (f)
-      || (delayed_size_change
-          && (width != f->new_width || height != f->new_height)))
+  if (width != FRAME_PIXEL_WIDTH (f)
+      || height != FRAME_PIXEL_HEIGHT (f)
+      || (f->new_size_p
+          && ((f->new_width >= 0 && width != f->new_width)
+              || (f->new_height >= 0 && height != f->new_height))))
     {
       if (CONSP (frame_size_history))
         frame_size_history_extra
           (f, build_string ("xg_frame_resized, changed"),
            FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
-           delayed_size_change ? f->new_width : -1,
-           delayed_size_change ? f->new_height : -1);
+           f->new_size_p ? f->new_width : -1,
+           f->new_size_p ? f->new_height : -1);
 
       FRAME_RIF (f)->clear_under_internal_border (f);
       change_frame_size (f, width, height, false, true, false);
@@ -1024,8 +1026,8 @@ xg_frame_resized (struct frame *f, int width, int height)
     frame_size_history_extra
       (f, build_string ("xg_frame_resized, unchanged"),
        FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
-       delayed_size_change ? f->new_width : -1,
-       delayed_size_change ? f->new_height : -1);
+       f->new_size_p ? f->new_width : -1,
+       f->new_size_p ? f->new_height : -1);
 
 }
 
@@ -1180,6 +1182,12 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
      the frame is mapped again we will (hopefully) get the correct size.  */
   if (FRAME_VISIBLE_P (f) && !was_visible)
     {
+      if (CONSP (frame_size_history))
+        frame_size_history_extra
+          (f, build_string ("xg_frame_set_char_size, visible"),
+           FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
+           f->new_width, f->new_height);
+
       /* Must call this to flush out events */
       (void)gtk_events_pending ();
       gdk_flush ();
@@ -1187,12 +1195,6 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
       x_wait_for_event (f, ConfigureNotify);
 #endif
 
-      if (CONSP (frame_size_history))
-        frame_size_history_extra
-          (f, build_string ("xg_frame_set_char_size, visible"),
-           FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
-           f->new_width, f->new_height);
-
       if (!NILP (fullscreen))
         /* Try to restore fullscreen state.  */
         {
diff --git a/src/nsfns.m b/src/nsfns.m
index 054777aa66f..1f281f75fd4 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -668,11 +668,7 @@ ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
        }
     }
 
-  {
-    NSTRACE_MSG ("inhibit:%d", inhibit);
-
-    adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
-  }
+  adjust_frame_size (f, -1, -1, 2, false, Qtool_bar_lines);
 }
 
 static void
@@ -1070,7 +1066,6 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
   Lisp_Object parent, parent_frame;
   struct kboard *kb;
   static int desc_ctr = 1;
-  int x_width = 0, x_height = 0;
 
   /* gui_display_get_arg modifies parms.  */
   parms = Fcopy_alist (parms);
diff --git a/src/nsterm.m b/src/nsterm.m
index b135e359f5d..6e7ab1266ba 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7296,7 +7296,7 @@ not_in_argv (NSString *arg)
 - (void)viewDidResize:(NSNotification *)notification
 {
   NSRect frame = [self frame];
-  int neww, newh;
+  int neww, newh, oldw, oldh;
 
   if (! FRAME_LIVE_P (emacsframe))
     return;
@@ -7305,25 +7305,25 @@ not_in_argv (NSString *arg)
 
   neww = (int)NSWidth (frame);
   newh = (int)NSHeight (frame);
+  oldw = FRAME_PIXEL_WIDTH (emacsframe);
+  oldh = FRAME_PIXEL_HEIGHT (emacsframe);
+
+  /* Don't want to do anything when the view size hasn't changed. */
+  if ((oldh == newh && oldw == neww)
+      || (emacsframe->new_size_p
+          && newh == emacsframe->new_height
+          && neww == emacsframe->new_width))
+    {
+      NSTRACE_MSG ("No change");
+      return;
+    }
+
   NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
+  NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
 
 #ifdef NS_DRAW_TO_BUFFER
   if ([self wantsUpdateLayer])
     {
-      CGFloat scale = [[self window] backingScaleFactor];
-      NSSize size = [surface getSize];
-      int oldw = size.width / scale;
-      int oldh = size.height / scale;
-
-      NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
-
-      /* Don't want to do anything when the view size hasn't changed. */
-      if ((oldh == newh && oldw == neww))
-        {
-          NSTRACE_MSG ("No change");
-          return;
-        }
-
       [surface release];
       surface = nil;
 
@@ -7331,10 +7331,6 @@ not_in_argv (NSString *arg)
     }
 #endif
 
-  /* I'm not sure if it's safe to call this every time the view
-     changes size, as Emacs may already know about the change.
-     Unfortunately there doesn't seem to be a bullet-proof method of
-     determining whether we need to call it or not.  */
   change_frame_size (emacsframe, neww, newh, false, YES, false);
 
   SET_FRAME_GARBAGED (emacsframe);
diff --git a/src/xterm.c b/src/xterm.c
index 5049f72ca63..189e3a47eea 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9071,8 +9071,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
              to check the pixel dimensions as well.  */
           if (width != FRAME_PIXEL_WIDTH (f)
               || height != FRAME_PIXEL_HEIGHT (f)
-              || (delayed_size_change
-                  && (width != f->new_width || height != f->new_height)))
+              || (f->new_size_p
+                  && ((f->new_width >= 0 && width != f->new_width)
+                      || (f->new_height >= 0 && height != f->new_height))))
             {
               change_frame_size (f, width, height, false, true, false);
               x_clear_under_internal_border (f);