From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "" Newsgroups: gmane.lisp.guile.bugs Subject: bug#45339: Readline filename completion Date: Wed, 19 May 2021 17:24:52 +0200 Message-ID: <87a6oqzr1v.fsf@riseup.net> References: <87mty87okl.fsf@riseup.net> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14054"; mail-complaints-to="usenet@ciao.gmane.io" To: 45339@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Wed May 19 17:28:33 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 1ljO7d-0003Rn-7V for guile-bugs@m.gmane-mx.org; Wed, 19 May 2021 17:28:33 +0200 Original-Received: from localhost ([::1]:43780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljO7Z-0003Pn-56 for guile-bugs@m.gmane-mx.org; Wed, 19 May 2021 11:28:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljO6C-00022G-EO for bug-guile@gnu.org; Wed, 19 May 2021 11:27:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljO6A-0005Yi-8m for bug-guile@gnu.org; Wed, 19 May 2021 11:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljO6A-0006nT-5c for bug-guile@gnu.org; Wed, 19 May 2021 11:27:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87mty87okl.fsf@riseup.net> Resent-From: "" Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Wed, 19 May 2021 15:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45339 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch Original-Received: via spool by 45339-submit@debbugs.gnu.org id=B45339.162143800026091 (code B ref 45339); Wed, 19 May 2021 15:27:02 +0000 Original-Received: (at 45339) by debbugs.gnu.org; 19 May 2021 15:26:40 +0000 Original-Received: from localhost ([127.0.0.1]:60483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljO5o-0006ml-Dr for submit@debbugs.gnu.org; Wed, 19 May 2021 11:26:40 -0400 Original-Received: from mx1.riseup.net ([198.252.153.129]:60312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljO5m-0006mT-FV for 45339@debbugs.gnu.org; Wed, 19 May 2021 11:26:39 -0400 Original-Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FlcCr6lr5zDq8D for <45339@debbugs.gnu.org>; Wed, 19 May 2021 08:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1621437992; bh=+8APy9GZSC5WvYOhcaqnMlTbC/qnVFwlplDLmoIPcEg=; h=From:To:Subject:Date:From; b=mWwfsBmp2nXuGaP25CejoW8qvL5nmst/n/cO52/Wu6gatFx1Qkg79dZOYHJLiOEOg 1xq/CYB36yOSOBlILThSC+1onZGjkQeBHZcyNU/QiY0bKOEa9k0+6MQRk2hFRJcM8m f3vqIIYXSuOO5eS39ZkypYA1Z8fgqhECAf4B3uw8= X-Riseup-User-ID: 651DA757C847A3039437A901A47C3C42BEC9755F3050C310DE7C25A221A0FBB1 Original-Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4FlcCr1LMFz1yBY for <45339@debbugs.gnu.org>; Wed, 19 May 2021 08:26:31 -0700 (PDT) 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:10097 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Since my patch didn't follow GNU C style here's an update. Sorry guys! --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=Fixed-style-for-02439a124.patch Content-Transfer-Encoding: quoted-printable From=200a62b75813cd8a94b87284395ee8d97e16069bb0 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) =2D-- 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 =2D-- 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; =2D 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, "filena= me-completion-function", 2, s =3D filename_completion_function (c_text, scm_is_true (continuep)); #endif free (c_text); =2D if (!s) { + if (!s) return SCM_BOOL_F; =2D } =2D ans =3D scm_take_locale_string (s); =2D return ans; + + return scm_take_locale_string (s); } #undef FUNC_NAME =20 =2D-=20 2.31.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFHBAEBCAAxFiEEjyJ5FFWW4Y1mdT0FcTDfCUiwZWUFAmClLg0THGpha3ViLXdA cmlzZXVwLm5ldAAKCRBxMN8JSLBlZRdRB/4pz7orKsbryfKOWW4RJeGonvyPdBdg lv35erjx5DzJaxPnWWWH2CzUcPHl1mfRD+1Z04xz0Go1L5o+o4mNYJtYhi4+VkNH yr0V2cDk30Qgm2NNcwnpvDlC/8QX60VIxq6fgqQXOox8r6HJm/SP7GXaVXJqNpYh sCCzc3r61XYm0PRo2fnSZRVg5FlNoMMaTLLR+W3XYujjImOyjoxk8kUrieyv2eHL 4Pn0HmRWIz9MAvzJn+InrCNTmvp379CTMR1RCK/VqG9LjMzTrR4iwGEburtJ7bTd hAxtATL5hw9s8Egg/34do22mXLtBm8LiXvby993vCuKpmlL9Ho/nuNlB =KRhL -----END PGP SIGNATURE----- --==-=-=--