Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 3a43f39600c..2f1453f2a19 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -940,7 +940,7 @@ is the parameter alist of the frame being restored.  Internal use only."
 Setting position and size parameters as soon as possible helps reducing
 flickering; other parameters, like `minibuffer' and `border-width', can
 not be changed once the frame has been created.  Internal use only."
-  (cl-loop for param in '(left top with height border-width minibuffer)
+  (cl-loop for param in '(left top width height border-width minibuffer)
            when (assq param parameters) collect it))
 
 (defun frameset--restore-frame (parameters window-state filters force-onscreen)
@@ -1146,8 +1146,8 @@ All keyword parameters default to nil."
                      frame to-tty duplicate)
                 ;; Only set target if forcing displays and the target display is different.
                 (unless (or (frameset-keep-original-display-p force-display)
-                            (eq (frame-parameter nil 'display)
-                                (cdr (assq 'display frame-cfg))))
+                            (equal (frame-parameter nil 'display)
+                                   (cdr (assq 'display frame-cfg))))
                   (setq frameset--target-display (cons 'display
                                                        (frame-parameter nil 'display))
                         to-tty (null (cdr frameset--target-display))))