aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2024-12-16 03:26:48 +0100
committerStefan Kangas2024-12-16 03:41:53 +0100
commiteaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612 (patch)
tree25645a1dbb11dbc8dd4b30630aac168f8ca8a541 /src
parent29058579e9f27872d47e9d5146dfd9ce79697a0d (diff)
downloademacs-eaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612.tar.gz
emacs-eaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612.zip
Invert preprocessor condition to fix 'C-x 4 a'
Typing 'C-x 4 a' in the main function now correctly adds 'main' to the generated ChangeLog, whereas before it added 'andreid_emacs_init'. Inverting the preprocessor condition seems like an easier fix than changing the add-change-log-entry-other-window heuristic. * src/emacs.c (main): Invert preprocessor condition to appease the 'add-change-log-entry-other-window' heuristic.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c
index bdd9eee10c4..25b014bf83c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1263,12 +1263,12 @@ maybe_load_seccomp (int argc, char **argv)
1263 1263
1264#endif /* SECCOMP_USABLE */ 1264#endif /* SECCOMP_USABLE */
1265 1265
1266#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY 1266#if !defined HAVE_ANDROID || defined ANDROID_STUBIFY
1267int 1267int
1268android_emacs_init (int argc, char **argv, char *dump_file) 1268main (int argc, char **argv)
1269#else 1269#else
1270int 1270int
1271main (int argc, char **argv) 1271android_emacs_init (int argc, char **argv, char *dump_file)
1272#endif 1272#endif
1273{ 1273{
1274 /* Variable near the bottom of the stack, and aligned appropriately 1274 /* Variable near the bottom of the stack, and aligned appropriately