feature/android 4ab9fa7507a 3/3: ; * lisp/loadup.el: Fix merge typos.

[Po Lu]

branch: feature/android
commit 4ab9fa7507a9843678ec7cf1f6b206476f435a26
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    ; * lisp/loadup.el: Fix merge typos.
---
 lisp/loadup.el | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/lisp/loadup.el b/lisp/loadup.el
index f6f48b3b735..3b30414b146 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -594,7 +594,7 @@ lost after dumping")))
                    (equal dump-mode "pdump"))
           ;; Don't enable this before bootstrap is completed, as the
           ;; compiler infrastructure may not be usable yet.
-          (setq native-comp-enable-subr-trampolines t))
+          (setq comp-enable-subr-trampolines t))
         (message "Dumping under the name %s" output)
         (condition-case ()
             (delete-file output)
@@ -644,17 +644,10 @@ lost after dumping")))
                 (message "Adding name %s" (concat name ".pdmp"))
                 (add-name-to-file (expand-file-name "emacs.pdmp"
                                                     invocation-directory)
-                                  (expand-file-name (concat name exe)
+                                  (expand-file-name (concat name ".pdmp")
                                                     invocation-directory)
-                                  t)
-                (when (equal dump-mode "pdump")
-                  (message "Adding name %s" (concat name ".pdmp"))
-                  (add-name-to-file (expand-file-name "emacs.pdmp"
-                                                      invocation-directory)
-                                    (expand-file-name (concat name ".pdmp")
-                                                      invocation-directory)
-                                    t))))
-          (kill-emacs)))))
+                                  t))))
+        (kill-emacs))))
 
 ;; This file must be loaded each time Emacs is run from scratch, e.g., temacs.
 ;; So run the startup code now.  First, remove `-l loadup' from args.