Merge branch 'develop' of https://github.com/hlissner/doom-emacs into latexRefactor

modules/completion/ivy/config.el

@@ -215,7 +215,7 @@ immediately runs it on the current candidate (ending the ivy session)."
 
 
 ;; Used by `counsel-M-x'
-(setq amx-save-file (concat doom-cache-dir "/smex-items"))
+(setq amx-save-file (concat doom-cache-dir "amx-items"))
 
 
 ;;

modules/emacs/vc/config.el

@@ -1,13 +1,5 @@
 ;;; emacs/vc/config.el -*- lexical-binding: t; -*-
 
-(defvar +vc-auto-hydra-smerge t
-  "When entering `smerge-mode' automatically open associated hydra.")
-
-
-;;
-;; Plugins
-;;
-
 ;; `git-timemachine'
 (after! git-timemachine
   ;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of

modules/lang/org/autoload/org.el

@@ -395,13 +395,15 @@ with `org-cycle')."
   (unless (eq this-command 'org-shifttab)
     (save-excursion
       (org-beginning-of-line)
-      (when (org-at-heading-p)
-        (when (or (not arg)
-                  (outline-invisible-p (line-end-position)))
-          (outline-toggle-children)
-          (unless (outline-invisible-p (line-end-position))
-            (org-cycle-hide-drawers 'subtree))
-          t)))))
+      (when (and (org-at-heading-p)
+                 (or org-cycle-open-archived-trees
+                     (not (member org-archive-tag (org-get-tags))))
+                 (or (not arg)
+                     (outline-invisible-p (line-end-position))))
+        (outline-toggle-children)
+        (unless (outline-invisible-p (line-end-position))
+          (org-cycle-hide-drawers 'subtree))
+        t))))
 
 ;;;###autoload
 (defun +org|remove-occur-highlights ()

modules/tools/magit/config.el

@@ -41,6 +41,19 @@ load everything.")
 (def-package! magit-blame :after git-timemachine)
 
 
+(def-package! magit-todos
+  :after magit
+  :config
+  (setq magit-todos-require-colon nil)
+  ;; `magit-todos-mode' defines keybinds on activation, so it's better to just
+  ;; do this manually:
+  (magit-add-section-hook 'magit-status-sections-hook
+                          #'magit-todos--insert-todos
+                          'magit-insert-staged-changes
+                          'append)
+  (define-key magit-todos-section-map "j" nil))
+
+
 (def-package! magithub
   :after magit
   :preface

modules/tools/magit/packages.el

@@ -4,5 +4,6 @@
 (when (package! magit)
   (package! magit-gitflow)
   (package! magithub)
+  (package! magit-todos)
   (when (featurep! :feature evil +everywhere)
     (package! evil-magit)))

modules/ui/pretty-code/config.el

@@ -24,7 +24,8 @@ modes, this function does nothing.
 Otherwise it builds `prettify-code-symbols-alist' according to
 `+pretty-code-symbols-alist' for the current major-mode."
   (unless (or (eq major-mode 'fundamental-mode)
-              (derived-mode-p 'special-mode 'comint-mode 'eshell-mode 'term-mode))
+              (eq (get major-mode 'mode-class) 'special)
+              (derived-mode-p 'comint-mode 'eshell-mode 'term-mode))
     (when (or (eq +pretty-code-enabled-modes t)
               (if (eq (car +pretty-code-enabled-modes) 'not)
                   (not (memq major-mode (cdr +pretty-code-enabled-modes)))

modules/ui/vc-gutter/config.el

@@ -48,8 +48,9 @@ to the right fringe.")
       (ignore (git-gutter))))
   (add-hook 'doom-escape-hook #'+version-control|update-git-gutter t)
 
-  ;; update git-gutter when using these commands
-  (add-hook 'magit-post-refresh-hook #'+version-control|update-git-gutter)
+  ;; update git-gutter when using magit commands
+  (advice-add #'magit-stage-file   :after #'+version-control|update-git-gutter)
+  (advice-add #'magit-unstage-file :after #'+version-control|update-git-gutter)
 
   ;; subtle diff indicators in the fringe
   (when +vc-gutter-default-style