aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Naggum1995-09-25 11:04:07 +0000
committerErik Naggum1995-09-25 11:04:07 +0000
commit2d2aae549e328d7bd2b0fab5577bfc06f73368ad (patch)
tree9d83189befb1182f8e74f7464d7ef0bcc428990e
parent955093c9e824f06638454e88c0de98f865f1c8e3 (diff)
downloademacs-2d2aae549e328d7bd2b0fab5577bfc06f73368ad.tar.gz
emacs-2d2aae549e328d7bd2b0fab5577bfc06f73368ad.zip
(command-line-1): --insert: Don't complain on --insert=file.
-rw-r--r--lisp/startup.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 523dc5c6b3c..d7f7f55b5cb 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -750,12 +750,12 @@ Type \\[describe-distribution] for information on getting the latest version."))
750 (setq file (expand-file-name file))) 750 (setq file (expand-file-name file)))
751 (load file nil t))) 751 (load file nil t)))
752 ((string-equal argi "-insert") 752 ((string-equal argi "-insert")
753 (or (stringp (car command-line-args-left))
754 (error "File name omitted from `-insert' option"))
755 (if argval 753 (if argval
756 (setq tem argval) 754 (setq tem argval)
757 (setq tem (car command-line-args-left) 755 (setq tem (car command-line-args-left)
758 command-line-args-left (cdr command-line-args-left))) 756 command-line-args-left (cdr command-line-args-left)))
757 (or (stringp tem)
758 (error "File name omitted from `-insert' option"))
759 (insert-file-contents tem)) 759 (insert-file-contents tem))
760 ((string-equal argi "-kill") 760 ((string-equal argi "-kill")
761 (kill-emacs t)) 761 (kill-emacs t))