* lisp/pcmpl-linux.el (pcomplete-pare-list): Re-add, from pcomplete.el.

Fixes: debbugs:8958

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4532eb64d9c75b18adf17f50b4ff9b0e3703b5dc..a3c69ee76d53fba9beb47cb47a4ff68807e6eba4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * pcmpl-linux.el (pcomplete-pare-list): Re-add, from pcomplete.el
+       (bug#8958).
+
 2011-07-04  Chong Yidong  <cyd@stupidchicken.com>
 
        * font-lock.el (font-lock-builtin-face): Change light background

diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 8090397627e2e6ca880c655ff6a0203838cd94b4..d75479fab3e2e96a634e9093fa2beb8aa93b3f30 100644 (file)
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -83,6 +83,19 @@
          (forward-line)))
       (pcomplete-uniqify-list points))))
 
+(defun pcomplete-pare-list (l r)
+  "Destructively remove from list L all elements matching any in list R.
+Test is done using `equal'."
+  (while (and l (and r (member (car l) r)))
+    (setq l (cdr l)))
+  (let ((m l))
+    (while m
+      (while (and (cdr m)
+                 (and r (member (cadr m) r)))
+       (setcdr m (cddr m)))
+      (setq m (cdr m))))
+  l)
+
 (defun pcmpl-linux-mountable-directories ()
   "Return a list of mountable directory names."
   (let (points)