2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 48274830763..099d3a01e3d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2363,7 +2363,8 @@ A fancy display is used on graphic displays, normal otherwise."
                (longopts
                 (append '("--funcall" "--load" "--insert" "--kill"
                           "--directory" "--eval" "--execute" "--no-splash"
-                          "--find-file" "--visit" "--file" "--no-desktop")
+                          "--find-file" "--visit" "--file" "--no-desktop"
+                          "--modern")
                         (mapcar (lambda (elt) (concat "-" (car elt)))
                                 command-switch-alist)))
                (line 0)
@@ -2514,6 +2515,9 @@ nil default-directory" name)
                          (error "File name omitted from `-insert' option"))
                      (insert-file-contents (command-line-normalize-file-name tem)))
 
+                    ((member argi '("-m" "-modern"))
+                     (modern-mode 1))
+
                     ((equal argi "-kill")
                      (kill-emacs t))
 
diff --git a/src/emacs.c b/src/emacs.c
index 059e1c6d8f0..bde2a9229a9 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2130,6 +2130,8 @@ static const struct standard_args standard_args[] =
   { "-color", "--color", 5, 0},
   { "-no-splash", "--no-splash", 3, 0 },
   { "-no-desktop", "--no-desktop", 3, 0 },
+  { "-m", "--modern", 0, 0 },
+  { "-modern", 0, 0, 0 },
   /* The following two must be just above the file-name args, to get
      them out of our way, but without mixing them with file names.  */
   { "-temacs", "--temacs", 1, 1 },