From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Fri, 25 Nov 2016 16:00:59 +0000 (+0100)
Subject: bound smerge-mode to key
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=d335e2661729aa64aa94691fb9f4ed58c036d438;p=emacsconfig.git

bound smerge-mode to key

- bound to C-c t S-s
- check it out! Minor mode to simplify editing output from the diff3
  program.

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---

diff --git a/bba.org b/bba.org
index 37e29556..01178842 100644
--- a/bba.org
+++ b/bba.org
@@ -2645,6 +2645,7 @@ character before any spaces."
   (define-key bba/toggle "p" 'smartparens-mode)
   (define-key bba/toggle "r" 'rainbow-delimiters-mode)
   (define-key bba/toggle "s" 'flyspell-mode)
+  (define-key bba/toggle "\S-s" 'smerge-mode)
   (define-key bba/toggle "t" 'toggle-truncate-lines)
   (define-key bba/toggle "v" 'visual-line-mode)
   (define-key bba/toggle "\S-w" 'which-function-mode)