[Emacs-diffs] trunk r118078: * lisp/frame.el (make-frame): Use t rather than nil for `w'.

[Stefan Monnier]

------------------------------------------------------------
revno: 118078
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18653
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-08 23:04:59 -0400
message:
  * lisp/frame.el (make-frame): Use t rather than nil for `w'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frame.el                  frame.el-20091113204419-o5vbwnq5f7feedwu-275

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-08 22:05:48 +0000
+++ b/lisp/ChangeLog    2014-10-09 03:04:59 +0000
@@ -1,3 +1,7 @@
+2014-10-09  Stefan Monnier  <address@hidden>
+
+       * frame.el (make-frame): Use t rather than nil for `w' (bug#18653).
+
 2014-10-08  Leo Liu  <address@hidden>
 
        * emacs-lisp/cl-extra.el (cl-fresh-line): New function.
@@ -9,8 +13,8 @@
 
 2014-10-08  Leo Liu  <address@hidden>
 
-       * progmodes/cfengine.el (cfengine3-make-syntax-cache): Always
-       return a syntax.  Replace call-process-shell-command with
+       * progmodes/cfengine.el (cfengine3-make-syntax-cache):
+       Always return a syntax.  Replace call-process-shell-command with
        process-file.  Ensure cfengine-mode-syntax-functions-regex is
        always set.  Ensure cache when cfengine-cf-promises fails.
        (Bug#18620)

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2014-10-04 08:20:24 +0000
+++ b/lisp/frame.el     2014-10-09 03:04:59 +0000
@@ -646,20 +646,23 @@
 the new frame according to its own rules."
   (interactive)
   (let* ((display (cdr (assq 'display parameters)))
-         (w (cond
-            ((assq 'terminal parameters)
-             (let ((type (terminal-live-p (cdr (assq 'terminal parameters)))))
-               (cond
-                ((null type) (error "Terminal %s does not exist"
-                                     (cdr (assq 'terminal parameters))))
-                (t type))))
-            ((assq 'window-system parameters)
-             (cdr (assq 'window-system parameters)))
-             (display
-              (or (window-system-for-display display)
-                  (error "Don't know how to interpret display %S"
-                         display)))
-            (t window-system)))
+         (w (or
+             (cond
+              ((assq 'terminal parameters)
+               (let ((type (terminal-live-p
+                            (cdr (assq 'terminal parameters)))))
+                 (cond
+                  ((null type) (error "Terminal %s does not exist"
+                                      (cdr (assq 'terminal parameters))))
+                  (t type))))
+              ((assq 'window-system parameters)
+               (cdr (assq 'window-system parameters)))
+              (display
+               (or (window-system-for-display display)
+                   (error "Don't know how to interpret display %S"
+                          display)))
+              (t window-system))
+             t))
         (oldframe (selected-frame))
         (params parameters)
         frame)
@@ -680,7 +683,7 @@
     ;; Now make the frame.
     (run-hooks 'before-make-frame-hook)
     (setq frame
-          (funcall (gui-method frame-creation-function (or w t)) params))
+          (funcall (gui-method frame-creation-function w) params))
     (normal-erase-is-backspace-setup-frame frame)
     ;; Inherit the original frame's parameters.
     (dolist (param frame-inherited-parameters)