From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Markus Rost Newsgroups: gmane.emacs.devel Subject: Re: completing-read case problem Date: Sun, 21 Nov 2004 00:18:20 -0500 Message-ID: <200411210518.iAL5IKJg018118@haifa.math.ias.edu> References: <200411101929.iAAJThfq007309@haifa.math.ias.edu> <200411140703.iAE73Gd1019094@haifa.math.ias.edu> <200411151943.iAFJhYL6009036@haifa.math.ias.edu> <200411152307.iAFN7TB06089@raven.dms.auburn.edu> <200411160252.iAG2qiP0017791@haifa.math.ias.edu> NNTP-Posting-Host: deer.gmane.org X-Trace: sea.gmane.org 1101014326 19481 80.91.229.6 (21 Nov 2004 05:18:46 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 21 Nov 2004 05:18:46 +0000 (UTC) Cc: teirllm@dms.auburn.edu, monnier@iro.umontreal.ca, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 21 06:18:40 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CVk7U-0001r8-00 for ; Sun, 21 Nov 2004 06:18:40 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVkGT-0007ZN-Ax for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2004 00:27:57 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CVkGL-0007Z8-Qg for emacs-devel@gnu.org; Sun, 21 Nov 2004 00:27:49 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CVkGL-0007Yw-Cn for emacs-devel@gnu.org; Sun, 21 Nov 2004 00:27:49 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVkGL-0007Yt-58 for emacs-devel@gnu.org; Sun, 21 Nov 2004 00:27:49 -0500 Original-Received: from [192.16.204.67] (helo=smtp1.ias.edu) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CVk7F-0004ti-6i; Sun, 21 Nov 2004 00:18:25 -0500 X-IAS: Institute for Advanced Study Original-Received: from yttrium.net.ias.edu (yttrium.net.ias.edu [172.16.12.11]) by smtp1.ias.edu (www.sendmail.org/2003) with SMTP id iAL5ILvt023090; Sun, 21 Nov 2004 00:18:24 -0500 (EST) Original-Received: from mailhost.math.ias.edu ([172.16.41.5]) by yttrium.net.ias.edu (NAVGW 2.5.2.9) with SMTP id M2004112100182001264 ; Sun, 21 Nov 2004 00:18:20 -0500 Original-Received: from haifa.math.ias.edu (haifa.math.ias.edu [172.16.41.42]) by mailhost.math.ias.edu (8.12.10/8.12.10) with ESMTP id iAL5HtqS017451; Sun, 21 Nov 2004 00:17:55 -0500 Original-Received: from haifa.math.ias.edu (localhost.localdomain [127.0.0.1]) by haifa.math.ias.edu (8.12.8/8.12.8) with ESMTP id iAL5IKLl018122; Sun, 21 Nov 2004 00:18:20 -0500 Original-Received: (from rost@localhost) by haifa.math.ias.edu (8.12.8/8.12.8/Submit) id iAL5IKJg018118; Sun, 21 Nov 2004 00:18:20 -0500 Original-To: rms@gnu.org In-reply-to: (message from Richard Stallman on Sat, 20 Nov 2004 20:10:48 -0500) X-Mailer: GNU Emacs 21.3+ X-Home-Page: http://www.mathematik.uni-bielefeld.de/~rost X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:30141 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:30141 > I installed the patch that Stefan sent, since the report > is that it worked well. > The installed patch doesn't work well for me. I think that one additional bogus line "goto exit;" slipped into it, see the following patch. This patch looks rather obvious to me, but since I am not a C programmer, I didn't install it myself. The second patch is Stefan's, which worked fine for me. ===Buffer *vc-diff*========================================= *** minibuf.c.~1.275.~ Sat Nov 20 23:37:08 2004 --- minibuf.c Sat Nov 20 23:55:30 2004 *************** *** 2105,2112 **** goto exit; } - goto exit; - /* Call do_completion, but ignore errors. */ SET_PT (ZV); val = internal_condition_case (complete_and_exit_1, Qerror, --- 2105,2110 ---- ============================================================ ===Buffer minibuf.diff====================================== *** minibuf.c.~1.273.~ Sun Nov 14 00:59:52 2004 --- minibuf.c Mon Nov 15 22:29:45 2004 *************** *** 2076,2085 **** if (XINT (Fminibuffer_prompt_end ()) == ZV) goto exit; ! if (!NILP (Ftest_completion (Fminibuffer_contents (), Vminibuffer_completion_table, Vminibuffer_completion_predicate))) ! goto exit; /* Call do_completion, but ignore errors. */ SET_PT (ZV); --- 2076,2102 ---- if (XINT (Fminibuffer_prompt_end ()) == ZV) goto exit; ! if (!NILP (Ftest_completion (val = Fminibuffer_contents (), Vminibuffer_completion_table, Vminibuffer_completion_predicate))) ! { ! if (completion_ignore_case) ! { /* Fixup case of the field, if necessary. */ ! Lisp_Object compl ! = Ftry_completion (val, ! Vminibuffer_completion_table, ! Vminibuffer_completion_predicate); ! if (STRINGP (compl) ! /* If it weren't for this piece of paranoia, I'd replace ! the whole thing with a call to do_completion. */ ! && EQ (Flength (val), Flength (compl))) ! { ! del_range (XINT (Fminibuffer_prompt_end ()), ZV); ! Finsert (1, &compl); ! } ! } ! goto exit; ! } /* Call do_completion, but ignore errors. */ SET_PT (ZV); ============================================================