From: Gregory Heytings <gregory@heytings.org>
To: Daniel Mendler <mail@daniel-mendler.de>
Cc: arstoffel@gmail.com, 60021@debbugs.gnu.org
Subject: bug#60021: 29.0.60; Eshell completion errors in the presence of buffer redirects
Date: Mon, 12 Dec 2022 22:24:24 +0000 [thread overview]
Message-ID: <ec23ed3e957f862ec155@heytings.org> (raw)
In-Reply-To: <87pmconwnw.fsf@daniel-mendler.de>
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
>
> 1. Start emacs -Q
> 2. M-x eshell
> 3. ls > #<*scratch*> TAB
>
Thanks for your bug report. Can you check that the attached patch fixes
that bug, without introducing other obvious regressions?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Check-that-arguments-are-strings-in-pcomplete-here-u.patch --]
[-- Type: text/x-diff; name=Check-that-arguments-are-strings-in-pcomplete-here-u.patch, Size: 1661 bytes --]
From 60416d39cda3ebf336bdb77487d3b7d8d429f1b6 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Mon, 12 Dec 2022 22:16:18 +0000
Subject: [PATCH] Check that arguments are strings in pcomplete-here-using-help
* lisp/pcomplete.el (pcomplete-here-using-help): Check that
pcomplete-args are strings before applying string operations on
them. Fixes bug#59956 and bug#60021.
---
lisp/pcomplete.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 4e3a88bbda8..c63c490bcaa 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1449,12 +1449,18 @@ pcomplete-here-using-help
The switches are obtained by calling `pcomplete-from-help' with
COMMAND and ARGS as arguments."
(while (cond
- ((string= "--" (pcomplete-arg 1))
+ ((let ((arg (pcomplete-arg 1)))
+ (if (stringp arg)
+ (string= "--" arg)))
(while (pcomplete-here (pcomplete-entries))))
- ((pcomplete-match "\\`--[^=]+=\\(.*\\)" 0)
+ ((let ((arg (pcomplete-arg 0)))
+ (if (stringp arg)
+ (pcomplete-match "\\`--[^=]+=\\(.*\\)" 0)))
(pcomplete-here (pcomplete-entries)
(pcomplete-match-string 1 0)))
- ((string-prefix-p "-" (pcomplete-arg 0))
+ ((let ((arg (pcomplete-arg 0)))
+ (if (stringp arg)
+ (string-prefix-p "-" arg)))
(pcomplete-here (apply #'pcomplete-from-help command args)))
(t (pcomplete-here* (pcomplete-entries))))))
--
2.35.1
next prev parent reply other threads:[~2022-12-12 22:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 21:23 bug#60021: 29.0.60; Eshell completion errors in the presence of buffer redirects Daniel Mendler
2022-12-12 22:24 ` Gregory Heytings [this message]
2022-12-12 22:51 ` Daniel Mendler
2022-12-12 23:34 ` Gregory Heytings
2022-12-13 13:46 ` Daniel Mendler
2022-12-13 13:50 ` Gregory Heytings
2022-12-13 14:15 ` Daniel Mendler
2022-12-13 14:20 ` Gregory Heytings
2022-12-19 22:24 ` Gregory Heytings
2022-12-20 6:45 ` Daniel Mendler
2022-12-20 8:55 ` Gregory Heytings
2022-12-20 9:47 ` Daniel Mendler
2022-12-20 10:00 ` Gregory Heytings
2022-12-29 22:03 ` Gregory Heytings
2022-12-30 4:42 ` Daniel Mendler
2022-12-12 22:41 ` Augusto Stoffel
2022-12-12 22:45 ` Daniel Mendler
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=ec23ed3e957f862ec155@heytings.org \
--to=gregory@heytings.org \
--cc=60021@debbugs.gnu.org \
--cc=arstoffel@gmail.com \
--cc=mail@daniel-mendler.de \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.