2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8290398d038..bf1a64802d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-06  Daniel Clemente  <dcl441-bugs@yahoo.com>  (tiny change)
+
+        * generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)
+
 2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
 
         * allout.el (allout-init, allout-prefixed-keybindings)
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index e23af4dff78..3c6622f6b16 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -370,6 +370,14 @@ your changes into effect."
   nil
   "Generic mode for X Resource configuration files."))
 
+(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)