From bdf9a71ab7baa2b1de9abcfd5df1a9107a55d141 Mon Sep 17 00:00:00 2001 From: Jack Jamison Date: Sun, 5 Jul 2026 01:19:30 -0400 Subject: add a bunch of emacs packages HELP --- .../smerge-mode/evil-collection-smerge-mode.el | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el (limited to '.config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el') diff --git a/.config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el b/.config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el new file mode 100644 index 0000000..fa939c5 --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el @@ -0,0 +1,54 @@ +;;; evil-collection-smerge-mode.el --- Bindings for `smerge-mode' -*- lexical-binding: t -*- + +;; Copyright (C) 2021 pspiagicw + +;; Author: pspiagicw +;; Maintainer: pspiagicw +;; URL: https://github.com/emacs-evil/evil-collection +;; Version: 0.0.1 +;; Package-Requires: ((emacs "26.3")) +;; Keywords: evil, python, tools, emacs + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: +;;; Bindings for `smerge-mode'. +;;; Code: +(require 'evil-collection) +(require 'smerge-mode) +;; + +(defconst evil-collection-smerge-mode-maps '(smerge-mode-map)) + +;;;###autoload +(defun evil-collection-smerge-mode-setup () + "Setup up `evil' bindings for `smerge-mode'." + (add-hook 'smerge-mode-hook #'evil-normalize-keymaps) + (evil-collection-define-key 'normal 'smerge-mode-map + "gj" 'smerge-next + "]]" 'smerge-next + "gk" 'smerge-prev + "[[" 'smerge-prev + "gr" 'smerge-resolve + "ga" 'smerge-keep-all + "gu" 'smerge-keep-upper + "gl" 'smerge-keep-lower + "go" 'smerge-keep-other + "gm" 'smerge-keep-mine + "gc" 'smerge-combine-with-next + "gR" 'smerge-refine + "gb" 'smerge-keep-base)) + +(provide 'evil-collection-smerge-mode) +;;; evil-collection-smerge-mode.el ends here -- cgit v1.2.3