* lisp/frame.el: Use lexical-binding.

(make-frame): Use t rather than nil for tty's window-system.
* lisp/startup.el (command-line): Use gui-method.

Fixes: debbugs:18598

3 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58dc8372a7a..0d1ec7033b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2014-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * frame.el: Use lexical-binding (bug#18598).
+        (make-frame): Use t rather than nil for tty's window-system.
+        * startup.el (command-line): Use gui-method.
+
         Consolidate management/ownership of selections.
         * select.el (gui-get-selection-alist): New method.
         (gui-get-selection): Use it.  Rename from x-get-selection.
diff --git a/lisp/frame.el b/lisp/frame.el
index 18aff5b2879..7fb21aa88cc 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,4 +1,4 @@
-;;; frame.el --- multi-frame management independent of window systems
+;;; frame.el --- multi-frame management independent of window systems  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1993-1994, 1996-1997, 2000-2014 Free Software Foundation, Inc.
 
@@ -680,7 +680,7 @@ the new frame according to its own rules."
     ;; Now make the frame.
     (run-hooks 'before-make-frame-hook)
     (setq frame
-          (funcall (gui-method frame-creation-function w) params))
+          (funcall (gui-method frame-creation-function (or w t)) params))
     (normal-erase-is-backspace-setup-frame frame)
     ;; Inherit the original frame's parameters.
     (dolist (param frame-inherited-parameters)
diff --git a/lisp/startup.el b/lisp/startup.el
index a0bcd1fcaba..a9bba57d707 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -954,8 +954,7 @@ please check its value")
              command-line-args))
       ;; Initialize the window system. (Open connection, etc.)
       (funcall
-       (or (cdr (assq initial-window-system window-system-initialization-alist))
-           (error "Unsupported window system `%s'" initial-window-system)))
+       (gui-method window-system-initialization (or initial-window-system t)))
       (put initial-window-system 'window-system-initialized t))
     ;; If there was an error, print the error message and exit.
     (error