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 --- .../evil-collection/modes/minibuffer/README.org | 47 ++++++++++++ .../modes/minibuffer/evil-collection-minibuffer.el | 85 ++++++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 .config/emacs/lisp/evil-collection/modes/minibuffer/README.org create mode 100644 .config/emacs/lisp/evil-collection/modes/minibuffer/evil-collection-minibuffer.el (limited to '.config/emacs/lisp/evil-collection/modes/minibuffer') diff --git a/.config/emacs/lisp/evil-collection/modes/minibuffer/README.org b/.config/emacs/lisp/evil-collection/modes/minibuffer/README.org new file mode 100644 index 0000000..30121f6 --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/minibuffer/README.org @@ -0,0 +1,47 @@ +* minibuffer + + Evil bindings for the minibuffer and =evil-ex= prompt. + + The minibuffer has no major mode, so the package hooks =minibuffer-setup-hook= + to enter insert state on open. + +** Affected keymaps + + - =minibuffer-local-map= + - =minibuffer-local-ns-map= + - =minibuffer-local-completion-map= + - =minibuffer-local-must-match-map= + - =minibuffer-local-isearch-map= + - =evil-ex-search-keymap= + - =evil-ex-completion-map= + +** Key bindings + + Normal-state bindings added to every map above. + + | Command | Key | + |----------------------------------------+------------| + | =evil-collection-change-in-minibuffer= | =c= | + | =abort-recursive-edit= | == | + | =exit-minibuffer= | =RET= | + + Extra bindings on =evil-ex-completion-map= for history navigation: + + | Command | State | Key | + |-------------------------------------+--------+------------| + | =previous-complete-history-element= | insert | =C-p= | + | =next-complete-history-element= | insert | =C-n= | + | =previous-history-element= | normal | =C-p= | + | =next-history-element= | normal | =C-n= | + | =abort-recursive-edit= | normal | == | + +** New commands + + | Command | Key | | + |----------------------------------------+-----+--------------------------------------------------------------------------------------| + | =evil-collection-change-in-minibuffer= | =c= | =evil-change= variant that avoids inserting a stray newline when the buffer had none | + +** Notes + + - =evil-echo-state= is locally disabled so the minibuffer prompt is not + overwritten by the state indicator. diff --git a/.config/emacs/lisp/evil-collection/modes/minibuffer/evil-collection-minibuffer.el b/.config/emacs/lisp/evil-collection/modes/minibuffer/evil-collection-minibuffer.el new file mode 100644 index 0000000..ed81b9c --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/minibuffer/evil-collection-minibuffer.el @@ -0,0 +1,85 @@ +;;; evil-collection-minibuffer.el --- Evil bindings for the minibuffer -*- lexical-binding: t -*- + +;; Copyright (C) 2017 Pierre Neidhardt + +;; Author: Pierre Neidhardt +;; Maintainer: James Nguyen +;; Pierre Neidhardt +;; URL: https://github.com/emacs-evil/evil-collection +;; Version: 0.0.1 +;; Package-Requires: ((emacs "26.3")) +;; Keywords: evil, minibuffer, tools + +;; This file 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, or (at your +;; option) any later version. +;; +;; This file 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. +;; +;; For a full copy of the GNU General Public License +;; see . + +;;; Commentary: +;; Evil bindings for the minibuffer. + +;;; Code: +(require 'evil-collection) + +(defconst evil-collection-minibuffer-maps '(minibuffer-local-map + minibuffer-local-ns-map + minibuffer-local-completion-map + minibuffer-local-must-match-map + minibuffer-local-isearch-map + evil-ex-search-keymap + evil-ex-completion-map)) + +(defun evil-collection-minibuffer-insert () + "Switch to insert state. + +This function is meant to be hooked in the minibuffer: + + (add-hook \='minibuffer-setup-hook \='evil-collection-minibuffer-insert) + +`evil-set-initial-state' can not be used for the minibuffer since +it does not have a mode." + (set (make-local-variable 'evil-echo-state) nil) + ;; (evil-set-initial-state 'mode 'insert) is the evil-proper + ;; way to do this, but the minibuffer doesn't have a mode. + ;; The alternative is to create a minibuffer mode (here), but + ;; then it may conflict with other packages' if they do the same. + (evil-insert 1)) + +(evil-define-operator evil-collection-change-in-minibuffer + (beg end type register yank-handler delete-func) + "A version of `evil-change' that won't insert a new line on buffers without one." + (interactive "") + ;; If there was no new line before the change, there should be none after. + ;; Delete any new line that might have been inserted and ignore an error if + ;; one wasn't. + (let ((new-inserted (and (eq type 'line) (/= ?\n (char-before end))))) + (evil-change beg end type register yank-handler delete-func) + (when new-inserted (ignore-errors (delete-char 1))))) + +;;;###autoload +(defun evil-collection-minibuffer-setup () + "Initialize minibuffer for `evil'." + ;; https://www.gnu.org/software/emacs/manual/html_node/elisp/Text-from-Minibuffer.html + (dolist (map evil-collection-minibuffer-maps) + (evil-collection-define-key 'normal map "c" 'evil-collection-change-in-minibuffer) + (evil-collection-define-key 'normal map (kbd "") 'abort-recursive-edit) + (evil-collection-define-key 'normal map (kbd "RET") 'exit-minibuffer)) + + (add-hook 'minibuffer-setup-hook 'evil-collection-minibuffer-insert) + ;; Because of the above minibuffer-setup-hook, some evil-ex bindings need be reset. + (evil-collection-define-key 'normal 'evil-ex-completion-map (kbd "") 'abort-recursive-edit) + (evil-collection-define-key 'insert 'evil-ex-completion-map (kbd "C-p") 'previous-complete-history-element) + (evil-collection-define-key 'insert 'evil-ex-completion-map (kbd "C-n") 'next-complete-history-element) + (evil-collection-define-key 'normal 'evil-ex-completion-map (kbd "C-p") 'previous-history-element) + (evil-collection-define-key 'normal 'evil-ex-completion-map (kbd "C-n") 'next-history-element)) + +(provide 'evil-collection-minibuffer) +;;; evil-collection-minibuffer.el ends here -- cgit v1.2.3