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#11339: 24.1.50; read-{buffer,file-name}-completion-ignore-case fails on non-ascii Date: Sat, 09 Nov 2019 11:20:12 +0200 Message-ID: <83eeyh9zjn.fsf@gnu.org> References: <87ehrbyg8t.fsf@escher.home> <87lfszxtcl.fsf@marxist.se> <83bltvl55x.fsf@gnu.org> <87o8xvz0hp.fsf@gmx.net> <83tv7mkb0l.fsf@gnu.org> <87d0ea9uxg.fsf@gmx.net> <83eeyphr5q.fsf@gnu.org> <87lfsvyd4i.fsf@gmx.net> <87h83jy5kp.fsf@gmx.net> <83v9rzh8gs.fsf@gnu.org> <875zjzy0yg.fsf@gmx.net> <831rulgcw3.fsf@gnu.org> <87wocb21so.fsf@gmx.net> <83tv7fekkf.fsf@gnu.org> <83h83feesw.fsf@gnu.org> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="140577"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 11339@debbugs.gnu.org, stephen.berman@gmx.net, stefan@marxist.se To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 09 10:21:16 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 1iTMvf-000aGJ-Ic for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Nov 2019 10:21:11 +0100 Original-Received: from localhost ([::1]:35454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTMvd-0007H5-Qa for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Nov 2019 04:21:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42614) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTMvW-0007Ga-Ut for bug-gnu-emacs@gnu.org; Sat, 09 Nov 2019 04:21:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iTMvV-0003QK-Ux for bug-gnu-emacs@gnu.org; Sat, 09 Nov 2019 04:21:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iTMvV-0003Q9-S5 for bug-gnu-emacs@gnu.org; Sat, 09 Nov 2019 04:21:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iTMvV-00076e-NW for bug-gnu-emacs@gnu.org; Sat, 09 Nov 2019 04:21:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Nov 2019 09:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11339 X-GNU-PR-Package: emacs Original-Received: via spool by 11339-submit@debbugs.gnu.org id=B11339.157329122927250 (code B ref 11339); Sat, 09 Nov 2019 09:21:01 +0000 Original-Received: (at 11339) by debbugs.gnu.org; 9 Nov 2019 09:20:29 +0000 Original-Received: from localhost ([127.0.0.1]:48180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTMuz-00075R-8Y for submit@debbugs.gnu.org; Sat, 09 Nov 2019 04:20:29 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:33491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTMux-00075F-Ek for 11339@debbugs.gnu.org; Sat, 09 Nov 2019 04:20:28 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:37113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iTMur-0002xD-Nz; Sat, 09 Nov 2019 04:20:21 -0500 Original-Received: from [176.228.60.248] (port=3711 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iTMur-0004of-5R; Sat, 09 Nov 2019 04:20:21 -0500 In-reply-to: (message from Stefan Monnier on Fri, 08 Nov 2019 17:36:08 -0500) 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:171311 Archived-At: > From: Stefan Monnier > Cc: stephen.berman@gmx.net, 11339@debbugs.gnu.org, stefan@marxist.se > Date: Fri, 08 Nov 2019 17:36:08 -0500 > > > The patch below fixes Stefan's simplified test case, but the original > > problem is still unsolved: "C-x b ba TAB TAB" says "Sole completion". > > > > What did I miss? > > It still fails when you swap the two elements in the list :-( > I don't have time to dig into the code now, tho, What about the below? It passes all the tests, and also fixes the original use case. diff --git a/src/minibuf.c b/src/minibuf.c index f6cf47f..1e87c50 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1323,13 +1323,13 @@ DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0, else { compare = min (bestmatchsize, SCHARS (eltstring)); - tem = Fcompare_strings (bestmatch, zero, - make_fixnum (compare), - eltstring, zero, - make_fixnum (compare), + Lisp_Object lcompare = make_fixnum (compare); + tem = Fcompare_strings (bestmatch, zero, lcompare, + eltstring, zero, lcompare, completion_ignore_case ? Qt : Qnil); matchsize = EQ (tem, Qt) ? compare : eabs (XFIXNUM (tem)) - 1; + Lisp_Object old_bestmatch = bestmatch; if (completion_ignore_case) { /* If this is an exact match except for case, @@ -1363,7 +1363,12 @@ DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0, bestmatch = eltstring; } if (bestmatchsize != SCHARS (eltstring) - || bestmatchsize != matchsize) + || bestmatchsize != matchsize + || (completion_ignore_case + && !EQ (Fcompare_strings (old_bestmatch, zero, lcompare, + eltstring, zero, lcompare, + Qnil), + Qt))) /* Don't count the same string multiple times. */ matchcount += matchcount <= 1; bestmatchsize = matchsize;