dev: merge branch 'master' of github.com:doomemacs

lisp/doom-projects.el

@@ -68,13 +68,6 @@ Is nil if no executable is found in your PATH during startup.")
   (global-set-key [remap find-tag]         #'projectile-find-tag)
 
   :config
-  ;; HACK: Projectile cleans up the known projects list at startup. If this list
-  ;;   contains tramp paths, the `file-remote-p' calls will pull in tramp via
-  ;;   its `file-name-handler-alist' entry, which is expensive. Since Doom
-  ;;   already cleans up the project list on kill-emacs-hook, it's simplest to
-  ;;   inhibit this cleanup process at startup (see bbatsov/projectile#1649).
-  (letf! ((#'projectile--cleanup-known-projects #'ignore))
-    (projectile-mode +1))
   ;; HACK: Auto-discovery and cleanup on `projectile-mode' is slow and
   ;;   premature. Let's try to defer it until it's needed.
   (add-transient-hook! 'projectile-relevant-known-projects
@@ -246,7 +239,18 @@ when using many of projectile's command, e.g. `projectile-compile-command',
 This suppresses the error so these commands will still run, but prompt you for
 the command instead."
     :around #'projectile-default-generic-command
-    (ignore-errors (apply fn args))))
+    (ignore-errors (apply fn args)))
+
+  ;; HACK: Projectile cleans up the known projects list at startup. If this list
+  ;;   contains tramp paths, the `file-remote-p' calls will pull in tramp via
+  ;;   its `file-name-handler-alist' entry, which is expensive. Since Doom
+  ;;   already cleans up the project list on kill-emacs-hook, it's simplest to
+  ;;   inhibit this cleanup process at startup (see bbatsov/projectile#1649).
+  (letf! ((#'projectile--cleanup-known-projects #'ignore))
+    (projectile-mode +1)
+    ;; HACK: See bbatsov/projectile@3c92d28c056c
+    (remove-hook 'buffer-list-update-hook #'projectile-track-known-projects-find-file-hook)
+    (add-hook 'doom-switch-buffer-hook #'projectile-track-known-projects-find-file-hook t)))
 
 
 ;;

lisp/doom-start.el

@@ -322,6 +322,15 @@ If RETURN-P, return the message as a string instead of displaying it."
 (doom-run-hook-on 'doom-first-buffer-hook '(find-file-hook doom-switch-buffer-hook))
 (doom-run-hook-on 'doom-first-file-hook   '(find-file-hook dired-initial-position-hook))
 (doom-run-hook-on 'doom-first-input-hook  '(pre-command-hook))
+
+;; If the user's already opened something (e.g. with command-line arguments),
+;; then we should assume nothing about the user's intentions and simply treat
+;; this session as fully initialized.
+(add-hook! 'doom-after-init-hook :depth 100
+  (defun doom-run-first-hooks-if-files-open-h ()
+    (when file-name-history
+      (doom-run-hooks 'doom-first-file-hook 'doom-first-buffer-hook))))
+
 ;; PERF: Activate these later, otherwise they'll fire for every buffer created
 ;;   between now and the end of startup.
 (add-hook! 'after-init-hook

lisp/lib/config.el

@@ -1,8 +1,5 @@
 ;;; lisp/lib/config.el -*- lexical-binding: t; -*-
 
-(defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir))
-(defvar doom-bin (expand-file-name "doom" doom-bin-dir))
-
 ;;;###autoload
 (defvar doom-after-reload-hook nil
   "A list of hooks to run after `doom/reload' has reloaded Doom.")

lisp/packages.el

@@ -6,7 +6,7 @@
   :pin "17cfa1b54800fdef2975c0c0531dad34846a5065")
 (package! compat
   :recipe (:host github :repo "emacs-compat/compat")
-  :pin "09dce8a193c5a70277512263782b82fa1cba84c0")
+  :pin "e9203e164903a6bb7de3e58aa0d653bbcff9d3d1")
 (package! gcmh
   :pin "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
 
@@ -21,22 +21,22 @@
   :pin "88e574ae75344e39b436f863ef0344135c7b6517")
 
 ;; doom-ui.el
-(package! nerd-icons :pin "4322290303f2e12efd5685a0d22d76ed76ec7349")
-(package! hide-mode-line :pin "bc5d293576c5e08c29e694078b96a5ed85631942")
+(package! nerd-icons :pin "c3d641d8e14bd11b5f98372da34ee5313636e363")
+(package! hide-mode-line :pin "ddd154f1e04d666cd004bf8212ead8684429350d")
 (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307")
 (package! rainbow-delimiters :pin "f40ece58df8b2f0fb6c8576b527755a552a5e763")
 (package! restart-emacs :pin "1607da2bc657fe05ae01f7fdf26f716eafead02c")
 
 ;; doom-editor.el
 (package! better-jumper :pin "47622213783ece37d5337dc28d33b530540fc319")
-(package! dtrt-indent :pin "339755e4fb5245862737babf7f2c1e3bae1c129c")
+(package! dtrt-indent :pin "a8aa356684804c52f26602d4e315f1306c6f3e59")
 (package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c")
-(package! smartparens :pin "ab475c78916d7b1666a495e3fe9c54b250195637")
+(package! smartparens :pin "c7519a1b69f196050a13e2230b7532893b077086")
 (package! ws-butler :pin "e3a38d93e01014cd47bf5af4924459bd145fd7c4")
 
 ;; doom-projects.el
-(package! projectile :pin "0163b335a18af0f077a474d4dc6b36e22b5e3274")
-(package! project :pin "093f42a1b612eaae0d2bdd475663c14973fe0325")
+(package! projectile :pin "8cc2ee8937b89f1639304cbd2526e85b17135372")
+(package! project :pin "5c77d78936364e2e6e9641af2091fde0bee729ce")
 
 ;; doom-keybinds.el
 (package! general :pin "826bf2b97a0fb4a34c5eb96ec2b172d682fd548f")