unofficial mirror of bug-guile@gnu.org 
 help / color / mirror / Atom feed
From: lloda <lloda@sarc.name>
To: jakub-w@riseup.net
Cc: 45339-done@debbugs.gnu.org
Subject: bug#45339: Readline filename completion
Date: Wed, 19 May 2021 21:31:26 +0200	[thread overview]
Message-ID: <290FCB18-EE13-4E18-9BA0-43ED1F653812@sarc.name> (raw)
In-Reply-To: <87a6oqzr1v.fsf@riseup.net>

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]


Applied in f3a23edf9ed111caab7bbad583874ad34ff8652d. Thanks!


> On 19 May 2021, at 17:24, "" <jakub-w@riseup.net> <jakub-w@riseup.net> wrote:
> 
> Since my patch didn't follow GNU C style here's an update.
> Sorry guys!
> 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Fixed-style-for-02439a124.patch --]
[-- Type: text/x-patch; x-unix-mode=0644; name="Fixed-style-for-02439a124.patch", Size: 1278 bytes --]

From 0a62b75813cd8a94b87284395ee8d97e16069bb0 Mon Sep 17 00:00:00 2001
From: jakub-w <jakub-w@riseup.net>
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 = scm_to_locale_string (text);
 #ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
   s = 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 = filename_completion_function (c_text, scm_is_true (continuep));
 #endif
   free (c_text);
-  if (!s) {
+  if (!s)
     return SCM_BOOL_F;
-  }
-  ans = scm_take_locale_string (s);
-  return ans;
+
+  return scm_take_locale_string (s);
 }
 #undef FUNC_NAME
 
-- 
2.31.1


[-- Attachment #3: Type: text/plain, Size: 1 bytes --]



      reply	other threads:[~2021-05-19 19:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-20 10:37 bug#45339: Readline filename completion Jakub Wojciech
2021-05-19 15:24 ` jakub-w
2021-05-19 19:31   ` lloda [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=290FCB18-EE13-4E18-9BA0-43ED1F653812@sarc.name \
    --to=lloda@sarc.name \
    --cc=45339-done@debbugs.gnu.org \
    --cc=jakub-w@riseup.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).