aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Clemente2011-03-05 18:56:39 -0800
committerGlenn Morris2011-03-05 18:56:39 -0800
commitffd0a50215b0e189b2a84913fbec2fa3c4419a8d (patch)
treed5327b300833552d646c244723b08f13b4a37875
parent01c35094547e9bdb73ce4633a8706894b2b439a4 (diff)
downloademacs-ffd0a50215b0e189b2a84913fbec2fa3c4419a8d.tar.gz
emacs-ffd0a50215b0e189b2a84913fbec2fa3c4419a8d.zip
* lisp/generic-x.el (xmodmap-generic-mode): New. (Bug#2065) (tiny change)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/generic-x.el8
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 @@
12011-03-06 Daniel Clemente <dcl441-bugs@yahoo.com> (tiny change)
2
3 * generic-x.el (xmodmap-generic-mode): New. (Bug#2065)
4
12011-03-06 Juanma Barranquero <lekktu@gmail.com> 52011-03-06 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * allout.el (allout-init, allout-prefixed-keybindings) 7 * 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."
370 nil 370 nil
371 "Generic mode for X Resource configuration files.")) 371 "Generic mode for X Resource configuration files."))
372 372
373(define-generic-mode xmodmap-generic-mode
374 '(?!)
375 '("add" "clear" "keycode" "keysym" "remove" "pointer")
376 nil
377 '("[xX]modmap\\(rc\\)?\\'")
378 nil
379 "Simple mode for xmodmap files.")
380
373;;; Hosts 381;;; Hosts
374(when (memq 'hosts-generic-mode generic-extras-enable-list) 382(when (memq 'hosts-generic-mode generic-extras-enable-list)
375 383