Disable whitespace-newline-mode properly.

[bpt/emacs.git] / lisp / generic-x.el

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index e23af4d..5205a68 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -229,7 +229,8 @@ This hook will be installed if the variable
     prototype-generic-mode
     resolve-conf-generic-mode
     samba-generic-mode
-    x-resource-generic-mode)
+    x-resource-generic-mode
+    xmodmap-generic-mode)
   "List of generic modes that are defined by default on Unix.")
 
 (defconst generic-other-modes
@@ -370,6 +371,15 @@ your changes into effect."
   nil
   "Generic mode for X Resource configuration files."))
 
+(if (memq 'xmodmap-generic-mode generic-extras-enable-list)
+(define-generic-mode xmodmap-generic-mode
+  '(?!)
+  '("add" "clear" "keycode" "keysym" "remove" "pointer")
+  nil
+  '("[xX]modmap\\(rc\\)?\\'")
+  nil
+  "Simple mode for xmodmap files."))
+
 ;;; Hosts
 (when (memq 'hosts-generic-mode generic-extras-enable-list)
 
@@ -533,7 +543,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
   (interactive)
   (let ((compilation-buffer-name-function
         (function
-         (lambda(ign)
+         (lambda (_ign)
            (concat "*" (buffer-file-name) "*")))))
     (compile
      (concat (w32-shell-name) " -c " (buffer-file-name)))))
@@ -1695,6 +1705,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "efs"
     "ext2"
     "ext3"
+    "ext4"
     "hfs"
     "hpfs"
     "iso9660"
@@ -1712,6 +1723,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "cifs"
     "usbdevfs"
     "sysv"
+    "sysfs"
     "tmpfs"
     "udf"
     "ufs"