Move macro to util file
This commit is contained in:
James Nguyen
parent
8c6eaebb44
commit
24088eddcb
|
|
@ -26,11 +26,9 @@
|
|||
;; Evil bindings for calc.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'calc)
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defun evil-collection-calc-ext-setup ()
|
||||
"Set up `evil' bindings for `calc'.
|
||||
Since calc bindings are set on-demand when calc-ext is load, we
|
||||
|
|
|
|||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
;;; Code:
|
||||
(require 'elfeed nil t)
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defvar elfeed-search-mode-map)
|
||||
(defvar elfeed-show-mode-map)
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defun evil-collection-elfeed-setup ()
|
||||
"Set up `evil' bindings for `elfeed'."
|
||||
|
|
|
|||
|
|
@ -28,11 +28,10 @@
|
|||
|
||||
;;; Code:
|
||||
(require 'emms nil t)
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(declare-function emms-with-inhibit-read-only-t "emms")
|
||||
(declare-function emms-playlist-mode-correct-previous-yank "emms-playlist-mode")
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defvar emms-browser-mode-map)
|
||||
(defvar emms-playlist-mode-map)
|
||||
|
|
|
|||
|
|
@ -28,9 +28,7 @@
|
|||
|
||||
;;; Code:
|
||||
(require 'eww)
|
||||
(require 'evil)
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defun evil-collection-eww-setup ()
|
||||
"Set up `evil' bindings for `eww'."
|
||||
|
|
|
|||
|
|
@ -28,12 +28,10 @@
|
|||
;; This package uses normal state and redefines everything.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'evil-collection-evil-search)
|
||||
(require 'info)
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defun evil-collection-info-setup ()
|
||||
"Set up `evil' bindings for `info-mode'."
|
||||
(evil-collection-inhibit-insert-state Info-mode-map)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
;; Evil bindings for pdf-tools.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'pdf-tools nil t)
|
||||
(require 'pdf-view nil t)
|
||||
|
||||
|
|
@ -37,9 +37,6 @@
|
|||
(defvar pdf-view-mode-map)
|
||||
(defvar pdf-outline-buffer-mode-map)
|
||||
(defvar pdf-occur-buffer-mode-map)
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defvar pdf-view-mode-map)
|
||||
(defvar pdf-outline-buffer-mode-map)
|
||||
|
|
|
|||
|
|
@ -27,11 +27,9 @@
|
|||
;; Evil bindings for proced.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'proced)
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defun evil-collection-proced-setup ()
|
||||
"Set up `evil' bindings for `proced'."
|
||||
(evil-collection-inhibit-insert-state proced-mode-map)
|
||||
|
|
|
|||
|
|
@ -28,14 +28,13 @@
|
|||
;; Evil bindings for `transmission'.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'transmission nil t)
|
||||
|
||||
(defvar transmission-mode-map)
|
||||
(defvar transmission-files-mode-map)
|
||||
(defvar transmission-info-mode-map)
|
||||
(defvar transmission-peers-mode-map)
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
|
||||
(defun evil-collection-transmission-setup ()
|
||||
"Set up `evil' bindings for `transmission'."
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
;;; evil-collection-util.el --- Utilities for `evil-collection'. -*- lexical-binding: t -*-
|
||||
|
||||
;; Copyright (C) 2017 James Nguyen
|
||||
|
||||
;; Author: James Nguyen <james@jojojames.com>
|
||||
;; Maintainer: James Nguyen <james@jojojames.com>
|
||||
;; Pierre Neidhardt <ambrevar@gmail.com>
|
||||
;; URL: https://github.com/jojojames/evil-collection
|
||||
;; Version: 0.0.1
|
||||
;; Package-Requires: ((emacs "25.1"))
|
||||
;; Keywords: evil, emacs, tools
|
||||
|
||||
;; 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
;;; Bindings for
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
|
||||
(defmacro evil-collection-inhibit-insert-state (map)
|
||||
"Unmap insertion keys from normal state.
|
||||
This is particularly useful for read-only modes."
|
||||
`(evil-define-key
|
||||
'normal ,map
|
||||
[remap evil-append] #'ignore
|
||||
[remap evil-append-line] #'ignore
|
||||
[remap evil-insert] #'ignore
|
||||
[remap evil-insert-line] #'ignore
|
||||
[remap evil-change] #'ignore
|
||||
[remap evil-change-line] #'ignore
|
||||
[remap evil-substitute] #'ignore
|
||||
[remap evil-change-whole-line] #'ignore
|
||||
[remap evil-delete] #'ignore
|
||||
[remap evil-delete-line] #'ignore
|
||||
[remap evil-delete-char] #'ignore
|
||||
[remap evil-delete-backward-char] #'ignore
|
||||
[remap evil-replace] #'ignore
|
||||
[remap evil-replace-state] #'ignore
|
||||
[remap evil-open-below] #'ignore
|
||||
[remap evil-open-above] #'ignore
|
||||
[remap evil-paste-after] #'ignore
|
||||
[remap evil-paste-before] #'ignore
|
||||
[remap evil-join] #'ignore
|
||||
[remap evil-indent] #'ignore
|
||||
[remap evil-shift-left] #'ignore
|
||||
[remap evil-shift-right] #'ignore
|
||||
[remap evil-invert-char] #'ignore))
|
||||
|
||||
(provide 'evil-collection-util)
|
||||
;;; evil-collection-util.el ends here
|
||||
|
|
@ -26,10 +26,9 @@
|
|||
;; Evil bindings for ztree.
|
||||
|
||||
;;; Code:
|
||||
(require 'evil)
|
||||
(require 'evil-collection-util)
|
||||
(require 'ztree nil t)
|
||||
|
||||
(declare-function evil-collection-inhibit-insert-state "evil-collection")
|
||||
(defvar ztree-mode-map)
|
||||
(defvar ztreediff-mode-map)
|
||||
|
||||
|
|
|
|||
|
|
@ -191,34 +191,5 @@ instance:
|
|||
lispyville-yank)
|
||||
"List of yank operators.")
|
||||
|
||||
(defmacro evil-collection-inhibit-insert-state (map)
|
||||
"Unmap insertion keys from normal state.
|
||||
This is particularly useful for read-only modes."
|
||||
`(evil-define-key
|
||||
'normal ,map
|
||||
[remap evil-append] #'ignore
|
||||
[remap evil-append-line] #'ignore
|
||||
[remap evil-insert] #'ignore
|
||||
[remap evil-insert-line] #'ignore
|
||||
[remap evil-change] #'ignore
|
||||
[remap evil-change-line] #'ignore
|
||||
[remap evil-substitute] #'ignore
|
||||
[remap evil-change-whole-line] #'ignore
|
||||
[remap evil-delete] #'ignore
|
||||
[remap evil-delete-line] #'ignore
|
||||
[remap evil-delete-char] #'ignore
|
||||
[remap evil-delete-backward-char] #'ignore
|
||||
[remap evil-replace] #'ignore
|
||||
[remap evil-replace-state] #'ignore
|
||||
[remap evil-open-below] #'ignore
|
||||
[remap evil-open-above] #'ignore
|
||||
[remap evil-paste-after] #'ignore
|
||||
[remap evil-paste-before] #'ignore
|
||||
[remap evil-join] #'ignore
|
||||
[remap evil-indent] #'ignore
|
||||
[remap evil-shift-left] #'ignore
|
||||
[remap evil-shift-right] #'ignore
|
||||
[remap evil-invert-char] #'ignore))
|
||||
|
||||
(provide 'evil-collection)
|
||||
;;; evil-collection.el ends here
|
||||
|
|
|
|||
Loading…
Reference in New Issue