aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2021-11-25 20:54:07 +0200
committerEli Zaretskii2021-11-25 20:54:07 +0200
commit0c44b8edb4778bbbc536d67b617e93a152b948de (patch)
treee42d163336eba4a158239b84b8cb053e220f2af9
parent7f14723aa2b6c89f4e2e3895ff0fb1b931f83755 (diff)
downloademacs-0c44b8edb4778bbbc536d67b617e93a152b948de.tar.gz
emacs-0c44b8edb4778bbbc536d67b617e93a152b948de.zip
Fix handling of '--dump-file' command-line option
* lisp/startup.el (command-line-1): Handle "--dump-file" and "--seccomp" if they are left on the command-line. (Bug#52106)
-rw-r--r--lisp/startup.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index e1106419f10..fc085e6d0ef 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2393,6 +2393,7 @@ A fancy display is used on graphic displays, normal otherwise."
2393 ;; and long versions of what's on command-switch-alist. 2393 ;; and long versions of what's on command-switch-alist.
2394 (longopts 2394 (longopts
2395 (append '("--funcall" "--load" "--insert" "--kill" 2395 (append '("--funcall" "--load" "--insert" "--kill"
2396 "--dump-file" "--seccomp"
2396 "--directory" "--eval" "--execute" "--no-splash" 2397 "--directory" "--eval" "--execute" "--no-splash"
2397 "--find-file" "--visit" "--file" "--no-desktop") 2398 "--find-file" "--visit" "--file" "--no-desktop")
2398 (mapcar (lambda (elt) (concat "-" (car elt))) 2399 (mapcar (lambda (elt) (concat "-" (car elt)))
@@ -2554,6 +2555,11 @@ nil default-directory" name)
2554 (error "File name omitted from `-insert' option")) 2555 (error "File name omitted from `-insert' option"))
2555 (insert-file-contents (command-line-normalize-file-name tem))) 2556 (insert-file-contents (command-line-normalize-file-name tem)))
2556 2557
2558 ((or (equal argi "-dump-file")
2559 (equal argi "-seccomp"))
2560 ;; This was processed in C.
2561 (or argval (pop command-line-args-left)))
2562
2557 ((equal argi "-kill") 2563 ((equal argi "-kill")
2558 (kill-emacs t)) 2564 (kill-emacs t))
2559 2565