From: Karl Heuer <kwzh@gnu.org>
Date: Fri, 5 Jun 1998 15:49:43 +0000 (+0000)
Subject: Clean up mechanism for removing -l loadup from end.
X-Git-Tag: emacs-20.3~720
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7fa26c0a283c0fb76c56fd913559e3188ca783b2;p=emacs.git

Clean up mechanism for removing -l loadup from end.
---

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e94482647f5..d98eda2d526 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -251,13 +251,12 @@
 
 ;; For machines with CANNOT_DUMP defined in config.h,
 ;; this file must be loaded each time Emacs is run.
-;; So run the startup code now.
+;; So run the startup code now.  First, remove `-l loadup' from args.
 
-(or (equal (nth 3 command-line-args) "dump")
-    (equal (nth 4 command-line-args) "dump")
-    (progn
-      ;; Avoid loading loadup.el a second time!
-      (setq command-line-args (cdr (cdr command-line-args)))
-      (eval top-level)))
+(if (and (equal (nth 1 command-line-args) "-l")
+	 (equal (nth 2 command-line-args) "loadup"))
+    (setcdr command-line-args (nthcdr 3 command-line-args)))
+
+(eval top-level)
 
 ;;; loadup.el ends here