From 406d541f4381173ce83a4086964bbffbf7a6a3e2 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Wed, 18 Feb 2015 02:02:05 -0500
Subject: Remove 'C-c &' prefix for yasnippet

---
 lisp/init-yas.el | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lisp/init-yas.el')

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)
 
-- 
cgit v1.2.3