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:35:51 +0300 |
| commit | dfa8729c1086d6461de846aad47f2a0aba732176 (patch) | |
| tree | cb70e2e7cfc0b1043dffefe37bd6cda3378c18d4 /lisp | |
| parent | b6b9d465cb81f5d35fb5c5432461ce7170759725 (diff) | |
| download | emacs-dfa8729c1086d6461de846aad47f2a0aba732176.tar.gz emacs-dfa8729c1086d6461de846aad47f2a0aba732176.tar.bz2 emacs-dfa8729c1086d6461de846aad47f2a0aba732176.zip | |
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
Diffstat (limited to 'lisp')
| -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 6aa0c129638..64c3305d4fe 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-16 Lars Magne Ingebrigtsen <larsi@gnus.org> * dom.el (dom-strings): New function. 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)) |