diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/pcmpl-unix.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/pcmpl-unix.el')
| -rw-r--r-- | lisp/pcmpl-unix.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index 70273b94a1b..49dc2d2fc6c 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -77,12 +77,13 @@ being via `pcmpl-ssh-known-hosts-file'." (let ((pcomplete-help "(fileutils)rm invocation")) (pcomplete-opt "dfirRv") (while (pcomplete-here (pcomplete-all-entries) nil - 'expand-file-name)))) + #'expand-file-name)))) ;;;###autoload (defun pcomplete/xargs () "Completion for `xargs'." - ;; FIXME: Add completion of xargs-specific arguments. + (while (string-prefix-p "-" (pcomplete-arg 0)) + (pcomplete-here (funcall pcomplete-default-completion-function))) (funcall pcomplete-command-completion-function) (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1)) pcomplete-default-completion-function))) @@ -213,7 +214,7 @@ Includes files as well as host names followed by a colon." (list string) (completion-table-subvert (pcomplete-all-entries) "" "/ssh:"))) - ((string-match "/" string) ; Local file name. + ((string-search "/" string) ; Local file name. (pcomplete-all-entries)) (t ;Host name or local file name. (append (all-completions string (pcomplete-all-entries)) |