From 489ee443af957aa0cf6214988308b3fee35f5924 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 26 Jun 2025 00:02:11 +0800 Subject: [PATCH] Attempt to fix initialization of startup variables on Android * lisp/cus-start.el (standard): Revert last change if (featurep 'android), as Android systems perform dumping during the initialization of the first user session. (cherry picked from commit 704832f41b9ebf1cb2bef5f8cba4ab00fa31520f) --- lisp/cus-start.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 7e4f1a2c987..a092f1334e0 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -942,7 +942,7 @@ since it could result in memory overflow and make Emacs crash." ;; If this is NOT while dumping Emacs, set up the rest of the ;; customization info. This is the stuff that is not needed ;; until someone does M-x customize etc. - (if dump-mode + (if (or dump-mode (and (featurep 'android) (not after-init-time))) ;; Don't re-add to custom-delayed-init-variables post-startup. ;; Note this is the _only_ initialize property we handle. (if (eq (cadr (memq :initialize rest)) #'custom-initialize-delay) -- 2.39.5