aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-01-26 19:48:33 +0200
committerEli Zaretskii2019-01-26 19:48:33 +0200
commit4eb78a47e0be59c6d7b886cfe82ce56b276a52bd (patch)
tree22743bc472a48977ab3341015562ccad8fffe1ff /src
parenta7974933dd818194de3c9387b95dbd122bcf506c (diff)
downloademacs-4eb78a47e0be59c6d7b886cfe82ce56b276a52bd.tar.gz
emacs-4eb78a47e0be59c6d7b886cfe82ce56b276a52bd.zip
* src/emacs.c (load_pdump): Fix a thinko in last change.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 8a440de28a7..aed4e0d1508 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -780,11 +780,10 @@ load_pdump (int argc, char **argv)
780 sprintf (dump_file, "%s%c%s%s", 780 sprintf (dump_file, "%s%c%s%s",
781 path_exec, DIRECTORY_SEP, argv0_base, suffix); 781 path_exec, DIRECTORY_SEP, argv0_base, suffix);
782 result = pdumper_load (dump_file); 782 result = pdumper_load (dump_file);
783 if (result == PDUMPER_LOAD_SUCCESS)
784 goto out;
783 785
784 if (result != PDUMPER_LOAD_FILE_NOT_FOUND) 786 if (result == PDUMPER_LOAD_FILE_NOT_FOUND)
785 fatal ("could not load dump file \"%s\": %s",
786 dump_file, dump_error_to_string (result));
787 if (result != PDUMPER_LOAD_SUCCESS)
788 { 787 {
789 /* Finally, look for basename(argv[0])+".pdmp" in PATH_EXEC. 788 /* Finally, look for basename(argv[0])+".pdmp" in PATH_EXEC.
790 This way, they can rename both the executable and its pdump 789 This way, they can rename both the executable and its pdump
@@ -814,6 +813,10 @@ load_pdump (int argc, char **argv)
814 path_exec, DIRECTORY_SEP, argv0_base, suffix); 813 path_exec, DIRECTORY_SEP, argv0_base, suffix);
815 result = pdumper_load (dump_file); 814 result = pdumper_load (dump_file);
816 } 815 }
816 else
817 fatal ("could not load dump file \"%s\": %s",
818 dump_file, dump_error_to_string (result));
819
817 if (result != PDUMPER_LOAD_SUCCESS) 820 if (result != PDUMPER_LOAD_SUCCESS)
818 dump_file = NULL; 821 dump_file = NULL;
819 822