diff options
| author | Samer Masterson <samer@samertm.com> | 2015-01-16 05:35:51 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-16 05:43:39 +0300 |
| commit | 7b8cba98bfa8fff6536b5f868d2adf2b31c75544 (patch) | |
| tree | 7c264974ad9eccd65b62e18e2b8f1634f9d762fa | |
| parent | a3505cb3ef00ad3c9f886e2eb7f245845eb4c1ee (diff) | |
| download | emacs-7b8cba98bfa8fff6536b5f868d2adf2b31c75544.tar.gz | |
Backport: Parse pcomplete arguments regardless of pcomplete-cycle-completions
* pcomplete.el (pcomplete-parse-arguments): Parse arguments regardless
of pcomplete-cycle-completions's value.
Fixes: debbugs:18950
(cherry picked from commit dfa8729c1086d6461de846aad47f2a0aba732176)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pcomplete.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3ce3b202466..8a3d6570c84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-16 Samer Masterson <samer@samertm.com> (tiny change) + + * pcomplete.el (pcomplete-parse-arguments): Parse arguments + regardless of pcomplete-cycle-completions's value. (Bug#18950) + 2015-01-13 Michael Albinus <michael.albinus@gmx.de> * filenotify.el (file-notify-descriptors, file-notify-handle-event): diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 17327ea5c95..7bcf2c1759e 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -755,8 +755,7 @@ this is `comint-dynamic-complete-functions'." pcomplete-index 0 pcomplete-stub (pcomplete-arg 'last)) (let ((begin (pcomplete-begin 'last))) - (if (and pcomplete-cycle-completions - (listp pcomplete-stub) ;?? + (if (and (listp pcomplete-stub) ;?? (not pcomplete-expand-only-p)) (let* ((completions pcomplete-stub) ;?? (common-stub (car completions)) |