From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 92b609c: Restore old echo_truncate condition Date: Sun, 17 Jun 2018 14:45:32 -0400 Message-ID: References: <20180616212217.23489.78551@vcs0.savannah.gnu.org> <20180616212218.9EA67204ED@vcs0.savannah.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1529261048 10267 195.159.176.226 (17 Jun 2018 18:44:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 17 Jun 2018 18:44:08 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Daniel Colascione Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jun 17 20:44:04 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fUceg-0002WC-KX for ged-emacs-devel@m.gmane.org; Sun, 17 Jun 2018 20:44:02 +0200 Original-Received: from localhost ([::1]:56082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUcgn-0006aO-IK for ged-emacs-devel@m.gmane.org; Sun, 17 Jun 2018 14:46:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUcgD-0006a8-Ju for emacs-devel@gnu.org; Sun, 17 Jun 2018 14:45:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUcgA-00064X-GU for emacs-devel@gnu.org; Sun, 17 Jun 2018 14:45:37 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:59495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUcgA-00064L-3Y for emacs-devel@gnu.org; Sun, 17 Jun 2018 14:45:34 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id w5HIjW2v020161; Sun, 17 Jun 2018 14:45:32 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 425CA656ED; Sun, 17 Jun 2018 14:45:32 -0400 (EDT) In-Reply-To: <20180616212218.9EA67204ED@vcs0.savannah.gnu.org> (Daniel Colascione's message of "Sat, 16 Jun 2018 17:22:18 -0400 (EDT)") X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered TRK_NCM1=0.1, EDT_SA_DN_PASS=0, RV6309=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6309> : inlines <6702> : streams <1789969> : uri <2659821> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:226418 Archived-At: > Restore old echo_truncate condition Is there some bug report, or message we could link t, or even better a test we could add to avoid such a regression? This code is fiendishly intricate in my experience, so such a revert needs a comment explaining what we learned along the way. Stefan > * src/keyboard.c (read_key_sequence): Restore old > echo_truncate condition. > --- > src/keyboard.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/src/keyboard.c b/src/keyboard.c > index 5409918..aa58e26 100644 > --- a/src/keyboard.c > +++ b/src/keyboard.c > @@ -8888,9 +8888,6 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt, > /* Whether each event in the mocked input came from a mouse menu. */ > bool used_mouse_menu_history[READ_KEY_ELTS] = {0}; > > - /* Distinguish first time through from replay with mock_input == 0. */ > - bool is_replay = false; > - > /* If the sequence is unbound in submaps[], then > keybuf[fkey.start..fkey.end-1] is a prefix in Vfunction_key_map, > and fkey.map is its binding. > @@ -8999,9 +8996,8 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt, > /* These are no-ops the first time through, but if we restart, they > revert the echo area and this_command_keys to their original state. */ > this_command_key_count = keys_start; > - if (INTERACTIVE && is_replay) > + if (INTERACTIVE && t < mock_input) > echo_truncate (echo_start); > - is_replay = true; > > /* If the best binding for the current key sequence is a keymap, or > we may be looking at a function key's escape sequence, keep on > > _______________________________________________ > Emacs-diffs mailing list > Emacs-diffs@gnu.org > https://lists.gnu.org/mailman/listinfo/emacs-diffs