generic-x trivia.

* lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
(xmodmap-generic-mode): Respect generic-extras-enable-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf1a64802d0047452712c4297a8aef716bf06107..a3646cc5a47e8e4700daa401ae7949cd9c85f76c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-06  Glenn Morris  <rgm@gnu.org>
+
+       * generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
+       (xmodmap-generic-mode): Respect generic-extras-enable-list.
+
 2011-03-06  Daniel Clemente  <dcl441-bugs@yahoo.com>  (tiny change)
 
        * generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 3c6622f6b168146cfa917cc437562a9f95c6aad6..bce03331a2995adce7be34a7093c7df1e04649f4 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,13 +371,14 @@ 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.")
+  "Simple mode for xmodmap files."))
 
 ;;; Hosts
 (when (memq 'hosts-generic-mode generic-extras-enable-list)