summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-10-02 01:03:22 +0000
committerKarl Heuer <kwzh@gnu.org>1996-10-02 01:03:22 +0000
commit093bcc1b4c156418b02474f741f6a596942fe6e5 (patch)
treebc0637e3651eb16ab210009f6c0f44c48d9ef855 /src/frame.c
parentb0f660a56318770b0a58e49bbcc2d687d57c90e9 (diff)
downloademacs-093bcc1b4c156418b02474f741f6a596942fe6e5.tar.gz
(store_frame_param): Allow setting a frame's minibuffer
to the value that it already has.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c5
1 files changed, 3 insertions, 2 deletions
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;