aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-08 23:26:20 +0100
committerJuanma Barranquero2014-03-08 23:26:20 +0100
commite7db54476d83d155fffb25fdec89f09224970a44 (patch)
treef36b3a5b6c9eaba8b6ae0c7a0a6e8f2d4ebd449b
parent7359e7a8325d3ca6fa7bfd201917d08d1f9c4b9f (diff)
downloademacs-e7db54476d83d155fffb25fdec89f09224970a44.tar.gz
emacs-e7db54476d83d155fffb25fdec89f09224970a44.zip
lisp/frameset.el: Avoid computing frame-list unnecessarily.
(frameset-restore): When no frame is visible, do not generate a list of frames, just make visible the selected one.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/frameset.el2
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 @@
12014-03-08 Juanma Barranquero <lekktu@gmail.com>
2
3 * frameset.el (frameset-restore): When no frame is visible, do not
4 generate a list of frames, just make visible the selected one.
5
12014-03-08 Dmitry Gutov <dgutov@yandex.ru> 62014-03-08 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * vc/vc-git.el (vc-git-command): Turn FILE-OR-LIST into nil when 8 * 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."
1204 1204
1205 ;; Make sure there's at least one visible frame. 1205 ;; Make sure there's at least one visible frame.
1206 (unless (or (daemonp) (visible-frame-list)) 1206 (unless (or (daemonp) (visible-frame-list))
1207 (make-frame-visible (car (frame-list)))))) 1207 (make-frame-visible (selected-frame)))))
1208 1208
1209 1209
1210;; Register support 1210;; Register support