[Emacs-diffs] /srv/bzr/emacs/trunk r103551: generic-x trivia.

[Glenn Morris]

------------------------------------------------------------
revno: 103551
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 18:59:21 -0800
message:
  generic-x trivia.
  
  * lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
  (xmodmap-generic-mode): Respect generic-extras-enable-list.
modified:
  lisp/ChangeLog
  lisp/generic-x.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-06 02:56:39 +0000
+++ b/lisp/ChangeLog    2011-03-06 02:59:21 +0000
@@ -1,3 +1,8 @@
+2011-03-06  Glenn Morris  <address@hidden>
+
+       * generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
+       (xmodmap-generic-mode): Respect generic-extras-enable-list.
+
 2011-03-06  Daniel Clemente  <address@hidden>  (tiny change)
 
        * generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)

=== modified file 'lisp/generic-x.el'
--- a/lisp/generic-x.el 2011-03-06 02:56:39 +0000
+++ b/lisp/generic-x.el 2011-03-06 02:59:21 +0000
@@ -229,7 +229,8 @@
     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 @@
   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)