changeset 677: |
585f14458a65 |
parent 676: |
ca09f470abb3 |
child 678: |
2b7d5a8d63ac |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 24 Sep 2024 22:19:05 -0400 |
files: |
emacs/default.el emacs/lib/inbox.el emacs/lib/sk.el |
description: |
tweaks |
1.1--- a/emacs/default.el Tue Sep 24 20:57:47 2024 -0400
1.2+++ b/emacs/default.el Tue Sep 24 22:19:05 2024 -0400
1.3@@ -340,7 +340,7 @@
1.4 ;;; Eglot
1.5 (with-eval-after-load 'eglot
1.6 (unless (package-installed-p 'eglot-x)
1.7- (package-vc-install '(eglot-x :url "https://vc.compiler.company/packy/eglot-x.git")))
1.8+ (package-vc-install '(eglot-x :url "https://vc.compiler.company/packy/eglot-x")))
1.9 (require 'eglot-x)
1.10 (with-eval-after-load 'eglot-x
1.11 (add-to-list 'eglot-server-programs
2.1--- a/emacs/lib/inbox.el Tue Sep 24 20:57:47 2024 -0400
2.2+++ b/emacs/lib/inbox.el Tue Sep 24 22:19:05 2024 -0400
2.3@@ -130,7 +130,7 @@
2.4 ("A" 1)
2.5 ("B" 2)
2.6 ("C" 3)
2.7- (t 2)))
2.8+ (_ 2)))
2.9 (res))
2.10 ;; FIXME todo states shouldn't be hardcoded
2.11 (cond
3.1--- a/emacs/lib/sk.el Tue Sep 24 20:57:47 2024 -0400
3.2+++ b/emacs/lib/sk.el Tue Sep 24 22:19:05 2024 -0400
3.3@@ -29,6 +29,7 @@
3.4 (require 'cl-lib)
3.5 (require 'sxp (expand-file-name "sxp.el" (join-paths user-emacs-directory "lib/")))
3.6 (require 'skeleton)
3.7+ (require 'project)
3.8 (require 'org)
3.9 (require 'tempo)
3.10 (require 'autoinsert)
3.11@@ -197,12 +198,12 @@
3.12 (let ((root (project-root (project-current))))
3.13 (cons (expand-file-name root) (project-skelfile-dir-locals root))))
3.14
3.15-(defun %skel-dir-local--get-variables ()
3.16+(defun skel-dir-local-get-variables ()
3.17 (let ((root (expand-file-name (project-root (project-current)))))
3.18 (unless (assoc-string root dir-locals-class-alist)
3.19 (push (skel-dir-local--get-variables) dir-locals-class-alist))))
3.20
3.21-(add-hook 'skel-minor-mode-hook '%skel-dir-local--get-variables)
3.22+;; (add-hook 'skel-minor-mode-hook '%skel-dir-local--get-variables)
3.23
3.24 (provide 'skel)
3.25 (provide 'sk)