[elpa] externals/org-modern 7ac63f5bb1: Fix variable usage
branch: externals/org-modern commit 7ac63f5bb1f644dadfe50fcc267f03c59cd99b67 Author: Daniel Mendler Commit: Daniel Mendler Fix variable usage --- org-modern.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org-modern.el b/org-modern.el index ee97114e3c..2e0cf6f987 100644 --- a/org-modern.el +++ b/org-modern.el @@ -382,7 +382,6 @@ the font.") (defconst org-modern--table-overline '(:overline t)) (defconst org-modern--table-sp '((space :width (org-modern--table-sp-width)) (space :width (org-modern--table-sp-width -(defvar org-indent-mode) (declare-function org-modern-indent-mode "ext:org-modern-indent") (defun org-modern--checkbox () @@ -870,7 +869,7 @@ whole buffer; otherwise, for the line at point." (add-hook 'org-cycle-hook #'org-modern--cycle nil 'local)) (org-modern--update-faces) (org-modern--update-bitmaps) -(when (and org-indent-mode org-modern-block-indent) +(when (and (bound-and-true-p org-indent-mode) org-modern-block-indent) (org-modern-indent-mode 1))) (t (remove-from-invisibility-spec 'org-modern)
[elpa] externals/modus-themes ed44bbae35: Make stylistic refinements to some modus-operandi-tinted prose mappings
branch: externals/modus-themes commit ed44bbae35261301f3f5f48d957b9ed2aad3dc86 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Make stylistic refinements to some modus-operandi-tinted prose mappings --- modus-operandi-tinted-theme.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el index b301bb17bd..abc6fcd6b6 100644 --- a/modus-operandi-tinted-theme.el +++ b/modus-operandi-tinted-theme.el @@ -362,13 +362,13 @@ which corresponds to a minimum contrast in relative luminance of (bg-prose-block-contents bg-dim) (bg-prose-code unspecified) - (fg-prose-code cyan-cooler) + (fg-prose-code green-cooler) (bg-prose-macro unspecified) - (fg-prose-macro magenta-cooler) + (fg-prose-macro blue-cooler) (bg-prose-verbatim unspecified) - (fg-prose-verbatim magenta-warmer) + (fg-prose-verbatim yellow-warmer) (prose-done green) (prose-todo red) @@ -454,7 +454,7 @@ which corresponds to a minimum contrast in relative luminance of Heading mappings - (fg-heading-0 cyan-cooler) + (fg-heading-0 green-cooler) (fg-heading-1 fg-main) (fg-heading-2 yellow-faint) (fg-heading-3 fg-alt)
[nongnu] elpa/aidermacs bde650d0c3: Warn user via display-warning
branch: elpa/aidermacs commit bde650d0c3beb1b19cf117df1f4295fca8b6e3da Author: Pablo Stafforini Commit: Matthew Zeng Warn user via display-warning --- aidermacs-backend-comint.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el index a4162f401d..b9201f1dd4 100644 --- a/aidermacs-backend-comint.el +++ b/aidermacs-backend-comint.el @@ -250,7 +250,8 @@ _OUTPUT is the text to be processed." ;; Detect potential infinite loop - position didn't advance (if (eq pos next-pos) (progn -(warn "aidermacs: Font-lock position didn't advance at pos %d" pos) +(display-warning 'aidermacs +(format "aidermacs: Font-lock position didn't advance at pos %d" pos)) (setq pos aidermacs--syntax-block-end-pos)) (setq pos next-pos font-pos next-font-pos)
[elpa] externals/modus-themes 0c03c3b34a 2/2: Use slightly different colour for mail-cite-2 in modus-vivendi-tinted
branch: externals/modus-themes commit 0c03c3b34aa9d7ffd76319986e9673133fb0ffb6 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Use slightly different colour for mail-cite-2 in modus-vivendi-tinted --- modus-vivendi-tinted-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el index aba3ca89e5..6e53fca46d 100644 --- a/modus-vivendi-tinted-theme.el +++ b/modus-vivendi-tinted-theme.el @@ -334,7 +334,7 @@ which corresponds to a minimum contrast in relative luminance of (mail-cite-0 cyan-cooler) (mail-cite-1 yellow-cooler) - (mail-cite-2 cyan) + (mail-cite-2 cyan-warmer) (mail-cite-3 red-cooler) (mail-part magenta-cooler) (mail-recipient blue-warmer)
[elpa] externals/modus-themes de28e15485 1/2: Use slightly different colours for the mail cite mappings in modus-operandi-tinted
branch: externals/modus-themes commit de28e1548552fa1290fb6f4b29ebc5fdac815e31 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Use slightly different colours for the mail cite mappings in modus-operandi-tinted --- modus-operandi-tinted-theme.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el index abc6fcd6b6..375cb9f9fe 100644 --- a/modus-operandi-tinted-theme.el +++ b/modus-operandi-tinted-theme.el @@ -333,8 +333,8 @@ which corresponds to a minimum contrast in relative luminance of Mail mappings (mail-cite-0 cyan-cooler) - (mail-cite-1 yellow-cooler) - (mail-cite-2 cyan) + (mail-cite-1 yellow) + (mail-cite-2 green-warmer) (mail-cite-3 red-cooler) (mail-part magenta-cooler) (mail-recipient blue-warmer)
[elpa] externals/modus-themes updated (ed44bbae35 -> 0c03c3b34a)
elpasync pushed a change to branch externals/modus-themes. from ed44bbae35 Make stylistic refinements to some modus-operandi-tinted prose mappings new de28e15485 Use slightly different colours for the mail cite mappings in modus-operandi-tinted new 0c03c3b34a Use slightly different colour for mail-cite-2 in modus-vivendi-tinted Summary of changes: modus-operandi-tinted-theme.el | 4 ++-- modus-vivendi-tinted-theme.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[nongnu] elpa/cider d6a875bd53: Remove Boot support
branch: elpa/cider
commit d6a875bd530a5727e032fa3edcab6d4980a55fb4
Author: Oleksandr Yakushev
Commit: Bozhidar Batsov
Remove Boot support
---
CHANGELOG.md | 1 +
README.md | 8 +--
cider.el | 65 +++---
doc/modules/ROOT/pages/basics/installation.adoc | 6 +-
doc/modules/ROOT/pages/cljs/other_repls.adoc | 39 -
doc/modules/ROOT/pages/cljs/up_and_running.adoc | 15 +
doc/modules/ROOT/pages/troubleshooting.adoc | 11 ++--
doc/modules/ROOT/pages/usage/code_completion.adoc | 6 +-
test/cider-tests.el | 67 +--
9 files changed, 25 insertions(+), 193 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93728fa49..46d423f8b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
### Changes
- [#3782](https://github.com/clojure-emacs/cider/issues/3782): **(Breaking)**
Drop official support for Emacs 26.
+- [#3812](https://github.com/clojure-emacs/cider/issues/3812): **(Breaking)**
Remove support for Boot.
- [#3793](https://github.com/clojure-emacs/cider/issues/3793): **(Breaking)**
Remove features that relied on printed exception parsing:
- `cider-stacktrace-analyze-string` and `cider-stacktrace-analyze-at-point`
functions.
- Automatic stacktrace parsing in log viewer.
diff --git a/README.md b/README.md
index 93ad5d1e84..83ecd907cf 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ install CIDER with the following command:
### Launch an nREPL server and client from Emacs
-Simply open in Emacs a file belonging to your `lein`, `tools.deps` or `boot`
project (like
+Simply open in Emacs a file belonging to your `lein` or `tools.deps` project
(like
`foo.clj`) and type M-x `cider-jack-in`. This will start an nREPL
server with all the project dependencies loaded in and CIDER will automatically
connect to it.
@@ -82,12 +82,6 @@ You can go to your project's directory in a terminal and
type there
$ lein repl
```
-Or with Boot:
-
-```
-$ boot repl -s wait
-```
-
Alternatively you can start nREPL either manually or by the facilities provided
by your project's build tool (`tools.deps`, Gradle, Maven, etc).
diff --git a/cider.el b/cider.el
index 3a3d5e2848..9f79b33a1f 100644
--- a/cider.el
+++ b/cider.el
@@ -289,7 +289,9 @@ By default we favor the project-specific shadow-cljs over
the system-wide."
:package-version '(cider . "1.14.0"))
(make-obsolete-variable 'cider-lein-global-options 'cider-lein-parameters
"1.8.0")
-(make-obsolete-variable 'cider-boot-global-options 'cider-boot-parameters
"1.8.0")
+(make-obsolete-variable 'cider-boot-command nil "1.8.0")
+(make-obsolete-variable 'cider-boot-parameters nil "1.8.0")
+(make-obsolete-variable 'cider-boot-global-options nil "1.8.0")
(make-obsolete-variable 'cider-clojure-cli-global-options
'cider-clojure-cli-parameters "1.8.0")
(make-obsolete-variable 'cider-shadow-cljs-global-options
'cider-shadow-cljs-parameters "1.8.0")
(make-obsolete-variable 'cider-gradle-global-options 'cider-gradle-parameters
"1.8.0")
@@ -300,7 +302,7 @@ By default we favor the project-specific shadow-cljs over
the system-wide."
(if (executable-find "clojure") 'clojure-cli 'lein)
"The default tool to use when doing `cider-jack-in' outside a project.
This value will only be consulted when no identifying file types, i.e.
-project.clj for leiningen or build.boot for boot, could be found.
+project.clj for leiningen or deps.edn for clojure-cli, could be found.
As the Clojure CLI is bundled with Clojure itself, it's the default.
In the absence of the Clojure CLI (e.g. on Windows), we fallback
@@ -320,7 +322,7 @@ to Leiningen."
nil
"Allow choosing a build system when there are many.
When there are project markers from multiple build systems (e.g. lein and
-boot) the user is prompted to select one of them. When non-nil, this
+clojure-cli) the user is prompted to select one of them. When non-nil, this
variable will suppress this behavior and will select whatever build system
is indicated by the variable if present. Note, this is only when CIDER
cannot decide which of many build systems to use and will never override a
@@ -432,7 +434,6 @@ The plist supports the following keys
"Determine the command `cider-jack-in' needs to invoke for the PROJECT-TYPE."
(pcase project-type
('leincider-lein-command)
-('bootcider-boot-command)
('clojure-cli cider-clojure-cli-command)
('babashkacider-babashka-command)
('shadow-cljs cider-shadow-cljs-command)
@@ -477,7 +478,6 @@ Throws an error if PROJECT-TYPE is unknown."
" "
r)
r)))
-('boot (cider--resolve-command cider-boot-command))
('clojure-cli (if (and cider-enrich-classpath
(not (eq system-type 'windows-nt))
[nongnu] elpa/gptel 6e48a0b05d 1/2: gptel-gh: add new models (#789)
branch: elpa/gptel
commit 6e48a0b05d09b5da653784af2d02a943835b5e03
Author: kiennq
Commit: GitHub
gptel-gh: add new models (#789)
gptel-gh.el (gptel--gh-models): Add new models
gpt-4o-copilot, gpt-4.1. Adjust capabilities of previously
added models.
---
gptel-gh.el | 42 +++---
1 file changed, 31 insertions(+), 11 deletions(-)
diff --git a/gptel-gh.el b/gptel-gh.el
index b828e570a0..299f8eebfd 100644
--- a/gptel-gh.el
+++ b/gptel-gh.el
@@ -27,22 +27,36 @@
;;; Github Copilot
(defconst gptel--gh-models
- '((gpt-4o-2024-11-20
+ '((gpt-4o
:description
"Advanced model for complex tasks; cheaper & faster than GPT-Turbo"
:capabilities (media tool-use json url)
:mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
:context-window 128 :input-cost 2.5 :output-cost 10 :cutoff-date
"2023-10")
+(gpt-4o-copilot
+ :description "Cheap model for fast tasks; cheaper & more capable than
GPT-3.5 Turbo"
+ :context-window 128
+ :input-cost 0.15
+ :output-cost 0.60
+ :cutoff-date "2023-10")
+(gpt-4.1
+ :description "Flagship model for complex tasks"
+ :capabilities (tool-use json url)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
+ :context-window 1024
+ :input-cost 2.0
+ :output-cost 8.0
+ :cutoff-date "2024-05")
(gpt-4.5-preview
:description "Largest and most capable GPT model to date"
- :capabilities (tool-use url)
+ :capabilities (url)
:context-window 128
:input-cost 75
:output-cost 150
:cutoff-date "2023-10")
(o1
:description "Reasoning model designed to solve hard problems across
domains"
- :capabilities (reasoning)
+ :capabilities (reasoning tool-use)
:context-window 200
:input-cost 15
:output-cost 60
@@ -50,43 +64,49 @@
:request-params (:stream :json-false))
(o3-mini
:description "High intelligence at the same cost and latency targets of
o1-mini"
+ :capabilities (reasoning tool-use)
:context-window 200
:input-cost 3
:output-cost 12
- :cutoff-date "2023-10"
- :capabilities (reasoning)
- :request-params (:stream :json-false))
+ :cutoff-date "2023-10")
(claude-3.5-sonnet
:description "Highest level of intelligence and capability"
- :capabilities (tool-use cache)
+ :capabilities (media tool-use cache)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp"
"application/pdf")
:context-window 200
:input-cost 3
:output-cost 15
:cutoff-date "2024-04")
(claude-3.7-sonnet
:description "Hybrid model capable of standard thinking and extended
thinking modes"
- :capabilities (tool-use cache)
+ :capabilities (media tool-use cache)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp"
"application/pdf")
:context-window 200
:input-cost 3
:output-cost 15
:cutoff-date "2025-02")
(claude-3.7-sonnet-thought
:description "Claude 3.7 Sonnet Thinking"
- :capabilities (tool-use cache)
+ :capabilities (media cache)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp"
"application/pdf")
:context-window 200
:input-cost 3
:output-cost 15
:cutoff-date "2025-02")
(gemini-2.0-flash-001
:description "Next gen, high speed, multimodal for a diverse variety of
tasks"
- :capabilities (tool-use json)
+ :capabilities (json media)
+ :mime-types ("image/png" "image/jpeg" "image/webp" "image/heic"
"image/heif"
+ "application/pdf" "text/plain" "text/csv" "text/html")
:context-window 1000
:input-cost 0.10
:output-cost 0.40
:cutoff-date "2024-08")
(gemini-2.5-pro
:description "Next gen, high speed, multimodal for a diverse variety of
tasks"
- :capabilities (tool-use json)
+ :capabilities (tool-use json media)
+ :mime-types ("image/png" "image/jpeg" "image/webp" "image/heic"
"image/heif"
+ "application/pdf" "text/plain" "text/csv" "text/html")
:context-window 1000
:input-cost 0.10
:output-cost 0.40
[nongnu] elpa/gptel updated (a7e1dbbe3d -> 8e20fae2ce)
elpasync pushed a change to branch elpa/gptel. from a7e1dbbe3d gptel: Ignore unknown keys in tool constructor new 6e48a0b05d gptel-gh: add new models (#789) new 8e20fae2ce gptel: Add support for o3 and o4-mini (#789) Summary of changes: gptel-gh.el | 58 +++--- gptel.el| 26 -- 2 files changed, 67 insertions(+), 17 deletions(-)
[nongnu] elpa/gptel 8e20fae2ce 2/2: gptel: Add support for o3 and o4-mini (#789)
branch: elpa/gptel
commit 8e20fae2ce03bc12d9ad2dcf695b16bb2c2cd9e7
Author: Karthik Chikmagalur
Commit: Karthik Chikmagalur
gptel: Add support for o3 and o4-mini (#789)
* gptel.el (gptel--openai-models): Add support for OpenAI models
o3 and o4-mini. Additionally, update the metadata for these
models as they now support system messages and streaming, and many
of the models support media input as well.
* gptel-gh.el (gptel--gh-models): Add support for o3 and o4-mini
to the Copilot backend.
---
gptel-gh.el | 16
gptel.el| 26 --
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/gptel-gh.el b/gptel-gh.el
index 299f8eebfd..ace8347d6b 100644
--- a/gptel-gh.el
+++ b/gptel-gh.el
@@ -62,6 +62,14 @@
:output-cost 60
:cutoff-date "2023-10"
:request-params (:stream :json-false))
+(o3
+ :description "Well-rounded and powerful model across domains"
+ :capabilities (reasoning media tool-use json url)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
+ :context-window 200
+ :input-cost 10
+ :output-cost 40
+ :cutoff-date "2024-05")
(o3-mini
:description "High intelligence at the same cost and latency targets of
o1-mini"
:capabilities (reasoning tool-use)
@@ -69,6 +77,14 @@
:input-cost 3
:output-cost 12
:cutoff-date "2023-10")
+(o4-mini
+ :description "Fast, effective reasoning with efficient performance in
coding and visual tasks"
+ :capabilities (reasoning media tool-use json url)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
+ :context-window 200
+ :input-cost 1.10
+ :output-cost 4.40
+ :cutoff-date "2024-05")
(claude-3.5-sonnet
:description "Highest level of intelligence and capability"
:capabilities (media tool-use cache)
diff --git a/gptel.el b/gptel.el
index 72ae7aa721..62528d64bc 100644
--- a/gptel.el
+++ b/gptel.el
@@ -599,16 +599,30 @@ the same as t."
:input-cost 3
:output-cost 12
:cutoff-date "2023-10"
- :capabilities (nosystem reasoning)
- :request-params (:stream :json-false))
+ :capabilities (nosystem reasoning))
+(o3
+ :description "Well-rounded and powerful model across domains"
+ :capabilities (reasoning media tool-use json url)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
+ :context-window 200
+ :input-cost 10
+ :output-cost 40
+ :cutoff-date "2024-05")
(o3-mini
:description "High intelligence at the same cost and latency targets of
o1-mini"
:context-window 200
- :input-cost 3
- :output-cost 12
+ :input-cost 1.10
+ :output-cost 4.40
:cutoff-date "2023-10"
- :capabilities (reasoning)
- :request-params (:stream :json-false))
+ :capabilities (reasoning tool-use json))
+(o4-mini
+ :description "Fast, effective reasoning with efficient performance in
coding and visual tasks"
+ :capabilities (reasoning media tool-use json url)
+ :mime-types ("image/jpeg" "image/png" "image/gif" "image/webp")
+ :context-window 200
+ :input-cost 1.10
+ :output-cost 4.40
+ :cutoff-date "2024-05")
(gpt-3.5-turbo
:description "More expensive & less capable than GPT-4o-mini; use that
instead"
:capabilities (tool-use)
[elpa] externals/hyperbole 7568a2b88a: Fix assignment to free var (#702)
branch: externals/hyperbole commit 7568a2b88a972fcb33fdeb483c3cda410b99351d Author: Mats Lidell Commit: GitHub Fix assignment to free var (#702) --- hsys-org.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hsys-org.el b/hsys-org.el index d4a74c6477..bb0d970c7b 100644 --- a/hsys-org.el +++ b/hsys-org.el @@ -538,9 +538,10 @@ a non-Org buffer type." (save-match-data ;; If this Org link matches a potential HyWiki word, ignore it. (when (not (and (fboundp 'hywiki-word-at) (hywiki-word-at))) - (if (setq label-start-end (ibut:label-p t "[" "]" t)) - (cons (nth 1 label-start-end) (nth 2 label-start-end)) - t) +(let ((label-start-end (ibut:label-p t "[" "]" t))) + (if label-start-end + (cons (nth 1 label-start-end) (nth 2 label-start-end)) + t)) ;; Assume caller has already checked that the current buffer is in org-mode. (defun hsys-org-heading-at-p (&optional _)
[elpa] externals/consult 8de9ba3e54: consult--read: Drop cl-assert (Fix #1219)
branch: externals/consult commit 8de9ba3e543f73be64a6eabce592f4f73d7296b2 Author: Daniel Mendler Commit: Daniel Mendler consult--read: Drop cl-assert (Fix #1219) --- consult.el | 8 1 file changed, 8 deletions(-) diff --git a/consult.el b/consult.el index a495880661..4417143b33 100644 --- a/consult.el +++ b/consult.el @@ -2912,14 +2912,6 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer inherits the input method. ASYNC-WRAP wraps asynchronous functions and defaults to `consult--async-wrap'." - ;; supported types - (cl-assert (or (functionp table) ;; dynamic table or asynchronous function - (obarrayp table) ;; obarray - (hash-table-p table) ;; hash table - (not table) ;; empty list - (stringp (car table)) ;; string list - (and (consp (car table)) (stringp (caar table))) ;; string alist - (and (consp (car table)) (symbolp (caar table) ;; symbol alist (ignore prompt predicate require-match history default keymap category initial narrow initial-narrow add-history annotate state preview-key sort lookup group inherit-input-method async-wrap)
