From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#62700: 29.0.60; minibuffer-{previous,next,choose}-completion behave unintuitively when point is not at end of buffer Date: Tue, 13 Jun 2023 19:54:04 +0300 Organization: LINKOV.NET Message-ID: <86v8fruwur.fsf@mail.linkov.net> References: <8635574n10.fsf@mail.linkov.net> <868rema032.fsf@mail.linkov.net> <83r0se4bwf.fsf@gnu.org> <87pm7xkqsd.fsf@catern.com> <83jzy419bk.fsf@gnu.org> <874jourckv.fsf@catern.com> <83lei6mxa0.fsf@gnu.org> <86wn1jutxv.fsf@mail.linkov.net> <83zg6eby5t.fsf@gnu.org> <83r0qjzj22.fsf@gnu.org> <86h6rccz9c.fsf@mail.linkov.net> <83v8fsw0r9.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13611"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 62700@debbugs.gnu.org, sbaugh@janestreet.com, sbaugh@catern.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 13 18:57:20 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q97KY-0003Cp-La for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Jun 2023 18:57:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q97KK-00049q-Ry; Tue, 13 Jun 2023 12:57:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q97KJ-00048X-9T for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 12:57:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q97KI-0007Pg-S7 for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 12:57:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q97KI-0007MW-B4 for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2023 12:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Jun 2023 16:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62700 X-GNU-PR-Package: emacs Original-Received: via spool by 62700-submit@debbugs.gnu.org id=B62700.168667539928263 (code B ref 62700); Tue, 13 Jun 2023 16:57:02 +0000 Original-Received: (at 62700) by debbugs.gnu.org; 13 Jun 2023 16:56:39 +0000 Original-Received: from localhost ([127.0.0.1]:42926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q97Ju-0007Ln-SH for submit@debbugs.gnu.org; Tue, 13 Jun 2023 12:56:39 -0400 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:39689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q97Jt-0007La-Tv for 62700@debbugs.gnu.org; Tue, 13 Jun 2023 12:56:38 -0400 X-GND-Sasl: juri@linkov.net X-GND-Sasl: juri@linkov.net X-GND-Sasl: juri@linkov.net X-GND-Sasl: juri@linkov.net Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 5C916E000D; Tue, 13 Jun 2023 16:56:29 +0000 (UTC) In-Reply-To: <83v8fsw0r9.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 13 Jun 2023 05:32:10 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263335 Archived-At: >> > but today I merged from emacs-29 to master and got conflicts in >> > minibuffer.el. The conflicts were strange: they seemed to be caused >> > by gitmerge.el attempting to merge backported changes? That should >> > not happen. >> >> The merge conflict occurred because the first commit e338a8ac41d >> was pushed to emacs-29 with the keyword "backport", but 2a84ab905c8 >> without any keyword that would prevent an attempt of its merge to master. >> >> > Would you please look at minibuffer.el on the master branch and see if >> > anything there needs fixing? >> >> I checked that no problems occurred in minibuffer.el on the master branch. > > Thanks. I wasn't sure that my manual resolution of the merge conflict > in this case was correct. I looked at the patch that should be pushed to master, and noticed that probably it needs the same change that was applied in emacs-29. Maybe Spencer could confirm what would be the right patch for master.