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

diff --cc configure.ac
Simple merge

diff --cc src/buffer.c
index d4a0c37bed511d429e53359d2661d59dfdce984f,dcb3c3944b7b635c46de49fa1908fe678ccbe852..b67b989326eb69b01d84872756468809c8af1578
--- 1/src/buffer.c
--- 2/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))

diff --cc src/editfns.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/textprop.c
Simple merge

diff --cc src/xdisp.c
Simple merge