Update Android port

* lisp/loadup.el (current-load-list): Set to empty load list
after startup.
* src/lread.c (build_load_history): Revert earlier changes.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 47565f809af7a402910627cb47ea3dfa697a8d6a..15267cca3be0179a7de6e2d5848e33e82c639be5 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -666,6 +666,13 @@ lost after dumping")))
 (setq load-file-name nil)
 (eval top-level t)
 
+;; loadup.el is loaded at startup, but clobbers current-load-list.
+;; Set current-load-list to a list containing no definitions and only
+;; its name, to prevent invalid entries from ending up in
+;; Vload_history when running temacs interactively.
+
+(setq current-load-list (list "loadup.el"))
+
 \f
 ;; Local Variables:
 ;; no-byte-compile: t

diff --git a/src/lread.c b/src/lread.c
index c29c7ede6ac8cde03e5090bb63d0fb0489d493d8..fe48e61439309b7ad0ff4c9cd50151d557830c85 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -2317,7 +2317,7 @@ static void
 build_load_history (Lisp_Object filename, bool entire)
 {
   Lisp_Object tail, prev, newelt;
-  Lisp_Object tem, tem2, association;
+  Lisp_Object tem, tem2;
   bool foundit = 0;
 
   tail = Vload_history;
@@ -2366,16 +2366,8 @@ build_load_history (Lisp_Object filename, bool entire)
      front of load-history, the most-recently-loaded position.  Also
      do this if we didn't find an existing member for the file.  */
   if (entire || !foundit)
-    {
-      association = Fnreverse (Vcurrent_load_list);
-
-      if (!NILP (association) && STRINGP (XCAR (association)))
-       /* readevalloop can be called with SOURCENAME set to some
-          nonsense value, meaning the car of ASSOCIATION will be nil
-          (or worse something else), leading to an invalid
-          Vload_history.  Ignore such invalid entries.  */
-       Vload_history = Fcons (association, Vload_history);
-    }
+    Vload_history = Fcons (Fnreverse (Vcurrent_load_list),
+                          Vload_history);
 }
 
 static void