summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-02-18 02:02:05 -0500
committerKyle Meyer <kyle@kyleam.com>2015-02-18 02:02:05 -0500
commit406d541f4381173ce83a4086964bbffbf7a6a3e2 (patch)
tree8bb85abb5da7f823b1c3850bc80580ea518d8f54
parent5e6daf4ea6009bc6990bc83e55a103812bebe1ab (diff)
downloademacs.d-406d541f4381173ce83a4086964bbffbf7a6a3e2.tar.gz
Remove 'C-c &' prefix for yasnippet
-rw-r--r--lisp/init-yas.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/init-yas.el b/lisp/init-yas.el
index d3dbe64..04e0681 100644
--- a/lisp/init-yas.el
+++ b/lisp/init-yas.el
@@ -4,6 +4,9 @@
(setq yas-fallback-behavior nil)
(define-key yas-minor-mode-map (kbd "C-c i") 'yas-expand)
+;; Remove commands with 'C-c &' prefix, which conflicts with
+;; `org-mark-ring-goto' binding'
+(define-key yas-minor-mode-map (kbd "C-c &") nil)
(define-key yas-minor-mode-map (kbd "<tab>") nil)
(define-key yas-minor-mode-map (kbd "TAB") nil)