From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii 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 05:32:10 +0300 Message-ID: <83v8fsw0r9.fsf@gnu.org> 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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13831"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62700@debbugs.gnu.org, sbaugh@janestreet.com, sbaugh@catern.com To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 13 04:33:17 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 1q8tqP-0003L7-CC for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Jun 2023 04:33:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8tqC-0003zZ-1Z; Mon, 12 Jun 2023 22:33: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 1q8tqA-0003zJ-Mf for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 22:33:02 -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 1q8tqA-0001Bp-Dj for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 22:33:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8tqA-0000qZ-9k for bug-gnu-emacs@gnu.org; Mon, 12 Jun 2023 22:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Jun 2023 02:33: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.16866235233178 (code B ref 62700); Tue, 13 Jun 2023 02:33:02 +0000 Original-Received: (at 62700) by debbugs.gnu.org; 13 Jun 2023 02:32:03 +0000 Original-Received: from localhost ([127.0.0.1]:41033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8tpD-0000pB-39 for submit@debbugs.gnu.org; Mon, 12 Jun 2023 22:32:03 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:41562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8tpB-0000oh-6Y for 62700@debbugs.gnu.org; Mon, 12 Jun 2023 22:32:01 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8tp4-0000xp-0L; Mon, 12 Jun 2023 22:31:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=I/25OXrf5UPmCe/OFNigWNErU44/scH7mWFLlpNgT2c=; b=jhvq+I1IMSDe diIHdxZfWDhOZ4dFDFHMyOI/ktLwNVYgUWp/1ne/Fxp4cIEkqZ665cXZzMd7IlKucLmOdlJD3+wkk +F6Y+ySZxDYuP46MbI1V90jw+GV5IHyO3V6E8qZRMxbu3phfw8N0UzPciFq4Q6Z0owFr2Oaw8QKDt umEtVTCeDNVp2KrKBX6lyoJiLJizKeznejOnwyoMgnaO1kXiwQWm/smB/04R2ykD6XPNGvGEaxMNB o0aaTJ7ZXwE9JxzW9IJzKkgQa/J5l5Qj5jsOTI5KSjUsxF7v2/7ay/Xb7lhGK3eBt1lDPq0w+ckwp XrJmlFlmvcopyGEvsC2Beg==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8tp3-00055o-0a; Mon, 12 Jun 2023 22:31:53 -0400 In-Reply-To: <86h6rccz9c.fsf@mail.linkov.net> (message from Juri Linkov on Mon, 12 Jun 2023 21:27:11 +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:263302 Archived-At: > From: Juri Linkov > Cc: sbaugh@janestreet.com, 62700@debbugs.gnu.org, sbaugh@catern.com > Date: Mon, 12 Jun 2023 21:27:11 +0300 > > > 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.