[elpa] externals/modus-themes 93e89bdcf8: Add support for some tmr faces

[ELPA Syncer]

branch: externals/modus-themes
commit 93e89bdcf8b778e263d460ec98ad8a2c9b4625f7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add support for some tmr faces
---
 doc/modus-themes.info | 83 ++-
 doc/modus-themes.org  |  1 +
 modus-themes.el   |  8 +
 3 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index 950cc4fc3b..3919b41e4d 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -4577,6 +4577,7 @@ have lots of extensions, so the “full support” may not be 
100% true…
• term
• textsec
• tldr
+   • tmr [ Part of 4.8.0-dev.  ]
• transient (pop-up windows such as Magit’s)
• trashed
• treemacs
@@ -6704,47 +6705,47 @@ Node: DIY Use a hook at the post-load-theme phase185309
 Node: DIY A theme-agnostic hook for theme loading187514
 Node: Face coverage190145
 Node: Supported packages190597
-Node: Indirectly covered packages196418
-Node: Notes on individual packages197774
-Node: Note on calendarel weekday and weekend colors198874
-Node: Note on git-gutter in Doom Emacs200022
-Node: Note on php-mode multiline comments202544
-Node: Note on underlines in compilation buffers203304
-Node: Note on inline Latex in Org buffers204176
-Node: Note on dimmerel204786
-Node: Note on display-fill-column-indicator-mode206271
-Node: Note on highlight-parenthesesel207724
-Node: Note on mmm-modeel background colors213827
-Node: Note for prism216181
-Node: Note on company-mode overlay pop-up219403
-Ref: Note on company-mode overlay pop-up-Footnote-1220133
-Ref: Note on company-mode overlay pop-up-Footnote-2220200
-Node: Note on ERC escaped color sequences220255
-Ref: Note on ERC escaped color sequences-Footnote-1221683
-Node: Note on powerline or spaceline221793
-Node: Note on SHR colors07
-Node: Note on SHR fonts222631
-Node: Note on Ement colors and fonts223318
-Node: Note on pdf-tools link hints224846
-Node: Note on the Notmuch logo227306
-Node: Note on goto-address-mode faces227844
-Node: Frequently Asked Questions228962
-Node: Is the contrast ratio about adjacent colors?229542
-Node: What does it mean to avoid exaggerations?231051
-Node: Why are colors mostly variants of blue, magenta, cyan?232905
-Node: What is the best setup for legibility?237328
-Node: Are these color schemes?239978
-Node: Port the Modus themes to other platforms?243662
-Node: Contributing246564
-Node: Sources of the themes246963
-Node: Issues you can help with247859
-Node: Patches require copyright assignment to the FSF249299
-Node: Acknowledgements251521
-Node: GNU Free Documentation License255878
-Node: Indices281242
-Node: Function index281421
-Node: Variable index283017
-Node: Concept index286517
+Node: Indirectly covered packages196453
+Node: Notes on individual packages197809
+Node: Note on calendarel weekday and weekend colors198909
+Node: Note on git-gutter in Doom Emacs200057
+Node: Note on php-mode multiline comments202579
+Node: Note on underlines in compilation buffers203339
+Node: Note on inline Latex in Org buffers204211
+Node: Note on dimmerel204821
+Node: Note on display-fill-column-indicator-mode206306
+Node: Note on highlight-parenthesesel207759
+Node: Note on mmm-modeel background colors213862
+Node: Note for prism216216
+Node: Note on company-mode overlay pop-up219438
+Ref: Note on company-mode overlay pop-up-Footnote-1220168
+Ref: Note on company-mode overlay pop-up-Footnote-2220235
+Node: Note on ERC escaped color sequences220290
+Ref: Note on ERC escaped color sequences-Footnote-1221718
+Node: Note on powerline or spaceline221828
+Node: Note on SHR colors42
+Node: Note on SHR fonts222666
+Node: Note on Ement colors and fonts223353
+Node: Note on pdf-tools link hints224881
+Node: Note on the Notmuch logo227341
+Node: Note on goto-address-mode faces227879
+Node: Frequently Asked Questions228997
+Node: Is the contrast ratio about adjacent colors?229577
+Node: What does it mean to avoid exaggerations?231086
+Node: Why are colors mostly variants of blue, magenta, cyan?232940
+Node: What is the best setup for legibility?237363
+Node: Are these color schemes?240013
+Node: Port the Modus themes to other platforms?243697
+Node: Contributing246599
+Node: Sources of the themes246998
+Node: Issues you can help with247894
+Node: Patches require copyright assignment to the FSF249334
+Node: Acknowledgements251556
+Node: GNU Free Documentation License255913
+Node: Indices281277
+Node: Function index281456
+Node: Variable index283052
+Node: Concept index286552
 
 End Tag Table
 
diff --git a/doc/modus-themes.org b/doc/modus-themes.org
index 1709ffd5af..a1c1bb97dc 100644
--- a/doc/modus-themes.org
+++ b/doc/modus-themes.org
@@ -4395,6 +4395,7 @@ have lots of extensions, so the "full support" may not be 
100% true…
 + term
 + textsec
 + tldr
++ tmr [ Part of {{{development-version}}}. ]
 + transie

[elpa] externals/ef-themes db013c9d2d: Add support for tmr

[ELPA Syncer]

branch: externals/ef-themes
commit db013c9d2dcb8029f39f8cebea7ba4b3a25aba41
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add support for tmr
---
 README.org   | 1 +
 ef-themes.el | 8 
 2 files changed, 9 insertions(+)

diff --git a/README.org b/README.org
index 1bc7dc7259..613c78b775 100644
--- a/README.org
+++ b/README.org
@@ -1474,6 +1474,7 @@ everything most users need.
 - term
 - textsec
 - tldr
+- tmr [ Part of {{{development-version}}}. ]
 - transient
 - trashed
 - tree-sitter
diff --git a/ef-themes.el b/ef-themes.el
index 5ca87a8e42..251daf7425 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -2381,6 +2381,14 @@ text should not be underlined as well) yet still blend 
in."
 `(tldr-description ((,c :inherit font-lock-doc-face)))
 `(tldr-introduction ((,c :inherit font-lock-comment-face)))
 `(tldr-title ((,c :inherit bold)))
+ tmr
+`(tmr-mode-line-active ((,c :inherit bold :foreground ,modeline-info)))
+`(tmr-mode-line-soon ((,c :inherit bold :foreground ,modeline-warning)))
+`(tmr-mode-line-urgent ((,c :inherit bold :foreground ,modeline-err)))
+`(tmr-tabulated-description ((,c :foreground ,docstring)))
+`(tmr-tabulated-end-time ((,c :foreground ,date-deadline)))
+`(tmr-tabulated-remaining-time ((,c :foreground ,date-scheduled)))
+`(tmr-tabulated-start-time ((,c :foreground ,date-common)))
  transient
 `(transient-active-infix ((,c :background ,bg-active :foreground 
,fg-intense)))
 `(transient-amaranth ((,c :inherit bold :foreground ,yellow-warmer)))

[elpa] externals/a68-mode updated (14a9074240 -> bd8268af32)

[ELPA Syncer]

elpasync pushed a change to branch externals/a68-mode.

  from  14a9074240 Fix indent rule for ;
   new  44c1e5b5bf Complete SMIE grammar for loops
   new  021c559c7b Add ~ to a68--keywords-regexp
   new  fc9eeeae56 Several fixes related to lexing loops
   new  bd8268af32 Improve choice-clauses in SMIE grammar


Summary of changes:
 a68-mode.el | 331 +++-
 1 file changed, 304 insertions(+), 27 deletions(-)

[elpa] externals/a68-mode 44c1e5b5bf 1/4: Complete SMIE grammar for loops

[ELPA Syncer]

branch: externals/a68-mode
commit 44c1e5b5bfa1e870c65b2853b1d8e6e4b0433c25
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Complete SMIE grammar for loops
---
 a68-mode.el | 249 
 1 file changed, 236 insertions(+), 13 deletions(-)

diff --git a/a68-mode.el b/a68-mode.el
index 0b42f02f81..96311f150b 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -26,6 +26,28 @@
 
 ;; A major mode for editing Algol 68 code.
 
+;; This mode uses SMIE in order to implement syntax-driven
+;; highlighting and automatic indentation.  SMIE is based on operator
+;; precedence grammars, which often makes it difficult to express the
+;; syntax of programming languages due to their many restrictions.
+;;
+;; Fortunately, the parsing of Algol 68 by the means of an operator
+;; precedence grammar has been extensively studied by Meertens and van
+;; Vliet, and documented in two main works:
+;;
+;; - "An operator-priority grammar for Algol 68+"
+;; - "Making ALGOL 68+ texts conform to an operator-priority grammar"
+;;
+;; The first article provides an operator-priority grammar for the
+;; language, and indicates what inserts are necessary in order to
+;; comply with the grammar's structural restrictions.  This is the
+;; basis of many of the rules in the SMIE grammar used in this file,
+;; particularly the tricky cases like loop clauses.
+;;
+;; The second article provides rules to determine when the several
+;; inserts must be inserted by the lexer.  This is the basis of the
+;; SMIE lexer used in this file.
+
 ;;; Code:
 
 (require 'font-lock)
@@ -338,17 +360,39 @@ with the equivalent upcased form."
 (proc-decl (proc-decl "," proc-decl)
("op" ids "=" args ids ":" exp)
("proc" ids "=" ids ":" exp))
-;; TODO: this don't cover all the loop
-;; possibilities.
-(loop ("-do-" "do" exp "od")
-  ("for" exp "from" exp "to" exp "by" exp
-   "do" exp "od")
-  ("for" exp "from" exp "to" exp
-   "do" exp "od")
-  ("for" exp "by" exp "to" exp
-   "do" exp "od")
-  ("-to-" "to" exp "do" exp "od")
-  ("while" exp "do" exp "od"))
+;; Loop clauses.
+;;   loop clause :
+;; loop insert, for part, (from part), (by part), (to part), repeating 
part.
+;;   for part :
+;; (for token, identifier).
+;;   from part :
+;; from token, unit.
+;;   by part :
+;; by token, unit.
+;;   to part :
+;; to token, unit.
+;;   repeating part :
+;; (while part), do part.
+;;   while part :
+;; while token, enquiry clause.
+;;   do part :
+;; do token, serial clause, od token.
+(loop-clause ("for" id "do" exp "od")
+ ("for" id "from" exp "do" exp "od")
+ ("for" id "from" exp "by" exp "do" exp "od")
+ ("for" id "from" exp "by" exp "to" exp "do" exp "od")
+ ("for" id "from" exp "by" exp "to" exp "while" exp "do" exp 
"od")
+ ("-from-" exp "by" exp "to" exp "while" exp "do" exp "od")
+ ("-from-" exp "by" exp "to" exp "do" exp "od")
+ ("-from-" exp "by" exp "do" exp "od")
+ ("-from-" exp "do" exp "od")
+ ("-by-" exp "to" exp "while" exp "do" exp "od")
+ ("-by-" exp "while" exp "do" exp "od")
+ ("-by-" exp "do" exp "od")
+ ("-to-" exp "while" exp "do" exp "od")
+ ("-to-" exp "do" exp "od")
+ ("-while-" exp "do" exp "od")
+ ("-do-" exp "od"))
 (insts (insts ";" insts)
(id ":=" exp)
("if" exp "then" insts "fi")
@@ -365,7 +409,7 @@ with the equivalent upcased form."
(op-decl)
(type-decl)
(proc-decl)
-   (loop)))
+   (loop-clause)))
   "Algol 68 BNF operator precedence grammar to use with SMIE")
 
 (defvar a68--smie-grammar-upper
@@ -388,17 +432,149 @@ with the equivalent upcased form."
 '((assoc "=" "/" ":=" ":=:" ":/=:"
  "+" "-" "*" "/")
 
