[elpa] externals/ellama 30058c4771 2/3: Bump version

[ELPA Syncer]

branch: externals/ellama
commit 30058c4771708e7ad0fa9d93fe0bd00c2889a483
Author: Sergey Kostyaev 
Commit: Sergey Kostyaev 

Bump version
---
 NEWS.org  | 5 +
 ellama.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS.org b/NEWS.org
index d8cd8e37d0..fef897c4ee 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,8 @@
+* Version 1.5.1
+- Renamed the variable ~ellama-transient-system~ to ~ellama-global-system~ to
+  reflect its broader scope and updated all references in ~ellama.el~,
+  ~ellama-transient.el~ and ~ellama-blueprint.el~. Moved it from
+  ellama-transient to ellama. Fix symbol’s value as variable is void bug.
 * Version 1.5.0
  Code Refactoring and Modularity
 - Moved transient menu-related functions and variables from ~ellama.el~ to
diff --git a/ellama.el b/ellama.el
index a67197c3c0..2772916ae5 100644
--- a/ellama.el
+++ b/ellama.el
@@ -6,7 +6,7 @@
 ;; URL: http://github.com/s-kostyaev/ellama
 ;; Keywords: help local tools
 ;; Package-Requires: ((emacs "28.1") (llm "0.22.0") (plz "0.8") (transient 
"0.7") (compat "29.1"))
-;; Version: 1.5.0
+;; Version: 1.5.1
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;; Created: 8th Oct 2023
 

[elpa] externals/ellama updated (e370c3f23a -> 91683e236a)

[ELPA Syncer]

elpasync pushed a change to branch externals/ellama.

  from  e370c3f23a Merge pull request #253 from 
s-kostyaev/user-defined-blueprints
   new  96ef755121 Rename ellama-transient-system to ellama-global-system
   new  30058c4771 Bump version
   new  91683e236a Merge pull request #279 from 
s-kostyaev/fix-ellama-transient-system


Summary of changes:
 NEWS.org|  5 +
 ellama-blueprint.el |  4 ++--
 ellama-transient.el | 13 ++---
 ellama.el   |  6 +++---
 4 files changed, 16 insertions(+), 12 deletions(-)

[elpa] externals/org 5cfc857c66: ob-lisp: Prefix cl: symbols explicitly

[ELPA Syncer]

branch: externals/org
commit 5cfc857c66e3ad7d4b70bb4a61f641c059994170
Author: Owen Radcliffe 
Commit: Ihor Radchenko 

ob-lisp: Prefix cl: symbols explicitly

* lisp/ob-lisp.el (org-babel-lisp-dir-fmt):
(org-babel-expand-body:lisp):
(org-babel-execute:lisp): Use explicit cl: prefix for wrapper code so
that ob-lisp.el can be used without being in a package that uses :cl.

Link: 
https://orgmode.org/list/caj87nk_d7edoaursu2pj00vngcj8vhak1jkvke2bqgogjp+...@mail.gmail.com

TINYCHANGE
---
 lisp/ob-lisp.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index ed5a4bb004..66e5373074 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -61,7 +61,7 @@ Valid values include `slime-eval' and `sly-eval'."
   :type 'symbol)
 
 (defcustom org-babel-lisp-dir-fmt
-  "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"
+  "(cl:let ((cl:*default-pathname-defaults* #P%S\n)) %%s\n)"
   "Format string used to wrap code bodies to set the current directory.
 For example a value of \"(progn ;; %s\\n   %%s)\" would ignore the
 current directory string."
@@ -77,10 +77,10 @@ current directory string."
  (prologue (cdr (assq :prologue params)))
  (epilogue (cdr (assq :epilogue params)))
 (body (if (null vars) (org-trim body)
-(concat "(let ("
+(concat "(cl:let ("
 (mapconcat
  (lambda (var)
-   (format "(%S (quote %S))" (car var) (cdr var)))
+   (format "(%S (cl:quote %S))" (car var) (cdr var)))
  vars "\n  ")
 ")\n"
  (and prologue (concat prologue "\n"))
@@ -89,7 +89,7 @@ current directory string."
  ")"
 (if (or (member "code" result-params)
(member "pp" result-params))
-   (format "(pprint %s)" body)
+   (format "(cl:pprint %s)" body)
   body)))
 
 (defun org-babel-execute:lisp (body params)
@@ -115,7 +115,7 @@ a property list containing the parameters of the block."
 default-directory)))
  (format
   (if dir (format org-babel-lisp-dir-fmt 
dir)
-"(progn %s\n)")
+"(cl:progn %s\n)")
   (buffer-substring-no-properties
(point-min) (point-max)
 (cdr (assq :package params)))

[nongnu] elpa/dirvish 515b599696 2/2: refactor(core): change format of preview buffer name

[ELPA Syncer]

branch: elpa/dirvish
commit 515b599696b262300508480aaa65ad27dc6e25d7
Author: Alex Lu 
Commit: Alex Lu 

refactor(core): change format of preview buffer name

Filename to the tail:

1. Easier for users to identify the filename's starting position.
2. Correctly retrieves the buffer file's icon.
---
 dirvish.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dirvish.el b/dirvish.el
