(pcomplete/kill): Don't abuse pcomplete-entries.

(pcmpl-linux-fs-types): Same, and update to new modules layout.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95ab875f504334fbf632775023ecb7d0f340ea04..5c056104bb19fd35b7fd58643dce9b0224864ecc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * pcmpl-linux.el (pcomplete/kill): Don't abuse pcomplete-entries.
+       (pcmpl-linux-fs-types): Same, and update to new modules layout.
+
        * pcmpl-gnu.el (pcmpl-gnu-makefile-names): Use a single call to
        pcomplete-entries.
 

diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 5761b9807357f16a21d7e48a6bf8b8defcf90e02..3543491dac825def1a67945aaff2734c8912d607 100644 (file)
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -47,9 +47,7 @@
        (pcomplete-match-string 1 0)))
   (while (pcomplete-here
          (if (file-directory-p "/proc")
-             (let ((default-directory "/proc/"))
-               (mapcar 'directory-file-name
-                       (pcomplete-entries "[0-9]+/$"))))
+              (directory-files "/proc" nil "\\`[0-9]+\\'"))
          nil 'identity)))
 
 ;;;###autoload
@@ -68,13 +66,8 @@
 (defun pcmpl-linux-fs-types ()
   "Return a list of available fs modules on GNU/Linux systems."
   (let ((kernel-ver (pcomplete-process-result "uname" "-r")))
-    (mapcar
-     (function
-      (lambda (fsobj)
-       (substring fsobj 0 (- (length fsobj) 2))))
-     (let ((default-directory
-            (concat "/lib/modules/" kernel-ver "/fs/")))
-       (pcomplete-entries "\\.o$")))))
+    (directory-files
+     (concat "/lib/modules/" kernel-ver "/kernel/fs/"))))
 
 (defun pcmpl-linux-mounted-directories ()
   "Return a list of mounted directory names."