[elpa] externals/org 4846c7fa39: org-babel-map-call-lines: Fix typo
branch: externals/org commit 4846c7fa398d8426f3336cd2c98e5b3b31b3ad30 Author: Ihor Radchenko Commit: Ihor Radchenko org-babel-map-call-lines: Fix typo * lisp/ob-core.el (org-babel-map-call-lines): Fix incorrect variable reference revealed by compiler warning. --- lisp/ob-core.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 2f66ab17df..10992d61dd 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1408,8 +1408,8 @@ buffer." (while (re-search-forward "call_\\S-\\|^[ \t]*#\\+CALL:" nil t) (let ((,datum (org-element-context))) (when (org-element-type-p ,datum '(babel-call inline-babel-call)) - (goto-char (or (org-element-post-affiliated datum) - (org-element-begin datum))) + (goto-char (or (org-element-post-affiliated ,datum) + (org-element-begin ,datum))) (let ((,end (copy-marker (org-element-end ,datum ,@body (goto-char ,end)
[nongnu] elpa/aidermacs updated (bea17f1917 -> 764a99dd5e)
elpasync pushed a change to branch elpa/aidermacs. from bea17f1917 Replace goto-line with forward-line new d9a20f5138 Add aidermacs-auto-accept-architect new 170fe69a36 Update thinking tokens doc new 5157e8fb76 Release 1.0 new 764a99dd5e Add CHANGELOG Summary of changes: CHANGELOG.md| 16 +++ README.md | 49 +++-- aidermacs-backend-comint.el | 2 +- aidermacs-backend-vterm.el | 2 +- aidermacs-backends.el | 2 +- aidermacs-models.el | 2 +- aidermacs.el| 11 -- 7 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 CHANGELOG.md
[nongnu] elpa/aidermacs 5157e8fb76 3/4: Release 1.0
branch: elpa/aidermacs commit 5157e8fb760b239ae04f57d0c8a7f4bb87e7b6ad Author: Mingde (Matthew) Zeng Commit: Mingde (Matthew) Zeng Release 1.0 Signed-off-by: Mingde (Matthew) Zeng --- aidermacs-backend-comint.el | 2 +- aidermacs-backend-vterm.el | 2 +- aidermacs-backends.el | 2 +- aidermacs-models.el | 2 +- aidermacs.el| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el index 27e4274fb7..d891d04e7f 100644 --- a/aidermacs-backend-comint.el +++ b/aidermacs-backend-comint.el @@ -1,6 +1,6 @@ ;;; aidermacs-backend-comint.el --- Comint backend for aidermacs -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng -;; Version: 1.0.0 +;; Version: 1.0 ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs ;; SPDX-License-Identifier: Apache-2.0 diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index 620ba3d875..fa99e2ea21 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -1,6 +1,6 @@ ;;; aidermacs-backend-vterm.el --- VTerm backend for aidermacs -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng -;; Version: 1.0.0 +;; Version: 1.0 ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs ;; SPDX-License-Identifier: Apache-2.0 diff --git a/aidermacs-backends.el b/aidermacs-backends.el index cfcc77c8b0..9f37f4da0d 100644 --- a/aidermacs-backends.el +++ b/aidermacs-backends.el @@ -1,6 +1,6 @@ ;;; aidermacs-backends.el --- Backend dispatcher for aidermacs -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng -;; Version: 1.0.0 +;; Version: 1.0 ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs ;; SPDX-License-Identifier: Apache-2.0 diff --git a/aidermacs-models.el b/aidermacs-models.el index 4c987d8292..60f4db8305 100644 --- a/aidermacs-models.el +++ b/aidermacs-models.el @@ -1,6 +1,6 @@ ;;; aidermacs-models.el --- Model selection for aidermacs -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng -;; Version: 1.0.0 +;; Version: 1.0 ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs ;; SPDX-License-Identifier: Apache-2.0 diff --git a/aidermacs.el b/aidermacs.el index 6abe8ac1e0..cbcd75dffd 100644 --- a/aidermacs.el +++ b/aidermacs.el @@ -1,6 +1,6 @@ ;;; aidermacs.el --- AI pair programming with Aider -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng -;; Version: 1.0.0 +;; Version: 1.0 ;; Package-Requires: ((emacs "29.1")) ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs
[nongnu] elpa/aidermacs 764a99dd5e 4/4: Add CHANGELOG
branch: elpa/aidermacs commit 764a99dd5ee301621645a5969b6ca43c2823950d Author: Mingde (Matthew) Zeng Commit: Mingde (Matthew) Zeng Add CHANGELOG Signed-off-by: Mingde (Matthew) Zeng --- CHANGELOG.md | 16 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00..4955e59dc5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# CHANGELOG + +## 1.0 - Initial Release + +### Features + +- **Built-in Ediff Integration:** Review AI-generated changes with Emacs' familiar `ediff` interface. +- **Intelligent Model Selection:** Automatically discover and integrate with multiple AI providers (OpenAI, Anthropic, DeepSeek, Google Gemini, OpenRouter). +- **Flexible Terminal Backend Support:** Choose between `comint` and `vterm` backends for the best terminal compatibility and performance. +- **Enhanced File Management:** Easily manage files within your Aider session with commands for adding, dropping, listing, and more. Full support for remote files via Tramp (SSH, Docker, etc.). +- **Streamlined Transient Menu Selection:** Access all Aidermacs features through a redesigned and ergonomic transient menu system. +- **Prompt Files Minor Mode:** Work seamlessly with prompt files and other Aider-related files with convenient keybindings and automatic mode activation. +- **Claude 3.7 Sonnet Thinking Tokens:** Enable and configure thinking tokens using the `/think-tokens` in-chat command or the `--thinking-tokens` command-line argument. +- **Architect Mode Confirmation:** Control whether to automatically accept Architect mode changes with the `aidermacs-auto-accept-architect` variable. +- **Re-Enable Auto-Commits:** Aider automatically commits AI-generated changes by default. We consider this behavior *very* intrusive, so we've disabled it. You can re-enable auto-commits by setting `aidermacs-auto-commits` to `t`. +- **Customizing Aider Options with `aidermacs-extra-args`:** Pass any Aider-supported command-line options.
[nongnu] elpa/aidermacs 170fe69a36 2/4: Update thinking tokens doc
branch: elpa/aidermacs
commit 170fe69a36d0df05986497a33fd86c93ec5479bc
Author: Mingde (Matthew) Zeng
Commit: Mingde (Matthew) Zeng
Update thinking tokens doc
Signed-off-by: Mingde (Matthew) Zeng
---
README.md | 35 ---
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index b54d530633..e1b5a46a3a 100644
--- a/README.md
+++ b/README.md
@@ -275,30 +275,19 @@ Aidermacs supports project-specific configurations via
`.aider.conf.yml` files.
### Claude 3.7 Sonnet Thinking Tokens
-Aider can work with Sonnet 3.7's [new thinking
tokens](https://www.anthropic.com/news/claude-3-7-sonnet), but does not ask
Sonnet to use thinking tokens by default.
-
-Enabling thinking currently requires manual configuration. Create an
`.aider.model.settings.yml` in your home dir, project's root, or the current
directory, then add the following to the file. Adjust the `budget_tokens` value
to change the target number of thinking tokens.
-
-```yaml
-- name: anthropic/claude-3-7-sonnet-20250219
- edit_format: diff
- weak_model_name: anthropic/claude-3-5-haiku-20241022
- use_repo_map: true
- examples_as_sys_msg: true
- use_temperature: false
- extra_params:
-extra_headers:
- anthropic-beta:
prompt-caching-2024-07-31,pdfs-2024-09-25,output-128k-2025-02-19
-max_tokens: 64000
-thinking:
- type: enabled
- budget_tokens: 32000 # Adjust this number
- cache_control: true
- editor_model_name: anthropic/claude-3-7-sonnet-20250219
- editor_edit_format: editor-diff
-```
+Aider can work with Sonnet 3.7's [new thinking
tokens](https://www.anthropic.com/news/claude-3-7-sonnet). You can now enable
and configure thinking tokens more easily using the following methods:
+
+1. **In-Chat Command:** Use the `/think-tokens` command followed by the
desired token budget. For example: `/think-tokens 8k` or `/think-tokens 1`.
Supported formats include `8096`, `8k`, `10.5k`, and `0.5M`.
+
+2. **Command-Line Argument:** Set the `--thinking-tokens` argument when
starting Aidermacs. For example, you can add this to your
`aidermacs-extra-args`:
+
+```emacs-lisp
+(setq aidermacs-extra-args '("--thinking-tokens" "16k"))
+```
+
+These methods provide a more streamlined way to control thinking tokens
without requiring manual configuration of `.aider.model.settings.yml` files.
-More streamlined support will be coming soon.
+*Note: If you are using an `.aider.conf.yml` file, you can also set the
`thinking_tokens` option there.*
## Usage
[nongnu] elpa/aidermacs d9a20f5138 1/4: Add aidermacs-auto-accept-architect
branch: elpa/aidermacs
commit d9a20f51382a67a0f9a16302ae7c3d74cd54fd05
Author: Mingde (Matthew) Zeng
Commit: Mingde (Matthew) Zeng
Add aidermacs-auto-accept-architect
Signed-off-by: Mingde (Matthew) Zeng
---
README.md| 14 +-
aidermacs.el | 9 -
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b76423a9c6..b54d530633 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,19 @@ When Architect mode is enabled, the
`aidermacs-default-model` setting is ignored
(setq aidermacs-editor-model "deepseek/deepseek-chat") ;; defaults to
aidermacs-default-model
```
-*Note: This configuration will be overwritten by the existence of an
`.aider.conf.yml` file (see
[details](#Overwrite-Configuration-with-Configuration-File)).*
+*Note: These configurations will be overwritten by the existence of an
`.aider.conf.yml` file (see
[details](#Overwrite-Configuration-with-Configuration-File)).*
+
+ Architect Mode Confirmation
+
+By default, Aidermacs requires explicit confirmation before applying changes
proposed in Architect mode. This gives you a chance to review the AI's plan
before any code is modified.
+
+If you prefer to automatically accept all Architect mode changes without
confirmation (similar to Aider's default behavior), you can enable this with:
+
+```emacs-lisp
+(setq aidermacs-auto-accept-architect t)
+```
+
+*Note: These configurations will be overwritten by the existence of an
`.aider.conf.yml` file (see
[details](#Overwrite-Configuration-with-Configuration-File)).*
### Terminal Backend Selection
diff --git a/aidermacs.el b/aidermacs.el
index 988f058da1..6abe8ac1e0 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -83,6 +83,11 @@ This is useful for working in monorepos where you want to
limit aider's scope."
When nil, disable auto-commits requiring manual git commits."
:type 'boolean)
+(defcustom aidermacs-auto-accept-architect nil
+ "When non-nil, automatically accept architect mode changes.
+When nil, require explicit confirmation before applying changes."
+ :type 'boolean)
+
(defun aidermacs-project-root ()
"Get the project root using project.el, VC, or fallback to file directory.
This function tries multiple methods to determine the project root."
@@ -260,8 +265,10 @@ This function sets up the appropriate arguments and
launches the process."
"--editor-model" aidermacs-editor-model)
(unless has-model-arg
(list "--model" aidermacs-default-model)))
- (when (not aidermacs-auto-commits)
+ (unless aidermacs-auto-commits
'("--no-auto-commits"))
+ (unless aidermacs-auto-accept-architect
+ '("--no-auto-accept-architect"))
(when aidermacs-subtree-only
'("--subtree-only")
(final-args (append backend-args flat-extra-args)))
[elpa] externals/tempel 93c792aca6 1/4: tempel-expand: Call tempel--save
branch: externals/tempel commit 93c792aca66f8230a6ece6bfb53b2ec9918f2fc6 Author: Daniel Mendler Commit: Daniel Mendler tempel-expand: Call tempel--save --- tempel.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tempel.el b/tempel.el index 7e1c96adb7..c3c6bc0156 100644 --- a/tempel.el +++ b/tempel.el @@ -678,6 +678,8 @@ If you want to select from a list of templates, use acts like a Capf, otherwise like an interactive completion command." (interactive (list t)) + (when interactive +(tempel--save)) (if-let ((templates (tempel--templates)) (bounds (tempel--prefix-bounds)) (name (buffer-substring-no-properties @@ -705,9 +707,9 @@ Capf, otherwise like an interactive completion command." (if interactive (let ((completion-at-point-functions (list #'tempel-complete)) completion-cycle-threshold) +(tempel--save) (when (and tempel-trigger-prefix (not (tempel--prefix-bounds))) (insert tempel-trigger-prefix)) -(tempel--save) (unless (completion-at-point) (user-error "tempel-complete: No matching templates"))) (let ((region (tempel--region)))
[elpa] externals/tempel f52a99ebf6 4/4: Version 1.4
branch: externals/tempel commit f52a99ebf6ee52a30d435ef1583dc8df3e5f2ca5 Author: Daniel Mendler Commit: Daniel Mendler Version 1.4 --- CHANGELOG.org | 2 +- tempel.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 3ac74c133b..8a3e45a620 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,7 +2,7 @@ #+author: Daniel Mendler #+language: en -* Development +* Version 1.4 (2025-03-16) - =tempel-expand=: Expand exact matches directly when invoked interactively instead of going via =completion-at-point=. This avoids problems with diff --git a/tempel.el b/tempel.el index 3e19c4ebbe..d7310a36bf 100644 --- a/tempel.el +++ b/tempel.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2022 -;; Version: 1.3 +;; Version: 1.4 ;; Package-Requires: ((emacs "28.1") (compat "30")) ;; URL: https://github.com/minad/tempel ;; Keywords: abbrev, languages, tools, text
[elpa] externals/org e49a31ced2: doc/org-manual.org: add STARTUP to Beamer example
branch: externals/org commit e49a31ced29bd1fd7e98a5087256cfd6e0e8b686 Author: Leo Butler Commit: Ihor Radchenko doc/org-manual.org: add STARTUP to Beamer example To work out of the box, the given example needs to load `ox-beamer'. Ref: https://list.orgmode.org/87tt8yvp2a@icloud.com/ --- doc/org-manual.org | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/org-manual.org b/doc/org-manual.org index fa1bf5c7f6..1f4fe5a6f7 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -13288,6 +13288,7 @@ Here is an example of an Org document ready for Beamer export. ,#+AUTHOR: Carsten Dominik ,#+OPTIONS: H:2 toc:t num:t ,#+LATEX_CLASS: beamer +,#+STARTUP: beamer ,#+LATEX_CLASS_OPTIONS: [presentation] ,#+BEAMER_THEME: Madrid ,#+COLUMNS: %45ITEM %10BEAMER_ENV(Env) %10BEAMER_ACT(Act) %4BEAMER_COL(Col)
[elpa] externals/tempel f1d76b15b8 3/4: Update changelog
branch: externals/tempel commit f1d76b15b8d29ea3dba8b9b186dcfc362607f3a8 Author: Daniel Mendler Commit: Daniel Mendler Update changelog --- CHANGELOG.org | 6 ++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.org b/CHANGELOG.org index ed7d6e71ce..3ac74c133b 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,6 +2,12 @@ #+author: Daniel Mendler #+language: en +* Development + +- =tempel-expand=: Expand exact matches directly when invoked interactively + instead of going via =completion-at-point=. This avoids problems with + =completion-styles= settings. + * Version 1.3 (2024-12-22) - Require Emacs 28.1.
[nongnu] elpa/eglot-inactive-regions 13cef75886: invalidate opacity cache on refresh-all
branch: elpa/eglot-inactive-regions commit 13cef75886a18d656ad79bf042ba3ffcd4aa37ad Author: Filippo Argiolas Commit: Filippo Argiolas invalidate opacity cache on refresh-all Clear opacity hash table on refresh-all to be able invalidate face cache and trigger a refresh without changing the opacity (e.g. in a load-theme hook). Make refresh-all interactive. --- eglot-inactive-regions.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eglot-inactive-regions.el b/eglot-inactive-regions.el index 724fcbd2ea..6adc5e6f42 100644 --- a/eglot-inactive-regions.el +++ b/eglot-inactive-regions.el @@ -280,8 +280,10 @@ Useful to update colors after a face or theme change." (run-hook-with-args 'eglot-inactive-regions-refresh-hook beg end) (defun eglot-inactive-regions-refresh-all () - "Refresh all buffers where this mode is enabled." + "Invalidate face cache and refresh all buffers where mode is enabled." + (interactive) (when eglot-inactive-regions-mode +(clrhash eglot-inactive-regions-opacity-table) (dolist (buffer (buffer-list)) (with-current-buffer buffer (eglot-inactive-regions-refresh)
[nongnu] elpa/evil 94f9517f66: Add sphinx.configuration key to .readthedocs.yaml
branch: elpa/evil commit 94f9517f66be80395ef7ba3604278ed5624b9529 Author: Axel Forsman Commit: Axel Forsman Add sphinx.configuration key to .readthedocs.yaml See: https://about.readthedocs.com/blog/2024/12/deprecate-config-files-without-sphinx-or-mkdocs-config/ --- .readthedocs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f17f5abf0d..f4b346be25 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,6 +9,9 @@ build: pre_build: - scripts/evil-extract-docstrings +sphinx: + configuration: doc/source/conf.py + python: install: - requirements: doc/requirements.txt
[nongnu] elpa/dirvish 1ece580035 1/2: fix: respect multibyte string in attributes
branch: elpa/dirvish
commit 1ece5800352b97eb3faf2ad9f1292a20d10ca58e
Author: Alex Lu
Commit: Alex Lu
fix: respect multibyte string in attributes
---
dirvish.el | 2 +-
extensions/dirvish-vc.el | 24
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dirvish.el b/dirvish.el
index c15072c243..ba31d4d37b 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -1047,7 +1047,7 @@ When the attribute does not exist, set it with BODY."
('right (setq right (concat v right
finally
(prog1 (unless (or left right) (cl-return))
- (let* ((len1 (length right))
+ (let* ((len1 (string-width (or right "")))
(remain (- width len1
(or (get-text-property l-beg 'line-prefix) 0)))
(len2 (min (length left) (max 0 (- remain f-wid 1
diff --git a/extensions/dirvish-vc.el b/extensions/dirvish-vc.el
index 1ae74e3d2a..d54e270355 100644
--- a/extensions/dirvish-vc.el
+++ b/extensions/dirvish-vc.el
@@ -181,7 +181,7 @@ This attribute only works on graphic displays."
`(ov . ,ov)))
(dirvish-define-attribute git-msg
- "Append git commit message to filename."
+ "Display short git log."
:when (and (eq (dirvish-prop :vc-backend) 'Git) (not (dirvish-prop :remote)))
:setup (dirvish-prop :gm-chop
(seq-reduce (lambda (acc i) (cl-incf acc (nth 2 i)))
@@ -189,19 +189,19 @@ This attribute only works on graphic displays."
(let* ((msg-raw (dirvish-attribute-cache f-name :git-msg))
(msg (if (>= (length msg-raw) 1) (substring msg-raw 0 -1) ""))
(face (or hl-face 'dirvish-git-commit-message-face))
- (spc (make-string w-width ?\ ))
- (chop (dirvish-prop :gm-chop)) len tail str str-len)
+ (chop (dirvish-prop :gm-chop)) (mlen (length msg)) (stop t)
+ (limit (- (floor (* (if (< w-width 70) 0.48 0.6) w-width)) chop))
+ (count 0) (whole (concat " " msg (make-string w-width ?\ ))) str len)
(cond ((or (not msg-raw) (< w-width 30)) (setq str ""))
((and (>= w-width 30) (< w-width 50)) (setq str (propertize " … ")))
- ((and (>= w-width 50) (< w-width 70))
- (setq len (max 0 (- (floor (* w-width 0.48)) chop))
- tail (if (> (length msg) len) "… " " ")
- str (concat (substring (concat " " msg spc) 0 len) tail)))
- (t (setq len (max 0 (- (floor (* w-width 0.6)) chop))
- tail (if (> (length msg) len) "… " " ")
- str (concat (substring (concat " " msg spc) 0 len) tail
-(add-face-text-property 0 (setq str-len (length str)) face t str)
-(add-text-properties 0 str-len `(help-echo ,msg) str)
+ (t (setq str "" stop (<= limit 0
+(while (not stop) ; prevent multibyte string taking too much space
+ (setq str (substring whole 0 count))
+ (if (>= (- limit (string-width str)) 1)
+ (cl-incf count)
+(setq str (concat str (if (> count mlen) " " "… ")) stop t)))
+(add-face-text-property 0 (setq len (length str)) face t str)
+(add-text-properties 0 len `(help-echo ,msg) str)
`(right . ,str)))
(dirvish-define-preview vc-diff (ext)
[nongnu] elpa/dirvish updated (ddfa9cc77e -> aefa04cbe1)
elpasync pushed a change to branch elpa/dirvish. from ddfa9cc77e refactor(core): query tab by `ws` key instead of name (closes #313) new 1ece580035 fix: respect multibyte string in attributes new aefa04cbe1 chore: reorder code markers Summary of changes: dirvish.el | 474 +++ extensions/dirvish-vc.el | 24 +-- 2 files changed, 249 insertions(+), 249 deletions(-)
[nongnu] elpa/dirvish aefa04cbe1 2/2: chore: reorder code markers
branch: elpa/dirvish commit aefa04cbe185a8a35a3c38b6b52c941546b5e997 Author: Alex Lu Commit: Alex Lu chore: reorder code markers --- dirvish.el | 472 ++--- 1 file changed, 236 insertions(+), 236 deletions(-) diff --git a/dirvish.el b/dirvish.el index ba31d4d37b..1dd893ef61 100644 --- a/dirvish.el +++ b/dirvish.el @@ -358,22 +358,6 @@ seconds. DEBOUNCE defaults to `dirvish-redisplay-debounce'." "Return current timestamp string with \"%D|%T\" format." (format-time-string "%D|%T")) -(defun dirvish--hide-dired-header () - "Hide the Dired header." - (remove-overlays (point-min) (point) 'dired-header t) - (save-excursion -(let* ((beg (goto-char (point-min))) - (next-file (next-single-property-change beg 'dired-filename)) - (end (or (dirvish-prop :content-begin) -(and (not next-file) (point-max)) -(progn (goto-char next-file) (line-beginning-position - (o (make-overlay beg end))) - (dirvish-prop :content-begin end) - (overlay-put o 'dired-header t) - (overlay-put o 'invisible - (cond ((cdr dired-subdir-alist) nil) - (dirvish-use-header-line t)) - (defun dirvish--display-buffer (buffer alist) "Try displaying BUFFER with ALIST. This splits the window at the designated side of the frame. @@ -619,150 +603,6 @@ filename or a string with format of `dirvish-fd-bufname'." (setq find-fn 'find-file)) (dirvish-save-dedication (funcall find-fn entry) - Advices - -(defun dirvish-insert-subdir-a (dirname &rest _) - "Setup newly inserted subdir DIRNAME for this Dirvish buffer." - (dirvish--hide-dired-header) - (dirvish--dir-data-async dirname (current-buffer) t)) - -(defun dirvish-wdired-enter-a (&rest _) - "Advice for `wdired-change-to-wdired-mode'." - (let (dirvish-hide-cursor) (dirvish--maybe-toggle-cursor 'hollow)) - (dirvish--render-attrs 'clear)) - -(defun dirvish-find-alt-a () - "Advice for `dired-find-alternate-file'." - (dirvish--find-entry 'find-alternate-file (dired-get-file-for-visit))) - -(defun dirvish-dired-noselect-a (fn dir-or-list &optional flags) - "Return buffer for DIR-OR-LIST with FLAGS, FN is `dired-noselect'." - (let* ((dir (if (consp dir-or-list) (car dir-or-list) dir-or-list)) - (key (file-name-as-directory (expand-file-name dir))) - (dv (or (dirvish-curr) (dirvish--get-session) (dirvish--new))) - (bname buffer-file-name) - (remote (file-remote-p dir)) - (flags (or flags (dv-ls-switches dv))) - (buffer (alist-get key (dv-roots dv) nil nil #'equal)) - (new-buffer-p (null buffer)) - (dps (dv-preview-dispatchers dv)) - tramp-fn dired-buffers) ; disable reuse from dired -(setf (dv-timestamp dv) (dirvish--timestamp)) -(when new-buffer-p - (if (not remote) (setq buffer (apply fn (list dir-or-list flags))) -(setq tramp-fn (prog1 'dirvish-tramp-noselect (require 'dirvish-tramp)) - buffer (apply tramp-fn (list fn dir-or-list flags remote dps - (with-current-buffer buffer (dirvish--setup-dired)) - (push (cons key buffer) (dv-roots dv))) -(with-current-buffer buffer - (cond (new-buffer-p nil) -((and (not remote) (not (equal flags dired-actual-switches))) - (dired-sort-other flags)) -((eq dired-auto-revert-buffer t) (revert-buffer)) -((functionp dired-auto-revert-buffer) - (when (funcall dired-auto-revert-buffer dir) (revert-buffer - (funcall (dv-root-conf dv) buffer) - (dirvish-prop :dv (dv-id dv)) - (dirvish-prop :gui (display-graphic-p)) - (dirvish-prop :remote remote) - (dirvish-prop :root key) - (unless remote (dirvish-prop :preview-dps dps)) - (dirvish-prop :attrs (dv-attributes dv)) - (cl-loop for (k v) on dirvish--scopes by 'cddr - do (dirvish-prop k (and (functionp v) (funcall v - (when bname (dired-goto-file bname)) - (setf (dv-index dv) (cons key buffer)) - (let ((key (if (string-prefix-p "🔍" key) (buffer-name buffer) key))) -(setq dirvish--history (seq-take (push key dirvish--history) 200))) - (run-hook-with-args 'dirvish-find-entry-hook key buffer) - buffer))) - - Hooks - -(defun dirvish-apply-ansicolor-h (_win pos) - "Update dirvish ansicolor in preview window from POS." - (let (buffer-read-only) -(ansi-color-apply-on-region - (goto-char pos) (progn (forward-line (frame-height)) (point) - -(defun dirvish--update-display () - "Update UI of Dirvish." - (when-let* ((dv (dirvish-curr)) ((null (derived-mode-p 'wdired-mode -(cond ((not (dirvish--apply-hiding-p dirvish-hide-cursor))) - ((eobp) (forward-line -1)) - ((cdr dired-subdir-alist)) - ((and (bobp) dirvish-use-header-line) - (goto-char (dirvish-prop :con
[elpa] externals/tempel 2fc756c548 2/4: Formatting
branch: externals/tempel commit 2fc756c54841de09ad97f5fab2ad31987009c458 Author: Daniel Mendler Commit: Daniel Mendler Formatting --- tempel.el | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tempel.el b/tempel.el index c3c6bc0156..3e19c4ebbe 100644 --- a/tempel.el +++ b/tempel.el @@ -209,13 +209,13 @@ TEMPLATES is the list of templates." "Exit function for completion for template NAME and STATUS. TEMPLATES is the list of templates. REGION are the current region bounds." - (unless (eq status 'exact) -(when-let ((sym (intern-soft name)) - (template (alist-get sym templates))) - (tempel--delete-word name) - (when tempel-trigger-prefix -(tempel--delete-word tempel-trigger-prefix)) - (tempel--insert template region + (when-let (((not (eq status 'exact))) + (sym (intern-soft name)) + (template (alist-get sym templates))) +(tempel--delete-word name) +(when tempel-trigger-prefix + (tempel--delete-word tempel-trigger-prefix)) +(tempel--insert template region))) (defun tempel--range-modified (ov &rest _) "Range overlay OV modified."
[elpa] externals/tempel updated (e3bd2de9e6 -> f52a99ebf6)
elpasync pushed a change to branch externals/tempel. from e3bd2de9e6 tempel-expand: Expand directly when called interactively new 93c792aca6 tempel-expand: Call tempel--save new 2fc756c548 Formatting new f1d76b15b8 Update changelog new f52a99ebf6 Version 1.4 Summary of changes: CHANGELOG.org | 6 ++ tempel.el | 20 +++- 2 files changed, 17 insertions(+), 9 deletions(-)
[nongnu] elpa/aidermacs d49dae370a 03/11: fix some documentation warnings
branch: elpa/aidermacs commit d49dae370aa79e0582a700f8947e9dd42b5e8cb3 Author: reindert Commit: reindert fix some documentation warnings --- aidermacs-backend-vterm.el | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index cd6a71894d..dce0504ff5 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -152,8 +152,8 @@ Use BUFFER if provided, otherwise retrieve it from `aidermacs-get-buffer-name'." (setq aidermacs--vterm-active-timer nil) (defcustom aidermacs-vterm-use-theme-colors t - "Whether to use emacs theme colors for aider. Has effect only -when using the vterm backend." + "Whether to use Emacs theme colors for aider. +Has effect only when using the vterm backend." :type 'boolean) (defcustom aidermacs-vterm-theme-colors-plist @@ -161,19 +161,19 @@ when using the vterm backend." "--assistant-output-color" default "--tool-error-color" error "--tool-warning-color" warning) - "Emacs faces to use for aider colour flags. Keys are the commandline -arguments to send to aider. Values are either faces or strings (colours like \"#00cc00\")" + "Emacs faces to use for aider colour flags. +Keys are the commandline arguments to send to aider. Values are either faces, or strings containing color codes like \"#00ccff\"" :type 'plist) (defun aidermacs--vterm-colorname-to-rgb (name) - "Convert emacs color names to RGB values." + "Convert Emacs color name NAME to RGB values." (if-let ((colors (color-values name))) (concat "#" (mapconcat (lambda (c) (format "%02X" (/ c 256))) colors)) (face-attribute 'default :foreground))) (defun aidermacs--vterm-theme-args () - "Create arguments for aider to try and match the current emacs theme. + "Create arguments for aider to try and match the current Emacs theme. See `aidermacs-theme-colors-plist'." (if aidermacs-vterm-use-theme-colors (mapcar (lambda (s)
[nongnu] elpa/aidermacs 3fd69ed34e 02/11: add options to groups
branch: elpa/aidermacs
commit 3fd69ed34e71f583fb26cdfe31722dc5c7d7fc98
Author: reindert
Commit: reindert
add options to groups
---
aidermacs-backend-comint.el | 6 --
aidermacs-backend-vterm.el | 9 ++---
aidermacs-backends.el | 9 ++---
aidermacs-models.el | 15 ++-
aidermacs.el| 27 ++-
5 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el
index d891d04e7f..a91838def2 100644
--- a/aidermacs-backend-comint.el
+++ b/aidermacs-backend-comint.el
@@ -48,7 +48,8 @@
("cpp" . "c++"))
"Map external language names to Emacs names."
:type '(alist :key-type (string :tag "Language Name/Alias")
-:value-type (string :tag "Mode Name (without -mode)")))
+:value-type (string :tag "Mode Name (without -mode)"))
+ :group 'aidermacs-backend-comint)
;; FIXME: Hmm... seems to use standard diff3 markers. Maybe some code
;; in `smerge-mode.el' could be (re)used?
@@ -62,7 +63,8 @@
(defcustom aidermacs-comint-multiline-newline-key "S-"
"Key binding for `comint-accumulate' in Aidermacs buffers.
This allows for multi-line input without sending the command."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-backend-comint)
(defface aidermacs-command-separator
'type graphic)) :strike-through t :extend t)
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index fa99e2ea21..a7a75a21bd 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -69,7 +69,8 @@
(defcustom aidermacs-vterm-multiline-newline-key "S-"
"Key binding to enter a newline without sending in vterm."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-backend-vterm)
(defun aidermacs--vterm-check-finish-sequence-repeated (proc orig-filter
start-point)
"Check for the finish sequence in PROC's buffer.
@@ -158,7 +159,8 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
(defcustom aidermacs-vterm-use-theme-colors t
"Whether to use Emacs theme colors for aider.
Has effect only when using the vterm backend."
- :type 'boolean)
+ :type 'boolean
+ :group 'aidermacs-backend-vterm)
(defcustom aidermacs-vterm-theme-colors-plist
'("--user-input-color" font-lock-function-name-face
@@ -168,7 +170,8 @@ Has effect only when using the vterm backend."
"Emacs faces to use for aider colour flags.
Keys are the commandline arguments to send to aider.
Values are either faces or strings (colours like \"#00cc00\")."
- :type 'plist)
+ :type 'plist
+ :group 'aidermacs-backend-vterm)
(defun aidermacs--vterm-colorname-to-rgb (name)
"Convert Emacs color NAME to RGB values."
diff --git a/aidermacs-backends.el b/aidermacs-backends.el
index 9f37f4da0d..3e39870173 100644
--- a/aidermacs-backends.el
+++ b/aidermacs-backends.el
@@ -42,11 +42,13 @@ Options are `comint' (the default) or `vterm'. When set to
`vterm',
aidermacs launches a fully functional vterm buffer instead
of using a comint process."
:type '(choice (const :tag "Comint" comint)
- (const :tag "VTerm" vterm)))
+ (const :tag "VTerm" vterm))
+ :group 'aidermacs-backends)
(defcustom aidermacs-output-limit 10
"Maximum number of output entries to keep in history."
- :type 'integer)
+ :type 'integer
+ :group 'aidermacs-backends)
(defvar-local aidermacs--output-history nil
"List to store aidermacs output history.
@@ -60,7 +62,8 @@ Each entry is a cons cell (timestamp . output-text).")
(defcustom aidermacs-before-run-backend-hook nil
"Hook run before the aidermacs backend is startd."
- :type 'hook)
+ :type 'hook
+ :group 'aidermacs-backends)
(defun aidermacs-get-output-history (&optional limit)
"Get the output history, optionally limited to LIMIT entries.
diff --git a/aidermacs-models.el b/aidermacs-models.el
index 60f4db8305..b04039084f 100644
--- a/aidermacs-models.el
+++ b/aidermacs-models.el
@@ -38,20 +38,24 @@
(defcustom aidermacs-default-model "sonnet"
"Default AI model to use for aidermacs sessions when not in Architect mode."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-architect-model "sonnet"
"Default AI model to use for architectural reasoning in aidermacs sessions."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-editor-model aidermacs-default-model
"Default AI model to use for code editing in aidermacs sessions.
Defaults to `aidermacs-default-model` if not explicitly set."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-use-architect-mode nil
"If non-nil, use separate Architect/Editor mode."
- :type 'boolean)
+ :type 'boolean
+ :group 'aidermacs-models)
(defcustom aidermacs-popular-models
'("sonnet"
@@ -62,7 +66,8 @@ Defaults to `aidermacs-default-model`
[elpa] externals/hydra 84a9db01ef 2/2: Merge remote-tracking branch 'upstream/hydra/main' into externals/hydra
branch: externals/hydra commit 84a9db01eff1fcc52ad054c5ad3c22316739573f Merge: 54e9db2b02 59a2a45a35 Author: Stefan Monnier Commit: Stefan Monnier Merge remote-tracking branch 'upstream/hydra/main' into externals/hydra --- hydra.el | 27 +-- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/hydra.el b/hydra.el index 5d5623c383..6d0f29b461 100644 --- a/hydra.el +++ b/hydra.el @@ -1,6 +1,6 @@ ;;; hydra.el --- Make bindings that stick around. -*- lexical-binding: t -*- -;; Copyright (C) 2015-2022 Free Software Foundation, Inc. +;; Copyright (C) 2015-2025 Free Software Foundation, Inc. ;; Author: Oleh Krehel ;; Maintainer: Oleh Krehel @@ -322,31 +322,6 @@ Exitable only through a blue head.") "^.*(\\(defhydra\\) \\([[:alpha:]-]+\\)" 2))) -;;* Find Function - -;; FIXME: Maybe we can dispense with this advice if `defhydra' adds appropriate -;; `definition-name' properties to the functions it defines? -(advice-add 'find-function-search-for-symbol :around -#'hydra--around-find-function-search-for-symbol-advice) - -(defun hydra--around-find-function-search-for-symbol-advice -(orig-fun symbol type library) - "Navigate to hydras with `find-function-search-for-symbol'." - (let ((res (apply orig-fun symbol type library))) -(when (symbolp symbol) -;; The original function returns (cons (current-buffer) (point)) -;; if it found the point. -(unless (cdr res) - (with-current-buffer (find-file-noselect library) -(let ((sn (symbol-name symbol))) - (when (and (null type) - (string-match "\\`\\(hydra-[[:alnum:]-]+\\)/\\(.*\\)\\'" sn) - (re-search-forward (concat "(defhydra " (match-string 1 sn)) -nil t)) -(goto-char (match-beginning 0))) - (cons (current-buffer) (point)) -res)) - ;;* Universal Argument (defvar hydra-base-map (let ((map (make-sparse-keymap)))
[elpa] externals/hydra 59a2a45a35 1/2: hydra.el: Remove the no longer necessary defadvice for find-function-search-for-symbol
branch: externals/hydra commit 59a2a45a35027948476d1d7751b0f0215b1e61aa Author: Oleh Krehel Commit: Oleh Krehel hydra.el: Remove the no longer necessary defadvice for find-function-search-for-symbol --- hydra.el | 20 1 file changed, 20 deletions(-) diff --git a/hydra.el b/hydra.el index 4aafab8a22..905cc7d5e5 100644 --- a/hydra.el +++ b/hydra.el @@ -330,26 +330,6 @@ Exitable only through a blue head.") "^.*(\\(defhydra\\) \\([a-zA-Z-]+\\)" 2))) -;;* Find Function -(eval-after-load 'find-func - '(defadvice find-function-search-for-symbol -(around hydra-around-find-function-search-for-symbol-advice - (symbol type library) activate) -"Navigate to hydras with `find-function-search-for-symbol'." -(prog1 ad-do-it - (when (symbolp symbol) -;; The original function returns (cons (current-buffer) (point)) -;; if it found the point. -(unless (cdr ad-return-value) - (with-current-buffer (find-file-noselect library) -(let ((sn (symbol-name symbol))) - (when (and (null type) - (string-match "\\`\\(hydra-[a-z-A-Z0-9]+\\)/\\(.*\\)\\'" sn) - (re-search-forward (concat "(defhydra " (match-string 1 sn)) -nil t)) -(goto-char (match-beginning 0))) - (cons (current-buffer) (point) - ;;* Universal Argument (defvar hydra-base-map (let ((map (make-sparse-keymap)))
[nongnu] elpa/aidermacs 486f4b65f7 1/2: Don't close vterm buffer on exit; allow troubleshooting
branch: elpa/aidermacs commit 486f4b65f752e1968978295f02b5753bd8d55c5a Author: reindert Commit: reindert Don't close vterm buffer on exit; allow troubleshooting --- aidermacs-backend-vterm.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index fa99e2ea21..6bc591a955 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -208,7 +208,8 @@ BUFFER-NAME is the name for the vterm buffer." (unless (get-buffer buffer-name) (let* ((cmd (mapconcat #'identity (append `(,program ,@(aidermacs--vterm-theme-args)) args) " ")) (vterm-buffer-name buffer-name) - (vterm-shell cmd)) + (vterm-shell cmd) + (vterm-kill-buffer-on-exit nil)) (with-current-buffer (vterm-other-window) (setq-local vterm-max-scrollback 1000 aidermacs--vterm-active-timer nil
[elpa] externals/denote updated (0dcd487b40 -> 2571667b85)
elpasync pushed a change to branch externals/denote. from 0dcd487b40 Remove comment in function denote-directory about deprecated values new e1984b7df3 Make development-version be 4.0.0 since we have lots of breaking changes new 2571667b85 Move the installation and sample configuration sections closer to the top Summary of changes: README.org | 328 ++--- 1 file changed, 164 insertions(+), 164 deletions(-)
[elpa] externals/denote 2571667b85 2/2: Move the installation and sample configuration sections closer to the top
branch: externals/denote
commit 2571667b85558ad1a8a79bebadb2282915dd1fe2
Author: Protesilaos Stavrou
Commit: Protesilaos Stavrou
Move the installation and sample configuration sections closer to the top
Otherwise they are hard to find, which is especially important for
inexperienced users.
---
README.org | 326 ++---
1 file changed, 163 insertions(+), 163 deletions(-)
diff --git a/README.org b/README.org
index 575730e7ca..943ff7e188 100644
--- a/README.org
+++ b/README.org
@@ -65,6 +65,169 @@ included in the section entitled “GNU Free Documentation
License.”
modify this GNU manual.”
#+end_quote
+* Installation
+:PROPERTIES:
+:CUSTOM_ID: h:f3bdac2c-4704-4a51-948c-a789a2589790
+:END:
+#+cindex: Installation instructions
+
+** GNU ELPA package
+:PROPERTIES:
+:CUSTOM_ID: h:42953f87-82bd-43ec-ab99-22b1e22955e7
+:END:
+
+The package is available as =denote=. Simply do:
+
+: M-x package-refresh-contents
+: M-x package-install
+
+And search for it.
+
+GNU ELPA provides the latest stable release. Those who prefer to follow
+the development process in order to report bugs or suggest changes, can
+use the version of the package from the GNU-devel ELPA archive. Read:
+https://protesilaos.com/codelog/2022-05-13-emacs-elpa-devel/.
+
+** Manual installation
+:PROPERTIES:
+:CUSTOM_ID: h:d397712c-c8c0-4cfa-ad1a-ef28cf78d1f0
+:END:
+
+Assuming your Emacs files are found in =~/.emacs.d/=, execute the
+following commands in a shell prompt:
+
+#+begin_src sh
+cd ~/.emacs.d
+
+# Create a directory for manually-installed packages
+mkdir manual-packages
+
+# Go to the new directory
+cd manual-packages
+
+# Clone this repo, naming it "denote"
+git clone https://github.com/protesilaos/denote denote
+#+end_src
+
+Finally, in your =init.el= (or equivalent) evaluate this:
+
+#+begin_src emacs-lisp
+;; Make Elisp files in that directory available to the user.
+(add-to-list 'load-path "~/.emacs.d/manual-packages/denote")
+#+end_src
+
+Everything is in place to set up the package.
+
+* Sample configuration
+:PROPERTIES:
+:CUSTOM_ID: h:5d16932d-4f7b-493d-8e6a-e5c396b15fd6
+:END:
+#+cindex: Package configuration
+
+Denote is immediately useful for beginners and power users alike. This
+manual covers everything in detail, though do not let the numerous
+possibilities distract you from the fact that a basic configuration is
+enough to be highly productive ([[#h:998ae528-9276-47ec-b642-3d7355a38f27][Get
started with this sample configuration]]).
+
+** Get started with this sample configuration
+:PROPERTIES:
+:CUSTOM_ID: h:998ae528-9276-47ec-b642-3d7355a38f27
+:END:
+
+If you are new to Denote, this a good place to start. Then work your
+way through the manual and expand your configuration accordingly. Only
+include commands/variables that are useful to you. We provide another
+code sample if you need some ideas
([[#h:58c4746b-b0d8-4896-9d88-a99b1d487231][More comprehensive sample
configuration]]).
+
+#+begin_src emacs-lisp
+;; Another basic setup with a little more to it.
+(use-package denote
+ :ensure t
+ :hook (dired-mode . denote-dired-mode)
+ :bind
+ (("C-c n n" . denote)
+ ("C-c n r" . denote-rename-file)
+ ("C-c n l" . denote-link)
+ ("C-c n b" . denote-backlinks)
+ ("C-c n d" . denote-sort-dired))
+ :config
+ (setq denote-directory (expand-file-name "~/Documents/notes/"))
+
+ ;; Automatically rename Denote buffers when opening them so that
+ ;; instead of their long file name they have, for example, a literal
+ ;; "[D]" followed by the file's title. Read the doc string of
+ ;; `denote-rename-buffer-format' for how to modify this.
+ (denote-rename-buffer-mode 1))
+#+end_src
+
+** More comprehensive sample configuration
+:PROPERTIES:
+:CUSTOM_ID: h:58c4746b-b0d8-4896-9d88-a99b1d487231
+:END:
+
+Here we include more of what you can configure with Denote
([[#h:998ae528-9276-47ec-b642-3d7355a38f27][Get started with this sample
configuration]]).
+
+#+begin_src emacs-lisp
+(use-package denote
+ :ensure t
+ :hook
+ ( ;; If you use Markdown or plain text files, then you want to make
+ ;; the Denote links clickable (Org renders links as buttons right
+ ;; away)
+ (text-mode . denote-fontify-links-mode-maybe)
+ ;; Apply colours to Denote names in Dired. This applies to all
+ ;; directories. Check `denote-dired-directories' for the specific
+ ;; directories you may prefer instead. Then, instead of
+ ;; `denote-dired-mode', use `denote-dired-mode-in-directories'.
+ (dired-mode . denote-dired-mode))
+ :bind
+ ;; Denote DOES NOT define any key bindings. This is for the user to
+ ;; decide. For example:
+ ( :map global-map
+("C-c n n" . denote)
+("C-c n d" . denote-sort-dired)
+;; If you intend to use Denote with a variety of file types, it is
+;; easier to bind the link-related commands to the `global-map', as
+;; shown here. Otherwise follow the same pattern for `org-mode-map',
+;; `markd
[elpa] externals/denote e1984b7df3 1/2: Make development-version be 4.0.0 since we have lots of breaking changes
branch: externals/denote commit e1984b7df3374e6276f172838a3356cc64ffa24a Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Make development-version be 4.0.0 since we have lots of breaking changes --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 7e3f821477..575730e7ca 100644 --- a/README.org +++ b/README.org @@ -6,7 +6,7 @@ #+startup: content #+macro: stable-version 3.1.0 #+macro: release-date 2024-09-04 -#+macro: development-version 3.2.0-dev +#+macro: development-version 4.0.0-dev #+export_file_name: denote.texi #+texinfo_filename: denote.info #+texinfo_dir_category: Emacs misc features
[nongnu] elpa/gptel 5e88e9aa3a 1/2: README: Tweak list of alternatives (#707)
branch: elpa/gptel commit 5e88e9aa3a250d2f064b9c968d3a2fa97c0fb37f Author: Henrik Ahlgren Commit: GitHub README: Tweak list of alternatives (#707) * README: Drop leafy-mode, it's gone 404 from Github. Add Minuet, which is a new code-completion specific LLM client. --- README.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.org b/README.org index 84f1f99a2f..d5eb443998 100644 --- a/README.org +++ b/README.org @@ -1386,8 +1386,9 @@ Other Emacs clients for LLMs include - [[https://github.com/s-kostyaev/ellama][Ellama]]: A full-fledged LLM client built on llm, that supports many LLM providers (Ollama, Open AI, Vertex, GPT4All and more). Its usage differs from gptel in that it provides separate commands for dozens of common tasks, like general chat, summarizing code/text, refactoring code, improving grammar, translation and so on. - [[https://github.com/xenodium/chatgpt-shell][chatgpt-shell]]: comint-shell based interaction with ChatGPT. Also supports DALL-E, executable code blocks in the responses, and more. - [[https://github.com/rksm/org-ai][org-ai]]: Interaction through special =#+begin_ai ... #+end_ai= Org-mode blocks. Also supports DALL-E, querying ChatGPT with the contents of project files, and more. +- [[https://github.com/milanglacier/minuet-ai.el][Minuet]]: Code-completion using LLM. Supports fill-in-the-middle (FIM) completion for compatible models such as DeepSeek and Codestral. -There are several more: [[https://github.com/MichaelBurge/leafy-mode][leafy-mode]], [[https://github.com/iwahbe/chat.el][chat.el]], [[https://github.com/stuhlmueller/gpt.el][gpt.el]], [[https://github.com/AnselmC/le-gpt.el][le-gpt]], [[https://github.com/stevemolitor/robby][robby]]. +There are several more: [[https://github.com/iwahbe/chat.el][chat.el]], [[https://github.com/stuhlmueller/gpt.el][gpt.el]], [[https://github.com/AnselmC/le-gpt.el][le-gpt]], [[https://github.com/stevemolitor/robby][robby]]. *** Packages using gptel
[nongnu] elpa/evil-anzu 7309650425 2/2: Merge pull request #15 from LemonBreezes/enable-lexical-binding
branch: elpa/evil-anzu commit 7309650425797420944075c9c1556c7c1ff960b3 Merge: d1e98ee697 92b3cdd089 Author: StrawberryTea Commit: GitHub Merge pull request #15 from LemonBreezes/enable-lexical-binding Enable lexical binding --- evil-anzu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evil-anzu.el b/evil-anzu.el index 69e2ae6d95..8d150dd28f 100644 --- a/evil-anzu.el +++ b/evil-anzu.el @@ -1,4 +1,4 @@ -;;; evil-anzu.el --- anzu for evil-mode +;;; evil-anzu.el --- anzu for evil-mode -*- lexical-binding: t; -*- ;; Copyright (C) 2017 by Syohei YOSHIDA
[nongnu] elpa/gptel updated (5d811b1af8 -> b1d9d54f5c)
elpasync pushed a change to branch elpa/gptel. from 5d811b1af8 gptel-org: Autoload markdown->org converters new 5e88e9aa3a README: Tweak list of alternatives (#707) new b1d9d54f5c elpaignore: Oopsie daisy (#708) Summary of changes: .elpaignore | 2 +- README.org | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
[nongnu] elpa/aidermacs 5b6879604e 2/2: Merge pull request #73 from rjekker/vterm-dont-kill-on-exit
branch: elpa/aidermacs commit 5b6879604eb173170f538957e0f97e8229812ed2 Merge: 764a99dd5e 486f4b65f7 Author: Matthew Zeng Commit: GitHub Merge pull request #73 from rjekker/vterm-dont-kill-on-exit Don't close vterm buffer on exit; allow troubleshooting --- aidermacs-backend-vterm.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index fa99e2ea21..6bc591a955 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -208,7 +208,8 @@ BUFFER-NAME is the name for the vterm buffer." (unless (get-buffer buffer-name) (let* ((cmd (mapconcat #'identity (append `(,program ,@(aidermacs--vterm-theme-args)) args) " ")) (vterm-buffer-name buffer-name) - (vterm-shell cmd)) + (vterm-shell cmd) + (vterm-kill-buffer-on-exit nil)) (with-current-buffer (vterm-other-window) (setq-local vterm-max-scrollback 1000 aidermacs--vterm-active-timer nil
[nongnu] elpa/evil-anzu 92b3cdd089 1/2: Enable lexical binding
branch: elpa/evil-anzu commit 92b3cdd08974182e9dde25ab0862a0cb65af66de Author: StrawberryTea Commit: StrawberryTea Enable lexical binding --- evil-anzu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evil-anzu.el b/evil-anzu.el index 69e2ae6d95..8d150dd28f 100644 --- a/evil-anzu.el +++ b/evil-anzu.el @@ -1,4 +1,4 @@ -;;; evil-anzu.el --- anzu for evil-mode +;;; evil-anzu.el --- anzu for evil-mode -*- lexical-binding: t; -*- ;; Copyright (C) 2017 by Syohei YOSHIDA
[nongnu] elpa/gptel b1d9d54f5c 2/2: elpaignore: Oopsie daisy (#708)
branch: elpa/gptel commit b1d9d54f5c9dc5a5cb0bbbc4a4818a5bd92e87ce Author: Henrik Ahlgren Commit: GitHub elpaignore: Oopsie daisy (#708) --- .elpaignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.elpaignore b/.elpaignore index eb3c3db438..6cab84d506 100644 --- a/.elpaignore +++ b/.elpaignore @@ -1,3 +1,3 @@ test .github -.elpaigore +.elpaignore
[elpa] externals/org 0f0f9629c2 1/3: Merge branch 'bugfix'
branch: externals/org
commit 0f0f9629c296e874a2807093de5f27d6a03ef2dd
Merge: e49a31ced2 dd3876dbda
Author: Ihor Radchenko
Commit: Ihor Radchenko
Merge branch 'bugfix'
---
Makefile| 12 -
lisp/org-capture.el | 2 +-
lisp/org.el | 8 +++---
lisp/ox.el | 70 ++---
4 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Makefile b/Makefile
index 66b513b152..c97e3061a4 100644
--- a/Makefile
+++ b/Makefile
@@ -23,18 +23,18 @@ help helpall::
$(info )
$(info Build and Check)
$(info ===)
- $(info make- build Org ELisp and all documentation)
+ $(info make- build Org Elisp and all documentation)
$(info make all- ditto)
- $(info make compile- build Org ELisp files)
- $(info make single - build Org ELisp files, single Emacs per
source)
+ $(info make compile- build Org Elisp files)
+ $(info make single - build Org Elisp files, single Emacs per
source)
$(info make native - build Org natively compiled Elisp files)
$(info make autoloads - create org-loaddefs.el to load Org
in-place)
- $(info make test - build Org ELisp files and run test suite)
+ $(info make test - build Org Elisp files and run test suite)
$(info make vanilla- run Emacs with this Org-mode and no
personal config)
$(info make repro - like vanilla, but refresh compilation and
enable debugging [use this to reproduce bugs])
helpall::
$(info make test-dirty - check without building first)
- $(info make compile-dirty - build only stale Org ELisp files)
+ $(info make compile-dirty - build only stale Org Elisp files)
$(info )
$(info Compatibility)
$(info =)
@@ -42,7 +42,7 @@ helpall::
$(info )
$(info Cleaning)
$(info )
- $(info make clean - remove built Org ELisp files and
documentation)
+ $(info make clean - remove built Org Elisp files and
documentation)
$(info make cleanall - remove everything that can be built and
all remnants)
$(info make clean-install - remove previous Org installation)
$(info )
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d44ccceadb..b36c1c1166 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -681,7 +681,7 @@ When called with a `C-0' (zero) prefix, insert a template
at point.
When called with a `C-1' (one) prefix, force prompting for a date when
a datetree entry is made.
-ELisp programs can set KEYS to a string associated with a template
+Elisp programs can set KEYS to a string associated with a template
in `org-capture-templates'. In this case, interactive selection
will be bypassed.
diff --git a/lisp/org.el b/lisp/org.el
index bc61a7c462..8b989a47cc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3201,16 +3201,16 @@ There are multiple ways to set the category. One way
is to set
it in the document property drawer. For example:
:PROPERTIES:
-:CATEGORY: ELisp
+:CATEGORY: Elisp
:END:
Other ways to define it is as an Emacs file variable, for example
-# -*- mode: org; org-category: \"ELisp\"
+# -*- mode: org; org-category: \"Elisp\"
or for the file to contain a special line:
-#+CATEGORY: ELisp
+#+CATEGORY: Elisp
If the file does not specify a category, then file's base name
is used instead.")
@@ -9492,7 +9492,7 @@ With numeric prefix arg, switch to the Nth state.
With a numeric prefix arg of 0, inhibit note taking for the change.
With a numeric prefix arg of -1, cancel repeater to allow marking as DONE.
-When called through ELisp, arg is also interpreted in the following way:
+When called through Elisp, arg is also interpreted in the following way:
`none'-> empty state
\"\"-> switch to empty state
`done'-> switch to DONE
diff --git a/lisp/ox.el b/lisp/ox.el
index 7d44c3d702..7e8ffc715d 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6292,25 +6292,25 @@ them."
("Figure %d:"
("ar" :default "شكل %d:")
("cs" :default "Obrázek %d:")
- ("da" :default "Figur %d")
+ ("da" :default "Figur %d:")
("de" :default "Abbildung %d:")
("es" :default "Figura %d:")
("et" :default "Joonis %d:")
("fa" :default "شکل %d:")
- ("fr" :default "Figure %d :" :html "Figure %d :")
- ("is" :default "Mynd %d")
+ ("fr" :default "Figure %d:" :html "Figure %d :")
+ ("is" :default "Mynd %d:")
("it" :default "Figura %d:")
- ("ja" :default "図%d: " :html "図%d: ")
+ ("ja" :default "図%d:" :html "図%d:")
("nl" :default "Figuur %d:" :html "Figuur %d:")
- ("no" :default "Illustrasjon %d")
- ("nb" :default "Illustrasjon %d")
- ("nn" :default "Illustrasjon %d")
- ("pl" :default "Obrazek %d")
[elpa] externals/org 5317402b06 2/3: Merge branch 'bugfix'
branch: externals/org commit 5317402b0683d3f538faaa436e70d17ea582185e Merge: 0f0f9629c2 c26d301c9c Author: Ihor Radchenko Commit: Ihor Radchenko Merge branch 'bugfix' --- lisp/org-macs.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 044c49efbf..a291f5f7d3 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -1171,6 +1171,7 @@ STRING width. When REFERENCE-FACE is nil, `default' face is used." (org--string-width-1 string) ;; Wrap/line prefix will make `window-text-pixel-size' return too ;; large value including the prefix. +(setq string (copy-sequence string)) ; do not modify STRING object (remove-text-properties 0 (length string) '(wrap-prefix t line-prefix t) string)
[elpa] externals-release/org c26d301c9c 2/2: org-string-width: Do not modify STRING by side effect
branch: externals-release/org commit c26d301c9caf4f36a3f9f3946d865b0fffe62683 Author: Ihor Radchenko Commit: Ihor Radchenko org-string-width: Do not modify STRING by side effect * lisp/org-macs.el (org-string-width): Do not modify STRING argument by side effect. Reported-by: libreville Link: https://orgmode.org/list/6e8524bd56546d695751ada1840d8...@riseup.net --- lisp/org-macs.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 2e8e5e09d2..f0fda21bcd 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -1164,6 +1164,7 @@ STRING width. When REFERENCE-FACE is nil, `default' face is used." (org--string-width-1 string) ;; Wrap/line prefix will make `window-text-pixel-size' return too ;; large value including the prefix. +(setq string (copy-sequence string)) ; do not modify STRING object (remove-text-properties 0 (length string) '(wrap-prefix t line-prefix t) string)
[elpa] externals-release/org dd3876dbda 1/2: org-export-dictionary: Fix some missing colons in translations
branch: externals-release/org
commit dd3876dbdad6fa57f7129b0e7c59481d8dbcda2d
Author: Max J. Herrmann
Commit: Ihor Radchenko
org-export-dictionary: Fix some missing colons in translations
* lisp/ox.el (org-export-dictionary): Make usage of colons consistent
across translations.
TINYCHANGE
---
lisp/ox.el | 68 +++---
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/lisp/ox.el b/lisp/ox.el
index 4cd6466fe8..06c346b657 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6268,25 +6268,25 @@ them."
("Figure %d:"
("ar" :default "شكل %d:")
("cs" :default "Obrázek %d:")
- ("da" :default "Figur %d")
+ ("da" :default "Figur %d:")
("de" :default "Abbildung %d:")
("es" :default "Figura %d:")
("et" :default "Joonis %d:")
("fa" :default "شکل %d:")
- ("fr" :default "Figure %d :" :html "Figure %d :")
- ("is" :default "Mynd %d")
+ ("fr" :default "Figure %d:" :html "Figure %d :")
+ ("is" :default "Mynd %d:")
("it" :default "Figura %d:")
- ("ja" :default "図%d: " :html "図%d: ")
+ ("ja" :default "図%d:" :html "図%d:")
("nl" :default "Figuur %d:" :html "Figuur %d:")
- ("no" :default "Illustrasjon %d")
- ("nb" :default "Illustrasjon %d")
- ("nn" :default "Illustrasjon %d")
- ("pl" :default "Obrazek %d") ; alternatively "Rysunek %d"
+ ("no" :default "Illustrasjon %d:")
+ ("nb" :default "Illustrasjon %d:")
+ ("nn" :default "Illustrasjon %d:")
+ ("pl" :default "Obrazek %d:") ; alternatively "Rysunek %d"
("pt_BR" :default "Figura %d:")
("ro" :default "Imaginea %d:")
("ru" :html "Рис. %d.:" :utf-8 "Рис. %d.:")
- ("sl" :default "Slika %d")
- ("sv" :default "Illustration %d")
+ ("sl" :default "Slika %d:")
+ ("sv" :default "Illustration %d:")
("tr" :default "Şekil %d:")
("zh-CN" :html "图%d " :utf-8 "图%d "))
("Footnotes"
@@ -6394,24 +6394,24 @@ them."
("Listing %d:"
("ar" :default "برنامج %d:")
("cs" :default "Program %d:")
- ("da" :default "Program %d")
- ("de" :default "Programmlisting %d")
- ("es" :default "Listado de programa %d")
- ("et" :default "Loend %d")
+ ("da" :default "Program %d:")
+ ("de" :default "Programmlisting %d:")
+ ("es" :default "Listado de programa %d:")
+ ("et" :default "Loend %d:")
("fa" :default "برنامهریزی %d:")
- ("fr" :default "Programme %d :" :html "Programme %d :")
- ("it" :default "Listato %d :")
+ ("fr" :default "Programme %d:" :html "Programme %d :")
+ ("it" :default "Listato %d:")
("ja" :default "ソースコード%d:")
("nl" :default "Programma %d:" :html "Programma %d:")
("nn" :default "Program %d:")
- ("no" :default "Dataprogram %d")
- ("nb" :default "Dataprogram %d")
- ("ro" :default "Lista %d")
+ ("no" :default "Dataprogram %d:")
+ ("nb" :default "Dataprogram %d:")
+ ("ro" :default "Lista %d:")
("pl" :default "Indeks %d:")
("pt_BR" :default "Listagem %d:")
("ru" :html
"Распечатка %d.:"
:utf-8 "Распечатка %d.:")
- ("sl" :default "Izpis programa %d")
+ ("sl" :default "Izpis programa %d:")
("sv" :default "Programlistning %d:")
("tr" :default "Program %d:")
("zh-CN" :html "代码%d " :utf-8 "代码%d "))
@@ -6530,27 +6530,27 @@ them."
("Table %d:"
("ar" :default "جدول %d:")
("cs" :default "Tabulka %d:")
- ("da" :default "Tabel %d")
- ("de" :default "Tabelle %d")
- ("es" :default "Tabla %d")
- ("et" :default "Tabel %d")
- ("fa" :default "جدول %d")
- ("fr" :default "Tableau %d :")
- ("is" :default "Tafla %d")
+ ("da" :default "Tabel %d:")
+ ("de" :default "Tabelle %d:")
+ ("es" :default "Tabla %d:")
+ ("et" :default "Tabel %d:")
+ ("fa" :default "جدول %d:")
+ ("fr" :default "Tableau %d:")
+ ("is" :default "Tafla %d:")
("it" :default "Tabella %d:")
("ja" :default "表%d:" :html "表%d:")
("nl" :default "Tabel %d:" :html "Tabel %d:")
- ("no" :default "Tabell %d")
- ("nb" :default "Tabell %d")
- ("nn" :default "Tabell %d")
- ("pl" :default "Tabela %d")
+ ("no" :default "Tabell %d:")
+ ("nb" :default "Tabell %d:")
+ ("nn" :default "Tabell %d:")
+ ("pl" :default "Tabela %d:")
("pt_BR" :default "Tabela %d:")
- ("ro" :default "Tabel %d")
+ ("ro" :default "Tabel %d:")
("ru" :html "Таблица %d.:"
:utf-8 "Таблица %d.:")
- ("sl" :default "Tabela %d")
+ ("sl" :default "Tabela %d:")
("sv" :default "Tabell %d:")
- ("tr" :default "Tablo %d")
+ ("tr" :default "Tablo %d:")
("zh-CN" :html "表%d " :utf-8 "表%d "))
("Table of Contents"
("ar" :default "قائمة المحتويات")
[elpa] externals-release/org updated (f86e17e380 -> c26d301c9c)
elpasync pushed a change to branch externals-release/org. from f86e17e380 Fix capitalization ELisp -> Elisp new dd3876dbda org-export-dictionary: Fix some missing colons in translations new c26d301c9c org-string-width: Do not modify STRING by side effect Summary of changes: lisp/org-macs.el | 1 + lisp/ox.el | 68 2 files changed, 35 insertions(+), 34 deletions(-)
[elpa] externals/org 6daeb5da62 3/3: org-olpath-completing-read: Fix completion boundaries
branch: externals/org commit 6daeb5da622a7a2a4ab81a145dfcb9f100132a89 Author: Ihor Radchenko Commit: Ihor Radchenko org-olpath-completing-read: Fix completion boundaries * lisp/org-refile.el (org-olpath-completing-read): Start completion boundary from 0. This should be done because completion table produced by `org-refile-get-targets' contains full OLP as parent/child/child/... and we are completing against it, not just against current siblings. Reported-by: Martin Marshall Link: https://orgmode.org/list/caofdpfuz-5b3l5sadrdfyetswfc9hlqaxgwngnfem50jzow...@mail.gmail.com --- lisp/org-refile.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/org-refile.el b/lisp/org-refile.el index cdb0fc83c2..5e9cecd746 100644 --- a/lisp/org-refile.el +++ b/lisp/org-refile.el @@ -780,9 +780,7 @@ this function appends the default value from (all-completions string thetable predicate ((eq (car-safe flag) 'boundaries) ;; See `completion-file-name-table'. - (let ((start (or (and (string-match "/" string) - (match-beginning 0)) -(length string))) + (let ((start 0) (end (and (string-match "/" (cdr flag)) (match-beginning 0 `(boundaries ,start . ,end)))
[elpa] externals/org updated (e49a31ced2 -> 6daeb5da62)
elpasync pushed a change to branch externals/org. from e49a31ced2 doc/org-manual.org: add STARTUP to Beamer example adds bdf9f949d7 Update version number for the 9.7.25 release adds f86e17e380 Fix capitalization ELisp -> Elisp new dd3876dbda org-export-dictionary: Fix some missing colons in translations new 0f0f9629c2 Merge branch 'bugfix' new c26d301c9c org-string-width: Do not modify STRING by side effect new 5317402b06 Merge branch 'bugfix' new 6daeb5da62 org-olpath-completing-read: Fix completion boundaries Summary of changes: Makefile| 12 - lisp/org-capture.el | 2 +- lisp/org-macs.el| 1 + lisp/org-refile.el | 4 +-- lisp/org.el | 8 +++--- lisp/ox.el | 70 ++--- 6 files changed, 48 insertions(+), 49 deletions(-)
[elpa] externals/colorful-mode 73c6e26d7b: Minor changes.
branch: externals/colorful-mode commit 73c6e26d7b823a5e872195cbcd320e24674d8f94 Author: Elías Gabriel Pérez Commit: Elías Gabriel Pérez Minor changes. * README.org: Update sample code. * colorful-mode.el (colorful--hex-to-name, colorful--find-overlay): Use `cl-dolist' instead `catch throw' --- README.org | 19 +++ colorful-mode.el | 14 ++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.org b/README.org index 970755474e..2e00ad06ad 100644 --- a/README.org +++ b/README.org @@ -204,18 +204,21 @@ for you: (add-hook 'post-command-hook (lambda () "delete colorful overlay on active mark" -(when colorful-mode - (if-let* ((beg (use-region-beginning)) +(when-let* (colorful-mode +(beg (use-region-beginning)) (end (use-region-end))) (dolist (ov (overlays-in beg end)) (when (overlay-get ov 'colorful--overlay) (remove-overlays (overlay-start ov) (overlay-end ov) - 'colorful--overlay t))) -(save-excursion - (and (mark) - (font-lock-fontify-region -(region-beginning) -(region-end + 'colorful--overlay t)) + +(add-hook 'deactivate-mark-hook + (lambda () +"refontify deleted mark" +(when-let* (colorful-mode +(beg (region-beginning)) +(end (region-end))) + (font-lock-flush beg end #+end_src * How does it compare to =rainbow-mode= or built-in =css fontify colors=? diff --git a/colorful-mode.el b/colorful-mode.el index be645bf257..4bb7e86880 100644 --- a/colorful-mode.el +++ b/colorful-mode.el @@ -476,10 +476,9 @@ H must be a float not divided." (defun colorful--hex-to-name (hex) "Return HEX as color name." - (catch 'name -(dolist (color-list color-name-rgb-alist) - (if (equal (cdr color-list) (color-values hex)) - (throw 'name (car color-list)) + (cl-dolist (color-list color-name-rgb-alist) +(if (equal (cdr color-list) (color-values hex)) +(cl-return (car color-list) (defun colorful--name-to-hex (name) "Return color NAME as hex color format." @@ -492,10 +491,9 @@ H must be a float not divided." (defun colorful--find-overlay (&optional beg) "Return colorful overlay if found at current point. BEG is the position to check for the overlay." - (catch 'val -(dolist (ov (overlays-at (or beg (point - (if (overlay-get ov 'colorful--overlay) - (throw 'val ov) + (cl-dolist (ov (overlays-at (or beg (point +(if (overlay-get ov 'colorful--overlay) +(cl-return ov (defun colorful--delete-overlays (limit) "Font-lock matcher that flushes our overlays before we install new ones."
[elpa] externals/orderless 254f241248 2/2: Version 1.4
branch: externals/orderless commit 254f2412489bbbf62700f9d3d5f18e537841dcc3 Author: Daniel Mendler Commit: Daniel Mendler Version 1.4 --- orderless.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orderless.el b/orderless.el index 88e8676021..0f85e80af5 100644 --- a/orderless.el +++ b/orderless.el @@ -5,7 +5,7 @@ ;; Author: Omar Antolín Camarena ;; Maintainer: Omar Antolín Camarena , Daniel Mendler ;; Keywords: matching, completion -;; Version: 1.3 +;; Version: 1.4 ;; URL: https://github.com/oantolin/orderless ;; Package-Requires: ((emacs "27.1") (compat "30"))
[elpa] externals/marginalia daab796790 3/4: marginalia--field: Minor optimization
branch: externals/marginalia commit daab796790b2cd01b7afce705f7502d2d2b86eed Author: Daniel Mendler Commit: Daniel Mendler marginalia--field: Minor optimization --- marginalia.el | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/marginalia.el b/marginalia.el index 93de72f104..2d62c5548f 100644 --- a/marginalia.el +++ b/marginalia.el @@ -404,7 +404,13 @@ FACE is the name of the face, with which the field should be propertized." (setq field (if format `(format ,format ,field) `(or ,field ""))) (when width (setq field `(format ,(format "%%%ds" (- width)) ,field))) (when truncate (setq field `(marginalia--truncate ,field ,truncate))) - (when face (setq field `(propertize ,field 'face ,face))) + (when face +(setq field (if (or format width truncate) +(cl-with-gensyms (f) + `(let ((,f ,field)) + (put-text-property 0 (length ,f) 'face ,face ,f) + ,f)) + `(propertize ,field 'face ,face field) (defmacro marginalia--fields (&rest fields)
[elpa] externals/marginalia 08e0f3c6cd 1/4: Safer marginalia--orig-completion-metadata-get
branch: externals/marginalia commit 08e0f3c6cd4dbb54114a14d27980eea1c576bcc4 Author: Daniel Mendler Commit: Daniel Mendler Safer marginalia--orig-completion-metadata-get --- marginalia.el | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/marginalia.el b/marginalia.el index f6cdb548b2..a948b22f31 100644 --- a/marginalia.el +++ b/marginalia.el @@ -322,7 +322,10 @@ The value of `this-command' is used as key for the lookup." Marginalia mode (defalias 'marginalia--orig-completion-metadata-get - (symbol-function (compat-function completion-metadata-get)) + (symbol-function + (if (fboundp 'marginalia--orig-completion-metadata-get) + 'marginalia--orig-completion-metadata-get + (compat-function completion-metadata-get))) "Original `completion-metadata-get' function.") (defvar marginalia--pangram "Cwm fjord bank glyphs vext quiz.")
[elpa] externals/marginalia 413604559b 2/4: Inherit face marginalia-key from help-key-binding
branch: externals/marginalia commit 413604559b27d061188ab19052ebce9d0853b5be Author: Daniel Mendler Commit: Daniel Mendler Inherit face marginalia-key from help-key-binding --- marginalia.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marginalia.el b/marginalia.el index a948b22f31..93de72f104 100644 --- a/marginalia.el +++ b/marginalia.el @@ -172,7 +172,7 @@ The value of `this-command' is used as key for the lookup." :group 'faces) (defface marginalia-key - '((t :inherit font-lock-keyword-face)) + '((t :inherit help-key-binding)) "Face used to highlight keys.") (defface marginalia-type
[elpa] externals/orderless d41ccf1b2b 1/2: Use keywords "matching" and "completion"
branch: externals/orderless commit d41ccf1b2b4c3ba481dc899633c0bc148c47072e Author: Daniel Mendler Commit: Daniel Mendler Use keywords "matching" and "completion" --- orderless.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orderless.el b/orderless.el index c3e6f6b60a..88e8676021 100644 --- a/orderless.el +++ b/orderless.el @@ -4,7 +4,7 @@ ;; Author: Omar Antolín Camarena ;; Maintainer: Omar Antolín Camarena , Daniel Mendler -;; Keywords: extensions +;; Keywords: matching, completion ;; Version: 1.3 ;; URL: https://github.com/oantolin/orderless ;; Package-Requires: ((emacs "27.1") (compat "30"))
[elpa] externals/marginalia updated (a527fb03b7 -> f6c1f50686)
elpasync pushed a change to branch externals/marginalia. from a527fb03b7 Simplify marginalia--fun new 08e0f3c6cd Safer marginalia--orig-completion-metadata-get new 413604559b Inherit face marginalia-key from help-key-binding new daab796790 marginalia--field: Minor optimization new f6c1f50686 marginalia--variable-value: Add tool tip with additional integer formats Summary of changes: CHANGELOG.org | 6 ++ marginalia.el | 22 ++ 2 files changed, 24 insertions(+), 4 deletions(-)
[elpa] externals/marginalia f6c1f50686 4/4: marginalia--variable-value: Add tool tip with additional integer formats
branch: externals/marginalia commit f6c1f50686c5c96761d0b9d12773e2391459487c Author: Daniel Mendler Commit: Daniel Mendler marginalia--variable-value: Add tool tip with additional integer formats --- CHANGELOG.org | 6 ++ marginalia.el | 7 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 6f7a12fc18..df1215f1ae 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,6 +2,12 @@ #+author: Omar Antolín Camarena, Daniel Mendler #+language: en +* Development + +- =marginalia-key=: Inherit from =help-key-binding= face. +- =marginalia--variable-value=: Add tool tip for integers with hexadecimal, octal + and character representation. + * Version 1.8 (2024-12-22) - Require Emacs 28.1. diff --git a/marginalia.el b/marginalia.el index 2d62c5548f..0e16b1b103 100644 --- a/marginalia.el +++ b/marginalia.el @@ -685,7 +685,12 @@ keybinding since CAND includes it." (format (propertize "#'%s" 'face 'marginalia-function) val)) ((pred recordp) (format (propertize "#" 'face 'marginalia-value) (type-of val))) ((pred symbolp) (propertize (symbol-name val) 'face 'marginalia-symbol)) -((pred numberp) (propertize (number-to-string val) 'face 'marginalia-number)) +((pred numberp) + (propertize (number-to-string val) + 'face 'marginalia-number + 'help-echo (and (integerp val) + (format "%d, #o%o, #x%x%s" val val val + (if (characterp val) (format ", ?%c" val) "") (_ (let ((print-escape-newlines t) (print-escape-control-characters t) ;;(print-escape-multibyte t)
[elpa] externals/dape a25b72ea7e: Respect intent of font-lock-mode in info and repl buffers
branch: externals/dape commit a25b72ea7e8cddda83166a54c92e1f5b5f7a1d63 Author: Daniel Pettersson Commit: Daniel Pettersson Respect intent of font-lock-mode in info and repl buffers --- dape.el | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dape.el b/dape.el index 370ba2b700..abd13a28a6 100644 --- a/dape.el +++ b/dape.el @@ -4242,14 +4242,11 @@ calls should continue. If NO-HANDLES is non nil skip + - handles." (setq name (propertize name 'font-lock-face 'font-lock-variable-name-face - 'face 'font-lock-variable-name-face 'mouse-face 'highlight 'help-echo "mouse-2: create or remove watch expression" 'keymap dape-info-variable-name-map) type - (propertize type - 'font-lock-face 'font-lock-type-face - 'face 'font-lock-type-face) + (propertize type 'font-lock-face 'font-lock-type-face) value (propertize value 'mouse-face 'highlight @@ -4526,7 +4523,8 @@ The search is done backwards from POINT. The line is marked with `( keymap ,(make-composed-keymap (list (plist-get props 'keymap) keymap)) font-lock-face ,(or (plist-get props 'font-lock-face) - (plist-get props 'face))) + (plist-get props 'face)) + face nil) str) finally return (propertize str
[elpa] externals/orderless updated (c7cb04499d -> 254f241248)
elpasync pushed a change to branch externals/orderless. from c7cb04499d Relax the smart-case heuristic; Check the whole pattern new d41ccf1b2b Use keywords "matching" and "completion" new 254f241248 Version 1.4 Summary of changes: orderless.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[nongnu] elpa/aidermacs c346e7f22e 09/11: Remove extra badge
branch: elpa/aidermacs commit c346e7f22ec7a48837f929e3b8d46226c913f8bb Author: Mingde (Matthew) Zeng Commit: Mingde (Matthew) Zeng Remove extra badge Signed-off-by: Mingde (Matthew) Zeng --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 41666c1b9d..ac15577d66 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ [](https://github.com/MatthewZMD/aidermacs/blob/master/LICENSE) [](https://github.com/MatthewZMD/aidermacs/graphs/contributors) [](https://github.com/MatthewZMD/aidermacs/issues) -[](https://github.com/MatthewZMD/aidermacs/pull/new) Missing [Cursor](https://cursor.sh) but prefer living in Emacs? Aidermacs brings Cursor-like AI-powered development to your Emacs workflow by integrating [Aider](https://github.com/paul-gauthier/aider), one of the most powerful open-source AI pair programming tools. As a community-driven project, Aidermacs prioritizes Emacs users' needs and preferences while providing the same powerful features found in Cursor!
[nongnu] elpa/gptel 54ce1c3d26: gptel-curl: Handle Deepseek API variance (#709)
branch: elpa/gptel commit 54ce1c3d26715414a014c67e3b9062d9997333ce Author: Karthik Chikmagalur Commit: Karthik Chikmagalur gptel-curl: Handle Deepseek API variance (#709) * gptel-openai-extras.el (gptel-curl--parse-stream): Some deepseek model providers will stop supplying "reasoning_content" entries in the streaming response after the end of the reasoning block. This breaks our check in `gptel-deepseek' to detect if we're working with a reasoning or non-reasoning model. Fix by explicitly setting the :reasoning-block key in INFO to indicate that we're in a reasoning block, then use the value of :reasoning-block to determine if the model is reasoning-capable. * gptel-curl.el (gptel-curl--stream-filter): Set :reasoning-block when reading reasoning content delivered via a separate JSON field (i.e. when it's not integrated in the main response stream.) --- gptel-curl.el | 2 ++ gptel-openai-extras.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gptel-curl.el b/gptel-curl.el index 11ced1fbe4..425d25aeee 100644 --- a/gptel-curl.el +++ b/gptel-curl.el @@ -338,6 +338,8 @@ Optional RAW disables text properties and transformation." ((stringp reasoning) ;; Obtained from separate JSON field in response (funcall callback (cons 'reasoning reasoning) proc-info) + (unless reasoning-block ;Record that we're in a reasoning block (#709) +(plist-put proc-info :reasoning-block 'in)) (plist-put proc-info :reasoning nil)) ;Reset for next parsing round ((and (null reasoning-block) (length> response 0)) (if (string-match-p "^ *" response) diff --git a/gptel-openai-extras.el b/gptel-openai-extras.el index c9e0630747..078666cb7b 100644 --- a/gptel-openai-extras.el +++ b/gptel-openai-extras.el @@ -296,7 +296,7 @@ parameters." (concat (plist-get info :reasoning) reasoning)) (when-let* ((content (plist-get delta :content)) ((not (eq content :null -(if (plist-member delta :reasoning_content) ;Check for reasoning model +(if (eq (plist-get info :reasoning-block) 'in) ;Check if in reasoning block (plist-put info :reasoning-block t) ;End of streaming reasoning block (plist-put info :reasoning-block 'done)) ;Not using a reasoning model (throw 'done t)))
[elpa] externals/yaml f99ef76c80 2/2: Merge pull request #61 from ergopractice/control-encode-scalars-as-flow-seq
branch: externals/yaml commit f99ef76c80e6fc3fcf650c4fe34e10726594a4c4 Merge: 09e46d563f 3f1be7640b Author: Zachary Romero Commit: GitHub Merge pull request #61 from ergopractice/control-encode-scalars-as-flow-seq Adds control for encoding scalars as flow sequences --- yaml.el | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yaml.el b/yaml.el index fe3c42f277..ae6084fd3d 100644 --- a/yaml.el +++ b/yaml.el @@ -45,6 +45,9 @@ (defconst yaml-parser-version "0.5.1") +(defvar yaml--encode-use-flow-sequence t + "Turn on encoding sequence of scalars as flow sequence.") + (defvar yaml--parse-debug nil "Turn on debugging messages when parsing YAML when non-nil. @@ -2672,7 +2675,8 @@ auto-detecting the indentation" (yaml--encode-hash-table ht indent auto-indent)) ((zerop (length l)) (insert "[]")) - ((seq-every-p #'yaml--scalarp l) + ((and yaml--encode-use-flow-sequence +(seq-every-p #'yaml--scalarp l)) (insert "[") (yaml--encode-object (car l) 0) (seq-do (lambda (object)
[nongnu] elpa/aidermacs updated (5b6879604e -> 2a15be0dd3)
elpasync pushed a change to branch elpa/aidermacs. from 5b6879604e Merge pull request #73 from rjekker/vterm-dont-kill-on-exit new 3fd69ed34e add options to groups new 3910673d2f Merge pull request #72 from rjekker/defgroup new 26f87a0dac Add Non-GNU Elpa badge new 254a802d62 Revert "add options to groups" new c346e7f22e Remove extra badge new 22801ad707 document theme support new d49dae370a fix some documentation warnings new 47918c434d set reasonable defaults for completion and bg colors new 73eda045ac Merge branch 'main' into match-theme new d1d3103556 remove spurious debug message new 2a15be0dd3 Merge pull request #71 from rjekker/match-theme Summary of changes: README.md | 9 +- aidermacs-backend-vterm.el | 73 +++--- 2 files changed, 58 insertions(+), 24 deletions(-)
[elpa] externals/yaml 3f1be7640b 1/2: Add control for encoding scalars as flow sequences
branch: externals/yaml commit 3f1be7640b1d368f2115789e589f7945806e4462 Author: ergopractice <181522387+ergopract...@users.noreply.github.com> Commit: ergopractice <181522387+ergopract...@users.noreply.github.com> Add control for encoding scalars as flow sequences --- yaml.el | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yaml.el b/yaml.el index fe3c42f277..ae6084fd3d 100644 --- a/yaml.el +++ b/yaml.el @@ -45,6 +45,9 @@ (defconst yaml-parser-version "0.5.1") +(defvar yaml--encode-use-flow-sequence t + "Turn on encoding sequence of scalars as flow sequence.") + (defvar yaml--parse-debug nil "Turn on debugging messages when parsing YAML when non-nil. @@ -2672,7 +2675,8 @@ auto-detecting the indentation" (yaml--encode-hash-table ht indent auto-indent)) ((zerop (length l)) (insert "[]")) - ((seq-every-p #'yaml--scalarp l) + ((and yaml--encode-use-flow-sequence +(seq-every-p #'yaml--scalarp l)) (insert "[") (yaml--encode-object (car l) 0) (seq-do (lambda (object)
[nongnu] elpa/aidermacs 254a802d62 08/11: Revert "add options to groups"
branch: elpa/aidermacs
commit 254a802d62629ea4d8165f1d39967ba7e987c2e7
Author: Mingde (Matthew) Zeng
Commit: Mingde (Matthew) Zeng
Revert "add options to groups"
This reverts commit 3fd69ed34e71f583fb26cdfe31722dc5c7d7fc98.
---
aidermacs-backend-comint.el | 6 ++
aidermacs-backend-vterm.el | 9 +++--
aidermacs-backends.el | 9 +++--
aidermacs-models.el | 15 +--
aidermacs.el| 27 +--
5 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el
index a91838def2..d891d04e7f 100644
--- a/aidermacs-backend-comint.el
+++ b/aidermacs-backend-comint.el
@@ -48,8 +48,7 @@
("cpp" . "c++"))
"Map external language names to Emacs names."
:type '(alist :key-type (string :tag "Language Name/Alias")
-:value-type (string :tag "Mode Name (without -mode)"))
- :group 'aidermacs-backend-comint)
+:value-type (string :tag "Mode Name (without -mode)")))
;; FIXME: Hmm... seems to use standard diff3 markers. Maybe some code
;; in `smerge-mode.el' could be (re)used?
@@ -63,8 +62,7 @@
(defcustom aidermacs-comint-multiline-newline-key "S-"
"Key binding for `comint-accumulate' in Aidermacs buffers.
This allows for multi-line input without sending the command."
- :type 'string
- :group 'aidermacs-backend-comint)
+ :type 'string)
(defface aidermacs-command-separator
'type graphic)) :strike-through t :extend t)
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index e6fe70aa4f..6bc591a955 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -69,8 +69,7 @@
(defcustom aidermacs-vterm-multiline-newline-key "S-"
"Key binding to enter a newline without sending in vterm."
- :type 'string
- :group 'aidermacs-backend-vterm)
+ :type 'string)
(defun aidermacs--vterm-check-finish-sequence-repeated (proc orig-filter
start-point)
"Check for the finish sequence in PROC's buffer.
@@ -159,8 +158,7 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
(defcustom aidermacs-vterm-use-theme-colors t
"Whether to use Emacs theme colors for aider.
Has effect only when using the vterm backend."
- :type 'boolean
- :group 'aidermacs-backend-vterm)
+ :type 'boolean)
(defcustom aidermacs-vterm-theme-colors-plist
'("--user-input-color" font-lock-function-name-face
@@ -170,8 +168,7 @@ Has effect only when using the vterm backend."
"Emacs faces to use for aider colour flags.
Keys are the commandline arguments to send to aider.
Values are either faces or strings (colours like \"#00cc00\")."
- :type 'plist
- :group 'aidermacs-backend-vterm)
+ :type 'plist)
(defun aidermacs--vterm-colorname-to-rgb (name)
"Convert Emacs color NAME to RGB values."
diff --git a/aidermacs-backends.el b/aidermacs-backends.el
index 3e39870173..9f37f4da0d 100644
--- a/aidermacs-backends.el
+++ b/aidermacs-backends.el
@@ -42,13 +42,11 @@ Options are `comint' (the default) or `vterm'. When set to
`vterm',
aidermacs launches a fully functional vterm buffer instead
of using a comint process."
:type '(choice (const :tag "Comint" comint)
- (const :tag "VTerm" vterm))
- :group 'aidermacs-backends)
+ (const :tag "VTerm" vterm)))
(defcustom aidermacs-output-limit 10
"Maximum number of output entries to keep in history."
- :type 'integer
- :group 'aidermacs-backends)
+ :type 'integer)
(defvar-local aidermacs--output-history nil
"List to store aidermacs output history.
@@ -62,8 +60,7 @@ Each entry is a cons cell (timestamp . output-text).")
(defcustom aidermacs-before-run-backend-hook nil
"Hook run before the aidermacs backend is startd."
- :type 'hook
- :group 'aidermacs-backends)
+ :type 'hook)
(defun aidermacs-get-output-history (&optional limit)
"Get the output history, optionally limited to LIMIT entries.
diff --git a/aidermacs-models.el b/aidermacs-models.el
index b04039084f..60f4db8305 100644
--- a/aidermacs-models.el
+++ b/aidermacs-models.el
@@ -38,24 +38,20 @@
(defcustom aidermacs-default-model "sonnet"
"Default AI model to use for aidermacs sessions when not in Architect mode."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-architect-model "sonnet"
"Default AI model to use for architectural reasoning in aidermacs sessions."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-editor-model aidermacs-default-model
"Default AI model to use for code editing in aidermacs sessions.
Defaults to `aidermacs-default-model` if not explicitly set."
- :type 'string
- :group 'aidermacs-models)
+ :type 'string)
(defcustom aidermacs-use-architect-mode nil
"If non-nil, use separate Architect/Editor mode."
- :type 'boolean
- :group 'aidermacs-models)
+ :type 'boolean)
[elpa] externals/consult updated (99fcdf3b64 -> fa223d826f)
elpasync pushed a change to branch externals/consult. from 99fcdf3b64 consult-completion-in-region: Pass metadata to completion-all-completions new 2251d55aa7 Add consult-info-define new fa223d826f consult-info-define: Improve docstring Summary of changes: CHANGELOG.org | 5 + README.org | 29 - consult-info.el | 16 3 files changed, 33 insertions(+), 17 deletions(-)
[nongnu] elpa/slime f079d8cdc0: Experimental swank-repl:run-function-and-switch-to-new-thread
branch: elpa/slime commit f079d8cdc007b02f40d61227203de3b15f118d89 Author: Stas Boukarev Commit: Stas Boukarev Experimental swank-repl:run-function-and-switch-to-new-thread --- contrib/swank-repl.lisp | 14 +- swank.lisp | 5 - 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/contrib/swank-repl.lisp b/contrib/swank-repl.lisp index c05c4c0bb5..4f531fdcab 100644 --- a/contrib/swank-repl.lisp +++ b/contrib/swank-repl.lisp @@ -11,7 +11,8 @@ listener-get-value create-repl listener-save-value - redirect-trace-output) + redirect-trace-output + run-function-and-switch-to-new-thread) (:import-from swank @@ -153,6 +154,17 @@ INPUT OUTPUT IO REPL-RESULTS" (setf (mconn.repl-thread connection) 'aborted +(defun run-function-and-switch-to-new-thread (function) + (let ((connection *emacs-connection*)) +(assert (typep connection 'multithreaded-connection)) +(assert (eql (current-thread) (mconn.repl-thread connection))) +(setf (mconn.repl-thread connection) + (spawn-repl-thread connection "new-repl-thread")) +(send-to-emacs (list :return (current-thread) + `(:ok nil) + swank::*eval-continuation*)) +(funcall function))) + ; Redirection during requests ;;; ;;; We always redirect the standard streams to Emacs while evaluating diff --git a/swank.lisp b/swank.lisp index ac49b54731..a00fd210a2 100644 --- a/swank.lisp +++ b/swank.lisp @@ -1683,6 +1683,8 @@ Fall back to the current if no such package exists." (*print-lines* (or *print-lines* ,lines))) ,@body)) +(defvar *eval-continuation* nil) + (defun eval-for-emacs (form buffer-package id) "Bind *BUFFER-PACKAGE* to BUFFER-PACKAGE and evaluate FORM. Return the result to the continuation ID. @@ -1692,7 +1694,8 @@ Errors are trapped and invoke our debugger." (let ((*buffer-package* (guess-buffer-package buffer-package)) (*buffer-readtable* (guess-buffer-readtable buffer-package)) (*pending-continuations* (cons id *pending-continuations*)) - (*pre-reply-hook* *pre-reply-hook*)) + (*pre-reply-hook* *pre-reply-hook*) + (*eval-continuation* id)) (check-type *buffer-package* package) (check-type *buffer-readtable* readtable) ;; APPLY would be cleaner than EVAL.
[elpa] externals/consult 2251d55aa7 1/2: Add consult-info-define
branch: externals/consult commit 2251d55aa7c84ebbf11274f44ab6879d3808c2a7 Author: Daniel Mendler Commit: Daniel Mendler Add consult-info-define --- CHANGELOG.org | 5 + README.org | 29 - consult-info.el | 15 +++ 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index d3003db89c..1179ffec0c 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,6 +2,11 @@ #+author: Daniel Mendler #+language: en +* Development + +- Add ~consult-info-define~ to conveniently define custom ~consult-info-*~ commands + to search through a subset of info manuals. + * Version 2.1 (2025-03-11) - Remove obsolete ~consult--async-*~ APIs. diff --git a/README.org b/README.org index c5e11eaf17..3162a118b0 100644 --- a/README.org +++ b/README.org @@ -351,30 +351,25 @@ their descriptions. :end: #+findex: consult-info +#+findex: consult-info-define #+findex: consult-man - =consult-man=: Find Unix man page, via Unix =apropos= or =man -k=. =consult-man= opens the selected man page using the Emacs =man= command. Supports live preview of the theme while scrolling through the candidates. - =consult-info=: Full text search through info pages. If the command is invoked from within an ~*info*~ buffer, it will search through the current manual. You - may want to create your own commands which search through a predefined set of - info pages, for example: + may want to create your own =consult-info-*= commands which search through a + predefined set of info pages. You can use the function =consult-info-define= to + define commands =consult-info-emacs=, =consult-info-completion=, =consult-info-org=, + and so on: #+begin_src emacs-lisp -(defun consult-info-emacs () - "Search through Emacs info pages." - (interactive) - (consult-info "emacs" "efaq" "elisp" "cl" "compat")) - -(defun consult-info-org () - "Search through the Org info page." - (interactive) - (consult-info "org")) - -(defun consult-info-completion () - "Search through completion info pages." - (interactive) - (consult-info "vertico" "consult" "marginalia" "orderless" "embark" -"corfu" "cape" "tempel")) +(consult-info-define "emacs" "efaq" "elisp" "cl" "compat" "eshell") +(consult-info-define 'completion + "vertico" "consult" "marginalia" "orderless" + "embark" "corfu" "cape" "tempel") +(consult-info-define "org") +(consult-info-define "gnus") +(consult-info-define "magit") #+end_src ** Miscellaneous diff --git a/consult-info.el b/consult-info.el index 8aad712697..f594e1a354 100644 --- a/consult-info.el +++ b/consult-info.el @@ -200,5 +200,20 @@ CALLBACK receives the candidates." :add-history (thing-at-point 'symbol) :lookup #'consult--lookup-member +;;;###autoload +(progn ;; Wrapped with `progn' to preload `consult-info-define'. + (defun consult-info-define (name &rest manuals) +"Define `consult-info-NAME' command to search through MANUALS. +MANUALS is a list of a strings. NAME can be a symbol or a string. If +NAME is a string, it is added to the MANUALS list." +(let ((cmd (intern (format "consult-info-%s" name + (when (stringp name) (push name manuals)) + (defalias cmd (lambda () (interactive) (apply #'consult-info manuals)) +(format "Search via `consult-info' through the manual%s %s:\n\n%s" +(if (cdr manuals) "s" "") +(mapconcat (lambda (m) (format "\"%s\"" m)) manuals ", ") +(mapconcat (lambda (m) (format " * Info node `(%s)'" m)) manuals "\n"))) + cmd))) + (provide 'consult-info) ;;; consult-info.el ends here
[nongnu] elpa/aidermacs 73eda045ac 05/11: Merge branch 'main' into match-theme
branch: elpa/aidermacs commit 73eda045ac57c97a71f78dbafbadc948d8f9ec57 Merge: 47918c434d 764a99dd5e Author: Reindert-Jan Ekker Commit: GitHub Merge branch 'main' into match-theme --- .gitignore | 4 ++ CHANGELOG.md| 16 + README.md | 67 ++--- aidermacs-backend-comint.el | 15 +++- aidermacs-backend-vterm.el | 18 +++-- aidermacs-backends.el | 171 +--- aidermacs-models.el | 6 +- aidermacs.el| 56 +-- 8 files changed, 208 insertions(+), 145 deletions(-) diff --git a/.gitignore b/.gitignore index 7364d48a21..05d1193288 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ .env __pycache__ /*.elc + +# ELPA-generated files. +/aidermacs-pkg.el +/aidermacs-autoloads.el diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00..4955e59dc5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# CHANGELOG + +## 1.0 - Initial Release + +### Features + +- **Built-in Ediff Integration:** Review AI-generated changes with Emacs' familiar `ediff` interface. +- **Intelligent Model Selection:** Automatically discover and integrate with multiple AI providers (OpenAI, Anthropic, DeepSeek, Google Gemini, OpenRouter). +- **Flexible Terminal Backend Support:** Choose between `comint` and `vterm` backends for the best terminal compatibility and performance. +- **Enhanced File Management:** Easily manage files within your Aider session with commands for adding, dropping, listing, and more. Full support for remote files via Tramp (SSH, Docker, etc.). +- **Streamlined Transient Menu Selection:** Access all Aidermacs features through a redesigned and ergonomic transient menu system. +- **Prompt Files Minor Mode:** Work seamlessly with prompt files and other Aider-related files with convenient keybindings and automatic mode activation. +- **Claude 3.7 Sonnet Thinking Tokens:** Enable and configure thinking tokens using the `/think-tokens` in-chat command or the `--thinking-tokens` command-line argument. +- **Architect Mode Confirmation:** Control whether to automatically accept Architect mode changes with the `aidermacs-auto-accept-architect` variable. +- **Re-Enable Auto-Commits:** Aider automatically commits AI-generated changes by default. We consider this behavior *very* intrusive, so we've disabled it. You can re-enable auto-commits by setting `aidermacs-auto-commits` to `t`. +- **Customizing Aider Options with `aidermacs-extra-args`:** Pass any Aider-supported command-line options. diff --git a/README.md b/README.md index ed82176d0b..3d9c67f1dd 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,24 @@ Here's what the community is saying about Aidermacs: ## Configuration + Pre-Run Hook + +You can use the `aidermacs-before-run-backend-hook` to run custom setup code before starting the Aider backend. This is particularly useful for: + +- Setting environment variables +- Injecting secrets +- Performing any other pre-run configuration + +Example usage to securely set an OpenAI API key from password-store: + +```elisp +(add-hook 'aidermacs-before-run-backend-hook + (lambda () +(setenv "OPENAI_API_KEY" (password-store-get "code/openai_api_key" +``` + +This approach keeps sensitive information out of your dotfiles while still making it available to Aidermacs. + ### Default Model Selection You can customize the default AI model used by Aidermacs by setting the `aidermacs-default-model` variable: @@ -133,7 +151,19 @@ When Architect mode is enabled, the `aidermacs-default-model` setting is ignored (setq aidermacs-editor-model "deepseek/deepseek-chat") ;; defaults to aidermacs-default-model ``` -*Note: This configuration will be overwritten by the existence of an `.aider.conf.yml` file (see [details](#Overwrite-Configuration-with-Configuration-File)).* +*Note: These configurations will be overwritten by the existence of an `.aider.conf.yml` file (see [details](#Overwrite-Configuration-with-Configuration-File)).* + + Architect Mode Confirmation + +By default, Aidermacs requires explicit confirmation before applying changes proposed in Architect mode. This gives you a chance to review the AI's plan before any code is modified. + +If you prefer to automatically accept all Architect mode changes without confirmation (similar to Aider's default behavior), you can enable this with: + +```emacs-lisp +(setq aidermacs-auto-accept-architect t) +``` + +*Note: These configurations will be overwritten by the existence of an `.aider.conf.yml` file (see [details](#Overwrite-Configuration-with-Configuration-File)).* ### Terminal Backend Selection @@ -252,30 +282,19 @@ Aidermacs supports project-specific configurations via `.aider.conf.yml` files. ### Claude 3.7 Sonnet Thinking Tokens -Aider can work with Sonnet 3.7's [new thinking tokens](https://www.anthropic
[nongnu] elpa/aidermacs 3910673d2f 06/11: Merge pull request #72 from rjekker/defgroup
branch: elpa/aidermacs
commit 3910673d2f137d54da561c51f888213515eb9b98
Merge: 5b6879604e 3fd69ed34e
Author: Matthew Zeng
Commit: GitHub
Merge pull request #72 from rjekker/defgroup
add options to groups
---
aidermacs-backend-comint.el | 6 --
aidermacs-backend-vterm.el | 9 ++---
aidermacs-backends.el | 9 ++---
aidermacs-models.el | 15 ++-
aidermacs.el| 27 ++-
5 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el
index d891d04e7f..a91838def2 100644
--- a/aidermacs-backend-comint.el
+++ b/aidermacs-backend-comint.el
@@ -48,7 +48,8 @@
("cpp" . "c++"))
"Map external language names to Emacs names."
:type '(alist :key-type (string :tag "Language Name/Alias")
-:value-type (string :tag "Mode Name (without -mode)")))
+:value-type (string :tag "Mode Name (without -mode)"))
+ :group 'aidermacs-backend-comint)
;; FIXME: Hmm... seems to use standard diff3 markers. Maybe some code
;; in `smerge-mode.el' could be (re)used?
@@ -62,7 +63,8 @@
(defcustom aidermacs-comint-multiline-newline-key "S-"
"Key binding for `comint-accumulate' in Aidermacs buffers.
This allows for multi-line input without sending the command."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-backend-comint)
(defface aidermacs-command-separator
'type graphic)) :strike-through t :extend t)
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index 6bc591a955..e6fe70aa4f 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -69,7 +69,8 @@
(defcustom aidermacs-vterm-multiline-newline-key "S-"
"Key binding to enter a newline without sending in vterm."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-backend-vterm)
(defun aidermacs--vterm-check-finish-sequence-repeated (proc orig-filter
start-point)
"Check for the finish sequence in PROC's buffer.
@@ -158,7 +159,8 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
(defcustom aidermacs-vterm-use-theme-colors t
"Whether to use Emacs theme colors for aider.
Has effect only when using the vterm backend."
- :type 'boolean)
+ :type 'boolean
+ :group 'aidermacs-backend-vterm)
(defcustom aidermacs-vterm-theme-colors-plist
'("--user-input-color" font-lock-function-name-face
@@ -168,7 +170,8 @@ Has effect only when using the vterm backend."
"Emacs faces to use for aider colour flags.
Keys are the commandline arguments to send to aider.
Values are either faces or strings (colours like \"#00cc00\")."
- :type 'plist)
+ :type 'plist
+ :group 'aidermacs-backend-vterm)
(defun aidermacs--vterm-colorname-to-rgb (name)
"Convert Emacs color NAME to RGB values."
diff --git a/aidermacs-backends.el b/aidermacs-backends.el
index 9f37f4da0d..3e39870173 100644
--- a/aidermacs-backends.el
+++ b/aidermacs-backends.el
@@ -42,11 +42,13 @@ Options are `comint' (the default) or `vterm'. When set to
`vterm',
aidermacs launches a fully functional vterm buffer instead
of using a comint process."
:type '(choice (const :tag "Comint" comint)
- (const :tag "VTerm" vterm)))
+ (const :tag "VTerm" vterm))
+ :group 'aidermacs-backends)
(defcustom aidermacs-output-limit 10
"Maximum number of output entries to keep in history."
- :type 'integer)
+ :type 'integer
+ :group 'aidermacs-backends)
(defvar-local aidermacs--output-history nil
"List to store aidermacs output history.
@@ -60,7 +62,8 @@ Each entry is a cons cell (timestamp . output-text).")
(defcustom aidermacs-before-run-backend-hook nil
"Hook run before the aidermacs backend is startd."
- :type 'hook)
+ :type 'hook
+ :group 'aidermacs-backends)
(defun aidermacs-get-output-history (&optional limit)
"Get the output history, optionally limited to LIMIT entries.
diff --git a/aidermacs-models.el b/aidermacs-models.el
index 60f4db8305..b04039084f 100644
--- a/aidermacs-models.el
+++ b/aidermacs-models.el
@@ -38,20 +38,24 @@
(defcustom aidermacs-default-model "sonnet"
"Default AI model to use for aidermacs sessions when not in Architect mode."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-architect-model "sonnet"
"Default AI model to use for architectural reasoning in aidermacs sessions."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-editor-model aidermacs-default-model
"Default AI model to use for code editing in aidermacs sessions.
Defaults to `aidermacs-default-model` if not explicitly set."
- :type 'string)
+ :type 'string
+ :group 'aidermacs-models)
(defcustom aidermacs-use-architect-mode nil
"If non-nil, use separate Architect/Editor mode."
- :type 'boolean)
+ :type 'boolean
+ :group 'aidermacs-models)
(defcustom aidermacs
[nongnu] elpa/aidermacs d1d3103556 10/11: remove spurious debug message
branch: elpa/aidermacs commit d1d31035561c6ab49b0a15859d9d73887d8f3a4f Author: reindert Commit: reindert remove spurious debug message --- aidermacs-backend-vterm.el | 1 - 1 file changed, 1 deletion(-) diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el index d4fbc3af1a..ee92f79b17 100644 --- a/aidermacs-backend-vterm.el +++ b/aidermacs-backend-vterm.el @@ -236,7 +236,6 @@ BUFFER-NAME is the name for the vterm buffer." (let* ((cmd (mapconcat #'identity (append `(,program ,@(aidermacs--vterm-theme-args)) args) " ")) (vterm-buffer-name buffer-name) (vterm-shell cmd)) - (message "CMD: %s" cmd) (with-current-buffer (vterm-other-window) (setq-local vterm-max-scrollback 1000 aidermacs--vterm-active-timer nil
[nongnu] elpa/aidermacs 22801ad707 01/11: document theme support
branch: elpa/aidermacs commit 22801ad707d61fe6f9469522e6dd6a3b6ffa67d5 Author: reindert Commit: reindert document theme support --- README.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 851c5c4c76..e30bdd26df 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,13 @@ Available backends: - `comint` (default): Uses Emacs' built-in terminal emulation - `vterm`: Leverages vterm for better terminal compatibility +### Emacs theme support +The vterm backend will use the faces defined by your active emacs theme to set the colors for aider. In some cases this will not work perfectly; if text is unreadable for you, you can turn this off as follows: + +``` emacs-lisp +;; don't match emacs theme colors +(setopt aidermacs-vterm-use-theme-colors nil) +``` ### Multiline Input Configuration
[nongnu] elpa/aidermacs 2a15be0dd3 11/11: Merge pull request #71 from rjekker/match-theme
branch: elpa/aidermacs
commit 2a15be0dd350e79c39ee2221ab972f7b10b7c63e
Merge: c346e7f22e d1d3103556
Author: Matthew Zeng
Commit: GitHub
Merge pull request #71 from rjekker/match-theme
theme support
---
README.md | 7 +
aidermacs-backend-vterm.el | 73 +++---
2 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index ac15577d66..189c3d9525 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,13 @@ Available backends:
- `comint` (default): Uses Emacs' built-in terminal emulation
- `vterm`: Leverages vterm for better terminal compatibility
+### Emacs theme support
+The vterm backend will use the faces defined by your active Emacs theme to set
the colors for aider. It tries to guess some reasonable color values based on
your themes. In some cases this will not work perfectly; if text is unreadable
for you, you can turn this off as follows:
+
+``` emacs-lisp
+;; don't match emacs theme colors
+(setopt aidermacs-vterm-use-theme-colors nil)
+```
### Multiline Input Configuration
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index 6bc591a955..be72641ebc 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -160,41 +160,68 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
Has effect only when using the vterm backend."
:type 'boolean)
-(defcustom aidermacs-vterm-theme-colors-plist
+(defcustom aidermacs-vterm-theme-foreground-colors-plist
'("--user-input-color" font-lock-function-name-face
"--assistant-output-color" default
+"--tool-output-color" default
"--tool-error-color" error
-"--tool-warning-color" warning)
- "Emacs faces to use for aider colour flags.
-Keys are the commandline arguments to send to aider.
-Values are either faces or strings (colours like \"#00cc00\")."
+"--tool-warning-color" warning
+"--completion-menu-color" default
+"--completion-menu-current-color" highlight)
+ "Emacs faces to use for aider color flags.
+Keys are the commandline arguments to send to aider. Values are either faces,
+or strings containing color codes like \"#00ccff\".
+
+For any face specified, the :foreground attribute will be used to determine the
+color. If that is unspecified, this falls back to the default face foreground
+color."
:type 'plist)
-(defun aidermacs--vterm-colorname-to-rgb (name)
- "Convert Emacs color NAME to RGB values."
- (if-let ((colors (color-values name)))
+(defcustom aidermacs-vterm-theme-background-colors-plist
+ '("--completion-menu-bg-color" default
+"--completion-menu-current-bg-color" highlight)
+ "Emacs faces to use for aider color flags.
+Keys are the commandline arguments to send to aider. Values are either faces,
+or strings containing color codes like \"#00ccff\".
+
+For any face specified, the :background attribute will be used to determine the
+color. If that is unspecified, this falls back to the default face foreground
+color."
+ :type 'plist)
+
+(defun aidermacs--vterm-colorname-to-rgb (name attr)
+ "Convert Emacs color name NAME to RGB values."
+ (if-let* ((colors (color-values name)))
(concat "#"
(mapconcat (lambda (c) (format "%02X" (/ c 256))) colors))
-(face-attribute 'default :foreground)))
+(face-attribute 'default attr)))
+
+(defun aidermacs--vterm-get-face-color (face attr)
+ "Return an RGB color code for FACE attribute ATTR.
+If unspecified, return ATTR from default face."
+ (let ((color-string (face-attribute-specified-or
+ (face-attribute face attr)
+ (face-attribute 'default attr
+(if (string-prefix-p "#" color-string)
+color-string
+ (aidermacs--vterm-colorname-to-rgb color-string attr
+
+(defun aidermacs--vterm-convert-color-arg (attr el)
+ "Maps element EL from color plist, to actual RGB Values, using attribute
ATTR."
+ (shell-quote-argument
+ (cond ((stringp el) el)
+ ((facep el) (aidermacs--vterm-get-face-color el attr))
+ (t (error "Invalid face or colour value: %s" el)
(defun aidermacs--vterm-theme-args ()
"Create arguments for aider to try and match the current Emacs theme.
See `aidermacs-theme-colors-plist'."
(if aidermacs-vterm-use-theme-colors
- (mapcar (lambda (s)
-(cond ((stringp s)
- (if (string-prefix-p "-" s) s
- (shell-quote-argument s)))
- ((facep s)
- (shell-quote-argument
- (let ((color-string (face-attribute-specified-or
-(face-attribute s
:foreground)
-(face-attribute 'default
:foreground
- (if (string-prefix-p "#" color-string)
- color-string
-
[nongnu] elpa/aidermacs 47918c434d 04/11: set reasonable defaults for completion and bg colors
branch: elpa/aidermacs
commit 47918c434dbd4d7d5f35f4abf041d7a1c093e316
Author: reindert
Commit: reindert
set reasonable defaults for completion and bg colors
---
README.md | 2 +-
aidermacs-backend-vterm.el | 71 --
2 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index e30bdd26df..ed82176d0b 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ Available backends:
- `vterm`: Leverages vterm for better terminal compatibility
### Emacs theme support
-The vterm backend will use the faces defined by your active emacs theme to set
the colors for aider. In some cases this will not work perfectly; if text is
unreadable for you, you can turn this off as follows:
+The vterm backend will use the faces defined by your active Emacs theme to set
the colors for aider. It tries to guess some reasonable color values based on
your themes. In some cases this will not work perfectly; if text is unreadable
for you, you can turn this off as follows:
``` emacs-lisp
;; don't match emacs theme colors
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index dce0504ff5..24dee78147 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -156,40 +156,68 @@ Use BUFFER if provided, otherwise retrieve it from
`aidermacs-get-buffer-name'."
Has effect only when using the vterm backend."
:type 'boolean)
-(defcustom aidermacs-vterm-theme-colors-plist
+(defcustom aidermacs-vterm-theme-foreground-colors-plist
'("--user-input-color" font-lock-function-name-face
"--assistant-output-color" default
+"--tool-output-color" default
"--tool-error-color" error
-"--tool-warning-color" warning)
- "Emacs faces to use for aider colour flags.
-Keys are the commandline arguments to send to aider. Values are either faces,
or strings containing color codes like \"#00ccff\""
+"--tool-warning-color" warning
+"--completion-menu-color" default
+"--completion-menu-current-color" highlight)
+ "Emacs faces to use for aider color flags.
+Keys are the commandline arguments to send to aider. Values are either faces,
+or strings containing color codes like \"#00ccff\".
+
+For any face specified, the :foreground attribute will be used to determine the
+color. If that is unspecified, this falls back to the default face foreground
+color."
:type 'plist)
-(defun aidermacs--vterm-colorname-to-rgb (name)
+(defcustom aidermacs-vterm-theme-background-colors-plist
+ '("--completion-menu-bg-color" default
+"--completion-menu-current-bg-color" highlight)
+ "Emacs faces to use for aider color flags.
+Keys are the commandline arguments to send to aider. Values are either faces,
+or strings containing color codes like \"#00ccff\".
+
+For any face specified, the :background attribute will be used to determine the
+color. If that is unspecified, this falls back to the default face foreground
+color."
+ :type 'plist)
+
+(defun aidermacs--vterm-colorname-to-rgb (name attr)
"Convert Emacs color name NAME to RGB values."
- (if-let ((colors (color-values name)))
+ (if-let* ((colors (color-values name)))
(concat "#"
(mapconcat (lambda (c) (format "%02X" (/ c 256))) colors))
-(face-attribute 'default :foreground)))
+(face-attribute 'default attr)))
+
+(defun aidermacs--vterm-get-face-color (face attr)
+ "Return an RGB color code for FACE attribute ATTR.
+If unspecified, return ATTR from default face."
+ (let ((color-string (face-attribute-specified-or
+ (face-attribute face attr)
+ (face-attribute 'default attr
+(if (string-prefix-p "#" color-string)
+color-string
+ (aidermacs--vterm-colorname-to-rgb color-string attr
+
+(defun aidermacs--vterm-convert-color-arg (attr el)
+ "Maps element EL from color plist, to actual RGB Values, using attribute
ATTR."
+ (shell-quote-argument
+ (cond ((stringp el) el)
+ ((facep el) (aidermacs--vterm-get-face-color el attr))
+ (t (error "Invalid face or colour value: %s" el)
(defun aidermacs--vterm-theme-args ()
"Create arguments for aider to try and match the current Emacs theme.
See `aidermacs-theme-colors-plist'."
(if aidermacs-vterm-use-theme-colors
- (mapcar (lambda (s)
-(cond ((stringp s)
- (if (string-prefix-p "-" s) s
- (shell-quote-argument s)))
- ((facep s)
- (shell-quote-argument
- (let ((color-string (face-attribute-specified-or
-(face-attribute s
:foreground)
-(face-attribute 'default
:foreground
- (if (string-prefix-p "#" color-string)
- color-string
-
[nongnu] elpa/aidermacs 26f87a0dac 07/11: Add Non-GNU Elpa badge
branch: elpa/aidermacs commit 26f87a0dac097eef05b4a41d3d2b7dd44ac4a261 Author: Mingde (Matthew) Zeng Commit: Mingde (Matthew) Zeng Add Non-GNU Elpa badge Signed-off-by: Mingde (Matthew) Zeng --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e1b5a46a3a..41666c1b9d 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ # Aidermacs: AI Pair Programming in Emacs [](https://melpa.org/#/aidermacs) +[](https://elpa.nongnu.org/nongnu/aidermacs.html) [](https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html) [](https://github.com/MatthewZMD/aidermacs/blob/master/LICENSE) [](https://github.com/MatthewZMD/aidermacs/graphs/contributors)
[elpa] externals/shell-quasiquote cc170c2f48: shell-quasiquote.el (shqq): Don't rely on `, @FOO` as a QPAT
branch: externals/shell-quasiquote commit cc170c2f48c9e286e38a8afc14007ccdc46955ed Author: Stefan Monnier Commit: Stefan Monnier shell-quasiquote.el (shqq): Don't rely on `,@FOO` as a QPAT Pcase does not allow them any more. --- shell-quasiquote.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell-quasiquote.el b/shell-quasiquote.el index b8e9008db8..bd8c4182b3 100644 --- a/shell-quasiquote.el +++ b/shell-quasiquote.el @@ -110,7 +110,7 @@ separating spaces." ;; ,foo (`(,`\, ,form) `(shqq--quote-atom ,form)) ;; ,@foo - (`,@,form `(mapconcat #'shqq--quote-atom ,form " ")) + (`(,`\,@ ,form) `(mapconcat #'shqq--quote-atom ,form " ")) (_ (error "Bad shqq part: %S" part)) parts)))
[elpa] main 4bf505c66b: elpa-packages (yaml): Fix `:ignored-files` param
branch: main
commit 4bf505c66bcdcaae13f4315ed490121fe05b6cec
Author: Stefan Monnier
Commit: Stefan Monnier
elpa-packages (yaml): Fix `:ignored-files` param
---
elpa-packages | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elpa-packages b/elpa-packages
index 5970ae551b..7fc3b436c8 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -914,7 +914,7 @@
(xref :core "lisp/progmodes/xref.el")
(xref-union:url "https://codeberg.org/pkal/xref-union.el";)
(yaml :url "https://github.com/zkry/yaml.el";
- :ignored-files "LICENSE")
+ :ignored-files ("LICENSE"))
(yasnippet:url "https://github.com/joaotavora/yasnippet";)
(yasnippet-classic-snippets :url nil)
(zones:url nil)
;https://www.emacswiki.org/emacs/zones.el
[nongnu] elpa/aidermacs be43d00da6: Set emacs requirement version to 26.1
branch: elpa/aidermacs commit be43d00da65ad0f4bea375f4bc7532f213618ddb Author: Mingde (Matthew) Zeng Commit: Mingde (Matthew) Zeng Set emacs requirement version to 26.1 Signed-off-by: Mingde (Matthew) Zeng --- aidermacs.el | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aidermacs.el b/aidermacs.el index cbcd75dffd..acab07eddb 100644 --- a/aidermacs.el +++ b/aidermacs.el @@ -1,7 +1,7 @@ ;;; aidermacs.el --- AI pair programming with Aider -*- lexical-binding: t; -*- ;; Author: Mingde (Matthew) Zeng ;; Version: 1.0 -;; Package-Requires: ((emacs "29.1")) +;; Package-Requires: ((emacs "26.1") (transient "0.3.0")) ;; Keywords: ai emacs llm aider ai-pair-programming tools ;; URL: https://github.com/MatthewZMD/aidermacs ;; SPDX-License-Identifier: Apache-2.0 @@ -25,6 +25,9 @@ ;;; Code: +(when (< emacs-major-version 29) + (require 'compat)) + (require 'comint) (require 'dired) (require 'ediff)
[elpa] externals/diff-hl dafd697d2f: Support staging over Tramp
branch: externals/diff-hl commit dafd697d2f376275abdf457b0ec7f5bceafd0aab Author: Dmitry Gutov Commit: Dmitry Gutov Support staging over Tramp Fixes #234 --- diff-hl.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff-hl.el b/diff-hl.el index ea8ae4d8b6..61d8f49c26 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/dgutov/diff-hl ;; Keywords: vc, diff ;; Version: 1.10.0 -;; Package-Requires: ((cl-lib "0.2") (emacs "25.1")) +;; Package-Requires: ((cl-lib "0.2") (emacs "26.1")) ;; This file is part of GNU Emacs. @@ -761,7 +761,7 @@ its end position." (user-error "Only Git supports staging; this file is controlled by %s" backend (defun diff-hl-stage-diff (orig-buffer) - (let ((patchfile (make-temp-file "diff-hl-stage-patch")) + (let ((patchfile (make-nearby-temp-file "diff-hl-stage-patch")) success) (write-region (point-min) (point-max) patchfile nil 'silent) @@ -769,7 +769,7 @@ its end position." (with-current-buffer orig-buffer (with-output-to-string (vc-git-command standard-output 0 -patchfile +(file-local-name patchfile) "apply" "--cached" ) (setq success t))) (delete-file patchfile))
