* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
@ 2019-02-05 12:48 Tadeus Prastowo
2019-08-15 16:06 ` Alex Branham
0 siblings, 1 reply; 6+ messages in thread
From: Tadeus Prastowo @ 2019-02-05 12:48 UTC (permalink / raw)
To: 34330
M-x shell<enter>
mkdir -p /tmp/A\ \&\ B/ABC<enter>
cd /tmp/A<tab>
cd /tmp/A\ \&\ B/ # auto-complete successful
cd /tmp/A\ \&\ B/A<tab> # cannot auto-complete to ABC
The following fixes the problem:
<enter>
exit<enter>
C-x k<enter>
C-x b
*scratch*
(setq
shell-command-regexp
"\\(?:\\(?:[\\][\\]\\)+\\\\[;&|
]\\|[^\\]\\\\[;&|
]\\|[^;&|
]\\)+"
shell-command-separator-regexp
"\\(?:\\(?:[\\][\\]\\)+[;&|
]\\|[^\\][;&|
]\\)*")
(with-eval-after-load "shell"
(defun shell-forward-command (&optional arg)
"Move forward across ARG shell command(s). Does not cross lines.
See `shell-command-regexp'."
(interactive "p")
(let ((limit (line-end-position)))
(if (re-search-forward (concat shell-command-regexp
"\\(\\(?:\\(?:[\\][\\]\\)+[;&|]\\|[^\\][;&|]\\)[\t ]*\\)+")
limit 'move arg)
(skip-syntax-backward " "))))
(defun shell-backward-command (&optional arg)
"Move backward across ARG shell command(s). Does not cross lines.
See `shell-command-regexp'."
(interactive "p")
(let ((limit (save-excursion (comint-bol nil) (point))))
(when (> limit (point))
(setq limit (line-beginning-position)))
(skip-syntax-backward " " limit)
(if (re-search-backward
(format "\\(?:\\(?:[\\][\\]\\)+[;&|]\\|[^\\][;&|]\\)+[\t ]*\\(%s\\)"
shell-command-regexp)
limit 'move arg)
(progn (goto-char (match-beginning 1))
(skip-chars-forward ";&|"))))))
M-x eval-buffer<enter>
M-x shell<enter>
cd /tmp/A<tab>
cd /tmp/A\ \&\ B/ # auto-complete successful
cd /tmp/A\ \&\ B/A<tab>
cd /tmp/A\ \&\ B/ABC # auto-complete successful
In GNU Emacs 27.0.50 (build 2, x86_64-pc-linux-gnu, GTK+ Version 3.18.9)
of 2019-02-04 built on lgw01-amd64-031
Windowing system distributor 'The X.Org Foundation', version 11.0.11906000
System Description: Ubuntu 16.04.5 LTS
Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Configured using:
'configure --build=x86_64-linux-gnu --prefix=/usr
'--includedir=${prefix}/include' '--mandir=${prefix}/share/man'
'--infodir=${prefix}/share/info' --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules '--libdir=${prefix}/lib/x86_64-linux-gnu'
'--libexecdir=${prefix}/lib/x86_64-linux-gnu' --disable-maintainer-mode
--disable-dependency-tracking --prefix=/usr --sharedstatedir=/var/lib
--program-suffix=-snapshot --with-modules=yes --with-x=yes
--with-x-toolkit=gtk3 --with-xwidgets=yes 'CFLAGS=-g -O2
-fstack-protector-strong -Wformat -Werror=format-security'
'CPPFLAGS=-Wdate-time -D_FORTIFY_SOURCE=2'
'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro''
Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS GLIB
NOTIFY INOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF
XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 XDBE XIM MODULES THREADS XWIDGETS
LIBSYSTEMD PDUMPER LCMS2 GMP
Important settings:
value of $LC_MONETARY: en_US.UTF-8
value of $LC_NUMERIC: en_US.UTF-8
value of $LC_TIME: en_US.UTF-8
value of $LANG: en_US.UTF-8
value of $XMODIFIERS: @im=ibus
locale-coding-system: utf-8-unix
Major mode: Lisp Interaction
Minor modes in effect:
tooltip-mode: t
global-eldoc-mode: t
eldoc-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
line-number-mode: t
transient-mark-mode: t
Load-path shadows:
None found.
Features:
(shadow sort mail-extr emacsbug message rmc puny seq byte-opt gv
bytecomp byte-compile cconv dired dired-loaddefs format-spec rfc822 mml
easymenu mml-sec password-cache epa derived epg epg-config gnus-util
rmail rmail-loaddefs time-date mm-decode mm-bodies mm-encode mail-parse
rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils elec-pair
mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks
lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar
dnd fontset image regexp-opt fringe tabulated-list replace newcomment
text-mode elisp-mode lisp-mode prog-mode register page menu-bar
rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock
syntax facemenu font-core term/tty-colors frame cl-generic cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european
ethiopic indian cyrillic chinese composite charscript charprop
case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer
cl-preloaded nadvice loaddefs button faces cus-face macroexp files
text-properties overlay sha1 md5 base64 format env code-pages mule
custom widget hashtable-print-readable backquote threads dbusbind
inotify lcms2 dynamic-setting system-font-setting font-render-setting
xwidget-internal move-toolbar gtk x-toolkit x multi-tty
make-network-process emacs)
Memory information:
((conses 16 44122 7108)
(symbols 48 5855 1)
(strings 32 14936 1959)
(string-bytes 1 491087)
(vectors 16 8761)
(vector-slots 8 112008 10734)
(floats 8 17 20)
(intervals 56 226 0)
(buffers 992 11)
(heap 1024 13015 994))
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
2019-02-05 12:48 bug#34330: 27.0.50; shell auto-complete cannot handle special characters Tadeus Prastowo
@ 2019-08-15 16:06 ` Alex Branham
2019-08-15 16:10 ` Alex Branham
0 siblings, 1 reply; 6+ messages in thread
From: Alex Branham @ 2019-08-15 16:06 UTC (permalink / raw)
To: Tadeus Prastowo; +Cc: 34330
tags 34330 + patch
quit
On Tue 05 Feb 2019 at 13:48, Tadeus Prastowo <tadeus.prastowo@unitn.it> wrote:
> M-x shell<enter>
> mkdir -p /tmp/A\ \&\ B/ABC<enter>
> cd /tmp/A<tab>
> cd /tmp/A\ \&\ B/ # auto-complete successful
> cd /tmp/A\ \&\ B/A<tab> # cannot auto-complete to ABC
This happens because `pcomplete-completions-at-point' comes before the
shell and comint filename completion in
`shell-dynamic-complete-functions'. I propose moving it to the end. This
has already been the source of a previous bug report (bug#10417). Patch attached.
Thanks,
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
2019-08-15 16:06 ` Alex Branham
@ 2019-08-15 16:10 ` Alex Branham
2019-08-23 16:02 ` Alex Branham
0 siblings, 1 reply; 6+ messages in thread
From: Alex Branham @ 2019-08-15 16:10 UTC (permalink / raw)
To: Tadeus Prastowo; +Cc: 34330
[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]
On Thu 15 Aug 2019 at 11:06, Alex Branham <alex.branham@gmail.com> wrote:
> Patch attached.
... and here's the actual patch
From 1af4915f3dc774b4fb53e2b52b1318f4b52b7ba3 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 15 Aug 2019 11:02:38 -0500
Subject: [PATCH] Fix filename completion in shell mode buffers
* lisp/shell.el (shell-dynamic-complete-functions): Move
pcomplete-completions-at-point down the list so that filename
completion has a chance to complete before pcompletion.
Fixes bug#34330
---
lisp/shell.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/shell.el b/lisp/shell.el
index 2914d1d2c8..889602d26e 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -184,14 +184,15 @@ shell buffer. The value may depend on the operating system or shell."
shell-environment-variable-completion
shell-command-completion
shell-c-a-p-replace-by-expanded-directory
- pcomplete-completions-at-point
shell-filename-completion
- comint-filename-completion)
+ comint-filename-completion
+ pcomplete-completions-at-point)
"List of functions called to perform completion.
This variable is used to initialize `comint-dynamic-complete-functions' in the
shell buffer."
:type '(repeat function)
- :group 'shell)
+ :group 'shell
+ :version "27.1")
(defcustom shell-command-regexp "[^;&|\n]+"
"Regexp to match a single command within a pipeline.
--
2.22.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-filename-completion-in-shell-mode-buffers.patch --]
[-- Type: text/x-patch, Size: 1337 bytes --]
From 1af4915f3dc774b4fb53e2b52b1318f4b52b7ba3 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 15 Aug 2019 11:02:38 -0500
Subject: [PATCH] Fix filename completion in shell mode buffers
* lisp/shell.el (shell-dynamic-complete-functions): Move
pcomplete-completions-at-point down the list so that filename
completion has a chance to complete before pcompletion.
Fixes bug#34330
---
lisp/shell.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/shell.el b/lisp/shell.el
index 2914d1d2c8..889602d26e 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -184,14 +184,15 @@ shell buffer. The value may depend on the operating system or shell."
shell-environment-variable-completion
shell-command-completion
shell-c-a-p-replace-by-expanded-directory
- pcomplete-completions-at-point
shell-filename-completion
- comint-filename-completion)
+ comint-filename-completion
+ pcomplete-completions-at-point)
"List of functions called to perform completion.
This variable is used to initialize `comint-dynamic-complete-functions' in the
shell buffer."
:type '(repeat function)
- :group 'shell)
+ :group 'shell
+ :version "27.1")
(defcustom shell-command-regexp "[^;&|\n]+"
"Regexp to match a single command within a pipeline.
--
2.22.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
2019-08-15 16:10 ` Alex Branham
@ 2019-08-23 16:02 ` Alex Branham
2019-08-23 16:59 ` Noam Postavsky
0 siblings, 1 reply; 6+ messages in thread
From: Alex Branham @ 2019-08-23 16:02 UTC (permalink / raw)
To: Alex Branham; +Cc: Tadeus Prastowo, 34330
> On Thu 15 Aug 2019 at 11:06, Alex Branham <alex.branham@gmail.com> wrote:
Is this OK to apply to master to fix the issue with completion of
filenames?
Alex
>
>>From 1af4915f3dc774b4fb53e2b52b1318f4b52b7ba3 Mon Sep 17 00:00:00 2001
> From: Alex Branham <alex.branham@gmail.com>
> Date: Thu, 15 Aug 2019 11:02:38 -0500
> Subject: [PATCH] Fix filename completion in shell mode buffers
>
> * lisp/shell.el (shell-dynamic-complete-functions): Move
> pcomplete-completions-at-point down the list so that filename
> completion has a chance to complete before pcompletion.
>
> Fixes bug#34330
> ---
> lisp/shell.el | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/shell.el b/lisp/shell.el
> index 2914d1d2c8..889602d26e 100644
> --- a/lisp/shell.el
> +++ b/lisp/shell.el
> @@ -184,14 +184,15 @@ shell buffer. The value may depend on the operating system or shell."
> shell-environment-variable-completion
> shell-command-completion
> shell-c-a-p-replace-by-expanded-directory
> - pcomplete-completions-at-point
> shell-filename-completion
> - comint-filename-completion)
> + comint-filename-completion
> + pcomplete-completions-at-point)
> "List of functions called to perform completion.
> This variable is used to initialize `comint-dynamic-complete-functions' in the
> shell buffer."
> :type '(repeat function)
> - :group 'shell)
> + :group 'shell
> + :version "27.1")
>
> (defcustom shell-command-regexp "[^;&|\n]+"
> "Regexp to match a single command within a pipeline.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
2019-08-23 16:02 ` Alex Branham
@ 2019-08-23 16:59 ` Noam Postavsky
2019-08-27 14:52 ` Alex Branham
0 siblings, 1 reply; 6+ messages in thread
From: Noam Postavsky @ 2019-08-23 16:59 UTC (permalink / raw)
To: Alex Branham; +Cc: Tadeus Prastowo, 34330
Alex Branham <alex.branham@gmail.com> writes:
> Is this OK to apply to master to fix the issue with completion of
> filenames?
Well, nobody raised any objections, so it's probably fine. I think it
would be helpful to also add a comment in the code about this, since
it's not very obvious that the order is so sensitive.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#34330: 27.0.50; shell auto-complete cannot handle special characters
2019-08-23 16:59 ` Noam Postavsky
@ 2019-08-27 14:52 ` Alex Branham
0 siblings, 0 replies; 6+ messages in thread
From: Alex Branham @ 2019-08-27 14:52 UTC (permalink / raw)
To: Noam Postavsky; +Cc: Tadeus Prastowo, 34330
tags 34330 fixed
close 34330
quit
On Fri 23 Aug 2019 at 12:59, Noam Postavsky <npostavs@gmail.com> wrote:
> Alex Branham <alex.branham@gmail.com> writes:
>
>> Is this OK to apply to master to fix the issue with completion of
>> filenames?
>
> Well, nobody raised any objections, so it's probably fine. I think it
> would be helpful to also add a comment in the code about this, since
> it's not very obvious that the order is so sensitive.
Thanks, pushed to master.
e4d17d8cb4 2019-08-27T09:51:14-05:00 "Fix filename completion in shell mode buffers"
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e4d17d8cb479ffeeb7dfb7320a1432722ac8df75
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-27 14:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 12:48 bug#34330: 27.0.50; shell auto-complete cannot handle special characters Tadeus Prastowo
2019-08-15 16:06 ` Alex Branham
2019-08-15 16:10 ` Alex Branham
2019-08-23 16:02 ` Alex Branham
2019-08-23 16:59 ` Noam Postavsky
2019-08-27 14:52 ` Alex Branham
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.