[Emacs-diffs] emacs/lisp ChangeLog pcmpl-linux.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/22 03:35:14

Modified files:
        lisp           : ChangeLog pcmpl-linux.el 

Log message:
        (pcomplete/kill): Don't abuse pcomplete-entries.
        (pcmpl-linux-fs-types): Same, and update to new modules layout.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16473&r2=1.16474
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcmpl-linux.el?cvsroot=emacs&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16473
retrieving revision 1.16474
diff -u -b -r1.16473 -r1.16474
--- ChangeLog   22 Oct 2009 03:25:54 -0000      1.16473
+++ ChangeLog   22 Oct 2009 03:35:11 -0000      1.16474
@@ -1,5 +1,8 @@
 2009-10-22  Stefan Monnier  <address@hidden>
 
+       * 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.
 

Index: pcmpl-linux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcmpl-linux.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- pcmpl-linux.el      5 Jan 2009 03:19:38 -0000       1.14
+++ pcmpl-linux.el      22 Oct 2009 03:35:14 -0000      1.15
@@ -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."