--- a/lisp/ChangeLog	Tue May 25 21:50:30 2004 +0000
+++ b/lisp/ChangeLog	Tue May 25 22:13:28 2004 +0000
@@ -1,3 +1,9 @@
+2004-04-21  Sven Grundmann  <sven@hellerhof.de>
+
+	* list-mode.el (display-completion-list): Fixed completion list was
+	taking the width of the frame and not of the window for displaying
+	the selection methods.
+
 2004-05-21  Jerry James  <james@xemacs.org>
 
 	* cl.el (cl-random-time): Chop a bignum down to a fixnum if

--- a/lisp/list-mode.el	Tue May 25 21:50:30 2004 +0000
+++ b/lisp/list-mode.el	Tue May 25 22:13:28 2004 +0000
@@ -330,19 +330,13 @@
 	(let ((win-width
 	       (or cl-window-width
 		   (if bufferp
-		       ;; This needs fixing for the case of windows 
-		       ;; that aren't the same width's the frame.
-		       ;; Sadly, the window it will appear in is not known
-		       ;; until after the text has been made.
-
 		       ;; We have to use last-nonminibuf-frame here
 		       ;; and not selected-frame because if a
 		       ;; minibuffer-only frame is being used it will
 		       ;; be the selected-frame at the point this is
 		       ;; run.  We keep the selected-frame call around
 		       ;; just in case.
-		       (frame-width (or (last-nonminibuf-frame)
-					(selected-frame)))
+               (window-width (get-lru-window (last-nonminibuf-frame)))
 		     80))))
 	  (let ((count 0)
 		(max-width 0)