[Emacs-diffs] emacs/lisp ChangeLog pcomplete.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/01 19:39:55

Modified files:
        lisp           : ChangeLog pcomplete.el 

Log message:
        (pcomplete-std-complete): Don't try to complete past the last element.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16786&r2=1.16787
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcomplete.el?cvsroot=emacs&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16786
retrieving revision 1.16787
diff -u -b -r1.16786 -r1.16787
--- ChangeLog   1 Dec 2009 18:06:06 -0000       1.16786
+++ ChangeLog   1 Dec 2009 19:39:52 -0000       1.16787
@@ -1,5 +1,8 @@
 2009-12-01  Stefan Monnier  <address@hidden>
 
+       * pcomplete.el (pcomplete-std-complete): Don't try to complete past
+       the last element.
+
        * simple.el (normal-erase-is-backspace-mode): Fix thinko in message.
 
 2009-12-01  Glenn Morris  <address@hidden>

Index: pcomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcomplete.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- pcomplete.el        28 Nov 2009 17:06:34 -0000      1.47
+++ pcomplete.el        1 Dec 2009 19:39:55 -0000       1.48
@@ -480,7 +480,9 @@
                      (pcomplete-begin)))
            (buftext (buffer-substring beg (point)))
            (table
-            (if (not (equal pcomplete-stub buftext))
+            (cond
+             ((null completions) nil)
+             ((not (equal pcomplete-stub buftext))
                 ;; This isn't always strictly right (e.g. if
                 ;; FOO="toto/$FOO", then completion of /$FOO/bar may
                 ;; result in something incorrect), but given the lack of
@@ -491,17 +493,18 @@
                   (apply-partially
                    'pcomplete--table-subvert
                    completions
-                   (cdr prefixes) (car prefixes)))
+                 (cdr prefixes) (car prefixes))))
+             (t
               (lexical-let ((completions completions))
                 (lambda (string pred action)
                   (let ((res (complete-with-action
                               action completions string pred)))
                     (if (stringp res)
                         (pcomplete-quote-argument res)
-                      res))))))
+                      res)))))))
            (pred
             ;; pare it down, if applicable
-            (when (and pcomplete-use-paring pcomplete-seen)
+            (when (and table pcomplete-use-paring pcomplete-seen)
               (setq pcomplete-seen
                     (mapcar (lambda (f)
                               (funcall pcomplete-norm-func