(x-handle-initial-switch): New function.

1 files changed, 16 insertions, 0 deletions

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index f161f5cb202..1307376779c 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -110,6 +110,22 @@
                 x-invocation-args
                 (cdr x-invocation-args))))))
 
+;; Handle options that apply to initial frame only
+(defun x-handle-initial-switch (switch)
+  (let ((aelt (assoc switch command-line-x-option-alist)))
+    (if aelt
+        (let ((param (nth 3 aelt))
+              (value (nth 4 aelt)))
+          (if value
+              (setq initial-frame-alist
+                    (cons (cons param value)
+                          initial-frame-alist))
+            (setq initial-frame-alist
+                  (cons (cons param
+                              (car x-invocation-args))
+                        initial-frame-alist)
+                  x-invocation-args (cdr x-invocation-args)))))))
+
 ;; Make -iconic apply only to the initial frame!
 (defun x-handle-iconic (switch)
   (setq initial-frame-alist