[elpa] externals/llm 5c55130836: Add streaming tool calls for Ollama (#199)
branch: externals/llm commit 5c5513083669f84c2119e6cfdfd754fb0660158c Author: Andrew Hyatt Commit: GitHub Add streaming tool calls for Ollama (#199) Partially fixes https://github.com/ahyatt/llm/issues/198 - Co-authored-by: Andrew Hyatt --- NEWS.org | 2 ++ llm-ollama.el | 60 +++ 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/NEWS.org b/NEWS.org index 43a7631be1..ca626ab994 100644 --- a/NEWS.org +++ b/NEWS.org @@ -1,6 +1,8 @@ * Version 0.26.1 - Add Claude 4 models - Fix error using Open AI for batch embeddings +- Add streaming tool calls for Ollama +- Fix Ollama tool-use booleans * Version 0.26.0 - Call tools with =nil= when called with false JSON values. - Fix bug in ollama batch embedding generation. diff --git a/llm-ollama.el b/llm-ollama.el index ddf13f53f6..ef708c21cb 100644 --- a/llm-ollama.el +++ b/llm-ollama.el @@ -186,9 +186,6 @@ These are just the text inside the tag, not the tag itself.")) (llm-chat-prompt-interactions prompt (setq request-plist (plist-put request-plist :messages messages)) (setq request-plist (plist-put request-plist :model (llm-ollama-chat-model provider))) -(when (and streaming (llm-chat-prompt-tools prompt)) - (signal 'not-implemented - "Ollama does not support streaming with function calls")) (when (llm-chat-prompt-tools prompt) (setq request-plist (plist-put request-plist :tools @@ -228,7 +225,8 @@ These are just the text inside the tag, not the tag itself.")) (vconcat (mapcar (lambda (tool-use) `(:function (:name ,(llm-provider-utils-tool-use-name tool-use) :arguments ,(json-serialize - (llm-provider-utils-tool-use-args tool-use) + (llm-provider-utils-tool-use-args tool-use) + :false-object :json-false tool-uses (cl-defmethod llm-provider-streaming-media-handler ((_ llm-ollama) receiver _) @@ -236,25 +234,39 @@ These are just the text inside the tag, not the tag itself.")) (plz-media-type:application/x-ndjson :handler (let ((in-reasoning)) (lambda (data) - (when-let ((response (assoc-default -'content -(assoc-default 'message data -;; The response from ollama should just have the tag and -;; nothing more. -(cond - ((string-match (rx - (seq "<" - (eval `(or ,@llm-ollama-reasoning-tags)) - ">")) response) - (setq in-reasoning t)) - ((string-match (rx - (seq "")) response) - (setq in-reasoning nil)) - (t (funcall receiver (list (if in-reasoning -:reasoning - :text) response)) + (let* ((message (assoc-default 'message data)) + (text (assoc-default 'content message)) + (tool-call (assoc-default 'tool_calls message)) + (response nil)) +(when (and text (> (length text) 0)) + ;; The response from ollama should just have the tag and + ;; nothing more. + (cond + ((string-match (rx + (seq "<" +(eval `(or ,@llm-ollama-reasoning-tags)) +">")) text) +(setq in-reasoning t)) + ((string-match (rx + (seq "")) text) +(setq in-reasoning nil)) + (t +(setq response + (plist-put response (if in-reasoning :reasoning :text) text) +(when tool-call + (setq response +(plist-put response :tool-uses-raw + (aref tool-call 0 +(funcall receiver response))) + +(cl-defmethod llm-provider-collect-streaming-tool-uses ((_ llm-ollama) data) + (mapcar (lambda (fc
[nongnu] elpa/clojure-ts-mode updated (33e31bb3d5 -> 8e57ba78e1)
elpasync pushed a change to branch elpa/clojure-ts-mode. from 33e31bb3d5 Tweak wording new bd08cd0261 Release 0.5 new 8e57ba78e1 Bump the development version Summary of changes: CHANGELOG.md | 2 ++ clojure-ts-mode.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
[nongnu] elpa/clojure-ts-mode 8e57ba78e1 2/2: Bump the development version
branch: elpa/clojure-ts-mode commit 8e57ba78e14c1b165c8cb2e619dfb3cbbf46d742 Author: Bozhidar Batsov Commit: Bozhidar Batsov Bump the development version --- clojure-ts-mode.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el index 6930a54dc6..15dfef69c9 100644 --- a/clojure-ts-mode.el +++ b/clojure-ts-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Bozhidar Batsov ;; URL: http://github.com/clojure-emacs/clojure-ts-mode ;; Keywords: languages clojure clojurescript lisp -;; Version: 0.5.0 +;; Version: 0.6.0-snapshot ;; Package-Requires: ((emacs "30.1")) ;; This file is not part of GNU Emacs. @@ -74,7 +74,7 @@ :link '(emacs-commentary-link :tag "Commentary" "clojure-mode")) (defconst clojure-ts-mode-version - "0.5.0" + "0.6.0-snapshot" "The current version of `clojure-ts-mode'.") (defcustom clojure-ts-comment-macro-font-lock-body nil
[nongnu] elpa/clojure-ts-mode bd08cd0261 1/2: Release 0.5
branch: elpa/clojure-ts-mode commit bd08cd02612507c4012d078eb94ccd7aa9b567b1 Author: Bozhidar Batsov Commit: Bozhidar Batsov Release 0.5 --- CHANGELOG.md | 2 ++ clojure-ts-mode.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15471275d6..09b696c3e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## main (unreleased) +## 0.5.0 (2025-06-04) + - [#96](https://github.com/clojure-emacs/clojure-ts-mode/pull/96): Highlight function name properly in `extend-protocol` form. - [#96](https://github.com/clojure-emacs/clojure-ts-mode/pull/96): Add support for extend-protocol forms to `clojure-ts-add-arity` refactoring command. diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el index d828571775..6930a54dc6 100644 --- a/clojure-ts-mode.el +++ b/clojure-ts-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Bozhidar Batsov ;; URL: http://github.com/clojure-emacs/clojure-ts-mode ;; Keywords: languages clojure clojurescript lisp -;; Version: 0.5.0-snapshot +;; Version: 0.5.0 ;; Package-Requires: ((emacs "30.1")) ;; This file is not part of GNU Emacs. @@ -74,7 +74,7 @@ :link '(emacs-commentary-link :tag "Commentary" "clojure-mode")) (defconst clojure-ts-mode-version - "0.5.0-snapshot" + "0.5.0" "The current version of `clojure-ts-mode'.") (defcustom clojure-ts-comment-macro-font-lock-body nil
[elpa] externals/doric-themes updated (606d3e507d -> f69e39b44e)
elpasync pushed a change to branch externals/doric-themes. from 606d3e507d Make change-log-list use a bold+italic style new b697f52ed2 Add support for M-x woman faces new 0293a9c101 Add support for M-x man faces new f69e39b44e Refine the colour of icon "dir" faces Summary of changes: doric-themes.el | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-)
[elpa] externals/dicom 33ef616725: Version 0.6
branch: externals/dicom commit 33ef616725fb65270aecda68362caf1eaf8cbe07 Author: Daniel Mendler Commit: Daniel Mendler Version 0.6 --- dicom.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dicom.el b/dicom.el index b175e22d90..2620f3be1f 100644 --- a/dicom.el +++ b/dicom.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2024 -;; Version: 0.5 +;; Version: 0.6 ;; Package-Requires: ((emacs "28.1") (compat "30")) ;; URL: https://github.com/minad/dicom ;; Keywords: multimedia, hypermedia, files
[elpa] externals/doric-themes 0293a9c101 2/3: Add support for M-x man faces
branch: externals/doric-themes commit 0293a9c1012d95496cbcb4c14e5a6a77b9415c50 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for M-x man faces --- doric-themes.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doric-themes.el b/doric-themes.el index af1614b5d6..0296ecdac2 100644 --- a/doric-themes.el +++ b/doric-themes.el @@ -912,6 +912,7 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." magit-section-heading magit-signature-good magit-tag +Man-overstrike markdown-header-face-1 markdown-header-face-2 markdown-header-face-3 @@ -1166,6 +1167,7 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." font-latex-underline-face gnus-emphasis-highlight-words lazy-highlight +Man-underline notmuch-tag-added orderless-match-face-0 orderless-match-face-1
[elpa] externals/marginalia updated (ad490aa86d -> 51ad7dd521)
elpasync pushed a change to branch externals/marginalia. from ad490aa86d Add marginalia-cycle to context menu for accessibility new 4e8ca26f3e marginalia--completion-metadata: Check for minibufferp new 151ac0abd7 Version 2.1 new 51ad7dd521 Revert "marginalia--completion-metadata: Check for minibufferp" Summary of changes: CHANGELOG.org | 2 +- marginalia.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[elpa] externals/marginalia 151ac0abd7 2/3: Version 2.1
branch: externals/marginalia commit 151ac0abd70da0fc4cae753e2ac156bbaa10d317 Author: Daniel Mendler Commit: Daniel Mendler Version 2.1 --- CHANGELOG.org | 2 +- marginalia.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 6ca0599ff0..8e3954c56d 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,7 +2,7 @@ #+author: Omar Antolín Camarena, Daniel Mendler #+language: en -* Development +* Version 2.1 (2025-06-04) - Rename =marginalia-annotator-registry= to =marginalia-annotators= for consistency with =marginalia-classifiers=. diff --git a/marginalia.el b/marginalia.el index c86cb4f34c..9e60cd3aed 100644 --- a/marginalia.el +++ b/marginalia.el @@ -5,7 +5,7 @@ ;; Author: Omar Antolín Camarena , Daniel Mendler ;; Maintainer: Omar Antolín Camarena , Daniel Mendler ;; Created: 2020 -;; Version: 2.0 +;; Version: 2.1 ;; Package-Requires: ((emacs "28.1") (compat "30")) ;; URL: https://github.com/minad/marginalia ;; Keywords: docs, help, matching, completion
[elpa] externals/marginalia 51ad7dd521 3/3: Revert "marginalia--completion-metadata: Check for minibufferp"
branch: externals/marginalia commit 51ad7dd5217794df1d62c5aab521db3f32806bb2 Author: Daniel Mendler Commit: Daniel Mendler Revert "marginalia--completion-metadata: Check for minibufferp" This reverts commit 4e8ca26f3ebcc5821c71871200fd0a03bff060ab. --- marginalia.el | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/marginalia.el b/marginalia.el index 9e60cd3aed..1e19bb27ee 100644 --- a/marginalia.el +++ b/marginalia.el @@ -1350,10 +1350,9 @@ Remember `this-command' for `marginalia-classify-by-command-name'." "Get completion metadata." (let* ((end (minibuffer-prompt-end)) (pt (max 0 (- (point) end -(and (minibufferp) - (completion-metadata (buffer-substring-no-properties end (+ end pt)) - minibuffer-completion-table - minibuffer-completion-predicate +(completion-metadata (buffer-substring-no-properties end (+ end pt)) + minibuffer-completion-table + minibuffer-completion-predicate))) (defun marginalia--builtin-annotator-p (md) "Builtin annotator available in metadata MD?"
[nongnu] elpa/helm updated (82d35e2cd6 -> 8888deac01)
elpasync pushed a change to branch elpa/helm. from 82d35e2cd6 Change default prefix bindings for helm-action-at-nth-* new 9a236ef67f Allow using a pref arg toggle visible mark fns new deac01 Fallback to current-buffer in helm-multi-occur-1 Summary of changes: helm-core.el | 14 -- helm-occur.el | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-)
[nongnu] elpa/helm 8888deac01 2/2: Fallback to current-buffer in helm-multi-occur-1
branch: elpa/helm commit deac013cc6441c661710f1b0b72f7f47d2e1 Author: Thierry Volpiatto Commit: Thierry Volpiatto Fallback to current-buffer in helm-multi-occur-1 This is needed when the function is not called from Helm and Helm has not already started, this trigger an error because helm-current-buffer is nil at this point and get-buffer fails. --- helm-occur.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-occur.el b/helm-occur.el index 0f3e42e0cf..fc1486a3e7 100644 --- a/helm-occur.el +++ b/helm-occur.el @@ -414,7 +414,7 @@ helm-occur will start immediately with DEFAULT as INPUT. Always prefer using DEFAULT instead of INPUT, they have the same effect but DEFAULT keep the minibuffer empty, allowing the user to write immediately without having to delete its contents before." - (let* ((curbuf (get-buffer helm-current-buffer)) + (let* ((curbuf (get-buffer (or helm-current-buffer (current-buffer (bufs (if (or helm-occur-always-search-in-current (memql curbuf buffers)) (cons curbuf (remove curbuf buffers))
[nongnu] elpa/gnuplot 868c992c38: Version 0.10
branch: elpa/gnuplot commit 868c992c382955eb07db985e0b2cc9f152076125 Author: Daniel Mendler Commit: Daniel Mendler Version 0.10 --- CHANGELOG.org | 2 +- gnuplot.el| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 19e8b82a3e..46b39f96ed 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -1,6 +1,6 @@ #+TITLE: Changelog for =gnuplot.el= -* Development +* Version 0.10 (2025-06-04) - Add =interactive= mode specifications to commands, such that only relevant commands are shown in =M-X=. diff --git a/gnuplot.el b/gnuplot.el index c383a06bf2..a562a0a9b5 100644 --- a/gnuplot.el +++ b/gnuplot.el @@ -5,7 +5,7 @@ ;; Author: Jon Oddie, Bruce Ravel, Phil Type ;; Maintainer: Maxime Tréca , Daniel Mendler ;; Created: 1998 -;; Version: 0.9 +;; Version: 0.10 ;; Keywords: data gnuplot plotting ;; URL: https://github.com/emacs-gnuplot/gnuplot ;; Package-Requires: ((emacs "28.1") (compat "30"))
[elpa] externals/marginalia 4e8ca26f3e 1/3: marginalia--completion-metadata: Check for minibufferp
branch: externals/marginalia commit 4e8ca26f3ebcc5821c71871200fd0a03bff060ab Author: Daniel Mendler Commit: Daniel Mendler marginalia--completion-metadata: Check for minibufferp --- marginalia.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/marginalia.el b/marginalia.el index 3d818b3e88..c86cb4f34c 100644 --- a/marginalia.el +++ b/marginalia.el @@ -1350,9 +1350,10 @@ Remember `this-command' for `marginalia-classify-by-command-name'." "Get completion metadata." (let* ((end (minibuffer-prompt-end)) (pt (max 0 (- (point) end -(completion-metadata (buffer-substring-no-properties end (+ end pt)) - minibuffer-completion-table - minibuffer-completion-predicate))) +(and (minibufferp) + (completion-metadata (buffer-substring-no-properties end (+ end pt)) + minibuffer-completion-table + minibuffer-completion-predicate (defun marginalia--builtin-annotator-p (md) "Builtin annotator available in metadata MD?"
[elpa] externals/doric-themes b697f52ed2 1/3: Add support for M-x woman faces
branch: externals/doric-themes commit b697f52ed26ecd76f37632496eb17ead83f675d6 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for M-x woman faces --- doric-themes.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doric-themes.el b/doric-themes.el index cb11e45bbc..af1614b5d6 100644 --- a/doric-themes.el +++ b/doric-themes.el @@ -663,6 +663,7 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." which-key-command-description-face widget-button widget-button-pressed +woman-addition ztreep-node-face)) (defconst doric-themes-main-foreground-only-faces @@ -980,6 +981,7 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." vc-needs-update-state vc-removed-state which-func +woman-bold world-clock-label xref-file-header ztreep-diff-header-face @@ -1146,6 +1148,7 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." which-key-docstring-face which-key-group-description-face which-key-local-map-description-face +woman-italic ztreep-node-count-children-face)) (defconst doric-themes-underline-emphasis-faces
[elpa] externals/doric-themes f69e39b44e 3/3: Refine the colour of icon "dir" faces
branch: externals/doric-themes commit f69e39b44eee32d6eca698e4c87c78f788781647 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Refine the colour of icon "dir" faces --- doric-themes.el | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/doric-themes.el b/doric-themes.el index 0296ecdac2..fcbb067c94 100644 --- a/doric-themes.el +++ b/doric-themes.el @@ -344,7 +344,10 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." substitute-match)) (defconst doric-themes-intense-shadow-foreground-only-faces - '(calendar-month-header + '(all-the-icons-completion-dir-face +all-the-icons-dired-dir-face +all-the-icons-ibuffer-dir-face +calendar-month-header change-log-date denote-faces-date denote-faces-day @@ -367,6 +370,9 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." magit-log-author magit-log-date marginalia-date +nerd-icons-completion-dir-face +nerd-icons-dired-dir-face +nerd-icons-ibuffer-dir-face notmuch-search-date org-agenda-calendar-daterange org-agenda-column-dateline @@ -427,13 +433,11 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." (defconst doric-themes-subtle-shadow-foreground-only-faces '(all-the-icons-blue all-the-icons-blue-alt -all-the-icons-completion-dir-face all-the-icons-cyan all-the-icons-cyan-alt all-the-icons-dblue all-the-icons-dcyan all-the-icons-dgreen -all-the-icons-dired-dir-face all-the-icons-dmaroon all-the-icons-dorange all-the-icons-dpink @@ -442,6 +446,9 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." all-the-icons-dsilver all-the-icons-dyellow all-the-icons-green +all-the-icons-ibuffer-file-face +all-the-icons-ibuffer-mode-face +all-the-icons-ibuffer-size-face all-the-icons-lblue all-the-icons-lcyan all-the-icons-lgreen @@ -543,13 +550,11 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." mu4e-header-face nerd-icons-blue nerd-icons-blue-alt -nerd-icons-completion-dir-face nerd-icons-cyan nerd-icons-cyan-alt nerd-icons-dblue nerd-icons-dcyan nerd-icons-dgreen -nerd-icons-dired-dir-face nerd-icons-dmaroon nerd-icons-dorange nerd-icons-dpink @@ -558,6 +563,9 @@ Run `doric-themes-after-load-theme-hook' after loading a theme." nerd-icons-dsilver nerd-icons-dyellow nerd-icons-green +nerd-icons-ibuffer-file-face +nerd-icons-ibuffer-mode-face +nerd-icons-ibuffer-size-face nerd-icons-lblue nerd-icons-lcyan nerd-icons-lgreen
[nongnu] elpa/helm 82d35e2cd6: Change default prefix bindings for helm-action-at-nth-*
branch: elpa/helm commit 82d35e2cd674b3ac2bced7477e3dd162720ab436 Author: Thierry Volpiatto Commit: Thierry Volpiatto Change default prefix bindings for helm-action-at-nth-* --- helm-core.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-core.el b/helm-core.el index 183a942736..794aa19957 100644 --- a/helm-core.el +++ b/helm-core.el @@ -540,7 +540,7 @@ Default to Helm group when group is not defined in source." (set var val) (helm--action-at-nth-set-fn-1 val)) -(defcustom helm-action-at-nth-negative-prefix-key "C-x %d" +(defcustom helm-action-at-nth-negative-prefix-key "M-%d" "The prefix key to execute default action on nth <-n> candidate. This is a format spec where %d will be replaced by the candidate @@ -554,7 +554,7 @@ customize for immediate effect." :type 'string :set #'helm--action-at-nth-set-fn-) -(defcustom helm-action-at-nth-positive-prefix-key "C-c %d" +(defcustom helm-action-at-nth-positive-prefix-key "C-%d" "The prefix key to execute default action on nth <+n> candidate. This is a format spec where %d will be replaced by the candidate
[nongnu] elpa/helm 9a236ef67f 1/2: Allow using a pref arg toggle visible mark fns
branch: elpa/helm commit 9a236ef67f08b96e200fc18b062b0f89bbcceeab Author: Thierry Volpiatto Commit: Thierry Volpiatto Allow using a pref arg toggle visible mark fns --- helm-core.el | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/helm-core.el b/helm-core.el index 794aa19957..87f10eef7a 100644 --- a/helm-core.el +++ b/helm-core.el @@ -7653,13 +7653,15 @@ If ARG is negative toggle backward." helm-left-margin-width))) (put 'helm-toggle-visible-mark 'helm-only t) -(defun helm-toggle-visible-mark-forward () - (interactive) - (helm-toggle-visible-mark 1)) +(defun helm-toggle-visible-mark-forward (&optional arg) + "Toggle visible mark forward ARG times." + (interactive "p") + (helm-toggle-visible-mark arg)) -(defun helm-toggle-visible-mark-backward () - (interactive) - (helm-toggle-visible-mark -1)) +(defun helm-toggle-visible-mark-backward (&optional arg) + "Toggle visible mark backward ARG times." + (interactive "p") + (helm-toggle-visible-mark (- arg))) (defun helm-file-completion-source-p (&optional source) "Return non-nil if current source is a file completion source."
[elpa] externals/greenbar updated (75e079dad7 -> 755163adea)
mmaug pushed a change to branch externals/greenbar. from 75e079dad7 ; Prefer HTTPS to HTTP in URLs new 7b651257bd * greenbar.el (greenbar-lighter): Add custom variable Update copyright, package requirements, and commentary new dcad9ad5c3 * externals/greenbar/.elpaignore: Add new 755163adea * externals/greenbar/README.org: Add package description * externals/greenbar/snapshots/: Add sample screenshots Summary of changes: .elpaignore| 4 + README.org | 117 greenbar.el| 30 +++-- snapshots/gen-snapshots.sh | 264 + snapshots/graybar-dark-long.png| Bin 0 -> 46472 bytes snapshots/graybar-dark-short.png | Bin 0 -> 64541 bytes snapshots/graybar-light-long.png | Bin 0 -> 47178 bytes snapshots/graybar-light-short.png | Bin 0 -> 63920 bytes snapshots/greenbar-dark-long.png | Bin 0 -> 44502 bytes snapshots/greenbar-dark-short.png | Bin 0 -> 64524 bytes snapshots/greenbar-light-long.png | Bin 0 -> 46947 bytes snapshots/greenbar-light-short.png | Bin 0 -> 64506 bytes snapshots/rainbow-dark-long.png| Bin 0 -> 44810 bytes snapshots/rainbow-dark-short.png | Bin 0 -> 64810 bytes snapshots/rainbow-light-long.png | Bin 0 -> 46051 bytes snapshots/rainbow-light-short.png | Bin 0 -> 64852 bytes 16 files changed, 405 insertions(+), 10 deletions(-) create mode 100644 .elpaignore create mode 100644 README.org create mode 100755 snapshots/gen-snapshots.sh create mode 100644 snapshots/graybar-dark-long.png create mode 100644 snapshots/graybar-dark-short.png create mode 100644 snapshots/graybar-light-long.png create mode 100644 snapshots/graybar-light-short.png create mode 100644 snapshots/greenbar-dark-long.png create mode 100644 snapshots/greenbar-dark-short.png create mode 100644 snapshots/greenbar-light-long.png create mode 100644 snapshots/greenbar-light-short.png create mode 100644 snapshots/rainbow-dark-long.png create mode 100644 snapshots/rainbow-dark-short.png create mode 100644 snapshots/rainbow-light-long.png create mode 100644 snapshots/rainbow-light-short.png
[elpa] externals/greenbar 7b651257bd 1/3: * greenbar.el (greenbar-lighter): Add custom variable
branch: externals/greenbar
commit 7b651257bd0536d454f4b896212b3fe1f8c75024
Author: Michael R. Mauger
Commit: Michael R. Mauger
* greenbar.el (greenbar-lighter): Add custom variable
Update copyright, package requirements, and commentary
---
greenbar.el | 30 --
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/greenbar.el b/greenbar.el
index 804bb5b3c3..43bdb6dac6 100644
--- a/greenbar.el
+++ b/greenbar.el
@@ -1,10 +1,12 @@
;;; greenbar.el --- Mark comint output with "greenbar" background -*-
lexical-binding: t -*-
-;; Copyright (C) 2013-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2025 Free Software Foundation, Inc.
;; Author: Michael R. Mauger
-;; Version: 1.1
+;; Version: 1.2
+;; SPDX-License-Identifier: GPL-3.0-or-later
;; Package-Type: simple
+;; Package-Requires: ((emacs "27.1"))
;; Keywords: faces, terminals
;; This program is free software; you can redistribute it and/or modify
@@ -46,11 +48,10 @@
;; the desired derived mode hook. Adding `greenbar-mode' to
;; `comint-mode-hook' enables it for all comint derived modes.
-;; The variable `greenbar-color-theme' is a list of predefined bar
-;; background colors. Each element of the list is a list: the first
-;; member of which is a symbol that is the name of the theme; the rest
-;; of the list are color names which are used as background colors for
-;; successive bands of lines.
+;; The variable `greenbar-color-theme' is an Alist of predefined bar
+;; background colors. Each element of the Alist consists of a symbol
+;; that is the name of the theme; the rest of the list are color names
+;; which are used as background colors for successive bands of lines.
;; The variable `greenbar-color-list' controls which set of color bars
;; are to be applied. The value is either a name from color theme
@@ -115,7 +116,16 @@ theme followed by the list bar colors.")
(defcustom greenbar-highlight-input nil
"Should prompts and command input be highlighted."
- :type 'booleanp)
+ :type 'boolean)
+
+(defcustom greenbar-lighter
+ (let* ((greenbar (assq 'greenbar greenbar-color-themes))
+ (bg (nth 1 greenbar))
+ (fg (nth 2 greenbar)))
+(propertize "\N{Heavy Horizontal Fill}"
+'font-lock-face `(:foreground ,fg :background ,bg)))
+ "The minor mode lighter that appears in the mode line."
+ :type 'string)
(defun greenbar-color-list ()
"Get the list of greenbar background colors."
@@ -198,8 +208,8 @@ set of background colors found in
;;;###autoload
(define-minor-mode greenbar-mode
- "Enable \"green bar striping\" of comint output"
- :lighter nil
+ "Enable \"green bar striping\" of comint output."
+ :lighter greenbar-lighter
(if greenbar-mode
(add-hook 'comint-output-filter-functions
#'greenbar-output-filter t t)
[elpa] externals/greenbar dcad9ad5c3 2/3: * externals/greenbar/.elpaignore: Add
branch: externals/greenbar commit dcad9ad5c301daecacb5e54c006f7be989dacd37 Author: Michael R. Mauger Commit: Michael R. Mauger * externals/greenbar/.elpaignore: Add --- .elpaignore | 4 1 file changed, 4 insertions(+) diff --git a/.elpaignore b/.elpaignore new file mode 100644 index 00..cc9e39c03e --- /dev/null +++ b/.elpaignore @@ -0,0 +1,4 @@ +.elpaignore +.git +.gitignore +snapshots/
[elpa] externals/greenbar 755163adea 3/3: * externals/greenbar/README.org: Add package description
branch: externals/greenbar commit 755163adea1480d3ee85ace02987456d92992d70 Author: Michael R. Mauger Commit: Michael R. Mauger * externals/greenbar/README.org: Add package description * externals/greenbar/snapshots/: Add sample screenshots --- README.org | 117 snapshots/gen-snapshots.sh | 264 + snapshots/graybar-dark-long.png| Bin 0 -> 46472 bytes snapshots/graybar-dark-short.png | Bin 0 -> 64541 bytes snapshots/graybar-light-long.png | Bin 0 -> 47178 bytes snapshots/graybar-light-short.png | Bin 0 -> 63920 bytes snapshots/greenbar-dark-long.png | Bin 0 -> 44502 bytes snapshots/greenbar-dark-short.png | Bin 0 -> 64524 bytes snapshots/greenbar-light-long.png | Bin 0 -> 46947 bytes snapshots/greenbar-light-short.png | Bin 0 -> 64506 bytes snapshots/rainbow-dark-long.png| Bin 0 -> 44810 bytes snapshots/rainbow-dark-short.png | Bin 0 -> 64810 bytes snapshots/rainbow-light-long.png | Bin 0 -> 46051 bytes snapshots/rainbow-light-short.png | Bin 0 -> 64852 bytes 14 files changed, 381 insertions(+) diff --git a/README.org b/README.org new file mode 100644 index 00..afb20bd3b6 --- /dev/null +++ b/README.org @@ -0,0 +1,117 @@ +#+TITLE: GreenBar +#+AUTHOR: Michael R. Mauger +#+EMAIL: mich...@mauger.com + +#+DATE: [Tue May 27 19:35:08 EDT 2025] +#+SPDX-License-Identifier: GPL-3.0-or-later +#+SPDX-FileCopyrightText: Copyright 2025 Free Software Foundation, Inc. + +* Summary +For us old neck beards, who learned to write software on punch cards +and print out our code and output on wide line printers, it was +helpful to have alternating bands of subtle background coloring to +guide our eyes across the line on the page. Reading long rows of text +across a 14 7/8" page, it was very easy to loose your place vertically +while scanning the page horizontally. The subtle background shading +was often done with pale bands of green alternating with the white of +the paper. + +Paper pre-printed with the pale green bars was often referred to as +"green bar" and the technique is also referred to as "zebra striping." +In Emacs, in ~ps-print.el~ (PostScript print facility), the feature is +enabling with the ~ps-zebra-stripes~ setting. + +To enable ~greenbar-mode~ in your ~comint-mode~ buffers, add the +following to your Emacs configuration: + +#+BEGIN_SRC emacs-lisp + (add-hook 'comint-mode-hook #'greenbar-mode) +#+END_SRC + +If you want to enable ~greenbar-mode~ only in a single mode derived +from ~comint-mode~, then you need to add ~greenbar-mode~ only to the +desired derived mode hook. Adding ~greenbar-mode~ to +~comint-mode-hook~ enables it for all comint derived modes. + +The variable ~greenbar-color-theme~ is an Alist of predefined bar +background colors. Each element of the Alist consists of a symbol +that is the name of the theme; the rest of the list are color names +which are used as background colors for successive bands of lines. + +The variable ~greenbar-color-list~ controls which set of color bars +are to be applied. The value is either a name from color theme +defined in ~greenbar-color-themes~ or it is a list of color names. + +The variable ~greenbar-lines-per-bar~ controls how many output lines +are displayed using each band's background color. + +By default, input lines are not highlighted, but if +~greenbar-highlight-input~ is set to a non-nil value, then input is +also highlighted with green bars as well. + +Suggestions for other background color themes are always welcome. + +* Installation +Since this package is part of ELPA, it can be easily installed, and +then linking to ~comint~ buffers is easy. + +#+BEGIN_SRC emacs-lisp + (package-install 'greenbar) + (require 'greenbar) + + (setopt greenbar-lines-per-bar 3 + greenbar-background-colors 'greenbar + greenbar-highlight-inputnil) + + (add-hook 'comint-mode-hook #'greenbar-mode) +#+END_SRC + +Or, with ~use-package~: +#+BEGIN_SRC emacs-lisp + (use-package greenbar + +:custom +(greenbar-lines-per-bar 3) +(greenbar-background-colors 'greenbar) +(greenbar-highlight-inputnil) + +:hook comint-mode) +#+END_SRC + +* Examples +** ~greenbar~ theme +When you set ~greenbar-background-colors~ to ~greenbar~ + +*** Light background display mode +With a theme that has ~background-mode~ value of ~light~, here's what this +package will do to comint buffers. +[[file:./snapshots/greenbar-light-short.png]] +And +[[file:./snapshots/greenbar-light-long.png]] + +*** Dark background display theme +[[file:./snapshots/greenbar-dark-short.png]] +And +[[file:./snapshots/greenbar-dark-long.png]] + +** ~graybar~ +*** Light +[[file:./snapshots/graybar-light-short.png]] +And +[[file:./snapshots/graybar-light-long.png]] + +*** Dark +[[file:./snapshots/graybar-dark-short.png]] +And +[[file:./snapshots/graybar-dark-long.png]] + +** ~rainbow~ +*** Light +[[file:./snapshots/rainbow-light-short
[elpa] externals/minuet updated (b77fe73ace -> f69a3730bb)
elpasync pushed a change to branch externals/minuet. from b77fe73ace feat: make end point for gemini and claude configurable. new 13541c7fd2 doc: update README. new f69a3730bb doc: update README. Summary of changes: README.md | 3 +++ 1 file changed, 3 insertions(+)
[elpa] externals/minuet 13541c7fd2 1/2: doc: update README.
branch: externals/minuet commit 13541c7fd242a1a7cab8281fd0973c8ac091f5f9 Author: Milan Glacier Commit: Milan Glacier doc: update README. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2300c2565a..3af268da29 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,9 @@ as dancers move during a minuet.  +Note: Previewing insertion results within the buffer requires the +`consult` package. + **With overlay ghost text frontend**: 
[elpa] externals/minuet f69a3730bb 2/2: doc: update README.
branch: externals/minuet commit f69a3730bbc00240abbdaef760683439494e2baf Author: Milan Glacier Commit: Milan Glacier doc: update README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3af268da29..cb4332b125 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ as dancers move during a minuet. **With minibuffer frontend**: - - Note: Previewing insertion results within the buffer requires the `consult` package. + + **With overlay ghost text frontend**: 
[elpa] externals/marginalia 0e7097051c: Minor context menu improvement
branch: externals/marginalia commit 0e7097051cbcedcc4da9b633406291d4052ec0e4 Author: Daniel Mendler Commit: Daniel Mendler Minor context menu improvement --- marginalia.el | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/marginalia.el b/marginalia.el index 1e19bb27ee..6fbaa2f6a0 100644 --- a/marginalia.el +++ b/marginalia.el @@ -1392,8 +1392,10 @@ Remember `this-command' for `marginalia-classify-by-command-name'." if (or (not (eq fun 'builtin)) (marginalia--builtin-annotator-p md)) collect (vector - (capitalize (replace-regexp-in-string - ".*?-+annotate-+" "" (symbol-name fun))) + (thread-last (symbol-name fun) + (replace-regexp-in-string ".*?-+annotate-+" "") + (replace-regexp-in-string "-+" " ") + capitalize) (let ((i i)) (lambda () (interactive)
[elpa] externals/perl-doc 8641934da5: Feature: New user option perl-doc-window
branch: externals/perl-doc commit 8641934da5d611885a54c98c5d11e430d26a4109 Author: Harald Jörg Commit: Harald Jörg Feature: New user option perl-doc-window Controls whether new Perl documentation is displayed by splitting the current window (default), using the whole window, using a new frame each time or use a dedicated frame for perl-doc-mode buffers. Requested by https://github.com/HaraldJoerg/emacs-perl-doc/issues/3. --- ChangeLog | 30 ++ perl-doc.el | 42 +- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c62b079877..4db88b1fa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2025-06-04 Harald Jörg + + Trial version: + + * perl-doc.el: New user option 'perl-doc-window' + to control where perl-doc will display Perl documentation. + Requested in https://github.com/HaraldJoerg/emacs-perl-doc/issues/3. + +2023-08-05 Harald Jörg + + Version 0.81: + + * perl-doc.el (perl-doc--index-available-p): New function to + indicate whether we can run imenu. + * perl-doc.el (perl-doc--render-pod): Delete run of + `perl-doc--process-region' + (perl-doc): Make completion work in Emacs 27/28 (Fixes #2) + Recognize atan2 as a function (Fixes #1) + (perl-doc--speedbar-view-source): New function to view POD sources + from the speedbar menu + (perl-doc-speedbar-menu-items): Add menu items to view POD and its + source to the speedbar context menu + (perl-doc--insert-file-button): Don't show a "+" for modules if + imenu isn't available + * (perl-doc-speedbar-view-pod): Fix an error + discovered by relint + + * test/perl-doc-tests.el (perl-doc-test-process-links): Test one + more edge case from open.pm + 2022-09-29 Harald Jörg * perl-doc.el (perl-doc-with-L-grammar): Allow the vertical bar in diff --git a/perl-doc.el b/perl-doc.el index 0e45b1b553..359cbe7dbb 100644 --- a/perl-doc.el +++ b/perl-doc.el @@ -112,6 +112,23 @@ be used by the Perl interpreter." :group 'perl-doc :type '(repeat directory)) +(defcustom perl-doc-window 'default + "Where `perl-doc' displays Perl documentation. +same-window -- use the current window +frame -- use a new frame +same-frame -- reuse a frame already showing Perl documentation +default -- use the default selection of `pop-to-buffer'. +Any other value behaves like 'default'. +With the default setting, `perl-doc' can be customized to any desired +behavior by using the user options `display-buffer-alist' and +`display-buffer-base-action'." + :group 'perl-doc + :type '(radio + (const default) + (const same-window) + (const same-frame) + (const frame))) + (defvar perl-doc--debug nil "If non-nil, unrecognized POD links are reported to the message buffer. This is only relevant for developers, not for users.") @@ -541,8 +558,23 @@ function or a variable." (setq-local perl-doc-window-width (window-body-width (selected-window) t ;; Eventually, show the buffer and store current variables - (or noselect - (pop-to-buffer perldoc-buffer +(or noselect + (cond +((equal perl-doc-window 'same-window) + (pop-to-buffer-same-window perldoc-buffer)) +((equal perl-doc-window 'frame) + (pop-to-buffer perldoc-buffer +'((display-buffer-reuse-window + display-buffer-pop-up-frame) + (reusable-frames . visible +((equal perl-doc-window 'same-frame) + (pop-to-buffer perldoc-buffer +'((display-buffer-reuse-window + display-buffer-reuse-mode-window + display-buffer-pop-up-frame) + (mode . perl-doc-mode) + (reusable-frames . 0 +(t (pop-to-buffer perldoc-buffer)) ;;;###autoload (defun perl-doc (word &optional section) @@ -596,7 +628,7 @@ This retrieves the corresponding section from the perlfunc page. No completion is done (yet). Sorry." (interactive "MFunction name: ") (perl-doc--common topic 'perl-function)) - + ;;;###autoload (defun perl-doc-variable (topic) "Get Perl documentation for a builtin function WORD. @@ -604,7 +636,7 @@ This retrieves the corresponding section from the perlfunc page. No completion is done (yet). Sorry." (interactive "MVariable name: ") (perl-doc--common topic 'perl-variable)) - + ;;;###autoload (defun perl-doc-file (file) "Run `perl-doc' on FILE. @@ -1189,7 +1221,7 @@ already there, nil otherwise." (pcase topic ((pred perl-doc--language-documentation-p) "0:<.> Perl Language") - ((pred perl-doc--module-documentation-p) + ((pred perl-doc--module-docume
[elpa] externals/yasnippet c1e6ff23e9: Drop use of `yas--version' in doc/yas-doc-helper.el
branch: externals/yasnippet commit c1e6ff23e9af16b856c88dfaab9d3ad7b746ad37 Author: Xiyue Deng Commit: Xiyue Deng Drop use of `yas--version' in doc/yas-doc-helper.el - No longer available since 0.14.3 --- doc/yas-doc-helper.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el index 442bf8a0ee..1d3cf68514 100644 --- a/doc/yas-doc-helper.el +++ b/doc/yas-doc-helper.el @@ -199,7 +199,7 @@ But replace link to \"current\" page with a span element." ;;:with-broken-links mark :html-postamble ,(concat "Generated by %c from " - (or rev yas--version) " " date "\n" + rev " " date "\n" "%v\n"))) (project (assoc "yasnippet" org-publish-project-alist))) (when rev ;; Rakefile :doc:upload uses "html-revision".
