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)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ce3b20246627a3f9f926bb0146736e728c3b442..8a3d6570c849a122dcedc654ca84b76d45bfad09 100644 (file)
--- 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 17327ea5c95fcc8af635ba92146053c0b42e52f8..7bcf2c1759e8bd4644c6fd346f7553c2c216e063 100644 (file)
--- 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))