[elpa] externals/org-modern 89875c58c0: Disable timestamp formatting if org-display-custom-times is non-nil (Fix #29)

2022-03-23 Thread ELPA Syncer
branch: externals/org-modern
commit 89875c58c0ce5eb4cc3747dbba7b98b435229029
Author: Daniel Mendler 
Commit: Daniel Mendler 

Disable timestamp formatting if org-display-custom-times is non-nil (Fix 
#29)
---
 org-modern.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-modern.el b/org-modern.el
index 49e6a1745b..094a559f95 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -511,7 +511,7 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
(2 'org-modern-block-keyword append
   (when org-modern-tag
 '(("^\\*+.*?\\( \\)\\(:.*:\\)[ \t]*$" (0 (org-modern--tag)
-  (when org-modern-timestamp
+  (when (and org-modern-timestamp (not org-display-custom-times))
 '(("\\(?:<\\|\\[\\)\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\(?: 
[[:word:]]+\\)?\\(?: [.+-]+[0-9ymwdh/]+\\)*\\)\\(\\(?: [0-9:-]+\\)?\\(?: 
[.+-]+[0-9ymwdh/]+\\)*\\)\\(?:>\\|\\]\\)"
(0 (org-modern--timestamp)))
   
("<[^>]+>\\(-\\)\\(-\\)<[^>]+>\\|\\[[^]]+\\]\\(?1:-\\)\\(?2:-\\)\\[[^]]+\\]"



[elpa] externals/embark 183ab2fa37 2/2: Merge pull request #476 from minad/ouch

2022-03-23 Thread ELPA Syncer
branch: externals/embark
commit 183ab2fa379a14e4fb10ba9e2446274ac06ec0f3
Merge: 123ad4752c 889b56d147
Author: Omar Antolín Camarena 
Commit: GitHub 

Merge pull request #476 from minad/ouch

Ouch! Use emacs-major-version!
---
 embark.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark.el b/embark.el
index 6584f3b18f..74011b2463 100644
--- a/embark.el
+++ b/embark.el
@@ -3521,7 +3521,7 @@ With a prefix argument EDEBUG, instrument the code for 
debugging."
(eval (read (buffer-substring beg end)) lexical-binding)))
   (delete-region beg end
 
-(when (< emacs-version 29)
+(when (< emacs-major-version 29)
   (defun embark-elp-restore-package (prefix)
 "Remove instrumentation from functions with names starting with PREFIX."
 (interactive "SPrefix: ")



[elpa] externals/embark 889b56d147 1/2: Ouch! Use emacs-major-version!

2022-03-23 Thread ELPA Syncer
branch: externals/embark
commit 889b56d1471bd1c0f6ce9cba0e14ce1ab21835dc
Author: Daniel Mendler 
Commit: Daniel Mendler 

Ouch! Use emacs-major-version!
---
 embark.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark.el b/embark.el
index 6584f3b18f..74011b2463 100644
--- a/embark.el
+++ b/embark.el
@@ -3521,7 +3521,7 @@ With a prefix argument EDEBUG, instrument the code for 
debugging."
(eval (read (buffer-substring beg end)) lexical-binding)))
   (delete-region beg end
 
-(when (< emacs-version 29)
+(when (< emacs-major-version 29)
   (defun embark-elp-restore-package (prefix)
 "Remove instrumentation from functions with names starting with PREFIX."
 (interactive "SPrefix: ")



[elpa] externals/embark-consult updated (123ad4752c -> 183ab2fa37)

2022-03-23 Thread ELPA Syncer
elpasync pushed a change to branch externals/embark-consult.

  from  123ad4752c Merge pull request #475 from minad/minor-fixes2
  adds  889b56d147 Ouch! Use emacs-major-version!
  adds  183ab2fa37 Merge pull request #476 from minad/ouch

No new revisions were added by this update.

Summary of changes:
 embark.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[elpa] externals/ebdb c98512ebb6: Fix to previous divide name change, release 0.8.14

2022-03-23 Thread Eric Abrahamsen
branch: externals/ebdb
commit c98512ebb6984701bbf090f1eabedb120c51e7bd
Author: Eric Abrahamsen 
Commit: Eric Abrahamsen 

Fix to previous divide name change, release 0.8.14

Fixes #102

We need to move to proper parsing.

* ebdb.el (ebdb-divide-name): There isn't always a given name!
---
 ebdb.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebdb.el b/ebdb.el
index e8012c8ca6..45b58131f6 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2016-2021  Free Software Foundation, Inc.
 
-;; Version: 0.8.13
+;; Version: 0.8.14
 ;; Package-Requires: ((emacs "25.1") (seq "2.15"))
 
 ;; Maintainer: Eric Abrahamsen 
@@ -5463,7 +5463,7 @@ usage) to represent the surname."
  (setq given (and (not (zerop (match-beginning 0)))
   (substring string 0 (match-beginning 0)))
string (match-string 1 string)
-(setq given (split-string given nil t))
+(setq given (when given (split-string given nil t)))
 (cond ((string-match (regexp-opt ebdb-lastname-prefixes) string)
   (setq prefix (substring string 0 (match-end 0))
 string (substring string (match-end 0



[elpa] externals/phps-mode d6323a5548 2/8: Moved imenu and bookkeeping to main thread

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit d6323a55482df8d814d6277145c2ef39d0a325d3
Author: Christian Johansson 
Commit: Christian Johansson 

Moved imenu and bookkeeping to main thread
---
 phps-mode-lex-analyzer.el | 69 ++-
 phps-mode-lexer.el|  3 +++
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 7fa1f25530..ffdbd7ec4b 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -250,8 +250,21 @@
(setq phps-mode-lex-analyzer--parse-trail (nth 7 lex-result))
(setq phps-mode-lex-analyzer--parse-error (nth 8 lex-result))
(setq phps-mode-lex-analyzer--ast (nth 9 lex-result))
-   (setq phps-mode-lex-analyzer--imenu (nth 10 lex-result))
-   (setq phps-mode-lex-analyzer--bookkeeping (nth 11 lex-result))
+
+   ;; Catch errors in bookkeeping or imenu generation
+   (condition-case conditions
+   (progn
+ (phps-mode-ast-bookkeeping--generate)
+ (phps-mode-ast-imenu--generate))
+ (error
+  (display-warning
+  'phps-mode
+  (format "Failed to generate bookkeeping or imenu: %S" conditions)
+  :warning
+  "*PHPs Parser Errors*")))
+   (setq phps-mode-lex-analyzer--imenu phps-mode-ast-imenu--index)
+   (setq phps-mode-lex-analyzer--bookkeeping 
phps-mode-ast-bookkeeping--index)
+
(setq phps-mode-lex-analyzer--processed-buffer-p t)
(phps-mode-lex-analyzer--reset-imenu)
 
@@ -259,7 +272,8 @@
(dolist (token phps-mode-lex-analyzer--tokens)
  (let ((start (car (cdr token)))
(end (cdr (cdr token
-   (let ((token-syntax-color 
(phps-mode-lex-analyzer--get-token-syntax-color token)))
+   (let ((token-syntax-color
+  (phps-mode-lex-analyzer--get-token-syntax-color token)))
  (if token-syntax-color
  (phps-mode-lex-analyzer--set-region-syntax-color
   start end (list 'font-lock-face token-syntax-color))
@@ -387,8 +401,20 @@
(setq phps-mode-lex-analyzer--parse-trail (nth 7 lex-result))
(setq phps-mode-lex-analyzer--parse-error (nth 8 lex-result))
(setq phps-mode-lex-analyzer--ast (nth 9 lex-result))
-   (setq phps-mode-lex-analyzer--imenu (nth 10 lex-result))
-   (setq phps-mode-lex-analyzer--bookkeeping (nth 11 lex-result))
+
+   ;; Catch errors in bookkeeping or imenu generation
+   (condition-case conditions
+   (progn
+ (phps-mode-ast-bookkeeping--generate)
+ (phps-mode-ast-imenu--generate))
+ (error
+  (display-warning
+  'phps-mode
+  (format "Failed to generate bookkeeping or imenu: %S" conditions)
+  :warning
+  "*PHPs Parser Errors*")))
+   (setq phps-mode-lex-analyzer--imenu phps-mode-ast-imenu--index)
+   (setq phps-mode-lex-analyzer--bookkeeping 
phps-mode-ast-bookkeeping--index)
 
(phps-mode-debug-message
 (message "Incremental tokens: %s" phps-mode-lex-analyzer--tokens))
@@ -1193,9 +1219,7 @@
 ;; Error-free parse here
 (condition-case conditions
 (progn
-  (phps-mode-ast--generate)
-  (phps-mode-ast-bookkeeping--generate)
-  (phps-mode-ast-imenu--generate))
+  (phps-mode-ast--generate))
   (error
(setq
 parse-error
@@ -1204,26 +1228,21 @@
 ;; Need to copy buffer-local values before killing buffer
 (setq parse-trail phps-mode-ast--parse-trail)
 (setq ast-tree phps-mode-ast--tree)
-(setq imenu-index phps-mode-ast-imenu--index)
-(setq bookkeeping-index phps-mode-ast-bookkeeping--index)
 
 (kill-buffer)))
 
-(let
-((data
-  (list
-   tokens
-   states
-   state
-   state-stack
-   heredoc-label
-   heredoc-label-stack
-   nest-location-stack
-   parse-trail
-   parse-error
-   ast-tree
-   imenu-index
-   bookkeeping-index)))
+(let ((data
+   (list
+tokens
+states
+state
+state-stack
+heredoc-label
+heredoc-label-stack
+nest-location-stack
+parse-trail
+parse-error
+ast-tree)))
 
   ;; Save cache if possible and permitted
   (when (and
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index c4e0558995..8daae5d1b8 

[elpa] externals/phps-mode updated (246bcc6967 -> 3a09d15aa1)

2022-03-23 Thread Christian Johansson
cjohansson pushed a change to branch externals/phps-mode.

  from  246bcc6967 Updated version and date
   new  d45658d99c Starting experimenting with using two threads for serial 
commands
   new  d6323a5548 Moved imenu and bookkeeping to main thread
   new  fd61209f54 Got serial multi-threading working with 2 separate 
threads instead of 1
   new  2e249e5c24 Moved bookkeeping and imenu generation to separate thread
   new  b13cf27bf0 Removed unused variables
   new  e0389c235f Using separate error catching for imenu and bookkeeping 
generation
   new  9498a7ae53 Updated TODOs
   new  3a09d15aa1 Updated version and changelog


Summary of changes:
 TODO.md  |   5 +-
 phps-mode-ast-bookkeeping.el |   6 +-
 phps-mode-ast-imenu.el   |   9 ++-
 phps-mode-lex-analyzer.el|  95 +---
 phps-mode-serial.el  | 171 ++-
 phps-mode.el |   4 +-
 6 files changed, 182 insertions(+), 108 deletions(-)



[elpa] externals/phps-mode 2e249e5c24 4/8: Moved bookkeeping and imenu generation to separate thread

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit 2e249e5c24bba2e2266f5368bea10d9292263cbc
Author: Christian Johansson 
Commit: Christian Johansson 

Moved bookkeeping and imenu generation to separate thread
---
 phps-mode-ast-bookkeeping.el |  6 +++---
 phps-mode-ast-imenu.el   |  9 +
 phps-mode-lex-analyzer.el| 12 
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/phps-mode-ast-bookkeeping.el b/phps-mode-ast-bookkeeping.el
index 79e83e00f0..ebff44a952 100644
--- a/phps-mode-ast-bookkeeping.el
+++ b/phps-mode-ast-bookkeeping.el
@@ -242,10 +242,10 @@
 (push scope-string scope-strings)))
 scope-strings))
 
-(defun phps-mode-ast-bookkeeping--generate ()
-  "Generate AST for current buffer."
+(defun phps-mode-ast-bookkeeping--generate (&optional tree)
+  "Generate AST for current buffer or optionally for TREE."
   (let ((bookkeeping (make-hash-table :test 'equal))
-(bookkeeping-stack phps-mode-ast--tree)
+(bookkeeping-stack (if tree tree phps-mode-ast--tree))
 (inline-function-count 0)
 (arrow-function-count 0)
 (defined-count 0))
diff --git a/phps-mode-ast-imenu.el b/phps-mode-ast-imenu.el
index 5afe86b339..e61e6bfe9d 100644
--- a/phps-mode-ast-imenu.el
+++ b/phps-mode-ast-imenu.el
@@ -16,10 +16,11 @@
   nil
   "Imenu for current buffer.")
 
-(defun phps-mode-ast-imenu--generate ()
-  "Generate imenu from AST."
-  (let ((imenu-index))
-(dolist (item phps-mode-ast--tree)
+(defun phps-mode-ast-imenu--generate (&optional tree)
+  "Generate imenu from current buffer AST or optionally from TREE."
+  (let ((imenu-index)
+(ast-tree (if tree tree phps-mode-ast--tree)))
+(dolist (item ast-tree)
   (let ((children (plist-get item 'children))
 (item-type (plist-get item 'ast-type))
 (item-index (plist-get item 'index))
diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index ffdbd7ec4b..1c807a1791 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -254,8 +254,10 @@
;; Catch errors in bookkeeping or imenu generation
(condition-case conditions
(progn
- (phps-mode-ast-bookkeeping--generate)
- (phps-mode-ast-imenu--generate))
+ (phps-mode-ast-bookkeeping--generate
+  phps-mode-lex-analyzer--ast)
+ (phps-mode-ast-imenu--generate
+  phps-mode-lex-analyzer--ast))
  (error
   (display-warning
   'phps-mode
@@ -405,8 +407,10 @@
;; Catch errors in bookkeeping or imenu generation
(condition-case conditions
(progn
- (phps-mode-ast-bookkeeping--generate)
- (phps-mode-ast-imenu--generate))
+ (phps-mode-ast-bookkeeping--generate
+  phps-mode-lex-analyzer--ast)
+ (phps-mode-ast-imenu--generate
+  phps-mode-lex-analyzer--ast))
  (error
   (display-warning
   'phps-mode



[elpa] externals/phps-mode 3a09d15aa1 8/8: Updated version and changelog

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit 3a09d15aa143b175235674f4cd45f92b0b0a6c36
Author: Christian Johansson 
Commit: Christian Johansson 

Updated version and changelog
---
 phps-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phps-mode.el b/phps-mode.el
index 3e75faf5ce..7ffc5b9f0f 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Christian Johansson 
 ;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
-;; Modified: 18 Mar 2022
-;; Version: 0.4.19
+;; Modified: 23 Mar 2022
+;; Version: 0.4.20
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode
 



[elpa] externals/phps-mode 9498a7ae53 7/8: Updated TODOs

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit 9498a7ae532847e54ffc0c0e18320986828c76f6
Author: Christian Johansson 
Commit: Christian Johansson 

Updated TODOs
---
 TODO.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/TODO.md b/TODO.md
index 57cc5ba73c..805f5f8299 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,10 +4,9 @@
 
 * Bookkeeping of chained object operators like WC()->cart->subtotal
 * Bookkeeping of variables inside classes with multiple methods seems to not 
work
-* Move bookkeeping and imenu generation to main thread to be able to populate 
Sematic Subsystem in the future
-* Catch signaling from AST-generation, bookkeeping and imenu generation
-* Imenu-generation of conditionally defined functions and classes
 * Bookkeeping of class properties inside condition lists
+* Imenu-generation of conditionally defined functions and classes
+* Integrate imenu-generation into bookkeeping generation
 
 ## Other
 



[elpa] externals/phps-mode b13cf27bf0 5/8: Removed unused variables

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit b13cf27bf07ffb482518909126d270700e1437e1
Author: Christian Johansson 
Commit: Christian Johansson 

Removed unused variables
---
 phps-mode-lex-analyzer.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 1c807a1791..6b424677e9 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1146,9 +1146,7 @@
   (generate-new-buffer "*PHPs Lexer*"))
  (parse-error)
  (parse-trail)
- (ast-tree)
- (imenu-index)
- (bookkeeping-index))
+ (ast-tree))
 
 ;; Create temporary buffer and run lexer in it
 (when (get-buffer buffer)



[elpa] externals/phps-mode e0389c235f 6/8: Using separate error catching for imenu and bookkeeping generation

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit e0389c235f78ab0e02162b1b222688c5da936616
Author: Christian Johansson 
Commit: Christian Johansson 

Using separate error catching for imenu and bookkeeping generation
---
 phps-mode-lex-analyzer.el | 62 ++-
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 6b424677e9..010d4b2098 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -251,21 +251,30 @@
(setq phps-mode-lex-analyzer--parse-error (nth 8 lex-result))
(setq phps-mode-lex-analyzer--ast (nth 9 lex-result))
 
-   ;; Catch errors in bookkeeping or imenu generation
+   ;; Catch errors in bookkeeping generation
(condition-case conditions
-   (progn
- (phps-mode-ast-bookkeeping--generate
-  phps-mode-lex-analyzer--ast)
- (phps-mode-ast-imenu--generate
-  phps-mode-lex-analyzer--ast))
+   (phps-mode-ast-bookkeeping--generate
+phps-mode-lex-analyzer--ast)
  (error
   (display-warning
-  'phps-mode
-  (format "Failed to generate bookkeeping or imenu: %S" conditions)
-  :warning
-  "*PHPs Parser Errors*")))
+   'phps-mode
+   (format "Failed to generate bookkeeping: %S" conditions)
+   :warning
+   "*PHPs Bookkeeping Generation Errors*")))
+   (setq phps-mode-lex-analyzer--bookkeeping
+ phps-mode-ast-bookkeeping--index)
+
+   ;; Catch errors in imenu generation
+   (condition-case conditions
+   (phps-mode-ast-imenu--generate
+phps-mode-lex-analyzer--ast)
+ (error
+  (display-warning
+   'phps-mode
+   (format "Failed to generate imenu: %S" conditions)
+   :warning
+   "*PHPs Imenu Generation Errors*")))
(setq phps-mode-lex-analyzer--imenu phps-mode-ast-imenu--index)
-   (setq phps-mode-lex-analyzer--bookkeeping 
phps-mode-ast-bookkeeping--index)
 
(setq phps-mode-lex-analyzer--processed-buffer-p t)
(phps-mode-lex-analyzer--reset-imenu)
@@ -404,21 +413,30 @@
(setq phps-mode-lex-analyzer--parse-error (nth 8 lex-result))
(setq phps-mode-lex-analyzer--ast (nth 9 lex-result))
 
-   ;; Catch errors in bookkeeping or imenu generation
+   ;; Catch errors in bookkeeping generation
(condition-case conditions
-   (progn
- (phps-mode-ast-bookkeeping--generate
-  phps-mode-lex-analyzer--ast)
- (phps-mode-ast-imenu--generate
-  phps-mode-lex-analyzer--ast))
+   (phps-mode-ast-bookkeeping--generate
+phps-mode-lex-analyzer--ast)
  (error
   (display-warning
-  'phps-mode
-  (format "Failed to generate bookkeeping or imenu: %S" conditions)
-  :warning
-  "*PHPs Parser Errors*")))
+   'phps-mode
+   (format "Failed to generate bookkeeping: %S" conditions)
+   :warning
+   "*PHPs Bookkeeping Generation Errors*")))
+   (setq phps-mode-lex-analyzer--bookkeeping
+ phps-mode-ast-bookkeeping--index)
+
+   ;; Catch errors in imenu generation
+   (condition-case conditions
+   (phps-mode-ast-imenu--generate
+phps-mode-lex-analyzer--ast)
+ (error
+  (display-warning
+   'phps-mode
+   (format "Failed to generate imenu: %S" conditions)
+   :warning
+   "*PHPs Imenu Generation Errors*")))
(setq phps-mode-lex-analyzer--imenu phps-mode-ast-imenu--index)
-   (setq phps-mode-lex-analyzer--bookkeeping 
phps-mode-ast-bookkeeping--index)
 
(phps-mode-debug-message
 (message "Incremental tokens: %s" phps-mode-lex-analyzer--tokens))



[elpa] externals/phps-mode fd61209f54 3/8: Got serial multi-threading working with 2 separate threads instead of 1

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit fd61209f54907c058f529edd3686a74389aa52b9
Author: Christian Johansson 
Commit: Christian Johansson 

Got serial multi-threading working with 2 separate threads instead of 1
---
 phps-mode-serial.el | 54 ++---
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/phps-mode-serial.el b/phps-mode-serial.el
index 4b104dac8a..73e2a93701 100644
--- a/phps-mode-serial.el
+++ b/phps-mode-serial.el
@@ -159,18 +159,31 @@
   ;; First execute start lambda
   (condition-case conditions
   (let ((return (funcall start)))
-(setq start-return (list 'success return 
start-time)))
-(error (setq start-return (list 'error conditions 
start-time
+(setq
+ start-return
+ (list 'success return start-time)))
+(error
+ (setq
+  start-return
+  (list 'error conditions start-time
 
   ;; Profile execution in debug mode
   (when phps-mode-serial--profiling
 (let* ((end-time (current-time))
(end-time-float
-(+ (car end-time) (car (cdr end-time)) (* (car 
(cdr (cdr end-time))) 0.01)))
+(+
+ (car end-time)
+ (car (cdr end-time))
+ (* (car (cdr (cdr end-time))) 0.01)))
(start-time-float
-(+ (car start-time) (car (cdr start-time)) (* 
(car (cdr (cdr start-time))) 0.01)))
+(+
+ (car start-time)
+ (car (cdr start-time))
+ (* (car (cdr (cdr start-time))) 0.01)))
(elapsed (- end-time-float start-time-float)))
-  (message "Serial asynchronous thread start finished, 
elapsed: %fs" elapsed)))
+  (message
+   "Serial asynchronous thread start finished, 
elapsed: %fs"
+   elapsed)))
 
   start-return))
   key)))
@@ -180,9 +193,8 @@
  phps-mode-serial--async-threads)
 
 (make-thread
- `(lambda()
-(let ((start-return
-   (thread-join ,async-thread))
+ (lambda()
+(let ((start-return (thread-join async-thread))
   (end-return))
   (let ((status (car start-return))
 (value (car (cdr start-return)))
@@ -194,18 +206,31 @@
   ;; Then execute end lambda
   (condition-case conditions
   (let ((return (funcall end value)))
-(setq end-return (list 'success return 
start-time)))
-(error (setq end-return (list 'error conditions 
start-time
+(setq
+ end-return
+ (list 'success return start-time)))
+(error
+ (setq
+  end-return
+  (list 'error conditions start-time
 
   ;; Profile execution
   (when phps-mode-serial--profiling
 (let* ((end-time (current-time))
(end-time-float
-(+ (car end-time) (car (cdr end-time)) (* 
(car (cdr (cdr end-time))) 0.01)))
+(+
+ (car end-time)
+ (car (cdr end-time))
+ (* (car (cdr (cdr end-time))) 0.01)))
(start-time-float
-(+ (car start-time) (car (cdr start-time)) 
(* (car (cdr (cdr start-time))) 0.01)))
+(+
+ (car start-time)
+ (car (cdr start-time))
+ (* (car (cdr (cdr start-time))) 
0.01)))
(elapsed (- end-time-float 
start-time-float)))
-  (message "Serial asynchronous thread end 
finished, elapsed: %fs" elapsed)))
+  (message
+   "Serial asynchronous thread end finished, 
elapsed: %fs

[elpa] externals/phps-mode d45658d99c 1/8: Starting experimenting with using two threads for serial commands

2022-03-23 Thread Christian Johansson
branch: externals/phps-mode
commit d45658d99c19aa6ebd3b0bb3ff0a0f9f5d36e1e5
Author: Christian Johansson 
Commit: Christian Johansson 

Starting experimenting with using two threads for serial commands
---
 phps-mode-lexer.el  |   3 --
 phps-mode-serial.el | 147 
 2 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 8daae5d1b8..c4e0558995 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -1999,9 +1999,6 @@
   (dolist (lambd lambdas)
 (funcall lambd)))
 
-(when (fboundp 'thread-yield)
-  (thread-yield))
-
 ;; Did we find a match?
 (if phps-mode-lexer--match-length
 (progn
diff --git a/phps-mode-serial.el b/phps-mode-serial.el
index d359694277..4b104dac8a 100644
--- a/phps-mode-serial.el
+++ b/phps-mode-serial.el
@@ -97,7 +97,7 @@
   (let ((status (car start-return))
 (value (car (cdr start-return)))
 (start-time (car (cdr (cdr start-return
-(end-return nil))
+(end-return))
 
 ;; Profile execution in debug mode
 (when phps-mode-serial--profiling
@@ -145,77 +145,87 @@
 (with-current-buffer key
   (setq phps-mode-serial--status 'error))
 (when start-error
-  (funcall start-error value)))
+  (funcall start-error value
+end-return)))
phps-mode-serial--async-processes))
   (signal 'error (list "Async-start function is missing")))
 
   ;; Run command(s) asynchronously
-  (puthash
-   key
-   (make-thread
-(lambda()
-  (let ((start-return)
-(end-return))
-
-;; First execute start lambda
-(condition-case conditions
-(let ((return (funcall start)))
-  (setq start-return (list 'success return start-time)))
-  (error (setq start-return (list 'error conditions 
start-time
+  (let ((async-thread
+ (make-thread
+  (lambda()
+(let ((start-return))
 
-;; Profile execution in debug mode
-(when phps-mode-serial--profiling
-  (let* ((end-time (current-time))
- (end-time-float
-  (+ (car end-time) (car (cdr end-time)) (* (car (cdr 
(cdr end-time))) 0.01)))
- (start-time-float
-  (+ (car start-time) (car (cdr start-time)) (* (car 
(cdr (cdr start-time))) 0.01)))
- (elapsed (- end-time-float start-time-float)))
-(message "Serial asynchronous thread start finished, 
elapsed: %fs" elapsed)))
-
-(let ((status (car start-return))
-  (value (car (cdr start-return)))
-  (start-time (car (cdr (cdr start-return)
-
-  (if (string= status "success")
-  (progn
-
-;; Then execute end lambda
-(condition-case conditions
-(let ((return (funcall end value)))
-  (setq end-return (list 'success return 
start-time)))
-  (error (setq end-return (list 'error conditions 
start-time
-
-;; Profile execution
-(when phps-mode-serial--profiling
-  (let* ((end-time (current-time))
- (end-time-float
-  (+ (car end-time) (car (cdr end-time)) (* 
(car (cdr (cdr end-time))) 0.01)))
- (start-time-float
-  (+ (car start-time) (car (cdr start-time)) 
(* (car (cdr (cdr start-time))) 0.01)))
- (elapsed (- end-time-float start-time-float)))
-(message "Serial asynchronous thread end finished, 
elapsed: %fs" elapsed)))
-
-(let ((status (car end-return))
-  (value (car (cdr end-return
-
-  (when (string= status "success")
-(with-current-buffer key
-  (setq phps-mode-serial--status 'success)))
-
-  (when (string= status "error")
-(with-current-buffer key
-  (setq phps-mode-serial--status 'error))
-(when end-error
-  (funcall end-error value)
-
- 

[elpa] externals/csv-mode 56ed871dc2: Fix skipping of empty fields when transposing rows with quotes

2022-03-23 Thread Filipp Gunbin
branch: externals/csv-mode
commit 56ed871dc2feb9a12dce84a590ef9f049cc0405a
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Fix skipping of empty fields when transposing rows with quotes

* csv-mode.el (csv--collect-fields): Don't do csv-forward-field if on
separator, otherwise empty fields are missed.
---
 csv-mode.el | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/csv-mode.el b/csv-mode.el
index 24ed55b7fb..c78c44222e 100644
--- a/csv-mode.el
+++ b/csv-mode.el
@@ -1321,7 +1321,10 @@ point is assumed to be at the beginning of the line."
(split-string row-text csv-separator-regexp)
   (save-excursion
(while (< (setq field-start (point)) row-end-position)
- (csv-forward-field 1)
+  ;; csv-forward-field will skip a separator if point is on
+  ;; it, and we'll miss an empty field
+  (unless (memq (following-char) csv-separator-chars)
+   (csv-forward-field 1))
  (push
   (buffer-substring-no-properties field-start (point))
   fields)



[elpa] externals/embark 5bad2fd6b5: Fix remaining checkdoc complaints (they were silly, but whatever)

2022-03-23 Thread ELPA Syncer
branch: externals/embark
commit 5bad2fd6b56344b42a46a71bb5bd5def01610c70
Author: Omar Antolín 
Commit: Omar Antolín 

Fix remaining checkdoc complaints (they were silly, but whatever)
---
 embark.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/embark.el b/embark.el
index 74011b2463..64f0271ec7 100644
--- a/embark.el
+++ b/embark.el
@@ -2401,7 +2401,7 @@ default is `embark-collect'"
  :background "#efefef")
 (((class color) (min-colors 88) (background dark))
  :background "#242424"))
-  "Face to highlight alternate rows in `embark-collect-zebra-minor-mode'.")
+  "Face to highlight alternate rows in Embark Collect zebra minor mode.")
 
 (defface embark-collect-annotation '((t :inherit completions-annotations))
   "Face for annotations in Embark Collect.
@@ -2664,8 +2664,9 @@ For other Embark Collect buffers, run the default action 
on ENTRY."
   "List of candidates to be acted on.
 The command `embark-act' is bound `embark-collect-mode-map', but
 you might prefer to change the key binding to match your other
-key binding for it.  Or alternatively you might want to enable
-`embark-collect-direct-action-minor-mode' in
+key binding for it. Or alternatively you might want to enable the
+embark collect direct action minor mode by adding the function
+`embark-collect-direct-action-minor-mode' to
 `embark-collect-mode-hook'.")
 
 (defun embark--for-display (string)
@@ -2867,7 +2868,7 @@ candidate."
   (delete-overlay ov
 
 (defun embark-collect-toggle-marks ()
-  "Toggle each candidate mark: Marked candidates become unmarked, and vice 
versa."
+  "Toggle each mark: marked candidates become unmarked, and vice versa."
   (interactive)
   (unless (derived-mode-p 'embark-collect-mode)
 (user-error "Not in an Embark Collect mode buffer"))



[elpa] externals/embark-consult updated (183ab2fa37 -> 5bad2fd6b5)

2022-03-23 Thread ELPA Syncer
elpasync pushed a change to branch externals/embark-consult.

  from  183ab2fa37 Merge pull request #476 from minad/ouch
  adds  5bad2fd6b5 Fix remaining checkdoc complaints (they were silly, but 
whatever)

No new revisions were added by this update.

Summary of changes:
 embark.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)



[elpa] externals/pulsar updated (40b1aa8c48 -> 1a1de8a15f)

2022-03-23 Thread ELPA Syncer
elpasync pushed a change to branch externals/pulsar.

  from  40b1aa8c48 Document pulsar package installation
   new  5445236a47 Modify pulsar--pulse function to pulse only current 
window
   new  3f0745113b Merge branch 'main' into 'main'
   new  1a1de8a15f Add Aymeric Agon-Rambosson to the acknowledgements


Summary of changes:
 README.org |  3 ++-
 pulsar.el  | 13 -
 2 files changed, 10 insertions(+), 6 deletions(-)



[elpa] externals/pulsar 3f0745113b 2/3: Merge branch 'main' into 'main'

2022-03-23 Thread ELPA Syncer
branch: externals/pulsar
commit 3f0745113b6b7de97dd3135528bb80f96977fe9f
Merge: 40b1aa8c48 5445236a47
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Merge branch 'main' into 'main'

Modify pulsar--pulse function to pulse only current window

See merge request protesilaos/pulsar!2
---
 pulsar.el | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pulsar.el b/pulsar.el
index d369ecf929..155e929c23 100644
--- a/pulsar.el
+++ b/pulsar.el
@@ -262,11 +262,14 @@ With optional NO-PULSE keep the highlight until another 
command
 is invoked.  Otherwise use whatever `pulsar-pulse' entails.
 
 With optional FACE, use it instead of `pulsar-face'."
-  (let ((pulse-flag (if no-pulse nil pulsar-pulse))
-(pulse-delay pulsar-delay)
-(pulse-iterations pulsar-iterations)
-(f (if (facep face) face pulsar-face)))
-(pulse-momentary-highlight-region (pulsar--start) (pulsar--end) f)))
+  (let* ((pulse-flag (if no-pulse nil pulsar-pulse))
+(pulse-delay pulsar-delay)
+(pulse-iterations pulsar-iterations)
+(f (if (facep face) face pulsar-face))
+(o (make-overlay (pulsar--start) (pulsar--end
+(overlay-put o 'pulse-delete t)
+(overlay-put o 'window (frame-selected-window))
+(pulse-momentary-highlight-overlay o f)))
 
 ;;;###autoload
 (defun pulsar-pulse-line ()



[elpa] externals/pulsar 1a1de8a15f 3/3: Add Aymeric Agon-Rambosson to the acknowledgements

2022-03-23 Thread ELPA Syncer
branch: externals/pulsar
commit 1a1de8a15fed23cba9b7b9b469158f1a5a99ddb4
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add Aymeric Agon-Rambosson to the acknowledgements

This pertains to commit 5445236 or else merge request 2:
..  Aymeric
has assigned copyright to the FSF.
---
 README.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 8c74d5da8f..ae81477325 100644
--- a/README.org
+++ b/README.org
@@ -267,7 +267,8 @@ Pulsar is meant to be a collective effort.  Every bit of 
help matters.
 
 + Author/maintainer :: Protesilaos Stavrou.
 
-+ Contributions to the code or manual :: Daniel Mendler, JD Smith.
++ Contributions to the code or manual :: Aymeric Agon-Rambosson, Daniel
+  Mendler, JD Smith.
 
 + Ideas and user feedback :: Mark Barton, Petter Storvik, and user kb.
 



[elpa] externals/pulsar 5445236a47 1/3: Modify pulsar--pulse function to pulse only current window

2022-03-23 Thread ELPA Syncer
branch: externals/pulsar
commit 5445236a47da1609a387655168cde9a3800afd59
Author: Aymeric Agon-Rambosson 
Commit: Aymeric Agon-Rambosson 

Modify pulsar--pulse function to pulse only current window
---
 pulsar.el | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pulsar.el b/pulsar.el
index d369ecf929..155e929c23 100644
--- a/pulsar.el
+++ b/pulsar.el
@@ -262,11 +262,14 @@ With optional NO-PULSE keep the highlight until another 
command
 is invoked.  Otherwise use whatever `pulsar-pulse' entails.
 
 With optional FACE, use it instead of `pulsar-face'."
-  (let ((pulse-flag (if no-pulse nil pulsar-pulse))
-(pulse-delay pulsar-delay)
-(pulse-iterations pulsar-iterations)
-(f (if (facep face) face pulsar-face)))
-(pulse-momentary-highlight-region (pulsar--start) (pulsar--end) f)))
+  (let* ((pulse-flag (if no-pulse nil pulsar-pulse))
+(pulse-delay pulsar-delay)
+(pulse-iterations pulsar-iterations)
+(f (if (facep face) face pulsar-face))
+(o (make-overlay (pulsar--start) (pulsar--end
+(overlay-put o 'pulse-delete t)
+(overlay-put o 'window (frame-selected-window))
+(pulse-momentary-highlight-overlay o f)))
 
 ;;;###autoload
 (defun pulsar-pulse-line ()



[nongnu] elpa/apropospriate-theme 7bcabbbbef: add dirvish-hl-line

2022-03-23 Thread ELPA Syncer
branch: elpa/apropospriate-theme
commit 7bcaef2cb1dd12917f248402565b557d8f60
Author: justin talbott 
Commit: justin talbott 

add dirvish-hl-line
---
 README.md| 1 +
 apropospriate.el | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f8cc871e54..1687740b38 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ Apropospriate supports all the usual `prog-mode` derived 
packages as well as som
 * Neotree
 * Hydra
 * Dired Subtree
+* Dirvish
 * Symbol Overlay
 * Counsel CSS
 * Ivy Posframe
diff --git a/apropospriate.el b/apropospriate.el
index 8c1b258d61..67c8a1b57b 100644
--- a/apropospriate.el
+++ b/apropospriate.el
@@ -448,6 +448,7 @@ Set to `1.0' or nil to prevent font size manipulation."
  `(undo-tree-visualizer-register-face ((,class (:foreground ,yellow
  `(erm-syn-errline ((,class (:box nil :underline (:style wave :color 
,red)
  `(erm-syn-warnline ((,class (:box nil :underline (:style wave :color 
,orange)
+ `(dirvish-hl-line ((,class (:background ,highlight-line-color
  `(dired-directory ((,class (:foreground ,brown
  `(dired-header ((,class (:inherit header-line
  `(dired-subtree-depth-1-face ((,class (:background ,base00-1



[elpa] externals/corfu c8e6607c90: README: Expand Tab-n-go section

2022-03-23 Thread ELPA Syncer
branch: externals/corfu
commit c8e6607c90a89ff19062cd37afc17e8bbb86aba3
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Expand Tab-n-go section
---
 README.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.org b/README.org
index 55c647419b..c3be759714 100644
--- a/README.org
+++ b/README.org
@@ -316,6 +316,9 @@ always use =SPC= to separate the Orderless components.
 
 You may be interested in configuring Corfu in TAB-and-Go style. Pressing TAB
 moves to the next candidate and further input will then commit the selection.
+Note that further input will not expand snippets or templates, which may not be
+desired but which leads overall to a more predictable behavior. In order to
+force snippet expansion, confirm a candidate explicitly with ~RET~.
 
 #+begin_src emacs-lisp
   (use-package corfu



[elpa] externals/org c5ea195c76: Merge branch 'bugfix'

2022-03-23 Thread ELPA Syncer
branch: externals/org
commit c5ea195c76c62dc0cce3040a7d8763a1fc5dceba
Merge: c9c0b9d004 667fa06646
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

Merge branch 'bugfix'
---
 lisp/oc-biblatex.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index 80d4093b10..0031ec48b8 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -258,12 +258,7 @@ INFO is the export state, as a property list."
 (mapconcat (lambda (r)
  (org-cite-biblatex--atomic-arguments (list r) info))
(org-cite-get-references citation)
-   "")
-;; According to BibLaTeX manual, left braces or brackets
-;; following a multicite command could be parsed as other
-;; arguments. So we stop any further parsing by inserting
-;; a \relax unconditionally.
-"\\relax")))
+   ""
 
 (defun org-cite-biblatex--command (citation info name &optional multi no-opt)
   "Return BibLaTeX command NAME for CITATION object.



[elpa] externals/org updated (c9c0b9d004 -> c5ea195c76)

2022-03-23 Thread ELPA Syncer
elpasync pushed a change to branch externals/org.

  from  c9c0b9d004 Merge branch 'bugfix'
   new  667fa06646 oc-biblatex: Remove \relax hack after multicite commands
   new  c5ea195c76 Merge branch 'bugfix'


Summary of changes:
 lisp/oc-biblatex.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)



[elpa] externals-release/org 667fa06646: oc-biblatex: Remove \relax hack after multicite commands

2022-03-23 Thread ELPA Syncer
branch: externals-release/org
commit 667fa066460788c86b4786bf5d30b25e64fb18af
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

oc-biblatex: Remove \relax hack after multicite commands

* lisp/oc-biblatex.el (org-cite-biblatex--multi-arguments): Do not try
to be smart and add \relax{} after multicite commands, as it breaks
csquotes.

Reported-by: Zac E 


---
 lisp/oc-biblatex.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index 3cc157ec93..174725b424 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -164,12 +164,7 @@ INFO is the export state, as a property list."
 (mapconcat (lambda (r)
  (org-cite-biblatex--atomic-arguments (list r) info))
(org-cite-get-references citation)
-   "")
-;; According to BibLaTeX manual, left braces or brackets
-;; following a multicite command could be parsed as other
-;; arguments. So we stop any further parsing by inserting
-;; a \relax unconditionally.
-"\\relax")))
+   ""
 
 (defun org-cite-biblatex--command (citation info base &optional multi no-opt)
   "Return biblatex command using BASE name for CITATION object.



[nongnu] elpa/geiser bc0dde3104: Missing version tag, and version bumped

2022-03-23 Thread ELPA Syncer
branch: elpa/geiser
commit bc0dde310492de733f9ec528d7aeddd57093d05e
Author: jao 
Commit: jao 

Missing version tag, and version bumped
---
 elisp/geiser.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index a36f50ac6b..7fad7d0167 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "25.1") (transient "0.3") (project "0.8.1"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.23
+;; Version: 0.23.2
 
 ;;; Commentary:
 



[nongnu] elpa/geiser-guile c641fcc50b: Version bump to geiser 0.23.2

2022-03-23 Thread ELPA Syncer
branch: elpa/geiser-guile
commit c641fcc50b6b86ca95743122b5206cdcd475f96e
Author: jao 
Commit: jao 

Version bump to geiser 0.23.2

Fixes issue #18.
---
 geiser-guile.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-guile.el b/geiser-guile.el
index 3b4ebe47fd..db42945fa2 100644
--- a/geiser-guile.el
+++ b/geiser-guile.el
@@ -7,9 +7,9 @@
 ;; Maintainer: Jose Antonio Ortega Ruiz (j...@gnu.org)
 ;; Keywords: languages, guile, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/guile
-;; Package-Requires: ((emacs "25.1") (geiser "0.23.1"))
+;; Package-Requires: ((emacs "25.1") (geiser "0.23.2"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.23
+;; Version: 0.23.2
 
 ;; This file is NOT part of GNU Emacs.
 



[nongnu] elpa/geiser cbfab92584: Support for #{...}# extended symbol syntax

2022-03-23 Thread ELPA Syncer
branch: elpa/geiser
commit cbfab92584072ba0e1c4119612a8438db61ecbf6
Author: jao 
Commit: jao 

Support for #{...}# extended symbol syntax

Should fix issue #41, possibly the oldest still standing!  My thanks
and apologies to @ghost, wherever you are!
---
 elisp/geiser-syntax.el | 8 
 1 file changed, 8 insertions(+)

diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index a5fc54ffa6..d4ea75e1c4 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -190,6 +190,13 @@ implementation-specific entries for font-lock-keywords.")
   (geiser-syntax--read/token
(cons 'unprintable (geiser-syntax--read/matching "<" ">"
 
+(defun geiser-syntax--read/ex-symbol ()  ;; #{foo bar}# style symbols
+  (let ((tk (geiser-syntax--read/matching "{" "}")))
+(when-let (c (geiser-syntax--read/next-char))
+  (when (char-equal ?\# c)
+(geiser-syntax--read/next-char)
+(cons 'atom (make-symbol (format "#{%s}#" tk)))
+
 (defun geiser-syntax--read/skip-comment ()
   (while (and (geiser-syntax--read/next-char)
   (nth 8 (syntax-ppss
@@ -215,6 +222,7 @@ implementation-specific entries for font-lock-keywords.")
  (?\( (geiser-syntax--read/token 'vectorb))
  (?\< (geiser-syntax--read/unprintable))
  ((?' ?` ?,) (geiser-syntax--read/next-token))
+ (?\{ (geiser-syntax--read/ex-symbol))
  (t (let ((tok (geiser-syntax--read/symbol)))
   (cond ((equal (symbol-name tok) "t") '(boolean . :t))
 ((equal (symbol-name tok) "f") '(boolean . :f))



[nongnu] elpa/cider 41840db477: [Fixes #3170] Skip ensure of repl available on xref functions (#3171)

2022-03-23 Thread ELPA Syncer
branch: elpa/cider
commit 41840db4776ecc1a966efe2d0fe842b40ddaf095
Author: Eric Dallo 
Commit: GitHub 

[Fixes #3170] Skip ensure of repl available on xref functions (#3171)
---
 CHANGELOG.md| 1 +
 cider-client.el | 9 ++---
 cider-find.el   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a245d345c1..1c7c5471f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changes
 
 * Use clojure-mode 
[5.14.0](https://github.com/clojure-emacs/clojure-mode/blob/v5.14.0/CHANGELOG.md#5140-2022-03-07).
+* [#3170](https://github.com/clojure-emacs/cider/issues/3170) Skip ensure repl 
available on xref functions.
 
 ## 1.3.0 (2021-03-07)
 
diff --git a/cider-client.el b/cider-client.el
index 4fb2ca887d..a523d998e5 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -161,9 +161,12 @@ nREPL connection."
   (clojure-expected-ns path)))
 (clojure-expected-ns path)))
 
-(defun cider-nrepl-op-supported-p (op &optional connection)
-  "Check whether the CONNECTION supports the nREPL middleware OP."
-  (nrepl-op-supported-p op (or connection (cider-current-repl nil 'ensure
+(defun cider-nrepl-op-supported-p (op &optional connection skip-ensure)
+  "Check whether the CONNECTION supports the nREPL middleware OP.
+Skip check if repl is active if SKIP-ENSURE is non nil."
+  (nrepl-op-supported-p op (or connection (cider-current-repl nil (if 
skip-ensure
+  nil
+
'ensure)
 
 (defun cider-ensure-op-supported (op)
   "Check for support of middleware op OP.
diff --git a/cider-find.el b/cider-find.el
index ea43dc11dd..2ff0aa50fa 100644
--- a/cider-find.el
+++ b/cider-find.el
@@ -234,7 +234,7 @@ thing at point."
   "Used for xref integration."
   ;; Check if `cider-nrepl` middleware is loaded. Allows fallback to other xref
   ;; backends, if cider-nrepl is not loaded.
-  (when (cider-nrepl-op-supported-p "ns-path")
+  (when (cider-nrepl-op-supported-p "ns-path" 'skip-ensure)
 'cider))
 
 (cl-defmethod xref-backend-identifier-at-point ((_backend (eql cider)))



[nongnu] elpa/solarized-theme updated (f34a171ff0 -> 86e5f94ea0)

2022-03-23 Thread ELPA Syncer
elpasync pushed a change to branch elpa/solarized-theme.

  from  f34a171ff0 Add theme for face `completions-common-part'
   new  649290f404 Add more helm-find-files faces
   new  86e5f94ea0 Add theme for tab-bar face


Summary of changes:
 solarized-faces.el | 9 +
 1 file changed, 9 insertions(+)



[nongnu] elpa/solarized-theme 86e5f94ea0 2/2: Add theme for tab-bar face

2022-03-23 Thread ELPA Syncer
branch: elpa/solarized-theme
commit 86e5f94ea033c8b2a21084774063a493b62a4e81
Author: eggathuru <12476831+eggath...@users.noreply.github.com>
Commit: Thomas Frössman 

Add theme for tab-bar face
---
 solarized-faces.el | 4 
 1 file changed, 4 insertions(+)

diff --git a/solarized-faces.el b/solarized-faces.el
index 713a23bca2..cf26933186 100644
--- a/solarized-faces.el
+++ b/solarized-faces.el
@@ -1772,6 +1772,10 @@
 ;; misc
  `(sr-clex-hotchar-face ((,class (:background ,red  :foreground ,base03
   :weight bold
+; tab-bar
+ `(tab-bar ((t (:background ,base03 :foreground ,base0
+ `(tab-bar-tab ((t (:background ,base03 :foreground ,base1
+ `(tab-bar-tab-inactive ((t (:background ,base02 :foreground ,base01
 ; tabbar
  `(tabbar-default ((,class (:foreground ,base03 :background ,base03
  `(tabbar-highlight ((,class (:underline t



[nongnu] elpa/solarized-theme 649290f404 1/2: Add more helm-find-files faces

2022-03-23 Thread ELPA Syncer
branch: elpa/solarized-theme
commit 649290f404d17f322e89e2dfec2b37f51a4a9267
Author: JunyuanChen <75352049+junyuanc...@users.noreply.github.com>
Commit: Thomas Frössman 

Add more helm-find-files faces

dotted directory, socket, pipe, suid, backup-file
Colors taken from the default `ls --color` output.
---
 solarized-faces.el | 5 +
 1 file changed, 5 insertions(+)

diff --git a/solarized-faces.el b/solarized-faces.el
index b2f6e8e998..713a23bca2 100644
--- a/solarized-faces.el
+++ b/solarized-faces.el
@@ -808,9 +808,14 @@
  `(helm-buffer-size ((,class (:foreground ,base01
  `(helm-candidate-number ((,class (:background ,base02 :foreground ,base1
:bold t
+ `(helm-ff-dotted-directory ((,class (:foreground ,base03 :background 
,base01
  `(helm-ff-directory ((,class (:background ,base03  :foreground ,blue
  `(helm-ff-executable ((,class (:foreground ,green
+ `(helm-ff-socket ((,class (:foreground ,magenta
+ `(helm-ff-pipe ((,class (:foreground ,yellow
+ `(helm-ff-suid ((,class (:foreground ,base03 :background ,red
  `(helm-ff-file ((,class (:background ,base03 :foreground ,base0
+ `(helm-ff-backup-file ((,class (:foreground ,base01
  `(helm-ff-invalid-symlink ((,class (:background ,base03 :foreground 
,orange
  :slant italic
  `(helm-ff-prefix ((,class (:background ,yellow :foreground ,base03



[nongnu] elpa/cider 36277802a4: Add missing argument for previous commit

2022-03-23 Thread ELPA Syncer
branch: elpa/cider
commit 36277802a47b0dbc9c1fd60f60908963c59c58d6
Author: vemv 
Commit: vemv 

Add missing argument for previous commit
---
 cider-find.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cider-find.el b/cider-find.el
index 2ff0aa50fa..825250567c 100644
--- a/cider-find.el
+++ b/cider-find.el
@@ -234,7 +234,7 @@ thing at point."
   "Used for xref integration."
   ;; Check if `cider-nrepl` middleware is loaded. Allows fallback to other xref
   ;; backends, if cider-nrepl is not loaded.
-  (when (cider-nrepl-op-supported-p "ns-path" 'skip-ensure)
+  (when (cider-nrepl-op-supported-p "ns-path" nil 'skip-ensure)
 'cider))
 
 (cl-defmethod xref-backend-identifier-at-point ((_backend (eql cider)))