aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el5
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7a5d6ae070..b9d97d4e140 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-08-06 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * frame.el (get-other-frame): Tiny cleanup.
4
12013-08-06 Juanma Barranquero <lekktu@gmail.com> 52013-08-06 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * vc/vc.el (vc-default-ignore-completion-table): 7 * vc/vc.el (vc-default-ignore-completion-table):
diff --git a/lisp/frame.el b/lisp/frame.el
index 9d3c839fa35..31a9123503d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -500,10 +500,7 @@ See help of `modify-frame-parameters' for more information."
500 "Return some frame other than the current frame. 500 "Return some frame other than the current frame.
501Create one if necessary. Note that the minibuffer frame, if separate, 501Create one if necessary. Note that the minibuffer frame, if separate,
502is not considered (see `next-frame')." 502is not considered (see `next-frame')."
503 (let ((s (if (equal (next-frame (selected-frame)) (selected-frame)) 503 (if (equal (next-frame) (selected-frame)) (make-frame) (next-frame)))
504 (make-frame)
505 (next-frame (selected-frame)))))
506 s))
507 504
508(defun next-multiframe-window () 505(defun next-multiframe-window ()
509 "Select the next window, regardless of which frame it is on." 506 "Select the next window, regardless of which frame it is on."