From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: lloda Newsgroups: gmane.lisp.guile.bugs Subject: bug#45339: Readline filename completion Date: Wed, 19 May 2021 21:31:26 +0200 Message-ID: <290FCB18-EE13-4E18-9BA0-43ED1F653812@sarc.name> References: <87mty87okl.fsf@riseup.net> <87a6oqzr1v.fsf@riseup.net> Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_613B82B6-E77E-44C6-A411-778E9D708BC6" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3840"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 45339-done@debbugs.gnu.org To: jakub-w@riseup.net Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Wed May 19 21:50:10 2021 Return-path: Envelope-to: guile-bugs@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 1ljSCn-0000pK-Ld for guile-bugs@m.gmane-mx.org; Wed, 19 May 2021 21:50:09 +0200 Original-Received: from localhost ([::1]:47656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljSCm-0007w2-LM for guile-bugs@m.gmane-mx.org; Wed, 19 May 2021 15:50:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljRuI-0007BL-8d for bug-guile@gnu.org; Wed, 19 May 2021 15:31:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljRuI-0005Cs-0l for bug-guile@gnu.org; Wed, 19 May 2021 15:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljRuH-0004wz-T8 for bug-guile@gnu.org; Wed, 19 May 2021 15:31:01 -0400 Resent-From: lloda Original-Sender: "Debbugs-submit" Resent-To: bug-guile@gnu.org Resent-Date: Wed, 19 May 2021 19:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 45339 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch Mail-Followup-To: 45339@debbugs.gnu.org, lloda@sarc.name, jakub-w@riseup.net Original-Received: via spool by 45339-done@debbugs.gnu.org id=D45339.162145265319008 (code D ref 45339); Wed, 19 May 2021 19:31:01 +0000 Original-Received: (at 45339-done) by debbugs.gnu.org; 19 May 2021 19:30:53 +0000 Original-Received: from localhost ([127.0.0.1]:60771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljRu9-0004wW-1q for submit@debbugs.gnu.org; Wed, 19 May 2021 15:30:53 -0400 Original-Received: from mta-14-4.privateemail.com ([198.54.118.206]:14988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljRu6-0004wG-EI for 45339-done@debbugs.gnu.org; Wed, 19 May 2021 15:30:51 -0400 Original-Received: from mta-14.privateemail.com (localhost [127.0.0.1]) by mta-14.privateemail.com (Postfix) with ESMTP id 860EB8006B; Wed, 19 May 2021 15:30:44 -0400 (EDT) Original-Received: from [192.168.1.105] (unknown [10.20.151.227]) by mta-14.privateemail.com (Postfix) with ESMTPA id EF2428005F; Wed, 19 May 2021 15:30:43 -0400 (EDT) In-Reply-To: <87a6oqzr1v.fsf@riseup.net> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: "bug-guile" Xref: news.gmane.io gmane.lisp.guile.bugs:10099 Archived-At: --Apple-Mail=_613B82B6-E77E-44C6-A411-778E9D708BC6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Applied in f3a23edf9ed111caab7bbad583874ad34ff8652d. Thanks! > On 19 May 2021, at 17:24, "" = wrote: >=20 > Since my patch didn't follow GNU C style here's an update. > Sorry guys! >=20 --Apple-Mail=_613B82B6-E77E-44C6-A411-778E9D708BC6 Content-Disposition: attachment; filename=Fixed-style-for-02439a124.patch Content-Type: text/x-patch; x-unix-mode=0644; name="Fixed-style-for-02439a124.patch" Content-Transfer-Encoding: quoted-printable =46rom 0a62b75813cd8a94b87284395ee8d97e16069bb0 Mon Sep 17 00:00:00 2001 From: jakub-w Date: Wed, 19 May 2021 17:14:35 +0200 Subject: [PATCH] Fixed style for 02439a124 * guile-readline/readline.c (scm_filename_completion_function) --- guile-readline/readline.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/guile-readline/readline.c b/guile-readline/readline.c index 7bb2394ba..469d6ec7d 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -379,7 +379,6 @@ SCM_DEFINE (scm_filename_completion_function, = "filename-completion-function", 2, #define FUNC_NAME s_scm_filename_completion_function { char *s; - SCM ans; char *c_text =3D scm_to_locale_string (text); #ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION s =3D rl_filename_completion_function (c_text, scm_is_true = (continuep)); @@ -387,11 +386,10 @@ SCM_DEFINE (scm_filename_completion_function, = "filename-completion-function", 2, s =3D filename_completion_function (c_text, scm_is_true (continuep)); #endif free (c_text); - if (!s) { + if (!s) return SCM_BOOL_F; - } - ans =3D scm_take_locale_string (s); - return ans; + + return scm_take_locale_string (s); } #undef FUNC_NAME =20 --=20 2.31.1 --Apple-Mail=_613B82B6-E77E-44C6-A411-778E9D708BC6 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_613B82B6-E77E-44C6-A411-778E9D708BC6--