Re: Merging feature/android

[Robert Pluim]

>>>>> On Wed, 15 Mar 2023 08:16:26 +0800, Po Lu <luangruo@yahoo.com> said:

    Po Lu> Why isn't `format-decode' defined already when the test is run?
    Po Lu> format-decode.el is indeed preloaded.

It is defined, the code just isnʼt checking the right thing.

diff --git i/src/fileio.c w/src/fileio.c
index 99f710ccbf0..5153aeae248 100644
--- i/src/fileio.c
+++ w/src/fileio.c
@@ -5004,7 +5004,7 @@ because (1) it preserves some marker positions (in 
unchanged portions
   /* Decode file format.  Don't do this if Qformat_decode is not
      bound, which can happen when called early during loadup.  */
 
-  if (inserted > 0 && !NILP (Fboundp (Qformat_decode)))
+  if (inserted > 0 && !NILP (Ffboundp (Qformat_decode)))
     {
       /* Don't run point motion or modification hooks when decoding.  */
       specpdl_ref count1 = SPECPDL_INDEX ();
diff --git i/src/window.c w/src/window.c
index 9a29ecb8807..8c42d3cdd0c 100644
--- i/src/window.c
+++ w/src/window.c
@@ -3516,7 +3516,7 @@ replace_buffer_in_windows (Lisp_Object buffer)
 {
   /* When kill-buffer is called early during loadup, this function is
      undefined.  */
-  if (!NILP (Fboundp (Qreplace_buffer_in_windows)))
+  if (!NILP (Ffboundp (Qreplace_buffer_in_windows)))
     call1 (Qreplace_buffer_in_windows, buffer);
 }
 

Robert
--