summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-20 19:32:13 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-20 19:34:20 -0400
commitfcd53ef17d77057e51eb8e54e41c3e5d4b51ce3c (patch)
tree1be91adf306da0384b364bba96c88a749a364dbe
parent2f2900213cc8157590f11dcc7988c1a3bb7dc887 (diff)
Teach Emacs about X11/modmap
-rw-r--r--.config/X11/modmap2
-rw-r--r--.config/emacs/init.el10
2 files changed, 12 insertions, 0 deletions
diff --git a/.config/X11/modmap b/.config/X11/modmap
index 1736e09..b332204 100644
--- a/.config/X11/modmap
+++ b/.config/X11/modmap
@@ -1,3 +1,5 @@
+! -*- Mode: Xmodmap -*-
+
! My desktop doesn't have a super key, so I map Caps_Lock to Super_L
! Also, use Caps_Lock for the compose key
remove lock = Caps_Lock
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index eddd0b7..7b9be85 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -237,6 +237,16 @@ sh-script.el is broken."
(smerge-mode 1))))
(add-hook 'find-file-hook 'try-smerge-mode t)
+;; http://www.emacswiki.org/emacs/XModMapMode
+(when (not (fboundp 'xmodmap-mode))
+ (define-generic-mode 'xmodmap-mode
+ '(?!)
+ '("add" "clear" "keycode" "keysym" "pointer" "remove")
+ nil
+ '("[xX]modmap\\(rc\\)?\\'")
+ nil
+ "Simple mode for xmodmap files."))
+
;; All my weird mode-specific settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;