From 91783e069514179fac83b019ea096478efa03a52 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 15 Sep 2017 14:35:18 +0200 Subject: [PATCH] General refactor & cleanup --- core/core-ui.el | 1 + modules/completion/ivy/config.el | 5 ++--- modules/feature/evil/config.el | 2 +- modules/feature/version-control/+git.el | 1 - modules/feature/version-control/config.el | 12 +++++------- modules/lang/web/+html.el | 2 +- modules/org/org-attach/autoload/org-attach.el | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 8772d2da8..9ec858d13 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -273,6 +273,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle :commands (fringe-helper-define fringe-helper-convert) :init (unless (fboundp 'define-fringe-bitmap) + ;; doesn't exist in terminal Emacs; define it to prevent errors (defun define-fringe-bitmap (&rest _)))) (def-package! hideshow ; built-in diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 7dd495b01..8f4f15a4a 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -10,9 +10,8 @@ face to render it with.") (defmacro +ivy-do-action! (action) - "A factory function that returns an interactive lamba that sets the current -ivy action and immediately runs it on the current candidate (ending the ivy -session)." + "Returns an interactive lambda that sets the current ivy action and +immediately runs it on the current candidate (ending the ivy session)." `(lambda () (interactive) (ivy-set-action ,action) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 0584d24af..32c74b853 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -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 evil-mc-undo-all-cursors evil-mc-pause-cursors 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-prev-line evil-mc-make-cursor-at-pos evil-mc-has-cursors-p evil-mc-make-and-goto-next-cursor diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el index 408b68667..5d87ce08b 100644 --- a/modules/feature/version-control/+git.el +++ b/modules/feature/version-control/+git.el @@ -33,7 +33,6 @@ nil)) (add-hook '+evil-esc-hook #'+version-control|update-git-gutter t)) - (when (featurep! :feature hydra) (defhydra +hydra-git-gutter (:body-pre (git-gutter-mode 1) :hint nil) diff --git a/modules/feature/version-control/config.el b/modules/feature/version-control/config.el index 7d9339355..9c525e164 100644 --- a/modules/feature/version-control/config.el +++ b/modules/feature/version-control/config.el @@ -27,14 +27,12 @@ (add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe) :config (when (featurep! :feature hydra) - (require 'hydra) - (when (version< emacs-version "26") - (defalias 'smerge-keep-upper 'smerge-keep-mine) - (defalias 'smerge-keep-lower 'smerge-keep-other) - (defalias 'smerge-diff-base-upper 'smerge-diff-base-mine) - (defalias 'smerge-diff-upper-lower 'smerge-diff-mine-other) - (defalias 'smerge-diff-base-lower 'smerge-diff-base-other)) + (defalias #'smerge-keep-upper #'smerge-keep-mine) + (defalias #'smerge-keep-lower #'smerge-keep-other) + (defalias #'smerge-diff-base-upper #'smerge-diff-base-mine) + (defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other) + (defalias #'smerge-diff-base-lower #'smerge-diff-base-other)) (defhydra +hydra-smerge (:hint nil :pre (smerge-mode 1) diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el index 1e1642f8b..e8ce303d3 100644 --- a/modules/lang/web/+html.el +++ b/modules/lang/web/+html.el @@ -43,5 +43,5 @@ :config (set! :company-backend 'pug-mode '(company-yasnippet)) (map! :map pug-mode-map - :i [tab] #'doom/dumb-indent + :i [tab] #'doom/dumb-indent :i [backtab] #'doom/dumb-dedent)) diff --git a/modules/org/org-attach/autoload/org-attach.el b/modules/org/org-attach/autoload/org-attach.el index 2d6a670bc..783ee2d99 100644 --- a/modules/org/org-attach/autoload/org-attach.el +++ b/modules/org/org-attach/autoload/org-attach.el @@ -91,7 +91,7 @@ the cursor." (or ext (file-name-extension filename)))) ;;;###autoload -(defun +org-attach*insert-link (link filename) +(defun +org-attach*insert-link (_link filename) "TODO" (if (looking-back "^[ \t]+" (line-beginning-position)) (delete-region (match-beginning 0) (match-end 0))