tty-handle-args fix for bug#14608

* startup.el (tty-handle-args): Don't just discard "--" and anything after.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ed8840..89d970a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-13  Glenn Morris  <rgm@gnu.org>
 
+       * startup.el (tty-handle-args):
+       Don't just discard "--" and anything after.  (Bug#14608)
+
        * emacs-lisp/lisp.el (forward-sexp, backward-sexp): Doc fixes.
 
 2013-06-13  Michael Albinus  <michael.albinus@gmx.de>

diff --git a/lisp/startup.el b/lisp/startup.el
index b7b4c15..f21e8c4 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -715,7 +715,7 @@ opening the first frame (e.g. open a connection to an X server).")
                      default-frame-alist))
              (t
                (push argi rest)))))
-    (nreverse rest)))
+    (nconc (nreverse rest) args)))
 
 (declare-function x-get-resource "frame.c"
                  (attribute class &optional component subclass))