# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1308941975 -3600
# Node ID dc88f282ddc346bc5298a95734012370bea4a430
# Parent  9a046b2e64943a1bc9f4b470eaaae5aa3a5d50c1# Parent  b3b28406da8c505b39669ed07eb6d3713e4c692c
Merge.

diff -r b3b28406da8c -r dc88f282ddc3 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 24 19:58:12 2011 +0100
+++ b/lisp/ChangeLog	Fri Jun 24 19:59:35 2011 +0100
@@ -1,3 +1,9 @@
+2011-06-23  Didier Verna  <didier@xemacs.org>
+
+	From smitchel <smitchel@bnin.net>
+	* frame.el (get-other-frame): Add missing first argument THIS to
+	the call to NEXT-FRAME.
+
 2011-06-24  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* view-less.el (view):
diff -r b3b28406da8c -r dc88f282ddc3 lisp/frame.el
--- a/lisp/frame.el	Fri Jun 24 19:58:12 2011 +0100
+++ b/lisp/frame.el	Fri Jun 24 19:59:35 2011 +0100
@@ -602,7 +602,7 @@
 	 (next (next-frame this 'visible-nomini)))
     ;; then search iconified frames
     (if (eq this next)
-	(setq next (next-frame 'visible-iconic-nomini)))
+	(setq next (next-frame this 'visible-iconic-nomini)))
     (if (eq this next)
 	;; otherwise, make a new frame
 	(make-frame)