zsh-workers
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: "zsh-workers@zsh.org" <zsh-workers@zsh.org>
Subject: Re: [PATCH?] Re: Autocorrect for commands with a hyphen (dash) in the name
Date: Sun, 24 May 2020 22:46:52 -0700	[thread overview]
Message-ID: <CAH+w=7agasTxfW3fWJ_=TA3-echQuOzCt9J9aGbu=xTGxbXUDg@mail.gmail.com> (raw)
In-Reply-To: <CAH+w=7bSu-HTLWCAxP2tkLL7uWRxF9FSgggbOyK=jxp1jJt5+Q@mail.gmail.com>

> spckword() modifies the original input string in place, to return the
> best guess.  In both lex.c and zle_tricky.c, that result string is
> then used in later code, which means if it goes in tokenized it ought
> to come back out that way as well.

Maybe this is just the best way to deal with this mess.

diff --git a/Src/utils.c b/Src/utils.c
index 5158a70..118e132 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -3151,8 +3151,12 @@ spckword(char **s, int hist, int cmd, int ask)
     if (*t == Tilde || *t == Equals || *t == String)
     t++;
     for (; *t; t++)
-    if (itok(*t))
-        return;
+    if (itok(*t)) {
+        if (*t == Dash)
+        *t = '-';
+        else
+        return;
+    }
     best = NULL;
     for (t = *s; *t; t++)
     if (*t == '/')

  reply	other threads:[~2020-05-25  5:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAOoO2vg=-9P7v=ATOzrbh6VF35o_xzK_-yF+EA6OgTHsQBik-A@mail.gmail.com>
     [not found] ` <CAH+w=7bKpm7GO2ZhbA5Apr0sBDz5=kmX1=WK2X0nTcWxpkHPPQ@mail.gmail.com>
     [not found]   ` <ab8b7655-83e8-45b2-889f-043314faea62@www.fastmail.com>
     [not found]     ` <CAH+w=7aqAO37qpSvtmJXMPWq3zP=pUAZCe3i-BFyn0knRmFjVQ@mail.gmail.com>
2020-05-23 19:33       ` Bart Schaefer
2020-05-23 19:44         ` Peter Stephenson
2020-05-23 19:54           ` Bart Schaefer
2020-05-23 20:30             ` Peter Stephenson
2020-05-23 21:18               ` Bart Schaefer
2020-05-24 17:11                 ` Peter Stephenson
2020-05-24 18:39                   ` Bart Schaefer
2020-05-25  5:46                     ` Bart Schaefer [this message]
2020-05-25 16:35                       ` Peter Stephenson
2020-05-25 21:45                         ` Bart Schaefer
2020-05-30 21:25                           ` Bart Schaefer

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

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

  git send-email \
    --in-reply-to='CAH+w=7agasTxfW3fWJ_=TA3-echQuOzCt9J9aGbu=xTGxbXUDg@mail.gmail.com' \
    --to=schaefer@brasslantern.com \
    --cc=p.w.stephenson@ntlworld.com \
    --cc=zsh-workers@zsh.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

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 NNTP newsgroup(s).