Merge from origin/emacs-30

a6c78ccf5f2 ; * src/w32fns.c (Fw32_notification_close): Fix typo (bug...
febafe37884 * test/lisp/wdired-tests.el (wdired-test-bug34915): Fix f...
846b79b6d02 Fix 'wdired-test-unfinished-edit-01'
bc154cba130 ; * src/search.c (Fre_search_forward): Clarify doc string...
53291e3d46e Fontify destructor in c++-ts-mode
d77f8a34750 Fix invalid defcustom type for erc-buffers option
d68a4ea3ec6 ; Fix 'ibuffer-do-isearch{-regexp}'
8b1a0f8695a Fix infloop in 'shell-resync-dirs'
ce13eee5ab7 ; * src/image.c (free_image_cache): Add assertion.  (Bug#...

3 files changed, 5 insertions, 2 deletions

diff --git a/src/image.c b/src/image.c
index 2ee2f3245be..3d761bd48be 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2306,6 +2306,9 @@ free_image_cache (struct frame *f)
   struct image_cache *c = FRAME_IMAGE_CACHE (f);
   ptrdiff_t i;
 
+  /* This function assumes the caller already verified that the frame's
+     image cache is non-NULL.  */
+  eassert (c);
   /* Cache should not be referenced by any frame when freed.  */
   eassert (c->refcount == 0);
 
diff --git a/src/search.c b/src/search.c
index dd813eda913..2ff8b0599c4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2279,7 +2279,7 @@ The optional second argument BOUND is a buffer position that bounds
   value of nil means search to the end of the accessible portion of
   the buffer.
 The optional third argument NOERROR indicates how errors are handled
-  when the search fails.  If it is nil or omitted, emit an error; if
+  when the search fails: if it is nil or omitted, emit an error; if
   it is t, simply return nil and do nothing; if it is neither nil nor
   t, move to the limit of search and return nil.
 The optional fourth argument COUNT is a number that indicates the
diff --git a/src/w32fns.c b/src/w32fns.c
index 7fc2f598b3e..e5798fdd84f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10472,7 +10472,7 @@ DEFUN ("w32-notification-close",
 {
   struct frame *f = SELECTED_FRAME ();
 
-  if (FIXNUMP (id) && !pfnShell_NotifyIconW)
+  if (FIXNUMP (id) && pfnShell_NotifyIconW)
     delete_tray_notification (f, XFIXNUM (id));
 
   return Qnil;