# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1256182511 0
# Node ID 7aba6ca5f3d110f5c64c0366e72adca7c1817d35
# Parent  4d03be3df4fe983500ec2ebd6feaa8d5b2b90afd
(pcomplete/kill): Don't abuse pcomplete-entries.
(pcmpl-linux-fs-types): Same, and update to new modules layout.

diff -r 4d03be3df4fe -r 7aba6ca5f3d1 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 22 03:25:54 2009 +0000
+++ b/lisp/ChangeLog	Thu Oct 22 03:35:11 2009 +0000
@@ -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 -r 4d03be3df4fe -r 7aba6ca5f3d1 lisp/pcmpl-linux.el
--- a/lisp/pcmpl-linux.el	Thu Oct 22 03:25:54 2009 +0000
+++ b/lisp/pcmpl-linux.el	Thu Oct 22 03:35:11 2009 +0000
@@ -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."