From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#38645: 26.3; minibuffer input is called with multi-line window when multi-line message is shown Date: Thu, 26 Dec 2019 22:49:45 +0200 Message-ID: <831rsqrevq.fsf@gnu.org> References: <86fthfu3qe.fsf@gmail.com> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="112505"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 38645@debbugs.gnu.org To: ynyaaa@gmail.com, martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 26 21:50:12 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ika5E-000T1i-Ef for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 Dec 2019 21:50:12 +0100 Original-Received: from localhost ([::1]:56604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ika5C-0001Y9-Dm for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 Dec 2019 15:50:10 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47829) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ika55-0001WO-Pj for bug-gnu-emacs@gnu.org; Thu, 26 Dec 2019 15:50:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ika54-0006De-PT for bug-gnu-emacs@gnu.org; Thu, 26 Dec 2019 15:50:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ika54-0006DU-M4 for bug-gnu-emacs@gnu.org; Thu, 26 Dec 2019 15:50:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ika54-000611-L7 for bug-gnu-emacs@gnu.org; Thu, 26 Dec 2019 15:50:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Dec 2019 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38645 X-GNU-PR-Package: emacs Original-Received: via spool by 38645-submit@debbugs.gnu.org id=B38645.157739339823091 (code B ref 38645); Thu, 26 Dec 2019 20:50:02 +0000 Original-Received: (at 38645) by debbugs.gnu.org; 26 Dec 2019 20:49:58 +0000 Original-Received: from localhost ([127.0.0.1]:56291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ika50-00060N-Jx for submit@debbugs.gnu.org; Thu, 26 Dec 2019 15:49:58 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:38742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ika4y-00060B-SL for 38645@debbugs.gnu.org; Thu, 26 Dec 2019 15:49:57 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:48842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ika4t-000664-9V; Thu, 26 Dec 2019 15:49:51 -0500 Original-Received: from [176.228.60.248] (port=3018 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ika4s-0001V2-MZ; Thu, 26 Dec 2019 15:49:51 -0500 In-reply-to: <86fthfu3qe.fsf@gmail.com> (ynyaaa@gmail.com) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:173792 Archived-At: > From: ynyaaa@gmail.com > Cc: 38645@debbugs.gnu.org > Date: Fri, 20 Dec 2019 11:16:31 +0900 > > With (setq resize-mini-windows t), the key sequence below shows message > in one-line window. Then input motion commands and the minibuffer is > redisplayed in one-line window. Eval: prompt is hidden. > > M-: > C-q C-j > ?a > C-x C-e Martin, what do you think about the following fix? Is it correct, and if so, safe enough for the release branch? diff --git a/src/xdisp.c b/src/xdisp.c index 3080f8920a..438267350f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11562,7 +11562,15 @@ resize_mini_window (struct window *w, bool exact_p) SET_MARKER_FROM_TEXT_POS (w->start, start); - if (EQ (Vresize_mini_windows, Qgrow_only)) + if (EQ (Vresize_mini_windows, Qgrow_only) + /* Don't automatically shrink the mini-window, even if + resize-mini-windows is t, if we are displaying an + echo-area message while the minibuffer is active. */ + || (minibuf_level > 0 + && WINDOW_LIVE_P (minibuf_window) + && XWINDOW (minibuf_window) == w + && !NILP (echo_area_buffer[0]) + && EQ (echo_area_window, minibuf_window))) { /* Let it grow only, until we display an empty message, in which case the window shrinks again. */