master df25bd12fc3: Merge from savannah/emacs-30

[Andrea Corallo]

branch: master
commit df25bd12fc323b2e6ac76f05882d3902ce92b4cf
Merge: d458664e893 976416bebe2
Author: Andrea Corallo <acorallo@gnu.org>
Commit: Andrea Corallo <acorallo@gnu.org>

    Merge from savannah/emacs-30
    
    976416bebe2 Fix some function type declaration
    23549d71751 * src/image.c (gui_put_x_image): Avoid memory leak.
    cb633820c15 ; * doc/misc/use-package.texi (Getting Started): Fix word...
---
 doc/misc/use-package.texi | 4 ++--
 lisp/subr.el              | 2 +-
 lisp/window.el            | 4 ++--
 src/image.c               | 9 ++-------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/doc/misc/use-package.texi b/doc/misc/use-package.texi
index 8a7af5bc6f6..9e11b349f20 100644
--- a/doc/misc/use-package.texi
+++ b/doc/misc/use-package.texi
@@ -180,8 +180,8 @@ loading actually occurs.  As you might expect, you can use
 The above declarations will load the @samp{foo} package immediately.  In
 most cases, this is not necessary or desirable, as that will slow down
 Emacs startup.  Instead, you should try to set things up so that
-packages are only loaded when they are actually needed
-(``autoloading'').  If you have installed a package from @acronym{GNU}
+packages are only loaded when they are actually needed (this is known as
+``autoloading'').  If you have installed a package from @acronym{GNU}
 @acronym{ELPA} that provides its own autoloads, it is often enough to
 say:
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 8c20fc5e9d4..1389f446d35 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -481,7 +481,7 @@ for the sake of consistency.
 
 To alter the look of the displayed error messages, you can use
 the `command-error-function' variable."
-  (declare (ftype (function (string &rest t) nil))
+  (declare (ftype (function (&rest t) nil))
            (advertised-calling-convention (string &rest args) "23.1"))
   (signal 'error (list (apply #'format-message args))))
 
diff --git a/lisp/window.el b/lisp/window.el
index 60040f18bc7..006cfa19525 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2515,7 +2515,7 @@ have special meanings:
 
 Any other value of ALL-FRAMES means consider all windows on the
 selected frame and no others."
-  (declare (ftype (function (&optional t t t) (or window null)))
+  (declare (ftype (function (&optional t t t t) (or window null)))
            (side-effect-free error-free))
   (let ((windows (window-list-1 nil 'nomini all-frames))
         best-window best-time second-best-window second-best-time time)
@@ -2595,7 +2595,7 @@ have special meanings:
 
 Any other value of ALL-FRAMES means consider all windows on the
 selected frame and no others."
-  (declare (ftype (function (&optional t t t) (or window null)))
+  (declare (ftype (function (&optional t t t t) (or window null)))
            (side-effect-free error-free))
   (let ((best-size 0)
        best-window size)
diff --git a/src/image.c b/src/image.c
index 9d97337fd31..1b26af05351 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4177,7 +4177,7 @@ static void
 gui_put_x_image (struct frame *f, Emacs_Pix_Container pimg,
                  Emacs_Pixmap pixmap, int width, int height)
 {
-#if defined USE_CAIRO || defined HAVE_HAIKU
+#if defined USE_CAIRO || defined HAVE_HAIKU || defined HAVE_NS
   eassert (pimg == pixmap);
 #elif defined HAVE_X_WINDOWS
   GC gc;
@@ -4189,12 +4189,7 @@ gui_put_x_image (struct frame *f, Emacs_Pix_Container 
pimg,
   XFreeGC (FRAME_X_DISPLAY (f), gc);
 #elif defined HAVE_ANDROID
   android_put_image (pixmap, pimg);
-#endif
-
-#ifdef HAVE_NS
-  eassert (pimg == pixmap);
-  ns_retain_object (pimg);
-#endif
+#endif /* HAVE_ANDROID */
 }
 
 /* Thin wrapper for image_create_x_image_and_pixmap_1, so that it matches