summaryrefslogtreecommitdiff
path: root/lisp/generic-x.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-03-05 18:59:21 -0800
committerGlenn Morris <rgm@gnu.org>2011-03-05 18:59:21 -0800
commit79a0fb58c55ed8e173ba907ccd2e843f81257bad (patch)
tree85527a57a546a5348ce4b3285f8a9cc1379af916 /lisp/generic-x.el
parentffd0a50215b0e189b2a84913fbec2fa3c4419a8d (diff)
downloademacs-79a0fb58c55ed8e173ba907ccd2e843f81257bad.tar.gz
generic-x trivia.
* lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode. (xmodmap-generic-mode): Respect generic-extras-enable-list.
Diffstat (limited to 'lisp/generic-x.el')
-rw-r--r--lisp/generic-x.el6
1 files changed, 4 insertions, 2 deletions
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)