- SMIE token movement.
+ SMIE lexer
 
 (defvar a68--keywords-regexp
   (regexp-opt '("+" "*" ";" ">" "<" ":=" "=" "," ":")))
 
+(defun a68-at-enclosed-clause ()
+  "Return whether the point is at the beginning of an enclosed clause."
+  (save-excursion
+(forward-comment (- (point)))
+(or (looking-back (regexp-opt '(":" ":=" ":/=:" "=" "," ";" "["
+"@" "begin" "if" "then" "elif"
+"else" "case" "in" "ouse" "out"
+"of" "from" "by" "to" "while"
+"do" "(" "|" ")" "def" "postlude")))
+;; operator, so any nomad or monad.
+(looking-back (regexp-opt '("%" "^" "&" "+" "-" "~" "!" "?"
+">" "

[elpa] externals/a68-mode bd8268af32 4/4: Improve choice-clauses in SMIE grammar

[ELPA Syncer]

branch: externals/a68-mode
commit bd8268af324fbd36f3249f82469fc36975f01bf1
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Improve choice-clauses in SMIE grammar
---
 a68-mode.el | 75 +
 1 file changed, 61 insertions(+), 14 deletions(-)

diff --git a/a68-mode.el b/a68-mode.el
index d3fa94ca33..e8b6e73b54 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -344,9 +344,12 @@ with the equivalent upcased form."
 (fields (fields "," fields)
 (ids))
 (args ("(" fargs ")"))
+(spec ("(" fargs "):")
+  (exp))
 (fargs (fargs "," fargs)
(exp))
-(conformity-cases)
+(specs (specs "," specs)
+   (spec))
 (exp (ids)
  (exp "of" exp)
  (exp "[" exp "]")
@@ -365,6 +368,54 @@ with the equivalent upcased form."
 (proc-decl (proc-decl "," proc-decl)
("op" ids "=" args ids ":" exp)
("proc" ids "=" ids ":" exp))
+;; Enquiry clause:
+;;  enquiry clause :
+;;   series.
+(enquiry-clause (insts))
+;; Choice clauses
+;;   choice clause :
+;; choice start, chooser choice clause, choice finish.
+;;   chooser choice clause :
+;; enquiry clause, alternate choice clause.
+;;   enquiry clause :
+;; series.
+;;   alternate choice clause :
+;; in choice clause, (out choice clause).
+;;   in choice clause :
+;; choice in, in part of choice.
+;;   in part of choice :
+;; serial clause ; case part list proper ; united case part.
+;;   case part list proper :
+;; case part list, and also token, case part.
+;;   case part list :
+;; (case part list, and also token), case part.
+;;   case part :
+;; unit ; united case part.
+;;   united case part :
+;; specification, unit.
+;;   specification :
+;; single declaration brief pack, specification token.
+;;   single declaration brief pack :
+;; brief begin token, single declaration, brief end token.
+;;   single declaration :
+;; declarer, (dectag insert, identifier).
+;;   out choice clause :
+;; choice out, serial clause ;
+;; choice again, chooser choice clause.
+(choice-clause ("if" enquiry-clause "then" insts "fi")
+   ("if" enquiry-clause "then" insts "else" insts "fi")
+   ("if" enquiry-clause "then" insts
+"elif" enquiry-clause "then" insts "fi")
+   ("(" enquiry-clause "|" insts ")")
+   ("(" enquiry-clause "|" insts "|" insts ")")
+   ("(" enquiry-clause "|" insts
+"|:" enquiry-clause "|" insts ")")
+   ("case" enquiry-clause "in" specs "esac")
+   ("case" enquiry-clause "in" specs "out" insts "esac")
+   ("case" enquiry-clause "in" specs "ouse" insts "esac")
+   ("(" enquiry-clause "|" specs ")")
+   ("(" enquiry-clause "|" specs "|" insts ")")
+   ("(" enquiry-clause "|" specs "|:" insts ")"))
 ;; Loop clauses.
 ;;   loop clause :
 ;; loop insert, for part, (from part), (by part), (to part), repeating 
part.
@@ -400,20 +451,10 @@ with the equivalent upcased form."
  ("-do-" exp "od"))
 (insts (insts ";" insts)
(id ":=" exp)
-   ("if" exp "then" insts "fi")
-   ("if" exp "then" insts "else" insts "fi")
-   ("if" exp "then" insts
-"elif" exp "then" insts "else" insts "fi")
-   ("if" exp "then" insts
-"elif" exp "then" insts
-"elif" exp "then" insts "else" insts "fi")
-   ;; TODO OUSE for both case and conformity case
-   ("case" exp "in" fargs "esac")
-   ("case" exp "in" conformity-cases "esac")
-   ("case" exp "in" fargs "out" exp "esac")
(op-decl)
(type-decl)
(proc-decl)
+   (choice-clause)
(loop-clause)))
   "Algol 68 BNF operator precedence grammar to use with SMIE")
 
@@ -432,7 +473,7 @@ with the equivalent upcased form."
(smie-bnf->prec2 a68--bnf-grammar
 '((assoc "of" "[")
   (assoc ";")
-  (assoc "|" "|:")
+;  (assoc "|" "|:")
   (assoc ","))
 '((assoc "=" "/" ":=" ":=:" ":/=:"
  "+" "-" "*" "/")
@@ -440,7 +481,7 @@ with the equivalent upcased form."
  SMIE lexer
 
 (defvar a68--keywords-regexp
-  (regexp-opt '("+" "*" ";" ">" "<" ":=" "=" "," ":" "~")))
+  (regexp-opt '("|:" "(" ")" "+" "*" ";" ">" "<" ":=" "=" "," ":" "~")))
 
 (defun a68-at-strong-void-enclosed-clause ()
   "Return whether the point is at the beginning of a VOID enclosed clause."
@@ -509,6 +550,9 @@ with the equivalent upcased form."
 (defun a68--smie-forward-token ()

[elpa] externals/a68-mode fc9eeeae56 3/4: Several fixes related to lexing loops

[ELPA Syncer]

branch: externals/a68-mode
commit fc9eeeae565281570388d6d33d30e01ed1db743f
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Several fixes related to lexing loops
---
 a68-mode.el | 89 +
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/a68-mode.el b/a68-mode.el
index afee3ffa2c..d3fa94ca33 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -36,7 +36,12 @@
 ;; Vliet, and documented in two main works:
 ;;
 ;; - "An operator-priority grammar for Algol 68+"
+;;   L.G.L.T Meertens & J.C. van Vliet
+;;   https://ir.cwi.nl/pub/9325
+;;
 ;; - "Making ALGOL 68+ texts conform to an operator-priority grammar"
+;;   L.G.L.T Meertens & J.C. van Vliet
+;;   https://ir.cwi.nl/pub/9318
 ;;
 ;; The first article provides an operator-priority grammar for the
 ;; language, and indicates what inserts are necessary in order to
@@ -437,18 +442,20 @@ with the equivalent upcased form."
 (defvar a68--keywords-regexp
   (regexp-opt '("+" "*" ";" ">" "<" ":=" "=" "," ":" "~")))
 
-(defun a68-at-enclosed-clause ()
-  "Return whether the point is at the beginning of an enclosed clause."
+(defun a68-at-strong-void-enclosed-clause ()
+  "Return whether the point is at the beginning of a VOID enclosed clause."
   (save-excursion
 (forward-comment (- (point)))
-(or (looking-back (regexp-opt '(":" ":=" ":/=:" "=" "," ";" "["
-"@" "begin" "if" "then" "elif"
-"else" "case" "in" "ouse" "out"
-"of" "from" "by" "to" "while"
-"do" "(" "|" ")" "def" "postlude")))
-;; operator, so any nomad or monad.
-(looking-back (regexp-opt '("%" "^" "&" "+" "-" "~" "!" "?"
-">" "<" "/" "=" "*")))
+(or
+ ;; A VOID enclosed-clause may be preceded by one of the following
+ ;; symbols.
+ ;;
+ ;; Note the following symbols would have also be included if we
+ ;; were detecting a SORT MODE enclosed-clause: := :=: :/=: = [
+ ;; @ of from by to ) operator.
+ (looking-back (regexp-opt '(":" "," ";" "begin" "if" "then" "elif"
+"else" "case" "in" "ouse" "out"
+"while" "do" "(" "|" "|:" "def" 
"postlude")))
 ;; tag denotation or mode indication
 (and (looking-back "[A-Z][A-Za-z_]+")
  ;; Given the context at hand, i.e. a bold word followed
@@ -477,7 +484,7 @@ with the equivalent upcased form."
 (looking-back (regexp-opt '("%" "^" "&" "+" "-" "~" "!" "?"
 ">" "<" "/" "=" "*")
 
-(defun a68-at-after-an-unit ()
+(defun a68-at-post-unit ()
   "Return whether the point is immediately after an unit."
   (save-excursion
 (forward-comment (- (point)))
@@ -515,56 +522,56 @@ with the equivalent upcased form."
;; the beginning of a loop, provisionally, so it could be
;; corrected later by a top-down parser.  We proceed the same way
;; here, only our decision is final, be it right or wrong ;)
-   ((looking-at "from")
+   ((looking-at "\\")
 (cond
- ((a68-at-enclosed-clause)
+ ((a68-at-strong-void-enclosed-clause)
   (goto-char (+ (point) 4))
   "-from-")
- ((a68-at-after-an-unit)
+ ((a68-at-post-unit)
   (goto-char (+ (point) 4))
   "from")
  (t
   (goto-char (+ (point) 4))
   "-from-")))
-   ((looking-at "by")
+   ((looking-at "\\")
 (cond
- ((a68-at-enclosed-clause)
+ ((a68-at-strong-void-enclosed-clause)
   (goto-char (+ (point) 2))
   "-by-")
- ((a68-at-after-an-unit)
+ ((a68-at-post-unit)
   (goto-char (+ (point) 2))
   "by")
  (t
   (goto-char (+ (point) 2))
   "-by-")))
-   ((looking-at "to")
+   ((looking-at "\\")
 (cond
- ((a68-at-enclosed-clause)
+ ((a68-at-strong-void-enclosed-clause)
   (goto-char (+ (point) 2))
   "-to-")
- ((a68-at-after-an-unit)
+ ((a68-at-post-unit)
   (goto-char (+ (point) 2))
   "to")
  (t
   (goto-char (+ (point) 2))
   "-to-")))
-   ((looking-at "while")
+   ((looking-at "\\")
 (cond
- ((a68-at-enclosed-clause)
+ ((a68-at-strong-void-enclosed-clause)
   (goto-char (+ (point) 5))
   "-while-")
- ((a68-at-after-an-unit)
+ ((a68-at-post-unit)
   (goto-char (+ (point) 5))
   "while")
  (t
   (goto-char (+ (point) 5))
   "-while-")))
-   ((looking-at "do")
+   ((looking-at "\\")
 (cond
- ((a68-at-enclosed-clause)
+ ((a68-at-strong-void-enclosed-clause)
   (goto-char (+ (point) 2))
   "-do-")
- ((a68-at-after-an-unit)
+ ((a68-at-post-unit)
   (goto-char (+ (point) 2))
   "do")
  (t
@@ -584,48 +591,48 @@ with the equivalent upcased form."
   (cond
;; See comments in a68--smie-forward-token for an explanation of
;; t

[elpa] externals/a68-mode 021c559c7b 2/4: Add ~ to a68--keywords-regexp

[ELPA Syncer]

branch: externals/a68-mode
commit 021c559c7bd4f79ccbc0141e31d074d11044cdf7
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Add ~ to a68--keywords-regexp
---
 a68-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/a68-mode.el b/a68-mode.el
index 96311f150b..afee3ffa2c 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -435,7 +435,7 @@ with the equivalent upcased form."
  SMIE lexer
 
 (defvar a68--keywords-regexp
-  (regexp-opt '("+" "*" ";" ">" "<" ":=" "=" "," ":")))
+  (regexp-opt '("+" "*" ";" ">" "<" ":=" "=" "," ":" "~")))
 
 (defun a68-at-enclosed-clause ()
   "Return whether the point is at the beginning of an enclosed clause."

[elpa] externals/vc-jj ba7bc7e08d 1/2: Fix incorrect parent info

[ELPA Syncer]

branch: externals/vc-jj
commit ba7bc7e08d8a36371f60154cc11b301a6332eb42
Author: Rudi Schlatte 
Commit: Rudi Schlatte 

Fix incorrect parent info

Fixes #54
---
 vc-jj.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vc-jj.el b/vc-jj.el
index 90f40b5ba1..d41ca6a9aa 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -279,17 +279,17 @@ parents.map(|c| concat(
 (propertize string 'face face)
  (info (key description change-id change-id-prefix commit-id 
commit-id-prefix)
;; format a changeset info line
-   (let ((change-id-suffix (substring change-id (length 
change-id-short)))
- (commit-id-suffix (substring commit-id (length 
commit-id-short
+   (let ((change-id-suffix (substring change-id (length 
change-id-prefix)))
+ (commit-id-suffix (substring commit-id (length 
commit-id-prefix
  (concat
   (str (format "% -11s: " key) 'vc-dir-header)
   ;; There's no vc-dir-header-value-emphasis or similar
   ;; face, so we re-use vc-dir-status-up-to-date to render
   ;; the unique prefix
   " "
-  (str change-id-suffix 'vc-dir-status-ignored change-id-short)
+  (str change-id-suffix 'vc-dir-status-ignored change-id-prefix)
   " "
-  (str commit-id-suffix 'vc-dir-status-ignored commit-id-short)
+  (str commit-id-suffix 'vc-dir-status-ignored commit-id-prefix)
   " "
   (if (string-empty-p description)
   (str "(no description set)")

[elpa] externals/vc-jj updated (5e9da6f327 -> dc5a3c79a5)

[ELPA Syncer]

elpasync pushed a change to branch externals/vc-jj.

  from  5e9da6f327 Small simplification: use ensure-list where appropriate
   new  ba7bc7e08d Fix incorrect parent info
   new  dc5a3c79a5 Be robust in the presence of large files


Summary of changes:
 NEWS.org   |  10 -
 vc-jj-tests.el |  13 +-
 vc-jj.el   | 138 +++--
 3 files changed, 103 insertions(+), 58 deletions(-)

[nongnu] elpa/cider cbffc28502: Bump cider-nrepl to 0.55.3

[ELPA Syncer]

branch: elpa/cider
commit cbffc285023bfa3a0d035da804b42d89ee5d66eb
Author: Oleksandr Yakushev 
Commit: Oleksandr Yakushev 

Bump cider-nrepl to 0.55.3
---
 CHANGELOG.md   |  2 +-
 cider.el   |  2 +-
 dev/docker-sample-project/project.clj  |  2 +-
 dev/tramp-sample-project/project.clj   |  2 +-
 .../ROOT/pages/basics/middleware_setup.adoc| 10 +++---
 doc/modules/ROOT/pages/basics/up_and_running.adoc  |  4 +--
 doc/modules/ROOT/pages/cljs/shadow-cljs.adoc   |  2 +-
 doc/modules/ROOT/pages/cljs/up_and_running.adoc|  2 +-
 test/cider-tests.el| 36 +++---
 9 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f972f2d7a..dc9fd25e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 - [#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.
-- Bump the injected `cider-nrepl` to 
[0.55.1](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0551-2025-04-14).
+- Bump the injected `cider-nrepl` to 
[0.55.3](https://github.com/clojure-emacs/cider-nrepl/blob/master/CHANGELOG.md#0553-2025-04-24).
   - 
[compliment#122](https://github.com/alexander-yakushev/compliment/pull/122): 
Completion: sort candidates by priority.
   - Inspector: add dedicated view for Exceptions.
   - Stop vendoring Haystack dependency.
diff --git a/cider.el b/cider.el
index 9f79b33a1f..6a34fb0a0e 100644
--- a/cider.el
+++ b/cider.el
@@ -571,7 +571,7 @@ the artifact.")
 
 Used when `cider-jack-in-auto-inject-clojure' is set to `latest'.")
 
-(defconst cider-required-middleware-version "0.55.1"
+(defconst cider-required-middleware-version "0.55.3"
   "The CIDER nREPL version that's known to work properly with CIDER.")
 
 (defcustom cider-injected-middleware-version cider-required-middleware-version
diff --git a/dev/docker-sample-project/project.clj 
b/dev/docker-sample-project/project.clj
index b8a7fbfac1..fad2d34591 100644
--- a/dev/docker-sample-project/project.clj
+++ b/dev/docker-sample-project/project.clj
@@ -2,4 +2,4 @@
   :dependencies [[org.clojure/clojure "1.11.1"]
  [clj-http "3.12.3"]]
   :source-paths ["src"]
-  :plugins [[cider/cider-nrepl "0.55.1"]])
+  :plugins [[cider/cider-nrepl "0.55.3"]])
diff --git a/dev/tramp-sample-project/project.clj 
b/dev/tramp-sample-project/project.clj
index a869260bd3..f3a2cb0736 100644
--- a/dev/tramp-sample-project/project.clj
+++ b/dev/tramp-sample-project/project.clj
@@ -2,5 +2,5 @@
   :dependencies [[org.clojure/clojure "1.11.1"]
  [clj-http "3.12.3"]]
   :source-paths ["src"]
-  :plugins [[cider/cider-nrepl "0.55.1"]
+  :plugins [[cider/cider-nrepl "0.55.3"]
 [refactor-nrepl "3.9.0"]])
diff --git a/doc/modules/ROOT/pages/basics/middleware_setup.adoc 
b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
index 07475137ff..821dbca0bf 100644
--- a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
+++ b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
@@ -20,14 +20,14 @@ Use the convenient plugin for defaults, either in your 
project's
 
 [source,clojure]
 
-:plugins [[cider/cider-nrepl "0.55.1"]]
+:plugins [[cider/cider-nrepl "0.55.3"]]
 
 
 A minimal `profiles.clj` for CIDER would be:
 
 [source,clojure]
 
-{:repl {:plugins [[cider/cider-nrepl "0.55.1"]]}}
+{:repl {:plugins [[cider/cider-nrepl "0.55.3"]]}}
 
 
 WARNING: Be careful not to place this in the `:user` profile, as this way 
CIDER's
@@ -43,11 +43,11 @@ run `cider-connect` or `cider-connect-cljs`.
 
 [source,clojure]
 
-  :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.55.1"}}
+  :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.55.3"}}
   :main-opts ["-m" "nrepl.cmdline" "--middleware" 
"[cider.nrepl/cider-middleware]"]}
 
   :cider-cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.339"}
-cider/cider-nrepl {:mvn/version "0.55.1"}
+cider/cider-nrepl {:mvn/version "0.55.3"}
 cider/piggieback {:mvn/version "0.6.0"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware"

"[cider.nrepl/cider-middleware,cider.piggieback/wrap-cljs-repl]"]}
@@ -66,7 +66,7 @@ NOTE: Make sure you're using 
https://github.com/clojurephant/clojurephant[Clojur
 
 dependencies {
   devImplementation 'nrepl:nrepl:0.9.0'
-  devImplementation 'cider:cider-nrepl:0.55.1'
+  devImplementation 'cider:cider-nrepl:0.55.3'
 }
 
 tasks.named('clojureRepl') {
diff --git a/doc/modules/ROOT/pages/basics/up_and_running.adoc 
b/doc/modules/ROOT/pages/basics/up_and_running.adoc
index 2e5a0abced.

[elpa] externals/vc-jj dc5a3c79a5 2/2: Be robust in the presence of large files

[ELPA Syncer]

branch: externals/vc-jj
commit dc5a3c79a5d65b7e65d2a2d2b17937c4c36be7f8
Author: Rudi Schlatte 
Commit: Rudi Schlatte 

Be robust in the presence of large files

If a file is too large to be added to the repository, all jj commands
print a warning to stderr.  Ignore stderr when calling jj so that we
can parse the output.

Fixes #52
---
 NEWS.org   |  10 -
 vc-jj-tests.el |  13 +-
 vc-jj.el   | 130 +++--
 3 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 9142fc1113..1be5f7f13c 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -6,9 +6,15 @@
 
 - Display more information in =vc-dir= headers:
   - Display change id, commit id, description of the current changeset
-in one line
+in one line.
   - Display information about the current changeset's parent(s) in the
-same format
+same format.
+
+*** Fixed
+
+- Fix breakage when the project directory contains a file too large to
+  be automatically added.  (jj prints a warning in that case, even
+  when run with =--quiet=, so we need to discard output to stderr.)
 
 ** [[https://codeberg.org/emacs-jj-vc/vc-jj.el/compare/v0.1...v0.2][0.2]] - 
2025-04-18
 
diff --git a/vc-jj-tests.el b/vc-jj-tests.el
index 1cabdca062..9675fa429e 100644
--- a/vc-jj-tests.el
+++ b/vc-jj-tests.el
@@ -34,9 +34,9 @@
 (defun vc-jj-test-environment (seq)
   "Create a list suitable for prepending to `process-environment'.
 The purpose is to make tests reproducible by fixing timestamps,
-change ids, author information etc. SEQ is an integer that
+change ids, author information etc.  SEQ is an integer that
 modifies the JJ_RANDOMNESS_SEED, JJ_TIMESTAMP and JJ_OP_TIMESTAMP
-environment variables. Increasing values for SEQ will result in
+environment variables.  Increasing values for SEQ will result in
 increasing timestamps.
 
 Note that it not necessary to use this function, except when
@@ -210,5 +210,14 @@ is needed."
("with'apostrophe.txt" added)
("with\"quotation.txt" added))
 
+(ert-deftest vc-jj-looong-file ()
+  ;; https://codeberg.org/emacs-jj-vc/vc-jj.el/issues/52
+  (vc-jj-test-with-repo repo
+(shell-command "jj config set --repo snapshot.max-new-file-size 12")
+(write-region "1234567890" nil "numbers.txt")
+(write-region "abcdefghijklmnopqrstuvwxyz" nil "alphabet.txt")
+(should (eq (vc-jj-state "numbers.txt") 'added))
+(should (eq (vc-jj-state "alphabet.txt") 'ignored
+
 (provide 'vc-jj-tests)
 ;;; vc-jj-tests.el ends here
diff --git a/vc-jj.el b/vc-jj.el
index d41ca6a9aa..9b97be8746 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -101,31 +101,58 @@ If ROOT is given, the result is relative to the 
repository root,
 otherwise it is relative to the current directory."
   (if root
   (concat "root-file:\""
-  (string-replace "\"" "\\\"" (file-relative-name filename root))
-  "\"")
+  (string-replace "\"" "\\\"" (file-relative-name filename root))
+  "\"")
 (concat "cwd-file:\""
 (string-replace "\"" "\\\"" (file-relative-name filename)) "\"")))
 
-(defun vc-jj-command (buffer okstatus file-or-list &rest flags)
+(defun vc-jj--process-lines (&rest args)
+  "Run jj with ARGS, returning its output to stdout as a list of strings.
+In contrast to `process-lines', discard output to stderr since jj prints
+warnings to stderr even when run with '--quiet'."
+  (with-temp-buffer
+(let ((status (apply #'call-process vc-jj-program nil
+ ;; (current-buffer)
+ (list (current-buffer) nil)
+ nil args)))
+  (unless (eq status 0)
+   (error "'jj' exited with status %s" status))
+  (goto-char (point-min))
+  (let (lines)
+   (while (not (eobp))
+ (setq lines (cons (buffer-substring-no-properties
+(line-beginning-position)
+(line-end-position))
+   lines))
+ (forward-line 1))
+   (nreverse lines)
+
+(defun vc-jj--command-parseable (&rest args)
+  "Run jj with ARGS, returning its output as string.
+
+Note: any filenames in ARGS should be converted via
+`vc-jj--filename-to-fileset'.
+
+In contrast to `vc-jj--command-dispatched', discard output to stderr so
+the output can be safely parsed.  Does not support many of the features
+of `vc-jj--command-dispatched', such as async execution and checking of
+process status."
+  (with-temp-buffer
+(let ((status (apply #'call-process vc-jj-program nil
+ (list (current-buffer) nil)
+ nil args)))
+  (unless (eq status 0)
+   (error "'jj' exited with status %s" status))
+  (buffer-substring-no-properties (point-min) (point-max)
+
+(defun vc-jj--command-dispatched (buffer okstatus file-or-list &rest flags)
   "Execute `vc-jj-program', notifying the user and check

[nongnu] elpa/haskell-ts-mode 110fcbe118 1/3: Fix comment bug

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 110fcbe118672afbd1c5a4d43c6f6dcdb88a755e
Author: Pranshu Sharma 
Commit: Pranshu Sharma 

Fix comment bug
---
 haskell-ts-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index efd7c894bd..31ac4b4c28 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -439,7 +439,7 @@ when `haskell-ts-prettify-words' is non-nil.")
   ;; Comment
   (setq-local comment-start "-- ")
   (setq-local comment-use-syntax t)
-  (setq-local comment-start-skip "\\(?: \\|^\\)-+")
+  (setq-local comment-start-skip "\\(?: \\|^\\)--+")
   ;; Electric
   (setq-local electric-pair-pairs
   '((?` . ?`) (?\( . ?\)) (?{ . ?}) (?\" . ?\") (?\[ . ?\])))

[nongnu] elpa/haskell-ts-mode 0617de6e49 2/3: bump version

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 0617de6e49ca0465e06d30edc266786a3f6411fb
Author: Pranshu Sharma 
Commit: Pranshu Sharma 

bump version
---
 haskell-ts-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 31ac4b4c28..516a336546 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Pranshu Sharma 
 ;; URL: https://codeberg.org/pranshu/haskell-ts-mode
 ;; Package-Requires: ((emacs "29.3"))
-;; Version: 1.01
+;; Version: 1.1.1
 ;; Keywords: languages, haskell
 
 ;; This program is free software; you can redistribute it and/or modify

[nongnu] elpa/haskell-ts-mode updated (c96d686198 -> 12b3f9c735)

[ELPA Syncer]

elpasync pushed a change to branch elpa/haskell-ts-mode.

  from  c96d686198 Move the derived parent thing out of haskell-mode
   new  110fcbe118 Fix comment bug
   new  0617de6e49 bump version
   new  12b3f9c735 Set comment overide


Summary of changes:
 haskell-ts-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[nongnu] elpa/haskell-ts-mode 12b3f9c735 3/3: Set comment overide

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 12b3f9c735fb4aa09ad7cb20d4beed627827546f
Author: Pranshu Sharma 
Commit: Pranshu Sharma 

Set comment overide

fixes #28
---
 haskell-ts-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 516a336546..b490ffe55c 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Pranshu Sharma 
 ;; URL: https://codeberg.org/pranshu/haskell-ts-mode
 ;; Package-Requires: ((emacs "29.3"))
-;; Version: 1.1.1
+;; Version: 1.1.2
 ;; Keywords: languages, haskell
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -181,6 +181,7 @@ when `haskell-ts-prettify-words' is non-nil.")
  (match ("->" @font-lock-doc-face)))
 
:language 'haskell
+   :override t
:feature 'comment
`(((comment) @font-lock-comment-face)
  ((haddock) @font-lock-doc-face))

[nongnu] elpa/org-journal e581bf5530 2/2: Merge pull request #456 from danielfleischer/patch-1

[ELPA Syncer]

branch: elpa/org-journal
commit e581bf5530054a40f933fdcc41e65aa0eedbd7da
Merge: cf72173233 d4b3cfd108
Author: Bastian Bechtold 
Commit: GitHub 

Merge pull request #456 from danielfleischer/patch-1

kill buffer function
---
 org-journal.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-journal.el b/org-journal.el
index ca41aac6ae..d274fb3202 100644
--- a/org-journal.el
+++ b/org-journal.el
@@ -1887,7 +1887,7 @@ If STR is empty, search for all entries using 
`org-journal-time-prefix'."
 (unless org-journal-search-mode-map
   (setq org-journal-search-mode-map
 (let ((map (make-sparse-keymap)))
-  (define-key map "q" 'kill-this-buffer)
+  (define-key map "q" 'kill-current-buffer)
   (define-key map (kbd "") 'org-journal--search-next)
   (define-key map (kbd "") 'org-journal--search-prev)
   (define-key map "n" 'org-journal--search-next)

[nongnu] elpa/org-journal d4b3cfd108 1/2: kill buffer function

[ELPA Syncer]

branch: elpa/org-journal
commit d4b3cfd1081a4d910c2c87ed6478dca6beebab0c
Author: Daniel Fleischer 
Commit: GitHub 

kill buffer function

`kill-current-buffer` is the correct function, as `kill-this-buffer` is 
intended to be used with a mouse.
---
 org-journal.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-journal.el b/org-journal.el
index ca41aac6ae..d274fb3202 100644
--- a/org-journal.el
+++ b/org-journal.el
@@ -1887,7 +1887,7 @@ If STR is empty, search for all entries using 
`org-journal-time-prefix'."
 (unless org-journal-search-mode-map
   (setq org-journal-search-mode-map
 (let ((map (make-sparse-keymap)))
-  (define-key map "q" 'kill-this-buffer)
+  (define-key map "q" 'kill-current-buffer)
   (define-key map (kbd "") 'org-journal--search-next)
   (define-key map (kbd "") 'org-journal--search-prev)
   (define-key map "n" 'org-journal--search-next)

[elpa] externals/a68-mode updated (bd8268af32 -> 7574685518)

[ELPA Syncer]

elpasync pushed a change to branch externals/a68-mode.

  from  bd8268af32 Improve choice-clauses in SMIE grammar
   new  1563857067 Fix regexps in font-lock-keywords for SUPPER
   new  723e53387a Add some :after entries to a68--smie-rules-supper
   new  90448d0577 Fix indentation of | and |:
   new  7574685518 Add pseudo-operators to SMIE grammar and fix indentation 
:after "else"


Summary of changes:
 a68-mode.el | 62 +++--
 1 file changed, 48 insertions(+), 14 deletions(-)

[elpa] externals/a68-mode 90448d0577 3/4: Fix indentation of | and |:

[ELPA Syncer]

branch: externals/a68-mode
commit 90448d05775350aa2e0ae23f8edaeb2376dbb704
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Fix indentation of | and |:
---
 a68-mode.el | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/a68-mode.el b/a68-mode.el
index f4ac402e1e..7dbb72f374 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -475,7 +475,6 @@ with the equivalent upcased form."
(smie-bnf->prec2 a68--bnf-grammar
 '((assoc "of" "[")
   (assoc ";")
-;  (assoc "|" "|:")
   (assoc ","))
 '((assoc "=" "/" ":=" ":=:" ":/=:"
  "+" "-" "*" "/")
@@ -701,6 +700,10 @@ with the equivalent upcased form."
 (`(,_ . ";") (smie-rule-separator kind))
 (`(:after . ":=") a68-indent-level)
 (`(:after . "=") a68-indent-level)
+;; Since "|" is in the same BNF rule as "(" in choice-clauses,
+;; SMIE by default aligns it with it.
+(`(:before . "|")
+ (if (not smie-rule-sibling-p) 3))
 (`(:before . "BEGIN")
  (when (or (smie-rule-hanging-p)
(or
@@ -726,6 +729,10 @@ with the equivalent upcased form."
 (`(:elem . basic) a68-indent-level)
 (`(,_ . ",") (smie-rule-separator kind))
 (`(,_ . ";") (smie-rule-separator kind))
+;; Since "|" is in the same BNF rule as "(" in choice-clauses,
+;; SMIE by default aligns it with it.
+(`(:before . ,(or "|" "|:"))
+ (if (not (smie-rule-sibling-p)) 1))
 (`(:after . ":=") a68-indent-level)
 (`(:after . "=") a68-indent-level)
 (`(:after . "begin") 6)

[elpa] externals/a68-mode 723e53387a 2/4: Add some :after entries to a68--smie-rules-supper

[ELPA Syncer]

branch: externals/a68-mode
commit 723e53387a91a194d30cf17a9064168e9c850574
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Add some :after entries to a68--smie-rules-supper
---
 a68-mode.el | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/a68-mode.el b/a68-mode.el
index 7a1a64c4fe..f4ac402e1e 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -728,6 +728,20 @@ with the equivalent upcased form."
 (`(,_ . ";") (smie-rule-separator kind))
 (`(:after . ":=") a68-indent-level)
 (`(:after . "=") a68-indent-level)
+(`(:after . "begin") 6)
+(`(:after . "then") 5)
+(`(:after . "elif") 5)
+(`(:after . "case") 5)
+(`(:after . "ouse") 5)
+(`(:after . "out") 4)
+(`(:after . "in") 3)
+(`(:after . "for") 4)
+(`(:after . "do") 3)
+(`(:after . "from") 5)
+(`(:after . "by") 3)
+(`(:after . "to") 3)
+(`(:after . "while") 3)
+(`(:after . "def") 4)
 (`(:before . "begin")
  (when (or (smie-rule-hanging-p)
(or

[elpa] externals/a68-mode 1563857067 1/4: Fix regexps in font-lock-keywords for SUPPER

[ELPA Syncer]

branch: externals/a68-mode
commit 15638570676cc09d2e64f5ba843463d7247d70f1
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Fix regexps in font-lock-keywords for SUPPER
---
 a68-mode.el | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/a68-mode.el b/a68-mode.el
index e8b6e73b54..7a1a64c4fe 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -232,12 +232,14 @@
   word-end)
   ''font-lock-constant-face)
 ;; Tags.
-(cons "\\<[a-z]\\([a-z]_\\)*\\>" ''font-lock-variable-name-face)
-;; By convention operators have only upper-letter names.
-(cons "\\<\\([A-Z]+\\>\\)" ''font-lock-keyword-face)
-;; Mode names use ThisCase.
-(cons "\\<\\([A-Z][A-Za-z_]*\\>\\)" ''font-lock-type-face)))
-   "Highlighting expressions for Algol 68 mode in SUPPER stropping.")
+(cons "\\<\\([a-z][a-z]+_?\\)+\\>" ''font-lock-variable-name-face)
+;; Mode names start with an upper case letter.
+;; To distinguish from operator indications in highlighting,
+;; we mandate type faced strings to have at least one
+;; lower-case letter.
+(cons "\\<\\([A-Z][A-Za-z_]*[a-z][A-Za-z_]*\\)\\>" ''font-lock-type-face)
+(cons "\\<\\([A-Z][A-Z_]*\\)\\>" ''font-lock-keyword-face)))
+  "Highlighting expressions for Algol 68 mode in SUPPER stropping.")
 
  Syntax-based text properties.
 
@@ -639,14 +641,14 @@ with the equivalent upcased form."
;; See comments in a68--smie-forward-token for an explanation of
;; the handling of loop insertions -from- -to- -by- -while-.
((looking-back "\\")
-(cond
  (goto-char (- (point) 4))
- ((a68-at-strong-void-enclosed-clause)
-  "-from-")
- ((a68-at-post-unit)
-  "from")
- (t
-  "-from-")))
+ (cond
+  ((a68-at-strong-void-enclosed-clause)
+   "-from-")
+  ((a68-at-post-unit)
+   "from")
+  (t
+   "-from-")))
((looking-back "\\")
 (goto-char (- (point) 2))
 (cond

[elpa] externals/vc-jj 3ab18783d3: Tweak README

[ELPA Syncer]

branch: externals/vc-jj
commit 3ab18783d3a78286f34c1c52decd8840478105a1
Author: Rudi Schlatte 
Commit: Rudi Schlatte 

Tweak README

Clarify contributing trivial changes, link to Emacs manuals and elpa.
---
 README.org | 23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 5200ad40ea..b5b26ab0b7 100644
--- a/README.org
+++ b/README.org
@@ -1,15 +1,16 @@
 * jj (Jujutsu) integration with Emacs vc.el and project.el
 
-Work-in-progress support for =vc.el= and =project.el= implementations for
-the [[https://github.com/jj-vcs/jj][Jujutsu]] version control system.
+Support for Emacs built-in 
[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Version-Control.html][=vc.el=]]
 and 
[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Projects.html][=project.el=]]
 for the [[https://github.com/jj-vcs/jj][Jujutsu]]
+version control system.
 
-** Contributing
+** Installation
 
-We welcome bug reports and pull requests!  Since =vc-jj.el= is
-distributed via GNU elpa, non-trivial code contributions need to have
-the standard FSF copyright assignment in place.
+This package is distributed via GNU Elpa
+(https://elpa.gnu.org/packages/vc-jj.html) and can be installed via
+=M-x package-install=.
 
-** Jujutsu configuration hints
+
+** Jujutsu configuration
 
 Emacs has built-in support for git-style diff and conflict markers, so
 you might want to set the following options in your Jujutsu
@@ -21,3 +22,11 @@ configuration, for example via =jj config edit --user= or 
=jj config edit
 diff.format = "git"
 conflict-marker-style = "git"
 #+end_src
+
+** Contributing
+
+We welcome bug reports and pull requests!  Since =vc-jj.el= is
+distributed via GNU elpa, non-trivial code contributions need to have
+the standard FSF copyright assignment in place; feel free to contact
+us for details.  Note that "trivial" (below 15 lines or obvious) code
+suggestions in bug reports are fine.

[elpa] externals/denote-org 3f525c88f0 2/2: Escape nested dynamic blocks or keywords by prepending a zero-width space to them

[ELPA Syncer]

branch: externals/denote-org
commit 3f525c88f02bce6b44f9d4471fa6fe36f7960b65
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Escape nested dynamic blocks or keywords by prepending a zero-width space 
to them
---
 denote-org.el | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/denote-org.el b/denote-org.el
index 57bbec8034..8d98f7b4c7 100644
--- a/denote-org.el
+++ b/denote-org.el
@@ -584,6 +584,14 @@ Used by `org-dblock-update' with PARAMS provided by the 
dynamic block."
 
 ; Dynamic block to insert entire file contents
 
+(defun denote-org-escape-code-in-region (beg end)
+  "Like `org-escape-code-in-region' to escape only #+ by appending a zero 
width space to it.
+Operate on the region between positions BEG and END."
+  (save-excursion
+(goto-char end)
+(while (re-search-backward "^[ \t]*\\(#\\+\\)" beg t)
+  (save-excursion (replace-match "​\\1" nil nil nil 1)
+
 (defun denote-org-dblock--get-file-contents (file &optional no-front-matter 
add-links)
   "Insert the contents of FILE.
 With optional NO-FRONT-MATTER as non-nil, try to remove the front
@@ -615,7 +623,8 @@ argument."
  (1+ (re-search-forward "^$" nil :no-error 1)))
beginning-of-contents))
 (when add-links
-  (indent-region beginning-of-contents (point-max) 2)))
+  (indent-region beginning-of-contents (point-max) 2))
+(denote-org-escape-code-in-region beginning-of-contents (point-max)))
   (buffer-string
 
 (defvar denote-org-dblock-file-contents-separator
@@ -741,7 +750,8 @@ With optional ADD-LINKS, make the title link to the 
original file."
 (insert (format "* %s %s\n\n" title tags)))
   (org-align-tags :all))
 (while (re-search-forward "^\\(*+?\\) " nil :no-error)
-  (replace-match (format "*%s " "\\1"
+  (replace-match (format "*%s " "\\1")))
+(denote-org-escape-code-in-region beginning-of-contents (point-max)))
   (buffer-string
 
 (defun denote-org-dblock-add-files-as-headings (regexp &optional add-links 
sort-by-component reverse excluded-dirs-regexp exclude-regexp)

[elpa] externals/denote-org updated (03df0d9f3e -> 3f525c88f0)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote-org.

  from  03df0d9f3e Make denote-org-dblock--get-file-contents-as-heading 
region deletion more robust
   new  9647c7bd92 Consolidate the 'eval-after-load' for the dynamic blocks
   new  3f525c88f0 Escape nested dynamic blocks or keywords by prepending a 
zero-width space to them


Summary of changes:
 denote-org.el | 54 ++
 1 file changed, 22 insertions(+), 32 deletions(-)

[elpa] externals/denote-org 9647c7bd92 1/2: Consolidate the 'eval-after-load' for the dynamic blocks

[ELPA Syncer]

branch: externals/denote-org
commit 9647c7bd924bd758e26a38c249f68ed44aff687f
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Consolidate the 'eval-after-load' for the dynamic blocks
---
 denote-org.el | 40 ++--
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/denote-org.el b/denote-org.el
index 5368f4971f..57bbec8034 100644
--- a/denote-org.el
+++ b/denote-org.el
@@ -454,12 +454,6 @@ Also see `denote-org-dblock--files'."
:include-date nil))
   (org-update-dblock))
 
-;; NOTE 2024-03-30: This is how the autoload is done in org.el.
-;;;###autoload
-(eval-after-load 'org
-  '(progn
- (org-dynamic-block-define "denote-links" 
'denote-org-dblock-insert-links)))
-
 ;; TODO 2024-12-04: Maybe we can do this for anything that deals with
 ;; regular expressions that users provide?  I prefer not to do the
 ;; work if nobody wants it, though I am mentioning this here just in
@@ -520,12 +514,6 @@ Used by `org-dblock-update' with PARAMS provided by the 
dynamic block."
:include-date nil))
   (org-update-dblock))
 
-;; NOTE 2024-03-30: This is how the autoload is done in org.el.
-;;;###autoload
-(eval-after-load 'org
-  '(progn
- (org-dynamic-block-define "denote-missing-links" 
'denote-org-dblock-insert-missing-links)))
-
 ;;;###autoload
 (defun org-dblock-write:denote-missing-links (params)
   "Function to update `denote-links' Org Dynamic blocks.
@@ -578,12 +566,6 @@ Used by `org-dblock-update' with PARAMS provided by the 
dynamic block."
:include-date nil))
   (org-update-dblock))
 
-;; NOTE 2024-03-30: This is how the autoload is done in org.el.
-;;;###autoload
-(eval-after-load 'org
-  '(progn
- (org-dynamic-block-define "denote-backlinks" 
'denote-org-dblock-insert-backlinks)))
-
 ;;;###autoload
 (defun org-dblock-write:denote-backlinks (params)
   "Function to update `denote-backlinks' Org Dynamic blocks.
@@ -707,12 +689,6 @@ among `denote-sort-components'."
:add-links nil))
   (org-update-dblock))
 
-;; NOTE 2024-03-30: This is how the autoload is done in org.el.
-;;;###autoload
-(eval-after-load 'org
-  '(progn
- (org-dynamic-block-define "denote-files" 
'denote-org-dblock-insert-files)))
-
 ;;;###autoload
 (defun org-dblock-write:denote-files (params)
   "Function to update `denote-files' Org Dynamic blocks.
@@ -832,12 +808,6 @@ as its own heading."
:add-links nil))
   (org-update-dblock))
 
-;; NOTE 2024-03-30: This is how the autoload is done in org.el.
-;;;###autoload
-(eval-after-load 'org
-  '(progn
- (org-dynamic-block-define "denote-files-as-headings" 
'denote-org-dblock-insert-files-as-headings)))
-
 ;;;###autoload
 (defun org-dblock-write:denote-files-as-headings (params)
   "Function to update `denote-files' Org Dynamic blocks.
@@ -853,5 +823,15 @@ Used by `org-dblock-update' with PARAMS provided by the 
dynamic block."
 (when rx (denote-org-dblock-add-files-as-headings rx add-links sort 
reverse excluded-dirs not-rx)))
   (join-line)) ; remove trailing empty line
 
+;; NOTE 2024-03-30: This is how the autoload is done in org.el.
+;;;###autoload
+(eval-after-load 'org
+  '(progn
+ (org-dynamic-block-define "denote-links" 'denote-org-dblock-insert-links)
+ (org-dynamic-block-define "denote-missing-links" 
'denote-org-dblock-insert-missing-links)
+ (org-dynamic-block-define "denote-backlinks" 
'denote-org-dblock-insert-backlinks)
+ (org-dynamic-block-define "denote-files" 'denote-org-dblock-insert-files)
+ (org-dynamic-block-define "denote-files-as-headings" 
'denote-org-dblock-insert-files-as-headings)))
+
 (provide 'denote-org)
 ;;; denote-org.el ends here

[elpa] externals/a68-mode 7574685518 4/4: Add pseudo-operators to SMIE grammar and fix indentation :after "else"

[ELPA Syncer]

branch: externals/a68-mode
commit 75746855185ab9262fb3e0e72b093d47bff6fcd3
Author: Jose E. Marchesi 
Commit: Jose E. Marchesi 

Add pseudo-operators to SMIE grammar and fix indentation :after "else"
---
 a68-mode.el | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/a68-mode.el b/a68-mode.el
index 7dbb72f374..82ed28f14e 100644
--- a/a68-mode.el
+++ b/a68-mode.el
@@ -370,6 +370,9 @@ with the equivalent upcased form."
 (proc-decl (proc-decl "," proc-decl)
("op" ids "=" args ids ":" exp)
("proc" ids "=" ids ":" exp))
+;; Formulae.
+;; Standard operators are given their priority.
+;; XXX
 ;; Enquiry clause:
 ;;  enquiry clause :
 ;;   series.
@@ -451,8 +454,15 @@ with the equivalent upcased form."
  ("-to-" exp "do" exp "od")
  ("-while-" exp "do" exp "od")
  ("-do-" exp "od"))
+(pseudo-operator (exp "andth" exp)
+ (exp "orel" exp)
+ (exp ":=:" exp)
+ (exp ":/=:" exp)
+ (exp "is" exp)
+ (exp "isnt" exp))
 (insts (insts ";" insts)
(id ":=" exp)
+   (pseudo-operator)
(op-decl)
(type-decl)
(proc-decl)
@@ -737,6 +747,7 @@ with the equivalent upcased form."
 (`(:after . "=") a68-indent-level)
 (`(:after . "begin") 6)
 (`(:after . "then") 5)
+(`(:after . "else") 5)
 (`(:after . "elif") 5)
 (`(:after . "case") 5)
 (`(:after . "ouse") 5)

[elpa] externals/hyperbole 3f13371dfb: Use ert test resources (#714)

[ELPA Syncer]

branch: externals/hyperbole
commit 3f13371dfb42b3059f86296b1dd11bee801ca1c2
Author: Mats Lidell 
Commit: GitHub 

Use ert test resources (#714)
---
 ChangeLog  | 15 +++
 test/MANIFEST  |  4 +++
 test/hibtypes-resources/TAGS   |  3 +++
 test/hibtypes-resources/test-data.el   | 21 +++
 test/hibtypes-tests.el | 47 --
 test/hmouse-drv-resources/TAGS |  3 +++
 test/hmouse-drv-resources/test-data.el | 21 +++
 test/hmouse-drv-tests.el   | 41 ++---
 8 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b141b29bc2..0e8f575ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2025-04-25  Mats Lidell  
+
+* test/MANIFEST: Add resource folders.
+
+* test/hmouse-drv-resources/test-data.el:
+  test/hmouse-drv-resources/TAGS:
+  test/hibtypes-resources/test-data.el:
+  test/hibtypes-resources/TAGS: Test resources.
+
+* test/hmouse-drv-tests.el (hbut-ctags-vgrind-test, hbut-etags-test): Use
+test resources.
+
+* test/hibtypes-tests.el (ibtypes::ctags-vgrind-test)
+(ibtypes::etags-test): Use test resources.
+
 2025-04-23  Mats Lidell  
 
 * test/hywiki-tests.el (hywiki-tests--word-n-face-at): Verify that point
diff --git a/test/MANIFEST b/test/MANIFEST
index 37356fdd7b..80854f59d0 100644
--- a/test/MANIFEST
+++ b/test/MANIFEST
@@ -33,3 +33,7 @@ kotl-orgtbl-tests.el- kotl orgtbl tests
 set-tests.el- mathematical set library tests
 smart-org-tests.el  - smart-org-el tests
 test-helpers-tests.el   - unit test of the test helpers
+
+--- HYPERBOLE TEST RESOURCES ---
+hibtypes-resources  - test resources for hibtypes-tests
+hmouse-drv-resources- test resources for hmouse-drv-tests
diff --git a/test/hibtypes-resources/TAGS b/test/hibtypes-resources/TAGS
new file mode 100644
index 00..d0635cb7a5
--- /dev/null
+++ b/test/hibtypes-resources/TAGS
@@ -0,0 +1,3 @@
+
+test-data.el,25
+(defun test-func 19,386
diff --git a/test/hibtypes-resources/test-data.el 
b/test/hibtypes-resources/test-data.el
new file mode 100644
index 00..6aa981fef4
--- /dev/null
+++ b/test/hibtypes-resources/test-data.el
@@ -0,0 +1,21 @@
+;;; test-data.el
+
+;; Author:   Mats Lidell 
+;;
+;; Orig-Date:24-Apr-25 at 22:20:39
+;; Last-Mod: 24-Apr-25 at 22:22:16 by Mats Lidell
+;;
+;; SPDX-License-Identifier: GPL-3.0-or-later
+;;
+;; Copyright (C) 2025  Free Software Foundation, Inc.
+;; See the "HY-COPY" file for license information.
+;;
+;; This file is part of GNU Hyperbole.
+
+;;; Commentary:
+
+;;; Code:
+
+(defun test-func ()
+  "Test function."
+  nil)
diff --git a/test/hibtypes-tests.el b/test/hibtypes-tests.el
index 3998c5bd73..ab2bef76ad 100644
--- a/test/hibtypes-tests.el
+++ b/test/hibtypes-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:20-Feb-21 at 23:45:00
-;; Last-Mod:  8-Sep-24 at 00:48:52 by Mats Lidell
+;; Last-Mod: 24-Apr-25 at 23:49:38 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -19,6 +19,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'hibtypes)
 (require 'info)
 (require 'el-mock)
@@ -215,36 +216,32 @@
 
 ;; ctags
 ;; Seems ctags -v does not give the proper answer
-;; FIXME: Rewrite to not depend on hy-test-helpers.el
 (ert-deftest ibtypes::ctags-vgrind-test ()
-  (unwind-protect
-  (with-temp-buffer
-(insert "hy-test-helpers:consume-input-events hy-test-helpers.el 25\n")
-(goto-char (point-min))
-(forward-char 4)
-(let ((default-directory (expand-file-name "test" hyperb:dir)))
+  (let ((default-directory (ert-resource-directory)))
+(unwind-protect
+(with-temp-buffer
+  (insert "test-func test-data.el 19\n")
+  (goto-char (point-min))
+  (forward-char 4)
   (ibtypes::ctags)
-  (set-buffer "hy-test-helpers.el")
-  (should (looking-at "(defun hy-test-helpers:consume-input-events"
-(kill-buffer "hy-test-helpers.el")))
+  (set-buffer "test-data.el")
+  (should (looking-at "(defun test-func")))
+  (hy-test-helpers:kill-buffer "test-data.el"
 
 ;; etags
-;; FIXME: Rewrite to not depend on hy-test-helpers.el
 (ert-deftest ibtypes::etags-test ()
-  (unwind-protect
-  (with-temp-buffer
-(insert "\n")
-(insert "hy-test-helpers.el,237\n")
-(insert "(defun hy-test-helpers:consume-input-events 25,518\n")
-(rename-buffer (concat "TAGS" (buffer-name)))
-(goto-char (point-min))
-(forward-line 2)
-(forward-char 10)
-(let ((default-directory (expand-file-name "test" hyperb:dir)))
+  (let ((tags (find-file (ert-resource-file "TAGS")))
+(default-directory (ert-resource-directory)))
+(unwind-protect
+(with-current-buffer tags
+  (goto-char (point-min))
+  (forwar

[nongnu] elpa/helm e40fb76dde 1/2: Update News

[ELPA Syncer]

branch: elpa/helm
commit e40fb76dde7053204bea4c9171a35c2acc0bece5
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Update News
---
 NEWS.org | 8 
 1 file changed, 8 insertions(+)

diff --git a/NEWS.org b/NEWS.org
index 34f9125eee..7f119fcabb 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -2,6 +2,14 @@
 
 * NEWS
 ** Version 4.0.3
+*** Allow filtering sources in current session
+It is bound to C-M-e in helm-map.
+*** Change `helm-current-directory-alist` default value
+Now C-x C-f from a Gnus buffer brings to News directory.
+*** Exclude commands related to specific modes in helm-M-x
+This is available only in Emacs with an interactive version supporting
+MODES argument.  It is configurable with
+`helm-M-x-exclude-unusable-commands-in-mode`, default to t.
 *** Fix preselection after persistent killing buffers
 *** Improve colors in ttys
 *** Add new actions to helm-find-files

[nongnu] elpa/helm 294e7a103f 2/2: Fix theme affixation with themes with no docstring

[ELPA Syncer]

branch: elpa/helm
commit 294e7a103fe10cb121c7849e3dd2dd17ab2b2d60
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix theme affixation with themes with no docstring
---
 helm-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helm-mode.el b/helm-mode.el
index 1e271d2447..47b463ae93 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -1330,8 +1330,9 @@ is used."
  (condition-case nil
  (read (current-buffer))
(end-of-file nil)))
-  (when (eq (car-safe it) 'deftheme)
-(cl-return (setq doc (car (split-string (nth 2 it) "\n"))
+  (let ((docstring (nth 2 it)))
+(when (and (eq (car-safe it) 'deftheme) docstring)
+  (cl-return (setq doc (car (split-string docstring "\n")))
 (unless doc
   (setq doc (helm--get-theme-doc-from-header)
 doc))

[nongnu] elpa/helm updated (0c1b459489 -> 294e7a103f)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  0c1b459489 Add helm-only prop to helm-limit-to-sources
   new  e40fb76dde Update News
   new  294e7a103f Fix theme affixation with themes with no docstring


Summary of changes:
 NEWS.org | 8 
 helm-mode.el | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

[elpa] externals/modus-themes 1fe0a3c9c4: Introduce 'property' mapping

[ELPA Syncer]

branch: externals/modus-themes
commit 1fe0a3c9c46e66e6634e0ed23f2b5450497f618d
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Introduce 'property' mapping

Thanks to Alexandr Semenov for requesting this in issue 141:
.
---
 doc/modus-themes.info| 77 ++--
 doc/modus-themes.org | 67 +++
 modus-operandi-deuteranopia-theme.el |  1 +
 modus-operandi-theme.el  |  1 +
 modus-operandi-tinted-theme.el   |  1 +
 modus-operandi-tritanopia-theme.el   |  1 +
 modus-themes.el  |  1 +
 modus-vivendi-deuteranopia-theme.el  |  1 +
 modus-vivendi-theme.el   |  1 +
 modus-vivendi-tinted-theme.el|  1 +
 modus-vivendi-tritanopia-theme.el|  1 +
 11 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index c2d294bbd0..950cc4fc3b 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -5915,39 +5915,40 @@ Contributions to code or documentation
 
 Ideas and user feedback
  Aaron Jensen, Adam Porter, Adam Spiers, Adrian Manea, Aleksei
- Pirogov, Alex Griffin, Alex Koen, Alex Peitsinis, Alexey Shmalko,
- Alok Singh, Anders Johansson, André Alexandre Gomes, Andrew Tropin,
- Antonio Hernández Blas, Arif Rezai, Augusto Stoffel, Basil L.
- Contovounesios, Bernd Rellermeyer, Burgess Chang, Charlotte Van
- Petegem, Christian Tietze, Christopher Dimech, Christopher League,
- Damien Cassou, Daniel Mendler, Dario Gjorgjevski, David Edmondson,
- Davor Rotim, Divan Santana, Eliraz Kedmi, Emanuele Michele Alberto
- Monterosso, Farasha Euker, Feng Shu, Filippo Argiolas, Gautier
- Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa,
- Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken,
- Imran Khan, Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James
- Ferguson, Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman,
- John Wick, Jonas Collberg, Jorge Morais, Joshua O’Connor, Julio C.
- Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin
- Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg,
- Lennart C. Karssen, Luis Miguel Castañeda, Magne Hov, Manuel
- Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark Simpson,
- Marko Kocic, Markus Beppler, Matt Armstrong, Matthias Fuchs,
- Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael Goldenberg,
- Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky van Foreest,
- Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen, Oliver Epper,
- Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter
- Wu, Philip Kaludercic, Pierre Téchoueyres, Przemysław Kryger,
- Robert Hepple, Roman Rudakov, Russell Sim, Ryan Phillips, Rytis
- Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper, Saša
- Janiška, Shreyas Ragavan, Simon Pugnet, Steve Downey, Tassilo Horn,
- Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan Muftuoglu,
- Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes, Uri
- Sharf, Utkarsh Singh, Vincent Foley, Zoltan Kiraly.  As well as
- users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux,
- Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey,
- ZharMeny, bepolymathe, bit9tream, bangedorrunt, derek-upham,
- doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
+ Pirogov, Alex Griffin, Alex Koen, Alex Peitsinis, Alexandr Semenov,
+ Alexey Shmalko, Alok Singh, Anders Johansson, André Alexandre
+ Gomes, Andrew Tropin, Antonio Hernández Blas, Arif Rezai, Augusto
+ Stoffel, Basil L. Contovounesios, Bernd Rellermeyer, Burgess Chang,
+ Charlotte Van Petegem, Christian Tietze, Christopher Dimech,
+ Christopher League, Damien Cassou, Daniel Mendler, Dario
+ Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Eliraz
+ Kedmi, Emanuele Michele Alberto Monterosso, Farasha Euker, Feng
+ Shu, Filippo Argiolas, Gautier Ponsinet, Gerry Agbobada, Gianluca
+ Recchia, Gonçalo Marrafa, Guilherme Semente, Gustavo Barros,
+ Hörmetjan Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan
+ Popovych, Jabir Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry
+ Zhang, Johannes Grødem, John Haman, John Wick, Jonas Collberg,
+ Jorge Morais, Joshua O’Connor, Julio C.  Villasante, Kenta Usami,
+ Kevin Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev,
+ Laith Bahodi, Lasse Lindner, Len Trigg, Lennart C. Karssen, Luis
+ Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark
+ Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler,
+ Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda,
+ Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock,
+ Murilo Pereira, Nicky 

[elpa] externals/minuet 6e523c740f: doc: update environment variable setting example for Windows user.

[ELPA Syncer]

branch: externals/minuet
commit 6e523c740f50b6724d089f1061d5af0eddb26071
Author: Milan Glacier 
Commit: Milan Glacier 

doc: update environment variable setting example for Windows user.
---
 README.md | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be5da06ac8..0723c457db 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,9 @@ preferred package managers.
 ;; you should adjust the context window to a larger value.
 (setq minuet-context-window 512)
 (plist-put minuet-openai-fim-compatible-options :end-point 
"http://localhost:11434/v1/completions";)
-;; an arbitrary non-null environment variable as placeholder
+;; an arbitrary non-null environment variable as placeholder.
+;; For Windows users, TERM may not be present in environment variables.
+;; Consider using APPDATA instead.
 (plist-put minuet-openai-fim-compatible-options :name "Ollama")
 (plist-put minuet-openai-fim-compatible-options :api-key "TERM")
 (plist-put minuet-openai-fim-compatible-options :model "qwen2.5-coder:3b")
@@ -209,6 +211,8 @@ llama-server \
 (setq minuet-context-window 512)
 (plist-put minuet-openai-fim-compatible-options :end-point 
"http://localhost:8012/v1/completions";)
 ;; an arbitrary non-null environment variable as placeholder
+;; For Windows users, TERM may not be present in environment variables.
+;; Consider using APPDATA instead.
 (plist-put minuet-openai-fim-compatible-options :name "Llama.cpp")
 (plist-put minuet-openai-fim-compatible-options :api-key "TERM")
 ;; The model is set by the llama-cpp server and cannot be altered

[nongnu] elpa/bash-completion a79863f9c2 1/4: fix: Recover PS1 before command execution.

[ELPA Syncer]

branch: elpa/bash-completion
commit a79863f9c2080d450aa63dbda872b8ccee8ac790
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

fix: Recover PS1 before command execution.

Before this change, when doing completion in the same process PS1 was
modified to be able to detect the end of the completion command output
and it was recovered later on from PROMPT_COMMAND, just *after*
executing the user command, before building the next prompt.

The effect was not visible, unless the user command included $PS1, so if
you did:

> echo $PS1

and ran completion while editing that command, the PS1 that would be
output would be the one from bash-completion.

This change switches to another approach for recovering the prompt that
allows recovering it before executing the user command: a DEBUG trap is
registered which restores PS1 and PROMPT_COMMAND if the previous command
included __ebrcet. This change also adds __ebcret after the last command
issued by completion.

This way, the last command issued by completion uses the fake prompt,
but the command run just after that sees the real prompt in its
variable.

issue #77
---
 bash-completion.el   | 34 +++-
 test/bash-completion-integration-test.el | 26 
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/bash-completion.el b/bash-completion.el
index e3bebebe3f..130152fbb4 100644
--- a/bash-completion.el
+++ b/bash-completion.el
@@ -1533,7 +1533,7 @@ Return the status code of the command, as a number."
 ((not define-functions)
  (concat
   "if type __ebcpre &>/dev/null; then "
-  "  __ebcpre; %s; "
+  "  __ebcpre; %s; __ebcret $?; "
   "else "
   "  echo ==emacs==nopre=${BASH_VERSION}==.; "
   "  __ebcp=(\"$PS1\" \"$PROMPT_COMMAND\");"
@@ -1548,28 +1548,26 @@ Return the status code of the command, as a number."
"c=$((c+1));"
"  fi;"
"  history -d $c &>/dev/null || true;"
-   "}; function __ebcpre {"
+   "} ; function __ebcret {"
+   "  __ebcret=t;"
+   "  return $1;"
+   "} ; function __ebctrap {"
+   " if [[ \"$__ebcret\" = \"t\" && ${#__ebcp[@]} -gt 0 ]]; then"
+   "  PS1=\"${__ebcp[0]}\";"
+   "  PROMPT_COMMAND=\"${__ebcp[1]}\";"
+   "  unset __ebcp;"
+   "  unset __ebcret;"
+   " fi;"
+   "} ; trap __ebctrap DEBUG ; function __ebcpre {"
"  set +x; set +o emacs; set +o vi;"
"  echo \"==emacs==bash=${BASH_VERSION}==.\";"
"  if [[ ${#__ebcp[@]} = 0 ]]; then "
"__ebcp=(\"$PS1\" \"$PROMPT_COMMAND\");"
"  fi;"
-   "  PROMPT_COMMAND=" ;; set a temporary prompt
-   (bash-completion-quote
-(concat "PS1=" bash-completion--ps1 ";"
-"PROMPT_COMMAND=" ;; recover prompt
-(bash-completion-quote
- (concat
-  "__ebcr=$?;"
-  "PS1=\"${__ebcp[0]}\";"
-  "PROMPT_COMMAND=\"${__ebcp[1]}\";"
-  "unset __ebcp;"
-  "if [[ -n \"$PROMPT_COMMAND\" ]]; then"
-  "  (exit $__ebcr); eval \"$PROMPT_COMMAND\";"
-  "fi;"
-   ";"
+   "  PS1=" bash-completion--ps1 ";"
+   "  unset PROMPT_COMMAND;"
"  __ebcnohistory 1;"
-   "} && { __ebcpre; %s; }\n")))
+   "} ; { __ebcpre; %s; __ebcret $?; }\n")))
commandline)))
 (setq bash-completion--debug-info
   (list (cons 'commandline complete-command)
@@ -1591,7 +1589,7 @@ Return the status code of the command, as a number."
   ;; common initialization, then retry.
   (bash-completion-send "__ebcnohistory" process timeout debug-context 
'define-functions)
   (bash-completion--setup-bash-common process)
-  (funcall send-string process (concat "__ebcpre; " commandline ";\n"))
+  (funcall send-string process (concat "__ebcpre; " commandline "; 
__ebcret $?\n"))
   (bash-completion--wait-for-regexp
"short-timeout" process "==emacs==bash=[0-9].*?==."
bash-completion-short-command-timeout))
diff --git a/test/bash-completion-integration-test.el 
b/test/bash-completion-integration-test.el
index e2271652c5..f57ddc7865 100644
--- a/test/bash-completion-integration-test.el
+++ b/test/bash-completion-integration-test.el
@@ -900,4 +900,30 @@ $ ")
 "dummy moretestfile "
 (bash-completion_test-complete "dummy moret")
 
+(ert-deftest bash-comple

[nongnu] elpa/bash-completion a96525afd9 2/4: fix: Recover $? after completion.

[ELPA Syncer]

branch: elpa/bash-completion
commit a96525afd9077c06d781c59e78bfc6620e41be8f
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

fix: Recover $? after completion.

Before this change, the value of $? was lost when doing a completion as
it required running a command, so $? became the status code of the
completion command.

So if you typed:

> false
> ech $?

You would get 0 instead of 1, set by false.

This change stores the value of $? first thing before executing any
command, then have __ebcret restore it. The status code that bash
completion, the one that's embedded in the next prompt, remains the
status code of the completion command, but $? is the status code of the
last user command, before completion was run.

issue #77
---
 bash-completion.el   | 22 ++---
 test/bash-completion-integration-test.el | 34 
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/bash-completion.el b/bash-completion.el
index 130152fbb4..5a7d9ff8fe 100644
--- a/bash-completion.el
+++ b/bash-completion.el
@@ -294,7 +294,7 @@ Bash processes.")
 (defconst bash-completion-special-chars "[ -$&-*,:-<>?[-^`{-}]"
   "Regexp of characters that must be escaped or quoted.")
 
-(defconst bash-completion--ps1 "'==emacs==ret=$?==.'"
+(defconst bash-completion--ps1 "'==emacs==ret=${__ebcret:-$?}==.'"
   "Value for the special PS1 prompt set for completions, quoted.")
 
 (eval-when-compile
@@ -1532,12 +1532,12 @@ Return the status code of the command, as a number."
 ;; single process, assume __ebcpre is already defined
 ((not define-functions)
  (concat
-  "if type __ebcpre &>/dev/null; then "
+  "__ebcor=$?; if type __ebcpre &>/dev/null; then "
   "  __ebcpre; %s; __ebcret $?; "
   "else "
   "  echo ==emacs==nopre=${BASH_VERSION}==.; "
-  "  __ebcp=(\"$PS1\" \"$PROMPT_COMMAND\");"
-  "  unset PS1 PROMPT_COMMAND;"
+  "  __ebcp=(\"$PS1\" \"$PROMPT_COMMAND\" $__ebcor);"
+  "  unset PS1 PROMPT_COMMAND __ebcor;"
   "fi;\n"))
 ;; single process, define __ebcpre
 (t
@@ -1549,23 +1549,23 @@ Return the status code of the command, as a number."
"  fi;"
"  history -d $c &>/dev/null || true;"
"} ; function __ebcret {"
-   "  __ebcret=t;"
-   "  return $1;"
+   "  __ebcret=$1;"
+   "  return ${__ebcp[2]};"
"} ; function __ebctrap {"
-   " if [[ \"$__ebcret\" = \"t\" && ${#__ebcp[@]} -gt 0 ]]; then"
+   " if [[ -n \"$__ebcret\" && ${#__ebcp[@]} -gt 0 ]]; then"
"  PS1=\"${__ebcp[0]}\";"
"  PROMPT_COMMAND=\"${__ebcp[1]}\";"
-   "  unset __ebcp;"
-   "  unset __ebcret;"
+   "  unset __ebcp __ebcret;"
" fi;"
"} ; trap __ebctrap DEBUG ; function __ebcpre {"
+   "  __ebcor=${__ebcor:-$?}; "
"  set +x; set +o emacs; set +o vi;"
"  echo \"==emacs==bash=${BASH_VERSION}==.\";"
"  if [[ ${#__ebcp[@]} = 0 ]]; then "
-   "__ebcp=(\"$PS1\" \"$PROMPT_COMMAND\");"
+   "__ebcp=(\"$PS1\" \"$PROMPT_COMMAND\" $__ebcor);"
"  fi;"
"  PS1=" bash-completion--ps1 ";"
-   "  unset PROMPT_COMMAND;"
+   "  unset PROMPT_COMMAND __ebcor;"
"  __ebcnohistory 1;"
"} ; { __ebcpre; %s; __ebcret $?; }\n")))
commandline)))
diff --git a/test/bash-completion-integration-test.el 
b/test/bash-completion-integration-test.el
index f57ddc7865..02c24ecc0d 100644
--- a/test/bash-completion-integration-test.el
+++ b/test/bash-completion-integration-test.el
@@ -926,4 +926,38 @@ $ ")
(should (equal (bash-completion_test-buffer-string)
   "$ dummy dummy\n--$ --\n$ dummy dummy\n--$ --\n$ "
 
+(ert-deftest bash-completion-integration-recover-status-code ()
+  (bash-completion_test-with-shell-harness
+   (concat ; .bashrc
+"function failwith { return $1; }\n"
+"function dummy { echo $?; }\n"
+"function _dummy {\n"
+"COMPREPLY=( dummy )\n"
+"}\n"
+"complete -F _dummy dummy\n"
+"PS1='\$ '")
+   nil
+   ;; The first time initializes completion, the second time executes
+   ;; an already initialized completion. The two cases behave very
+   ;; differently, so we test both.
+   (dotimes (i 2)
+ (bash-completion_test-send (format "failwith %s" (+ 100 i)))
+ (should (equal
+  "dummy dummy "
+  (bash-completion_test-complete "dummy dum")))
+ (let ((start (line-beginning-position)))
+   (comint-send-input)
+   (bash-completion_test-wait-for-prompt start

[nongnu] elpa/bash-completion updated (a4c8fbc902 -> e5f3ee18a8)

[ELPA Syncer]

elpasync pushed a change to branch elpa/bash-completion.

  from  a4c8fbc902 Development version, following release 3.2
   new  a79863f9c2 fix: Recover PS1 before command execution.
   new  a96525afd9 fix: Recover $? after completion.
   new  2d9f7222f3 chore: Test bash-5.0 using nix instead of ubuntu-20
   new  e5f3ee18a8 chore: Remove test for bash 5.0 for now.


Summary of changes:
 .github/workflows/test.yml   | 22 
 bash-completion.el   | 44 +++
 test/bash-completion-integration-test.el | 60 
 3 files changed, 81 insertions(+), 45 deletions(-)

[nongnu] elpa/bash-completion 2d9f7222f3 3/4: chore: Test bash-5.0 using nix instead of ubuntu-20

[ELPA Syncer]

branch: elpa/bash-completion
commit 2d9f7222f3af34dfd89eec774052fd14279b7c70
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Test bash-5.0 using nix instead of ubuntu-20

ubuntu-20.04 isn't available anymore, so the trick of using it to test
an older version of bash doesn't work.

This change switches to downloading an older version of bash using nix
on the current version of ubuntu.
---
 .github/workflows/test.yml | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f022904ea5..3601750760 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,8 +37,8 @@ jobs:
 - name: Test the project
   run: 'eldev -p -dtT test'
 
-  test-ubuntu-20:
-runs-on: ubuntu-20.04 # bash 5.0
+  test-bash-5_0:
+runs-on: ubuntu-latest
 strategy:
   matrix:
 emacs_version:
@@ -50,6 +50,11 @@ jobs:
   with:
 version: ${{matrix.emacs_version}}
 
+- name: Install bash 5.0
+  run: |
+nix profile install 
nixpkgs/3b05df1d13c1b315cecc610a2f3180f6669442f0#bash
+which bash
+
 - name: Install Eldev
   uses: emacs-eldev/setup-eldev@v1
 

[nongnu] elpa/bash-completion e5f3ee18a8 4/4: chore: Remove test for bash 5.0 for now.

[ELPA Syncer]

branch: elpa/bash-completion
commit e5f3ee18a8c8c638011db69412ce2e6e244188c5
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Remove test for bash 5.0 for now.

The previous commit introduced a test for bash 5.0 that now fails. This
change takes the test off entirely until the cause of the failure is
understood and fixed.
---
 .github/workflows/test.yml | 27 ---
 1 file changed, 27 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3601750760..c7b971d566 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,30 +37,3 @@ jobs:
 - name: Test the project
   run: 'eldev -p -dtT test'
 
-  test-bash-5_0:
-runs-on: ubuntu-latest
-strategy:
-  matrix:
-emacs_version:
-  - '28.2'
-
-steps:
-- name: Install Nix and set up Emacs
-  uses: jcs090218/setup-emacs@master
-  with:
-version: ${{matrix.emacs_version}}
-
-- name: Install bash 5.0
-  run: |
-nix profile install 
nixpkgs/3b05df1d13c1b315cecc610a2f3180f6669442f0#bash
-which bash
-
-- name: Install Eldev
-  uses: emacs-eldev/setup-eldev@v1
-
-- name: Check out the source code
-  uses: actions/checkout@v4
-
-- name: Test the project
-  run: 'eldev -p -dtT test'
-  

[nongnu] elpa/racket-mode e20a5447c6: repl-output: Lower accumulation threshold from 500 to 20 msec; fixes #749

[ELPA Syncer]

branch: elpa/racket-mode
commit e20a5447c66a09a787738ad6838fad796c849f9e
Author: Greg Hendershott 
Commit: Greg Hendershott 

repl-output: Lower accumulation threshold from 500 to 20 msec; fixes #749
---
 racket/repl-output.rkt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racket/repl-output.rkt b/racket/repl-output.rkt
index e8f6052631..74fdf8da30 100644
--- a/racket/repl-output.rkt
+++ b/racket/repl-output.rkt
@@ -58,7 +58,7 @@
 ;; well.
 (struct repl-output-item (kind value))
 (define ((repl-output-manager-thread session-id))
-  (define msec-threshold 500)
+  (define msec-threshold 20)
   (define size-threshold 4096)
 
   (define (put* kind value)

[nongnu] elpa/clojure-ts-mode e960a905ab: [#16] Add support for automatic aligning forms

[ELPA Syncer]

branch: elpa/clojure-ts-mode
commit e960a905ab9ae6c77101ca1e65dd76e59c7f4009
Author: Roman Rudakov 
Commit: Bozhidar Batsov 

[#16] Add support for automatic aligning forms
---
 CHANGELOG.md |   1 +
 README.md|   4 +
 clojure-ts-mode.el   | 145 
 test/clojure-ts-mode-indentation-test.el | 188 ++-
 test/samples/align.clj   |  27 -
 5 files changed, 318 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c11acd343..281c42581a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#16](https://github.com/clojure-emacs/clojure-ts-mode/issues/16): Introduce 
`clojure-ts-align`.
 - [#11](https://github.com/clojure-emacs/clojure-ts-mode/issues/11): Enable 
regex syntax highlighting.
+- [#16](https://github.com/clojure-emacs/clojure-ts-mode/issues/16): Add 
support for automatic aligning forms.
 
 ## 0.3.0 (2025-04-15)
 
diff --git a/README.md b/README.md
index 02e598a878..251effc071 100644
--- a/README.md
+++ b/README.md
@@ -259,6 +259,10 @@ Leads to the following:
:other-key 2})
 ```
 
+This can also be done automatically (as part of indentation) by turning on
+`clojure-ts-align-forms-automatically`. This way it will happen whenever you
+select some code and hit `TAB`.
+
 Forms that can be aligned vertically are configured via the following 
variables:
 
 - `clojure-ts-align-reader-conditionals` - align reader conditionals as if they
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index f88f342158..f1de91d015 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -197,6 +197,22 @@ double quotes on the third column."
   :safe #'listp
   :type '(repeat string))
 
+(defcustom clojure-ts-align-forms-automatically nil
+  "If non-nil, vertically align some forms automatically.
+
+Automatically means it is done as part of indenting code.  This applies
+to binding forms (`clojure-ts-align-binding-forms'), to cond
+forms (`clojure-ts-align-cond-forms') and to map literals.  For
+instance, selecting a map a hitting
+\\`\\[indent-for-tab-command]' will align the
+values like this:
+
+{:some-key 10
+ :key2 20}"
+  :package-version '(clojure-ts-mode . "0.4")
+  :safe #'booleanp
+  :type 'boolean)
+
 (defvar clojure-ts-mode-remappings
   '((clojure-mode . clojure-ts-mode)
 (clojurescript-mode . clojure-ts-clojurescript-mode)
@@ -1340,6 +1356,9 @@ if NODE has metadata and its parent has type NODE-TYPE."
  ((parent-is "vec_lit") parent 1) ;; 
https://guide.clojure.style/#bindings-alignment
  ((parent-is "map_lit") parent 1) ;; 
https://guide.clojure.style/#map-keys-alignment
  ((parent-is "set_lit") parent 2)
+ ((parent-is "splicing_read_cond_lit") parent 4)
+ ((parent-is "read_cond_lit") parent 3)
+ ((parent-is "tagged_or_ctor_lit") parent 0)
  ;; https://guide.clojure.style/#body-indentation
  (clojure-ts--match-form-body clojure-ts--anchor-parent-skip-metadata 2)
  ;; https://guide.clojure.style/#threading-macros-alignment
@@ -1447,32 +1466,56 @@ Regular expression and syntax analysis code is borrowed 
from
 
 BOUND bounds the whitespace search."
   (unwind-protect
-  (when-let* ((cur-sexp (treesit-node-first-child-for-pos root-node 
(point) t)))
-(goto-char (treesit-node-start cur-sexp))
-(if (and (string= "sym_lit" (treesit-node-type cur-sexp))
- (clojure-ts--metadata-node-p (treesit-node-child cur-sexp 0 
t))
- (and (not (treesit-node-child-by-field-name cur-sexp "value"))
-  (string-empty-p (clojure-ts--named-node-text cur-sexp
-(treesit-end-of-thing 'sexp 2 'restricted)
-  (treesit-end-of-thing 'sexp 1 'restrict))
-(when (looking-at ",")
-  (forward-char))
-;; Move past any whitespace or comment.
-(search-forward-regexp "\\([,\s\t]*\\)\\(;+.*\\)?" bound)
-(pcase (syntax-after (point))
-  ;; End-of-line, try again on next line.
-  (`(12) (clojure-ts--search-whitespace-after-next-sexp root-node 
bound))
-  ;; Closing paren, stop here.
-  (`(5 . ,_) nil)
-  ;; Anything else is something to align.
-  (_ (point
+  (let ((regex "\\([,\s\t]*\\)\\(;+.*\\)?"))
+;; If we're on an empty line, we should return match, otherwise
+;; `clojure-ts-align-separator' setting won't work.
+(if (and (bolp) (looking-at-p "[[:blank:]]*$"))
+(progn
+  (search-forward-regexp regex bound)
+  (point))
+  (when-let* ((cur-sexp (treesit-node-first-child-for-pos root-node 
(point) t)))
+(goto-char (treesit-node-start cur-sexp))
+(if (and (string= "sym_lit" (treesit-node-type cur-sexp))
+ (clojure-ts--metadata-node-p (treesit-node-child cur-sexp 
0 t))
+ (and (not (treesit-node-child-b

[nongnu] elpa/bash-completion f99d624fac 05/10: chore: Update bash 5.0 test

[ELPA Syncer]

branch: elpa/bash-completion
commit f99d624fac5c1d2a2b3ac4770949905c2f65e77b
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Update bash 5.0 test
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a43d0997f..2a16c20263 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
 
 - name: Install Bash 5.0
   run: |
-wget 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
+wget --quiet 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
 chmod +x ./bash-linux
 
 - name: Install Eldev
@@ -62,5 +62,5 @@ jobs:
   uses: actions/checkout@v4
 
 - name: Test the project
-  run: 'eldev -p -dtT test --bash=$PWD/bash-linux'
+  run: './bash-linux --version && eldev -p -dtT test --bash=./bash-linux'
 

[nongnu] elpa/bash-completion bb2608a338 07/10: chore: Update bash 5.0 test, using RUNNER_TEMP

[ELPA Syncer]

branch: elpa/bash-completion
commit bb2608a338518547906f7f38b6e992ce62b2c6d3
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Update bash 5.0 test, using RUNNER_TEMP
---
 .github/workflows/test.yml | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dfff65e1fc..e14973a9c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,18 +50,16 @@ jobs:
   with:
 version: ${{matrix.emacs_version}}
 
-- name: Install Bash 5.0
-  run: |
-wget -O $GITHUB_WORKSPACE/bash-5.0 --quiet 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
-chmod +x $GITHUB_WORKSPACE/bash-5.0
-
 - name: Install Eldev
   uses: emacs-eldev/setup-eldev@v1
 
 - name: Check out the source code
   uses: actions/checkout@v4
 
-- name: Test the project
+- name: Install bash 5.0 and test the project
   run: |
-$GITHUB_WORKSPACE/bash-5.0 --version && eldev -p -dtT test 
--bash=$GITHUB_WORKSPACE/bash-5.0
+wget -O $RUNNER_TEMP/bash-5.0 --quiet 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
+chmod +x $RUNNER_TEMP/bash-5.0
+$RUNNER_TEMP/bash-5.0 --version
+eldev -p -dtT test --bash=$RUNNER_TEMP/bash-5.0
 

[nongnu] elpa/bash-completion 8664a9488c 04/10: chore: Fix bash 5.0 test workflow

[ELPA Syncer]

branch: elpa/bash-completion
commit 8664a9488c86a665d9c32966f023d9dcf17eadf0
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Fix bash 5.0 test workflow
---
 .github/workflows/test.yml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ab9b02c51d..1a43d0997f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,9 +52,8 @@ jobs:
 
 - name: Install Bash 5.0
   run: |
-wget -o ./bash-5.0 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
-chmod +x ./bash-5.0
-$PWD/bash-5.0 --version
+wget 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
+chmod +x ./bash-linux
 
 - name: Install Eldev
   uses: emacs-eldev/setup-eldev@v1
@@ -63,5 +62,5 @@ jobs:
   uses: actions/checkout@v4
 
 - name: Test the project
-  run: 'eldev -p -dtT test --bash=$PWD/bash-5.0'
+  run: 'eldev -p -dtT test --bash=$PWD/bash-linux'
 

[nongnu] elpa/bash-completion 9a15bc77dc 08/10: chore: Add test for Emacs 30.1

[ELPA Syncer]

branch: elpa/bash-completion
commit 9a15bc77dc77600ebdf953c1dc27b73978d79407
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Add test for Emacs 30.1
---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e14973a9c4..d8efa9c60d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,6 +21,7 @@ jobs:
   - '28.1'
   - '28.2'
   - '29.1'
+  - '30.1'
 
 steps:
 - name: Install Nix and set up Emacs

[nongnu] elpa/bash-completion 2d9bf9607d 01/10: chore: Add test-bash-5_0 using nix

[ELPA Syncer]

branch: elpa/bash-completion
commit 2d9bf9607d4bf1846042cea4807c7d5e5e23e4b6
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Add test-bash-5_0 using nix
---
 .github/workflows/test.yml | 25 +
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c7b971d566..b95d843c20 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,3 +37,28 @@ jobs:
 - name: Test the project
   run: 'eldev -p -dtT test'
 
+  test-bash-5_0:
+runs-on: ubuntu-latest
+strategy:
+  matrix:
+emacs_version:
+  - '29.1'
+
+steps:
+- name: Install Nix and set up Emacs
+  uses: jcs090218/setup-emacs@master
+  with:
+version: ${{matrix.emacs_version}}
+
+- name: Install Bash 5.0
+  run: 'nix profile install 
nixpkgs/3b05df1d13c1b315cecc610a2f3180f6669442f0#bash_5'
+
+- name: Install Eldev
+  uses: emacs-eldev/setup-eldev@v1
+
+- name: Check out the source code
+  uses: actions/checkout@v4
+
+- name: Test the project
+  run: 'bash --version; eldev -p -dtT test'
+

[nongnu] elpa/bash-completion d0637428fd 10/10: chore: Run tests on only one release of a major version.

[ELPA Syncer]

branch: elpa/bash-completion
commit d0637428fd0592ef56baa0255673300129f98c48
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Run tests on only one release of a major version.
---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e14973a9c4..109990f6ed 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,9 +17,7 @@ jobs:
   - '25.3'
   - '26.3'
   - '27.1'
-  - '27.2'
   - '28.1'
-  - '28.2'
   - '29.1'
 
 steps:

[nongnu] elpa/bash-completion 42ffee703b 09/10: chore: Remove 30.1 from tests for now.

[ELPA Syncer]

branch: elpa/bash-completion
commit 42ffee703bd7125b75bd8d439939c23f610c9e3b
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Remove 30.1 from tests for now.

The action just gets stuck trying to download it.
---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d8efa9c60d..e14973a9c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,7 +21,6 @@ jobs:
   - '28.1'
   - '28.2'
   - '29.1'
-  - '30.1'
 
 steps:
 - name: Install Nix and set up Emacs

[nongnu] elpa/bash-completion 1cd5a30b35 02/10: chore: Revert "Add test-bash-5_0 using nix"

[ELPA Syncer]

branch: elpa/bash-completion
commit 1cd5a30b3553088d452e6a897ed12af11a712950
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Revert "Add test-bash-5_0 using nix"

This reverts commit 2d9bf9607d4bf1846042cea4807c7d5e5e23e4b6.

It still doesn't work.
---
 .github/workflows/test.yml | 25 -
 1 file changed, 25 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b95d843c20..c7b971d566 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,28 +37,3 @@ jobs:
 - name: Test the project
   run: 'eldev -p -dtT test'
 
-  test-bash-5_0:
-runs-on: ubuntu-latest
-strategy:
-  matrix:
-emacs_version:
-  - '29.1'
-
-steps:
-- name: Install Nix and set up Emacs
-  uses: jcs090218/setup-emacs@master
-  with:
-version: ${{matrix.emacs_version}}
-
-- name: Install Bash 5.0
-  run: 'nix profile install 
nixpkgs/3b05df1d13c1b315cecc610a2f3180f6669442f0#bash_5'
-
-- name: Install Eldev
-  uses: emacs-eldev/setup-eldev@v1
-
-- name: Check out the source code
-  uses: actions/checkout@v4
-
-- name: Test the project
-  run: 'bash --version; eldev -p -dtT test'
-

[nongnu] elpa/bash-completion 8e2a79ea58 06/10: chore: Update bash 5.0 test, using GITHUB_WORKSPACE env var

[ELPA Syncer]

branch: elpa/bash-completion
commit 8e2a79ea58a4fb36ad35603ae567828f2b303d46
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Update bash 5.0 test, using GITHUB_WORKSPACE env var
---
 .github/workflows/test.yml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a16c20263..dfff65e1fc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,8 +52,8 @@ jobs:
 
 - name: Install Bash 5.0
   run: |
-wget --quiet 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
-chmod +x ./bash-linux
+wget -O $GITHUB_WORKSPACE/bash-5.0 --quiet 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
+chmod +x $GITHUB_WORKSPACE/bash-5.0
 
 - name: Install Eldev
   uses: emacs-eldev/setup-eldev@v1
@@ -62,5 +62,6 @@ jobs:
   uses: actions/checkout@v4
 
 - name: Test the project
-  run: './bash-linux --version && eldev -p -dtT test --bash=./bash-linux'
+  run: |
+$GITHUB_WORKSPACE/bash-5.0 --version && eldev -p -dtT test 
--bash=$GITHUB_WORKSPACE/bash-5.0
 

[nongnu] elpa/bash-completion updated (e5f3ee18a8 -> d0637428fd)

[ELPA Syncer]

elpasync pushed a change to branch elpa/bash-completion.

  from  e5f3ee18a8 chore: Remove test for bash 5.0 for now.
   new  2d9bf9607d chore: Add test-bash-5_0 using nix
   new  1cd5a30b35 chore: Revert "Add test-bash-5_0 using nix"
   new  b2a1f86bef chore: Try out bash-5.0 from static-bash
   new  8664a9488c chore: Fix bash 5.0 test workflow
   new  f99d624fac chore: Update bash 5.0 test
   new  8e2a79ea58 chore: Update bash 5.0 test, using GITHUB_WORKSPACE env 
var
   new  bb2608a338 chore: Update bash 5.0 test, using RUNNER_TEMP
   new  9a15bc77dc chore: Add test for Emacs 30.1
   new  42ffee703b chore: Remove 30.1 from tests for now.
   new  d0637428fd chore: Run tests on only one release of a major version.


Summary of changes:
 .github/workflows/test.yml | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

[nongnu] elpa/bash-completion b2a1f86bef 03/10: chore: Try out bash-5.0 from static-bash

[ELPA Syncer]

branch: elpa/bash-completion
commit b2a1f86beff60fbc9ff5f14745d40ddc741bfbb8
Author: Stephane Zermatten 
Commit: Stephane Zermatten 

chore: Try out bash-5.0 from static-bash
---
 .github/workflows/test.yml | 28 
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c7b971d566..ab9b02c51d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,3 +37,31 @@ jobs:
 - name: Test the project
   run: 'eldev -p -dtT test'
 
+  test-bash-5_0:
+runs-on: ubuntu-latest
+strategy:
+  matrix:
+emacs_version:
+  - '29.1'
+
+steps:
+- name: Install Nix and set up Emacs
+  uses: jcs090218/setup-emacs@master
+  with:
+version: ${{matrix.emacs_version}}
+
+- name: Install Bash 5.0
+  run: |
+wget -o ./bash-5.0 
https://github.com/robxu9/bash-static/releases/download/5.0/bash-linux
+chmod +x ./bash-5.0
+$PWD/bash-5.0 --version
+
+- name: Install Eldev
+  uses: emacs-eldev/setup-eldev@v1
+
+- name: Check out the source code
+  uses: actions/checkout@v4
+
+- name: Test the project
+  run: 'eldev -p -dtT test --bash=$PWD/bash-5.0'
+