tastytea/.emacs.d
tastytea/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add keybindings for smerge-prev and smerge-next.

Browse Source
This commit is contained in:
tastytea 2019-09-26 08:16:16 +02:00
parent 2dbc76d6c2
commit 84503c45d1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init.el
View File

@ -1,5 +1,5 @@
;;; init.el --- tastytea's Emacs init file. ;;; init.el --- tastytea's Emacs init file.
;; Time-stamp: <2019-09-25T19:49:55+00:00> ;; Time-stamp: <2019-09-26T06:15:27+00:00>
;;; Commentary: ;;; Commentary:
;; I am using this file with Emacs 26, but most of it will probably work with ;; I am using this file with Emacs 26, but most of it will probably work with
@ -419,6 +419,13 @@ With argument, do this that many times."
(setq yasnippet-snippets-dir "") (setq yasnippet-snippets-dir "")
) )
(use-package smerge
:ensure nil ; builtin
:bind
("C-<f5>" . smerge-prev)
("C-<f6>" . smerge-next)
)
;;;;;;;;;;;;;;;;;;;; Programming / C++ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;; Programming / C++ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Set coding style. ;; Set coding style.
(use-package cc-mode (use-package cc-mode