Merge from origin/emacs-29

bd5115e1347 Remove Eglot activation check from find-file-hook
adc04ad5247 * src/intervals.c (set_intervals_multibyte_1): Fix bug#61887
b3e930d328e Revert inadvertent change to lisp/icomplete.el in previou...
da8e4b6fe43 Revert previous change in go-ts-mode.el
7548446194a Release ERC 5.5
585faf4c173 ; More doc improvements for OClosures
2840895c1ae Don't create GUI frames in batch sessions
452b5ed1030 ; Fix wrong error name in erc-server-908 doc string.
1e9484f2fd1 ; * etc/ERC-NEWS: Mention more deprecations.
119b3a4dba1 Minor copyedits of documentation of OClosures
3a651773d29 Eglot: pay better attention to hints' paddingLeft/Right (...

# Conflicts:
#	etc/NEWS

1 files changed, 3 insertions, 0 deletions

diff --git a/src/intervals.c b/src/intervals.c
index 75e37a8c90c..ee976fb1035 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2333,6 +2333,9 @@ set_intervals_multibyte_1 (INTERVAL i, bool multi_flag,
 
   if (TOTAL_LENGTH (i) == 0)
     {
+      /* Delete the whole subtree.  */
+      i->left = NULL;
+      i->right = NULL;
       delete_interval (i);
       return;
     }