[Emacs-diffs] emacs-24 7b8cba9: Backport: Parse pcomplete arguments regardless of pcomplete-cycle-completions

[Dmitry Gutov]

branch: emacs-24
commit 7b8cba98bfa8fff6536b5f868d2adf2b31c75544
Author: Samer Masterson <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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)
---
 lisp/ChangeLog    |    5 +++++
 lisp/pcomplete.el |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ce3b20..8a3d657 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-16  Samer Masterson  <address@hidden>  (tiny change)
+
+       * pcomplete.el (pcomplete-parse-arguments): Parse arguments
+       regardless of pcomplete-cycle-completions's value.  (Bug#18950)
+
 2015-01-13  Michael Albinus  <address@hidden>
 
        * filenotify.el (file-notify-descriptors, file-notify-handle-event):
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 17327ea..7bcf2c1 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))