Merge from origin/emacs-29

092a2ecb083 ; * admin/make-tarball.txt: Update based on latest experi...
7b9e83d3cf9 Fix bug#64923

2 files changed, 18 insertions, 0 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 1cc97c883af..fddf8444067 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -426,6 +426,13 @@ Now change to the 'manual' directory and invoke upload-manuals:
   If upload-manuals fails, resolve the problems and re-invoke it.
   This requires running make-manuals again, since upload-manuals
   destructively modifies the 'manual' directory where you invoke it.
+
+  If new files fail to be "cvs add"ed, they need to be manually
+  removed from under /path/to/webpages/cvs/checkout before retrying
+  upload-manuals, because if they exist, they will not be handled as
+  "new" files, and will not be "cvs add"ed by the next run of the
+  script.
+
   Also, upload-manuals invokes "cvs commit -f", so if you run it
   several times, some files will be committed more than once even
   though they were not changed in-between.  Suck it up.
diff --git a/src/xfns.c b/src/xfns.c
index 55bcfb8e20e..222e24f1326 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5393,6 +5393,17 @@ This function is an internal primitive--use `make-frame' instead.  */)
   gui_default_parameter (f, parms, Qfullscreen, Qnil,
                          "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
 
+#ifdef USE_CAIRO
+  /* Set the initial size of the Cairo surface to the frame's current
+     width and height.  If the window manager doesn't resize the new
+     frame after it's first mapped, Emacs will create a surface with
+     empty dimensions in response to to the initial exposure event,
+     which will persist until the next time it's resized.
+     (bug#64923) */
+  x_cr_update_surface_desired_size (f, FRAME_PIXEL_WIDTH (f),
+                                    FRAME_PIXEL_HEIGHT (f));
+#endif /* USE_CAIRO */
+
   /* Make the window appear on the frame and enable display, unless
      the caller says not to.  However, with explicit parent, Emacs
      cannot control visibility, so don't try.  */