changeset 406: |
71baf0d4768d |
parent 405: |
1816f9c53453 |
child 407: |
7dfc86e5e290 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Wed, 05 Jun 2024 17:01:13 -0400 |
files: |
emacs/default.el emacs/lib/publish.el emacs/lib/sk.el readme.org rust/ui/alik/Cargo.toml |
description: |
skel work |
1.1--- a/emacs/default.el Tue Jun 04 18:53:40 2024 -0400
1.2+++ b/emacs/default.el Wed Jun 05 17:01:13 2024 -0400
1.3@@ -34,6 +34,7 @@
1.4 project-list-file (expand-file-name "projects" user-emacs-directory)
1.5 project-mode-line t
1.6 project-file-history-behavior 'relativize
1.7+ tempo-interactive t
1.8 emms-directory (expand-file-name "emms" user-emacs-directory)
1.9 gnus-cache-directory (expand-file-name "gnus" user-emacs-directory)
1.10 url-cache-directory (expand-file-name "url" user-emacs-directory)
1.11@@ -49,6 +50,7 @@
1.12 view-read-only t)
1.13 (browse-url-default-browser "")
1.14 ;;; Variables
1.15+(defvar user-emacs-lib-directory (expand-file-name (join-paths user-emacs-directory "lib")))
1.16 (defvar user-custom-file (expand-file-name (format "%s.el" user-login-name) user-emacs-directory))
1.17 (defvar user-home-directory (expand-file-name "~"))
1.18 (defvar user-lab-directory (expand-file-name "lab" user-home-directory))
1.19@@ -132,13 +134,13 @@
1.20 ("C-c p ^" . cape-tex)
1.21 ("C-c p &" . cape-sgml)
1.22 ("C-c p r" . cape-rfc1345))
1.23- :init
1.24+ :config
1.25 ;; Add to the global default value of `completion-at-point-functions' which is
1.26 ;; used by `completion-at-point'. The order of the functions matters, the
1.27 ;; first function returning a result wins. Note that the list of buffer-local
1.28 ;; completion functions takes precedence over the global list.
1.29 ;; (add-to-list 'completion-at-point-functions #'cape-dabbrev)
1.30- ;; (add-to-list 'completion-at-point-functions #'cape-abbrev)
1.31+ (add-to-list 'completion-at-point-functions #'cape-abbrev)
1.32 ;; (add-to-list 'completion-at-point-functions #'cape-history)
1.33 ;; (add-to-list 'completion-at-point-functions #'cape-keyword)
1.34 ;; (add-to-list 'completion-at-point-functions #'cape-file)
1.35@@ -916,8 +918,5 @@
1.36 (org-agenda-remove-restriction-lock t)
1.37 (message nil))))
1.38
1.39-;;; Tempo
1.40-(setq tempo-interactive t)
1.41-
1.42 (provide 'default)
1.43 ;; default.el ends here
2.1--- a/emacs/lib/publish.el Tue Jun 04 18:53:40 2024 -0400
2.2+++ b/emacs/lib/publish.el Wed Jun 05 17:01:13 2024 -0400
2.3@@ -11,7 +11,10 @@
2.4 (defvar publish-dir "/mnt/y/stash/compiler.company")
2.5 (defvar html-theme nil)
2.6 (defvar url "https://compiler.company")
2.7-(defvar html-nav "<div class=\"nav\"> (<a href = \"https://compiler.company\">~</a> (<a href = \"https://compiler.company/blog\">blog</a> <a href = \"https://compiler.company/docs\">docs</a>) (<a href = \"https://vc.compiler.company/comp\">vc</a> <a href = \"https://packy.compiler.company\">packy</a>))</div>")
2.8+(defvar vc-url "https://vc.compiler.company")
2.9+(defvar packy-url "https://packy.compiler.company")
2.10+(defvar html-nav (format "<div class=\"nav\"> (<a href = \"%s\">~</a> (<a href = \"%s/blog\">blog</a> <a href = \"%s/docs\">docs</a>) (<a href = \"%s\">vc</a> <a href = \"%s\">packy</a>))</div>"
2.11+ url url url vc-url packy-url))
2.12
2.13 (defvar html-foot "<footer><p>updated %C</p></footer>")
2.14
3.1--- a/emacs/lib/sk.el Tue Jun 04 18:53:40 2024 -0400
3.2+++ b/emacs/lib/sk.el Wed Jun 05 17:01:13 2024 -0400
3.3@@ -543,9 +543,7 @@
3.4 THEN and ELSE are tempo elements. To abort the execution of
3.5 these elements, user must press `skt-tempo-else-key'.
3.6
3.7-The main purpose of this extension is to mimic skeleton
3.8-conditionals and iterative templats. Skeleton becomes pretty
3.9-much obsolete with this extension."
3.10+The main purpose of this extension is to mimic skeleton conditionals."
3.11 (pcase element
3.12 (`(:if (,(and (pred stringp) prompt) ,(and (pred symbolp) var)) ,then ,else)
3.13 (let ((prompt (skt-tempo--prompt prompt))
4.1--- a/readme.org Tue Jun 04 18:53:40 2024 -0400
4.2+++ b/readme.org Wed Jun 05 17:01:13 2024 -0400
4.3@@ -1,7 +1,7 @@
4.4-
4.5 #+title: core
4.6-#+author: Richard Westhaver <ellis@rwest.io>
4.7 #+description: The Compiler Company Core
4.8+#+author: Richard Westhaver
4.9+#+email: richard.westhaver@gmail.com
4.10 The Compiler Company (=CC=) is a software research laboratory
4.11 concerned with the future of Mechanical Freedom.
4.12
5.1--- a/rust/ui/alik/Cargo.toml Tue Jun 04 18:53:40 2024 -0400
5.2+++ b/rust/ui/alik/Cargo.toml Wed Jun 05 17:01:13 2024 -0400
5.3@@ -35,4 +35,4 @@
5.4
5.5 [patch.crates-io]
5.6 egui = { git = "https://github.com/emilk/egui", branch = "master" }
5.7-eframe = { git = "https://github.com/emilk/egui", branch = "master" }
5.8\ No newline at end of file
5.9+eframe = { git = "https://github.com/emilk/egui", branch = "master" }