[Emacs-diffs] trunk r112970: tty-handle-args fix for bug#14608

[Glenn Morris]

------------------------------------------------------------
revno: 112970
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-13 13:59:10 -0400
message:
  tty-handle-args fix for bug#14608
  
  * startup.el (tty-handle-args): Don't just discard "--" and anything after.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-13 16:44:26 +0000
+++ b/lisp/ChangeLog    2013-06-13 17:59:10 +0000
@@ -1,5 +1,8 @@
 2013-06-13  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2013-04-23 21:51:40 +0000
+++ b/lisp/startup.el   2013-06-13 17:59:10 +0000
@@ -715,7 +715,7 @@
                      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))