merge conflict

modules/lang/clojure/config.el

@@ -86,6 +86,14 @@
            (with-current-buffer nrepl-server-buffer
              (buffer-string)))))))
 
+  ;; When in cider-debug-mode, override evil keys to not interfere with debug keys
+  (after! evil
+    (add-hook! cider--debug-mode
+      (defun +clojure--cider-setup-debug ()
+        "Setup cider debug to override evil keys cleanly"
+        (evil-make-overriding-map cider--debug-mode-map 'normal)
+        (evil-normalize-keymaps))))
+
   ;; The CIDER welcome message obscures error messages that the above code is
   ;; supposed to be make visible.
   (setq cider-repl-display-help-banner nil)
@@ -98,6 +106,8 @@
             "C"  #'cider-connect-cljs
             "m"  #'cider-macroexpand-1
             "M"  #'cider-macroexpand-all
+            (:prefix ("d" . "debug")
+             "d" #'cider-debug-defun-at-point)
             (:prefix ("e" . "eval")
               "b" #'cider-eval-buffer
               "d" #'cider-eval-defun-at-point

modules/lang/common-lisp/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/common-lisp/packages.el
 
-(when (package! sly :pin "68561f1b7b66fa0240766ece836bb04da31ea17d")
+(when (package! sly :pin "3278819ddf71d16444e6cea293dd41ca83ea9bae")
   (package! sly-macrostep :pin "5113e4e926cd752b1d0bcc1508b3ebad5def5fad")
   (package! sly-repl-ansi-color :pin "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"))

modules/lang/csharp/config.el

@@ -98,3 +98,5 @@ or terminating simple string."
   :when (featurep! +dotnet)
   :bind
   ("C-c d" . sharper-main-transient))
+
+(use-package! sln-mode :mode "\\.sln\\'")

modules/lang/csharp/packages.el

@@ -3,6 +3,7 @@
 
 (package! csharp-mode :pin "49168293a28aaaf84b9655fe1b2abe402c5e2ee1")
 (package! csproj-mode :pin "a7f0f4610c976a28c41b9b8299892f88b5d0336c")
+(package! sln-mode :pin "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c")
 (unless (featurep! +lsp)
   (package! omnisharp :pin "e26ff8b8d34a247cd4a93be5d62a5f21859b7b57"))
 (when (featurep! +unity)

modules/lang/emacs-lisp/demos.org

@@ -137,10 +137,8 @@ usage from their documentation (e.g. =SPC h f add-hook\!=).
    `(,red-bg-faces
      :background "red" :weight bold)))
 
-;; If you want to make use of the `doom-themes' package API (e.g. `doom-color',
-;; `doom-lighten', `doom-darken', etc.), you must use `custom-set-faces!'
-;; *after* the theme has been loaded. e.g.
-(load-theme 'doom-one t)
+;; You may utilise `doom-themes's theme API to fetch or tweak colors from their
+;; palettes. No need to wait until the theme or package is loaded. e.g.
 (custom-set-faces!
  `(outline-1 :foreground ,(doom-color 'red))
  `(outline-2 :background ,(doom-color 'blue)))
@@ -171,10 +169,8 @@ usage from their documentation (e.g. =SPC h f add-hook\!=).
    `(,red-bg-faces
      :background "red" :weight bold)))
 
-;; If you want to make use of the `doom-themes' package API (e.g. `doom-color',
-;; `doom-lighten', `doom-darken', etc.), you must use `custom-set-faces!'
-;; *after* the theme has been loaded. e.g.
-(load-theme 'doom-one t)
+;; You may utilise `doom-themes's theme API to fetch or tweak colors from their
+;; palettes. No need to wait until the theme or package is loaded. e.g.
 (custom-theme-set-faces! 'doom-one
  `(outline-1 :foreground ,(doom-color 'red))
  `(outline-2 :background ,(doom-color 'blue)))

modules/lang/gdscript/config.el

@@ -20,15 +20,23 @@
         :map gdscript-mode-map
 
         (:prefix ("r" . "run")
-         "e" #'gdscript-godot-open-project-in-editor
-         "p" #'gdscript-godot-run-project
-         "d" #'gdscript-godot-run-project-debug
-         "s" #'gdscript-godot-run-current-scene)
+         :desc "Open project in Godot" "e" #'gdscript-godot-open-project-in-editor
+         :desc "Run project" "p" #'gdscript-godot-run-project
+         :desc "Run debug" "d" #'gdscript-godot-run-project-debug
+         :desc "Run current scene" "s" #'gdscript-godot-run-current-scene)
+
+        (:prefix ("d" . "debug")
+         :desc "Add breakpoint" "a"  #'gdscript-debug-add-breakpoint
+         :desc "Display breakpoint buffer" "b" #'gdscript-debug-display-breakpoint-buffer
+         :desc "Remove breakpoint" "d" #'gdscript-debug-remove-breakpoint
+         :desc "Continue execution" "c" #'gdscript-debug-continue
+         :desc "Next" "n" #'gdscript-debug-next
+         :desc "Step" "s" #'gdscript-debug-step)
 
         (:prefix ("h" . "help")
-         "b" #'gdscript-docs-browse-api
-         "f" #'gdscript-docs-browse-symbol-at-point)
+         :desc "Browse online API" "b" #'gdscript-docs-browse-api
+         :desc "Browse API at point" "f" #'gdscript-docs-browse-symbol-at-point)
 
         (:prefix ("f" . "format")
-         "b" #'gdscript-format-buffer
-         "r" #'gdscript-format-region)))
+         :desc "Format buffer" "b" #'gdscript-format-buffer
+         :desc "Format region" "r" #'gdscript-format-region)))

modules/lang/latex/autoload.el

@@ -17,7 +17,7 @@ function uses."
                      (when (looking-at (concat re-beg re-env "}"))
                        (end-of-line))
                      (LaTeX-find-matching-begin)
-                     (current-column)))
+                     (+ LaTeX-item-indent (current-column))))
            (contin (pcase +latex-indent-item-continuation-offset
                      (`auto LaTeX-indent-level)
                      (`align 6)
@@ -29,13 +29,18 @@ function uses."
                    (ignore-errors
                      (LaTeX-find-matching-begin)
                      (+ (current-column)
+                        LaTeX-item-indent
                         LaTeX-indent-level
                         (if (looking-at (concat re-beg re-env "}"))
                             contin
                           0))))
                  indent))
             ((looking-at (concat re-end re-env "}"))
-             indent)
+             (save-excursion
+               (beginning-of-line)
+               (ignore-errors
+                 (LaTeX-find-matching-begin)
+                 (current-column))))
             ((looking-at "\\\\item")
              (+ LaTeX-indent-level indent))
             ((+ contin LaTeX-indent-level indent))))))

modules/lang/latex/packages.el

@@ -2,7 +2,7 @@
 ;;; lang/latex/packages.el
 
 (package! auctex :pin "fb062a364fbc7d791707ff574b0f0a7f4c7a7269")
-(package! adaptive-wrap :pin "8f60ee70d6eadb0ddae206a0310505195e7ba0d8")
+(package! adaptive-wrap :pin "91e939b48a8129f696f45a7a3963fe09cbfa3a2d")
 (package! latex-preview-pane :pin "5297668a89996b50b2b62f99cba01cc544dbed2e")
 (when (featurep! :editor evil +everywhere)
   (package! evil-tex :pin "ac313efb22d621c093d8d30233bd7dc8b4cc54b4"))

modules/lang/org/config.el

@@ -67,7 +67,8 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
 (defun +org-init-org-directory-h ()
   (unless org-directory
     (setq-default org-directory "~/org"))
-  (setq org-id-locations-file (expand-file-name ".orgids" org-directory)))
+  (unless org-id-locations-file
+    (setq org-id-locations-file (expand-file-name ".orgids" org-directory))))
 
 
 (defun +org-init-agenda-h ()
@@ -117,7 +118,11 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
           (?C . success))
         org-startup-indented t
         org-tags-column 0
-        org-use-sub-superscripts '{})
+        org-use-sub-superscripts '{}
+        ;; HACK Speed up regexp for priority faces by making it a little less
+        ;;      greedy than the default.
+        ;; REVIEW May be upstreamed at some point. Keep an eye out.
+        org-priority-regexp "^\\*+.*\\(\\[#\\([A-Z0-9]+\\)\\] ?\\)")
 
   (setq org-refile-targets
         '((nil :maxlevel . 3)
@@ -1047,6 +1052,7 @@ compelling reason, so..."
   ;; Set to nil so we can detect user changes to them later (and fall back on
   ;; defaults otherwise).
   (defvar org-directory nil)
+  (defvar org-id-locations-file nil)
   (defvar org-attach-id-dir nil)
 
   (setq org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/")