procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from savannah/emacs-30

Browse source 
976416bebe Fix some function type declaration
23549d7175 * src/image.c (gui_put_x_image): Avoid memory leak.
cb633820c1 ; * doc/misc/use-package.texi (Getting Started): Fix word...
This commit is contained in:
Andrea Corallo 2024-07-24 15:49:23 +02:00
commit df25bd12fc
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/use-package.texi
View file

@ -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:

2
lisp/subr.el
View file

@ -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))))

4
lisp/window.el
View file

@ -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)

9
src/image.c
View file

@ -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