General refactor & cleanup
This commit is contained in:
parent
9f6b90cf13
commit
91783e0695
7 changed files with 11 additions and 14 deletions
|
@ -273,6 +273,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
|
||||||
:commands (fringe-helper-define fringe-helper-convert)
|
:commands (fringe-helper-define fringe-helper-convert)
|
||||||
:init
|
:init
|
||||||
(unless (fboundp 'define-fringe-bitmap)
|
(unless (fboundp 'define-fringe-bitmap)
|
||||||
|
;; doesn't exist in terminal Emacs; define it to prevent errors
|
||||||
(defun define-fringe-bitmap (&rest _))))
|
(defun define-fringe-bitmap (&rest _))))
|
||||||
|
|
||||||
(def-package! hideshow ; built-in
|
(def-package! hideshow ; built-in
|
||||||
|
|
|
@ -10,9 +10,8 @@
|
||||||
face to render it with.")
|
face to render it with.")
|
||||||
|
|
||||||
(defmacro +ivy-do-action! (action)
|
(defmacro +ivy-do-action! (action)
|
||||||
"A factory function that returns an interactive lamba that sets the current
|
"Returns an interactive lambda that sets the current ivy action and
|
||||||
ivy action and immediately runs it on the current candidate (ending the ivy
|
immediately runs it on the current candidate (ending the ivy session)."
|
||||||
session)."
|
|
||||||
`(lambda ()
|
`(lambda ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(ivy-set-action ,action)
|
(ivy-set-action ,action)
|
||||||
|
|
|
@ -282,7 +282,7 @@ the new algorithm is confusing, like in python or ruby."
|
||||||
:commands (evil-mc-make-cursor-here evil-mc-make-all-cursors
|
:commands (evil-mc-make-cursor-here evil-mc-make-all-cursors
|
||||||
evil-mc-undo-all-cursors evil-mc-pause-cursors
|
evil-mc-undo-all-cursors evil-mc-pause-cursors
|
||||||
evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor
|
evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor
|
||||||
evil-mc-make-and-goto-last-cursor evil-mc-make-cursor-here
|
evil-mc-make-and-goto-last-cursor
|
||||||
evil-mc-make-cursor-move-next-line
|
evil-mc-make-cursor-move-next-line
|
||||||
evil-mc-make-cursor-move-prev-line evil-mc-make-cursor-at-pos
|
evil-mc-make-cursor-move-prev-line evil-mc-make-cursor-at-pos
|
||||||
evil-mc-has-cursors-p evil-mc-make-and-goto-next-cursor
|
evil-mc-has-cursors-p evil-mc-make-and-goto-next-cursor
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
nil))
|
nil))
|
||||||
(add-hook '+evil-esc-hook #'+version-control|update-git-gutter t))
|
(add-hook '+evil-esc-hook #'+version-control|update-git-gutter t))
|
||||||
|
|
||||||
|
|
||||||
(when (featurep! :feature hydra)
|
(when (featurep! :feature hydra)
|
||||||
(defhydra +hydra-git-gutter (:body-pre (git-gutter-mode 1)
|
(defhydra +hydra-git-gutter (:body-pre (git-gutter-mode 1)
|
||||||
:hint nil)
|
:hint nil)
|
||||||
|
|
|
@ -27,14 +27,12 @@
|
||||||
(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
|
(add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
|
||||||
:config
|
:config
|
||||||
(when (featurep! :feature hydra)
|
(when (featurep! :feature hydra)
|
||||||
(require 'hydra)
|
|
||||||
|
|
||||||
(when (version< emacs-version "26")
|
(when (version< emacs-version "26")
|
||||||
(defalias 'smerge-keep-upper 'smerge-keep-mine)
|
(defalias #'smerge-keep-upper #'smerge-keep-mine)
|
||||||
(defalias 'smerge-keep-lower 'smerge-keep-other)
|
(defalias #'smerge-keep-lower #'smerge-keep-other)
|
||||||
(defalias 'smerge-diff-base-upper 'smerge-diff-base-mine)
|
(defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
|
||||||
(defalias 'smerge-diff-upper-lower 'smerge-diff-mine-other)
|
(defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
|
||||||
(defalias 'smerge-diff-base-lower 'smerge-diff-base-other))
|
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other))
|
||||||
|
|
||||||
(defhydra +hydra-smerge (:hint nil
|
(defhydra +hydra-smerge (:hint nil
|
||||||
:pre (smerge-mode 1)
|
:pre (smerge-mode 1)
|
||||||
|
|
|
@ -43,5 +43,5 @@
|
||||||
:config
|
:config
|
||||||
(set! :company-backend 'pug-mode '(company-yasnippet))
|
(set! :company-backend 'pug-mode '(company-yasnippet))
|
||||||
(map! :map pug-mode-map
|
(map! :map pug-mode-map
|
||||||
:i [tab] #'doom/dumb-indent
|
:i [tab] #'doom/dumb-indent
|
||||||
:i [backtab] #'doom/dumb-dedent))
|
:i [backtab] #'doom/dumb-dedent))
|
||||||
|
|
|
@ -91,7 +91,7 @@ the cursor."
|
||||||
(or ext (file-name-extension filename))))
|
(or ext (file-name-extension filename))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +org-attach*insert-link (link filename)
|
(defun +org-attach*insert-link (_link filename)
|
||||||
"TODO"
|
"TODO"
|
||||||
(if (looking-back "^[ \t]+" (line-beginning-position))
|
(if (looking-back "^[ \t]+" (line-beginning-position))
|
||||||
(delete-region (match-beginning 0) (match-end 0))
|
(delete-region (match-beginning 0) (match-end 0))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue