From 2cf765ea6901250b7bd9f781da4f0701c27a512e Mon Sep 17 00:00:00 2001 From: tastytea Date: Thu, 26 Dec 2019 07:24:33 +0100 Subject: [PATCH] Emacs: Put keybindings for flycheck and smerge in their mode-maps. --- init/programming/common.el | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/init/programming/common.el b/init/programming/common.el index 49642d6..9079de8 100644 --- a/init/programming/common.el +++ b/init/programming/common.el @@ -1,6 +1,6 @@ ;;; common.el --- Common programming settings. -*- lexical-binding: t; -*- -;; Time-stamp: <2019-12-23T02:50:34+00:00> +;; Time-stamp: <2019-12-26T06:24:21+00:00> ;;; Commentary: @@ -49,9 +49,11 @@ (flycheck-add-mode 'css-csslint 'web-mode) :bind - ("" . flycheck-previous-error) - ("" . flycheck-next-error) - ("" . flycheck-list-errors) + (:map flycheck-mode-map + ("" . flycheck-previous-error) + ("" . flycheck-next-error) + ("" . flycheck-list-errors) + ) ) ) ; unless slow-computer. @@ -230,10 +232,14 @@ (use-package smerge :ensure nil ; Builtin. + :defines (smerge-mode-map) + :bind - ("C-" . smerge-prev) - ("C-" . smerge-next) - ("C-" . smerge-resolve) + (:map smerge-mode-map + ("" . smerge-prev) + ("" . smerge-next) + ("" . smerge-resolve) + ) ) ;; Git integration.