From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 28 Oct 2022 21:44:44 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/feature/noverlay'
X-Git-Tag: emacs-29.0.90~1616^2~406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71589b101ccbec67fa2741856ee0add5752dea72;p=emacs.git

Merge remote-tracking branch 'origin/feature/noverlay'
---

71589b101ccbec67fa2741856ee0add5752dea72
diff --cc src/buffer.c
index d4a0c37bed5,dcb3c3944b7..b67b989326e
--- a/src/buffer.c
+++ b/src/buffer.c
@@@ -2597,7 -2664,8 +2664,8 @@@ current buffer is cleared.  */
  
        /* Do this first, so it can use CHAR_TO_BYTE
  	 to calculate the old correspondences.  */
--      set_intervals_multibyte (0);
 -      set_overlays_multibyte (0);
++      set_intervals_multibyte (false);
++      set_overlays_multibyte (false);
  
        bset_enable_multibyte_characters (current_buffer, Qnil);
  
@@@ -2784,7 -2852,8 +2852,8 @@@
        /* FIXME: Is it worth the trouble, really?  Couldn't we just throw
           away all the text-properties instead of trying to guess how
           to adjust them?  AFAICT the result is not reliable anyway.  */
--      set_intervals_multibyte (1);
 -      set_overlays_multibyte (1);
++      set_intervals_multibyte (true);
++      set_overlays_multibyte (true);
      }
  
    if (!EQ (old_undo, Qt))