* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58dc8372a7ab14027778e3eb1f91b780f12675fa..0d1ec7033b0d55f843504b4daa9767db705da7ec 100644 (file)
--- 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 18aff5b28790cf375ca0aedcbfe6b170c31a7529..7fb21aa88ccc27e81d9790765430d896e7311990 100644 (file)
--- 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 a0bcd1fcaba00403063d307d5529b62053db613f..a9bba57d7078721fc3c23cedb1ea318e5e9eb07e 100644 (file)
--- 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