From 8c4e09dff83847ac7f07bf1da7751e9328006c4d Mon Sep 17 00:00:00 2001 From: Jack Jamison Date: Thu, 30 Jul 2026 20:09:00 -0400 Subject: actual final changes and get rid of junk in lisp dir actually works fine --- .../evil-collection/modes/smerge-mode/README.org | 16 ------- .../smerge-mode/evil-collection-smerge-mode.el | 54 ---------------------- 2 files changed, 70 deletions(-) delete mode 100644 .config/emacs/lisp/evil-collection/modes/smerge-mode/README.org delete 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') diff --git a/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org b/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org deleted file mode 100644 index 44871a7..0000000 --- a/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org +++ /dev/null @@ -1,16 +0,0 @@ -* smerge - - The table below shows the binding changes that are made to smerge-mode. - -| Command | Original Binding | evil-collection-smerge | -|----------------------------+------------------+------------------------| -| =smerge-next= | =C-c ^ n= | =gj, ]]= | -| =smerge-prev= | =C-c ^ p= | =gk, [[= | -| =smerge-keep-all= | =C-c ^ a= | =ga= | -| =smerge-keep-upper= | =C-c ^ u= | =gu= | -| =smerge-keep-lower= | =C-c ^ l= | =gl= | -| =smerge-keep-other= | =C-c ^ o= | =go= | -| =smerge-keep-mine= | =C-c ^ m= | =gm= | -| =smerge-combine-with-next= | =C-c ^ C= | =gc= | -| =smerge-refine= | =C-c ^ R= | =gr= | -| =smerge-keep-base= | =C-c ^ b= | =gb= | 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 deleted file mode 100644 index fa939c5..0000000 --- a/.config/emacs/lisp/evil-collection/modes/smerge-mode/evil-collection-smerge-mode.el +++ /dev/null @@ -1,54 +0,0 @@ -;;; 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