From: Geoff Voelker <voelker@cs.washington.edu>
Date: Fri, 26 May 1995 20:11:39 +0000 (+0000)
Subject: (command-line): Handle nil command-line-args.
X-Git-Tag: emacs-19.34~3911
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4048e56d200621a4423f8406c0af2687812fea35;p=emacs.git

(command-line): Handle nil command-line-args.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 71387028302..9b73e40a59d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -438,7 +438,7 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.")
 	     (error "Option `%s' doesn't allow an argument" argi))))
 
     ;; Re-attach the program name to the front of the arg list.
-    (setcdr command-line-args args))
+    (and command-line-args (setcdr command-line-args args)))
 
   ;; Under X Windows, this creates the X frame and deletes the terminal frame.
   (if (fboundp 'face-initialize)