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

diff --git a/lisp/startup.el b/lisp/startup.el
index 71387028302cf70e83550322fdbcb84808a778cf..9b73e40a59dfef2a7f95c9ece46db0d530b0255e 100644 (file)
--- 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)