index 82c98965fd..5ac0908116 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -844,8 +844,8 @@ filename or a string with format of `dirvish-fd-bufname'."
 (insert "\n\nFile truncated. End of partial preview.\n")))
 (setq buffer-file-name file)
 (goto-char (point-min))
-(rename-buffer (format "Preview: %s @DIRVISH-%s"
-   (file-name-nondirectory file) (dv-timestamp 
dv
+(rename-buffer (format "Preview@DIRVISH-%s :: %s"
+   (dv-timestamp dv) (file-name-nondirectory 
file
   (condition-case err
   (eval `(let ,(mapcar (lambda (env) `(,(car env) ,(cdr env)))
(remove '(delay-mode-hooks . t)

[elpa] externals-release/org bdf9f949d7: Update version number for the 9.7.25 release

[ELPA Syncer]

branch: externals-release/org
commit bdf9f949d75f24f064b83971a0bb6311b3915f81
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Update version number for the 9.7.25 release
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 58f16a9c78..ca089eae41 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.7.24
+;; Version: 9.7.25
 
 ;; This file is part of GNU Emacs.
 ;;

[elpa] externals/ellama 96ef755121 1/3: Rename ellama-transient-system to ellama-global-system

[ELPA Syncer]

branch: externals/ellama
commit 96ef75512199f93513612250d839ec1bd067dd4a
Author: Sergey Kostyaev 
Commit: Sergey Kostyaev 

Rename ellama-transient-system to ellama-global-system

Renamed the variable `ellama-transient-system` to `ellama-global-system` to
reflect its broader scope and updated all references in `ellama.el`,
`ellama-transient.el` and `ellama-blueprint.el`. Move it from 
ellama-transient to ellama.

Fix #278
---
 ellama-blueprint.el |  4 ++--
 ellama-transient.el | 13 ++---
 ellama.el   |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ellama-blueprint.el b/ellama-blueprint.el
index 896e6f86d1..83d6bbfe31 100644
--- a/ellama-blueprint.el
+++ b/ellama-blueprint.el
@@ -178,11 +178,11 @@ ARGS contains keys for fine control.
 (defun ellama-blueprint-edit-system-message ()
   "Edit system message as blueprint."
   (interactive)
-  (when ellama-transient-system
+  (when ellama-global-system
 (with-current-buffer (get-buffer-create ellama-blueprint-buffer)
   (erase-buffer)
   (let ((hard-newline t))
-   (insert ellama-transient-system)
+   (insert ellama-global-system)
(ellama-blueprint-mode))
   (switch-to-buffer (current-buffer))
   (ellama-blueprint-fill-variables
diff --git a/ellama-transient.el b/ellama-transient.el
index 6213244e24..2675e938f8 100644
--- a/ellama-transient.el
+++ b/ellama-transient.el
@@ -42,12 +42,11 @@
 (defvar ellama-transient-context-length 4096)
 (defvar ellama-transient-host "localhost")
 (defvar ellama-transient-port 11434)
-(defvar ellama-transient-system nil)
 
 (defun ellama-transient-system-show ()
   "Show transient system message."
   (format "System message (%s)"
-  (string-limit (car (string-lines ellama-transient-system))
+  (string-limit (car (string-lines ellama-global-system))
 ellama-transient-system-show-limit)))
 
 (transient-define-suffix ellama-transient-set-system ()
@@ -56,17 +55,17 @@ If a region is active, use the text within the region as 
the system message.
 Otherwise, prompt the user to enter a system message."
   (interactive)
   (if (region-active-p)
-  (setq ellama-transient-system (buffer-substring-no-properties
- (region-beginning) (region-end)))
+  (setq ellama-global-system (buffer-substring-no-properties
+  (region-beginning) (region-end)))
 (let* ((msg-string (read-string "Set system mesage: "))
(msg (when (not (string-empty-p msg-string)) msg-string)))
-  (setq ellama-transient-system msg
+  (setq ellama-global-system msg
 
 (defun ellama-transient-set-system-from-buffer ()
   "Set system message from current buffer."
   (interactive)
-  (setq ellama-transient-system (buffer-substring-no-properties
-(point-min) (point-max
+  (setq ellama-global-system (buffer-substring-no-properties
+ (point-min) (point-max
 
 (transient-define-suffix ellama-transient-set-ollama-model ()
   "Set ollama model name."
diff --git a/ellama.el b/ellama.el
index 27b70efb22..a67197c3c0 100644
--- a/ellama.el
+++ b/ellama.el
@@ -1145,7 +1145,7 @@ Otherwire return current active session."
 (with-current-buffer buf
   (ellama-collapse-org-quotes
 
-(defvar ellama-transient-system)
+(defvar ellama-global-system nil)
 
 (defun ellama-stream (prompt &rest args)
   "Query ellama for PROMPT.
@@ -1201,7 +1201,7 @@ failure (with BUFFER current).
 (donecb (or (plist-get args :on-done) #'ignore))
 (prompt-with-ctx (ellama-context-prompt-with-context prompt))
 (system (or (plist-get args :system)
-ellama-transient-system))
+ellama-global-system))
 (llm-prompt (if session
 (if (llm-chat-prompt-p (ellama-session-prompt session))
 (progn

[nongnu] elpa/dirvish updated (fa4987895f -> 515b599696)

[ELPA Syncer]

elpasync pushed a change to branch elpa/dirvish.

  from  fa4987895f chore: bump to 2.2.3
   new  836f605435 refactor: better support for `kill-current-buffer`
   new  515b599696 refactor(core): change format of preview buffer name


Summary of changes:
 README.org |  4 ++--
 dirvish.el | 16 +++-
 extensions/dirvish-side.el |  5 +++--
 3 files changed, 12 insertions(+), 13 deletions(-)

[elpa] externals/gnome-dark-style cbc4fbe8f2 3/3: chore: bump version to 0.2.2 (fix typo in function name)

[ELPA Syncer]

branch: externals/gnome-dark-style
commit cbc4fbe8f24ec28b5ca754c6022f60d09879d20c
Author: dimagid 
Commit: dimagid 

chore: bump version to 0.2.2 (fix typo in function name)
---
 README.org  | 2 +-
 gnome-dark-style.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 979bff33c8..6204bfbf96 100644
--- a/README.org
+++ b/README.org
@@ -1,7 +1,7 @@
 #+TITLE: gnome-dark-style.el
 #+AUTHOR: David Dimagid
 #+EMAIL: davidima...@gmail.com
-#+VERSION: 0.2.1
+#+VERSION: 0.2.2
 #+URL: https://github.com/dimagid/gnome-dark-style
 
 * Description
diff --git a/gnome-dark-style.el b/gnome-dark-style.el
index 2ea262c1cc..d618854e63 100644
--- a/gnome-dark-style.el
+++ b/gnome-dark-style.el
@@ -4,8 +4,8 @@
 
 ;; Author: David Dimagid 
 ;; Maintainer: David Dimagid 
-;; Version: 0.2.1
-;; Package-Version: 0.2.1
+;; Version: 0.2.2
+;; Package-Version: 0.2.2
 ;; URL: https://github.com/dimagid/gnome-dark-style
 ;; Package-Requires: ((emacs "30.1"))
 ;; Keywords: themes, gnome, sync, dark, light, color-scheme

[elpa] externals/gnome-dark-style updated (2d6bf27ee1 -> cbc4fbe8f2)

[ELPA Syncer]

elpasync pushed a change to branch externals/gnome-dark-style.

  from  2d6bf27ee1 docs: update README for version 0.2.1
   new  4b7bd94853 fix typo: replace "based-in" with "based-on"
   new  307d82cd68 Merge pull request #1 from sndb/fix-typo
   new  cbc4fbe8f2 chore: bump version to 0.2.2 (fix typo in function name)


Summary of changes:
 README.org  |  2 +-
 gnome-dark-style.el | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

[elpa] externals/gnome-dark-style 4b7bd94853 1/3: fix typo: replace "based-in" with "based-on"

[ELPA Syncer]

branch: externals/gnome-dark-style
commit 4b7bd948535b4b51065aaa0ccbb2658700fb014f
Author: sndb 
Commit: sndb 

fix typo: replace "based-in" with "based-on"
---
 gnome-dark-style.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnome-dark-style.el b/gnome-dark-style.el
index ebb5aa5e41..2ea262c1cc 100644
--- a/gnome-dark-style.el
+++ b/gnome-dark-style.el
@@ -63,7 +63,7 @@ If `gsettings' is not available, warn the user and return 
nil."
 nil))
 
 ;;;###autoload
-(defun gnome-set-theme-based-in-color-scheme ()
+(defun gnome-set-theme-based-on-color-scheme ()
   "Switch Emacs themes based on GNOME's color-scheme setting."
   (interactive)
   (let* ((gnome-color-scheme (get-gnome-color-scheme))
@@ -92,7 +92,7 @@ If `gsettings' is not available, warn the user and return 
nil."
   :command '("gsettings" "monitor" 
"org.gnome.desktop.interface" "color-scheme")
   :filter (lambda (process output)
 (when (string-match-p "color-scheme" output)
-  (gnome-set-theme-based-in-color-scheme))
+  (gnome-set-theme-based-on-color-scheme))
 ;; Mark the process as non-queryable on exit
 (set-process-query-on-exit-flag process nil)))
 
@@ -122,7 +122,7 @@ Manages a hook to stop monitoring on Emacs exit."
  gnome-light-theme)
 (t gnome-dark-theme
 (unless (member target-theme custom-enabled-themes)
-  (gnome-set-theme-based-in-color-scheme
+  (gnome-set-theme-based-on-color-scheme
   (when current-state
 (gnome-stop-color-scheme-monitor)
 (remove-hook 'kill-emacs-hook #'gnome-stop-color-scheme-monitor)

[elpa] externals/gnome-dark-style 307d82cd68 2/3: Merge pull request #1 from sndb/fix-typo

[ELPA Syncer]

branch: externals/gnome-dark-style
commit 307d82cd687931966313e5e61f4e8f14361f4615
Merge: 2d6bf27ee1 4b7bd94853
Author: dimagid 
Commit: GitHub 

Merge pull request #1 from sndb/fix-typo

fix typo: replace "based-in" with "based-on"
---
 gnome-dark-style.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnome-dark-style.el b/gnome-dark-style.el
index ebb5aa5e41..2ea262c1cc 100644
--- a/gnome-dark-style.el
+++ b/gnome-dark-style.el
@@ -63,7 +63,7 @@ If `gsettings' is not available, warn the user and return 
nil."
 nil))
 
 ;;;###autoload
-(defun gnome-set-theme-based-in-color-scheme ()
+(defun gnome-set-theme-based-on-color-scheme ()
   "Switch Emacs themes based on GNOME's color-scheme setting."
   (interactive)
   (let* ((gnome-color-scheme (get-gnome-color-scheme))
@@ -92,7 +92,7 @@ If `gsettings' is not available, warn the user and return 
nil."
   :command '("gsettings" "monitor" 
"org.gnome.desktop.interface" "color-scheme")
   :filter (lambda (process output)
 (when (string-match-p "color-scheme" output)
-  (gnome-set-theme-based-in-color-scheme))
+  (gnome-set-theme-based-on-color-scheme))
 ;; Mark the process as non-queryable on exit
 (set-process-query-on-exit-flag process nil)))
 
@@ -122,7 +122,7 @@ Manages a hook to stop monitoring on Emacs exit."
  gnome-light-theme)
 (t gnome-dark-theme
 (unless (member target-theme custom-enabled-themes)
-  (gnome-set-theme-based-in-color-scheme
+  (gnome-set-theme-based-on-color-scheme
   (when current-state
 (gnome-stop-color-scheme-monitor)
 (remove-hook 'kill-emacs-hook #'gnome-stop-color-scheme-monitor)

[elpa] externals/org-contacts b06a597368: Fix can't jump to contact in second file in `org-contacts-files`

[ELPA Syncer]

branch: externals/org-contacts
commit b06a59736800865b8a7e8d6d45774169cb31528a
Author: stardiviner 
Commit: stardiviner 

Fix can't jump to contact in second file in `org-contacts-files`
---
 org-contacts.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/org-contacts.el b/org-contacts.el
index fa64270006..9e3a25a9b4 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -979,11 +979,12 @@ This can be property key checking."
  (let ((buf (find-file-noselect (expand-file-name file
(with-current-buffer buf
  ;; NOTE: `org-goto-marker-or-bmk' will display buffer in current 
window, not follow `display-buffer' rule.
- (org-goto-marker-or-bmk (org-find-exact-headline-in-buffer 
contact-name))
- ;; FIXME: `goto-char' not physically move point in buffer.
- ;; (display-buffer buf '(display-buffer-below-selected))
- ;; (goto-char (org-find-exact-headline-in-buffer contact-name nil t))
- (org-fold-show-context
+ (when-let* ((found-contact (org-find-exact-headline-in-buffer 
contact-name)))
+   (org-goto-marker-or-bmk found-contact)
+   ;; FIXME: `goto-char' not physically move point in buffer.
+   ;; (display-buffer buf '(display-buffer-below-selected))
+   ;; (goto-char (org-find-exact-headline-in-buffer contact-name nil 
t))
+   (org-fold-show-context)
org-contacts-files))
 
 ;;;###autoload

[nongnu] elpa/dirvish c2fc22ed32: fix: amend last commit

[ELPA Syncer]

branch: elpa/dirvish
commit c2fc22ed3230e20ab042370b669d0883f0351292
Author: Alex Lu 
Commit: Alex Lu 

fix: amend last commit
---
 dirvish.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dirvish.el b/dirvish.el
index 5ac0908116..ea7578e99e 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -844,7 +844,7 @@ filename or a string with format of `dirvish-fd-bufname'."
 (insert "\n\nFile truncated. End of partial preview.\n")))
 (setq buffer-file-name file)
 (goto-char (point-min))
-(rename-buffer (format "Preview@DIRVISH-%s :: %s"
+(rename-buffer (format "PREVIEW|%s :: %s"
(dv-timestamp dv) (file-name-nondirectory 
file
   (condition-case err
   (eval `(let ,(mapcar (lambda (env) `(,(car env) ,(cdr env)))
@@ -900,8 +900,8 @@ filename or a string with format of `dirvish-fd-bufname'."
   (let* ((attrs (ignore-errors (file-attributes file)))
  (size (file-attribute-size attrs)) buf)
 (cond ((setq buf (get-buffer
-  (format "Preview: %s @DIRVISH-%s"
-  (file-name-nondirectory file) (dv-timestamp 
dv
+  (format "PREVIEW|%s :: %s"
+  (dv-timestamp dv) (file-name-nondirectory 
file
`(buffer . ,buf))
   ((not attrs)
`(info . ,(format "Can not get attributes of [ %s ]." file)))

[nongnu] elpa/llama 4d3141aceb: elisp-mode-syntax-propertize: Fix placement of meta comment

[ELPA Syncer]

branch: elpa/llama
commit 4d3141aceb70a1c672d1f4e9394037e2407d3a90
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

elisp-mode-syntax-propertize: Fix placement of meta comment
---
 llama.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llama.el b/llama.el
index 6d366c7f44..ba5bcf071b 100644
--- a/llama.el
+++ b/llama.el
@@ -272,9 +272,9 @@ explicitly specified `_%3'."
   ("##" (0 (when (nth 8 (syntax-ppss))
  (string-to-syntax "_"
   ;; }}
-  ;; Prevent the @ from becoming part of a following symbol.
   ;; {{ Preserve this part, even though it is absent from
   ;;this function in 29.1; backporting it by association.
+  ;; Prevent the @ from becoming part of a following symbol.
   (",@" (0 (unless (nth 8 (syntax-ppss))
  (string-to-syntax "'"
   ;; }}

[nongnu] elpa/gptel updated (db17b40806 -> 0a2fcb9528)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gptel.

  from  db17b40806 gptel-openai: Handle OpenRouter reasoning blocks
   new  3963afff60 gptel-org: Use gptel-org- prefix consistently
   new  0a2fcb9528 gptel-curl: Handle end of reasoning stream in other 
buffer


Summary of changes:
 gptel-curl.el |  9 +
 gptel-org.el  | 11 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

[nongnu] elpa/gptel 3963afff60 1/2: gptel-org: Use gptel-org- prefix consistently

[ELPA Syncer]

branch: elpa/gptel
commit 3963afff60cd30e179861971aadc0317e597dcad
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-org: Use gptel-org- prefix consistently

* gptel-org.el: (gptel--org-unescape-tool-results,
gptel--org-strip-tool-headers, gptel-org--create-prompt): Rename
to `gptel-org--unescape-tool-results' and
`gptel-org--strip-tool-headers'.
---
 gptel-org.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gptel-org.el b/gptel-org.el
index ace590e5cd..355d274cab 100644
--- a/gptel-org.el
+++ b/gptel-org.el
@@ -228,8 +228,8 @@ value of `gptel-org-branching-context', which see."
do (insert-buffer-substring org-buf start end)
(goto-char (point-min)))
   (goto-char (point-max))
-  (gptel--org-unescape-tool-results)
-  (gptel--org-strip-tool-headers)
+  (gptel-org--unescape-tool-results)
+  (gptel-org--strip-tool-headers)
   (let ((major-mode 'org-mode))
 (gptel--parse-buffer gptel-backend max-entries)
   ;; Create prompt the usual way
@@ -243,12 +243,13 @@ value of `gptel-org-branching-context', which see."
 (set (make-local-variable sym)
  (buffer-local-value sym org-buf)))
   (insert-buffer-substring org-buf beg end)
-  (gptel--org-unescape-tool-results)
-  (gptel--org-strip-tool-headers)
+  (gptel-org--unescape-tool-results)
+  (gptel-org--strip-tool-headers)
   (let ((major-mode 'org-mode))
 (gptel--parse-buffer gptel-backend max-entries)))
 
 (defun gptel--org-strip-tool-headers ()
+(defun gptel-org--strip-tool-headers ()
   "Remove all tool_call block headers and footers.
 Every line that matches will be removed entirely."
   (save-excursion
@@ -260,7 +261,7 @@ Every line that matches will be removed entirely."
   (delete-region (match-beginning 0)
  (min (point-max) (1+ (line-end-position)))
 
-(defun gptel--org-unescape-tool-results ()
+(defun gptel-org--unescape-tool-results ()
   "Undo escapes done to keep results from escaping blocks.
 Scans backward for gptel tool text property, reads the arguments, then
 unescapes the remainder."

[nongnu] elpa/gptel 8e0d6829c7 1/2: gptel-openai: Fix collision with openrouter parsing (#669)

[ELPA Syncer]

branch: elpa/gptel
commit 8e0d6829c759a338d8ee5f81b9523a9be9a514d4
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-openai: Fix collision with openrouter parsing (#669)

* gptel-openai.el (gptel-curl--parse-stream): Don't touch the
:reasoning key of fsm-info in OpenAI's `gptel-curl--parse-stream'
method unless using Openrouter.  This was causing collisions with
the parsing of responses from other OpenAI-compatible backends
that include the reasoning text in the main response field.

This whole code path is a kludge, it might be better to just spin
out a gptel-openrouter backend inheriting from gptel-openai.  This
would be similar to how gptel-deepseek works.
---
 gptel-openai.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gptel-openai.el b/gptel-openai.el
index a550f0c12d..ea32b254ea 100644
--- a/gptel-openai.el
+++ b/gptel-openai.el
@@ -230,7 +230,9 @@ information if the stream contains it."
   ;; old tool block continues, so continue collecting 
arguments in :partial_json 
   (push (plist-get func :arguments) (plist-get info 
:partial_json)
 ;; Check for reasoning blocks, currently only used by 
Openrouter
-(unless (eq (plist-get info :reasoning) 'done)
+;; FIXME: Should this be moved to a dedicated Openrouter 
backend?
+(unless (or (eq (plist-get info :reasoning) 'done)
+(not (plist-member delta :reasoning)))
   (if-let* ((reasoning-chunk (plist-get delta :reasoning)) 
;for openrouter
 ((not (eq reasoning-chunk :null
   (plist-put info :reasoning

[elpa] externals/ellama 91683e236a 3/3: Merge pull request #279 from s-kostyaev/fix-ellama-transient-system

[ELPA Syncer]

branch: externals/ellama
commit 91683e236a31cdb1551bdb941002e6d5c8e2c84a
Merge: e370c3f23a 30058c4771
Author: Sergey Kostyaev 
Commit: GitHub 

Merge pull request #279 from s-kostyaev/fix-ellama-transient-system

Rename ellama-transient-system to ellama-global-system
---
 NEWS.org|  5 +
 ellama-blueprint.el |  4 ++--
 ellama-transient.el | 13 ++---
 ellama.el   |  6 +++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index d8cd8e37d0..fef897c4ee 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,8 @@
+* Version 1.5.1
+- Renamed the variable ~ellama-transient-system~ to ~ellama-global-system~ to
+  reflect its broader scope and updated all references in ~ellama.el~,
+  ~ellama-transient.el~ and ~ellama-blueprint.el~. Moved it from
+  ellama-transient to ellama. Fix symbol’s value as variable is void bug.
 * Version 1.5.0
  Code Refactoring and Modularity
 - Moved transient menu-related functions and variables from ~ellama.el~ to
diff --git a/ellama-blueprint.el b/ellama-blueprint.el
index 896e6f86d1..83d6bbfe31 100644
--- a/ellama-blueprint.el
+++ b/ellama-blueprint.el
@@ -178,11 +178,11 @@ ARGS contains keys for fine control.
 (defun ellama-blueprint-edit-system-message ()
   "Edit system message as blueprint."
   (interactive)
-  (when ellama-transient-system
+  (when ellama-global-system
 (with-current-buffer (get-buffer-create ellama-blueprint-buffer)
   (erase-buffer)
   (let ((hard-newline t))
-   (insert ellama-transient-system)
+   (insert ellama-global-system)
(ellama-blueprint-mode))
   (switch-to-buffer (current-buffer))
   (ellama-blueprint-fill-variables
diff --git a/ellama-transient.el b/ellama-transient.el
index 6213244e24..2675e938f8 100644
--- a/ellama-transient.el
+++ b/ellama-transient.el
@@ -42,12 +42,11 @@
 (defvar ellama-transient-context-length 4096)
 (defvar ellama-transient-host "localhost")
 (defvar ellama-transient-port 11434)
-(defvar ellama-transient-system nil)
 
 (defun ellama-transient-system-show ()
   "Show transient system message."
   (format "System message (%s)"
-  (string-limit (car (string-lines ellama-transient-system))
+  (string-limit (car (string-lines ellama-global-system))
 ellama-transient-system-show-limit)))
 
 (transient-define-suffix ellama-transient-set-system ()
@@ -56,17 +55,17 @@ If a region is active, use the text within the region as 
the system message.
 Otherwise, prompt the user to enter a system message."
   (interactive)
   (if (region-active-p)
-  (setq ellama-transient-system (buffer-substring-no-properties
- (region-beginning) (region-end)))
+  (setq ellama-global-system (buffer-substring-no-properties
+  (region-beginning) (region-end)))
 (let* ((msg-string (read-string "Set system mesage: "))
(msg (when (not (string-empty-p msg-string)) msg-string)))
-  (setq ellama-transient-system msg
+  (setq ellama-global-system msg
 
 (defun ellama-transient-set-system-from-buffer ()
   "Set system message from current buffer."
   (interactive)
-  (setq ellama-transient-system (buffer-substring-no-properties
-(point-min) (point-max
+  (setq ellama-global-system (buffer-substring-no-properties
+ (point-min) (point-max
 
 (transient-define-suffix ellama-transient-set-ollama-model ()
   "Set ollama model name."
diff --git a/ellama.el b/ellama.el
index 27b70efb22..2772916ae5 100644
--- a/ellama.el
+++ b/ellama.el
@@ -6,7 +6,7 @@
 ;; URL: http://github.com/s-kostyaev/ellama
 ;; Keywords: help local tools
 ;; Package-Requires: ((emacs "28.1") (llm "0.22.0") (plz "0.8") (transient 
"0.7") (compat "29.1"))
-;; Version: 1.5.0
+;; Version: 1.5.1
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;; Created: 8th Oct 2023
 
@@ -1145,7 +1145,7 @@ Otherwire return current active session."
 (with-current-buffer buf
   (ellama-collapse-org-quotes
 
-(defvar ellama-transient-system)
+(defvar ellama-global-system nil)
 
 (defun ellama-stream (prompt &rest args)
   "Query ellama for PROMPT.
@@ -1201,7 +1201,7 @@ failure (with BUFFER current).
 (donecb (or (plist-get args :on-done) #'ignore))
 (prompt-with-ctx (ellama-context-prompt-with-context prompt))
 (system (or (plist-get args :system)
-ellama-transient-system))
+ellama-global-system))
 (llm-prompt (if session
 (if (llm-chat-prompt-p (ellama-session-prompt session))
 (progn

[nongnu] elpa/gptel 95eefe4fa7 2/2: gptel-org: Fix typo from refactoring

[ELPA Syncer]

branch: elpa/gptel
commit 95eefe4fa7cb2deda18aa415cd3ed36069d7763e
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-org: Fix typo from refactoring

* gptel-org.el (gptel--org-strip-tool-headers): Fix typo.
---
 gptel-org.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gptel-org.el b/gptel-org.el
index 355d274cab..94d2c678de 100644
--- a/gptel-org.el
+++ b/gptel-org.el
@@ -248,7 +248,6 @@ value of `gptel-org-branching-context', which see."
   (let ((major-mode 'org-mode))
 (gptel--parse-buffer gptel-backend max-entries)))
 
-(defun gptel--org-strip-tool-headers ()
 (defun gptel-org--strip-tool-headers ()
   "Remove all tool_call block headers and footers.
 Every line that matches will be removed entirely."

[elpa] externals/vertico a6bd815be3: vertico-directory-tidy: Try aggressive removal of shadowed path

[ELPA Syncer]

branch: externals/vertico
commit a6bd815be301a11be24ad944a9b3e853fcb1ed00
Author: Daniel Mendler 
Commit: Daniel Mendler 

vertico-directory-tidy: Try aggressive removal of shadowed path
---
 extensions/vertico-directory.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el
index 7b1b76e2eb..8d12ebce0d 100644
--- a/extensions/vertico-directory.el
+++ b/extensions/vertico-directory.el
@@ -111,8 +111,7 @@ Exit with current input if prefix ARG is given."
  (setq ov (symbol-value ov))
  (overlay-buffer ov)
  (= (point) (point-max))
- (or (>= (- (point) (overlay-end ov)) 2)
- (eq ?/ (char-before (- (point) 2)
+ (> (point) (overlay-end ov)))
 (delete-region (overlay-start ov) (overlay-end ov))
 
 (provide 'vertico-directory)

[elpa] main 8cc6433c20: elpa-packages (matlab-mode): Use the normal main file

[Stefan Monnier via]

branch: main
commit 8cc6433c203bdd787c42ce1c1396157800e01e71
Author: Stefan Monnier 
Commit: Stefan Monnier 

elpa-packages (matlab-mode): Use the normal main file
---
 elpa-packages | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index b06fa218ca..57016bce63 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -305,9 +305,9 @@
   :ignored-files ("COPYING"))
  ;; FIXME: Work in progress.  The copyright paperwork is ready.
  ;;(elsa   :url "https://github.com/emacs-elsa/Elsa";)
- ;;(emacspeak  :url "https://github.com/tvraman/emacspeak";
- ;; :doc "info/emacspeak.texi"
- ;; :lisp-dir "lisp")
+ ;; (emacspeak :url "https://github.com/tvraman/emacspeak";
+ ;;  :doc "info/emacspeak.texi"
+ ;;  :lisp-dir "lisp")
  (embark   :url "https://github.com/oantolin/embark";
   :doc "embark.texi"
   :ignored-files ("embark-consult.el" "avy-embark-collect.el"))
@@ -511,7 +511,7 @@
  (mathjax   :url "https://github.com/astoff/mathjax.el";
   :make "elpa")
  (matlab-mode   :url 
"https://github.com/mathworks/Emacs-MATLAB-Mode.git";
-  :main-file "matlab.el")
+  ) ;; :main-file "matlab.el"
  (mct  :url "https://gitlab.com/protesilaos/mct";
   :doc "README.org")
  (memory-usage :url nil)

[elpa] externals/ellama 0c406152cb 1/2: Fixed bug in session delete/kill that deletes/kills the current file/buffer when no session is selected

[ELPA Syncer]

branch: externals/ellama
commit 0c406152cb196908e5d150d4d565915f44bcbd2b
Author: Heinz Fridolin 
Commit: Heinz Fridolin 

Fixed bug in session delete/kill that deletes/kills the current file/buffer 
when no session is selected
---
 ellama.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ellama.el b/ellama.el
index 2772916ae5..044782de3f 100644
--- a/ellama.el
+++ b/ellama.el
@@ -980,10 +980,10 @@ If EPHEMERAL non nil new session will not be associated 
with any file."
  "Select session to remove: "
  (hash-table-keys ellama--active-sessions)))
 (buffer (ellama-get-session-buffer id))
-(file (buffer-file-name buffer))
+(file (when buffer (buffer-file-name buffer)))
 (session-file (when file (ellama--get-session-file-name file)))
 (translation-file (when file (ellama--get-translation-file-name 
file
-(kill-buffer buffer)
+(when buffer (kill-buffer buffer))
 (when file (delete-file file t))
 (when session-file (delete-file session-file t))
 (mapc
@@ -1022,7 +1022,7 @@ If EPHEMERAL non nil new session will not be associated 
with any file."
  "Select session to kill: "
  (hash-table-keys ellama--active-sessions)))
 (buffer (ellama-get-session-buffer id)))
-(kill-buffer buffer)))
+(when buffer (kill-buffer buffer
 
 ;;;###autoload
 (defun ellama-session-rename ()

[elpa] externals/ellama fdae36cc59 2/2: Merge pull request #281 from heinzfridolin/main

[ELPA Syncer]

branch: externals/ellama
commit fdae36cc59c40a386ad144f7f961b72ac53643ed
Merge: 91683e236a 0c406152cb
Author: Sergey Kostyaev 
Commit: GitHub 

Merge pull request #281 from heinzfridolin/main

Fix bug in session delete/kill that deletes/kills the current file/buffer 
when no session is selected
---
 ellama.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ellama.el b/ellama.el
index 2772916ae5..044782de3f 100644
--- a/ellama.el
+++ b/ellama.el
@@ -980,10 +980,10 @@ If EPHEMERAL non nil new session will not be associated 
with any file."
  "Select session to remove: "
  (hash-table-keys ellama--active-sessions)))
 (buffer (ellama-get-session-buffer id))
-(file (buffer-file-name buffer))
+(file (when buffer (buffer-file-name buffer)))
 (session-file (when file (ellama--get-session-file-name file)))
 (translation-file (when file (ellama--get-translation-file-name 
file
-(kill-buffer buffer)
+(when buffer (kill-buffer buffer))
 (when file (delete-file file t))
 (when session-file (delete-file session-file t))
 (mapc
@@ -1022,7 +1022,7 @@ If EPHEMERAL non nil new session will not be associated 
with any file."
  "Select session to kill: "
  (hash-table-keys ellama--active-sessions)))
 (buffer (ellama-get-session-buffer id)))
-(kill-buffer buffer)))
+(when buffer (kill-buffer buffer
 
 ;;;###autoload
 (defun ellama-session-rename ()

[elpa] externals/llm 3e209ee7c2 2/2: Set version to 0.24.1

[ELPA Syncer]

branch: externals/llm
commit 3e209ee7c29017601a8057d09b1f60a941445aa9
Author: Andrew Hyatt 
Commit: Andrew Hyatt 

Set version to 0.24.1
---
 llm.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llm.el b/llm.el
index f28461d9ea..fbd2e23327 100644
--- a/llm.el
+++ b/llm.el
@@ -5,7 +5,7 @@
 ;; Author: Andrew Hyatt 
 ;; Homepage: https://github.com/ahyatt/llm
 ;; Package-Requires: ((emacs "28.1") (plz "0.8") (plz-event-source "0.1.1") 
(plz-media-type "0.2.1"))
-;; Package-Version: 0.24.0
+;; Package-Version: 0.24.1
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
 ;; This program is free software; you can redistribute it and/or

[nongnu] elpa/markdown-mode 5bf29873b6 07/10: Merge pull request #886 from jrblevin/issue-885

[ELPA Syncer]

branch: elpa/markdown-mode
commit 5bf29873b63e8ad517868607b9bce8516fb92f02
Merge: 6fc5904257 b194469280
Author: Shohei YOSHIDA 
Commit: GitHub 

Merge pull request #886 from jrblevin/issue-885

Implement D&D handler like org-mode
---
 CHANGES.md   |  2 ++
 markdown-mode.el | 64 +++-
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d3f62d0890..9d1f0379f6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@
 - GNU Emacs 28.1 or later is required.
 
 *   New Features:
+- Introduce `markdown-yank-dnd-method` what action to perform on the 
dropped files
+  like `org-mode`.
 
 *   Bug fixes:
 
diff --git a/markdown-mode.el b/markdown-mode.el
index 5386c1e7c4..1bdd0b1ec3 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -53,6 +53,7 @@
 (declare-function sh-set-shell "sh-script")
 (declare-function mailcap-file-name-to-mime-type "mailcap")
 (declare-function dnd-get-local-file-name "dnd")
+(declare-function dnd-open-local-file "dnd")
 
 ;; for older emacs<29
 (declare-function mailcap-mime-type-to-extension "mailcap")
@@ -705,6 +706,20 @@ This may also be a cons cell where the behavior for `C-a' 
and
 (const :tag "on: before closing tags first" t)
 (const :tag "reversed: after closing tags first" 
reversed
   :package-version '(markdown-mode . "2.7"))
+
+(defcustom markdown-yank-dnd-method 'file-link
+  "Action to perform on the dropped files.
+When the value is the symbol,
+  - `copy-and-insert' -- copy file in current directory and insert its link
+  - `open' -- open dropped file in Emacs
+  - `insert-link' -- insert link of dropped/pasted file
+  - `ask' -- ask what to do out of the above."
+  :group 'markdown
+  :package-version '(markdown-mode "2.8")
+  :type '(choice (const :tag "Copy and insert" copy-and-insert)
+ (const :tag "Open file" open)
+ (const :tag "Insert file link" file-link)
+ (const :tag "Ask what to do" ask)))
 
 ;;; Markdown-Specific `rx' Macro ==
 
@@ -9898,12 +9913,8 @@ indicate that sorting should be done in reverse order."
 (t 1
 (sorting-type
  (or sorting-type
- (progn
-   ;; workaround #641
-   ;; Emacs < 28 hides prompt message by another message. This 
erases it.
-   (message "")
-   (read-char-exclusive
-"Sort type: [a]lpha [n]umeric (A/N means reversed): ")
+ (read-char-exclusive
+  "Sort type: [a]lpha [n]umeric (A/N means reversed): "
 (save-restriction
   ;; Narrow buffer to appropriate sorting area
   (if (region-active-p)
@@ -10119,18 +10130,41 @@ rows and columns and the column alignment."
   (insert " "))
 (setq files (cdr files))
 
-(defun markdown--dnd-local-file-handler (url _action)
+(defun markdown--dnd-read-method ()
+  (let ((choice (read-multiple-choice "What to do with file?"
+  '((?c "copy and insert")
+(?o "open")
+(?i "insert link")
+(cl-case (car choice)
+  (?c 'copy-and-insert)
+  (?o 'open)
+  (?i 'insert)
+  (otherwise (markdown--dnd-read-method)
+
+(defun markdown--dnd-insert-path (filename)
+  (let ((mimetype (mailcap-file-name-to-mime-type filename))
+(link-text "link text"))
+(when (string-match-p "\\s-" filename)
+  (setq filename (concat "<" filename ">")))
+(if (string-prefix-p "image/" mimetype)
+(markdown-insert-inline-image link-text filename)
+  (markdown-insert-inline-link link-text filename
+
+(defun markdown--dnd-local-file-handler (url action)
   (require 'mailcap)
   (require 'dnd)
   (let* ((filename (dnd-get-local-file-name url))
- (mimetype (mailcap-file-name-to-mime-type filename))
- (file (file-relative-name filename))
- (link-text "link text"))
-(when (string-match-p "\\s-" file)
-  (setq file (concat "<" file ">")))
-(if (string-prefix-p "image/" mimetype)
-(markdown-insert-inline-image link-text file)
-  (markdown-insert-inline-link link-text file
+ (method (if (eq markdown-yank-dnd-method 'ask)
+ (markdown--dnd-read-method)
+   markdown-yank-dnd-method)))
+(cl-case method
+  (copy-and-insert
+   (let ((copied (expand-file-name (file-name-nondirectory filename
+ (copy-file filename copied)
+ (markdown--dnd-insert-path (file-relative-name copied
+  (open
+   (dnd-open-local-file url action))
+  (insert (markdown--dnd-insert-path (file-relative-name filename))
 
 (defun markdown--dnd-multi-local-file-handler (urls action)
   (let ((multile-urls-p (> (length ur

[nongnu] elpa/markdown-mode b194469280 06/10: Update changes

[ELPA Syncer]

branch: elpa/markdown-mode
commit b19446928034420d64a591f5a3f0fb1bc9d938b6
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Update changes
---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d3f62d0890..9d1f0379f6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@
 - GNU Emacs 28.1 or later is required.
 
 *   New Features:
+- Introduce `markdown-yank-dnd-method` what action to perform on the 
dropped files
+  like `org-mode`.
 
 *   Bug fixes:
 

[nongnu] elpa/markdown-mode 38c5854fd3 01/10: added CommonMark (cmark) on the markdown-command list.

[ELPA Syncer]

branch: elpa/markdown-mode
commit 38c5854fd30901bc436683a7ec38c36fdc98ed57
Author: Bruno Dias 
Commit: Bruno Dias 

added CommonMark (cmark) on the markdown-command list.
---
 CHANGES.md   | 3 +++
 README.md| 2 +-
 markdown-mode.el | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1a5c2326ad..e8d87dc89f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+*   Improvements:
+- Added cmark and cmark-gfm to the markdown command list.
+
 # Markdown Mode 2.8
 
 *   **Breaking changes:**
diff --git a/README.md b/README.md
index e2bacac179..903a903d40 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ a complete list of keybindings is available using C-h 
m
 
 _Note:_ To use all of the features of `markdown-mode`, you'll need
 to install the Emacs package itself and also have a local Markdown
-processor installed (e.g., Markdown.pl, MultiMarkdown, or Pandoc).
+processor installed (e.g., Markdown.pl, MultiMarkdown, Pandoc, or CommonMark).
 The external processor is not required for editing, but will be
 used for rendering HTML for preview and export. After installing
 the Emacs package, be sure to configure `markdown-command` to point
diff --git a/markdown-mode.el b/markdown-mode.el
index a914eb3741..5386c1e7c4 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -108,7 +108,7 @@ Any changes to the output buffer made by this hook will be 
saved.")
   :group 'text
   :link '(url-link "https://jblevins.org/projects/markdown-mode/";))
 
-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" 
"pandoc" "markdown_py")
+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" 
"pandoc" "markdown_py" "cmark" "cmark-gfm")
 when (executable-find cmd)
 return 
(file-name-nondirectory it
   (or command "markdown"))

[nongnu] elpa/markdown-mode 16b783fb8a 02/10: Fix CHANGES

[ELPA Syncer]

branch: elpa/markdown-mode
commit 16b783fb8a506cffb8b0d3dac76945e77325819d
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Fix CHANGES
---
 CHANGES.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e8d87dc89f..d3f62d0890 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,7 @@
-*   Improvements:
-- Added cmark and cmark-gfm to the markdown command list.
-
 # Markdown Mode 2.8
 
+*Under development*
+
 *   **Breaking changes:**
 - GNU Emacs 28.1 or later is required.
 
@@ -12,6 +11,7 @@
 
 *   Improvements:
 - Support drag and drop features on Windows and multiple files' drag and 
drop
+- Added cmark and cmark-gfm to the markdown command list.
 
 # Markdown Mode 2.7
 

[nongnu] elpa/markdown-mode updated (0a522bf682 -> dd2cb2cdcd)

[ELPA Syncer]

elpasync pushed a change to branch elpa/markdown-mode.

  from  0a522bf682 Merge pull request #884 from jrblevin/support-dnd-windows
   new  38c5854fd3 added CommonMark (cmark) on the markdown-command list.
   new  16b783fb8a Fix CHANGES
   new  6fc5904257 Merge pull request #887 from diasbruno/patch-1
   new  4a05d5bf1f Implement D&D handler like org-mode
   new  c391f72ab1 Fix compilation warnings
   new  b194469280 Update changes
   new  5bf29873b6 Merge pull request #886 from jrblevin/issue-885
   new  1bc4b48a85 Disable `imenu-submenus-on-top` by default
   new  3ed9a17202 Update changes
   new  dd2cb2cdcd Merge pull request #888 from jrblevin/issue-882


Summary of changes:
 CHANGES.md   |  8 ++
 README.md|  2 +-
 markdown-mode.el | 74 +---
 3 files changed, 63 insertions(+), 21 deletions(-)

[nongnu] elpa/ws-butler 939aff54a4 1/3: Add a copy of the GPL

[Sean Whitton]

branch: elpa/ws-butler
commit 939aff54a4dd1b6e24cadfd4fe487cf562641306
Author: Sean Whitton 
Commit: Sean Whitton 

Add a copy of the GPL
---
 COPYING | 674 
 1 file changed, 674 insertions(+)

diff --git a/COPYING b/COPYING
new file mode 100644
index 00..e60008693e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directl

[elpa] externals/llm 6ca165b437 1/2: Fix issue in Ollama when passing non-standard params (#169)

[ELPA Syncer]

branch: externals/llm
commit 6ca165b43770fe9c6e730f2d43d3322a80ddb431
Author: Andrew Hyatt 
Commit: GitHub 

Fix issue in Ollama when passing non-standard params (#169)

This was introduced in the recent change to handle the `keep-alive`
option separately.

This fixes https://github.com/ahyatt/llm/issues/168.
---
 NEWS.org  | 2 ++
 llm-ollama.el | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index a32d1b58b4..d02a7f7576 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,5 @@
+* Version 0.24.1
+- Fix issue with Ollama incorrect requests when passing non-standard params.
 * Version 0.24.0
 - Add =multi-output= as an option, allowing all llm results to return, call, 
or stream multiple kinds of data via a plist.  This allows separating out 
reasoning, as well as optionally returning text as well as tool uses at the 
same time.
 - Added ~llm-models~ to get a list of models from a provider.
diff --git a/llm-ollama.el b/llm-ollama.el
index 87fdbdddf9..4b34153388 100644
--- a/llm-ollama.el
+++ b/llm-ollama.el
@@ -184,8 +184,9 @@ PROVIDER is the llm-ollama provider."
   (when-let* ((keep-alive (plist-get more-options-plist :keep_alive)))
 (setq request-plist (plist-put request-plist :keep_alive keep-alive)))
   (setq options (append options
-(map-filter (lambda (key _) (not (equal key 
:keep_alive)))
-more-options-plist
+(map-into (map-filter (lambda (key _) (not (equal 
key :keep_alive)))
+  more-options-plist)
+  'plist
 (when options
   (setq request-plist (plist-put request-plist :options options)))
 request-plist))

[elpa] externals/llm updated (fae79cea90 -> 3e209ee7c2)

[ELPA Syncer]

elpasync pushed a change to branch externals/llm.

  from  fae79cea90 Set version to 0.24.0.
   new  6ca165b437 Fix issue in Ollama when passing non-standard params 
(#169)
   new  3e209ee7c2 Set version to 0.24.1


Summary of changes:
 NEWS.org  | 2 ++
 llm-ollama.el | 5 +++--
 llm.el| 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

[nongnu] elpa/ws-butler updated (5c1b4f89f0 -> 9ee5a7657a)

[Sean Whitton]

spwhitton pushed a change to branch elpa/ws-butler.

  from  5c1b4f89f0 Release version 1.2
   new  939aff54a4 Add a copy of the GPL
   new  0da93406a5 Revert "Abbreviate default value of 
ws-butler-trim-predicate"
   new  9ee5a7657a Release version 1.3


Summary of changes:
 COPYING  | 674 +++
 ws-butler.el |   9 +-
 2 files changed, 681 insertions(+), 2 deletions(-)
 create mode 100644 COPYING

[nongnu] elpa/ws-butler 0da93406a5 2/3: Revert "Abbreviate default value of ws-butler-trim-predicate"

[Sean Whitton]

branch: elpa/ws-butler
commit 0da93406a50bc4329aab41be6ee57ca550166bb0
Author: Sean Whitton 
Commit: Sean Whitton 

Revert "Abbreviate default value of ws-butler-trim-predicate"

This reverts commit ffbf22775145840c8f50b47151ff544be1386236.
---
 ws-butler.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ws-butler.el b/ws-butler.el
index 0309215464..413f7052b7 100644
--- a/ws-butler.el
+++ b/ws-butler.el
@@ -92,7 +92,8 @@ not activate in all modes with a `mode-class' of `special'."
   :type '(repeat (symbol :tag "Major mode"))
   :group 'ws-butler)
 
-(defcustom ws-butler-trim-predicate #'always
+(defcustom ws-butler-trim-predicate
+  (lambda (_beg _end) t)
   "Function to exclude regions from whitespace trimming.
 Called with two arguments delimiting a region of the current buffer.
 If the function returns non-nil, trailing whitespace in that region will be

[nongnu] elpa/ws-butler 9ee5a7657a 3/3: Release version 1.3

[Sean Whitton]

branch: elpa/ws-butler
commit 9ee5a7657a22e836618813c2e2b64a548d27d2ff
Author: Sean Whitton 
Commit: Sean Whitton 

Release version 1.3
---
 ws-butler.el | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ws-butler.el b/ws-butler.el
index 413f7052b7..d7d88c5fb7 100644
--- a/ws-butler.el
+++ b/ws-butler.el
@@ -6,7 +6,7 @@
 ;; Author: Le Wang 
 ;; Maintainer: Sean Whitton 
 ;; Package-Requires: ((emacs "24.1"))
-;; Version: 1.2
+;; Version: 1.3
 ;; URL: https://elpa.nongnu.org/nongnu/ws-butler.html
 ;; Keywords: text
 
@@ -33,6 +33,10 @@
 
 ;;; News:
 
+;; Ver 1.3 2025/03/10 Sean Whitton
+;; Replace a use of `always' to retain compatibility with older Emacs.
+;; Thanks to Chris Rayner for the reporting the problem.
+;;
 ;; Ver 1.2 2025/02/25 Sean Whitton
 ;; When `special-mode' is in `ws-butler-global-exempt-modes', also check
 ;; whether a mode has a `mode-class' of `special', and don't activate

[nongnu] elpa/gptel updated (0a2fcb9528 -> 95eefe4fa7)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gptel.

  from  0a2fcb9528 gptel-curl: Handle end of reasoning stream in other 
buffer
   new  8e0d6829c7 gptel-openai: Fix collision with openrouter parsing 
(#669)
   new  95eefe4fa7 gptel-org: Fix typo from refactoring


Summary of changes:
 gptel-openai.el | 4 +++-
 gptel-org.el| 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)