[nongnu] elpa/helm 7ff0b93b79 2/2: Allow configuring split-string separator in helm async output (#2503, #2450)

[ELPA Syncer]

branch: elpa/helm
commit 7ff0b93b79117babeb5262b2f0754005b6d050ad
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Allow configuring split-string separator in helm async output (#2503, #2450)
---
 helm-core.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helm-core.el b/helm-core.el
index fb3da2cc00..43e63134af 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -1771,6 +1771,10 @@ The hook should takes one arg SOURCES.")
 
 (defvar helm-help-buffer-name "*Helm Help*"
   "The name of helm help buffer.")
+
+;; See bug#2503.
+(defvar helm-process-output-split-string-separator "\n"
+  "Separator to use when splitting helm async output.")
 
 ;;; Internal Variables
 ;;
@@ -5205,7 +5209,8 @@ This will work only in Emacs-26+, i.e. Emacs versions 
that have
 (defun helm-output-filter--process-source (process output-string source limit)
   (cl-dolist (candidate (helm-transform-candidates
  (helm-output-filter--collect-candidates
-  (split-string output-string "\n")
+  (split-string output-string
+
helm-process-output-split-string-separator)
   (assq 'incomplete-line source))
  source t))
 (setq candidate

[nongnu] elpa/helm 61bbbd4062 1/2: Add commands that scroll helm window by helm-scroll-amount lines (#2450)

[ELPA Syncer]

branch: elpa/helm
commit 61bbbd40622b075b8c36de723ccffbbccfd23139
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Add commands that scroll helm window by helm-scroll-amount lines (#2450)
---
 helm-core.el | 28 ++--
 helm-lib.el  |  4 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/helm-core.el b/helm-core.el
index 4f66fe5dac..fb3da2cc00 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -213,8 +213,8 @@ and vectors, so don't use strings to define them."
 (define-key map (kbd "") 'helm-follow-action-backward)
 (define-key map (kbd "")'helm-previous-page)
 (define-key map (kbd "") 'helm-next-page)
-(define-key map (kbd "M-v")'helm-previous-page)
-(define-key map (kbd "C-v")'helm-next-page)
+(define-key map (kbd "M-v")'helm-scroll-up)
+(define-key map (kbd "C-v")'helm-scroll-down)
 (define-key map (kbd "M-<")'helm-beginning-of-buffer)
 (define-key map (kbd "M->")'helm-end-of-buffer)
 (define-key map (kbd "C-g")'helm-keyboard-quit)
@@ -5790,12 +5790,12 @@ Key arg DIRECTION can be one of:
 
 (defun helm-move--previous-page-fn ()
   (condition-case nil
-  (scroll-down)
+  (scroll-down helm-scroll-amount)
 (beginning-of-buffer (goto-char (point-min)
 
 (defun helm-move--next-page-fn ()
   (condition-case nil
-  (scroll-up)
+  (scroll-up helm-scroll-amount)
 (end-of-buffer (goto-char (point-max)
 
 (defun helm-move--beginning-of-buffer-fn ()
@@ -5885,18 +5885,34 @@ next source)."
 (helm--next-or-previous-line 'next arg)))
 (put 'helm-next-line 'helm-only t)
 
+(defun helm-scroll-up ()
+  "Scroll up helm-buffer by `helm-scroll-amount' lines."
+  (interactive)
+  (with-helm-alive-p
+(helm-move-selection-common :where 'page :direction 'previous)))
+(put 'helm-scroll-up 'helm-only t)
+
 (defun helm-previous-page ()
   "Move selection back with a pageful."
   (interactive)
   (with-helm-alive-p
-(helm-move-selection-common :where 'page :direction 'previous)))
+(let (helm-scroll-amount)
+  (helm-move-selection-common :where 'page :direction 'previous
 (put 'helm-previous-page 'helm-only t)
 
+(defun helm-scroll-down ()
+  "Scroll down helm-buffer by `helm-scroll-amount' lines."
+  (interactive)
+  (with-helm-alive-p
+(helm-move-selection-common :where 'page :direction 'next)))
+(put 'helm-scroll-down 'helm-only t)
+
 (defun helm-next-page ()
   "Move selection forward with a pageful."
   (interactive)
   (with-helm-alive-p
-(helm-move-selection-common :where 'page :direction 'next)))
+(let (helm-scroll-amount)
+  (helm-move-selection-common :where 'page :direction 'next
 (put 'helm-next-page 'helm-only t)
 
 (defun helm-beginning-of-buffer ()
diff --git a/helm-lib.el b/helm-lib.el
index 5c407c7bbf..e3e9211d2a 100644
--- a/helm-lib.el
+++ b/helm-lib.el
@@ -97,8 +97,8 @@ already provided by [next-history-element]."
   :group 'helm)
 
 (defcustom helm-scroll-amount nil
-  "Scroll amount when scrolling other window in a helm session.
-It is used by `helm-scroll-other-window'
+  "Scroll amount when scrolling helm window or other window in a helm session.
+It is used by `helm-scroll-other-window', `helm-scroll-up', `helm-scroll-down'
 and `helm-scroll-other-window-down'.
 
 If you prefer scrolling line by line, set this value to 1."

[nongnu] elpa/helm-core updated (24cc8959fb -> 7ff0b93b79)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  24cc8959fb substitute-command-keys in short docs
  adds  61bbbd4062 Add commands that scroll helm window by 
helm-scroll-amount lines (#2450)
  adds  7ff0b93b79 Allow configuring split-string separator in helm async 
output (#2503, #2450)

No new revisions were added by this update.

Summary of changes:
 helm-core.el | 35 ---
 helm-lib.el  |  4 ++--
 2 files changed, 30 insertions(+), 9 deletions(-)

[nongnu] elpa/helm updated (24cc8959fb -> 7ff0b93b79)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  24cc8959fb substitute-command-keys in short docs
   new  61bbbd4062 Add commands that scroll helm window by 
helm-scroll-amount lines (#2450)
   new  7ff0b93b79 Allow configuring split-string separator in helm async 
output (#2503, #2450)


Summary of changes:
 helm-core.el | 35 ---
 helm-lib.el  |  4 ++--
 2 files changed, 30 insertions(+), 9 deletions(-)

[elpa] externals/cursory 81a1ea1f7c: Fix bug with state save and recovery

[ELPA Syncer]

branch: externals/cursory
commit 81a1ea1f7cf9946c915194351ca0485cb69ee8c5
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix bug with state save and recovery
---
 cursory.el | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cursory.el b/cursory.el
index a3378ebccf..196c137d99 100644
--- a/cursory.el
+++ b/cursory.el
@@ -5,7 +5,7 @@
 ;; Author: Protesilaos Stavrou 
 ;; URL: https://git.sr.ht/~protesilaos/cursory
 ;; Mailing list: https://lists.sr.ht/~protesilaos/cursory
-;; Version: 0.1.1
+;; Version: 0.1.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: convenience, cursor
 
@@ -146,14 +146,14 @@ With optional LOCAL as a prefix argument, set the
 (defun cursory-store-latest-preset ()
   "Write latest cursor state to `cursory-latest-state-file'.
 Can be assigned to `kill-emacs-hook'."
-  (when cursory--style-hist
+  (when-let ((hist cursory--style-hist))
 (with-temp-file cursory-latest-state-file
   (insert ";; Auto-generated file; don't edit -*- mode: "
- (if (<= 28 emacs-major-version)
- "lisp-data"
-   "emacs-lisp")
- " -*-\n"))
-  (pp (intern (car cursory--style-hist)) (current-buffer
+ (if (<= 28 emacs-major-version)
+ "lisp-data"
+   "emacs-lisp")
+ " -*-\n")
+  (pp (intern (car hist)) (current-buffer)
 
 (defvar cursory-recovered-preset nil
   "Recovered value of latest store cursor preset.")
@@ -161,15 +161,15 @@ Can be assigned to `kill-emacs-hook'."
 ;;;###autoload
 (defun cursory-restore-latest-preset ()
   "Restore latest cursor style."
-  (when-let ((file cursory-latest-state-file))
-(when (file-exists-p file)
-  (setq cursory-recovered-preset
-(unless (zerop
- (or (file-attribute-size (file-attributes file))
- 0))
-  (with-temp-buffer
-(insert-file-contents file)
-(read (current-buffer
+  (when-let* ((file cursory-latest-state-file)
+  ((file-exists-p file)))
+(setq cursory-recovered-preset
+  (unless (zerop
+   (or (file-attribute-size (file-attributes file))
+   0))
+(with-temp-buffer
+  (insert-file-contents file)
+  (read (current-buffer)))
 
 (provide 'cursory)
 ;;; cursory.el ends here

[elpa] externals/bluetooth 84488dfdd2: release version 0.3.1 with bugfix for timer cleanup issue

[ELPA Syncer]

branch: externals/bluetooth
commit 84488dfdd2355e512f9e9444a233448221b3d9cc
Author: Raffael Stocker 
Commit: Raffael Stocker 

release version 0.3.1 with bugfix for timer cleanup issue
---
 bluetooth.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluetooth.el b/bluetooth.el
index 1c998ba726..3bceacf8c4 100644
--- a/bluetooth.el
+++ b/bluetooth.el
@@ -7,7 +7,7 @@
 ;;
 ;; Maintainer: Raffael Stocker 
 ;; Created: 13 Aug 2019
-;; Version: 0.3
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "25.1") (dash "2.18.1"))
 ;; Keywords: hardware
 ;; URL: https://gitlab.com/rstocker/emacs-bluetooth

[elpa] externals/org-modern updated (42cb064f9d -> ff1046705b)

[ELPA Syncer]

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

  from  42cb064f9d Fix docstring
   new  98b52c2849 Add org-modern-custom-timestamp-format (#30)
   new  ff1046705b Simplify custom timestamp format, set 
org-modern-timestamp to a cons


Summary of changes:
 org-modern.el | 68 +++
 1 file changed, 41 insertions(+), 27 deletions(-)

[elpa] externals/org-modern 98b52c2849 1/2: Add org-modern-custom-timestamp-format (#30)

[ELPA Syncer]

branch: externals/org-modern
commit 98b52c2849efabfc5f3f3a3493d34f9c2a954e32
Author: viz <37809414+v...@users.noreply.github.com>
Commit: GitHub 

Add org-modern-custom-timestamp-format (#30)

* Add org-modern-custom-timestamp-format

This option is the equivalent of org-mode's
org-time-stamp-custom-formats.  See #29.

* Split org-modern--timestamp into two functions

* org-modern--timestamp-custom: Prefer add-text-properties

* Fix fallouts from merge

Restore the org-modern-timestamp behaviour before the merge

Co-authored-by: Visuwesh 
---
 org-modern.el | 51 +++
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/org-modern.el b/org-modern.el
index 27be2d1790..4a8df614e8 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -93,6 +93,17 @@ Set to nil to disable styling the headlines."
 Set to nil to disable styling the time stamps."
   :type 'boolean)
 
+(defcustom org-modern-custom-timestamp-format nil
+  "Format of custom timestamps, or nil for none.
+If non-nil, it should be (DATE . TIME) where DATE is the format
+for date, and TIME is the format for time.  DATE and TIME must be
+surrounded with space.  For the syntax, refer to
+`format-time-string'."
+  :type '(choice
+  (const :tag "Do not use custom timestamp format" nil)
+  (const :tag " -MM-DD  HH:MM " '(" %Y-%m-%d " . " %H:%M "))
+  (cons :tag "Custom date and time format" string string)))
+
 (defcustom org-modern-table t
   "Prettify tables."
   :type 'boolean)
@@ -333,7 +344,7 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
'org-modern-done
  'org-modern-todo)
 
-(defun org-modern--timestamp ()
+(defun org-modern--timestamp-default ()
   "Prettify timestamps."
   (let* ((active (eq (char-after (match-beginning 0)) ?<))
  (date-face (if active
@@ -342,6 +353,7 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
  (time-face (if active
 'org-modern-time-active
   'org-modern-time-inactive)))
+(remove-text-properties (match-beginning 0) (match-end 0) '(display nil))
 (put-text-property
  (match-beginning 0)
  (1+ (match-beginning 0))
@@ -366,6 +378,35 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
(match-end 0)
'face time-face
 
+(defun org-modern--timestamp-custom ()
+  "Prettify timestamps per `org-modern-custom-timestamp-format'."
+  (let* ((active (eq (char-after (match-beginning 0)) ?<))
+ (date-face (if active
+'org-modern-date-active
+  'org-modern-date-inactive))
+ (time-face (if active
+'org-modern-time-active
+  'org-modern-time-inactive))
+ (time (save-match-data
+ (encode-time
+  (org-fix-decoded-time
+   (org-parse-time-string
+(buffer-substring (match-beginning 0) (match-end 0
+(remove-list-of-text-properties (match-beginning 0) (match-end 0) 
'(display))
+;; year-month-day
+(add-text-properties
+ (match-beginning 0)
+ (if (eq (match-beginning 2) (match-end 2)) (match-end 0) (match-end 1))
+ `( face ,date-face
+display ,(format-time-string (car org-modern-custom-timestamp-format) 
time)))
+;; hour:minute
+(unless (eq (match-beginning 2) (match-end 2))
+  (add-text-properties
+   (match-beginning 2)
+   (match-end 0)
+   `( face ,time-face
+  display ,(format-time-string (cdr 
org-modern-custom-timestamp-format) time))
+
 (defun org-modern--star ()
   "Prettify headline stars."
   (let ((level (- (match-end 1) (match-beginning 1
@@ -517,9 +558,11 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
   (when org-modern-tag
 `((,(concat "^\\*+.*?\\( \\)\\(:\\(?:" org-tag-re ":\\)+\\)[ \t]*$")
(0 (org-modern--tag)
-  (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)))
+  (when org-modern-timestamp
+`(("\\(?:<\\|\\[\\)\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\(?: 
[[:word:]]+\\)?\\(?: [.+-]+[0-9ymwdh/]+\\)*\\)\\(\\(?: [0-9:-]+\\)?\\(?: 
[.+-]+[0-9ymwdh/]+\\)*\\)\\(?:>\\|\\]\\)"
+   (0 ,(if org-modern-custom-timestamp-format
+   '(org-modern--timestamp-custom)
+ '(org-modern--timestamp-default
   
("<[^>]+>\\(-\\)\\(-\\)<[^>]+>\\|\\[[^]]+\\]\\(?1:-\\)\\(?2:-\\)\\[[^]]+\\]"
(1 '(face org-modern-label display #("  " 1 2 (face 
(:strike-through t) cursor t))) t)
  

[elpa] externals/setup fa7c889f66: Attribute Earl for :with-function

[ELPA Syncer]

branch: externals/setup
commit fa7c889f66d952e798ffb52a4bf7fd38f0a29f01
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Attribute Earl for :with-function
---
 setup.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.el b/setup.el
index ab33df2a3f..3028f0e53c 100644
--- a/setup.el
+++ b/setup.el
@@ -41,7 +41,7 @@
 
 ;; - Add new `:and' macro.
 ;; - Add new `:with-function' macro and have `:hook-into' use
-;;   the context function instead of the context mode.
+;;   the context function instead of the context mode (Earl Hyatt)
 ;; - Improve `:bind-into' handling of maps.
 
  Version 1.2.0

[elpa] externals/pyim cd1bfd2bbc: v4.2.0

[ELPA Syncer]

branch: externals/pyim
commit cd1bfd2bbc10fe0ac47d0ec383cde453f6019e6c
Author: Feng Shu 
Commit: Feng Shu 

v4.2.0
---
 pyim.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim.el b/pyim.el
index 97f1d10f83..363ba1c4c0 100644
--- a/pyim.el
+++ b/pyim.el
@@ -7,7 +7,7 @@
 ;; Feng Shu 
 ;; Maintainer: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim
-;; Version: 4.1.1
+;; Version: 4.2.0
 ;; Keywords: convenience, Chinese, pinyin, input-method
 ;; Package-Requires: ((emacs "25.1") (async "1.6") (xr "1.13"))
 

[nongnu] elpa/parseclj 4d0e780e00 2/2: More warning fixes

[ELPA Syncer]

branch: elpa/parseclj
commit 4d0e780e00f1828b00c43099e6eebc6582998f72
Author: Arne Brasseur 
Commit: Arne Brasseur 

More warning fixes
---
 parseclj-alist.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/parseclj-alist.el b/parseclj-alist.el
index dcca15f598..5bc3719cc0 100644
--- a/parseclj-alist.el
+++ b/parseclj-alist.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(require 'map)
+
 (defun parseclj-alist (&rest kvs)
   "Create an association list from the given keys and values KVS.
 Arguments are simply provided in sequence, rather than as lists or cons cells.
@@ -82,7 +84,7 @@ For example: (parseclj-hash-table :foo 123 :bar 456)"
   ;; Emacs 27: (map-merge 'alist l1 l2)
   (let ((keys (delete-dups (append (mapcar #'car l1) (mapcar #'car l2
 (res '()))
-(mapcar
+(mapc
  (lambda (key)
(push (or (assoc key l2)
  (assoc key l1))

[nongnu] elpa/parseedn dce2eed418: Remove unused variable

[ELPA Syncer]

branch: elpa/parseedn
commit dce2eed418ad21acf3d2d6d75c37dfa679b22359
Author: Arne Brasseur 
Commit: Arne Brasseur 

Remove unused variable
---
 parseedn.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/parseedn.el b/parseedn.el
index b2bfb8aa02..87a4213055 100644
--- a/parseedn.el
+++ b/parseedn.el
@@ -164,8 +164,7 @@ TAG-READERS is an optional association list.  For more 
information, see
 
 (defun parseedn-print-hash-or-alist (map &optional ks)
   "Insert hash table MAP or elisp alist as an EDN map into the current buffer."
-  (let ((alist? (listp map))
-(keys (or ks (map-keys map
+  (let ((keys (or ks (map-keys map
 (parseedn-print (car keys))
 (insert " ")
 (parseedn-print (map-elt map (car keys)))

[nongnu] elpa/parseclj updated (b04eae6738 -> 4d0e780e00)

[ELPA Syncer]

elpasync pushed a change to branch elpa/parseclj.

  from  b04eae6738 Merge pull request #39 from 
ikappaki/issue/symbol-pipe-char
   new  d64bf5bb7a Add missing require to silence compiler warnings
   new  4d0e780e00 More warning fixes


Summary of changes:
 parseclj-alist.el  | 4 +++-
 parseclj-parser.el | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

[nongnu] elpa/parseclj d64bf5bb7a 1/2: Add missing require to silence compiler warnings

[ELPA Syncer]

branch: elpa/parseclj
commit d64bf5bb7adc509046b5bbac5b6ca11836572dbe
Author: Arne Brasseur 
Commit: Arne Brasseur 

Add missing require to silence compiler warnings
---
 parseclj-parser.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/parseclj-parser.el b/parseclj-parser.el
index f83e760908..4c757d23cc 100644
--- a/parseclj-parser.el
+++ b/parseclj-parser.el
@@ -31,6 +31,7 @@
 (require 'subr-x)
 (require 'parseclj-lex)
 (require 'parseclj-alist)
+(require 'map)
 
 (define-error 'parseclj-parser-error "parseclj: Syntax error")
 

[elpa] externals/org-modern ff1046705b 2/2: Simplify custom timestamp format, set org-modern-timestamp to a cons

[ELPA Syncer]

branch: externals/org-modern
commit ff1046705b3950b7a49da50bc34c11da86c6226d
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify custom timestamp format, set org-modern-timestamp to a cons
---
 org-modern.el | 113 ++
 1 file changed, 42 insertions(+), 71 deletions(-)

diff --git a/org-modern.el b/org-modern.el
index 4a8df614e8..4b59769daf 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -90,19 +90,15 @@ Set to nil to disable styling the headlines."
 
 (defcustom org-modern-timestamp t
   "Prettify time stamps, e.g. <2022-03-01>.
-Set to nil to disable styling the time stamps."
-  :type 'boolean)
-
-(defcustom org-modern-custom-timestamp-format nil
-  "Format of custom timestamps, or nil for none.
-If non-nil, it should be (DATE . TIME) where DATE is the format
-for date, and TIME is the format for time.  DATE and TIME must be
-surrounded with space.  For the syntax, refer to
-`format-time-string'."
+Set to nil to disable styling the time stamps. In order to use custom
+timestamps, the format should be (DATE . TIME) where DATE is the format
+for date, and TIME is the format for time. DATE and TIME must be
+surrounded with space. For the syntax, refer to `format-time-string'."
   :type '(choice
-  (const :tag "Do not use custom timestamp format" nil)
-  (const :tag " -MM-DD  HH:MM " '(" %Y-%m-%d " . " %H:%M "))
-  (cons :tag "Custom date and time format" string string)))
+  (const :tag "Disable time stamp styling" nil)
+  (const :tag "Enable timestamp styling" t)
+  (const :tag "Use format -MM-DD HH:MM" (" %Y-%m-%d " . " %H:%M "))
+  (cons :tag "Custom format" string string)))
 
 (defcustom org-modern-table t
   "Prettify tables."
@@ -344,68 +340,45 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
'org-modern-done
  'org-modern-todo)
 
-(defun org-modern--timestamp-default ()
+(defun org-modern--timestamp ()
   "Prettify timestamps."
-  (let* ((active (eq (char-after (match-beginning 0)) ?<))
+  (let* ((beg (match-beginning 0))
+ (end (match-end 0))
+ (tbeg (match-beginning 2))
+ (tend (match-end 2))
+ (active (eq (char-after beg) ?<))
  (date-face (if active
 'org-modern-date-active
   'org-modern-date-inactive))
  (time-face (if active
 'org-modern-time-active
   'org-modern-time-inactive)))
-(remove-text-properties (match-beginning 0) (match-end 0) '(display nil))
-(put-text-property
- (match-beginning 0)
- (1+ (match-beginning 0))
- 'display " ")
-(put-text-property
- (1- (match-end 0))
- (match-end 0)
- 'display " ")
-;; year-month-day
-(put-text-property
- (match-beginning 0)
- (if (eq (match-beginning 2) (match-end 2)) (match-end 0) (match-end 1))
- 'face date-face)
-;; hour:minute
-(unless (eq (match-beginning 2) (match-end 2))
-  (put-text-property
-   (1- (match-end 1))
-   (match-end 1)
-   'display (format "%c " (char-before (match-end 1
-  (put-text-property
-   (match-beginning 2)
-   (match-end 0)
-   'face time-face
-
-(defun org-modern--timestamp-custom ()
-  "Prettify timestamps per `org-modern-custom-timestamp-format'."
-  (let* ((active (eq (char-after (match-beginning 0)) ?<))
- (date-face (if active
-'org-modern-date-active
-  'org-modern-date-inactive))
- (time-face (if active
-'org-modern-time-active
-  'org-modern-time-inactive))
- (time (save-match-data
- (encode-time
-  (org-fix-decoded-time
-   (org-parse-time-string
-(buffer-substring (match-beginning 0) (match-end 0
-(remove-list-of-text-properties (match-beginning 0) (match-end 0) 
'(display))
-;; year-month-day
-(add-text-properties
- (match-beginning 0)
- (if (eq (match-beginning 2) (match-end 2)) (match-end 0) (match-end 1))
- `( face ,date-face
-display ,(format-time-string (car org-modern-custom-timestamp-format) 
time)))
-;; hour:minute
-(unless (eq (match-beginning 2) (match-end 2))
-  (add-text-properties
-   (match-beginning 2)
-   (match-end 0)
-   `( face ,time-face
-  display ,(format-time-string (cdr 
org-modern-custom-timestamp-format) time))
+(remove-list-of-text-properties beg end '(display))
+(if (consp org-modern-timestamp)
+(let* ((time (save-match-data
+   (encode-time
+(org-fix-decoded-time
+ (org-parse-time-string
+  (buffer-substring beg end))
+   (fmt org-modern-timestamp)
+   (date-str (format-time-stri

[elpa] externals/compat 255f93b1e5: Warn about the usage of and-let*

[ELPA Syncer]

branch: externals/compat
commit 255f93b1e51e4947d50073c819d001cd6477bc63
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Warn about the usage of and-let*
---
 MANUAL  | 3 +++
 compat.texi | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/MANUAL b/MANUAL
index 160c11fdff..d623547649 100644
--- a/MANUAL
+++ b/MANUAL
@@ -246,6 +246,9 @@ provided by Compat by default:
 - Macro: if-let* :: Defined in ~subr-x.el~.
 - Macro: when-let* :: Defined in ~subr-x.el~.
 - Macro: and-let* :: Defined in ~subr-x.el~.
+
+  **Please Note:** The implementation provided by Compat does not
+  include a bug that was observed with Emacs 26 (see [[debbugs:31840]]).
 - Function: file-local-name :: See [[info:elisp#Magic File Names][(elisp) 
Magic File Names]].
 - Function: file-name-quoted-p :: See [[info:elisp#File Name 
Expansion][(elisp) File Name Expansion]].
 - Function: file-name-quote :: See [[info:elisp#File Name Expansion][(elisp) 
File Name Expansion]].
diff --git a/compat.texi b/compat.texi
index fb4ec9e513..5f16078804 100644
--- a/compat.texi
+++ b/compat.texi
@@ -513,6 +513,9 @@ Defined in @code{subr-x.el}.
 
 @defmac and-let*
 Defined in @code{subr-x.el}.
+
+@strong{@strong{Please Note:}} The implementation provided by Compat does not
+include a bug that was observed with Emacs 26 (see 
@uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31840}).
 @end defmac
 
 @defun file-local-name

[elpa] externals/cursory 75fd942e13 3/3: Bump to version 0.1.3

[ELPA Syncer]

branch: externals/cursory
commit 75fd942e13cfa4d080a68c4cb29e02b114cfc4d2
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Bump to version 0.1.3
---
 cursory.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cursory.el b/cursory.el
index 6b0f89bdd8..87b0bcef3e 100644
--- a/cursory.el
+++ b/cursory.el
@@ -5,7 +5,7 @@
 ;; Author: Protesilaos Stavrou 
 ;; URL: https://git.sr.ht/~protesilaos/cursory
 ;; Mailing list: https://lists.sr.ht/~protesilaos/cursory
-;; Version: 0.1.2
+;; Version: 0.1.3
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: convenience, cursor
 

[elpa] externals/cursory updated (81a1ea1f7c -> 75fd942e13)

[ELPA Syncer]

elpasync pushed a change to branch externals/cursory.

  from  81a1ea1f7c Fix bug with state save and recovery
   new  6542b24fff Add a user option type for cursory-presets
   new  91512b6d0b Use M-x untabify
   new  75fd942e13 Bump to version 0.1.3


Summary of changes:
 cursory.el | 30 --
 1 file changed, 24 insertions(+), 6 deletions(-)

[elpa] externals/cursory 6542b24fff 1/3: Add a user option type for cursory-presets

[ELPA Syncer]

branch: externals/cursory
commit 6542b24fff6e6ff8ae893d1f2ce69b9b75e164fd
Author: Philip Kaludercic 
Commit: Protesilaos Stavrou 

Add a user option type for cursory-presets
---
 cursory.el | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/cursory.el b/cursory.el
index 196c137d99..125bf1c3a9 100644
--- a/cursory.el
+++ b/cursory.el
@@ -85,7 +85,25 @@ They correspond to built-in variables of the same name:
 `blink-cursor-delay'.  The value each of them accepts is the same
 as the corresponding variable."
   :group 'cursory
-  :type 'alist) ; FIXME 2022-04-15: Make this usable in the Custom UI
+  :type `(alist
+  :value-type
+  (plist :options
+ (((const :tag "Cursor type"
+  :cursor-type)
+   ,(get 'cursor-type 'custom-type))
+  ((const :tag "Cursor in non-selected windows"
+  :cursor-in-non-selected-windows)
+   ,(get 'cursor-in-non-selected-windows 'custom-type))
+  ((const :tag "Number of blinks"
+  :blink-cursor-blinks)
+   ,(get 'blink-cursor-blinks 'custom-type))
+  ((const :tag "Blink interval"
+  :blink-cursor-interval)
+   ,(get 'blink-cursor-interval 'custom-type))
+  ((const :tag "Blink delay"
+  :blink-cursor-delay)
+   ,(get 'blink-cursor-delay 'custom-type
+  :key-type symbol))
 
 (defcustom cursory-latest-state-file
   (locate-user-emacs-file "cursory-latest-state.eld")

[elpa] externals/cursory 91512b6d0b 2/3: Use M-x untabify

[ELPA Syncer]

branch: externals/cursory
commit 91512b6d0b9eb2938084ce0695c08c812fff3f15
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Use M-x untabify
---
 cursory.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cursory.el b/cursory.el
index 125bf1c3a9..6b0f89bdd8 100644
--- a/cursory.el
+++ b/cursory.el
@@ -167,10 +167,10 @@ Can be assigned to `kill-emacs-hook'."
   (when-let ((hist cursory--style-hist))
 (with-temp-file cursory-latest-state-file
   (insert ";; Auto-generated file; don't edit -*- mode: "
- (if (<= 28 emacs-major-version)
- "lisp-data"
-   "emacs-lisp")
- " -*-\n")
+  (if (<= 28 emacs-major-version)
+  "lisp-data"
+"emacs-lisp")
+  " -*-\n")
   (pp (intern (car hist)) (current-buffer)
 
 (defvar cursory-recovered-preset nil

[elpa] externals/javaimp 032d3a8639: Cleanup and rename javaimp-cygpath-convert-maybe

[Filipp Gunbin]

branch: externals/javaimp
commit 032d3a86395953237e0f7f6d178cd965b62ad560
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Cleanup and rename javaimp-cygpath-convert-maybe
---
 javaimp-gradle.el |  6 +++---
 javaimp-maven.el  |  8 
 javaimp-util.el   | 25 +
 javaimp.el|  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/javaimp-gradle.el b/javaimp-gradle.el
index bed838d712..4a159fab89 100644
--- a/javaimp-gradle.el
+++ b/javaimp-gradle.el
@@ -82,7 +82,7 @@ descriptor."
:file (cdr (assq 'file alist))
:file-orig file-orig
;; jar/war supported
-   :final-name (when-let ((final-name (javaimp-cygpath-convert-maybe
+   :final-name (when-let ((final-name (javaimp-cygpath-convert-file-name
(cdr (assq 'final-name alist)
  (and (member (file-name-extension final-name) '("jar" "war"))
   final-name))
@@ -90,7 +90,7 @@ descriptor."
 (javaimp--split-native-path
  (cdr (assq 'source-dirs alist
:build-dir (file-name-as-directory
-   (javaimp-cygpath-convert-maybe
+   (javaimp-cygpath-convert-file-name
 (cdr (assq 'build-dir alist
:dep-jars (javaimp--split-native-path (cdr (assq 'dep-jars alist)))
:load-ts (current-time)
@@ -147,7 +147,7 @@ descriptor."
  ;; java-library projects.  See
  ;; 
https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_classes_usage
  "-Dorg.gradle.java.compile-classpath-packaging=true"
- "-I" (javaimp-cygpath-convert-maybe
+ "-I" (javaimp-cygpath-convert-file-name
(expand-file-name "javaimp-init-script.gradle"
  (concat javaimp-basedir
  (file-name-as-directory "support"
diff --git a/javaimp-maven.el b/javaimp-maven.el
index fafaad3d00..f29ff5030b 100644
--- a/javaimp-maven.el
+++ b/javaimp-maven.el
@@ -122,15 +122,15 @@ resulting module trees."
   (javaimp-xml-child 'finalName build-elt))
  "." packaging)))
  :source-dirs (list (file-name-as-directory
-(javaimp-cygpath-convert-maybe
+(javaimp-cygpath-convert-file-name
  (javaimp-xml-first-child
   (javaimp-xml-child 'sourceDirectory build-elt
 (file-name-as-directory
-(javaimp-cygpath-convert-maybe
+(javaimp-cygpath-convert-file-name
  (javaimp-xml-first-child
   (javaimp-xml-child 'testSourceDirectory 
build-elt)
  :build-dir (file-name-as-directory
-(javaimp-cygpath-convert-maybe
+(javaimp-cygpath-convert-file-name
  (javaimp-xml-first-child (javaimp-xml-child 'directory 
build-elt
  :dep-jars nil  ; dep-jars is initialized lazily on demand
  :load-ts (current-time)
@@ -219,7 +219,7 @@ are somewhat arbitrary."
 (javaimp--call-build-tool
  program
  handler
- "-f" (javaimp-cygpath-convert-maybe file)
+ "-f" (javaimp-cygpath-convert-file-name file)
  task)))
 
 (provide 'javaimp-maven)
diff --git a/javaimp-util.el b/javaimp-util.el
index 8813b7afb6..645e65286b 100644
--- a/javaimp-util.el
+++ b/javaimp-util.el
@@ -234,24 +234,25 @@ error, the cache for FILE is cleared."
 ;; instead of calling `cygpath'.  See
 ;; https://cygwin.com/ml/cygwin/2013-03/msg00228.html
 
-(defun javaimp-cygpath-convert-maybe (path &optional mode is-really-path)
-  "On Cygwin, converts PATH using cygpath according to MODE and
-IS-REALLY-PATH.  If MODE is `unix' (the default), adds -u switch.
-If MODE is `windows', adds -m switch.  If `is-really-path' is
-non-nil, adds `-p' switch.  On other systems, PATH is returned
-unchanged."
-  (if (and path (eq system-type 'cygwin))
+(defun javaimp-cygpath-convert-file-name (filename &optional mode is-path)
+  "On Cygwin, converts FILENAME using `cygpath' program according
+to MODE.  If MODE is `unix' (the default), adds `-u' switch.  If
+MODE is `windows', adds `-m' switch.  If IS-PATH is
+non-nil, adds `-p' switch.  On non-Cygwin systems just returns
+the FILENAME unchanged."
+  (or mode (setq mode 'unix))
+  (if (and filename (eq system-type 'cygwin))
   (progn
-   (unless mode (setq mode 'unix))
(let (args)
  (push (cond ((eq mode 'unix) "-u")
  ((eq mode 'windows) "-m")
  (t (error "Invalid mode: %s" mode)))
args)
- (and is-really-path (push "-p" args))
- (push path args)
+ (when is-path
+(push "-p" args))
+ (push filename args)
  (car (apply #'process-lines javaimp-cygpath-program args
-path))
+filename))
 
 (defun javaimp--

[elpa] externals/cursory 63c4b42ebe: Mention the FSF as copyright holder

[ELPA Syncer]

branch: externals/cursory
commit 63c4b42ebe4446484bfb2a81b0b97ff65bcfbb3d
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Mention the FSF as copyright holder
---
 cursory.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cursory.el b/cursory.el
index 87b0bcef3e..23928c5f4d 100644
--- a/cursory.el
+++ b/cursory.el
@@ -1,11 +1,11 @@
 ;;; cursory.el --- Manage cursor styles using presets -*- lexical-binding: t 
-*-
 
-;; Copyright (C) 2022  Protesilaos Stavrou
+;; Copyright (C) 2022  Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou 
 ;; URL: https://git.sr.ht/~protesilaos/cursory
 ;; Mailing list: https://lists.sr.ht/~protesilaos/cursory
-;; Version: 0.1.3
+;; Version: 0.1.4
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: convenience, cursor
 

[elpa] externals/javaimp 7c587270ee: More renames & cleanups

[Filipp Gunbin]

branch: externals/javaimp
commit 7c587270eeefc9db27b235fbc63312227bcc5b75
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

More renames & cleanups
---
 javaimp-gradle.el |  8 
 javaimp-maven.el  |  4 ++--
 javaimp-util.el   | 39 ---
 javaimp.el| 33 -
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/javaimp-gradle.el b/javaimp-gradle.el
index 4a159fab89..6fd35e6660 100644
--- a/javaimp-gradle.el
+++ b/javaimp-gradle.el
@@ -87,12 +87,12 @@ descriptor."
  (and (member (file-name-extension final-name) '("jar" "war"))
   final-name))
:source-dirs (mapcar #'file-name-as-directory
-(javaimp--split-native-path
+(javaimp-split-native-path
  (cdr (assq 'source-dirs alist
:build-dir (file-name-as-directory
(javaimp-cygpath-convert-file-name
 (cdr (assq 'build-dir alist
-   :dep-jars (javaimp--split-native-path (cdr (assq 'dep-jars alist)))
+   :dep-jars (javaimp-split-native-path (cdr (assq 'dep-jars alist)))
:load-ts (current-time)
:dep-jars-fetcher #'javaimp-gradle--fetch-dep-jars
:raw nil))
@@ -122,7 +122,7 @@ descriptor."
(javaimp-module-file-orig module)
(lambda ()
  (re-search-forward "^dep-jars=\\(.*\\)$")
- (javaimp--split-native-path (match-string 1)))
+ (javaimp-split-native-path (match-string 1)))
(let ((mod-path (mapconcat #'javaimp-id-artifact (cdr ids) ":")))
  (unless (string-empty-p mod-path)
(format ":%s:" mod-path)
@@ -139,7 +139,7 @@ descriptor."
  (program (if (file-exists-p local-gradlew)
   (concat default-directory local-gradlew)
 javaimp-gradle-program)))
-(javaimp--call-build-tool
+(javaimp-call-build-tool
  program
  handler
  "-q"
diff --git a/javaimp-maven.el b/javaimp-maven.el
index f29ff5030b..49b4388b3a 100644
--- a/javaimp-maven.el
+++ b/javaimp-maven.el
@@ -201,7 +201,7 @@ are somewhat arbitrary."
(lambda ()
  (search-forward "Dependencies classpath:")
  (forward-line 1)
- (javaimp--split-native-path (thing-at-point 'line)))
+ (javaimp-split-native-path (thing-at-point 'line)))
"dependency:build-classpath"
;; Invoke in original file's directory because there may be local
;; build tool wrapper.
@@ -216,7 +216,7 @@ are somewhat arbitrary."
  (program (if (file-exists-p local-mvnw)
   (concat default-directory local-mvnw)
 javaimp-mvn-program)))
-(javaimp--call-build-tool
+(javaimp-call-build-tool
  program
  handler
  "-f" (javaimp-cygpath-convert-file-name file)
diff --git a/javaimp-util.el b/javaimp-util.el
index 645e65286b..a8850487d2 100644
--- a/javaimp-util.el
+++ b/javaimp-util.el
@@ -44,7 +44,7 @@ it is initialized from the JAVA_HOME environment variable."
   :group 'javaimp)
 
 (defvar javaimp-tool-output-buf-name "*javaimp-tool-output*"
-  "Name of the buffer to which `javaimp--call-build-tool' copies
+  "Name of the buffer to which `javaimp-call-build-tool' copies
 build tool output.  Can be let-bound to nil to suppress copying.")
 
 
@@ -196,38 +196,7 @@ additionally tested by PRED."
 
 
 
-;; Misc
-
-(defsubst javaimp--get-file-ts (file)
-  (nth 5 (file-attributes file)))
-
-(defun javaimp--get-file-classes-cached (file cache-sym class-reader)
-  "Return list of classes for FILE.  Use CACHE-SYM as a cache, it
-should be an alist with elements of the form (FILE
-. CACHED-FILE).  If not found in cache, or the cache is outdated,
-then classes are read using CLASS-READER, which should be a
-function of one argument, a FILE.  If that function throws an
-error, the cache for FILE is cleared."
-  (condition-case err
-  (let ((cached-file
- (alist-get file (symbol-value cache-sym) nil nil #'string=)))
-(when (or (not cached-file)
-  ;; If the file doesn't exist this will be current
-  ;; time, and thus condition always true
-  (> (float-time (javaimp--get-file-ts file))
-(float-time (javaimp-cached-file-read-ts cached-file
-  (setq cached-file (make-javaimp-cached-file
-:file file
-:read-ts (javaimp--get-file-ts file)
-:classes (funcall class-reader file
-(setf (alist-get file (symbol-value cache-sym) nil 'remove #'string=)
-  cached-file)
-(javaimp-cached-file-classes cached-file))
-(t
- ;; Clear on any error
- (setf (alist-get file (symbol-value cache-sym) nil 'remove #'string=) nil)
- (signal (car err) (cdr err)
-
+;; System
 
 ;; TODO use functions `cygwin-convert-file-name-from-windows' and
 ;; `cygwin-convert-file-name-to-windows' when they are available
@@ -254,7 +223,

[elpa] externals/compat 401df6defa: Bump version to 28.1.1.0

[ELPA Syncer]

branch: externals/compat
commit 401df6defaf5ef470a2dc57664b2d258662a5c3d
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Bump version to 28.1.1.0
---
 compat.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compat.el b/compat.el
index 0e06ee3480..d31cff1574 100644
--- a/compat.el
+++ b/compat.el
@@ -4,7 +4,7 @@
 
 ;; Author: Philip Kaludercic 
 ;; Maintainer: Compat Development <~pkal/compat-de...@lists.sr.ht>
-;; Version: 28.1.1.0-pre
+;; Version: 28.1.1.0
 ;; URL: https://sr.ht/~pkal/compat
 ;; Package-Requires: ((emacs "24.3") (nadvice "0.3"))
 ;; Keywords: lisp

[elpa] externals/consult updated (6df330a285 -> d705257e99)

[ELPA Syncer]

elpasync pushed a change to branch externals/consult.

  from  6df330a285 Fix regression in consult--read-from-kill-ring (Fix #556)
   new  f517b70dd8 Version 0.17
   new  d705257e99 Remove obsolete code


Summary of changes:
 CHANGELOG.org |  4 
 consult.el| 37 -
 2 files changed, 12 insertions(+), 29 deletions(-)

[elpa] externals/corfu 8591833f7d: Version 0.22

[ELPA Syncer]

branch: externals/corfu
commit 8591833f7dc76233dbe94b59c4eea9be6b4540f9
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.22

This release includes the new Corfu extensions:

- corfu-history
- corfu-indexed
- corfu-info
- corfu-quick
---
 corfu.el| 2 +-
 extensions/corfu-history.el | 2 +-
 extensions/corfu-indexed.el | 2 +-
 extensions/corfu-info.el| 2 +-
 extensions/corfu-quick.el   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/corfu.el b/corfu.el
index 84bfc2c46d..964b34ab51 100644
--- a/corfu.el
+++ b/corfu.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler 
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
-;; Version: 0.21
+;; Version: 0.22
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/corfu
 
diff --git a/extensions/corfu-history.el b/extensions/corfu-history.el
index c600892230..3f7f509e46 100644
--- a/extensions/corfu-history.el
+++ b/extensions/corfu-history.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (corfu "0.21"))
+;; Package-Requires: ((emacs "27.1") (corfu "0.22"))
 ;; Homepage: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-indexed.el b/extensions/corfu-indexed.el
index dace2bd958..adab802b67 100644
--- a/extensions/corfu-indexed.el
+++ b/extensions/corfu-indexed.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (corfu "0.21"))
+;; Package-Requires: ((emacs "27.1") (corfu "0.22"))
 ;; Homepage: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-info.el b/extensions/corfu-info.el
index 203bbcf390..bb60fe3d65 100644
--- a/extensions/corfu-info.el
+++ b/extensions/corfu-info.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (corfu "0.21"))
+;; Package-Requires: ((emacs "27.1") (corfu "0.22"))
 ;; Homepage: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-quick.el b/extensions/corfu-quick.el
index 0371dd2c20..fc5202172d 100644
--- a/extensions/corfu-quick.el
+++ b/extensions/corfu-quick.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (corfu "0.21"))
+;; Package-Requires: ((emacs "27.1") (corfu "0.22"))
 ;; Homepage: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.

[elpa] externals/emms 22f3d9e535: * emms-streams.el: fix autoloads

[ELPA Syncer]

branch: externals/emms
commit 22f3d9e5359c565b33f55715f90fbde35e4f675e
Author: Yoni Rabkin 
Commit: Yoni Rabkin 

* emms-streams.el: fix autoloads

small patch by Gerard Vermeulen
---
 emms-streams.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/emms-streams.el b/emms-streams.el
index bb8a29c2c6..c223b95a34 100644
--- a/emms-streams.el
+++ b/emms-streams.el
@@ -150,13 +150,14 @@
 ;;; --
 
 (defun emms-streams-install ()
-  (interactive)
   "Install the built-in streams file."
+  (interactive)
   (emms-streams-install-file emms-streams-file))
 
+;;;###autoload
 (defun emms-streams ()
-  (interactive)
   "Create or switch to the built-in streaming audio playlist."
+  (interactive)
   (when (and (not (file-exists-p emms-streams-file))
 (y-or-n-p "Emms' built-in streams file hasn't been installed yet. 
Install it now?"))
 (emms-streams-install))

[elpa] externals/vertico 68bb4d67e2: Version 0.23

[ELPA Syncer]

branch: externals/vertico
commit 68bb4d67e295bd75b8ef1a6d5ddda26849510fa6
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.23
---
 extensions/vertico-buffer.el  | 2 +-
 extensions/vertico-directory.el   | 2 +-
 extensions/vertico-flat.el| 2 +-
 extensions/vertico-grid.el| 2 +-
 extensions/vertico-indexed.el | 2 +-
 extensions/vertico-mouse.el   | 2 +-
 extensions/vertico-multiform.el   | 2 +-
 extensions/vertico-quick.el   | 2 +-
 extensions/vertico-repeat.el  | 2 +-
 extensions/vertico-reverse.el | 2 +-
 extensions/vertico-unobtrusive.el | 2 +-
 vertico.el| 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index d7de221809..7e62473cdf 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el
index 843e82a1f0..23e4f5c616 100644
--- a/extensions/vertico-directory.el
+++ b/extensions/vertico-directory.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 59531865e3..6be482d41c 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el
index 74a8ec6fdf..eec45b7cff 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el
index d54222ac6d..6bdf030a1b 100644
--- a/extensions/vertico-indexed.el
+++ b/extensions/vertico-indexed.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-mouse.el b/extensions/vertico-mouse.el
index 8a11ef4f76..acce34947f 100644
--- a/extensions/vertico-mouse.el
+++ b/extensions/vertico-mouse.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 7d36192739..3fee5f7689 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-quick.el b/extensions/vertico-quick.el
index e181db0aa9..6c8146f066 100644
--- a/extensions/vertico-quick.el
+++ b/extensions/vertico-quick.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-repeat.el b/extensions/vertico-repeat.el
index 33e41b4303..0c4e7a4e4c 100644
--- a/extensions/vertico-repeat.el
+++ b/extensions/vertico-repeat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.22"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.23"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el
index 8f3a938a6b..e6550c7e75 100644
--- a/extensions/vertico-reverse.el
+++ b/extension

[elpa] externals/consult f517b70dd8 1/2: Version 0.17

[ELPA Syncer]

branch: externals/consult
commit f517b70dd8a3be0b8c883633f2a7721448b40f0f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.17
---
 CHANGELOG.org | 2 +-
 consult.el| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index c59391dfdf..79f6616bc4 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,7 +2,7 @@
 #+author: Daniel Mendler
 #+language: en
 
-* Development
+* Version 0.17 (2022-04-22)
 
 - Bugfixes
 - Drop Emacs 26 support.
diff --git a/consult.el b/consult.el
index 15f6db8c3a..0cfbe17c75 100644
--- a/consult.el
+++ b/consult.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler and Consult contributors
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2020
-;; Version: 0.16
+;; Version: 0.17
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/consult
 

[elpa] externals/consult d705257e99 2/2: Remove obsolete code

[ELPA Syncer]

branch: externals/consult
commit d705257e99622d738ec48295eb573f2c686d3757
Author: Daniel Mendler 
Commit: Daniel Mendler 

Remove obsolete code
---
 CHANGELOG.org |  4 
 consult.el| 35 +++
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 79f6616bc4..34735b4fd9 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,6 +2,10 @@
 #+author: Daniel Mendler
 #+language: en
 
+* Development
+
+- Removed obsolete =consult-recent-file-filter= and 
=consult-preview-excluded-hooks=
+
 * Version 0.17 (2022-04-22)
 
 - Bugfixes
diff --git a/consult.el b/consult.el
index 0cfbe17c75..2f8faecffc 100644
--- a/consult.el
+++ b/consult.el
@@ -186,10 +186,6 @@ This is necessary in order to prevent a large startup time
 for navigation commands like `consult-line'."
   :type 'integer)
 
-(defvar consult-recent-file-filter nil)
-(make-obsolete-variable 'consult-recent-file-filter
-"Deprecated in favor of `recentf-exclude'." "0.16")
-
 (defcustom consult-buffer-filter
   '("\\` "
 "\\`\\*Completions\\*\\'"
@@ -295,10 +291,6 @@ The dynamically computed arguments are appended."
   "Number of files to keep open at once during preview."
   :type 'integer)
 
-(defvar consult-preview-excluded-hooks nil)
-(make-obsolete-variable 'consult-preview-excluded-hooks
-"Deprecated in favor of 
`consult-preview-allowed-hooks'." "0.16")
-
 (defcustom consult-preview-allowed-hooks
   '(global-font-lock-mode-check-buffers
 save-place-find-file-hook)
@@ -1380,13 +1372,6 @@ FACE is the cursor face."
 (setq keys (lookup-key map keys))
 (if (numberp keys) keys any)))
 
-;; TODO Remove this function after upgrades of :state functions
-(defun consult--protected-state-call (fun action cand)
-  "Call state FUN with ACTION and CAND and protect against errors."
-  (condition-case err
-  (funcall fun action cand)
-(t (message "consult--read: No preview, the :state function protocol 
changed: %S" err
-
 (defun consult--append-local-post-command-hook (fun)
   "Append FUN to local `post-command-hook' list."
   ;; Symbol indirection because of bug#46407.
@@ -1418,13 +1403,13 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE."
 (with-selected-window (or (minibuffer-selected-window) 
(next-window))
   ;; STEP 3: Reset preview
   (when last-preview
-(consult--protected-state-call state 'preview nil))
+(funcall state 'preview nil))
   ;; STEP 4: Notify the preview function of the 
minibuffer exit
-  (consult--protected-state-call state 'exit nil
+  (funcall state 'exit nil
 (add-hook 'minibuffer-exit-hook exit-hook nil 'local))
   ;; STEP 1: Setup the preview function
   (with-selected-window (or (minibuffer-selected-window) 
(next-window))
-(consult--protected-state-call state 'setup nil))
+(funcall state 'setup nil))
   (setq consult--preview-function
 (lambda ()
   (when-let ((cand (funcall candidate)))
@@ -1447,11 +1432,10 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE."
(when (window-live-p win)
  (with-selected-window win
;; STEP 2: Preview 
candidate
-   
(consult--protected-state-call
-state 'preview 
transformed)
+   (funcall state 'preview 
transformed)
(setq last-preview 
new-preview)))
   ;; STEP 2: Preview candidate
-  (consult--protected-state-call state 
'preview transformed)
+  (funcall state 'preview transformed)
   (setq last-preview new-preview)))
   (consult--append-local-post-command-hook
(lambda ()
@@ -1468,7 +1452,7 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE."
 input)
 (when state
   ;; STEP 5: The preview function should perform its final action
-  (consult--protected-state-call state 'return selected))
+  (funcall state 'return selected))
 
 (defmacro consult--with-preview (preview-key state transform candidate &rest 
body)
   "Add preview support to BODY.
@@ -2188,12 +2172,7 @@ PREVIEW-KEY are the preview keys."
   (consult--with-preview
   preview-key state
   (lambda (narrow input cand)
-   

[elpa] externals/kind-icon dd05272df4: Bump copyright year

[ELPA Syncer]

branch: externals/kind-icon
commit dd05272df45ad4c9d2753e55e39cfffeaeda96e2
Author: JD Smith <93749+jdtsm...@users.noreply.github.com>
Commit: JD Smith <93749+jdtsm...@users.noreply.github.com>

Bump copyright year
---
 kind-icon.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kind-icon.el b/kind-icon.el
index 825ac190c4..52ee5917ad 100644
--- a/kind-icon.el
+++ b/kind-icon.el
@@ -1,6 +1,6 @@
 ;;; kind-icon.el --- Completion kind icons  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 
 ;; Author: J.D. Smith 
 ;; URL: https://github.com/jdtsmith/kind-icon

[nongnu] elpa/git-commit 485b265dd3 02/26: magit-generate-changelog: Minor error message tweak

[ELPA Syncer]

branch: elpa/git-commit
commit 485b265dd3384c3eec0ec0c89239492311de2afc
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-generate-changelog: Minor error message tweak
---
 lisp/magit-extras.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 3928d72550..5cb052f22c 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -395,7 +395,7 @@ in HEAD as well as staged changes in the diff to check."
   (require 'add-log)   ; `change-log-insert-entries'.
   (unless (and (fboundp 'change-log-insert-entries)
(fboundp 'diff-add-log-current-defuns))
-(user-error "`magit-generate-changelog' requires Emacs 27 or better"))
+(user-error "`magit-generate-changelog' requires Emacs 27 or greater"))
   (setq default-directory
 (if (and (file-regular-p "gitdir")
  (not (magit-git-true "rev-parse" "--is-inside-work-tree"))

[nongnu] elpa/git-commit e766c891fe 03/26: Limit a workaround to the Emacs versions that need it

[ELPA Syncer]

branch: elpa/git-commit
commit e766c891fe6a279be9fe75ffe7d109e4b0684855
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Limit a workaround to the Emacs versions that need it

When this kludge was added Emacs 25.1 was still under development
and it was not clear when the bug would be fixed.  Now we know; it
was fixed in Emacs 27.1.
---
 lisp/magit-base.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 6add5a0564..d093acb914 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1036,7 +1036,9 @@ and https://github.com/magit/magit/issues/2295.";
   (and (file-directory-p filename)
(file-accessible-directory-p filename)))
 
-(when (magit--version>= emacs-version "25.1")
+(when (< emacs-major-version 27)
+  ;; Work around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.
+  ;; Fixed by cb55ccae8be946f1562d74718086a4c8c8308ee5 in Emacs 27.1.
   (with-eval-after-load 'vc-git
 (defun vc-git-conflicted-files (directory)
   "Return the list of files with conflicts in DIRECTORY."

[nongnu] elpa/git-commit 571b4346c1 05/26: Depend on the compat package from GNU Elpa

[ELPA Syncer]

branch: elpa/git-commit
commit 571b4346c1057cd504ddb6497c6b35c5d38eaa61
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Depend on the compat package from GNU Elpa
---
 default.mk| 11 +++
 lisp/git-commit-pkg.el|  1 +
 lisp/git-commit.el|  2 +-
 lisp/magit-base.el|  3 +++
 lisp/magit-libgit-pkg.el  |  1 +
 lisp/magit-libgit.el  |  5 -
 lisp/magit-pkg.el |  1 +
 lisp/magit-section-pkg.el |  1 +
 lisp/magit-section.el |  5 -
 lisp/magit.el |  2 +-
 10 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/default.mk b/default.mk
index e102c9c218..a7544e1672 100644
--- a/default.mk
+++ b/default.mk
@@ -111,6 +111,7 @@ VERSION ?= $(shell \
   git describe --tags --abbrev=0 --always | cut -c2-)
 TIMESTAMP = 20211004
 
+COMPAT_VERSION= 28.1.0.4
 DASH_VERSION  = 2.19.1
 GIT_COMMIT_VERSION= $(VERSION)
 LIBGIT_VERSION= 0
@@ -120,6 +121,7 @@ MAGIT_SECTION_VERSION = $(VERSION)
 TRANSIENT_VERSION = 0.3.6
 WITH_EDITOR_VERSION   = 3.0.5
 
+COMPAT_SNAPSHOT  = 28.1.0.4
 DASH_MELPA_SNAPSHOT  = 20210826
 GIT_COMMIT_MELPA_SNAPSHOT= $(TIMESTAMP)
 LIBGIT_MELPA_SNAPSHOT= 0
@@ -152,6 +154,13 @@ endif
 
 ELPA_DIR ?= $(USER_EMACS_DIR)/elpa
 
+COMPAT_DIR ?= $(shell \
+  find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/compat-[.0-9]*' 2> /dev/null | \
+  sort | tail -n 1)
+ifeq "$(COMPAT_DIR)" ""
+  COMPAT_DIR = $(TOP)../compat
+endif
+
 DASH_DIR ?= $(shell \
   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/dash-[.0-9]*' 2> /dev/null | \
   sort | tail -n 1)
@@ -197,6 +206,7 @@ LOAD_PATH = -L $(TOP)lisp
 # info node accordingly.  Also don't forget to "rgrep \b\b".
 
 ifdef CYGPATH
+  LOAD_PATH += -L $(shell cygpath --mixed $(COMPAT_DIR))
   LOAD_PATH += -L $(shell cygpath --mixed $(DASH_DIR))
   LOAD_PATH += -L $(shell cygpath --mixed $(LIBGIT_DIR))
   LOAD_PATH += -L $(shell cygpath --mixed $(TRANSIENT_DIR))
@@ -205,6 +215,7 @@ ifdef CYGPATH
 LOAD_PATH += -L $(shell cygpath --mixed $(MAGIT_SECTION_DIR))
   endif
 else
+  LOAD_PATH += -L $(COMPAT_DIR)
   LOAD_PATH += -L $(DASH_DIR)
   LOAD_PATH += -L $(LIBGIT_DIR)
   LOAD_PATH += -L $(TRANSIENT_DIR)
diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el
index 4461f6dd2b..6fe8fe152d 100644
--- a/lisp/git-commit-pkg.el
+++ b/lisp/git-commit-pkg.el
@@ -1,6 +1,7 @@
 (define-package "git-commit" "3.3.0-git"
   "Edit Git commit messages."
   '((emacs "25.1")
+(compat "28.1.0.4")
 (transient "20210920")
 (with-editor "20211001"))
   :homepage "https://magit.vc";
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 6f6f8a56d2..132d51bc36 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -13,7 +13,7 @@
 
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (transient "0.3.6") (with-editor "3.0.5"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.0.4") (transient "0.3.6") 
(with-editor "3.0.5"))
 ;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index d093acb914..91a3aede48 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -39,6 +39,9 @@
 (defconst magit--minimal-emacs "25.1")
 
 (require 'cl-lib)
+(require 'compat)
+(require 'compat-26)
+(require 'compat-27)
 (require 'dash)
 (require 'eieio)
 (require 'seq)
diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el
index b3c41fcb2e..47f1f4b67c 100644
--- a/lisp/magit-libgit-pkg.el
+++ b/lisp/magit-libgit-pkg.el
@@ -1,6 +1,7 @@
 (define-package "magit-libgit" "3.3.0-git"
   "."
   '((emacs "25.1")
+(compat "28.1.0.4")
 (libgit "0")
 (magit "20211004"))
   :homepage "https://magit.vc";
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index 6b0ba87948..812c90a69c 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -10,7 +10,7 @@
 
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.3.0"))
+;; Package-Requires: ((emacs "26.1") (compat "28.1.0.4") (libgit "0") (magit 
"3.3.0"))
 ;; Package-Version: 3.3.0-git
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -44,6 +44,9 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'compat)
+(require 'compat-26)
+(require 'compat-27)
 (require 'dash)
 (require 'eieio)
 (require 'seq)
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index 8cf3f5a33c..152e046055 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,6 +1,7 @@
 (define-package "magit" "3.3.0-git"
   "A Git porcelain inside Emacs."
   '((emacs "25.1")
+(compat "28.1.0.4")
 (dash "20210826")
 (git-commit "20220222")
 (magit-section "20220325")
diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el
index 23252b1c81..1289a6a0b3 100644
--- a/lisp/magit-section-pkg.el
+++ b/lisp/magit-section-pkg.el
@@ -1,6 +1,7 @@
 (define-package "magit-section" "3.3.0-git"
   "Sections

[nongnu] elpa/git-commit 58ce563589 04/26: magit-format-rev-summary: Cosmetics

[ELPA Syncer]

branch: elpa/git-commit
commit 58ce563589864c6f962d1b8e0282be9b4f530b92
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-format-rev-summary: Cosmetics
---
 lisp/magit-git.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index cc690ab267..842dc6ea66 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2117,8 +2117,7 @@ Return a list of two integers: (A>B B>A)."
 
 (defun magit-format-rev-summary (rev)
   (--when-let (magit-rev-format "%h %s" rev)
-(string-match " " it)
-(magit--put-face 0 (match-beginning 0) 'magit-hash it)
+(magit--put-face 0 (string-match " " it) 'magit-hash it)
 it))
 
 (defvar magit-ref-namespaces

[nongnu] elpa/git-commit b4b2098c91 15/26: Use with-environment-variables

[ELPA Syncer]

branch: elpa/git-commit
commit b4b2098c91fbc4c6a5a4299e440ec065b572092e
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use with-environment-variables
---
 lisp/magit-commit.el   | 23 ++-
 lisp/magit-extras.el   | 62 +-
 lisp/magit-git.el  |  4 +---
 lisp/magit-sequence.el | 14 +---
 lisp/magit.el  | 11 -
 5 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 2b90762a5b..a5d4943cfb 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -267,10 +267,11 @@ to inverse the meaning of the prefix argument.  \n(git 
commit
magit-commit-extend-override-date)))
   (when (setq args (magit-commit-assert args))
 (magit-commit-amend-assert)
-(let ((process-environment process-environment))
-  (unless override-date
-(push (magit-rev-format "GIT_COMMITTER_DATE=%cD") process-environment))
-  (magit-run-git-with-editor "commit" "--amend" "--no-edit" args
+(if override-date
+(magit-run-git-with-editor "commit" "--amend" "--no-edit" args)
+  (with-environment-variables
+  (("GIT_COMMITTER_DATE" (magit-rev-format "%cD")))
+(magit-run-git-with-editor "commit" "--amend" "--no-edit" args)
 
 ;;;###autoload
 (defun magit-commit-reword (&optional args override-date)
@@ -288,11 +289,12 @@ and ignore the option.
  (not magit-commit-reword-override-date)
magit-commit-reword-override-date)))
   (magit-commit-amend-assert)
-  (let ((process-environment process-environment))
-(unless override-date
-  (push (magit-rev-format "GIT_COMMITTER_DATE=%cD") process-environment))
-(cl-pushnew "--allow-empty" args :test #'equal)
-(magit-run-git-with-editor "commit" "--amend" "--only" args)))
+  (cl-pushnew "--allow-empty" args :test #'equal)
+  (if override-date
+  (magit-run-git-with-editor "commit" "--amend" "--only" args)
+(with-environment-variables
+(("GIT_COMMITTER_DATE" (magit-rev-format "%cD")))
+  (magit-run-git-with-editor "commit" "--amend" "--only" args
 
 ;;;###autoload
 (defun magit-commit-fixup (&optional commit args)
@@ -467,8 +469,7 @@ is updated:
 'magit--reshelve-history)
update-author
(magit-commit-arguments
-  (let ((process-environment process-environment))
-(push (concat "GIT_COMMITTER_DATE=" date) process-environment)
+  (with-environment-variables (("GIT_COMMITTER_DATE" date))
 (magit-run-git "commit" "--amend" "--no-edit"
(and update-author (concat "--date=" date))
args)))
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index ea8f8e1655..c9e3145bb8 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -577,38 +577,38 @@ list returned by `magit-rebase-arguments'."
(float-time
 (date-to-time
  (read-string "Date for first commit: "
-  time-now 'magit--reshelve-history)
-(process-environment process-environment))
-(push "FILTER_BRANCH_SQUELCH_WARNING=1" process-environment)
-(magit-with-toplevel
-  (magit-run-git-async
-   "filter-branch" "--force" "--env-filter"
-   (format
-"case $GIT_COMMIT in %s\nesac"
-(mapconcat
- (lambda (rev)
-   (prog1 (concat
-   (format "%s) " rev)
-   (and (not magit-reshelve-since-committer-only)
-(format "export GIT_AUTHOR_DATE=\"%s\"; " 
date))
-   (format "export GIT_COMMITTER_DATE=\"%s\";;" date))
- (cl-incf date 60)))
- (magit-git-lines "rev-list" "--reverse" range)
- " "))
-   (and keyid
-(list "--commit-filter"
-  (format "git commit-tree --gpg-sign=%s \"$@\";"
-  keyid)))
-   range "--"))
-(set-process-sentinel
- magit-this-process
- (lambda (process event)
-   (when (memq (process-status process) '(exit signal))
- (if (> (process-exit-status process) 0)
+  time-now 'magit--reshelve-history))
+(with-environment-variables (("FILTER_BRANCH_SQUELCH_WARNING" "1"))
+  (magit-with-toplevel
+(magit-run-git-async
+ "filter-branch" "--force" "--env-filter"
+ (format
+  "case $GIT_COMMIT in %s\nesac"
+  (mapconcat
+   (lambda (rev)
+ (prog1
+ (concat
+  (fo

[nongnu] elpa/git-commit updated (3cfc8458e1 -> 40fb3d2002)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  3cfc8458e1 Fix imenu in repository lists
   new  6cd8bcaf18 Use string-prefix-p and string-suffix-p
   new  485b265dd3 magit-generate-changelog: Minor error message tweak
   new  e766c891fe Limit a workaround to the Emacs versions that need it
   new  58ce563589 magit-format-rev-summary: Cosmetics
   new  571b4346c1 Depend on the compat package from GNU Elpa
   new  59fb9ce03f Use string-replace instead of replace-regexp-in-string
   new  7671e46a8b Use string-search instead of string-match-p
   new  bba16d4f3e Use string-search instead of string-match
   new  a20dc0b83e Use string-trim
   new  264e92436c Use xor
   new  1553a4fa36 Use and-let* for side-effects
   new  4bcb303154 Use and-let* for side-effects even more
   new  9ce3859dd2 Use when-let* for multiple bindings
   new  8842230bca Use length= and length>
   new  b4b2098c91 Use with-environment-variables
   new  77cc75ed90 Use image-property
   new  b280fd7625 Use compat-assoc-delete-all
   new  b0ababbde4 Use compat-alist-get
   new  5f23a34a5f Use compat-dired-marked-files
   new  4d1d00e6fa Fix finding remote executables
   new  e9df33bf28 Silence warnings on older Emacs releases
   new  a37b2066dd Use pcase's quote upattern
   new  d69f062a8a Refresh library headers
   new  5a43c5f557 magit-tests.el: Use lexical-binding
   new  557b9d3df1 make: Right-align target verbs
   new  40fb3d2002 make: Improve creation of autoloads file


Summary of changes:
 default.mk|  11 +++
 docs/Makefile |   2 +-
 lisp/Makefile |  45 +++--
 lisp/git-commit-pkg.el|   1 +
 lisp/git-commit.el|  38 +---
 lisp/git-rebase.el|  35 +++
 lisp/magit-apply.el   |  71 +++---
 lisp/magit-autorevert.el  |  21 ++--
 lisp/magit-base.el|  49 +-
 lisp/magit-bisect.el  |  23 ++---
 lisp/magit-blame.el   |  23 ++---
 lisp/magit-bookmark.el|  34 +++
 lisp/magit-branch.el  |  35 +++
 lisp/magit-bundle.el  |  15 ++-
 lisp/magit-clone.el   |  21 ++--
 lisp/magit-commit.el  |  46 +
 lisp/magit-core.el|  15 ++-
 lisp/magit-diff.el| 219 +-
 lisp/magit-ediff.el   |  31 +++---
 lisp/magit-extras.el  | 160 +++---
 lisp/magit-fetch.el   |  15 ++-
 lisp/magit-files.el   |  15 ++-
 lisp/magit-git.el | 217 +
 lisp/magit-gitignore.el   |  17 ++--
 lisp/magit-libgit-pkg.el  |   1 +
 lisp/magit-libgit.el  |  43 +
 lisp/magit-log.el | 103 ++--
 lisp/magit-margin.el  |  35 +++
 lisp/magit-merge.el   |  21 ++--
 lisp/magit-mode.el|  75 +++
 lisp/magit-notes.el   |  41 
 lisp/magit-obsolete.el|  15 ++-
 lisp/magit-patch.el   |  21 ++--
 lisp/magit-pkg.el |   1 +
 lisp/magit-process.el |  55 +--
 lisp/magit-pull.el|  17 ++--
 lisp/magit-push.el|  37 ---
 lisp/magit-reflog.el  |  15 ++-
 lisp/magit-refs.el|  23 ++---
 lisp/magit-remote.el  |  23 ++---
 lisp/magit-repos.el   |  35 +++
 lisp/magit-reset.el   |  15 ++-
 lisp/magit-section-pkg.el |   1 +
 lisp/magit-section.el | 108 ++---
 lisp/magit-sequence.el|  49 +-
 lisp/magit-sparse-checkout.el |  15 ++-
 lisp/magit-stash.el   |  19 ++--
 lisp/magit-status.el  |  27 +++---
 lisp/magit-submodule.el   |  15 ++-
 lisp/magit-subtree.el |  15 ++-
 lisp/magit-tag.el |  15 ++-
 lisp/magit-transient.el   |  17 ++--
 lisp/magit-wip.el |  19 ++--
 lisp/magit-worktree.el|  17 ++--
 lisp/magit.el |  68 +++--
 test/magit-tests.el   |  19 +++-
 56 files changed, 1017 insertions(+), 1122 deletions(-)

[nongnu] elpa/git-commit a20dc0b83e 09/26: Use string-trim

[ELPA Syncer]

branch: elpa/git-commit
commit a20dc0b83e458c4f2d5e5c7f4038f27af3794014
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-trim
---
 lisp/magit-log.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 0ef03dcb23..b9e304be7f 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -834,7 +834,7 @@ https://github.com/mhagger/git-when-merged.";
 (if (zerop exit)
 (magit-log-setup-buffer (list (format "%s^1..%s" m m))
 args files nil commit)
-  (setq m (string-trim-left (substring m (string-match " " m
+  (setq m (string-trim m))
   (if (equal m "Commit is directly on this branch.")
   (let* ((from (concat commit "~10"))
  (to (- (car (magit-rev-diff-count branch commit)) 10))

[nongnu] elpa/git-commit d69f062a8a 23/26: Refresh library headers

[ELPA Syncer]

branch: elpa/git-commit
commit d69f062a8a6fc637b27893a5cb0851d4537ba7de
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Refresh library headers
---
 lisp/git-commit.el| 38 +
 lisp/git-rebase.el| 29 ++
 lisp/magit-apply.el   | 15 +---
 lisp/magit-autorevert.el  | 15 +---
 lisp/magit-base.el| 21 +++-
 lisp/magit-bisect.el  | 15 +---
 lisp/magit-blame.el   | 15 +---
 lisp/magit-bookmark.el| 19 ++-
 lisp/magit-branch.el  | 15 +---
 lisp/magit-bundle.el  | 15 +---
 lisp/magit-clone.el   | 15 +---
 lisp/magit-commit.el  | 15 +---
 lisp/magit-core.el| 15 +---
 lisp/magit-diff.el| 15 +---
 lisp/magit-ediff.el   | 15 +---
 lisp/magit-extras.el  | 15 +---
 lisp/magit-fetch.el   | 15 +---
 lisp/magit-files.el   | 15 +---
 lisp/magit-git.el | 15 +---
 lisp/magit-gitignore.el   | 15 +---
 lisp/magit-libgit.el  | 38 +
 lisp/magit-log.el | 15 +---
 lisp/magit-margin.el  | 15 +---
 lisp/magit-merge.el   | 15 +---
 lisp/magit-mode.el| 15 +---
 lisp/magit-notes.el   | 15 +---
 lisp/magit-obsolete.el| 15 +---
 lisp/magit-patch.el   | 15 +---
 lisp/magit-process.el | 15 +---
 lisp/magit-pull.el| 15 +---
 lisp/magit-push.el| 15 +---
 lisp/magit-reflog.el  | 15 +---
 lisp/magit-refs.el| 15 +---
 lisp/magit-remote.el  | 15 +---
 lisp/magit-repos.el   | 15 +---
 lisp/magit-reset.el   | 15 +---
 lisp/magit-section.el | 28 +++--
 lisp/magit-sequence.el| 15 +---
 lisp/magit-sparse-checkout.el | 15 +---
 lisp/magit-stash.el   | 15 +---
 lisp/magit-status.el  | 15 +---
 lisp/magit-submodule.el   | 15 +---
 lisp/magit-subtree.el | 15 +---
 lisp/magit-tag.el | 15 +---
 lisp/magit-transient.el   | 15 +---
 lisp/magit-wip.el | 15 +---
 lisp/magit-worktree.el| 15 +---
 lisp/magit.el | 57 ---
 test/magit-tests.el   | 19 ---
 49 files changed, 383 insertions(+), 481 deletions(-)

diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 132d51bc36..f519506d21 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -1,34 +1,40 @@
-;;; git-commit.el --- Edit Git commit messages  -*- lexical-binding: t; -*-
+;;; git-commit.el --- Edit Git commit messages  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2010-2022  The Magit Project Contributors
-;;
-;; You should have received a copy of the AUTHORS.md file which
-;; lists all contributors.  If not, see http://magit.vc/authors.
+;; Copyright (C) 2008-2022 The Magit Project Contributors
 
 ;; Author: Jonas Bernoulli 
-;;  Sebastian Wiesner 
-;;  Florian Ragwitz 
-;;  Marius Vollmer 
+;; Sebastian Wiesner 
+;; Florian Ragwitz 
+;; Marius Vollmer 
 ;; Maintainer: Jonas Bernoulli 
 
-;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (compat "28.1.0.4") (transient "0.3.6") 
(with-editor "3.0.5"))
+;; Keywords: git tools vc
+
 ;; Package-Version: 3.3.0-git
+;; Package-Requires: (
+;; (emacs "25.1")
+;; (compat "28.1.0.4")
+;; (transient "0.3.6")
+;; (with-editor "3.0.5"))
+
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; Magit is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
 ;;
-;; This file is distributed in the hope that it will be useful,
+;; Magit is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this file.  If not, see .
+;; along with Magit.  If not, see .
+
+;; You should have received a copy of the AUTHORS.md file, which
+;; lists

[nongnu] elpa/git-commit 6cd8bcaf18 01/26: Use string-prefix-p and string-suffix-p

[ELPA Syncer]

branch: elpa/git-commit
commit 6cd8bcaf188aaa3bf5fd5fddaf47e63193f150d3
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-prefix-p and string-suffix-p
---
 lisp/magit-base.el | 2 +-
 lisp/magit-commit.el   | 2 +-
 lisp/magit-diff.el | 2 +-
 lisp/magit-git.el  | 6 +++---
 lisp/magit-sequence.el | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index e14bfe546c..6add5a0564 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1181,7 +1181,7 @@ or (last of all) the value of EXP."
 ;;;###autoload
 (defun org-man-export--magit-gitman (fn link description format)
   (if (and (eq format 'texinfo)
-   (string-match-p "\\`git" link))
+   (string-prefix-p "git" link))
   (replace-regexp-in-string "%s" link "
 @ifinfo
 @ref{%s,,,gitman,}.
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 8eabac5a55..581f5bbf88 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -370,7 +370,7 @@ depending on the value of option 
`magit-commit-squash-confirm'."
 (magit-call-git
  "commit" "--no-gpg-sign"
  (-remove-first
-  (apply-partially #'string-match-p "\\`--gpg-sign=")
+  (apply-partially #'string-prefix-p "--gpg-sign=")
   args)))
 (magit-run-git-with-editor "commit" args))
   t) ; The commit was created; used by below lambda.
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index ff0a5bce6e..76d3cc6175 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2331,7 +2331,7 @@ section or a child thereof."
  (string-prefix-p "a/" orig)
  (string-prefix-p "b/" file))
 (and (derived-mode-p 'magit-log-mode)
- (--first (string-match-p "\\`-L" it)
+ (--first (string-prefix-p "-L" it)
   magit-buffer-log-args)))
 (setq file (substring file 2))
 (when orig
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 958bddfd60..cc690ab267 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1927,17 +1927,17 @@ SORTBY is a key or list of keys to pass to the `--sort' 
flag of
   (--map (substring it 6) (magit-list-refnames "refs/notes")))
 
 (defun magit-remote-list-tags (remote)
-  (--keep (and (not (string-match-p "\\^{}$" it))
+  (--keep (and (not (string-suffix-p "^{}" it))
(substring it 51))
   (magit-git-lines "ls-remote" "--tags" remote)))
 
 (defun magit-remote-list-branches (remote)
-  (--keep (and (not (string-match-p "\\^{}$" it))
+  (--keep (and (not (string-suffix-p "^{}" it))
(substring it 52))
   (magit-git-lines "ls-remote" "--heads" remote)))
 
 (defun magit-remote-list-refs (remote)
-  (--keep (and (not (string-match-p "\\^{}$" it))
+  (--keep (and (not (string-suffix-p "^{}" it))
(substring it 41))
   (magit-git-lines "ls-remote" remote)))
 
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 91e1d2df6d..7896d42f21 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -361,7 +361,7 @@ the process manually."
   ;; And CHERRY_PICK_HEAD does not exist when a conflict happens
   ;; while picking a series of commits with --no-commit.
   (when-let ((line (magit-file-line (magit-git-dir "sequencer/todo"
-(string-match-p "^pick" line
+(string-prefix-p "pick" line
 
 ;;; Revert
 
@@ -417,7 +417,7 @@ without prompting."
   ;; And REVERT_HEAD does not exist when a conflict happens while
   ;; reverting a series of commits with --no-commit.
   (when-let ((line (magit-file-line (magit-git-dir "sequencer/todo"
-(string-match-p "^revert" line
+(string-prefix-p "revert" line
 
 ;;; Patch
 

[nongnu] elpa/git-commit 4bcb303154 12/26: Use and-let* for side-effects even more

[ELPA Syncer]

branch: elpa/git-commit
commit 4bcb3031542deee77e5a5899e266fbe61f958ced
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use and-let* for side-effects even more

The previous commit also replaces many instances of `when-let' with
`and-let'.  In those cases I did not hesitate.  This commit addresses
instances where side-effects are involved.

My current reasoning is that if the returned value matters, then
`and'/`and-let*' should be used, and whether there are side-effects is
only a secondary consideration.  Of course there is a gray area; if it
is really important to emphasize the side-effect, then one might still
want to use `when'/`when-let*'.

The simplest case is the change to `magit-diff-visit--hunk'.  That
function doesn't actually visit anything; instead it returns the hunk
which is relevant when visiting.  But the function name could give the
false impression that it somehow visits a hunk.  Preventing that false
impression is a good reason to use `and-let*'.  Additionally the
side-effect of the first form in BODY is local to the BODY, to the
outside code this is an irrelevant implementation detail.

`magit-diff--dwim' call `deactivate-mark', which clearly is a
side-effect that affects the global buffer state.  However this
side-effect is not relevant to the direct outside code, which on the
other hand cares very much about the returned value.

Finally `magit-hunk-goto-successor', which is very much about the
side-effect of "going to the successor".  This is so obvious that I
don't think it is necessary to signal the side-effect-ness.  Again the
returned value is used for flow-control, which should be made obvious,
so `and-let*' it is.

Unfortunately, due to a bug in Emacs 26, we cannot actually use
`and-let*' in some of these cases.
---
 lisp/magit-diff.el | 91 +++---
 lisp/magit-git.el  |  6 ++--
 lisp/magit-refs.el |  2 +-
 3 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index f942b42bdf..1141973675 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1090,9 +1090,10 @@ The information can be in three forms:
 
 If no DWIM context is found, nil is returned."
   (cond
-   ((--when-let (magit-region-values '(commit branch) t)
+   ((when-let* ((commits (magit-region-values '(commit branch) t)))
+  ;; Cannot use and-let* because of debbugs#31840.
   (deactivate-mark)
-  (concat (car (last it)) ".." (car it
+  (concat (car (last commits)) ".." (car commits
(magit-buffer-refname
 (cons 'commit magit-buffer-refname))
((derived-mode-p 'magit-stash-mode)
@@ -1141,26 +1142,26 @@ If no DWIM context is found, nil is returned."
 (t range)))
 
 (defun magit-diff--region-range (&optional interactive mbase)
-  (when-let ((commits (magit-region-values '(commit branch) t)))
-(let ((revA (car (last commits)))
-  (revB (car commits)))
-  (when interactive
-(deactivate-mark))
-  (if mbase
-  (let ((base (magit-git-string "merge-base" revA revB)))
-(cond
- ((string= (magit-rev-parse revA) base)
-  (format "%s..%s" revA revB))
- ((string= (magit-rev-parse revB) base)
-  (format "%s..%s" revB revA))
- (interactive
-  (let ((main (magit-completing-read "View changes along"
- (list revA revB)
- nil t nil nil revB)))
-(format "%s...%s"
-(if (string= main revB) revA revB) main)))
- (t "%s...%s" revA revB)))
-(format "%s..%s" revA revB)
+  (when-let* ((commits (magit-region-values '(commit branch) t)) ;debbugs#31840
+  (revA (car (last commits)))
+  (revB (car commits)))
+(when interactive
+  (deactivate-mark))
+(if mbase
+(let ((base (magit-git-string "merge-base" revA revB)))
+  (cond
+   ((string= (magit-rev-parse revA) base)
+(format "%s..%s" revA revB))
+   ((string= (magit-rev-parse revB) base)
+(format "%s..%s" revB revA))
+   (interactive
+(let ((main (magit-completing-read "View changes along"
+   (list revA revB)
+   nil t nil nil revB)))
+  (format "%s...%s"
+  (if (string= main revB) revA revB) main)))
+   (t "%s...%s" revA revB)))
+  (format "%s..%s" revA revB
 
 (defun magit-diff-read-range-or-commit (prompt &optional secondary-default 
mbase)
   "Read range or revision with special diff range treatment.
@@ -1677,24 +1678,24 @@ the Magit-Status buffer for DIRECTORY."
   (list buf nil
 
 (defun magit-d

[nongnu] elpa/git-commit b0ababbde4 18/26: Use compat-alist-get

[ELPA Syncer]

branch: elpa/git-commit
commit b0ababbde40a88390889f353b615eefb51a617d6
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use compat-alist-get
---
 lisp/magit-section.el | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 87a132d447..09e87beb72 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -1754,13 +1754,10 @@ invisible."
 
 (cl-defun magit-section-cache-visibility
 (&optional (section magit-insert-section--current))
-  ;; Emacs 25's `alist-get' lacks TESTFN.
-  (let* ((id  (magit-section-ident section))
- (elt (assoc id magit-section-visibility-cache))
- (val (if (oref section hidden) 'hide 'show)))
-(if elt
-(setcdr elt val)
-  (push (cons id val) magit-section-visibility-cache
+  (setf (compat-alist-get (magit-section-ident section)
+  magit-section-visibility-cache
+  nil nil #'equal)
+(if (oref section hidden) 'hide 'show)))
 
 (cl-defun magit-section-maybe-cache-visibility
 (&optional (section magit-insert-section--current))

[nongnu] elpa/git-commit 40fb3d2002 26/26: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/git-commit
commit 40fb3d20026139ad1c3a3d9069b40d7d61bf8786
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Improve creation of autoloads file
---
 lisp/Makefile | 39 +++
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/lisp/Makefile b/lisp/Makefile
index d59bbd6dc4..ec7dd33fa6 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -83,16 +83,17 @@ versionlib: $(PKG)-version.el
 
 $(PKG)-autoloads.el: $(ELS)
@printf " Creating $@\n"
-   @printf "%s" "$$LOADDEFS_TMPL" > $@
-   @$(BATCH) --eval "(progn\
-   (fset 'message (lambda (&rest _)))\
-   (setq make-backup-files nil)\
-   (setq vc-handled-backends nil)\
-   (setq default-directory (file-truename default-directory))\
-   (setq generated-autoload-file (expand-file-name \"$@\"))\
-   (setq find-file-visit-truename t)\
-   (update-directory-autoloads default-directory))"
-
+   @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+  (autoload-timestamps nil) \
+  (backup-inhibited t)\
+  (version-control 'never)\
+  (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+((symbol-function 'progress-reporter-done) (lambda (_\
+(let ((generated-autoload-file file))\
+  (update-directory-autoloads default-directory"
 $(PKG)-version.el:
@printf " Creating $@\n"
@printf "%s" "$$VERSIONLIB_TMPL" > $@
@@ -116,24 +117,6 @@ clean:
 
 ## Templates #
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-
-endef
-export LOADDEFS_TMPL
-#'
-
 define VERSIONLIB_TMPL
 ;;; $(PKG)-version.el --- the Magit version you are using
 

[nongnu] elpa/git-commit 264e92436c 10/26: Use xor

[ELPA Syncer]

branch: elpa/git-commit
commit 264e92436cc6b809a30ae035a5b2821bdcd71176
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use xor
---
 lisp/magit-section.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 74d242c437..c939bf853b 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -1603,9 +1603,7 @@ evaluated its BODY.  Admittedly that's a bit of a hack."
   (let ((section (magit-current-section)))
 (when (or force
   magit-section-highlight-force-update
-  (cond ; `xor' wasn't added until 27.1.
-   ((not magit-section-pre-command-region-p) (region-active-p))
-   ((not (region-active-p)) magit-section-pre-command-region-p))
+  (xor magit-section-pre-command-region-p (region-active-p))
   (not (eq magit-section-pre-command-section section)))
   (let ((inhibit-read-only t)
 (deactivate-mark nil)

[nongnu] elpa/git-commit bba16d4f3e 08/26: Use string-search instead of string-match

[ELPA Syncer]

branch: elpa/git-commit
commit bba16d4f3e1929ed4dcb3363649834c2401e6bf1
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-search instead of string-match
---
 lisp/magit-blame.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 279098e09d..24f2080542 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -718,7 +718,7 @@ modes is toggled, then this mode also gets toggled 
automatically.
 (defun magit-blame--format-time-string (time tz)
   (let* ((time-format (or (magit-blame--style-get 'time-format)
   magit-blame-time-format))
- (tz-in-second (and (string-match "%z" time-format)
+ (tz-in-second (and (string-search "%z" time-format)
 (car (last (parse-time-string tz))
 (format-time-string time-format
 (seconds-to-time (string-to-number time))

[nongnu] elpa/git-commit 59fb9ce03f 06/26: Use string-replace instead of replace-regexp-in-string

[ELPA Syncer]

branch: elpa/git-commit
commit 59fb9ce03fe364e29ab5057cd93c96bff601dedc
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-replace instead of replace-regexp-in-string
---
 lisp/magit-base.el | 7 ---
 lisp/magit-bookmark.el | 7 +++
 lisp/magit-extras.el   | 4 ++--
 lisp/magit-git.el  | 8 
 lisp/magit-log.el  | 2 +-
 lisp/magit-push.el | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 91a3aede48..a9866f5b84 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -844,8 +844,9 @@ ACTION is a member of option `magit-slow-confirm'."
 
 (defun magit-confirm-make-prompt (action)
   (let ((prompt (symbol-name action)))
-(replace-regexp-in-string
- "-" " " (concat (upcase (substring prompt 0 1)) (substring prompt 1)
+(string-replace "-" " "
+(concat (upcase (substring prompt 0 1))
+(substring prompt 1)
 
 (defun magit-read-number-string (prompt &optional default _history)
   "Like `read-number' but return value is a string.
@@ -1187,7 +1188,7 @@ or (last of all) the value of EXP."
 (defun org-man-export--magit-gitman (fn link description format)
   (if (and (eq format 'texinfo)
(string-prefix-p "git" link))
-  (replace-regexp-in-string "%s" link "
+  (string-replace "%s" link "
 @ifinfo
 @ref{%s,,,gitman,}.
 @end ifinfo
diff --git a/lisp/magit-bookmark.el b/lisp/magit-bookmark.el
index a803aeeae5..0d958178f1 100644
--- a/lisp/magit-bookmark.el
+++ b/lisp/magit-bookmark.el
@@ -58,10 +58,9 @@ and the buffer-local values of the variables referenced in 
its
  (--keep (and (oref it hidden)
   (cons (oref it type)
 (if (derived-mode-p 'magit-stash-mode)
-(replace-regexp-in-string
- (regexp-quote magit-buffer-revision)
- magit-buffer-revision-hash
- (oref it value))
+(string-replace magit-buffer-revision
+magit-buffer-revision-hash
+(oref it value))
   (oref it value
  (oref magit-root-section children)))
 bookmark)
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 5cb052f22c..2d4e186cda 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -722,13 +722,13 @@ the minibuffer too."
   (when pnt-format
 (when idx-format
   (setq pnt-format
-(replace-regexp-in-string "%N" idx pnt-format t t)))
+(string-replace "%N" idx pnt-format)))
 (magit-rev-insert-format pnt-format rev pnt-args)
 (backward-delete-char 1))
   (when eob-format
 (when idx-format
   (setq eob-format
-(replace-regexp-in-string "%N" idx eob-format t t)))
+(string-replace "%N" idx eob-format)))
 (save-excursion
   (goto-char (point-max))
   (skip-syntax-backward ">s-")
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 842dc6ea66..b785691028 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1747,10 +1747,10 @@ the name of a remote and REF is the ref local to the 
remote."
  (src (match-string 2 line))
  (dst (match-string 3 line)))
  (and (string-match (format "\\`%s\\'"
-(replace-regexp-in-string
- "*" "\\(.+\\)" dst t t))
+(string-replace
+ "*" "\\(.+\\)" dst))
 ref)
-  (cons rmt (replace-regexp-in-string
+  (cons rmt (string-replace
  "*" (match-string 1 ref) src))
 (magit-git-lines "config" "--local" "--list")
 
@@ -2162,7 +2162,7 @@ and this option only controls what face is used.")
((string-match re it) (concat "refs/remotes/" 
it))
(t(concat "refs/" it)))
  (split-string
-  (replace-regexp-in-string "tag: " "refs/tags/" 
string)
+  (string-replace "tag: " "refs/tags/" string)
   regexp t
 (setq names (split-string string regexp t)))
   (let (state head upstream tags branches remotes other combined)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 39c3faf9d0..afd980b4d6 100644
--- a/lisp/magit-log.el
+++ b/li

[nongnu] elpa/git-commit 8842230bca 14/26: Use length= and length>

[ELPA Syncer]

branch: elpa/git-commit
commit 8842230bcafae287e56a8a4597aaa4539c3345d6
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use length= and length>

These functions potentially improve performance, though honestly
their use probably does not make a measurable difference in most
of these cases. Still a good idea to get into the habit of using
them.
---
 lisp/magit-apply.el| 4 ++--
 lisp/magit-base.el | 6 +++---
 lisp/magit-branch.el   | 6 +++---
 lisp/magit-clone.el| 2 +-
 lisp/magit-diff.el | 2 +-
 lisp/magit-ediff.el| 2 +-
 lisp/magit-git.el  | 8 
 lisp/magit-log.el  | 4 ++--
 lisp/magit-remote.el   | 4 ++--
 lisp/magit-repos.el| 2 +-
 lisp/magit-worktree.el | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 52db7c0463..8230c2d4a0 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -655,7 +655,7 @@ of a side, then keep that side without prompting."
   (setq sections
 (--remove (member (oref it value) binaries)
   sections)))
-(cond ((= (length sections) 1)
+(cond ((length= sections 1)
(magit-discard-apply (car sections) 'magit-apply-diff))
   (sections
(magit-discard-apply-n sections #'magit-apply-diffs)))
@@ -718,7 +718,7 @@ so causes the change to be applied to the index as well."
  (--separate (member (oref it value) bs)
  sections
 (magit-confirm-files 'reverse (--map (oref it value) sections))
-(cond ((= (length sections) 1)
+(cond ((length= sections 1)
(magit-reverse-apply (car sections) #'magit-apply-diff args))
   (sections
(magit-reverse-apply sections #'magit-apply-diffs args)))
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index a9866f5b84..4bbf76f8ef 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -715,7 +715,7 @@ back to built-in `completing-read' for now." :error)
initial-input hist def)))
 
 (defun magit-prompt-with-default (prompt def)
-  (if (and def (> (length prompt) 2)
+  (if (and def (length> prompt 2)
(string-equal ": " (substring prompt -2)))
   (format "%s (default %s): " (substring prompt 0 -2) def)
 prompt))
@@ -824,9 +824,9 @@ ACTION is a member of option `magit-slow-confirm'."
  (or (not sitems) items))
 ((not sitems)
  (magit-y-or-n-p prompt action))
-((= (length items) 1)
+((length= items 1)
  (and (magit-y-or-n-p prompt action) items))
-((> (length items) 1)
+((length> items 1)
  (and (magit-y-or-n-p (concat (mapconcat #'identity items "\n")
   "\n\n" prompt-n)
   action)
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 80f52bb2c8..cf62d17ace 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -554,7 +554,7 @@ defaulting to the branch at point."
   (interactive
(let ((branches (magit-region-values 'branch t))
  (force current-prefix-arg))
- (if (> (length branches) 1)
+ (if (length> branches 1)
  (magit-confirm t nil "Delete %i branches" nil branches)
(setq branches
  (list (magit-read-branch-prefer-other
@@ -612,7 +612,7 @@ defaulting to the branch at point."
  (magit-rev-parse "--short" ref))
 (magit-call-git "update-ref" "-d" ref))
   (magit-refresh)
- ((> (length branches) 1)
+ ((length> branches 1)
   (setq branches (delete (magit-get-current-branch) branches))
   (mapc #'magit-branch-maybe-delete-pr-remote branches)
   (mapc #'magit-branch-unset-pushRemote branches)
@@ -673,7 +673,7 @@ defaulting to the branch at point."
 (format "+refs/heads/%s:refs/remotes/%s/%s"
 merge remote merge))
   (when (member refspec refspecs)
-(if (and (= (length refspecs) 1)
+(if (and (length= refspecs 1)
  (magit-confirm 'delete-pr-remote
(format "Also delete remote %s (%s)" remote
"no pull-request branch remains")
diff --git a/lisp/magit-clone.el b/lisp/magit-clone.el
index b332978957..fb5c893282 100644
--- a/lisp/magit-clone.el
+++ b/lisp/magit-clone.el
@@ -233,7 +233,7 @@ Then show the status buffer for the new repository."
 (setq directory (file-name-as-directory (expand-file-name directory)))
 (when (file-exists-p directory)
   (if (file-directory-p directory)
-  (when (> (length (directory-files directory)) 2)
+  (when (length> (directory-files directory) 2)
 (let ((name (magit-clone--url-to-name repository)))
   (unless (and name
 

[nongnu] elpa/git-commit 7671e46a8b 07/26: Use string-search instead of string-match-p

[ELPA Syncer]

branch: elpa/git-commit
commit 7671e46a8b7dfb0d9a438d9a07a656d7feea5c63
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-search instead of string-match-p
---
 lisp/magit-clone.el| 4 ++--
 lisp/magit-diff.el | 6 +++---
 lisp/magit-git.el  | 4 ++--
 lisp/magit-log.el  | 7 ---
 lisp/magit-patch.el| 2 +-
 lisp/magit-remote.el   | 2 +-
 lisp/magit-sequence.el | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lisp/magit-clone.el b/lisp/magit-clone.el
index 96889d9156..b332978957 100644
--- a/lisp/magit-clone.el
+++ b/lisp/magit-clone.el
@@ -317,9 +317,9 @@ Then show the status buffer for the new repository."
   (format-spec
magit-clone-url-format
`((?h . ,host)
- (?n . ,(if (string-match-p "/" repo)
+ (?n . ,(if (string-search "/" repo)
 repo
-  (if (string-match-p "\\." user)
+  (if (string-search "." user)
   (if-let ((user (magit-get user)))
   (concat user "/" repo)
 (user-error "Set %S or specify owner explicitly" user))
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 76d3cc6175..a5619dc31d 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1719,8 +1719,8 @@ the Magit-Status buffer for DIRECTORY."
  (offset 0))
  (goto-char content)
  (while (< (point) target)
-   (unless (string-match-p
-(if goto-from "\\+" "-")
+   (unless (string-search
+(if goto-from "+" "-")
 (buffer-substring (point) (+ (point) prefix)))
  (cl-incf offset))
(forward-line))
@@ -2391,7 +2391,7 @@ section or a child thereof."
   'font-lock-face 'magit-diff-file-heading)
   " ("
   (cond (rewind "rewind")
-((string-match-p "\\.\\.\\." range) "non-ff")
+((string-search "..." range) "non-ff")
 (t "new commits"))
   (and (or modified untracked)
(concat ", "
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index b785691028..15d6ed445b 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1303,7 +1303,7 @@ string \"true\", otherwise return nil."
 (defun magit-rev-head-p (rev)
   (or (equal rev "HEAD")
   (and rev
-   (not (string-match-p "\\.\\." rev))
+   (not (string-search ".." rev))
(equal (magit-rev-parse rev)
   (magit-rev-parse "HEAD")
 
@@ -1904,7 +1904,7 @@ SORTBY is a key or list of keys to pass to the `--sort' 
flag of
   (let ((lines (magit-git-lines
 "for-each-ref" (concat "--format=" format)
 (or args (list "refs/heads" "refs/remotes" "refs/tags")
-(if (string-match-p "\f" format)
+(if (string-search "\f" format)
 (--map (split-string it "\f") lines)
   lines)))
 
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index afd980b4d6..0ef03dcb23 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1065,7 +1065,7 @@ Type \\[magit-reset] to reset `HEAD' to the commit at 
point.
(count (and (= (length revs) 1)
(> limit 1024) ; otherwise it's fast enough
(setq revs (car revs))
-   (not (string-match-p "\\.\\." revs))
+   (not (string-search ".." revs))
(not (member revs '("--all" "--branches")))
(-none-p (lambda (arg)
   (--any-p (string-prefix-p it arg)
@@ -1088,7 +1088,7 @@ Type \\[magit-reset] to reset `HEAD' to the commit at 
point.
 (defun magit-log-header-line-arguments (revs args files)
   "Return string describing some of the used arguments."
   (mapconcat (lambda (arg)
-   (if (string-match-p " " arg)
+   (if (string-search " " arg)
(prin1 arg)
  arg))
  `("git" "log" ,@args ,@revs "--" ,@files)
@@ -1329,7 +1329,8 @@ Do not add this to a hook variable."
   (insert (format "%-2s " (1- magit-log-count)))
   (when refsub
 (insert (magit-reflog-format-subject
- (substring refsub 0 (if (string-match-p ":" refsub) -2 
-1))
+ (substring refsub 0
+(if (string-search ":" refsub) -2 -1))
 (when msg
   (insert (funcall magit-log-format-message-function hash msg)))
 (when (and refs magit-log-show-refname-after-summary)
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index 1d7bc100fc..a8ccc68861 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -106,7 +106,7 @@ which creates patches for all commits that are reachable 
from
(concat (car (last revs)) "^.." (car revs))
  (let

[nongnu] elpa/git-commit 77cc75ed90 16/26: Use image-property

[ELPA Syncer]

branch: elpa/git-commit
commit 77cc75ed90c17ab496cf43d0b6e0e033864e6913
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use image-property
---
 lisp/magit-diff.el | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index c27b8a5250..00400403eb 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2785,11 +2785,10 @@ or a ref which is not a branch, then it inserts 
nothing."
(car-safe
 (get-text-property (point) 'display)))
   'image)))
-;; `image-property' wasn't added until 26.1.
-(setcdr image (plist-put (cdr image) :ascent 'center))
-(setcdr image (plist-put (cdr image) :relief 1))
-(setcdr image (plist-put (cdr image) :scale  1))
-(setcdr image (plist-put (cdr image) :height size))
+(setf (image-property image :ascent) 'center)
+(setf (image-property image :relief) 1)
+(setf (image-property image :scale)  1)
+(setf (image-property image :height) size)
 (let ((top (list image '(slice 0.0 0.0 1.0 0.5)))
   (bot (list image '(slice 0.0 0.5 1.0 1.0)))
   (align `((space :align-to ,align-to

[nongnu] elpa/git-commit 9ce3859dd2 13/26: Use when-let* for multiple bindings

[ELPA Syncer]

branch: elpa/git-commit
commit 9ce3859dd2e78c7fe57411a780eccbf4ec18d0f4
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use when-let* for multiple bindings
---
 lisp/magit-bisect.el  |  8 
 lisp/magit-blame.el   |  6 +++---
 lisp/magit-branch.el  |  6 +++---
 lisp/magit-extras.el  |  4 ++--
 lisp/magit-log.el | 41 +
 lisp/magit-process.el | 32 
 lisp/magit-refs.el|  6 +++---
 lisp/magit-stash.el   |  4 ++--
 lisp/magit-status.el  | 12 ++--
 9 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el
index 64ccc612cc..6801c8514c 100644
--- a/lisp/magit-bisect.el
+++ b/lisp/magit-bisect.el
@@ -224,10 +224,10 @@ bisect run'."
  (magit-process-sentinel process event)
  (when (buffer-live-p (process-buffer process))
(with-current-buffer (process-buffer process)
- (when-let ((section (magit-section-at))
-(output (buffer-substring-no-properties
- (oref section content)
- (oref section end
+ (when-let* ((section (magit-section-at))
+ (output (buffer-substring-no-properties
+  (oref section content)
+  (oref section end
(with-temp-file (magit-git-dir "BISECT_CMD_OUTPUT")
  (insert output)
  (magit-refresh))
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 24f2080542..8c0d8551f4 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -963,9 +963,9 @@ instead of the hash, like `kill-ring-save' would."
 ;;; Utilities
 
 (defun magit-blame-maybe-update-revision-buffer ()
-  (when-let ((chunk  (magit-current-blame-chunk))
- (commit (oref chunk orig-rev))
- (buffer (magit-get-mode-buffer 'magit-revision-mode nil t)))
+  (when-let* ((chunk  (magit-current-blame-chunk))
+  (commit (oref chunk orig-rev))
+  (buffer (magit-get-mode-buffer 'magit-revision-mode nil t)))
 (if magit--update-revision-buffer
 (setq magit--update-revision-buffer (list commit buffer))
   (setq magit--update-revision-buffer (list commit buffer))
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index a81890ca55..80f52bb2c8 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -860,9 +860,9 @@ and also rename the respective reflog file."
   :class 'magit--git-branch:upstream)
 
 (cl-defmethod transient-init-value ((obj magit--git-branch:upstream))
-  (when-let ((branch (oref transient--prefix scope))
- (remote (magit-get "branch" branch "remote"))
- (merge  (magit-get "branch" branch "merge")))
+  (when-let* ((branch (oref transient--prefix scope))
+  (remote (magit-get "branch" branch "remote"))
+  (merge  (magit-get "branch" branch "merge")))
 (oset obj value (list remote merge
 
 (cl-defmethod transient-infix-read ((obj magit--git-branch:upstream))
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 5b584a56fd..ea8f8e1655 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -787,8 +787,8 @@ argument."
((use-region-p)
 (call-interactively #'copy-region-as-kill))
(t
-(when-let ((section (magit-current-section))
-   (value (oref section value)))
+(when-let* ((section (magit-current-section))
+(value (oref section value)))
   (magit-section-case
 ((branch commit module-commit tag)
  (let ((default-directory default-directory) ref)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 97db32c590..88ddec7424 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1060,19 +1060,20 @@ Type \\[magit-reset] to reset `HEAD' to the commit at 
point.
   (setq args (remove "--graph" args)))
 (unless (member "--graph" args)
   (setq args (remove "--color" args)))
-(when-let ((limit (magit-log-get-commit-limit))
-   (limit (* 2 limit)) ; increase odds for complete graph
-   (count (and (= (length revs) 1)
-   (> limit 1024) ; otherwise it's fast enough
-   (setq revs (car revs))
-   (not (string-search ".." revs))
-   (not (member revs '("--all" "--branches")))
-   (-none-p (lambda (arg)
-  (--any-p (string-prefix-p it arg)
-   
magit-log-disable-graph-hack-args))
-args)
-   (magit-git-string "rev-list" "--count"
- "--first-parent" args revs
+(when-let* ((limit (magit-log-get-commit-limit))
+(limit (* 2 limit)) ; increase odds for co

[nongnu] elpa/git-commit 4d1d00e6fa 20/26: Fix finding remote executables

[ELPA Syncer]

branch: elpa/git-commit
commit 4d1d00e6fa03bde6d51cbd5bb4dd2442531ad63f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Fix finding remote executables
---
 lisp/magit-autorevert.el | 6 +-
 lisp/magit-commit.el | 4 ++--
 lisp/magit-git.el| 2 +-
 lisp/magit-log.el| 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index 39b1c02fe8..b40d44cdd6 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -109,11 +109,7 @@ seconds of user inactivity.  That is not desirable."
(not global-auto-revert-mode) ; see #3460
buffer-file-name
(file-readable-p buffer-file-name)
-   (or (< emacs-major-version 27)
-   (with-no-warnings
- (condition-case nil
- (executable-find magit-git-executable t) ; see #3684
-   (wrong-number-of-arguments t ; very old 27 built
+   (compat-executable-find (magit-git-executable) t)
(magit-toplevel)
(or (not magit-auto-revert-tracked-only)
(magit-file-tracked-p buffer-file-name)))
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index a5d4943cfb..3309618773 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -517,7 +517,7 @@ See `magit-commit-autofixup' for an alternative 
implementation."
(transient-args 'magit-commit-absorb
   (if (eq phase 'transient)
   (transient-setup 'magit-commit-absorb)
-(unless (executable-find "git-absorb")
+(unless (compat-executable-find "git-absorb" t)
   (user-error "This command requires the git-absorb executable, which %s"
   "is available from https://github.com/tummychow/git-absorb";))
 (unless (magit-anything-staged-p)
@@ -560,7 +560,7 @@ See `magit-commit-absorb' for an alternative 
implementation."
(transient-args 'magit-commit-autofixup
   (if (eq phase 'transient)
   (transient-setup 'magit-commit-autofixup)
-(unless (executable-find "git-autofixup")
+(unless (compat-executable-find "git-autofixup" t)
   (user-error "This command requires the git-autofixup script, which %s"
   "is available from 
https://github.com/torbiak/git-autofixup";))
 (unless (magit-anything-modified-p)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 4a14ced045..367a1dfd98 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -926,7 +926,7 @@ returning the truename."
   "Git executable cannot be found (see https://magit.vc/goto/e6a78ed2)")
 
 (defun magit--assert-usable-git ()
-  (if (not (executable-find (magit-git-executable)))
+  (if (not (compat-executable-find (magit-git-executable) t))
   (signal 'magit-git-executable-not-found (magit-git-executable))
 (let ((magit-git-debug
(lambda (err)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 659f202355..2763a1d949 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -821,7 +821,7 @@ https://github.com/mhagger/git-when-merged.";
  (list commit
(magit-read-other-branch "Merged into" commit)))
(magit-log-arguments)))
-  (unless (executable-find "git-when-merged")
+  (unless (compat-executable-find "git-when-merged" t)
 (user-error "This command requires git-when-merged (%s)"
 "https://github.com/mhagger/git-when-merged";))
   (let (exit m)

[nongnu] elpa/git-commit 1553a4fa36 11/26: Use and-let* for side-effects

[ELPA Syncer]

branch: elpa/git-commit
commit 1553a4fa36634c18377991d945ed6695e6b42803
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use and-let* for side-effects
---
 lisp/git-rebase.el  |   2 +-
 lisp/magit-branch.el|   8 +--
 lisp/magit-commit.el|   2 +-
 lisp/magit-diff.el  |   6 +-
 lisp/magit-extras.el|   2 +-
 lisp/magit-git.el   | 163 
 lisp/magit-gitignore.el |   2 +-
 lisp/magit-libgit.el|   2 +-
 lisp/magit-log.el   |  10 +--
 lisp/magit-merge.el |   2 +-
 lisp/magit-mode.el  |  48 +++---
 lisp/magit-notes.el |  26 
 lisp/magit-patch.el |   4 +-
 lisp/magit-process.el   |   2 +-
 lisp/magit-pull.el  |   2 +-
 lisp/magit-push.el  |  18 +++---
 lisp/magit-repos.el |  18 +++---
 lisp/magit-section.el   |  62 +-
 lisp/magit-sequence.el  |   6 +-
 lisp/magit-transient.el |   2 +-
 lisp/magit-wip.el   |   4 +-
 21 files changed, 197 insertions(+), 194 deletions(-)

diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index f3fcd6df74..f33328e565 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -318,7 +318,7 @@ instance with all nil values is returned."
  git-rebase-line-regexps)))
 (git-rebase-action
  :action-typetype
- :action (when-let ((action (match-string-no-properties 1)))
+ :action (and-let* ((action (match-string-no-properties 1)))
(or (cdr (assoc action git-rebase-short-options))
action))
  :action-options (match-string-no-properties 2)
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 7b6e27e8b4..a81890ca55 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -873,10 +873,10 @@ and also rename the respective reflog file."
 (cl-defmethod transient-infix-set ((obj magit--git-branch:upstream) refname)
   (magit-set-upstream-branch (oref transient--prefix scope) refname)
   (oset obj value
-(let ((branch (oref transient--prefix scope)))
-  (when-let ((r (magit-get "branch" branch "remote"))
- (m (magit-get "branch" branch "merge")))
-(list r m
+(and-let* ((branch (oref transient--prefix scope))
+   (r (magit-get "branch" branch "remote"))
+   (m (magit-get "branch" branch "merge")))
+  (list r m)))
   (magit-refresh))
 
 (cl-defmethod transient-format ((obj magit--git-branch:upstream))
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 581f5bbf88..2b90762a5b 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -189,7 +189,7 @@ Also see https://github.com/magit/magit/issues/4132.";
   (fpr (epg-sub-key-fingerprint key))
   (id  (epg-sub-key-id key))
   (author
-   (when-let ((id-obj
+   (and-let* ((id-obj
(car (epg-key-user-id-list cert
  (let ((id-str (epg-user-id-string id-obj)))
(if (stringp id-str)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index a5619dc31d..f942b42bdf 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1346,7 +1346,7 @@ for a revision."
   (magit-diff--goto-position file line col
 
 (defun magit-diff--locate-hunk (file line &optional parent)
-  (when-let ((diff (cl-find-if (lambda (section)
+  (and-let* ((diff (cl-find-if (lambda (section)
  (and (cl-typep section 'magit-file-section)
   (equal (oref section value) file)))
(oref (or parent magit-root-section) 
children
@@ -2116,7 +2116,7 @@ keymap is the parent of their keymaps.")
 
 (defun magit-diff-use-window-width-as-stat-width ()
   "Use the `window-width' as the value of `--stat-width'."
-  (when-let ((window (get-buffer-window (current-buffer) 'visible)))
+  (and-let* ((window (get-buffer-window (current-buffer) 'visible)))
 (list (format "--stat-width=%d" (window-width window)
 
 (defun magit-diff-wash-diffs (args &optional limit)
@@ -3390,7 +3390,7 @@ last (visual) lines of the region."
 (defun magit-diff-inside-hunk-body-p ()
   "Return non-nil if point is inside the body of a hunk."
   (and (magit-section-match 'hunk)
-   (when-let ((content (oref (magit-current-section) content)))
+   (and-let* ((content (oref (magit-current-section) content)))
  (> (magit-point) content
 
 ;;; Diff Extract
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 2d4e186cda..5b584a56fd 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -253,7 +253,7 @@ With a prefix argument, visit in another window.  If there
 is no file at point, then instead visit `defa

[nongnu] elpa/git-commit 5f23a34a5f 19/26: Use compat-dired-marked-files

[ELPA Syncer]

branch: elpa/git-commit
commit 5f23a34a5f3c7eb12f15d05778aa5a152404c960
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use compat-dired-marked-files
---
 lisp/magit-extras.el | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index c9e3145bb8..92678b8846 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -264,9 +264,9 @@ is no file at point, then instead visit 
`default-directory'."
   (interactive "P")
   (if-let ((topdir (magit-toplevel default-directory)))
   (let ((args (car (magit-log-arguments)))
-(files (dired-get-marked-files nil nil #'magit-file-tracked-p)))
-(unless files
-  (user-error "No marked file is being tracked by Git"))
+(files (compat-dired-get-marked-files
+nil nil #'magit-file-tracked-p nil
+"No marked file is being tracked by Git")))
 (when (and follow
(not (member "--follow" args))
(not (cdr files)))
@@ -287,10 +287,7 @@ for a repository."
   (interactive (list (or (magit-toplevel)
  (magit-read-repository t))
  current-prefix-arg))
-  ;; Note: The ERROR argument of `dired-get-marked-files' isn't
-  ;; available until Emacs 27.
-  (let ((files (or (dired-get-marked-files nil arg)
-   (user-error "No files specified"
+  (let ((files (compat-dired-get-marked-files nil arg nil nil t)))
 (magit-status-setup-buffer repo)
 (magit-am-apply-patches files)))
 

[nongnu] elpa/git-modes updated (bb71cb2226 -> 96abfb732d)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-modes.

  from  bb71cb2226 Convert readme to org
   new  d6a7111ceb Drop support for Emacs 24
   new  845d333732 Refresh library header
   new  fc08fcd540 make: Improve creation of autoloads file
   new  96abfb732d make: Remove install target


Summary of changes:
 Makefile  | 53 +--
 git-modes.el  | 22 +++--
 gitattributes-mode.el | 17 +
 gitconfig-mode.el | 17 +
 gitignore-mode.el | 17 +
 5 files changed, 52 insertions(+), 74 deletions(-)

[nongnu] elpa/git-commit 557b9d3df1 25/26: make: Right-align target verbs

[ELPA Syncer]

branch: elpa/git-commit
commit 557b9d3df19b597853e4e2b608c015aea0dfc1ed
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Right-align target verbs
---
 docs/Makefile | 2 +-
 lisp/Makefile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 084158eb7d..59810c71b7 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -77,7 +77,7 @@ install-info: info
 ## Clean #
 
 clean:
-   @printf "Cleaning docs/*...\n"
+   @printf " Cleaning docs/*...\n"
@$(RMDIR) dir $(INFOPAGES) $(HTMLFILES) $(HTMLDIRS) $(PDFFILES)
@$(RMDIR) $(EPUBFILES) $(EPUBTRASH)
@$(RMDIR) $(GENSTATS_DIR)
diff --git a/lisp/Makefile b/lisp/Makefile
index 4c764fb75d..d59bbd6dc4 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -82,7 +82,7 @@ versionlib: $(PKG)-version.el
-f batch-byte-compile $<
 
 $(PKG)-autoloads.el: $(ELS)
-   @printf "Generating $@\n"
+   @printf " Creating $@\n"
@printf "%s" "$$LOADDEFS_TMPL" > $@
@$(BATCH) --eval "(progn\
(fset 'message (lambda (&rest _)))\
@@ -94,7 +94,7 @@ $(PKG)-autoloads.el: $(ELS)
(update-directory-autoloads default-directory))"
 
 $(PKG)-version.el:
-   @printf "Generating $@\n"
+   @printf " Creating $@\n"
@printf "%s" "$$VERSIONLIB_TMPL" > $@
 
 check-declare:
@@ -111,7 +111,7 @@ install: lisp versionlib
 ## Clean #
 
 clean:
-   @printf "Cleaning lisp/*...\n"
+   @printf " Cleaning lisp/*...\n"
@$(RM) *.elc $(ELGS)
 
 ## Templates #

[nongnu] elpa/git-modes fc08fcd540 3/4: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/git-modes
commit fc08fcd540cb8b9fb4238c1ad88c89de9735b530
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Improve creation of autoloads file
---
 Makefile | 40 +---
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 9e7a5a782b..fb7a691e68 100644
--- a/Makefile
+++ b/Makefile
@@ -38,36 +38,22 @@ loaddefs: $(PKG)-autoloads.el
 CLEAN  = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-   @printf "Cleaning...\n"
+   @printf " Cleaning...\n"
@rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
-   @printf "Generating $@\n"
-   @printf "%s" "$$LOADDEFS_TMPL" > $@
-   @$(EMACS) -Q --batch --eval "(progn\
-   (setq make-backup-files nil)\
-   (setq vc-handled-backends nil)\
-   (setq default-directory (file-truename default-directory))\
-   (setq generated-autoload-file (expand-file-name \"$@\"))\
-   (setq find-file-visit-truename t)\
-   (update-directory-autoloads default-directory))"
+   @printf " Creating $@\n"
+   @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+  (autoload-timestamps nil) \
+  (backup-inhibited t)\
+  (version-control 'never)\
+  (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+((symbol-function 'progress-reporter-done) (lambda (_\
+(let ((generated-autoload-file file))\
+  (update-directory-autoloads default-directory"
 
 CP  ?= install -p -m 644
 MKDIR   ?= install -p -m 755 -d

[nongnu] elpa/git-modes d6a7111ceb 1/4: Drop support for Emacs 24

[ELPA Syncer]

branch: elpa/git-modes
commit d6a7111ceb226117bfbbb8cf1f9810416c64df2d
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Drop support for Emacs 24

Please update to Emacs 25 or 26 or 27 or even 28.
---
 git-modes.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-modes.el b/git-modes.el
index 2450aaa919..941561545d 100644
--- a/git-modes.el
+++ b/git-modes.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (c) 2012-2013  Sebastian Wiesner
 ;; Copyright (C) 2013-2015  Rüdiger Sonderfeld
-;; Copyright (C) 2012-2021  The Magit Project Contributors
+;; Copyright (C) 2012-2022  The Magit Project Contributors
 
 ;; Author: Sebastian Wiesner 
 ;; Rüdiger Sonderfeld 
@@ -10,7 +10,7 @@
 ;; Maintainer: Jonas Bernoulli 
 ;; Homepage: https://github.com/magit/git-modes
 ;; Keywords: convenience vc git
-;; Package-Requires: ((emacs "24.3"))
+;; Package-Requires: ((emacs "25.1"))
 ;; Package-Version: 1.4.0
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 

[nongnu] elpa/git-commit e9df33bf28 21/26: Silence warnings on older Emacs releases

[ELPA Syncer]

branch: elpa/git-commit
commit e9df33bf2862b4222c044bddaf60901279a153b3
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Silence warnings on older Emacs releases
---
 lisp/magit-diff.el|  2 --
 lisp/magit-extras.el  | 62 ++-
 lisp/magit-process.el |  6 ++---
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 00400403eb..82fa150061 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -41,8 +41,6 @@
 ;; For `magit-diff-popup'
 (declare-function magit-stash-show "magit-stash" (stash &optional args files))
 ;; For `magit-diff-visit-file'
-(declare-function dired-jump "dired" ; dired-x before 27.1
-  (&optional other-window file-name))
 (declare-function magit-find-file-noselect "magit-files" (rev file))
 (declare-function magit-status-setup-buffer "magit-status" (&optional 
directory))
 ;; For `magit-diff-while-committing'
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 92678b8846..4222b94cd0 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -31,12 +31,11 @@
 
 (require 'magit)
 
-(declare-function change-log-insert-entries "add-log" (changelogs))
-(declare-function diff-add-log-current-defuns "diff-mode" ())
+;; For `magit-do-async-shell-command'.
 (declare-function dired-read-shell-command "dired-aux" (prompt arg files))
 ;; For `magit-project-status'.
-(declare-function project-root "project" (project))
-(declare-function vc-git-command "vc-git" (buffer okstatus file-or-list &rest 
flags))
+(declare-function vc-git-command "vc-git"
+  (buffer okstatus file-or-list &rest flags))
 
 (defvar ido-exit)
 (defvar ido-fallback)
@@ -226,7 +225,9 @@ like pretty much every other keymap:
 (defun magit-project-status ()
   "Run `magit-status' in the current project's root."
   (interactive)
-  (magit-status-setup-buffer (project-root (project-current t
+  (if (fboundp 'project-root)
+  (magit-status-setup-buffer (project-root (project-current t)))
+(user-error "`magit-project-status' requires `project' 0.3.0 or greater")))
 
 (defvar magit-bind-magit-project-status t
   "Whether to bind \"m\" to `magit-project-status' in `project-prefix-map'.
@@ -390,31 +391,32 @@ in HEAD as well as staged changes in the diff to check."
   (require 'diff-mode) ; `diff-add-log-current-defuns'.
   (require 'vc-git); `vc-git-diff'.
   (require 'add-log)   ; `change-log-insert-entries'.
-  (unless (and (fboundp 'change-log-insert-entries)
-   (fboundp 'diff-add-log-current-defuns))
-(user-error "`magit-generate-changelog' requires Emacs 27 or greater"))
-  (setq default-directory
-(if (and (file-regular-p "gitdir")
- (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
- (magit-git-true "rev-parse" "--is-inside-git-dir"))
-(file-name-directory (magit-file-line "gitdir"))
-  (magit-toplevel)))
-  (let ((rev1 (if amending "HEAD^1" "HEAD"))
-(rev2 nil))
-;; Magit may have updated the files without notifying vc, but
-;; `diff-add-log-current-defuns' relies on vc being up-to-date.
-(mapc #'vc-file-clearprops (magit-staged-files))
-(change-log-insert-entries
- (with-temp-buffer
-   (vc-git-command (current-buffer) 1 nil
-   "diff-index" "--exit-code" "--patch"
-   (and (magit-anything-staged-p) "--cached")
-   rev1 "--")
-   ;; `diff-find-source-location' consults these vars.
-   (defvar diff-vc-revisions)
-   (setq-local diff-vc-revisions (list rev1 rev2))
-   (setq-local diff-vc-backend 'Git)
-   (diff-add-log-current-defuns)
+  (cond
+   ((and (fboundp 'change-log-insert-entries)
+ (fboundp 'diff-add-log-current-defuns))
+(setq default-directory
+  (if (and (file-regular-p "gitdir")
+   (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
+   (magit-git-true "rev-parse" "--is-inside-git-dir"))
+  (file-name-directory (magit-file-line "gitdir"))
+(magit-toplevel)))
+(let ((rev1 (if amending "HEAD^1" "HEAD"))
+  (rev2 nil))
+  ;; Magit may have updated the files without notifying vc, but
+  ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
+  (mapc #'vc-file-clearprops (magit-staged-files))
+  (change-log-insert-entries
+   (with-temp-buffer
+ (vc-git-command (current-buffer) 1 nil
+ "diff-index" "--exit-code" "--patch"
+ (and (magit-anything-staged-p) "--cached")
+ rev1 "--")
+ ;; `diff-find-source-location' consults these vars.
+ (defvar diff-vc-revisions)
+ (setq-local diff-vc-revisions (list rev1 rev2))
+ (setq-local diff-vc-backend 'Git)
+ (diff-add-log-current-defuns)
+   (t (user-error "`magit-gen

[nongnu] elpa/git-modes 96abfb732d 4/4: make: Remove install target

[ELPA Syncer]

branch: elpa/git-modes
commit 96abfb732d695cbd2075ba701254651a7b28d693
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Remove install target

None of my other packages of this (low) complexity have such a
target and it is never being requested.  Now this Makefile has
the same layout as the other Makefiles.
---
 Makefile | 13 -
 1 file changed, 13 deletions(-)

diff --git a/Makefile b/Makefile
index fb7a691e68..70d590df44 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,12 @@ EMACS_ARGS ?=
 LOAD_PATH  ?= $(addprefix -L ../,$(DEPS))
 LOAD_PATH  += -L .
 
-PREFIX ?= /usr/local
-
 all: lisp
 
 help:
$(info make all  - generate byte-code and autoloads)
$(info make lisp - generate byte-code and autoloads)
$(info make clean- remove generated files)
-   $(info make install  - install in $(PREFIX))
@printf "\n"
 
 lisp: $(ELCS) loaddefs
@@ -54,13 +51,3 @@ $(PKG)-autoloads.el: $(ELS)
 ((symbol-function 'progress-reporter-done) (lambda (_\
 (let ((generated-autoload-file file))\
   (update-directory-autoloads default-directory"
-
-CP  ?= install -p -m 644
-MKDIR   ?= install -p -m 755 -d
-LISPDIR ?= $(PREFIX)/share/emacs/site-lisp/git-modes
-
-.PHONY: install
-install: lisp
-   @printf "Installing...\n"
-   @$(MKDIR) $(DESTDIR)$(LISPDIR)
-   @$(CP) $(ELS) $(ELCS) $(DESTDIR)$(LISPDIR)

[nongnu] elpa/git-commit a37b2066dd 22/26: Use pcase's quote upattern

[ELPA Syncer]

branch: elpa/git-commit
commit a37b2066dd88be92d80cd9221347ed43525e979f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use pcase's quote upattern

I though that wasn't added until much later but actually this is
supported since Emacs 25.1.
---
 lisp/git-rebase.el |  4 +--
 lisp/magit-apply.el| 52 +++---
 lisp/magit-base.el |  6 ++--
 lisp/magit-bookmark.el |  8 ++---
 lisp/magit-diff.el | 86 +-
 lisp/magit-ediff.el| 14 
 lisp/magit-log.el  | 24 +++---
 lisp/magit-margin.el   | 20 ++--
 lisp/magit-merge.el|  4 +--
 lisp/magit-mode.el |  8 ++---
 lisp/magit-remote.el   |  2 +-
 lisp/magit-section.el  | 12 +++
 lisp/magit-sequence.el |  8 ++---
 13 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index f33328e565..e02378ae5c 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -646,8 +646,8 @@ Like `undo' but works in read-only buffers."
   (and (eq action-type 'commit)
target))
   (pcase scroll
-(`up   (magit-diff-show-or-scroll-up))
-(`down (magit-diff-show-or-scroll-down))
+('up   (magit-diff-show-or-scroll-up))
+('down (magit-diff-show-or-scroll-down))
 (_ (apply #'magit-show-commit it
   (magit-diff-arguments 'magit-revision-mode
 (ding)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 8230c2d4a0..fa77908357 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -133,9 +133,9 @@ so causes the change to be applied to the index as well."
   (interactive (and current-prefix-arg (list "--3way")))
   (--when-let (magit-apply--get-selection)
 (pcase (list (magit-diff-type) (magit-diff-scope))
-  (`(,(or `unstaged `staged) ,_)
+  (`(,(or 'unstaged 'staged) ,_)
(user-error "Change is already in the working tree"))
-  (`(untracked ,(or `file `files))
+  (`(untracked ,(or 'file 'files))
(call-interactively #'magit-am))
   (`(,_ region) (magit-apply-region it args))
   (`(,_   hunk) (magit-apply-hunk   it args))
@@ -258,9 +258,9 @@ adjusted as \"@@ -10,6 +10,7 @@\" and \"@@ -18,6 +19,7 
@@\"."
   (or (magit-region-sections '(hunk file module) t)
   (let ((section (magit-current-section)))
 (pcase (oref section type)
-  ((or `hunk `file `module) section)
-  ((or `staged `unstaged `untracked
-   `stashed-index `stashed-worktree `stashed-untracked)
+  ((or 'hunk 'file 'module) section)
+  ((or 'staged 'unstaged 'untracked
+   'stashed-index 'stashed-worktree 'stashed-untracked)
(oref section children))
   (_ (user-error "Cannot apply this, it's not a change"))
 
@@ -298,12 +298,12 @@ at point, stage the file but not its content."
 (`(unstaged  region  ,_) (magit-apply-region it "--cached"))
 (`(unstagedhunk  ,_) (magit-apply-hunk   it "--cached"))
 (`(unstaged   hunks  ,_) (magit-apply-hunks  it "--cached"))
-(`(unstagedfile   t) (magit-apply-diff   it "--cached"))
-(`(unstaged   files   t) (magit-apply-diffs  it "--cached"))
-(`(unstagedlist   t) (magit-apply-diffs  it "--cached"))
-(`(unstagedfile nil) (magit-stage-1 "-u" (list (oref it value
-(`(unstaged   files nil) (magit-stage-1 "-u" (magit-region-values nil 
t)))
-(`(unstagedlist nil) (magit-stage-modified))
+('(unstagedfile   t) (magit-apply-diff   it "--cached"))
+('(unstaged   files   t) (magit-apply-diffs  it "--cached"))
+('(unstagedlist   t) (magit-apply-diffs  it "--cached"))
+('(unstagedfile nil) (magit-stage-1 "-u" (list (oref it value
+('(unstaged   files nil) (magit-stage-1 "-u" (magit-region-values nil 
t)))
+('(unstagedlist nil) (magit-stage-modified))
 (`(staged,_  ,_) (user-error "Already staged"))
 (`(committed ,_  ,_) (user-error "Cannot stage committed changes"))
 (`(undefined ,_  ,_) (user-error "Cannot stage this change")))
@@ -351,9 +351,9 @@ ignored) files."
 (defun magit-stage-untracked (&optional intent)
   (let* ((section (magit-current-section))
  (files (pcase (magit-diff-scope)
-  (`file  (list (oref section value)))
-  (`files (magit-region-values nil t))
-  (`list  (magit-untracked-files
+  ('file  (list (oref section value)))
+  ('files (magit-region-values nil t))
+  ('list  (magit-untracked-files
  plain repos)
 (dolist (file files)
   (if (and (not (file-symlink-p file))
@@ -408,12 +408,12 @@ ignored) files."
   (`(stagedregion  ,_) (magit-apply-region it "--reverse" "--cached"))
  

[nongnu] elpa/git-commit 5a43c5f557 24/26: magit-tests.el: Use lexical-binding

[ELPA Syncer]

branch: elpa/git-commit
commit 5a43c5f557ff31c3c598d4b51f2c2dd96e7adbb6
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-tests.el: Use lexical-binding
---
 test/magit-tests.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/magit-tests.el b/test/magit-tests.el
index 5ce5e82211..05f6d52d7d 100644
--- a/test/magit-tests.el
+++ b/test/magit-tests.el
@@ -1,4 +1,4 @@
-;;; magit-tests.el --- Tests for Magit
+;;; magit-tests.el --- Tests for Magit  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2008-2022 The Magit Project Contributors
 

[nongnu] elpa/git-modes 845d333732 2/4: Refresh library header

[ELPA Syncer]

branch: elpa/git-modes
commit 845d333732ad9c8d65a28f12af645c6682db6f45
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Refresh library header
---
 git-modes.el  | 22 --
 gitattributes-mode.el | 17 +
 gitconfig-mode.el | 17 +
 gitignore-mode.el | 17 +
 4 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/git-modes.el b/git-modes.el
index 941561545d..f6aa58043c 100644
--- a/git-modes.el
+++ b/git-modes.el
@@ -1,8 +1,8 @@
-;;; git-modes.el --- Major modes for editing Git configuration files  -*- 
lexical-binding: t -*-
+;;; git-modes.el --- Major modes for editing Git configuration files  -*- 
lexical-binding:t -*-
 
-;; Copyright (c) 2012-2013  Sebastian Wiesner
-;; Copyright (C) 2013-2015  Rüdiger Sonderfeld
-;; Copyright (C) 2012-2022  The Magit Project Contributors
+;; Copyright (c) 2012-2013 Sebastian Wiesner
+;; Copyright (C) 2013-2015 Rüdiger Sonderfeld
+;; Copyright (C) 2012-2022 The Magit Project Contributors
 
 ;; Author: Sebastian Wiesner 
 ;; Rüdiger Sonderfeld 
@@ -10,22 +10,24 @@
 ;; Maintainer: Jonas Bernoulli 
 ;; Homepage: https://github.com/magit/git-modes
 ;; Keywords: convenience vc git
-;; Package-Requires: ((emacs "25.1"))
+
 ;; Package-Version: 1.4.0
+;; Package-Requires: ((emacs "25.1"))
+
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3 of the License,
+;; by the Free Software Foundation, either version 3 of the License,
 ;; or (at your option) any later version.
-
+;;
 ;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-
+;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this file.  If not, see .
+;; along with this file.  If not, see .
 
 ;;; Commentary:
 
diff --git a/gitattributes-mode.el b/gitattributes-mode.el
index de5793d676..bbdce5d95f 100644
--- a/gitattributes-mode.el
+++ b/gitattributes-mode.el
@@ -1,26 +1,27 @@
-;;; gitattributes-mode.el --- Major mode for editing .gitattributes files  -*- 
lexical-binding: t -*-
+;;; gitattributes-mode.el --- Major mode for editing .gitattributes files  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2013-2015  Rüdiger Sonderfeld
-;; Copyright (C) 2013-2021  The Magit Project Contributors
+;; Copyright (C) 2013-2015 Rüdiger Sonderfeld
+;; Copyright (C) 2013-2022 The Magit Project Contributors
 
 ;; Author: Rüdiger Sonderfeld 
 ;; Maintainer: Jonas Bernoulli 
 ;; Homepage: https://github.com/magit/git-modes
 ;; Keywords: convenience vc git
+
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3 of the License,
+;; by the Free Software Foundation, either version 3 of the License,
 ;; or (at your option) any later version.
-
+;;
 ;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-
+;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this file.  If not, see .
+;; along with this file.  If not, see .
 
 ;;; Commentary:
 
diff --git a/gitconfig-mode.el b/gitconfig-mode.el
index 6b336da720..219499b1cb 100644
--- a/gitconfig-mode.el
+++ b/gitconfig-mode.el
@@ -1,26 +1,27 @@
-;;; gitconfig-mode.el --- Major mode for editing .gitconfig files  -*- 
lexical-binding: t -*-
+;;; gitconfig-mode.el --- Major mode for editing .gitconfig files  -*- 
lexical-binding:t -*-
 
-;; Copyright (c) 2012-2013  Sebastian Wiesner
-;; Copyright (C) 2012-2021  The Magit Project Contributors
+;; Copyright (c) 2012-2013 Sebastian Wiesner
+;; Copyright (C) 2012-2022 The Magit Project Contributors
 
 ;; Author: Sebastian Wiesner 
 ;; Maintainer: Jonas Bernoulli 
 ;; Homepage: https://github.com/magit/git-modes
 ;; Keywords: convenience vc git
+
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3 of the License,
+;; by the 

[nongnu] elpa/git-commit b280fd7625 17/26: Use compat-assoc-delete-all

[ELPA Syncer]

branch: elpa/git-commit
commit b280fd76250f8caaf1bc7c91800d9a577e017812
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use compat-assoc-delete-all
---
 lisp/magit-mode.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 4fb0fe42d7..639762ba29 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -1413,9 +1413,7 @@ Unless specified, REPOSITORY is the current buffer's 
repository."
   (when-let ((cache (assoc (or repository
(magit-repository-local-repository))
magit-repository-local-cache)))
-;; There is no `assoc-delete-all'.
-(setf (cdr cache)
-  (cl-delete key (cdr cache) :key #'car :test #'equal
+(setf cache (compat-assoc-delete-all key cache
 
 (defmacro magit--with-repository-local-cache (key &rest body)
   (declare (indent 1) (debug (form body)))

[nongnu] elpa/keycast updated (809ce7625a -> 0c37db482c)

[ELPA Syncer]

elpasync pushed a change to branch elpa/keycast.

  from  809ce7625a Silence older byte-compilers
   new  d7f94942c8 Depend on compat package from GNU Elpa
   new  afe071c00c Use and-let* for side-effects
   new  5d71dee90b Refresh library header
   new  a0d30dbf17 make: Improve creation of autoloads file
   new  0c37db482c Put eval-when-compile and require on one line


Summary of changes:
 Makefile   | 42 ++
 keycast.el | 29 ++---
 2 files changed, 28 insertions(+), 43 deletions(-)

[nongnu] elpa/keycast 0c37db482c 5/5: Put eval-when-compile and require on one line

[ELPA Syncer]

branch: elpa/keycast
commit 0c37db482ca98e729430121209d70dd093082a5e
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Put eval-when-compile and require on one line

I like that when grepping for such usage.
---
 keycast.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keycast.el b/keycast.el
index 31445c6538..d9a1daa263 100644
--- a/keycast.el
+++ b/keycast.el
@@ -37,9 +37,8 @@
 (require 'compat)
 (require 'format-spec)
 
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'subr-x))
+(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'subr-x))
 
 (define-obsolete-variable-alias 'keycast-insert-after
   'keycast-mode-line-insert-after "Keycast 2.0.0")

[nongnu] elpa/keycast d7f94942c8 1/5: Depend on compat package from GNU Elpa

[ELPA Syncer]

branch: elpa/keycast
commit d7f94942c863ac30b0050c64099ce4f69a2fc444
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Depend on compat package from GNU Elpa
---
 Makefile   | 2 +-
 keycast.el | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 21c52fa92d..1514c6f80f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ PKG = keycast
 ELS   = $(PKG).el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  =
+DEPS  = compat
 
 EMACS  ?= emacs
 EMACS_ARGS ?=
diff --git a/keycast.el b/keycast.el
index bb7953b8fb..fca08d684c 100644
--- a/keycast.el
+++ b/keycast.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli 
 ;; Homepage: https://github.com/tarsius/keycast
 
-;; Package-Requires: ((emacs "25.3"))
+;; Package-Requires: ((emacs "25.3") (compat "28.1.1.0"))
 ;; Package-Version: 1.2.0-git
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -35,6 +35,7 @@
 
 ;;; Code:
 
+(require 'compat)
 (require 'format-spec)
 
 (eval-when-compile

[nongnu] elpa/keycast afe071c00c 2/5: Use and-let* for side-effects

[ELPA Syncer]

branch: elpa/keycast
commit afe071c00c22a0b43a5294d353fc297fed85903d
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use and-let* for side-effects
---
 keycast.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keycast.el b/keycast.el
index fca08d684c..9484124ca0 100644
--- a/keycast.el
+++ b/keycast.el
@@ -494,7 +494,7 @@ t to show the actual COMMAND, or a symbol to be shown 
instead."
   "Produce key binding information for the tab bar."
   (and keycast-tab-bar-mode
(keycast--active-frame-p)
-   (when-let ((output (keycast--format keycast-tab-bar-format)))
+   (and-let* ((output (keycast--format keycast-tab-bar-format)))
  (concat output
  (make-string (max 0 (- keycast-tab-bar-minimal-width
 (length output)))

[nongnu] elpa/keycast a0d30dbf17 4/5: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/keycast
commit a0d30dbf177002be2deff56be3b60cce50450854
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Improve creation of autoloads file
---
 Makefile | 40 +---
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 1514c6f80f..893f89c5fb 100644
--- a/Makefile
+++ b/Makefile
@@ -32,33 +32,19 @@ loaddefs: $(PKG)-autoloads.el
 CLEAN  = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-   @printf "Cleaning...\n"
+   @printf " Cleaning...\n"
@rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
-   @printf "Generating $@\n"
-   @printf "%s" "$$LOADDEFS_TMPL" > $@
-   @$(EMACS) -Q --batch --eval "(progn\
-   (setq make-backup-files nil)\
-   (setq vc-handled-backends nil)\
-   (setq default-directory (file-truename default-directory))\
-   (setq generated-autoload-file (expand-file-name \"$@\"))\
-   (setq find-file-visit-truename t)\
-   (update-directory-autoloads default-directory))"
+   @printf " Creating $@\n"
+   @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+  (autoload-timestamps nil) \
+  (backup-inhibited t)\
+  (version-control 'never)\
+  (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+((symbol-function 'progress-reporter-done) (lambda (_\
+(let ((generated-autoload-file file))\
+  (update-directory-autoloads default-directory"

[nongnu] elpa/keycast 5d71dee90b 3/5: Refresh library header

[ELPA Syncer]

branch: elpa/keycast
commit 5d71dee90b0fb9b105d6ddea00994959f739ecb7
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Refresh library header
---
 keycast.el | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/keycast.el b/keycast.el
index 9484124ca0..31445c6538 100644
--- a/keycast.el
+++ b/keycast.el
@@ -1,29 +1,28 @@
-;;; keycast.el --- Show current command and its binding  -*- lexical-binding: 
t -*-
+;;; keycast.el --- Show current command and its binding  -*- lexical-binding:t 
-*-
 
-;; Copyright (C) 2018-2022  Jonas Bernoulli
+;; Copyright (C) 2018-2022 Jonas Bernoulli
 
 ;; Author: Jonas Bernoulli 
 ;; Homepage: https://github.com/tarsius/keycast
+;; Keywords: multimedia
 
 ;; Package-Requires: ((emacs "25.3") (compat "28.1.1.0"))
 ;; Package-Version: 1.2.0-git
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
 ;;
 ;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;;
-;; For a full copy of the GNU General Public License
-;; see .
-
-;; This file is not part of GNU Emacs.
+;; You should have received a copy of the GNU General Public License
+;; along with this file.  If not, see .
 
 ;;; Commentary:
 

[nongnu] elpa/magit updated (3cfc8458e1 -> 40fb3d2002)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  3cfc8458e1 Fix imenu in repository lists
  adds  6cd8bcaf18 Use string-prefix-p and string-suffix-p
  adds  485b265dd3 magit-generate-changelog: Minor error message tweak
  adds  e766c891fe Limit a workaround to the Emacs versions that need it
  adds  58ce563589 magit-format-rev-summary: Cosmetics
  adds  571b4346c1 Depend on the compat package from GNU Elpa
  adds  59fb9ce03f Use string-replace instead of replace-regexp-in-string
  adds  7671e46a8b Use string-search instead of string-match-p
  adds  bba16d4f3e Use string-search instead of string-match
  adds  a20dc0b83e Use string-trim
  adds  264e92436c Use xor
  adds  1553a4fa36 Use and-let* for side-effects
  adds  4bcb303154 Use and-let* for side-effects even more
  adds  9ce3859dd2 Use when-let* for multiple bindings
  adds  8842230bca Use length= and length>
  adds  b4b2098c91 Use with-environment-variables
  adds  77cc75ed90 Use image-property
  adds  b280fd7625 Use compat-assoc-delete-all
  adds  b0ababbde4 Use compat-alist-get
  adds  5f23a34a5f Use compat-dired-marked-files
  adds  4d1d00e6fa Fix finding remote executables
  adds  e9df33bf28 Silence warnings on older Emacs releases
  adds  a37b2066dd Use pcase's quote upattern
  adds  d69f062a8a Refresh library headers
  adds  5a43c5f557 magit-tests.el: Use lexical-binding
  adds  557b9d3df1 make: Right-align target verbs
  adds  40fb3d2002 make: Improve creation of autoloads file

No new revisions were added by this update.

Summary of changes:
 default.mk|  11 +++
 docs/Makefile |   2 +-
 lisp/Makefile |  45 +++--
 lisp/git-commit-pkg.el|   1 +
 lisp/git-commit.el|  38 +---
 lisp/git-rebase.el|  35 +++
 lisp/magit-apply.el   |  71 +++---
 lisp/magit-autorevert.el  |  21 ++--
 lisp/magit-base.el|  49 +-
 lisp/magit-bisect.el  |  23 ++---
 lisp/magit-blame.el   |  23 ++---
 lisp/magit-bookmark.el|  34 +++
 lisp/magit-branch.el  |  35 +++
 lisp/magit-bundle.el  |  15 ++-
 lisp/magit-clone.el   |  21 ++--
 lisp/magit-commit.el  |  46 +
 lisp/magit-core.el|  15 ++-
 lisp/magit-diff.el| 219 +-
 lisp/magit-ediff.el   |  31 +++---
 lisp/magit-extras.el  | 160 +++---
 lisp/magit-fetch.el   |  15 ++-
 lisp/magit-files.el   |  15 ++-
 lisp/magit-git.el | 217 +
 lisp/magit-gitignore.el   |  17 ++--
 lisp/magit-libgit-pkg.el  |   1 +
 lisp/magit-libgit.el  |  43 +
 lisp/magit-log.el | 103 ++--
 lisp/magit-margin.el  |  35 +++
 lisp/magit-merge.el   |  21 ++--
 lisp/magit-mode.el|  75 +++
 lisp/magit-notes.el   |  41 
 lisp/magit-obsolete.el|  15 ++-
 lisp/magit-patch.el   |  21 ++--
 lisp/magit-pkg.el |   1 +
 lisp/magit-process.el |  55 +--
 lisp/magit-pull.el|  17 ++--
 lisp/magit-push.el|  37 ---
 lisp/magit-reflog.el  |  15 ++-
 lisp/magit-refs.el|  23 ++---
 lisp/magit-remote.el  |  23 ++---
 lisp/magit-repos.el   |  35 +++
 lisp/magit-reset.el   |  15 ++-
 lisp/magit-section-pkg.el |   1 +
 lisp/magit-section.el | 108 ++---
 lisp/magit-sequence.el|  49 +-
 lisp/magit-sparse-checkout.el |  15 ++-
 lisp/magit-stash.el   |  19 ++--
 lisp/magit-status.el  |  27 +++---
 lisp/magit-submodule.el   |  15 ++-
 lisp/magit-subtree.el |  15 ++-
 lisp/magit-tag.el |  15 ++-
 lisp/magit-transient.el   |  17 ++--
 lisp/magit-wip.el |  19 ++--
 lisp/magit-worktree.el|  17 ++--
 lisp/magit.el |  68 +++--
 test/magit-tests.el   |  19 +++-
 56 files changed, 1017 insertions(+), 1122 deletions(-)

[nongnu] elpa/magit-section updated (3cfc8458e1 -> 40fb3d2002)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  3cfc8458e1 Fix imenu in repository lists
  adds  6cd8bcaf18 Use string-prefix-p and string-suffix-p
  adds  485b265dd3 magit-generate-changelog: Minor error message tweak
  adds  e766c891fe Limit a workaround to the Emacs versions that need it
  adds  58ce563589 magit-format-rev-summary: Cosmetics
  adds  571b4346c1 Depend on the compat package from GNU Elpa
  adds  59fb9ce03f Use string-replace instead of replace-regexp-in-string
  adds  7671e46a8b Use string-search instead of string-match-p
  adds  bba16d4f3e Use string-search instead of string-match
  adds  a20dc0b83e Use string-trim
  adds  264e92436c Use xor
  adds  1553a4fa36 Use and-let* for side-effects
  adds  4bcb303154 Use and-let* for side-effects even more
  adds  9ce3859dd2 Use when-let* for multiple bindings
  adds  8842230bca Use length= and length>
  adds  b4b2098c91 Use with-environment-variables
  adds  77cc75ed90 Use image-property
  adds  b280fd7625 Use compat-assoc-delete-all
  adds  b0ababbde4 Use compat-alist-get
  adds  5f23a34a5f Use compat-dired-marked-files
  adds  4d1d00e6fa Fix finding remote executables
  adds  e9df33bf28 Silence warnings on older Emacs releases
  adds  a37b2066dd Use pcase's quote upattern
  adds  d69f062a8a Refresh library headers
  adds  5a43c5f557 magit-tests.el: Use lexical-binding
  adds  557b9d3df1 make: Right-align target verbs
  adds  40fb3d2002 make: Improve creation of autoloads file

No new revisions were added by this update.

Summary of changes:
 default.mk|  11 +++
 docs/Makefile |   2 +-
 lisp/Makefile |  45 +++--
 lisp/git-commit-pkg.el|   1 +
 lisp/git-commit.el|  38 +---
 lisp/git-rebase.el|  35 +++
 lisp/magit-apply.el   |  71 +++---
 lisp/magit-autorevert.el  |  21 ++--
 lisp/magit-base.el|  49 +-
 lisp/magit-bisect.el  |  23 ++---
 lisp/magit-blame.el   |  23 ++---
 lisp/magit-bookmark.el|  34 +++
 lisp/magit-branch.el  |  35 +++
 lisp/magit-bundle.el  |  15 ++-
 lisp/magit-clone.el   |  21 ++--
 lisp/magit-commit.el  |  46 +
 lisp/magit-core.el|  15 ++-
 lisp/magit-diff.el| 219 +-
 lisp/magit-ediff.el   |  31 +++---
 lisp/magit-extras.el  | 160 +++---
 lisp/magit-fetch.el   |  15 ++-
 lisp/magit-files.el   |  15 ++-
 lisp/magit-git.el | 217 +
 lisp/magit-gitignore.el   |  17 ++--
 lisp/magit-libgit-pkg.el  |   1 +
 lisp/magit-libgit.el  |  43 +
 lisp/magit-log.el | 103 ++--
 lisp/magit-margin.el  |  35 +++
 lisp/magit-merge.el   |  21 ++--
 lisp/magit-mode.el|  75 +++
 lisp/magit-notes.el   |  41 
 lisp/magit-obsolete.el|  15 ++-
 lisp/magit-patch.el   |  21 ++--
 lisp/magit-pkg.el |   1 +
 lisp/magit-process.el |  55 +--
 lisp/magit-pull.el|  17 ++--
 lisp/magit-push.el|  37 ---
 lisp/magit-reflog.el  |  15 ++-
 lisp/magit-refs.el|  23 ++---
 lisp/magit-remote.el  |  23 ++---
 lisp/magit-repos.el   |  35 +++
 lisp/magit-reset.el   |  15 ++-
 lisp/magit-section-pkg.el |   1 +
 lisp/magit-section.el | 108 ++---
 lisp/magit-sequence.el|  49 +-
 lisp/magit-sparse-checkout.el |  15 ++-
 lisp/magit-stash.el   |  19 ++--
 lisp/magit-status.el  |  27 +++---
 lisp/magit-submodule.el   |  15 ++-
 lisp/magit-subtree.el |  15 ++-
 lisp/magit-tag.el |  15 ++-
 lisp/magit-transient.el   |  17 ++--
 lisp/magit-wip.el |  19 ++--
 lisp/magit-worktree.el|  17 ++--
 lisp/magit.el |  68 +++--
 test/magit-tests.el   |  19 +++-
 56 files changed, 1017 insertions(+), 1122 deletions(-)

[nongnu] elpa/orgit updated (bc4168ecd2 -> 79ed3337ab)

[ELPA Syncer]

elpasync pushed a change to branch elpa/orgit.

  from  bc4168ecd2 Use function-quote when appropriate
   new  a479c8f31a Use pcase's quote upattern
   new  26870d23be Depend on compat package from GNU Elpa
   new  8ba66a5779 Use and-let* for side-effects
   new  b2ee9f3d6f Use length=
   new  878d79fa8d Refresh library header
   new  e18d3bb059 make: Improve creation of autoloads file
   new  79ed3337ab Put eval-when-compile and require on one line


Summary of changes:
 Makefile | 43 +++
 orgit.el | 50 ++
 2 files changed, 41 insertions(+), 52 deletions(-)

[nongnu] elpa/orgit 8ba66a5779 3/7: Use and-let* for side-effects

[ELPA Syncer]

branch: elpa/orgit
commit 8ba66a5779b5a55d29b6a568d2d1e54b928cbb21
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use and-let* for side-effects
---
 orgit.el | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/orgit.el b/orgit.el
index b555c3db37..7af35b0195 100644
--- a/orgit.el
+++ b/orgit.el
@@ -373,7 +373,8 @@ store links to the Magit-Revision mode buffers for these 
commits."
   (cond ((eq major-mode 'magit-revision-mode)
  (orgit-rev-store-1 magit-buffer-revision))
 ((derived-mode-p 'magit-mode)
- (when-let ((revs (magit-region-values 'commit)))
+ (when-let* ((revs (magit-region-values 'commit)))
+   ;; Cannot use and-let* because of debbugs#31840.
(mapc #'orgit-rev-store-1 revs)
t
 
@@ -426,9 +427,9 @@ store links to the Magit-Revision mode buffers for these 
commits."
   ((member orgit-remote remotes) orgit-remote
   (if remote
   (if-let ((link
-(or (when-let ((url (magit-get "orgit" gitvar)))
+(or (and-let* ((url (magit-get "orgit" gitvar)))
   (format-spec url `((?r . ,rev
-(when-let ((url (magit-get "remote" remote "url"))
+(and-let* ((url (magit-get "remote" remote "url"))
(format (cl-find-if
 (lambda (elt)
   (string-match (car elt) url))

[nongnu] elpa/orgit b2ee9f3d6f 4/7: Use length=

[ELPA Syncer]

branch: elpa/orgit
commit b2ee9f3d6f72035c720509dc1544bcd1cfc77e99
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use length=
---
 orgit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orgit.el b/orgit.el
index 7af35b0195..3e4075dba8 100644
--- a/orgit.el
+++ b/orgit.el
@@ -422,7 +422,7 @@ store links to the Magit-Revision mode buffers for these 
commits."
 (let* ((default-directory dir)
(remotes (magit-git-lines "remote"))
(remote  (magit-get "orgit.remote"))
-   (remote  (cond ((= (length remotes) 1) (car remotes))
+   (remote  (cond ((length= remotes 1) (car remotes))
   ((member remote remotes) remote)
   ((member orgit-remote remotes) orgit-remote
   (if remote

[nongnu] elpa/orgit e18d3bb059 6/7: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/orgit
commit e18d3bb0592ee767255c167d03ea23723cf6e143
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Improve creation of autoloads file
---
 Makefile | 40 +---
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 00cb06fc4d..7a4932797d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,33 +37,19 @@ loaddefs: $(PKG)-autoloads.el
 CLEAN  = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-   @printf "Cleaning...\n"
+   @printf " Cleaning...\n"
@rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
-   @printf "Generating $@\n"
-   @printf "%s" "$$LOADDEFS_TMPL" > $@
-   @$(EMACS) -Q --batch --eval "(progn\
-   (setq make-backup-files nil)\
-   (setq vc-handled-backends nil)\
-   (setq default-directory (file-truename default-directory))\
-   (setq generated-autoload-file (expand-file-name \"$@\"))\
-   (setq find-file-visit-truename t)\
-   (update-directory-autoloads default-directory))"
+   @printf " Creating $@\n"
+   @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+  (autoload-timestamps nil) \
+  (backup-inhibited t)\
+  (version-control 'never)\
+  (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+((symbol-function 'progress-reporter-done) (lambda (_\
+(let ((generated-autoload-file file))\
+  (update-directory-autoloads default-directory"

[nongnu] elpa/orgit 79ed3337ab 7/7: Put eval-when-compile and require on one line

[ELPA Syncer]

branch: elpa/orgit
commit 79ed3337ab0ca3d5018732dcdabfbf700c4822d9
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Put eval-when-compile and require on one line

I like that when grepping for such usage.
---
 orgit.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/orgit.el b/orgit.el
index 3df3083bfd..69ef31570f 100644
--- a/orgit.el
+++ b/orgit.el
@@ -100,8 +100,7 @@
 (unless (fboundp 'org-link-store-props)
   (defalias 'org-link-store-props 'org-store-link-props))
 
-(eval-when-compile
-  (require 'subr-x))
+(eval-when-compile (require 'subr-x))
 
 ;;; Options
 

[nongnu] elpa/orgit a479c8f31a 1/7: Use pcase's quote upattern

[ELPA Syncer]

branch: elpa/orgit
commit a479c8f31a3f465f9ba791e506aae00795423f61
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use pcase's quote upattern
---
 orgit.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orgit.el b/orgit.el
index 921274162a..a23a8c39f8 100644
--- a/orgit.el
+++ b/orgit.el
@@ -448,9 +448,9 @@ store links to the Magit-Revision mode buffers for these 
commits."
 
 (defun orgit--format-export (link desc format)
   (pcase format
-(`html  (format "%s" link desc))
-(`latex (format "\\href{%s}{%s}" link desc))
-(`ascii link)
+('html  (format "%s" link desc))
+('latex (format "\\href{%s}{%s}" link desc))
+('ascii link)
 (_  link)))
 
 ;;; Utilities

[nongnu] elpa/orgit 26870d23be 2/7: Depend on compat package from GNU Elpa

[ELPA Syncer]

branch: elpa/orgit
commit 26870d23be559bf2509d4497a205366296c88cbb
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Depend on compat package from GNU Elpa
---
 Makefile | 3 ++-
 orgit.el | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7859e69ac1..00cb06fc4d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ PKG = orgit
 ELS   = $(PKG).el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  = dash
+DEPS  = compat
+DEPS += dash
 DEPS += magit/lisp
 DEPS += org/lisp
 DEPS += transient/lisp
diff --git a/orgit.el b/orgit.el
index a23a8c39f8..b555c3db37 100644
--- a/orgit.el
+++ b/orgit.el
@@ -5,7 +5,7 @@
 ;; Author: Jonas Bernoulli 
 ;; Maintainer: Jonas Bernoulli 
 
-;; Package-Requires: ((emacs "25.1") (magit "3.0") (org "9.4"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0") (magit "3.0") (org 
"9.4"))
 ;; Package-Version: 1.8.0-git
 ;; Homepage: https://github.com/magit/orgit
 ;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -91,6 +91,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'compat)
 (require 'format-spec)
 (require 'magit)
 (require 'org)

[nongnu] elpa/orgit 878d79fa8d 5/7: Refresh library header

[ELPA Syncer]

branch: elpa/orgit
commit 878d79fa8db4d83d981a74f079d747b4a16e25c2
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Refresh library header
---
 orgit.el | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/orgit.el b/orgit.el
index 3e4075dba8..3df3083bfd 100644
--- a/orgit.el
+++ b/orgit.el
@@ -1,31 +1,32 @@
-;;; orgit.el --- support for Org links to Magit buffers  -*- lexical-binding: 
t; -*-
+;;; orgit.el --- Support for Org links to Magit buffers  -*- lexical-binding:t 
-*-
 
-;; Copyright (C) 2014-2022  The Magit Project Contributors
+;; Copyright (C) 2014-2022 The Magit Project Contributors
 
 ;; Author: Jonas Bernoulli 
-;; Maintainer: Jonas Bernoulli 
+;; Homepage: https://github.com/magit/orgit
+;; Keywords: hypermedia vc
 
-;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0") (magit "3.0") (org 
"9.4"))
 ;; Package-Version: 1.8.0-git
-;; Homepage: https://github.com/magit/orgit
+;; Package-Requires: (
+;; (emacs "25.1")
+;; (compat "28.1.1.0")
+;; (magit "3.0")
+;; (org "9.4"))
+
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This library is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
 ;;
-;; This library is distributed in the hope that it will be useful,
+;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this library.  If not, see http://www.gnu.org/licenses.
-
-;; This library was inspired by `org-magit.el' which was written by
-;; Yann Hodique  and is distributed under the
-;; GNU General Public License version 2 or later.
+;; along with this file.  If not, see .
 
 ;;; Commentary:
 

[nongnu] elpa/with-editor 8c7672c04b 1/7: Use string-suffix-p instead of string-match-p

[ELPA Syncer]

branch: elpa/with-editor
commit 8c7672c04bb606f01a41b558a922dee1127568cc
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-suffix-p instead of string-match-p
---
 lisp/with-editor.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 83204f6066..9d0e5297eb 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -651,7 +651,7 @@ may not insert the text into the PROCESS's buffer.  Then it 
calls
 (setq string (concat incomplete string)))
   (save-match-data
 (cond
- ((and process (not (string-match-p "\n\\'" string)))
+ ((and process (not (string-suffix-p "\n" string)))
   (let ((length (length string)))
 (when (> length with-editor--max-incomplete-length)
   (setq string
@@ -860,7 +860,7 @@ else like the former."
   ;; running, so it has to be remove here.
   (let ((shell-mode-hook (remove 'with-editor-export-editor shell-mode-hook)))
 (cond ((or (not (or with-editor--envvar shell-command-with-editor-mode))
-   (not (string-match-p "&\\'" command)))
+   (not (string-suffix-p "&" command)))
(funcall fn command output-buffer error-buffer))
   ((and with-editor-shell-command-use-emacsclient
 with-editor-emacsclient-executable

[nongnu] elpa/with-editor cb47cdb6ff 4/7: Use string-search instead of string-match-p

[ELPA Syncer]

branch: elpa/with-editor
commit cb47cdb6ff4f29cfcc2c2215a4472c315f3124a5
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use string-search instead of string-match-p
---
 lisp/with-editor.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 6857dd744c..b7ed9c4f29 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -165,7 +165,7 @@ please see 
https://github.com/magit/magit/wiki/Emacsclient.";
 (let ((dir (expand-file-name "bin" invocation-directory)))
   (when (file-directory-p dir)
 (push dir path)))
-(when (string-match-p "Cellar" invocation-directory)
+(when (string-search "Cellar" invocation-directory)
   (let ((dir (expand-file-name "../../../bin" invocation-directory)))
 (when (file-directory-p dir)
   (push dir path))

[nongnu] elpa/with-editor 1d3f4fec94 5/7: Refresh library header

[ELPA Syncer]

branch: elpa/with-editor
commit 1d3f4fec941f9aa1c485cd87d6579d256b6a68c5
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Refresh library header
---
 lisp/with-editor.el | 24 +---
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index b7ed9c4f29..716c47475d 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -1,24 +1,20 @@
-;;; with-editor.el --- Use the Emacsclient as $EDITOR -*- lexical-binding: t 
-*-
+;;; with-editor.el --- Use the Emacsclient as $EDITOR  -*- lexical-binding:t 
-*-
 
-;; Copyright (C) 2014-2022  The Magit Project Contributors
-;;
-;; You should have received a copy of the AUTHORS.md file.  If not,
-;; see https://github.com/magit/with-editor/blob/master/AUTHORS.md.
+;; Copyright (C) 2014-2022 The Magit Project Contributors
 
 ;; Author: Jonas Bernoulli 
-;; Maintainer: Jonas Bernoulli 
-;; Keywords: tools
 ;; Homepage: https://github.com/magit/with-editor
+;; Keywords: processes terminals
 
-;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0"))
 ;; Package-Version: 3.2.0-git
+;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; This file is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published
+;; by the Free Software Foundation, either version 3 of the License,
+;; or (at your option) any later version.
 ;;
 ;; This file is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,9 +22,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with Magit.  If not, see http://www.gnu.org/licenses.
-
-;; This file is not part of GNU Emacs.
+;; along with this file.  If not, see .
 
 ;;; Commentary:
 

[nongnu] elpa/with-editor 54d1e816ac 7/7: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/with-editor
commit 54d1e816ac0f3203f0065ea9e6a551b9d103dad4
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Improve creation of autoloads file
---
 lisp/Makefile | 36 +++-
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/lisp/Makefile b/lisp/Makefile
index 8166fbe663..c2cbd78241 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -15,30 +15,16 @@ clean:
@printf " Cleaning lisp/*...\n"
@rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
@printf " Creating $@\n"
-   @printf "%s" "$$LOADDEFS_TMPL" > $@
-   @$(EMACS) -Q --batch --eval "(progn\
-   (setq make-backup-files nil)\
-   (setq vc-handled-backends nil)\
-   (setq default-directory (file-truename default-directory))\
-   (setq generated-autoload-file (expand-file-name \"$@\"))\
-   (setq find-file-visit-truename t)\
-   (update-directory-autoloads default-directory))"
+   @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+  (autoload-timestamps nil) \
+  (backup-inhibited t)\
+  (version-control 'never)\
+  (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+((symbol-function 'progress-reporter-done) (lambda (_\
+(let ((generated-autoload-file file))\
+  (update-directory-autoloads default-directory"

[nongnu] elpa/with-editor db85a58945 3/7: Depend on compat package

[ELPA Syncer]

branch: elpa/with-editor
commit db85a589458eb9745d10280b465c347c1cead8b9
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Depend on compat package
---
 default.mk  | 3 ++-
 lisp/with-editor.el | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/default.mk b/default.mk
index 906b08dbac..ded66c899b 100644
--- a/default.mk
+++ b/default.mk
@@ -5,7 +5,8 @@ PKG = with-editor
 ELS   = $(PKG).el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  = dash
+DEPS  = compat
+DEPS += dash
 
 DOMAIN  ?= magit.vc
 CFRONT_DIST ?= E2LUHBKU1FBV02
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 63e0e3ca89..6857dd744c 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -10,7 +10,7 @@
 ;; Keywords: tools
 ;; Homepage: https://github.com/magit/with-editor
 
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0"))
 ;; Package-Version: 3.2.0-git
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -84,6 +84,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'compat)
 (require 'server)
 (require 'shell)
 (eval-when-compile (require 'subr-x))

[nongnu] elpa/with-editor updated (3d1af157b4 -> 54d1e816ac)

[ELPA Syncer]

elpasync pushed a change to branch elpa/with-editor.

  from  3d1af157b4 with-editor-sleeping-editor-filter: Store window 
configuration
   new  8c7672c04b Use string-suffix-p instead of string-match-p
   new  78136c418a Drop support for Emacs 24
   new  db85a58945 Depend on compat package
   new  cb47cdb6ff Use string-search instead of string-match-p
   new  1d3f4fec94 Refresh library header
   new  4666ad9e87 make: Right-align target verbs
   new  54d1e816ac make: Improve creation of autoloads file


Summary of changes:
 default.mk  |  3 ++-
 docs/Makefile   |  2 +-
 lisp/Makefile   | 40 +---
 lisp/with-editor.el | 35 ++-
 4 files changed, 30 insertions(+), 50 deletions(-)

[nongnu] elpa/with-editor 78136c418a 2/7: Drop support for Emacs 24

[ELPA Syncer]

branch: elpa/with-editor
commit 78136c418a13697b22e17a8e875c8a1b472b6ae4
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Drop support for Emacs 24

Please update to Emacs 25 or 26 or 27 or 28.
---
 lisp/with-editor.el | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 9d0e5297eb..63e0e3ca89 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -10,7 +10,7 @@
 ;; Keywords: tools
 ;; Homepage: https://github.com/magit/with-editor
 
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "25.1"))
 ;; Package-Version: 3.2.0-git
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -84,11 +84,9 @@
 ;;; Code:
 
 (require 'cl-lib)
-(eval-when-compile
-  (require 'pcase) ; `pcase-dolist' is not autoloaded on Emacs 24.
-  (require 'subr-x))
 (require 'server)
 (require 'shell)
+(eval-when-compile (require 'subr-x))
 
 (eval-when-compile
   (progn (require 'dired nil t)

[nongnu] elpa/with-editor 4666ad9e87 6/7: make: Right-align target verbs

[ELPA Syncer]

branch: elpa/with-editor
commit 4666ad9e87c5a93eeff4b06630d018ff620db45d
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Right-align target verbs
---
 docs/Makefile | 2 +-
 lisp/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index c0b03ded5f..254813d204 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -97,5 +97,5 @@ stats-upload:
 CLEAN = $(PKG).info dir $(PKG) $(PKG).html $(PKG).pdf
 
 clean:
-   @printf "Cleaning docs/*...\n"
+   @printf " Cleaning docs/*...\n"
@rm -rf $(CLEAN)
diff --git a/lisp/Makefile b/lisp/Makefile
index ba0c4c1992..8166fbe663 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -12,7 +12,7 @@ loaddefs: $(PKG)-autoloads.el
 CLEAN = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-   @printf "Cleaning lisp/*...\n"
+   @printf " Cleaning lisp/*...\n"
@rm -rf $(CLEAN)
 
 define LOADDEFS_TMPL
@@ -33,7 +33,7 @@ export LOADDEFS_TMPL
 #'
 
 $(PKG)-autoloads.el: $(ELS)
-   @printf "Generating $@\n"
+   @printf " Creating $@\n"
@printf "%s" "$$LOADDEFS_TMPL" > $@
@$(EMACS) -Q --batch --eval "(progn\
(setq make-backup-files nil)\

[elpa] externals/pyim b6eb72c849: pyim-autoselector 依赖 pyim-process.

[ELPA Syncer]

branch: externals/pyim
commit b6eb72c8493b45a376203e29b012e77162283f3c
Author: Feng Shu 
Commit: Feng Shu 

pyim-autoselector 依赖 pyim-process.

* pyim-liberime.el (pyim-process-autoselector): Use.
(pyim-autoselector): Removed.

* pyim.el (pyim-autoselector): Required.

* pyim-process.el (pyim-process-autoselector): New custom.
(pyim-autoselector): Alias to pyim-process-autoselector.

* pyim-autoselector.el (pyim-entered, pyim-candidates): Do not 
require.
(pyim-process): Require.
(pyim-autoselector): Removed.
(pyim-autoselector-xingma): Prefer functions in pyim-process.

* Development.org (整体架构): 调整自动上屏器的位置。
---
 Development.org  |  8 
 pyim-autoselector.el | 35 +++
 pyim-liberime.el |  2 +-
 pyim-process.el  | 29 +++--
 pyim.el  |  1 +
 5 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/Development.org b/Development.org
index 3819afcf4c..70fc29976f 100644
--- a/Development.org
+++ b/Development.org
@@ -16,9 +16,9 @@
 | | Dict 管理命令，标点用户命令，Pymap 管理命令   Indicator | |
 | |
 | |
 | | +-+
 | |
-| | | PYIM 用例层： Process   |
 | |
-| | | |
 | |
-| | |  +---+  |
 | |
+| | 自动上屏器: | PYIM 用例层： Process   | 
| |
+| | --  | |
 | |
+| | Autoselector|  +---+  |
 | |
 | | |  | PYIM 实体层： |  |
 | |
 | | |  | ---   |  |
 | |
 | | |  | Entered, Imobjs, Codes,   |  |
 | |
@@ -31,7 +31,7 @@
 | | |  |   |  |
 | |
 | | |  +---+  |
 | |
 | | | |
 | |
-| | | 自动上屏器： Autoselector   |  
   | |
+| | | |
 | |
 | | +-+
 | |
 | |
 | |
 | |  PYIM 持久化层:   探针：  
  | |
diff --git a/pyim-autoselector.el b/pyim-autoselector.el
index b082abd9ec..973d6b3a6f 100644
--- a/pyim-autoselector.el
+++ b/pyim-autoselector.el
@@ -29,35 +29,12 @@
 ;; * 代码   :code:
 (require 'cl-lib)
 (require 'pyim-scheme)
-(require 'pyim-entered)
-(require 'pyim-candidates)
+(require 'pyim-process)
 
 (defgroup pyim-autoselector nil
   "Autoselector for pyim."
   :group 'pyim)
 
-(defcustom pyim-autoselector '(pyim-autoselector-xingma)
-  "已经启用的自动上屏器.
-
-自动上屏器是一个函数。假设用户已经输入 \"nihao\", 并按下 \"m\" 键，
-那么当前entered 就是 \"nihaom\". 上次 entered 是 \"nihao\". 那么
-返回值有3种情况（优先级按照下面的顺序）：
-
-1. (:select last :replace-with \"xxx\") 自动上屏上次
-entered (nihao) 的第一个候选词，m 键下一轮处理。
-
-2. (:select current :replace-with \"xxx\") 自动上屏当前
-entered (nihaom) 的第一个候选词。
-
-3. nil  不自动上屏。
-
-如果 :replace-with 设置为一个字符串，则选择最终会被这个字符串替代。
-
-注意：多个 autoselector 函数运行时，最好不要相互影响，如果相互有
-影响，需要用户自己管理。"
-  :type '(choice (const nil)
- (repeat function)))
-
 (defun pyim-autoselector-xingma (&rest _args)
   "适用于型码输入法的自动上屏器.
 
@@ -66,18 +43,20 @@ entered (nihaom) 的第一个候选词。
   (let* ((scheme-name (pyim-scheme-name))
  (class (pyim-scheme-get-option scheme-name :class))
  (n (pyim-scheme-get-option scheme-name :code-split-length))
- (entered (pyim-entered-get 'point-before)))
+ (entered (pyim-process-get-entered 'point-before))
+ (candidates (pyim-process-get-candidates))
+ (last-candidates (pyim-process-get-last-candidates)))
 (when (eq class 'xingma)
   (cond
((and (= (length entered) n)
- (= (length pyim-candidates) 1)
+ (= (length candidates) 1)
  ;; 如果没有候选词，pyim 默认将用户输入当做候选词，这时不能自动上屏，
  ;; 因为这种情况往往是用户输入有误，自动上屏之后，调整输入就变得麻烦了。
- (not (equal entered (car pyim-candidates
+ (not (equal entered (car ca

[elpa] externals/embark 958d158f00: DWIM behavior for consult-async commands (fix #252)

[ELPA Syncer]

branch: externals/embark
commit 958d158f00919e17fcaedc08a811f4ee9cf0a059
Author: Omar Antolín 
Commit: Omar Antolín 

DWIM behavior for consult-async commands (fix #252)

Now when the consult-async search commands like consult-grep are used
as actions the behavior now depends on the type of the target: for
files, buffers, bookmarks and libraries, the search starts in the
directory associated to the target with no initial search term; for
any other type of target the initial serch term will be the text of
the target.
---
 embark-consult.el | 27 +--
 embark.el | 25 +++--
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/embark-consult.el b/embark-consult.el
index 5a92032cf9..d4de0e0992 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -288,26 +288,33 @@ This is intended to be used in 
`embark-target-injection-hooks'."
   (cl-pushnew #'embark-consult--unique-match
   (alist-get cmd embark-target-injection-hooks)))
 
-(defun embark-consult--add-async-separator (&rest _)
-  "Add Consult's async separator at the beginning.
-This is intended to be used in `embark-target-injection-hooks' for any action
-that is a Consult async command."
+(cl-defun embark-consult--prep-async (&key type target &allow-other-keys)
+  "Either add Consult's async separator or ignore the TARGET depending on TYPE.
+If the TARGET of the given TYPE has an associated notion of
+directory, we don't want to search for the text of target, but
+rather just start a search in the associated directory.
+
+This is intended to be used in `embark-target-injection-hooks'
+for any action that is a Consult async command."
   (let* ((style (alist-get consult-async-split-style
consult-async-split-styles-alist))
  (initial (plist-get style :initial))
- (separator (plist-get style :separator)))
-(cond
- (initial
+ (separator (plist-get style :separator))
+ (directory (embark--associated-directory target type)))
+(when directory
+  (delete-minibuffer-contents))
+(when initial
   (goto-char (minibuffer-prompt-end))
   (insert initial)
   (goto-char (point-max)))
- (separator
+(when (and separator (null directory))
   (goto-char (point-max))
-  (insert separator)
+  (insert separator
 
 (map-keymap
  (lambda (_key cmd)
-   (cl-pushnew #'embark-consult--add-async-separator
+   (cl-pushnew #'embark--cd (alist-get cmd embark-pre-action-hooks))
+   (cl-pushnew #'embark-consult--prep-async
(alist-get cmd embark-target-injection-hooks)))
  embark-consult-async-search-map)
 
diff --git a/embark.el b/embark.el
index 1d6bf419f4..4cc4f55222 100644
--- a/embark.el
+++ b/embark.el
@@ -3673,22 +3673,27 @@ The advice is self-removing so it only affects ACTION 
once."
   (unless (y-or-n-p (format "Run %s on %s? " action target))
 (user-error "Cancelled")))
 
+(defun embark--associated-directory (target type)
+  "Return directory associated to TARGET of given TYPE.
+The supported values of TYPE are file, buffer, bookmark and
+library, which have an obvious notion of associated directory."
+  (pcase type
+('file
+ (file-name-directory target))
+('buffer
+ (buffer-local-value 'default-directory (get-buffer target)))
+('bookmark
+ (file-name-directory (bookmark-location target)))
+('library
+ (file-name-directory (locate-library target)
+
 (autoload 'bookmark-location "bookmark")
 (cl-defun embark--cd (&key action target type &allow-other-keys)
   "Run ACTION with `default-directory' set to the directory of TARGET.
 The supported values of TYPE are file, buffer, bookmark and
 library, which have an obvious notion of associated directory."
   (when-let (((symbolp action))
- (directory
-  (pcase type
-('file
- (file-name-directory target))
-('buffer
- (buffer-local-value 'default-directory (get-buffer target)))
-('bookmark
- (file-name-directory (bookmark-location target)))
-('library
- (file-name-directory (locate-library target))
+ (directory (embark--associated-directory target type)))
 (cl-labels ((in-directory (fn &rest args)
   (advice-remove action #'in-directory)
   (let ((default-directory directory))

[elpa] externals/embark-consult updated (c7b6a00bb8 -> 958d158f00)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  c7b6a00bb8 Remove outdated docstring reference to 
embark-collect-completions
  adds  958d158f00 DWIM behavior for consult-async commands (fix #252)

No new revisions were added by this update.

Summary of changes:
 embark-consult.el | 27 +--
 embark.el | 25 +++--
 2 files changed, 32 insertions(+), 20 deletions(-)

[elpa] externals/consult a96ec24784: consult-xref: Use completion category `consult-xref' (Fix #557)

[ELPA Syncer]

branch: externals/consult
commit a96ec24784291153cff731deb4024dd3d3bd9967
Author: Daniel Mendler 
Commit: Daniel Mendler 

consult-xref: Use completion category `consult-xref' (Fix #557)

The xref marker is attached to the `consult-xref' text property.
---
 consult-xref.el | 8 
 consult.el  | 8 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/consult-xref.el b/consult-xref.el
index 223e8283c5..263d6d6ad5 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -45,7 +45,7 @@
 (or (xref-location-line loc) 0)
 (xref-item-summary xref
 (add-text-properties
- 0 1 `(consult--candidate ,xref consult-xref--group ,group) 
cand)
+ 0 1 `(consult-xref ,xref consult-xref--group ,group) cand)
 cand))
 xrefs)))
 
@@ -102,7 +102,7 @@ FETCHER and ALIST arguments."
 :history 'consult-xref--history
 :require-match t
 :sort nil
-:category 'xref-location
+:category 'consult-xref
 :group #'consult-xref--group
 :state
 ;; do not preview other frame
@@ -111,8 +111,8 @@ FETCHER and ALIST arguments."
  ('window #'switch-to-buffer-other-window)
  ('nil #'switch-to-buffer)))
   (consult-xref--preview fun))
-:lookup #'consult--lookup-candidate)))
-   (get-text-property 0 'consult--candidate (car candidates)))
+:lookup (apply-partially #'consult--lookup-prop 'consult-xref
+   (get-text-property 0 'consult-xref (car candidates)))
  display)))
 
 (provide 'consult-xref)
diff --git a/consult.el b/consult.el
index 2f8faecffc..fb1d961f90 100644
--- a/consult.el
+++ b/consult.el
@@ -971,10 +971,14 @@ Return the location marker."
   (when-let (found (member selected candidates))
 (car (consult--get-location (car found)
 
+(defun consult--lookup-prop (prop selected candidates &rest _)
+  "Lookup SELECTED in CANDIDATES list and return PROP value."
+  (when-let (found (member selected candidates))
+(get-text-property 0 prop (car found
+
 (defun consult--lookup-candidate (selected candidates &rest _)
   "Lookup SELECTED in CANDIDATES list and return property 
`consult--candidate'."
-  (when-let (found (member selected candidates))
-(get-text-property 0 'consult--candidate (car found
+  (consult--lookup-prop 'consult--candidate selected candidates))
 
 (defun consult--forbid-minibuffer ()
   "Raise an error if executed from the minibuffer."

[elpa] externals/embark 9bf01e1c1d: Rewrite the documentation related to Marginalia and Consult

[ELPA Syncer]

branch: externals/embark
commit 9bf01e1c1d554150a7e0ec07f0dc6892295a51dd
Author: Omar Antolín 
Commit: Omar Antolín 

Rewrite the documentation related to Marginalia and Consult
---
 README.org  |  90 --
 embark.texi | 107 +++-
 2 files changed, 163 insertions(+), 34 deletions(-)

diff --git a/README.org b/README.org
index 84c4fbdf84..d3857380ee 100644
--- a/README.org
+++ b/README.org
@@ -884,8 +884,15 @@ included in the list =embark-indicators=).
 * Embark, Marginalia and Consult
 
 Embark cooperates well with the 
[[https://github.com/minad/marginalia][Marginalia]] and 
[[https://github.com/minad/consult][Consult]] packages.
-Neither of those packages is a dependency of Embark, but Marginalia is
-highly recommended, for reasons explained in the rest of this section.
+Neither of those packages is a dependency of Embark, but both are
+highly recommended companions to Embark, for opposite reasons:
+Marginalia greatly enhances Embark's usefulness, while Embark can help
+enhance Consult.
+
+In the remainder of this section I'll explain what exactly Marginalia
+does for Embark, and what Embark can do for Consult.
+
+** Marginalia
 
 Embark comes with actions for symbols (commands, functions, variables
 with actions such as finding the definition, looking up the
@@ -905,28 +912,75 @@ augments many Emacs command to report accurate category 
metadata.
 Simply activating =marginalia-mode= allows Embark to offer you the
 package and symbol actions when appropriate again. Candidate
 annotations in the Embark collect buffer are also provided by the
-Marginalia package.
+Marginalia package:
 
-- If you install Marginalia and activate =marginalia-mode=, the list
-  view in Embark Collect buffers will use the Marginalia annotations
-  automatically.
+- If you install Marginalia and activate =marginalia-mode=, Embark
+  Collect buffers will use the Marginalia annotations automatically.
 
 - If you don't install Marginalia, you will see only the annotations
   that come with Emacs (such as key bindings in =M-x=, or the unicode
   characters in =C-x 8 RET=).
 
-- If you have Consult installed and call =embark-collect= from
-  =consult-line=, =consult-mark= or =consult-outline=, you will notice the
-  Embark Collect buffer starts in list view by default. Similarly,
-  you'll notice that the =consult-yank= family of commands start out in
-  list view with zebra stripes, so you can easily tell where
-  multi-line kill-ring entries start and end.
-
-- The function =embark-open-externally= has been removed following the
-  policy of avoiding overlap with Consult. If you used that action,
-  add 
[[https://github.com/minad/consult/blob/373498acb76b9395e5e590fb8e39f671a9363cd7/consult.el#L707][the
 small function]] to your configuration or install Consult and
-  use =consult-file-externally=.
-
+** Consult
+
+The excellent Consult package provides many commands that use
+minibuffer completion, via the =completing-read= function; plenty of its
+commands can be considered enhanced versions of built-in Emacs
+commands, and some are completely new functionality. One common
+enhancement provided in all commands for which it makes sense is
+preview functionality, for example =consult-buffer= will show you a
+quick preview of a buffer before you actually switch to it.
+
+If you use both Consult and Embark you should absolutely install the
+=embark-consult= package which provides integration between the two. It
+provides exporters for several Consult commands and also tweaks the
+behavior of many Consult commands when used as actions with =embark-act=
+in subtle ways that you may not even notice, but make for a smoother
+experience.
+
+The =embark-consult= package provides the following exporters:
+
+- You can use =embark-export= from =consult-line=, =consult-outline=, or
+  =consult-mark= to obtain an =occur-mode= buffer. As with the built-in
+  =occur= command you use that buffer to jump to a match and after that,
+  you can then use =next-error= and =previous-error= to navigate to other
+  matches. You can also press =e= to activate =occur-edit-mode= and edit
+  the matches in place!
+
+- You can export from any of the Consult asynchronous search commands,
+  =consult-grep=, =consult-git-grep=, or =consult-ripgrep= to get a
+  =grep-mode= buffer. Here too you can use =next-error= and =previous-error=
+  to navigate among matches, and, if you install the 
[[http://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep.el ][wgrep]] 
package,
+  you can use it to edit the matches in place.
+
+In both cases, pressing =g= to revert the exported buffer will rerun the
+Consult command you had exported from and re-enter the input you had
+typed. You can then proceed to re-export if that's what you want, but
+you can also edit the input changing the search terms or simply cancel
+if you see you are done with that search.
+
+Besides those 

[elpa] externals/embark-consult updated (958d158f00 -> 9bf01e1c1d)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  958d158f00 DWIM behavior for consult-async commands (fix #252)
  adds  9bf01e1c1d Rewrite the documentation related to Marginalia and 
Consult

No new revisions were added by this update.

Summary of changes:
 README.org  |  90 --
 embark.texi | 107 +++-
 2 files changed, 163 insertions(+), 34 deletions(-)

[elpa] externals/marginalia f97b6f398b: Use ignore

[ELPA Syncer]

branch: externals/marginalia
commit f97b6f398b6b08576bc919835e1ab4872a8d5de4
Author: Daniel Mendler 
Commit: Daniel Mendler 

Use ignore
---
 marginalia.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marginalia.el b/marginalia.el
index 31da2c43b7..2187aea2fc 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -394,7 +394,7 @@ FACE is the name of the face, with which the field should 
be propertized."
 (defun marginalia--annotator (cat)
   "Return annotation function for category CAT."
   (pcase (car (alist-get cat marginalia-annotator-registry))
-('none (lambda (_) nil))
+('none #'ignore)
 ('builtin nil)
 (fun fun)))
 

[elpa] externals/embark 29e227f7ec 2/2: Use selected-window in xref exporter

[ELPA Syncer]

branch: externals/embark
commit 29e227f7ec4cdf9fdab8b5723f4db236c81c2eb7
Author: Omar Antolín 
Commit: Omar Antolín 

Use selected-window in xref exporter

It's too late for embark--target-window by the time this runs, but the
selected window should now again be the one the xref-producing command
was run from.
---
 embark-consult.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark-consult.el b/embark-consult.el
index 02fdfccd90..2187451583 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -224,7 +224,7 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
 (set-buffer
  (xref--show-xref-buffer
   (lambda () xref-items)
-  `((window . ,(embark--target-window))
+  `((window . ,(selected-window))
 (auto-jump . ,xref-auto-jump-to-first-xref)
 (display-action))
 

[elpa] externals/embark updated (9bf01e1c1d -> 29e227f7ec)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark.

  from  9bf01e1c1d Rewrite the documentation related to Marginalia and 
Consult
   new  fc3b1650d2 Exporter for consult-xref
   new  29e227f7ec Use selected-window in xref exporter


Summary of changes:
 embark-consult.el | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

[elpa] externals/embark fc3b1650d2 1/2: Exporter for consult-xref

[ELPA Syncer]

branch: externals/embark
commit fc3b1650d2b6b99cd8cc5cfbe774c5e3201b6bab
Author: Omar Antolín 
Commit: Omar Antolín 

Exporter for consult-xref

Initial implementation of an exporter for consult-xref, see 
minad/consult#557.
---
 embark-consult.el | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/embark-consult.el b/embark-consult.el
index d4de0e0992..02fdfccd90 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -171,8 +171,8 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
 (defvar wgrep-header/footer-parser)
 (declare-function wgrep-setup "ext:wgrep")
 
-(embark-define-keymap embark-consult-export-grep-map
-  "A keymap for Embark Export grep-mode buffers."
+(embark-define-keymap embark-consult-revert-map
+  "A keymap with a binding for revert-buffer."
   :parent nil
   ("g" revert-buffer))
 
@@ -187,7 +187,7 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
   ;; Set up keymap before possible wgrep-setup, so that wgrep
   ;; restores our binding too when the user finishes editing.
   (use-local-map (make-composed-keymap
-  embark-consult-export-grep-map
+  embark-consult-revert-map
   (current-local-map)))
   (setq-local wgrep-header/footer-parser #'ignore)
   (when (fboundp 'wgrep-setup) (wgrep-setup)))
@@ -212,6 +212,25 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
 (setf (alist-get 'consult-grep embark-exporters-alist)
   #'embark-consult-export-grep)
 
+;;; Support for consult-xref
+
+(declare-function xref--show-xref-buffer "ext:xref")
+
+(defun embark-consult-export-xref (items)
+  "Create an xref buffer listing ITEMS."
+  (let ((xref-items (mapcar (lambda (item)
+  (get-text-property 0 'consult-xref item))
+items)))
+(set-buffer
+ (xref--show-xref-buffer
+  (lambda () xref-items)
+  `((window . ,(embark--target-window))
+(auto-jump . ,xref-auto-jump-to-first-xref)
+(display-action))
+
+(setf (alist-get 'consult-xref embark-exporters-alist)
+  #'embark-consult-export-xref)
+
 ;;; Support for consult-find and consult-locate
 
 (setf (alist-get '(file . consult-find) embark-default-action-overrides)

[elpa] externals/embark-consult updated (9bf01e1c1d -> 29e227f7ec)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  9bf01e1c1d Rewrite the documentation related to Marginalia and 
Consult
  adds  fc3b1650d2 Exporter for consult-xref
  adds  29e227f7ec Use selected-window in xref exporter

No new revisions were added by this update.

Summary of changes:
 embark-consult.el | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

[elpa] externals/consult 8fab8a0061: Expose the current consult-xref--fetcher (See #557)

[ELPA Syncer]

branch: externals/consult
commit 8fab8a0061e030bf1d0d583f5b4da687df564d14
Author: Daniel Mendler 
Commit: Daniel Mendler 

Expose the current consult-xref--fetcher (See #557)
---
 consult-xref.el | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/consult-xref.el b/consult-xref.el
index 263d6d6ad5..2a32c0648b 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -29,9 +29,10 @@
 (require 'xref)
 
 (defvar consult-xref--history nil)
+(defvar consult-xref--fetcher nil)
 
-(defun consult-xref--candidates (xrefs)
-  "Return candidate list from XREFS."
+(defun consult-xref--candidates ()
+  "Return xref candidate list."
   (let ((root (consult--project-root)))
 (mapcar (lambda (xref)
   (let* ((loc (xref-item-location xref))
@@ -47,7 +48,7 @@
 (add-text-properties
  0 1 `(consult-xref ,xref consult-xref--group ,group) cand)
 cand))
-xrefs)))
+(funcall consult-xref--fetcher
 
 (defun consult-xref--preview (display)
   "Xref preview with DISPLAY function."
@@ -87,9 +88,9 @@
 This function can be used for `xref-show-xrefs-function'.
 See `xref-show-xrefs-function' for the description of the
 FETCHER and ALIST arguments."
-  (let ((candidates (consult--with-increased-gc
- (consult-xref--candidates (funcall fetcher
-(display (alist-get 'display-action alist)))
+  (let* ((consult-xref--fetcher fetcher)
+ (candidates (consult--with-increased-gc (consult-xref--candidates)))
+ (display (alist-get 'display-action alist)))
 (xref-pop-to-location
  (if (cdr candidates)
  (apply