From 656452df00b1f7cadfac838db7b969fbee354340 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 19 May 2017 17:21:52 +0200 Subject: [PATCH] General cleanup & refactor; update TODO --- TODO.org | 6 ++- core/autoload/ui.el | 2 +- core/core-popups.el | 5 +- modules/private/hlissner/+bindings.el | 46 ++++++++++--------- modules/private/hlissner/autoload/hlissner.el | 2 +- modules/ui/doom-modeline/config.el | 2 +- modules/ui/doom-modeline/packages.el | 3 -- modules/ui/doom/config.el | 6 +-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/TODO.org b/TODO.org index 7c1c378bb..6c04f8c45 100644 --- a/TODO.org +++ b/TODO.org @@ -89,7 +89,7 @@ + [ ] twitter + [ ] present -** 2.0.3 [27/54] +** 2.0.3 [29/56] + [ ] bin/org-alert: scans TODOs in org files and issues system alerts + [ ] Get rid of ~def-bootstrap~ and ~doom-bootstrap~; it's a clumsy system + [ ] tools/upload: add ~+upload/open-remote-file~ command to open current file @@ -100,7 +100,7 @@ + [ ] Write ~describe-setting~ for ~def-setting!~ definitions. + [ ] Fix invisible buffer-info segment in modeline for terminal Emacs + [ ] ui/doom-modeline: fix ~0/0~ display in modeline (leftover anzu state) -+ [1/7] lang/org ++ [3/9] lang/org + [ ] drag-drop image attachment (org-download) and central storage + [ ] unified export system + [ ] better shackle + org-agenda integration @@ -108,6 +108,8 @@ + [-] fix janky cursor positioning when manipulating org-table cells + [-] certain characters/keys--when typed in a table--cause the cell to shrink (likely cause: smartparens pairs & custom SPC/BKSPC binds) + + [X] Fix M-RET in plain lists not preserving indent level for new items + + [X] don't move cursor when toggling folds + [X] don't move cursor when realigning org tables + [1/13] New module :: tools/regex (PCRE IDE) + [X] perl backend diff --git a/core/autoload/ui.el b/core/autoload/ui.el index 1a6f0ce18..20a0b690a 100644 --- a/core/autoload/ui.el +++ b/core/autoload/ui.el @@ -2,7 +2,7 @@ ;;;###autoload (defun doom/toggle-fullscreen () - "Toggle fullscreen Emacs." + "Toggle fullscreen Emacs (non-native on MacOS)." (interactive) (set-frame-parameter nil 'fullscreen diff --git a/core/core-popups.el b/core/core-popups.el index d07a03af3..7b4f854bc 100644 --- a/core/core-popups.el +++ b/core/core-popups.el @@ -257,15 +257,14 @@ properties." (after! eshell - ;; When eshell runs a visual command (see `eshell-visual-commands'), it spawns - ;; a term buffer to run it in, but where it spawns it is the problem. - ;; By tying buffer life to its process, we ensure that we land back in the ;; eshell buffer after term dies. May cause problems with short-lived ;; processes. ;; FIXME replace with a 'kill buffer' keybinding. (setq eshell-destroy-buffer-when-process-dies t) + ;; When eshell runs a visual command (see `eshell-visual-commands'), it spawns + ;; a term buffer to run it in, but where it spawns it is the problem... (defun doom*eshell-undedicate-popup (orig-fn &rest args) "Force spawned term buffer to share with the eshell popup (if necessary)." (when (doom-popup-p) diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el index a77fb016e..cef1a82d7 100644 --- a/modules/private/hlissner/+bindings.el +++ b/modules/private/hlissner/+bindings.el @@ -5,12 +5,14 @@ x-alt-keysym 'meta) (defmacro find-file-in! (path &optional project-p) - "Returns an interactive function for searching files" + "Returns an interactive function for searching files." `(lambda () (interactive) (let ((default-directory ,path)) (call-interactively ',(command-remapping - (if project-p 'projectile-find-file) 'find-file))))) + (if project-p + #'projectile-find-file + #'find-file)))))) (map! [remap evil-jump-to-tag] #'projectile-find-tag @@ -76,27 +78,27 @@ :m ";" 'evil-ex (:leader ;; Most commonly used - :desc "Switch project buffer" :n "," #'persp-switch-to-buffer - :desc "Switch buffer" :n "<" #'switch-to-buffer - :desc "Browse files" :n "." #'find-file - :desc "Find file from here" :n ">" #'counsel-file-jump - :desc "Find file in project" :n "/" #'projectile-find-file - :desc "Find in file (swiper)" :n "?" #'swiper - :desc "Imenu" :n ";" #'imenu - :desc "Imenu across buffers" :n ":" #'imenu-anywhere - :desc "Find other file" :n "a" #'projectile-find-other-file - :desc "Jump to bookmark" :n "b" #'bookmark-jump - :desc "Delete bookmark" :n "B" #'bookmark-delete - :desc "List errors" :n "e" #'flycheck-list-errors - :desc "View Emacs Log" :n "m" #'doom/popup-toggle-messages - :desc "Recent files" :n "r" #'recentf - :desc "Recent project files" :n "R" #'projectile-recentf - :desc "Insert from kill ring" :n "y" #'counsel-yank-pop - :desc "Switch project" :n "p" #'projectile-switch-project - :desc "Open Neotree" :n "\\" #'+evil/neotree + :desc "Switch project buffer" :n "," #'persp-switch-to-buffer + :desc "Switch buffer" :n "<" #'switch-to-buffer + :desc "Browse files" :n "." #'find-file + :desc "Find file from here" :n ">" #'counsel-file-jump + :desc "Find file in project" :n "/" #'projectile-find-file + :desc "Find in file (swiper)" :n "?" #'swiper + :desc "Imenu" :n ";" #'imenu + :desc "Imenu across buffers" :n ":" #'imenu-anywhere + :desc "Find other file" :n "a" #'projectile-find-other-file + :desc "Jump to bookmark" :n "b" #'bookmark-jump + :desc "Delete bookmark" :n "B" #'bookmark-delete + :desc "List errors" :n "e" #'flycheck-list-errors + :desc "View Emacs Log" :n "m" #'doom/popup-toggle-messages + :desc "Recent files" :n "r" #'recentf + :desc "Recent project files" :n "R" #'projectile-recentf + :desc "Insert from kill ring" :n "y" #'counsel-yank-pop + :desc "Switch project" :n "p" #'projectile-switch-project + :desc "Open Neotree" :n "\\" #'+evil/neotree ;; Since I've remapped C-h... - :desc "help" :n "h" #'help-command + :desc "help" :n "h" #'help-command (:desc "quit" :prefix "q" @@ -303,7 +305,7 @@ ;; rotate-text :n "!" #'rotate-text ;; hide-show/evil-matchit - :nv "" #'+evil/matchit-or-toggle-fold + :nv [tab] #'+evil/matchit-or-toggle-fold ;; help-mode (:map help-mode-map diff --git a/modules/private/hlissner/autoload/hlissner.el b/modules/private/hlissner/autoload/hlissner.el index 33da0f707..a6b58d050 100644 --- a/modules/private/hlissner/autoload/hlissner.el +++ b/modules/private/hlissner/autoload/hlissner.el @@ -12,7 +12,7 @@ private/hlissner/snippets." (defun +hlissner/C-u-M-x () "Invokes `execute-extended-command' with the universal argument." (interactive) - (let ((current-prefix-arg 1)) + (let ((current-prefix-arg 4)) (call-interactively #'execute-extended-command))) (defmacro +hlissner-def-finder! (name dir) diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index ca7a8ea9a..4301c30e6 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -34,7 +34,7 @@ ;; anzu and evil-anzu make it possible to display current/total in the ;; mode-line. (def-package! evil-anzu - :when (featurep! :feature evil) + :when (featurep 'evil) :init (add-transient-hook! evil-ex-start-search (require 'evil-anzu)) :config diff --git a/modules/ui/doom-modeline/packages.el b/modules/ui/doom-modeline/packages.el index 39cb1098b..f9dbcb769 100644 --- a/modules/ui/doom-modeline/packages.el +++ b/modules/ui/doom-modeline/packages.el @@ -3,8 +3,6 @@ ;;; These are the invisible dependencies ;; Required -;;(require 'f) -;;(require 's) ;;(require 'evil) ;;(require 'projectile) ;;(require 'all-the-icons) @@ -12,7 +10,6 @@ ;; Optional ;;(require 'flycheck) ;;(require 'anzu) -;;(require 'evil-anzu) ;;(require 'iedit) ;;(require 'evil-multiedit) diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index b8b5d1552..69c440802 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -126,7 +126,7 @@ (advice-add #'recenter :around #'doom*blink-cursor-maybe) (after! evil - (advice-add #'evil-window-top :after #'doom/blink-cursor) + (advice-add #'evil-window-top :after #'doom/blink-cursor) (advice-add #'evil-window-middle :after #'doom/blink-cursor) (advice-add #'evil-window-bottom :after #'doom/blink-cursor))) @@ -140,7 +140,7 @@ "Face to hightlight `hideshow' overlays." :group 'doom) - ;; Nicer code-folding overlays + ;; Nicer code-folding overlays (with fringe indicators) (setq hs-set-up-overlay (lambda (ov) (when (eq 'code (overlay-get ov 'hs)) @@ -159,7 +159,7 @@ (after! flycheck ;; because git-gutter is in the left fringe (setq flycheck-indication-mode 'right-fringe) - + ;; A non-descript, left-pointing arrow (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow [0 0 0 0 0 4 12 28 60 124 252 124 60 28 12 4 0 0 0 0]))