No NARF, only DOOM
This commit is contained in:
Henrik Lissner
parent
a984bf4f26
commit
ad225d2591
104 changed files with 1404 additions and 1409 deletions
|
|
@ -1,49 +1,48 @@
|
|||
;;; defuns-evil.el
|
||||
;; for ../core-evil.el
|
||||
|
||||
;;;###autoload (autoload 'narf:evil-open-folds "defuns-evil" nil t)
|
||||
(evil-define-command narf/evil-open-folds (count)
|
||||
;;;###autoload (autoload 'doom:evil-open-folds "defuns-evil" nil t)
|
||||
(evil-define-command doom/evil-open-folds (count)
|
||||
"Instead of `evil-open-folds'. Accepts COUNT for dictating fold level."
|
||||
(interactive "P")
|
||||
(unless (bound-and-true-p hs-minor-mode)
|
||||
(hs-minor-mode 1))
|
||||
(if count (hs-hide-level count) (evil-open-folds)))
|
||||
|
||||
;;;###autoload (autoload 'narf:evil-open-folds "defuns-evil" nil t)
|
||||
(evil-define-command narf/evil-close-folds (count)
|
||||
;;;###autoload (autoload 'doom:evil-open-folds "defuns-evil" nil t)
|
||||
(evil-define-command doom/evil-close-folds (count)
|
||||
"Instead of `evil-close-folds'. Accepts COUNT for dictating fold level."
|
||||
(interactive "P")
|
||||
(unless (bound-and-true-p hs-minor-mode)
|
||||
(hs-minor-mode 1))
|
||||
(if count (hs-hide-level count) (evil-close-folds)))
|
||||
|
||||
;;;###autoload (autoload 'narf/multi-next-line "defuns-evil" nil t)
|
||||
(evil-define-motion narf/multi-next-line (count)
|
||||
;;;###autoload (autoload 'doom/multi-next-line "defuns-evil" nil t)
|
||||
(evil-define-motion doom/multi-next-line (count)
|
||||
"Move down 6 lines"
|
||||
:type line
|
||||
(let ((line-move-visual visual-line-mode))
|
||||
(evil-line-move (* 6 (or count 1)))))
|
||||
|
||||
;;;###autoload (autoload 'narf/multi-previous-line "defuns-evil" nil t)
|
||||
(evil-define-motion narf/multi-previous-line (count)
|
||||
;;;###autoload (autoload 'doom/multi-previous-line "defuns-evil" nil t)
|
||||
(evil-define-motion doom/multi-previous-line (count)
|
||||
"Move up 6 lines"
|
||||
:type line
|
||||
(let ((line-move-visual visual-line-mode))
|
||||
(evil-line-move (- (* 6 (or count 1))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf/evil-visual-line-state-p ()
|
||||
(defun doom/evil-visual-line-state-p ()
|
||||
"Returns non-nil if in visual-line mode, nil otherwise."
|
||||
(and (evil-visual-state-p)
|
||||
(eq (evil-visual-type) 'line)))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf*evil-exchange-off ()
|
||||
(defun doom*evil-exchange-off ()
|
||||
(when evil-exchange--overlays
|
||||
(evil-exchange-cancel)))
|
||||
|
||||
;;;###autoload (autoload 'narf/evil-macro-on-all-lines "defuns-evil" nil t)
|
||||
(evil-define-operator narf/evil-macro-on-all-lines (beg end &optional macro)
|
||||
;;;###autoload (autoload 'doom/evil-macro-on-all-lines "defuns-evil" nil t)
|
||||
(evil-define-operator doom/evil-macro-on-all-lines (beg end &optional macro)
|
||||
"Apply macro to each line."
|
||||
:motion nil
|
||||
:move-point nil
|
||||
|
|
@ -57,8 +56,8 @@
|
|||
(or macro (read-char "@-"))))))
|
||||
|
||||
;;; Custom argument handlers
|
||||
(defvar narf-buffer-match-global evil-ex-substitute-global "")
|
||||
(defun narf--evil-ex-match-init (name &optional face update-hook)
|
||||
(defvar doom-buffer-match-global evil-ex-substitute-global "")
|
||||
(defun doom--evil-ex-match-init (name &optional face update-hook)
|
||||
(with-current-buffer evil-ex-current-buffer
|
||||
(cond
|
||||
((eq flag 'start)
|
||||
|
|
@ -70,7 +69,7 @@
|
|||
((eq flag 'stop)
|
||||
(evil-ex-delete-hl name)))))
|
||||
|
||||
(defun narf--evil-ex-buffer-match (arg &optional hl-name flags beg end)
|
||||
(defun doom--evil-ex-buffer-match (arg &optional hl-name flags beg end)
|
||||
(when (and (eq flag 'update)
|
||||
evil-ex-substitute-highlight-all
|
||||
(not (zerop (length arg))))
|
||||
|
|
@ -94,22 +93,22 @@
|
|||
(evil-ex-pattern-update-ex-info nil (format "?%s" lossage))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf/evil-ex-buffer-match (flag &optional arg)
|
||||
(defun doom/evil-ex-buffer-match (flag &optional arg)
|
||||
(let ((hl-name 'evil-ex-buffer-match))
|
||||
(with-selected-window (minibuffer-selected-window)
|
||||
(narf--evil-ex-match-init hl-name)
|
||||
(narf--evil-ex-buffer-match arg hl-name (list (if narf-buffer-match-global ?g))))))
|
||||
(doom--evil-ex-match-init hl-name)
|
||||
(doom--evil-ex-buffer-match arg hl-name (list (if doom-buffer-match-global ?g))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf/evil-ex-global-match (flag &optional arg)
|
||||
(defun doom/evil-ex-global-match (flag &optional arg)
|
||||
(let ((hl-name 'evil-ex-global-match))
|
||||
(with-selected-window (minibuffer-selected-window)
|
||||
(narf--evil-ex-match-init hl-name)
|
||||
(doom--evil-ex-match-init hl-name)
|
||||
(let ((result (car-safe (evil-ex-parse-global arg))))
|
||||
(narf--evil-ex-buffer-match result hl-name nil (point-min) (point-max))))))
|
||||
(doom--evil-ex-buffer-match result hl-name nil (point-min) (point-max))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf/evil-ex-undefine-cmd (cmd)
|
||||
(defun doom/evil-ex-undefine-cmd (cmd)
|
||||
(if (string-match "^[^][]*\\(\\[\\(.*\\)\\]\\)[^][]*$" cmd)
|
||||
(let ((abbrev (replace-match "" nil t cmd 1))
|
||||
(full (replace-match "\\2" nil nil cmd 1)))
|
||||
|
|
@ -117,10 +116,10 @@
|
|||
(setq evil-ex-commands (delq (assoc abbrev evil-ex-commands) evil-ex-commands)))
|
||||
(setq evil-ex-commands (delq (assoc cmd evil-ex-commands) evil-ex-commands))))
|
||||
|
||||
(defvar narf:map-maps '())
|
||||
(defvar doom:map-maps '())
|
||||
|
||||
;;;###autoload (autoload 'narf:map "defuns-evil" nil t)
|
||||
(evil-define-command narf:map (bang input &optional mode)
|
||||
;;;###autoload (autoload 'doom:map "defuns-evil" nil t)
|
||||
(evil-define-command doom:map (bang input &optional mode)
|
||||
"Map ex commands to keybindings. INPUT should be in the format [KEY] [EX COMMAND]."
|
||||
(interactive "<!><a>")
|
||||
(let* ((parts (s-split-up-to " " input 2 t))
|
||||
|
|
@ -138,31 +137,31 @@
|
|||
(evil-define-key mode nil key fn)
|
||||
(define-key map key fn))))
|
||||
|
||||
;;;###autoload (autoload 'narf:nmap "defuns-evil" nil t)
|
||||
(evil-define-command narf:nmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (narf:map bang input 'normal))
|
||||
;;;###autoload (autoload 'doom:nmap "defuns-evil" nil t)
|
||||
(evil-define-command doom:nmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (doom:map bang input 'normal))
|
||||
|
||||
;;;###autoload (autoload 'narf:imap "defuns-evil" nil t)
|
||||
(evil-define-command narf:imap (bang input &optional mode)
|
||||
(interactive "<!><a>") (narf:map bang input 'insert))
|
||||
;;;###autoload (autoload 'doom:imap "defuns-evil" nil t)
|
||||
(evil-define-command doom:imap (bang input &optional mode)
|
||||
(interactive "<!><a>") (doom:map bang input 'insert))
|
||||
|
||||
;;;###autoload (autoload 'narf:vmap "defuns-evil" nil t)
|
||||
(evil-define-command narf:vmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (narf:map bang input 'visual))
|
||||
;;;###autoload (autoload 'doom:vmap "defuns-evil" nil t)
|
||||
(evil-define-command doom:vmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (doom:map bang input 'visual))
|
||||
|
||||
;;;###autoload (autoload 'narf:mmap "defuns-evil" nil t)
|
||||
(evil-define-command narf:mmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (narf:map bang input 'motion))
|
||||
;;;###autoload (autoload 'doom:mmap "defuns-evil" nil t)
|
||||
(evil-define-command doom:mmap (bang input &optional mode)
|
||||
(interactive "<!><a>") (doom:map bang input 'motion))
|
||||
|
||||
;;;###autoload (autoload 'narf:omap "defuns-evil" nil t)
|
||||
(evil-define-command narf:omap (bang input &optional mode)
|
||||
(interactive "<!><a>") (narf:map bang input 'operator))
|
||||
;;;###autoload (autoload 'doom:omap "defuns-evil" nil t)
|
||||
(evil-define-command doom:omap (bang input &optional mode)
|
||||
(interactive "<!><a>") (doom:map bang input 'operator))
|
||||
|
||||
;;;###autoload
|
||||
(defun narf/evil-snipe-easymotion ()
|
||||
(defun doom/evil-snipe-easymotion ()
|
||||
(interactive)
|
||||
(require 'evil-easymotion)
|
||||
(call-interactively narf--evil-snipe-repeat-fn))
|
||||
(call-interactively doom--evil-snipe-repeat-fn))
|
||||
|
||||
(provide 'defuns-evil)
|
||||
;;; defuns-evil.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue