summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-11-02 00:50:26 -0400
committerKyle Meyer <kyle@kyleam.com>2014-11-02 00:51:19 -0400
commitc7cca9ecb8a6f2b45f52709ec64d84990802167b (patch)
tree748d315b6f506b87ae4041a64a69135ddcb34ec3 /lisp
parent8b9f13021ce3eef6c3c9ed28acc113dc8cc52e19 (diff)
downloademacs.d-c7cca9ecb8a6f2b45f52709ec64d84990802167b.tar.gz
Don't let paredit clobber M-s map
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-elisp.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el
index 862ca06..fa66852 100644
--- a/lisp/init-elisp.el
+++ b/lisp/init-elisp.el
@@ -10,6 +10,10 @@
(define-key paredit-mode-map (kbd "C-,") 'paredit-forward-slurp-sexp)
(define-key paredit-mode-map (kbd "C-.") 'paredit-forward-barf-sexp)
(define-key paredit-mode-map (kbd "C-M-,") 'paredit-backward-slurp-sexp)
- (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp))
+ (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp)
+
+ ;; Don't let `paredit-splice-sexp' override default 'M-s' map.
+ (define-key paredit-mode-map (kbd "M-s") nil)
+ (define-key paredit-mode-map (kbd "M-p") 'paredit-splice-sexp))
(provide 'init-elisp)