From 79a0fb58c55ed8e173ba907ccd2e843f81257bad Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 5 Mar 2011 18:59:21 -0800 Subject: [PATCH] generic-x trivia. * lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode. (xmodmap-generic-mode): Respect generic-extras-enable-list. --- lisp/ChangeLog | 5 +++++ lisp/generic-x.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf1a64802d0..a3646cc5a47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-06 Glenn Morris + + * generic-x.el (generic-unix-modes): Add xmodmap-generic-mode. + (xmodmap-generic-mode): Respect generic-extras-enable-list. + 2011-03-06 Daniel Clemente (tiny change) * generic-x.el (xmodmap-generic-mode): New. (Bug#2065) diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 3c6622f6b16..bce03331a29 100644 --- 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)