Minor refactors

early-init.el

@@ -10,7 +10,7 @@
 ;; loaded, but after `early-init-file'. Doom handles package initialization, so
 ;; we must prevent Emacs from doing it early!
 (setq package-enable-at-startup nil)
-(advice-add #'package--ensure-init-file :override #'ignore)
+(fset #'package--ensure-init-file #'ignore)
 
 ;; Prevent the glimpse of un-styled Emacs by disabling these UI elements early.
 (push '(menu-bar-lines . 0) default-frame-alist)
@@ -25,7 +25,7 @@
 ;; Ignore X resources; its settings would be redundant with the other settings
 ;; in this file and can conflict with later config (particularly where the
 ;; cursor color is concerned).
-(advice-add #'x-apply-session-resources :override #'ignore)
+(fset #'x-apply-session-resources #'ignore)
 
 ;; Prevent unwanted runtime builds in gccemacs (native-comp); packages are
 ;; compiled ahead-of-time when they are installed and site files are compiled

modules/lang/org/contrib/journal.el

@@ -38,10 +38,11 @@
         ;; we wanted to keep visible.
         org-journal-find-file #'find-file)
   
-  ;; Setup carryover to include all configured TODO states.
+  ;; Setup carryover to include all configured TODO states. We cannot carry over
+  ;; [ ] keywords because `org-journal-carryover-items's syntax cannot correctly
+  ;; interpret it as anything other than a date.
   (setq org-journal-carryover-items  "TODO=\"TODO\"|TODO=\"PROJ\"|TODO=\"STRT\"|TODO=\"WAIT\"|TODO=\"HOLD\"")
 
-
   (set-popup-rule! "^\\*Org-journal search" :select t :quit t)
 
   (map! (:map org-journal-mode-map

modules/tools/lsp/+lsp.el

@@ -98,8 +98,8 @@ server getting expensively restarted when reverting buffers."
             (run-at-time
              (if (numberp +lsp-defer-shutdown) +lsp-defer-shutdown 3)
              nil (lambda (workspace)
-                   (let ((lsp--cur-workspace workspace))
-                     (unless (lsp--workspace-buffers lsp--cur-workspace)
+                   (with-lsp-workspace workspace
+                     (unless (lsp--workspace-buffers workspace)
                        (let ((lsp-restart 'ignore))
                          (funcall orig-fn))
                        (+lsp-optimization-mode -1))))