From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#63399: 28.2; Documentation for yes-or-no-p wrong/different between docstring and lispref Date: Wed, 10 May 2023 12:08:24 +0200 Message-ID: <87r0rozeg7.fsf@gmx.de> References: <874jolxmyf.fsf@vagabond.tim-landscheidt.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8656"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 63399@debbugs.gnu.org To: Tim Landscheidt Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 10 12:09:15 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 1pwgl1-00022b-M1 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 10 May 2023 12:09:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwgkq-0003Sb-8W; Wed, 10 May 2023 06:09: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 1pwgkp-0003SP-Ax for bug-gnu-emacs@gnu.org; Wed, 10 May 2023 06:09: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 1pwgko-0003pI-Mp for bug-gnu-emacs@gnu.org; Wed, 10 May 2023 06:09:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwgko-0002hX-G1 for bug-gnu-emacs@gnu.org; Wed, 10 May 2023 06:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 May 2023 10:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63399 X-GNU-PR-Package: emacs Original-Received: via spool by 63399-submit@debbugs.gnu.org id=B63399.168371331410340 (code B ref 63399); Wed, 10 May 2023 10:09:02 +0000 Original-Received: (at 63399) by debbugs.gnu.org; 10 May 2023 10:08:34 +0000 Original-Received: from localhost ([127.0.0.1]:45281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwgkL-0002gg-KF for submit@debbugs.gnu.org; Wed, 10 May 2023 06:08:33 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:46401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwgkJ-0002gS-4l for 63399@debbugs.gnu.org; Wed, 10 May 2023 06:08:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1683713305; i=michael.albinus@gmx.de; bh=XdxkOKhRm0Q0cJFCdBXTesK1HeGIFzbGoAlO3TffwBI=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=eVxzxlT3uyRKdztMr/jd8Qpm31iag4giJ7EB+z8DLHZK0e+8fqbOecMSFSguGa67U 3Ao1dxYE5TtgnJJGY+fZcYRsHAE+1vKp5emmAF31S8Z2VDZaSUFG1jjpqihI5EjXXe Ykbf0EjObKjCuvHPti9IdfD/Fnz1wBfZqu5btea8U7vjc+Mf3JgOm1W0STgO0v4+E3 ngqPMbUQHG/W4QltMFeXx+kMz44/D9JMia0+zOqv4J0m0AprWFNBXIIFsXFIje+v2k ofNJeqApzBABmZZ+Xuryq586L9l1VEKpsY4E54Mu6SHSKpIK/pnOdyhBD22ToICrE3 gUnASfIjglGOg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.0]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MA7GS-1q2hIQ3wHy-00BfBl; Wed, 10 May 2023 12:08:25 +0200 In-Reply-To: <874jolxmyf.fsf@vagabond.tim-landscheidt.de> (Tim Landscheidt's message of "Tue, 09 May 2023 20:35:20 +0000") X-Provags-ID: V03:K1:NRA5rllwxKDh+lmE4rpTk/ElrERVuQstIU+rp+l7hN8F9G7USs2 9lTpkL6odUrqMEdFNndRAP2wmXH+W4qPOHIYICruSxR9oG/bsc/vdukJzocm1T//zCq4GXV r1lMYD+QtG382gYV3ED5UXMCwAAdr2ZUgTqZgw34Q0p1OfGd83SuMTrGvpnLJVwMheFUasL nAsTleOKWjSv5MiKEu/TA== UI-OutboundReport: notjunk:1;M01:P0:75NRzmTLHxw=;26su97CZg3NcE5eZLwj8g1hE6hN e+z4Dtp96eWz2aKGZ2xEVLELcme2JQgtYnB6yN3TLNCf10h22iynKBbBoe+4ZL6Woj4x/jaAL zCxByruBf6nVT7q5Zv37mZXCVhLxvOdZTEaMxcTzp0lcmkLElCwoDFuXiAaYgfK7bS8dHOWOP Xa5hRAmQe0aRpVsnmYjH4k7AZJIf2bwUXE6hD9irwjfoCCOtj9NA5cH6I2yZpJSua+eNJor6K k6BMpA4q0e/opQj7We7PUrYT0qroK+gJOQEBNekpKObShisVNY3YbO4cQoukGMsJdvXnOhJyC aI5R8zlo//JzwsuDH3rrF0/aPUbbii58kksGR8BXtoNJXpYhzXmCZhQh7zDuzWt4tE5NCePm3 ZloreuUs+jHervpW5EXOErWvO4wo848tKY2YmnZ3m4R3sgelwBguALv1HJI5vfrXFs9vvepzr fIcyp+mmBvrVJzMtVCVrtaeMIbcVVahcPR1T9BEAefosCBob0qle4uAp7gB8uazlRb+biNc6a 9gmpVax4JxT22jdExxFd9LLeRDeF2Ve9gS7tU2/UG+TZjpbUsTV2DHqtzbY1sAuMK1e1iYTiC UrRZpIwzVNLHjuc9fnK2GKqbb1nD9IeG6f0vuPoHo9cVR1pJKqQ6bfrPkL2QJKkBzsxkAiLgW o9uiTbNqvrGZ3sH7U2yQgCFom6tXEaEj91mxev24PZlIlr2A0Q7n6+zrK6Ido/jW91k8WoD0Z aRRK2Za0t+l/jKM80zWwzqS9IoRFdUdBCaPCMWYh/eSNxFzVYdUcr5WurcT11VgZffRFYQ94 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:261478 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Tim Landscheidt writes: Hi, > With the big caveat that I have never looked deeper at > Emacs's C code, the source in src/fns.c does not appear to > change the prompt given as an argument in any way, but just > append yes-or-no-prompt to it. > > Also, (elisp) Yes-or-No Queries reads (since 7f53446a10ea; > doc/lispref/minibuf.texi): > > | [=E2=80=A6] > > | Here is an example: > > | (yes-or-no-p "Do you really want to remove everything?") > > | ;; After evaluation of the preceding expression, > | ;; the following prompt appears, > | ;; with an empty minibuffer: > > | ---------- Buffer: minibuffer ---------- > | Do you really want to remove everything? (yes or no) > | ---------- Buffer: minibuffer ---------- > > | [=E2=80=A6] > > This is not the actual result: (yes-or-no-p "Do you really > want to remove everything?") gives the prompt "Do you really > want to remove everything?(yes or no) ", i. e., the space > before the parenthesis is missing. I guess we should pad the prompt with a trailing space, if there isn't any already. As we do in `y-or-no-p'. What about the appended patch? Documentation must be updated as well, of course. Best regards, Michael. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Transfer-Encoding: quoted-printable diff --git a/src/fns.c b/src/fns.c index bb6efdda655..b081cb225e1 100644 =2D-- a/src/fns.c +++ b/src/fns.c @@ -26,6 +26,7 @@ Copyright (C) 1985-2023 Free Software Foundation, Inc. #include #include #include +#include #include "lisp.h" #include "bignum.h" @@ -3234,6 +3235,12 @@ DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1= , 1, 0, if (use_short_answers) return call1 (intern ("y-or-n-p"), prompt); + { + char *s =3D SSDATA (prompt); + ptrdiff_t len =3D strlen (s); + if (!(len =3D=3D 0) && !(isspace (s[len - 1]))) + prompt =3D CALLN (Fconcat, prompt, make_string (" ", 1)); + } prompt =3D CALLN (Fconcat, prompt, Vyes_or_no_prompt); specpdl_ref count =3D SPECPDL_INDEX (); --=-=-=--