2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bbc084319b..a0791284bca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-restore): When no frame is visible, do not
+        generate a list of frames, just make visible the selected one.
+
 2014-03-08  Dmitry Gutov  <dgutov@yandex.ru>
 
         * vc/vc-git.el (vc-git-command): Turn FILE-OR-LIST into nil when
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 6fd23f739ae..d6742d89632 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1204,7 +1204,7 @@ All keyword parameters default to nil."
 
     ;; Make sure there's at least one visible frame.
     (unless (or (daemonp) (visible-frame-list))
-      (make-frame-visible (car (frame-list))))))
+      (make-frame-visible (selected-frame)))))
 
 
 ;; Register support