Add file system types cifs and usbdevfs. Allow special chars in file names.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae98b5f389c..42ae13bef6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-06 Lars Hansen <larsh@soem.dk>
+
+        * generic-x.el (etc-fstab-generic-mode): Add file system types
+        cifs and usbdevfs. Allow special chars in file names.
+
 2006-02-05  Jay Belanger  <belanger@truman.edu>
 
         Update copyright notices of the files in lisp/calc.
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index d6f56cfc76c..4d4e187146d 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1706,6 +1706,8 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "reiserfs"
     "romfs"
     "smbfs"
+    "cifs"
+    "usbdevfs"
     "sysv"
     "tmpfs"
     "udf"
@@ -1717,7 +1719,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "swap"
     "auto"
     "ignore")
-  '(("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)"
+  '(("^\\([^# \t]+\\)\\s-+\\([^# \t]+\\)"
      (1 font-lock-type-face t)
      (2 font-lock-variable-name-face t)))
   '("/etc/[v]*fstab\\'")
@@ -1725,7 +1727,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
    (function
     (lambda ()
       (setq imenu-generic-expression
-            '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
+            '((nil "^\\([^# \t]+\\)\\s-+" 1))))))))
 
 ;; From Jacques Duthen <jacques.duthen@sncf.fr>
 (when (memq 'show-tabs-generic-mode generic-extras-enable-list)