From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 2 Oct 1996 01:03:22 +0000 (+0000)
Subject: (store_frame_param): Allow setting a frame's minibuffer
X-Git-Tag: emacs-20.1~3573
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7af7ef389ac8eb504d3f3fac33555e5d9d9f9d08;p=emacs.git

(store_frame_param): Allow setting a frame's minibuffer
to the value that it already has.
---

diff --git a/src/frame.c b/src/frame.c
index a68aed314d0..27b74d5d595 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1707,8 +1707,9 @@ store_frame_param (f, prop, val)
       if (! MINI_WINDOW_P (XWINDOW (val)))
 	error ("Surrogate minibuffer windows must be minibuffer windows.");
 
-      if (FRAME_HAS_MINIBUF_P (f) || FRAME_MINIBUF_ONLY_P (f))
-	error ("can't change the surrogate minibuffer of a frame with its own minibuffer");
+      if (FRAME_HAS_MINIBUF_P (f) || FRAME_MINIBUF_ONLY_P (f)
+	  && !EQ (val, f->minibuffer_window))
+	error ("Can't change the surrogate minibuffer of a frame with its own minibuffer");
 
       /* Install the chosen minibuffer window, with proper buffer.  */
       f->minibuffer_window = val;