[nongnu] elpa/helm 08f5a7267f 2/4: Add comments only

[ELPA Syncer]

branch: elpa/helm
commit 08f5a7267fd3a8f8c97bbf8792905acb999d9400
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Add comments only
---
 helm-buffers.el | 13 +
 helm-utils.el   |  6 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/helm-buffers.el b/helm-buffers.el
index adb3ff26c8..8193fea829 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -131,6 +131,19 @@ Do not use `setq' to set this variable.
 This variable takes effect only when `tab-bar-mode' is available 
(emacs-27.1+)."
   :type 'boolean
   :set (lambda (var val)
+ ;; We should be able to retrieve all buffers assigned to a tab 
whatever
+ ;; the value used for `tab-bar-tab-name-function', unfortunately this
+ ;; is not the case, it seems the alist contains the buffer names only
+ ;; when `tab-bar-tab-name-all' is used and set globally. Then when the
+ ;; mode-line/header-line is rebuilded some code (probably C code in
+ ;; `force-mode-line-update' or elsewhare) changes the alist so just
+ ;; let-binding `tab-bar-tab-name-function' is not enough. This is
+ ;; reproductible when we have more than one window visible and we turn
+ ;; on `tab-bar-mode', the alist is showing only the first buffer of
+ ;; window-list omitting the others, however when starting with only 
one
+ ;; window, calling `tab-bar-mode' and splitting window afterward the
+ ;; alist is updated. Looks it is a bug or a limitation of
+ ;; `tab-bar-mode'.
  (set var val)
  (if val
  (customize-set-variable
diff --git a/helm-utils.el b/helm-utils.el
index f77f0d6663..93ba9e77cf 100644
--- a/helm-utils.el
+++ b/helm-utils.el
@@ -322,7 +322,11 @@ If a prefix arg is given split windows vertically."
   (if (and (fboundp 'tab-bar-mode)
helm-buffers-maybe-switch-to-tab
tab-bar-mode)
-  (let* ((tab-bar-tab-name-function #'tab-bar-tab-name-all)
+  (let* (;; Normally `helm-buffers-maybe-switch-to-tab' custom set function
+ ;; bounded `tab-bar-tab-name-function' to `tab-bar-tab-name-all'
+ ;; but in case user bounded this with setq ensure it works
+ ;; at least partially by let-bounding it here.
+ (tab-bar-tab-name-function #'tab-bar-tab-name-all)
  (tabs (tab-bar-tabs))
  (tab-names (mapcar (lambda (tab)
   (cdr (assq 'name tab)))

[nongnu] elpa/helm f655faa0b3 4/4: Change behavior of helm-buffers-switch-to-buffer-new-tab (#2684)

[ELPA Syncer]

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

Change behavior of helm-buffers-switch-to-buffer-new-tab (#2684)
---
 helm-buffers.el | 15 +++
 helm-types.el   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/helm-buffers.el b/helm-buffers.el
index 8193fea829..181c7c815b 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -972,15 +972,22 @@ If REGEXP-FLAG is given use `query-replace-regexp'."
   "Run switch to other frame action from `helm-source-buffers-list'."
   'helm-buffer-switch-to-buffer-other-frame)
 
-(defun helm-buffers-switch-to-buffer-other-tab (_candidate)
+(defun helm-buffers-switch-buffers-in-tab (candidate)
+  "Switch marked buffers in a new tab.
+If no marked candidates or only one marked, try to switch to CANDIDATE in its
+tab if some, otherwise, display it in a new tab."
   (when (fboundp 'switch-to-buffer-other-tab)
 (let ((bufs (helm-marked-candidates)))
-  (cl-loop for buf in bufs
-   do (switch-to-buffer-other-tab buf)
+  (if (cdr bufs)
+  (progn
+(switch-to-buffer-other-tab (car bufs))
+(helm-window-show-buffers bufs))
+(helm-buffers-maybe-switch-to-buffer-in-tab
+ candidate #'switch-to-buffer-other-tab)
 
 (helm-make-command-from-action helm-buffers-switch-to-buffer-new-tab
   "Run switch to buffer in other tab action from `helm-source-buffers-list'."
-  'helm-buffers-switch-to-buffer-other-tab
+  'helm-buffers-switch-buffers-in-tab
   (cl-assert (fboundp 'tab-bar-mode) nil "Tab-bar-mode not available"))
 
 (defun helm-buffer-switch-buffers (_candidate)
diff --git a/helm-types.el b/helm-types.el
index be6cb24435..b33488fb27 100644
--- a/helm-types.el
+++ b/helm-types.el
@@ -177,7 +177,7 @@
'helm-buffers-maybe-raise-buffer-frame
(lambda () (and (fboundp 'tab-bar-mode)
"Switch to buffer(s) other tab `C-c C-t'"))
-   'helm-buffers-switch-to-buffer-other-tab
+   'helm-buffers-switch-buffers-in-tab
"Switch to buffer at line number"
'helm-switch-to-buffer-at-linum
"Browse project `C-x C-d'"

[nongnu] elpa/helm-core updated (3bcf8a3bfc -> f655faa0b3)

[ELPA Syncer]

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

  from  3bcf8a3bfc Avoid using a global var to save 
tab-bar-tab-name-function
  adds  fa72d7df20 Allow inserting bmk in minibuffer from *-read-file-name
  adds  08f5a7267f Add comments only
  adds  b5f1d4f5b6 Split tab-bar related functions in separate fns
  adds  f655faa0b3 Change behavior of helm-buffers-switch-to-buffer-new-tab 
(#2684)

No new revisions were added by this update.

Summary of changes:
 helm-buffers.el | 28 
 helm-files.el   | 21 +
 helm-types.el   |  2 +-
 helm-utils.el   | 42 --
 4 files changed, 74 insertions(+), 19 deletions(-)

[nongnu] elpa/helm b5f1d4f5b6 3/4: Split tab-bar related functions in separate fns

[ELPA Syncer]

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

Split tab-bar related functions in separate fns

Allow using predicate out of these functions.
---
 helm-utils.el | 46 --
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/helm-utils.el b/helm-utils.el
index 93ba9e77cf..94d32024c6 100644
--- a/helm-utils.el
+++ b/helm-utils.el
@@ -317,27 +317,31 @@ If a prefix arg is given split windows vertically."
 (declare-function tab-bar-switch-to-tab "tab-bar.el")
 (declare-function tab-bar-tab-name-all "tab-bar.el")
 
+(defun helm-buffers-maybe-switch-to-buffer-in-tab (buffer fallback-fn)
+  (let* (;; Normally `helm-buffers-maybe-switch-to-tab' custom set function
+ ;; bounded `tab-bar-tab-name-function' to `tab-bar-tab-name-all'
+ ;; but in case user bounded this with setq ensure it works
+ ;; at least partially by let-bounding it here.
+ (tab-bar-tab-name-function #'tab-bar-tab-name-all)
+ (tabs (tab-bar-tabs))
+ (tab-names (mapcar (lambda (tab)
+  (cdr (assq 'name tab)))
+tabs))
+ (bname (buffer-name (get-buffer buffer)))
+ (tab (helm-buffers--get-tab-from-name bname tabs)))
+(if (helm-buffers--buffer-in-tab-p bname tab-names)
+(progn
+  (tab-bar-switch-to-tab (alist-get 'name tab))
+  (select-window (get-buffer-window bname)))
+  (funcall fallback-fn buffer
+
 (defun helm-buffers-switch-to-buffer-or-tab (buffer)
   "Switch to BUFFER in its tab if some."
   (if (and (fboundp 'tab-bar-mode)
helm-buffers-maybe-switch-to-tab
tab-bar-mode)
-  (let* (;; Normally `helm-buffers-maybe-switch-to-tab' custom set function
- ;; bounded `tab-bar-tab-name-function' to `tab-bar-tab-name-all'
- ;; but in case user bounded this with setq ensure it works
- ;; at least partially by let-bounding it here.
- (tab-bar-tab-name-function #'tab-bar-tab-name-all)
- (tabs (tab-bar-tabs))
- (tab-names (mapcar (lambda (tab)
-  (cdr (assq 'name tab)))
-tabs))
- (bname (buffer-name (get-buffer buffer)))
- (tab (helm-buffers--get-tab-from-name bname tabs)))
-(if (helm-buffers--buffer-in-tab-p bname tab-names)
-(progn
-  (tab-bar-switch-to-tab (alist-get 'name tab))
-  (select-window (get-buffer-window bname)))
-  (switch-to-buffer buffer)))
+  (helm-buffers-maybe-switch-to-buffer-in-tab
+   buffer #'switch-to-buffer)
 (switch-to-buffer buffer)))
 
 (defun helm-buffers--get-tab-from-name (tab-name tabs)
@@ -346,9 +350,15 @@ If a prefix arg is given split windows vertically."
when (member tab-name (split-string (cdr (assq 'name tab)) ", " t))
return tab))
 
-(defun helm-buffers--buffer-in-tab-p (buffer-name tab-names)
+(defun helm--get-tab-names ()
+  (let ((tab-bar-tab-name-function #'tab-bar-tab-name-all))
+(mapcar (lambda (tab)
+  (cdr (assq 'name tab)))
+(tab-bar-tabs
+
+(defun helm-buffers--buffer-in-tab-p (buffer-name &optional tab-names)
   "Check if BUFFER-NAME is in TAB-NAMES list."
-  (cl-loop for name in tab-names
+  (cl-loop for name in (or tab-names (helm--get-tab-names))
;; Buf names are separated with "," in TAB-NAMES
;; e.g. '("tab-bar.el" "*scratch*, helm-buffers.el").
thereis (member buffer-name (split-string name ", " t

[nongnu] elpa/helm fa72d7df20 1/4: Allow inserting bmk in minibuffer from *-read-file-name

[ELPA Syncer]

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

Allow inserting bmk in minibuffer from *-read-file-name
---
 helm-files.el | 21 +
 1 file changed, 21 insertions(+)

diff --git a/helm-files.el b/helm-files.el
index 9aaeb368f6..0893f5f2d5 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -62,6 +62,7 @@
 (declare-function term-next-prompt "term")
 (declare-function term-process-mark "term")
 (declare-function bookmark-prop-get "bookmark")
+(declare-function helm-bookmark-build-source "helm-bookmark")
 (declare-function comint-next-prompt "comint")
 (declare-function comint-delete-input "comint")
 (declare-function comint-send-input "comint")
@@ -299,6 +300,7 @@ It is the source handling new file or directory in 
`helm-find-files'.")
 (define-key map (kbd "C-_")   'helm-ff-undo)
 (define-key map (kbd "C-r")   'helm-find-files-down-last-level)
 (define-key map (kbd "C-c h") 'helm-ff-file-name-history)
+(define-key map (kbd "C-x r b")   'helm-ff-bookmark-insert-location)
 (define-key map (kbd "C-") 'helm-ff-run-toggle-auto-update)
 (define-key map (kbd "C-c ") 'helm-ff-run-toggle-auto-update)
 (define-key map (kbd "C-c t") 'helm-ff-toggle-thumbnails)
@@ -5673,6 +5675,25 @@ source is `helm-source-find-files'."
 (helm-run-after-exit 'helm-ff-bookmark)))
 (put 'helm-find-files-switch-to-bookmark 'helm-only t)
 
+(defun helm-ff-bookmark-insert-location ()
+  "Insert helm-find-files bookmark in minibuffer."
+  (interactive)
+  (require 'helm-bookmark)
+  (helm :sources (helm-bookmark-build-source
+  "bookmark insert location"
+  'helm-bookmark-helm-find-files-setup-alist
+  helm-source-in-buffer
+  :action (lambda (candidate)
+(with-selected-window (minibuffer-window)
+  (goto-char (point-max))
+  (when (re-search-backward "/" nil t)
+(delete-region (match-end 0) (point-max))
+(forward-char 1))
+  (bookmark-insert-location candidate
+:buffer "*helm bookmark insert*"
+:allow-nest t))
+(put 'helm-ff-bookmark-insert-location 'helm-only t)
+
 (defun helm-find-files-initial-input (&optional input)
   "Return INPUT if present, otherwise try to guess it."
   (let ((guesser (helm-acase (helm-ffap-guesser)

[nongnu] elpa/helm updated (3bcf8a3bfc -> f655faa0b3)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  3bcf8a3bfc Avoid using a global var to save 
tab-bar-tab-name-function
   new  fa72d7df20 Allow inserting bmk in minibuffer from *-read-file-name
   new  08f5a7267f Add comments only
   new  b5f1d4f5b6 Split tab-bar related functions in separate fns
   new  f655faa0b3 Change behavior of helm-buffers-switch-to-buffer-new-tab 
(#2684)


Summary of changes:
 helm-buffers.el | 28 
 helm-files.el   | 21 +
 helm-types.el   |  2 +-
 helm-utils.el   | 42 --
 4 files changed, 74 insertions(+), 19 deletions(-)

[nongnu] elpa/org-contrib 0e65be83e4: Update version number for the 0.6 release

[ELPA Syncer]

branch: elpa/org-contrib
commit 0e65be83e4b41c17a5b9096c9055c1601b26a23d
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

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

diff --git a/lisp/org-contrib.el b/lisp/org-contrib.el
index 59c7fba8bb..9e839e1869 100644
--- a/lisp/org-contrib.el
+++ b/lisp/org-contrib.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry 
 ;; Homepage: https://git.sr.ht/~bzg/org-contrib
 ;; Package-Requires: ((emacs "25.1") (org "9.4.6"))
-;; Version: 0.4.2
+;; Version: 0.6
 ;; Keywords: org
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 

[nongnu] elpa/helm 119d1d2885 2/2: Improve query replace in fnames

[ELPA Syncer]

branch: elpa/helm
commit 119d1d2885f731febf0e83cf97f8c075f4038198
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Improve query replace in fnames

Allow incrementing inside the search and replace expression and not
only after.
---
 helm-files.el | 23 ++-
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index d217a53c30..d5a2858d64 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -2416,14 +2416,12 @@ COUNT is used for incrementing new name if needed."
   ;; replacement with \# in
   ;; search and replace
   ;; feature in placeholder \@.
-  (string-match
-   "@/\\(.*\\)/\\(\\(?99:.*\\)#\\)/"
-   rep)
-  (replace-regexp-in-string
-   (match-string 1 rep)
-   (concat (match-string 99 rep)
-   (format "%03d" (1+ count)))
-   target))
+  (string-match "@/\\(.*\\)/\\(.*\\)/" rep)
+  (helm-aand (replace-regexp-in-string
+  "#" (format "%03d" (1+ count))
+  (match-string 2 rep))
+ (replace-regexp-in-string
+  (match-string 1 rep) it target)))
  ;; Incremental replacement
  ;; before or after \@.
  ((or (string-match "\\`#@\\'" rep)
@@ -2448,15 +2446,6 @@ COUNT is used for incrementing new name if needed."
  (length target))
 (t (string-to-number it
  t t rep))
- ;; Search and replace in
- ;; placeholder. Doesn't
- ;; handle incremental here.
- ((string-match "@/\\(.*\\)/\\(.*\\)/" rep)
-  (replace-match (replace-regexp-in-string
-  (match-string 1 rep)
-  (match-string 2 rep)
-  target t)
- t t rep))
  ;; Simple replacement by placeholder.
  ((string-match "@" rep)
   (replace-match target t t rep))

[nongnu] elpa/helm updated (f655faa0b3 -> 119d1d2885)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  f655faa0b3 Change behavior of helm-buffers-switch-to-buffer-new-tab 
(#2684)
   new  d22d0782a9 Fix docstring
   new  119d1d2885 Improve query replace in fnames


Summary of changes:
 helm-files.el | 25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

[nongnu] elpa/helm d22d0782a9 1/2: Fix docstring

[ELPA Syncer]

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

Fix docstring
---
 helm-files.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-files.el b/helm-files.el
index 0893f5f2d5..d217a53c30 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -6450,7 +6450,7 @@ selecting them."
   (t (find-file candidate)))
 
 (helm-make-command-from-action helm-ff-find-file-other-tab
-"Run find file in other tab action from `helm-source-buffers-list'."
+"Run find file in other tab action from `helm-find-files'."
   'find-file-other-tab
   (cl-assert (fboundp 'tab-bar-mode) nil "Tab-bar-mode not available"))
 

[nongnu] elpa/helm-core updated (f655faa0b3 -> 119d1d2885)

[ELPA Syncer]

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

  from  f655faa0b3 Change behavior of helm-buffers-switch-to-buffer-new-tab 
(#2684)
  adds  d22d0782a9 Fix docstring
  adds  119d1d2885 Improve query replace in fnames

No new revisions were added by this update.

Summary of changes:
 helm-files.el | 25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

[nongnu] elpa/helm bb9f092ad6 2/2: Maybe switch to buffer in tab with imenu

[ELPA Syncer]

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

Maybe switch to buffer in tab with imenu
---
 helm-imenu.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-imenu.el b/helm-imenu.el
index 0ff45bbdf4..f610a39171 100644
--- a/helm-imenu.el
+++ b/helm-imenu.el
@@ -305,7 +305,7 @@ The sexp should be an `all-the-icons' function with its 
args."
 (defun helm-imenu--maybe-switch-to-buffer (candidate)
   (let ((cand (cdr candidate)))
 (helm-aif (and (markerp cand) (marker-buffer cand))
-(switch-to-buffer it
+(helm-buffers-switch-to-buffer-or-tab it
 
 (defun helm-imenu--execute-action-at-once-p ()
   (let ((cur (helm-get-selection))

[nongnu] elpa/helm updated (119d1d2885 -> bb9f092ad6)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  119d1d2885 Improve query replace in fnames
   new  3e0ba33224 Force switching to new tab even when buffer
   new  bb9f092ad6 Maybe switch to buffer in tab with imenu


Summary of changes:
 helm-buffers.el | 6 --
 helm-imenu.el   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

[nongnu] elpa/helm-core updated (119d1d2885 -> bb9f092ad6)

[ELPA Syncer]

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

  from  119d1d2885 Improve query replace in fnames
  adds  3e0ba33224 Force switching to new tab even when buffer
  adds  bb9f092ad6 Maybe switch to buffer in tab with imenu

No new revisions were added by this update.

Summary of changes:
 helm-buffers.el | 6 --
 helm-imenu.el   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

[nongnu] elpa/helm 3e0ba33224 1/2: Force switching to new tab even when buffer

[ELPA Syncer]

branch: elpa/helm
commit 3e0ba33224ef7fdb5a6feab6d35c96cad886a306
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Force switching to new tab even when buffer

is displayed in an already existing tab (#2684).
---
 helm-buffers.el | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helm-buffers.el b/helm-buffers.el
index 181c7c815b..7997b1bcce 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -982,8 +982,10 @@ tab if some, otherwise, display it in a new tab."
   (progn
 (switch-to-buffer-other-tab (car bufs))
 (helm-window-show-buffers bufs))
-(helm-buffers-maybe-switch-to-buffer-in-tab
- candidate #'switch-to-buffer-other-tab)
+(if helm-current-prefix-arg
+(switch-to-buffer-other-tab candidate)
+  (helm-buffers-maybe-switch-to-buffer-in-tab
+   candidate #'switch-to-buffer-other-tab))
 
 (helm-make-command-from-action helm-buffers-switch-to-buffer-new-tab
   "Run switch to buffer in other tab action from `helm-source-buffers-list'."

[elpa] branch new-version created (now 20acc256e5)

[Andrew Hyatt]

ahyatt pushed a change to branch new-version.

at  20acc256e5 Update version to 0.17.4

This branch includes the following new commits:

   new  20acc256e5 Update version to 0.17.4

[elpa] new-version 20acc256e5: Update version to 0.17.4

[Andrew Hyatt]

branch: new-version
commit 20acc256e5441e8ca4ffcd6db7319ab0e59c466b
Author: Andrew Hyatt 
Commit: Andrew Hyatt 

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

diff --git a/llm.el b/llm.el
index 465ccaae26..16c16baa90 100644
--- a/llm.el
+++ b/llm.el
@@ -5,7 +5,7 @@
 ;; Author: Andrew Hyatt 
 ;; Homepage: https://github.com/ahyatt/llm
 ;; Package-Requires: ((emacs "28.1") (plz "0.8"))
-;; Package-Version: 0.17.3
+;; Package-Version: 0.17.4
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
 ;; This program is free software; you can redistribute it and/or

[elpa] branch new-version deleted (was 20acc256e5)

[Andrew Hyatt]

ahyatt pushed a change to branch new-version.

   was  20acc256e5 Update version to 0.17.4

This change permanently discards the following revisions:

  discards  20acc256e5 Update version to 0.17.4

[elpa] externals/auctex updated (9f758c32c7 -> 1c833240a3)

[ELPA Syncer]

elpasync pushed a change to branch externals/auctex.

  from  9f758c32c7 ; Unify license notice header.
   new  9f9a2964b1 Adjust license notice
   new  86fa24978c Revert "Adjust license notice"
   new  1c833240a3 Replace FSF office address.


Summary of changes:
 GNUmakefile| 15 +++
 bib-cite.el| 18 --
 context-en.el  | 18 --
 context-nl.el  | 18 --
 context.el | 18 --
 font-latex.el  | 18 --
 latex-flymake.el   | 18 --
 latex.el   | 18 --
 multi-prompt.el| 18 --
 plain-tex.el   | 18 --
 preview.el | 18 --
 style/Alegreya.el  | 18 --
 style/AlegreyaSans.el  | 18 --
 style/AnonymousPro.el  | 18 --
 style/CJK.el   | 18 --
 style/CJKutf8.el   | 18 --
 style/FiraMono.el  | 18 --
 style/FiraSans.el  | 18 --
 style/MinionPro.el | 18 --
 style/MyriadPro.el | 18 --
 style/XCharter.el  | 18 --
 style/acro.el  | 18 --
 style/acronym.el   | 18 --
 style/afterpage.el | 18 --
 style/algorithm.el | 18 --
 style/algpseudocode.el | 18 --
 style/algpseudocodex.el| 18 --
 style/alltt.el | 18 --
 style/alphanum.el  | 18 --
 style/amsaddr.el   | 18 --
 style/amsart.el| 18 --
 style/amsbook.el   | 18 --
 style/amsbsy.el| 18 --
 style/amsfonts.el  | 18 --
 style/amsmath.el   | 18 --
 style/amsopn.el| 18 --
 style/amsrefs.el   | 18 --
 style/amssymb.el   | 18 --
 style/amstex.el| 18 --
 style/amstext.el   | 18 --
 style/amsthm.el| 18 --
 style/appendix.el  | 18 --
 style/arabxetex.el | 18 --
 style/array.el | 18 --
 style/article.el   | 18 --
 style/attachfile.el| 18 --
 style/australian.el| 18 --
 style/austrian.el  | 18 --
 style/authblk.el   | 18 --
 style/babel.el | 18 --
 style/backref.el   | 18 --
 style/baskervaldx.el   | 18 --
 style/beamer.el| 18 --
 style/beamerarticle.el | 18 --
 style/beamerswitch.el  | 18 --
 style/biblatex.el  | 18 --
 style/bicaption.el | 18 --
 style/bidi.el  | 18 --
 style/bidibeamer.el| 18 --
 style/bigdelim.el  | 18 --
 style/bigstrut.el  | 18 --
 style/bm.el| 18 --
 style/book.el  | 18 --
 style/booktabs.el  | 18 --
 style/brazil.el| 18 --
 style/brazilian.el | 18 --
 style/breqn.el | 18 --
 style/bulgarian.el | 18 --
 style/canadian.el  | 18 --
 style/cancel.el| 18 --
 style/captcont.el  | 18 --
 style/caption.el   | 18 --
 style/catchfilebetweentags.el  | 18 --
 style/changebar.el | 18 --
 style/changelog.el | 18 --
 style/changes.el   | 18 --
 style/cleveref.el  | 18 --
 style/color.el | 18 --
 style/colortbl.el  | 18 --
 style/commath.el   | 18 --
 style/comment.el   | 18 --
 style/contract.el  | 18 --
 style/csquotes.el  | 18 --
 style/currvita.el  | 18 --
 style/cuted.el   

[elpa] externals/llm e6bc34d0e8: Update version to 0.17.4 (#81)

[ELPA Syncer]

branch: externals/llm
commit e6bc34d0e8f7d2a96b9334c7d3963ac7e6856e35
Author: Andrew Hyatt 
Commit: GitHub 

Update version to 0.17.4 (#81)
---
 llm.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llm.el b/llm.el
index 465ccaae26..16c16baa90 100644
--- a/llm.el
+++ b/llm.el
@@ -5,7 +5,7 @@
 ;; Author: Andrew Hyatt 
 ;; Homepage: https://github.com/ahyatt/llm
 ;; Package-Requires: ((emacs "28.1") (plz "0.8"))
-;; Package-Version: 0.17.3
+;; Package-Version: 0.17.4
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
 ;; This program is free software; you can redistribute it and/or

[nongnu] elpa/geiser 3eafde36a2 1/4: geiser-repl--find-output-region: fix for 2-character prompts

[ELPA Syncer]

branch: elpa/geiser
commit 3eafde36a23a681348749d4eabf239edb9ffa6ae
Author: Macon Gambill 
Commit: Macon Gambill 

geiser-repl--find-output-region: fix for 2-character prompts
---
 elisp/geiser-repl.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 6f6cea7c23..23d8828049 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -521,7 +521,7 @@ will be set up using `geiser-connect-local' when a REPL is 
started.")
 (forward-line)
 (when (> (point) geiser-repl--last-output-start)
   (set-marker geiser-repl--last-output-start (point)
-(> (- geiser-repl--last-output-end geiser-repl--last-output-start) 2)))
+(>= (- geiser-repl--last-output-end geiser-repl--last-output-start) 2)))
 
 (defun geiser-repl--treat-output-region ()
   (with-silent-modifications

[nongnu] elpa/geiser updated (c034c129cf -> 97ce88463f)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser.

  from  c034c129cf version bump
   new  3eafde36a2 geiser-repl--find-output-region: fix for 2-character 
prompts
   new  fb8439a7fd Improve geiser-repl-autoeval-mode behavior
   new  32196db8f8 Improve geiser-repl-superparen-mode compatibility
   new  97ce88463f news updated


Summary of changes:
 elisp/geiser-repl.el | 54 ++--
 news.org | 11 +++
 2 files changed, 42 insertions(+), 23 deletions(-)

[nongnu] elpa/geiser 97ce88463f 4/4: news updated

[ELPA Syncer]

branch: elpa/geiser
commit 97ce88463f346ff0dab147334fa0ce7b81569d7c
Author: jao 
Commit: jao 

news updated
---
 news.org | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/news.org b/news.org
index b50f93ea3f..9354e6a484 100644
--- a/news.org
+++ b/news.org
@@ -1,3 +1,14 @@
+* Version 0.32
+
+  - REPL: Fix for highlighting of 2-character input prompts (thanks to Macon
+Gambill)
+
+  - REPL autoeval mode improvements (thanks to Anter Mejr):
+- Autoeval just once
+- Stop paren highlighting after autoevaluations
+- Highlight only if show-paren-mode is enabled
+- Compatibility with electric-pair-mode
+
 * Version 0.31.1 (September 1, 2024)
 
   - Code cleanups

[nongnu] elpa/geiser 32196db8f8 3/4: Improve geiser-repl-superparen-mode compatibility

[ELPA Syncer]

branch: elpa/geiser
commit 32196db8f8ddab071565a5ae6d799ada4f8fbe6b
Author: Antero Mejr 
Commit: jao 

Improve geiser-repl-superparen-mode compatibility

This change to `geiser-repl--superparen-function' improves
compatibility with electric-pair-mode, as the procedure will no longer
add too many parentheses.
---
 elisp/geiser-repl.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 3bde43e44a..2cd772936e 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -852,7 +852,12 @@ evaluated without having to press ENTER."
 (defun geiser-repl--superparen-function ()
   (when (char-equal (char-before) geiser-repl-superparen-character)
 (delete-char -1)
-(insert-char ?\) (geiser-repl--nesting-level
+(let ((level (geiser-repl--nesting-level)))
+  (if (memq nil (mapcar (lambda (idx)
+  (= (char-after idx) ?\)))
+(number-sequence (point) (- (+ (point) level) 1
+  (insert-char ?\) level)
+(forward-char level)
 
 (defvar-local geiser-repl-superparen-mode-string " S"
   "Modeline indicator for geiser-repl-superparen-mode")

[nongnu] elpa/geiser fb8439a7fd 2/4: Improve geiser-repl-autoeval-mode behavior

[ELPA Syncer]

branch: elpa/geiser
commit fb8439a7fdb81566873e69564438d2e82dc3f8a9
Author: Antero Mejr 
Commit: jao 

Improve geiser-repl-autoeval-mode behavior

Don't autoeval lines that have already been evaluated.
Don't keep highlighting parens after the line is auto-evaluated.
Don't highlight if show-paren-mode is not enabled.
---
 elisp/geiser-repl.el | 45 -
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 23d8828049..3bde43e44a 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -803,17 +803,21 @@ If SAVE-HISTORY is non-nil, save CMD in the REPL history."
 
 ;;; geiser-repl-autoeval-mode minor mode:
 
-(defun geiser-repl--autoeval-paren-function ()
-  (let* ((data (show-paren--default))
- (here (nth 0 data))
- (there (nth 2 data))
- (mismatch (nth 4 data)))
-(if (and here
- (eq 0 (geiser-repl--nesting-level))
- (not mismatch)
- (> here there))
-(geiser-repl--send-input))
-data))
+(defun geiser-repl--autoeval-paren-function (show-paren-enabled)
+  (lambda ()
+(let* ((data (show-paren--default))
+   (here (nth 0 data))
+   (there (nth 2 data))
+   (mismatch (nth 4 data)))
+  (if (and (= (point) (point-max))
+   here
+   (eq 0 (geiser-repl--nesting-level))
+   (not mismatch)
+   (> here there))
+  (progn (geiser-repl--send-input)
+ ;; Don't highlight if we're doing an autoeval.
+ nil)
+(and show-paren-enabled data)
 
 (defvar-local geiser-repl-autoeval-mode-string " E"
   "Modeline indicator for geiser-repl-autoeval-mode")
@@ -825,20 +829,19 @@ Non-null prefix argument turns on the mode.
 Null prefix argument turns off the mode.
 
 When Autoeval mode is enabled, balanced S-expressions are automatically
-evaluated without having to press ENTER.
-
-This mode may cause issues with structural editing modes such as paredit."
+evaluated without having to press ENTER."
   :init-value nil
   :lighter geiser-repl-autoeval-mode-string
   :group 'geiser-repl
 
-  (if (boundp 'show-paren-data-function)
-  (if geiser-repl-autoeval-mode
-  (progn (show-paren-local-mode 1)
- (setq-local show-paren-delay geiser-repl-autoeval-mode-delay)
- (setq-local show-paren-data-function
- 'geiser-repl--autoeval-paren-function))
-(setq-local show-paren-data-function 'show-paren--default)))
+  (if geiser-repl-autoeval-mode
+  (let ((show-paren-enabled show-paren-mode))
+(progn (show-paren-local-mode 1)
+   (setq-local show-paren-delay geiser-repl-autoeval-mode-delay)
+   (setq-local show-paren-data-function
+   (geiser-repl--autoeval-paren-function
+show-paren-enabled
+(setq-local show-paren-data-function 'show-paren--default))
   (when (called-interactively-p nil)
 (message "Geiser Autoeval %s"
  (if geiser-repl-autoeval-mode "enabled" "disabled"

[nongnu] elpa/gptel f5e0766a4a: gptel-rewrite: Add rewrite as a merge conflict

[ELPA Syncer]

branch: elpa/gptel
commit f5e0766a4aa7efb9f3b8dca1be1b3c5776d817a5
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-rewrite: Add rewrite as a merge conflict

* gptel-rewrite.el (gptel--rewrite-merge, gptel--rewrite-key-help,
gptel--suffix-rewrite-merge, gptel-rewrite-menu,
gptel-rewrite-actions-map): Add command to add LLM rewrite as a
merge conflict.
---
 gptel-rewrite.el | 42 +-
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/gptel-rewrite.el b/gptel-rewrite.el
index bb6c6e4def..9f8c6f0158 100644
--- a/gptel-rewrite.el
+++ b/gptel-rewrite.el
@@ -56,7 +56,8 @@ for a particular major-mode."
   "C-c C-d" #'gptel--rewrite-diff
   "C-c C-e" #'gptel--rewrite-ediff
   "C-c C-n" #'gptel--rewrite-next
-  "C-c C-p" #'gptel--rewrite-previous)
+  "C-c C-p" #'gptel--rewrite-previous
+  "C-c C-m" #'gptel--rewrite-merge)
 
 (defvar-local gptel--rewrite-overlays nil
   "List of active rewrite overlays in the buffer.")
@@ -93,7 +94,7 @@ CALLBACK is supplied by Eldoc, see
   (when (and gptel--rewrite-overlays
  (get-char-property (point) 'gptel-rewrite))
   (funcall callback
-   (format (substitute-command-keys "%s rewrite available: apply 
\\[gptel--rewrite-apply], clear \\[gptel--rewrite-clear], diff 
\\[gptel--rewrite-diff] or ediff \\[gptel--rewrite-ediff]")
+   (format (substitute-command-keys "%s rewrite available: accept 
\\[gptel--rewrite-apply], clear \\[gptel--rewrite-clear], merge 
\\[gptel--rewrite-merge], diff \\[gptel--rewrite-diff] or ediff 
\\[gptel--rewrite-ediff]")
(propertize (concat (gptel-backend-name gptel-backend)
":" gptel-model)
'face 'mode-line-emphasis)
@@ -216,6 +217,26 @@ the changed regions. BUF is the (current) buffer."
 (add-hook 'ediff-quit-hook gptel--ediff-restore)
 (ediff-buffers (current-buffer) newbuf)))
 
+(defun gptel--rewrite-merge (&optional ovs)
+  "Insert pending LLM responses in OVS as merge conflicts."
+  (interactive (list (gptel--rewrite-overlay-at)))
+  (let ((changed))
+(dolist (ov (ensure-list ovs))
+  (save-excursion
+(when-let (new-str (overlay-get ov 'gptel-rewrite))
+  ;; Insert merge
+  (goto-char (overlay-start ov))
+  (unless (bolp) (insert "\n"))
+  (insert-before-markers "<<< original\n")
+  (goto-char (overlay-end ov))
+  (unless (bolp) (insert "\n"))
+  (insert
+   "===\n" new-str
+   "\n>>> " (gptel-backend-name gptel-backend) "\n")
+  (setq changed t
+(when changed (smerge-mode 1)))
+  (gptel--rewrite-clear ovs))
+
 ;; * Transient Prefix for rewriting/refactoring
 
 ;;;###autoload (autoload 'gptel-rewrite-menu "gptel-rewrite" nil t)
@@ -241,6 +262,7 @@ the changed regions. BUF is the (current) buffer."
 :if (lambda () (gptel--rewrite-sanitize-overlays))
 (gptel--suffix-rewrite-diff)
 (gptel--suffix-rewrite-ediff)
+(gptel--suffix-rewrite-merge)
 (gptel--suffix-rewrite-apply)
 "Cancel"
 (gptel--suffix-rewrite-clear)]]
@@ -326,8 +348,9 @@ the changed regions. BUF is the (current) buffer."
(propertize hint-str 'face 'success)))
   (overlay-put ov 'help-echo
(format "%s rewrite available:
-- apply  \\[gptel--rewrite-apply],
+- accept \\[gptel--rewrite-apply],
 - clear  \\[gptel--rewrite-clear],
+- merge  \\[gptel--accept-merge],
 - diff   \\[gptel--rewrite-diff],
 - ediff  \\[gptel--rewrite-ediff]"
(propertize (concat (gptel-backend-name 
gptel-backend)
@@ -360,11 +383,20 @@ the changed regions. BUF is the (current) buffer."
   (interactive)
   (gptel--rewrite-ediff gptel--rewrite-overlays))
 
+(transient-define-suffix gptel--suffix-rewrite-merge ()
+  "Insert LLM output as merge conflicts"
+  :if (lambda () gptel--rewrite-overlays)
+  :key "ce"
+  :description (concat "LLM " (downcase (gptel--refactor-or-rewrite))
+ "s as merge conflicts")
+  (interactive)
+  (gptel--rewrite-merge gptel--rewrite-overlays))
+
 (transient-define-suffix gptel--suffix-rewrite-apply ()
-  "Apply pending LLM rewrites."
+  "Accept pending LLM rewrites."
   :if (lambda () gptel--rewrite-overlays)
   :key "ca"
-  :description (concat "Apply all pending LLM "
+  :description (concat "Accept all pending LLM "
(downcase (gptel--refactor-or-rewrite))
"s")
   (interactive)

[elpa] externals/ement caf7ca9d1c: Add: Authenticated media support

[ELPA Syncer]

branch: externals/ement
commit caf7ca9d1c6503b8adbcb10e1e9317c5de9a83d0
Author: Adam Porter 
Commit: Adam Porter 

Add: Authenticated media support
---
 README.org|  8 +
 ement-lib.el  |  9 ++
 ement-room.el | 93 ++-
 3 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/README.org b/README.org
index 4aebb0546f..a1b357b566 100644
--- a/README.org
+++ b/README.org
@@ -299,6 +299,14 @@ Ement.el doesn't support encrypted rooms natively, but it 
can be used transparen
 
 ** 0.16-pre
 
+*Compatibility*
+
++ Use authenticated media requests (part of Matrix 1.11; see 
[[https://github.com/matrix-org/matrix-spec-proposals/pull/3916][MSC3916]] and 
[[https://matrix.org/blog/2024/06/26/sunsetting-unauthenticated-media/][matrix.org's
 sunsetting unauthenticated media]]).
+
+*Additions*
+
++ When option ~ement-room-images~ is disabled (preventing automatic download 
and display of images), individual images may be shown by clicking the button 
in their events.
+
 *Changes*
 
 + Option ~ement-room-coalesce-events~ may now be set to (and defaults to) a 
maximum number of events to coalesce together.  (This avoids potential 
performance problems in rare cases.  See 
[[https://github.com/alphapapa/ement.el/issues/247][#247]].  Thanks to 
[[https://github.com/viiru-][Arto Jantunen]] for reporting and 
[[https://github.com/sergiodj][Sergio Durigan Junior]] for testing.)
diff --git a/ement-lib.el b/ement-lib.el
index bfb8bed334..7df227 100644
--- a/ement-lib.el
+++ b/ement-lib.el
@@ -1364,6 +1364,15 @@ Suitable for use in completion, etc."
 (format "%s/_matrix/media/r0/download/%s/%s"
 uri-prefix server-name media-id)))
 
+(defun ement--mxc-to-endpoint (uri)
+  "Return API endpoint for MXC URI.
+Returns string suitable for the ENDPOINT argument to `ement-api'."
+  (string-match (rx "mxc://" (group (1+ (not (any "/"
+"/" (group (1+ anything))) uri)
+  (let ((server-name (match-string 1 uri))
+(media-id (match-string 2 uri)))
+(format "media/download/%s/%s" server-name media-id)))
+
 (defun ement--remove-face-property (string value)
   "Remove VALUE from STRING's `face' properties.
 Used to remove the `button' face from buttons, because that face
diff --git a/ement-room.el b/ement-room.el
index 70dd4269da..9492c54ebc 100644
--- a/ement-room.el
+++ b/ement-room.el
@@ -1236,7 +1236,7 @@ spec) without requiring all events to use the same margin 
width."
   "Plain-text body content."
   ;; NOTE: `save-match-data' is required around calls to 
`ement-room--format-message-body'.
   (let* ((body (save-match-data
- (ement-room--format-message-body event :formatted-p nil)))
+ (ement-room--format-message-body event session :formatted-p 
nil)))
  (body-length (length body))
  (face (ement-room--event-body-face event room session))
  (quote-start (ement--text-property-search-forward 'face
@@ -1260,7 +1260,7 @@ spec) without requiring all events to use the same margin 
width."
 (ement-room-define-event-formatter ?B
   "Formatted body content (i.e. rendered HTML)."
   (let* ((body (save-match-data
- (ement-room--format-message-body event)))
+ (ement-room--format-message-body event session)))
  (body-length (length body))
  (face (ement-room--event-body-face event room session))
  (quote-start (ement--text-property-search-forward 'face
@@ -4061,8 +4061,8 @@ Format defaults to `ement-room-message-format-spec', 
which see."
  'display `((margin right-margin) ,string))
   (buffer-string
 
-(cl-defun ement-room--format-message-body (event &key (formatted-p t))
-  "Return formatted body of \"m.room.message\" EVENT.
+(cl-defun ement-room--format-message-body (event session &key (formatted-p t))
+  "Return formatted body of \"m.room.message\" EVENT on SESSION.
 If FORMATTED-P, return the formatted body content, when available."
   (pcase-let* (((cl-struct ement-event content
(unsigned (map ('redacted_by unsigned-redacted-by)))
@@ -4087,7 +4087,7 @@ If FORMATTED-P, return the formatted body content, when 
available."
(appendix (pcase msgtype
;; TODO: Face for m.notices.
((or "m.text" "m.emote" "m.notice") nil)
-   ("m.image" (ement-room--format-m.image event))
+   ("m.image" (ement-room--format-m.image event 
session))
("m.file" (ement-room--format-m.file event))
("m.video" (ement-room--format-m.video event))
("m.audio" (ement-room--format-m.audio event))
@@ -5326,26 +5326,65 @@ options `ement-room-image-thumbnail-height' and
'((display-buffer-pop-up-frame
   (pop-up-frame-parameters . ((fullscreen . t

[elpa] externals/emms a93815048f: * doc/emms.texinfo: Fix typo in `emms-playlist-next` function

[ELPA Syncer]

branch: externals/emms
commit a93815048fc38707edc1115fcca05eac208173bd
Author: Yoni Rabkin 
Commit: Yoni Rabkin 

* doc/emms.texinfo: Fix typo in `emms-playlist-next` function

patch by Rehan Daphedar
---
 AUTHORS  | 1 +
 doc/emms.texinfo | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 70834e3f83..d6a9ac2b79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,7 @@ Luca Capello   
 Mandar Mitra
 Maxim Cournoyer
 Pavel Korytov
+Rehan Daphedar
 Ryan Van Wagoner
 Sascha Wilde
 Scarlett McAllister
diff --git a/doc/emms.texinfo b/doc/emms.texinfo
index a6aac35a1f..43d474dd9e 100644
--- a/doc/emms.texinfo
+++ b/doc/emms.texinfo
@@ -722,7 +722,7 @@ player is playing. This is a good function to put in
 @code{emms-player-finished-hook}.
 @end defun
 @defun emms-playlist-next
-Move to the previous track in the current buffer.
+Move to the next track in the current buffer.
 @end defun
 @defun emms-playlist-previous
 Move to the previous track in the current buffer.

[elpa] externals/modus-themes updated (1725bfd1ed -> c2cb0404c3)

[ELPA Syncer]

elpasync pushed a change to branch externals/modus-themes.

  from  1725bfd1ed Refine support for forge
   new  8bbebd2f39 Document how users can add support for meow
   new  cb612d3689 Document how users can add support for combobulate
   new  cbe6c0284f Document how users can add support for howm
   new  c2cb0404c3 Replace deprecate colour in the manual's entry about 
solaire


Summary of changes:
 doc/modus-themes.info | 413 +-
 doc/modus-themes.org  | 149 --
 2 files changed, 406 insertions(+), 156 deletions(-)

[elpa] externals/modus-themes 8bbebd2f39 1/4: Document how users can add support for meow

[ELPA Syncer]

branch: externals/modus-themes
commit 8bbebd2f399b4842ca152c365b3b22fc1b0b9086
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Document how users can add support for meow

This is in response to the question raised by ZharMeny in issue 116:
.
---
 doc/modus-themes.info | 288 --
 doc/modus-themes.org  |  31 ++
 2 files changed, 192 insertions(+), 127 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index 941b766439..82223a4509 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -145,6 +145,7 @@ Advanced customization
 * DIY Use more spacious margins or padding in Emacs frames::
 * DIY Custom hl-todo colors::
 * DIY Add support for solaire-mode::
+* DIY Add support for meow-mode::
 * DIY Use a hook at the post-load-theme phase::
 
 DIY Stylistic variants using palette overrides
@@ -1615,6 +1616,7 @@ such, they are labeled as "do-it-yourself" or "DIY".
 * DIY Use more spacious margins or padding in Emacs frames::
 * DIY Custom hl-todo colors::
 * DIY Add support for solaire-mode::
+* DIY Add support for meow-mode::
 * DIY Use a hook at the post-load-theme phase::
 
 
@@ -3924,7 +3926,7 @@ otherwise the defaults are not always legible.
Reload the theme for changes to take effect.
 
 
-File: modus-themes.info,  Node: DIY Add support for solaire-mode,  Next: DIY 
Use a hook at the post-load-theme phase,  Prev: DIY Custom hl-todo colors,  Up: 
Advanced customization
+File: modus-themes.info,  Node: DIY Add support for solaire-mode,  Next: DIY 
Add support for meow-mode,  Prev: DIY Custom hl-todo colors,  Up: Advanced 
customization
 
 7.20 DIY Add support for solaire-mode
 =
@@ -3985,9 +3987,40 @@ the post-load-theme phase.
Reload the theme for changes to take effect.
 
 
-File: modus-themes.info,  Node: DIY Use a hook at the post-load-theme phase,  
Prev: DIY Add support for solaire-mode,  Up: Advanced customization
+File: modus-themes.info,  Node: DIY Add support for meow-mode,  Next: DIY Use 
a hook at the post-load-theme phase,  Prev: DIY Add support for solaire-mode,  
Up: Advanced customization
 
-7.21 DIY Use a hook at the post-load-theme phase
+7.21 DIY Add support for meow-mode
+==
+
+The ‘meow’ package provides a modal editing experience.  It is meant to
+build on top of the key bindings the user is already familiar with.  My
+problem as an outsider is that I cannot make sense of all the contexts
+where its faces are used in, so I cannot make a good choice of which
+styles to use.  The following is but a basic attempt to get started.
+
+ ;; This is not complete, because it is difficult for a non-user to
+ ;; make sense of where all the faces are used in.
+ (defun my-modus-themes-custom-faces (&rest _)
+   (modus-themes-with-colors
+ (custom-set-faces
+  ;; FIXME: What is a "region cursor" and should it differ from the 
position highlights below?
+  `(meow-region-cursor-1 ((,c :inherit (bold modus-themes-reset-soft) 
:background ,bg-char-0)))
+  `(meow-region-cursor-2 ((,c :inherit (bold modus-themes-reset-soft) 
:background ,bg-char-1)))
+  `(meow-region-cursor-3 ((,c :inherit (bold modus-themes-reset-soft) 
:background ,bg-char-2)))
+
+  `(meow-position-highlight-number-1 ((,c :inherit (bold 
modus-themes-reset-soft) :background ,bg-char-0)))
+  `(meow-position-highlight-number-2 ((,c :inherit (bold 
modus-themes-reset-soft) :background ,bg-char-1)))
+  `(meow-position-highlight-number-3 ((,c :inherit (bold 
modus-themes-reset-soft) :background ,bg-char-2))
+
+ (add-hook 'enable-theme-functions #'my-modus-themes-custom-faces)
+
+   *note Using a hook at the post-load-theme phase: DIY Use a hook at
+the post-load-theme phase.
+
+
+File: modus-themes.info,  Node: DIY Use a hook at the post-load-theme phase,  
Prev: DIY Add support for meow-mode,  Up: Advanced customization
+
+7.22 DIY Use a hook at the post-load-theme phase
 
 
 Many of the Do-It-Yourself (DIY) snippets provided herein make use of a
@@ -4035,7 +4068,7 @@ it will not use them (in plain terms, the code works with 
or without
 
 File: modus-themes.info,  Node: DIY A theme-agnostic hook for theme loading,  
Up: DIY Use a hook at the post-load-theme phase
 
-7.21.1 DIY A theme-agnostic hook for theme loading
+7.22.1 DIY A theme-agnostic hook for theme loading
 --
 
 [ NOTE: The following is for versions of Emacs before 29.  For Emacs 29
@@ -6372,129 +6405,130 @@ B.3 Concept index
 
 Tag Table:
 Node: Top872
-Node: Overview8498
-Node: How do the themes look like11264
-Node: Learn about the latest changes11623
-Node: Installation12011
-Node: Install manually from source12937
-Node: Install from the archives

[elpa] externals/modus-themes cb612d3689 2/4: Document how users can add support for combobulate

[ELPA Syncer]

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

Document how users can add support for combobulate

This is in response to the question raised by Damien Cassou in issue
108: .
---
 doc/modus-themes.info | 310 +-
 doc/modus-themes.org  |  51 +
 2 files changed, 233 insertions(+), 128 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index 82223a4509..74ac348308 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -146,6 +146,7 @@ Advanced customization
 * DIY Custom hl-todo colors::
 * DIY Add support for solaire-mode::
 * DIY Add support for meow-mode::
+* DIY Add support for combobulate::
 * DIY Use a hook at the post-load-theme phase::
 
 DIY Stylistic variants using palette overrides
@@ -1617,6 +1618,7 @@ such, they are labeled as "do-it-yourself" or "DIY".
 * DIY Custom hl-todo colors::
 * DIY Add support for solaire-mode::
 * DIY Add support for meow-mode::
+* DIY Add support for combobulate::
 * DIY Use a hook at the post-load-theme phase::
 
 
@@ -3987,7 +3989,7 @@ the post-load-theme phase.
Reload the theme for changes to take effect.
 
 
-File: modus-themes.info,  Node: DIY Add support for meow-mode,  Next: DIY Use 
a hook at the post-load-theme phase,  Prev: DIY Add support for solaire-mode,  
Up: Advanced customization
+File: modus-themes.info,  Node: DIY Add support for meow-mode,  Next: DIY Add 
support for combobulate,  Prev: DIY Add support for solaire-mode,  Up: Advanced 
customization
 
 7.21 DIY Add support for meow-mode
 ==
@@ -4018,9 +4020,60 @@ styles to use.  The following is but a basic attempt to 
get started.
 the post-load-theme phase.
 
 
-File: modus-themes.info,  Node: DIY Use a hook at the post-load-theme phase,  
Prev: DIY Add support for meow-mode,  Up: Advanced customization
+File: modus-themes.info,  Node: DIY Add support for combobulate,  Next: DIY 
Use a hook at the post-load-theme phase,  Prev: DIY Add support for meow-mode,  
Up: Advanced customization
 
-7.22 DIY Use a hook at the post-load-theme phase
+7.22 DIY Add support for combobulate
+
+
+The ‘combobulate’ package provides the means to operate on text that is
+underpinned by the ‘tree-sitter’ program.  Because this is a specialized
+case that requires intimate knowledge of the technicalities, I am not
+adding support for this package directly at the theme level.  Users can
+try this instead:
+
+ (defun my-modus-themes-custom-faces (&rest _)
+   (modus-themes-with-colors
+ (custom-set-faces
+  `(combobulate-active-indicator-face ((,c :foreground ,fg-main)))
+  `(combobulate-dimmed-indicator-face ((,c :inherit shadow)))
+  `(combobulate-error-indicator-face ((,c :inherit error)))
+  `(combobulate-query-highlight-fiery-flames-face ((,c :inherit 
modus-themes-intense-red)))
+  `(combobulate-query-highlight-gleaming-gold-face ((,c :inherit 
modus-themes-intense-yellow)))
+  `(combobulate-query-highlight-majestic-mercury-face ((,c :inherit 
modus-themes-intense-cyan)))
+  `(combobulate-query-highlight-mysterious-mauve-face ((,c :inherit 
modus-themes-intense-magenta)))
+  `(combobulate-query-highlight-radiant-rind-face ((,c :inherit 
modus-themes-subtle-red)))
+  `(combobulate-query-highlight-regal-ripples-face ((,c :inherit 
modus-themes-intense-blue)))
+  `(combobulate-query-highlight-serene-shade-face ((,c :inherit 
modus-themes-subtle-green)))
+  `(combobulate-query-highlight-silver-shadows-face ((,c :background 
,bg-active :foreground ,fg-main)))
+  `(combobulate-query-highlight-vibrant-veggie-face ((,c :inherit 
modus-themes-intense-green)))
+  `(combobulate-query-query-anonymous-face ((,c :inherit 
modus-themes-bold :foreground ,fg-alt)))
+  `(combobulate-query-query-builtin-face ((,c :inherit 
font-lock-builtin-face)))
+  `(combobulate-query-query-constant-face ((,c :inherit 
font-lock-constant-face)))
+  `(combobulate-query-query-doc-markup-face ((,c :inherit 
font-lock-doc-markup-face)))
+  `(combobulate-query-query-keyword-face ((,c :inherit 
font-lock-keyword-face)))
+  `(combobulate-query-query-predicate-builtin-face ((,c :inherit 
bold)))
+  `(combobulate-query-query-string-face ((,c :inherit 
font-lock-string-face)))
+  `(combobulate-refactor-choice-face ((,c :inherit modus-themes-slant 
:foreground ,info)))
+  `(combobulate-refactor-cursor-face ((,c :foreground ,cursor)))
+  `(combobulate-refactor-field-face ((,c :background ,bg-inactive 
:foreground ,fg-main :extend nil)))
+  `(combobulate-refactor-highlight-face ((,c :inherit highlight)))
+  `(combobulate-refactor-inactive-

[elpa] externals/modus-themes cbe6c0284f 3/4: Document how users can add support for howm

[ELPA Syncer]

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

Document how users can add support for howm

This is in response to the question raised by Jabir Ali Ouassou in issue 
117:
.
---
 doc/modus-themes.info | 327 --
 doc/modus-themes.org  |  65 --
 2 files changed, 236 insertions(+), 156 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index 74ac348308..e37e3fff65 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -147,6 +147,7 @@ Advanced customization
 * DIY Add support for solaire-mode::
 * DIY Add support for meow-mode::
 * DIY Add support for combobulate::
+* DIY Add support for howm::
 * DIY Use a hook at the post-load-theme phase::
 
 DIY Stylistic variants using palette overrides
@@ -1619,6 +1620,7 @@ such, they are labeled as "do-it-yourself" or "DIY".
 * DIY Add support for solaire-mode::
 * DIY Add support for meow-mode::
 * DIY Add support for combobulate::
+* DIY Add support for howm::
 * DIY Use a hook at the post-load-theme phase::
 
 
@@ -4020,7 +4022,7 @@ styles to use.  The following is but a basic attempt to 
get started.
 the post-load-theme phase.
 
 
-File: modus-themes.info,  Node: DIY Add support for combobulate,  Next: DIY 
Use a hook at the post-load-theme phase,  Prev: DIY Add support for meow-mode,  
Up: Advanced customization
+File: modus-themes.info,  Node: DIY Add support for combobulate,  Next: DIY 
Add support for howm,  Prev: DIY Add support for meow-mode,  Up: Advanced 
customization
 
 7.22 DIY Add support for combobulate
 
@@ -4071,9 +4073,47 @@ try this instead:
 the post-load-theme phase.
 
 
-File: modus-themes.info,  Node: DIY Use a hook at the post-load-theme phase,  
Prev: DIY Add support for combobulate,  Up: Advanced customization
+File: modus-themes.info,  Node: DIY Add support for howm,  Next: DIY Use a 
hook at the post-load-theme phase,  Prev: DIY Add support for combobulate,  Up: 
Advanced customization
 
-7.23 DIY Use a hook at the post-load-theme phase
+7.23 DIY Add support for howm
+=
+
+The ‘howm’ package is a note-taking solution for Emacs.  Users can add
+support for its faces with something like the following.
+
+ (defun my-modus-themes-custom-faces (&rest _)
+   (modus-themes-with-colors
+ (custom-set-faces
+  `(action-lock-face ((,c :inherit button)))
+  `(howm-mode-keyword-face (( )))
+  `(howm-mode-ref-face ((,c :inherit link)))
+  `(howm-mode-title-face ((,c :inherit modus-themes-heading-0)))
+  `(howm-mode-wiki-face ((,c :inherit link)))
+  `(howm-reminder-deadline-face ((,c :foreground ,date-deadline)))
+  `(howm-reminder-late-deadline-face ((,c :inherit bold :foreground 
,date-deadline)))
+  `(howm-reminder-defer-face ((,c :foreground ,date-scheduled)))
+  `(howm-reminder-scheduled-face ((,c :foreground ,date-scheduled)))
+  `(howm-reminder-done-face ((,c :foreground ,prose-done)))
+  `(howm-reminder-todo-face ((,c :foreground ,prose-todo)))
+  `(howm-reminder-normal-face ((,c :foreground ,date-common)))
+  `(howm-reminder-today-face ((,c :inherit bold :foreground 
,date-common)))
+  `(howm-reminder-tomorrow-face ((,c :inherit bold :foreground 
,date-scheduled)))
+  `(howm-simulate-todo-mode-line-face ((,c :inherit bold)))
+  `(howm-view-empty-face (( )))
+  `(howm-view-hilit-face ((,c :inherit match)))
+  `(howm-view-name-face ((,c :inherit bold)))
+  `(iigrep-counts-face1 ((,c :foreground ,rainbow-1)))
+  `(iigrep-counts-face2 ((,c :foreground ,rainbow-2)))
+  `(iigrep-counts-face3 ((,c :foreground ,rainbow-3)))
+  `(iigrep-counts-face4 ((,c :foreground ,rainbow-4)))
+  `(iigrep-counts-face5 ((,c :foreground ,rainbow-5))
+
+ (add-hook 'enable-theme-functions #'my-modus-themes-custom-faces)
+
+
+File: modus-themes.info,  Node: DIY Use a hook at the post-load-theme phase,  
Prev: DIY Add support for howm,  Up: Advanced customization
+
+7.24 DIY Use a hook at the post-load-theme phase
 
 
 Many of the Do-It-Yourself (DIY) snippets provided herein make use of a
@@ -4121,7 +4161,7 @@ it will not use them (in plain terms, the code works with 
or without
 
 File: modus-themes.info,  Node: DIY A theme-agnostic hook for theme loading,  
Up: DIY Use a hook at the post-load-theme phase
 
-7.23.1 DIY A theme-agnostic hook for theme loading
+7.24.1 DIY A theme-agnostic hook for theme loading
 --
 
 [ NOTE: The following is for versions of Emacs before 29.  For Emacs 29
@@ -5773,20 +5813,20 @@ Ideas and user feedback
  Monterosso, Farasha

[elpa] externals/modus-themes c2cb0404c3 4/4: Replace deprecate colour in the manual's entry about solaire

[ELPA Syncer]

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

Replace deprecate colour in the manual's entry about solaire

Thanks to Edgar Vincent for bringing this matter to my attention. This
was done on the GitLab mirror, issue 316:
.
---
 doc/modus-themes.info | 98 +--
 doc/modus-themes.org  |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index e37e3fff65..438000d49a 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -3979,7 +3979,7 @@ theme colors in code with modus-themes-with-colors.
(modus-themes-with-colors
  (custom-set-faces
   `(solaire-default-face ((,c :inherit default :background ,bg-dim 
:foreground ,fg-dim)))
-  `(solaire-line-number-face ((,c :inherit solaire-default-face 
:foreground ,fg-unfocused)))
+  `(solaire-line-number-face ((,c :inherit solaire-default-face 
:foreground ,fg-dim)))
   `(solaire-hl-line-face ((,c :background ,bg-active)))
   `(solaire-org-hide-face ((,c :background ,bg-dim :foreground 
,bg-dim))
 
@@ -6576,54 +6576,54 @@ Node: DIY Toggle themes without reloading them157592
 Node: DIY Use more spacious margins or padding in Emacs frames158901
 Node: DIY Custom hl-todo colors163138
 Node: DIY Add support for solaire-mode164955
-Node: DIY Add support for meow-mode168053
-Node: DIY Add support for combobulate169833
-Node: DIY Add support for howm173437
-Node: DIY Use a hook at the post-load-theme phase175507
-Node: DIY A theme-agnostic hook for theme loading177621
-Node: Face coverage180252
-Node: Supported packages180704
-Node: Indirectly covered packages186448
-Node: Notes on individual packages187804
-Node: Note on calendarel weekday and weekend colors188904
-Node: Note on git-gutter in Doom Emacs190052
-Node: Note on php-mode multiline comments192552
-Node: Note on underlines in compilation buffers193312
-Node: Note on inline Latex in Org buffers194184
-Node: Note on dimmerel194794
-Node: Note on display-fill-column-indicator-mode196279
-Node: Note on highlight-parenthesesel197730
-Node: Note on mmm-modeel background colors203807
-Node: Note for prism206159
-Node: Note on company-mode overlay pop-up209371
-Ref: Note on company-mode overlay pop-up-Footnote-1210099
-Ref: Note on company-mode overlay pop-up-Footnote-2210166
-Node: Note on ERC escaped color sequences210221
-Ref: Note on ERC escaped color sequences-Footnote-1211649
-Node: Note on powerline or spaceline211759
-Node: Note on SHR colors212173
-Node: Note on SHR fonts212593
-Node: Note on Ement colors and fonts213280
-Node: Note on pdf-tools link hints214784
-Node: Note on the Notmuch logo217240
-Node: Note on goto-address-mode faces217772
-Node: Frequently Asked Questions218890
-Node: Is the contrast ratio about adjacent colors?219521
-Node: What does it mean to avoid exaggerations?221030
-Node: Why are colors mostly variants of blue magenta cyan?222880
-Node: What is the best setup for legibility?227214
-Node: Are these color schemes?229856
-Node: Port the Modus themes to other platforms?233510
-Node: Contributing236344
-Node: Sources of the themes236743
-Node: Issues you can help with237639
-Node: Patches require copyright assignment to the FSF239031
-Node: Acknowledgements241253
-Node: GNU Free Documentation License245532
-Node: Indices270695
-Node: Function index270874
-Node: Variable index272172
-Node: Concept index275523
+Node: DIY Add support for meow-mode168047
+Node: DIY Add support for combobulate169827
+Node: DIY Add support for howm173431
+Node: DIY Use a hook at the post-load-theme phase175501
+Node: DIY A theme-agnostic hook for theme loading177615
+Node: Face coverage180246
+Node: Supported packages180698
+Node: Indirectly covered packages186442
+Node: Notes on individual packages187798
+Node: Note on calendarel weekday and weekend colors188898
+Node: Note on git-gutter in Doom Emacs190046
+Node: Note on php-mode multiline comments192546
+Node: Note on underlines in compilation buffers193306
+Node: Note on inline Latex in Org buffers194178
+Node: Note on dimmerel194788
+Node: Note on display-fill-column-indicator-mode196273
+Node: Note on highlight-parenthesesel197724
+Node: Note on mmm-modeel background colors203801
+Node: Note for prism206153
+Node: Note on company-mode overlay pop-up209365
+Ref: Note on company-mode overlay pop-up-Footnote-1210093
+Ref: Note on company-mode overlay pop-up-Footnote-2210160
+Node: Note on ERC escaped color sequences210215
+Ref: Note on ERC escaped color sequences-Footnote-1211643
+Node: Note on powerline or spaceline211753
+Node: Note on SHR colors212167
+Node: Note on SHR fonts212587
+Node: Note on Ement colors and fonts213274
+Node: N

[nongnu] elpa/haskell-ts-mode 0f8e1cdb02 2/3: changing defvar

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 0f8e1cdb02b0fd6aa0ab51760196cf19ddf573f3
Author: pranshu 
Commit: pranshu 

changing defvar
---
 haskell-ts-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 7a0610c848..ff40a6ae66 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -149,7 +149,7 @@
`(["(" ")" "[" "]"] @font-lock-operator-face
  (infix operator: (_) @font-lock-operator-face
 
-(setq haskell-ts-indent-rules
+(defvar haskell-ts-indent-rules
   (let ((p-prev-sib
 (lambda (node _ _)
   (let ((n (treesit-node-prev-sibling node)))
@@ -428,6 +428,7 @@
 
 
 
+
 (provide 'haskell-ts-mode)
 
 ;;; haskell-ts-mode.el ends here

[nongnu] elpa/haskell-ts-mode updated (3c68ec42d1 -> d79cfaa13e)

[ELPA Syncer]

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

  from  3c68ec42d1 Added optional highlihgting to type signature
   new  77627a3966 Fixed prev-adaptive bug
   new  0f8e1cdb02 changing defvar
   new  d79cfaa13e Formatting changes


Summary of changes:
 haskell-ts-mode.el | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

[nongnu] elpa/gptel b1c4cb13c6: gptel-rewrite: Change menu description, layout, keys

[ELPA Syncer]

branch: elpa/gptel
commit b1c4cb13c690913aee64c1a5add4add939de86e8
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-rewrite: Change menu description, layout, keys

* gptel-rewrite.el (gptel-rewrite-menu, gptel-rewrite-menu,
gptel--suffix-rewrite-diff, gptel--suffix-rewrite-apply,
gptel--suffix-rewrite-clear): Use a better `gptel-rewrite-menu`
layout and transient menu keybindings for rewrite actions.
---
 gptel-rewrite.el | 36 +---
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/gptel-rewrite.el b/gptel-rewrite.el
index 9f8c6f0158..b161963b51 100644
--- a/gptel-rewrite.el
+++ b/gptel-rewrite.el
@@ -257,14 +257,17 @@ the changed regions. BUF is the (current) buffer."
 (gptel--rewrite-infix-diff:-U)]
[:description gptel--refactor-or-rewrite
 :if use-region-p
-(gptel--suffix-rewrite)]
-   [:description (lambda () (concat "Continue " (gptel--refactor-or-rewrite)))
-:if (lambda () (gptel--rewrite-sanitize-overlays))
+(gptel--suffix-rewrite)]]
+  [[:description (lambda () (concat "Diff " (gptel--refactor-or-rewrite) "s"))
+:if (lambda () gptel--rewrite-overlays)
 (gptel--suffix-rewrite-diff)
-(gptel--suffix-rewrite-ediff)
+(gptel--suffix-rewrite-ediff)]
+   [:description (lambda () (concat "Continue " (gptel--refactor-or-rewrite) 
"s"))
+:if (lambda () (gptel--rewrite-sanitize-overlays))
 (gptel--suffix-rewrite-merge)
-(gptel--suffix-rewrite-apply)
-"Cancel"
+(gptel--suffix-rewrite-apply)]
+   [:description (lambda () (concat "Reject " (gptel--refactor-or-rewrite) 
"s"))
+:if (lambda () (gptel--rewrite-sanitize-overlays))
 (gptel--suffix-rewrite-clear)]]
   (interactive)
   (unless gptel--rewrite-message
@@ -368,27 +371,24 @@ the changed regions. BUF is the (current) buffer."
 (transient-define-suffix gptel--suffix-rewrite-diff (&optional switches)
   "Diff LLM output against buffer."
   :if (lambda () gptel--rewrite-overlays)
-  :key "cd"
-  :description (concat "Diff  LLM " (downcase (gptel--refactor-or-rewrite))
-   "s against buffer")
+  :key "D"
+  :description (concat "Diff  LLM " (downcase (gptel--refactor-or-rewrite)) 
"s")
   (interactive (list (transient-args transient-current-command)))
   (gptel--rewrite-diff gptel--rewrite-overlays switches))
 
 (transient-define-suffix gptel--suffix-rewrite-ediff ()
   "Ediff LLM output against buffer."
   :if (lambda () gptel--rewrite-overlays)
-  :key "ce"
-  :description (concat "Ediff LLM " (downcase (gptel--refactor-or-rewrite))
- "s against buffer")
+  :key "E"
+  :description (concat "Ediff LLM " (downcase (gptel--refactor-or-rewrite)) 
"s")
   (interactive)
   (gptel--rewrite-ediff gptel--rewrite-overlays))
 
 (transient-define-suffix gptel--suffix-rewrite-merge ()
   "Insert LLM output as merge conflicts"
   :if (lambda () gptel--rewrite-overlays)
-  :key "ce"
-  :description (concat "LLM " (downcase (gptel--refactor-or-rewrite))
- "s as merge conflicts")
+  :key "cm"
+  :description "Accept as merge conflicts"
   (interactive)
   (gptel--rewrite-merge gptel--rewrite-overlays))
 
@@ -396,9 +396,7 @@ the changed regions. BUF is the (current) buffer."
   "Accept pending LLM rewrites."
   :if (lambda () gptel--rewrite-overlays)
   :key "ca"
-  :description (concat "Accept all pending LLM "
-   (downcase (gptel--refactor-or-rewrite))
-   "s")
+  :description "Accept in-place"
   (interactive)
   (gptel--rewrite-apply gptel--rewrite-overlays))
 
@@ -406,7 +404,7 @@ the changed regions. BUF is the (current) buffer."
   "Clear pending LLM rewrites."
   :if (lambda () gptel--rewrite-overlays)
   :key "ck"
-  :description (concat "Clear all pending LLM "
+  :description (concat "Clear pending "
(downcase (gptel--refactor-or-rewrite))
"s")
   (interactive)

[nongnu] elpa/helm-core updated (bb9f092ad6 -> 23f72fb284)

[ELPA Syncer]

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

  from  bb9f092ad6 Maybe switch to buffer in tab with imenu
  adds  87db6ba095 Make HFF consistent with buffers for switching to tab
  adds  6b88c35099 Make usage of prefarg consistent with marked and single 
candidate
  adds  23f72fb284 Use adaptive sort in insert bookmark location

No new revisions were added by this update.

Summary of changes:
 helm-buffers.el | 18 --
 helm-files.el   | 42 +-
 helm-utils.el   | 16 
 3 files changed, 45 insertions(+), 31 deletions(-)

[nongnu] elpa/helm updated (bb9f092ad6 -> 23f72fb284)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  bb9f092ad6 Maybe switch to buffer in tab with imenu
   new  87db6ba095 Make HFF consistent with buffers for switching to tab
   new  6b88c35099 Make usage of prefarg consistent with marked and single 
candidate
   new  23f72fb284 Use adaptive sort in insert bookmark location


Summary of changes:
 helm-buffers.el | 18 --
 helm-files.el   | 42 +-
 helm-utils.el   | 16 
 3 files changed, 45 insertions(+), 31 deletions(-)

[nongnu] elpa/haskell-ts-mode d79cfaa13e 3/3: Formatting changes

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit d79cfaa13e6a7d8fa84cd59421fe4340537519c1
Author: pranshu 
Commit: pranshu 

Formatting changes
---
 haskell-ts-mode.el | 4 
 1 file changed, 4 deletions(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index ff40a6ae66..bdb28bdc06 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -304,7 +304,6 @@
  (string-to-list "\r\n\f\v"))
 table))
 
-
 (defmacro haskell-ts-imenu-name-function (check-func)
   `(lambda (node)
  (if (funcall ,check-func node)
@@ -426,9 +425,6 @@
 (when (treesit-ready-p 'haskell)
   (add-to-list 'auto-mode-alist '("\\.hs\\'" . haskell-ts-mode)))
 
-
-
-
 (provide 'haskell-ts-mode)
 
 ;;; haskell-ts-mode.el ends here

[nongnu] elpa/helm 87db6ba095 1/3: Make HFF consistent with buffers for switching to tab

[ELPA Syncer]

branch: elpa/helm
commit 87db6ba09505d18e5c611041d03ae9f0d897e283
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Make HFF consistent with buffers for switching to tab
---
 helm-buffers.el | 18 --
 helm-files.el   | 14 ++
 helm-utils.el   | 14 ++
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/helm-buffers.el b/helm-buffers.el
index 7997b1bcce..1852fd4ce6 100644
--- a/helm-buffers.el
+++ b/helm-buffers.el
@@ -972,20 +972,10 @@ If REGEXP-FLAG is given use `query-replace-regexp'."
   "Run switch to other frame action from `helm-source-buffers-list'."
   'helm-buffer-switch-to-buffer-other-frame)
 
-(defun helm-buffers-switch-buffers-in-tab (candidate)
-  "Switch marked buffers in a new tab.
-If no marked candidates or only one marked, try to switch to CANDIDATE in its
-tab if some, otherwise, display it in a new tab."
-  (when (fboundp 'switch-to-buffer-other-tab)
-(let ((bufs (helm-marked-candidates)))
-  (if (cdr bufs)
-  (progn
-(switch-to-buffer-other-tab (car bufs))
-(helm-window-show-buffers bufs))
-(if helm-current-prefix-arg
-(switch-to-buffer-other-tab candidate)
-  (helm-buffers-maybe-switch-to-buffer-in-tab
-   candidate #'switch-to-buffer-other-tab))
+(defun helm-buffers-switch-buffers-in-tab (_candidate)
+  "Display marked buffers in a new tab.
+See `helm-buffers-switch-buffers-in-tab-1' for more infos."
+  (helm-buffers-switch-buffers-in-tab-1 (helm-marked-candidates)))
 
 (helm-make-command-from-action helm-buffers-switch-to-buffer-new-tab
   "Run switch to buffer in other tab action from `helm-source-buffers-list'."
diff --git a/helm-files.el b/helm-files.el
index d5a2858d64..17901bcd32 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -266,7 +266,7 @@ Should not be used among other sources.")
 ([C-c DEL] . 
helm-ff-run-toggle-auto-update))
   nil 'helm-ff-delete-char-backward--exit-fn)
 (when (fboundp 'tab-bar-mode)
-  (define-key map (kbd "C-c C-t")   'helm-ff-find-file-other-tab))
+  (define-key map (kbd "C-c C-t")   'helm-ff-run-find-file-other-tab))
 map)
   "Keymap for `helm-find-files'.")
 
@@ -869,7 +869,7 @@ want to use it, helm is still providing
"Find file other frame `C-c C-o'" 'find-file-other-frame
(lambda () (and (fboundp 'tab-bar-mode)
"Find file other tab `C-c C-t'"))
-   'find-file-other-tab
+   'helm-ff-find-file-other-tab
"Print File `C-c p, C-u to refresh'" 'helm-ff-print
"Locate `C-x C-f, C-u to specify locate db'" 'helm-ff-locate)
   "Actions for `helm-find-files'."
@@ -6438,9 +6438,15 @@ selecting them."
   ;; unspecified e.g user hit C-k foo RET.
   (t (find-file candidate)))
 
-(helm-make-command-from-action helm-ff-find-file-other-tab
+(defun helm-ff-find-file-other-tab (_candidate)
+  "Display marked files in a new tab.
+See `helm-buffers-switch-buffers-in-tab-1' for more infos."
+  (helm-buffers-switch-buffers-in-tab-1
+   (mapcar 'find-file-noselect (helm-marked-candidates
+
+(helm-make-command-from-action helm-ff-run-find-file-other-tab
 "Run find file in other tab action from `helm-find-files'."
-  'find-file-other-tab
+  'helm-ff-find-file-other-tab
   (cl-assert (fboundp 'tab-bar-mode) nil "Tab-bar-mode not available"))
 
 (defun helm-ff--new-dirs-to-update (path)
diff --git a/helm-utils.el b/helm-utils.el
index 94d32024c6..4e4b125c40 100644
--- a/helm-utils.el
+++ b/helm-utils.el
@@ -350,6 +350,20 @@ If a prefix arg is given split windows vertically."
when (member tab-name (split-string (cdr (assq 'name tab)) ", " t))
return tab))
 
+(defun helm-buffers-switch-buffers-in-tab-1 (buffers)
+  "Display BUFFERS in a new tab.
+If only one buffer in BUFFERS, try to switch to it in its
+tab if some, otherwise, display it in a new tab."
+  (when (fboundp 'switch-to-buffer-other-tab)
+(if (cdr buffers)
+(progn
+  (switch-to-buffer-other-tab (car buffers))
+  (helm-window-show-buffers buffers))
+  (if helm-current-prefix-arg
+  (switch-to-buffer-other-tab (car buffers))
+(helm-buffers-maybe-switch-to-buffer-in-tab
+ (car buffers) #'switch-to-buffer-other-tab)
+
 (defun helm--get-tab-names ()
   (let ((tab-bar-tab-name-function #'tab-bar-tab-name-all))
 (mapcar (lambda (tab)

[nongnu] elpa/helm 23f72fb284 3/3: Use adaptive sort in insert bookmark location

[ELPA Syncer]

branch: elpa/helm
commit 23f72fb284d4336dca209ef3996d59a65ab7f2d9
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Use adaptive sort in insert bookmark location

Limit the command to only Helm as well.
---
 helm-files.el | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index 17901bcd32..c235fab03a 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5668,19 +5668,21 @@ source is `helm-source-find-files'."
   "Insert helm-find-files bookmark in minibuffer."
   (interactive)
   (require 'helm-bookmark)
-  (helm :sources (helm-bookmark-build-source
-  "bookmark insert location"
-  'helm-bookmark-helm-find-files-setup-alist
-  helm-source-in-buffer
-  :action (lambda (candidate)
-(with-selected-window (minibuffer-window)
-  (goto-char (point-max))
-  (when (re-search-backward "/" nil t)
-(delete-region (match-end 0) (point-max))
-(forward-char 1))
-  (bookmark-insert-location candidate
-:buffer "*helm bookmark insert*"
-:allow-nest t))
+  (with-helm-alive-p
+(helm :sources (helm-bookmark-build-source
+"bookmark insert location"
+'helm-bookmark-helm-find-files-setup-alist
+helm-source-in-buffer
+:filtered-candidate-transformer 'helm-adaptive-sort
+:action (lambda (candidate)
+  (with-selected-window (minibuffer-window)
+(goto-char (point-max))
+(when (re-search-backward "/" nil t)
+  (delete-region (match-end 0) (point-max))
+  (forward-char 1))
+(bookmark-insert-location candidate
+  :buffer "*helm bookmark insert*"
+  :allow-nest t)))
 (put 'helm-ff-bookmark-insert-location 'helm-only t)
 
 (defun helm-find-files-initial-input (&optional input)

[nongnu] elpa/helm 6b88c35099 2/3: Make usage of prefarg consistent with marked and single candidate

[ELPA Syncer]

branch: elpa/helm
commit 6b88c3509935b8c13aed2543dd6a77a33aa6e4e3
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Make usage of prefarg consistent with marked and single candidate

when switching to tabs.
---
 helm-utils.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/helm-utils.el b/helm-utils.el
index 4e4b125c40..b6370b8633 100644
--- a/helm-utils.el
+++ b/helm-utils.el
@@ -356,7 +356,9 @@ If only one buffer in BUFFERS, try to switch to it in its
 tab if some, otherwise, display it in a new tab."
   (when (fboundp 'switch-to-buffer-other-tab)
 (if (cdr buffers)
-(progn
+(if helm-current-prefix-arg
+(cl-loop for b in buffers
+ do (switch-to-buffer-other-tab b))
   (switch-to-buffer-other-tab (car buffers))
   (helm-window-show-buffers buffers))
   (if helm-current-prefix-arg

[nongnu] elpa/haskell-ts-mode 77627a3966 1/3: Fixed prev-adaptive bug

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 77627a3966c32f128ebc51b0fde0812fe77ca263
Author: pranshu 
Commit: pranshu 

Fixed prev-adaptive bug
---
 haskell-ts-mode.el | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index e17df7f466..7a0610c848 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -149,7 +149,7 @@
`(["(" ")" "[" "]"] @font-lock-operator-face
  (infix operator: (_) @font-lock-operator-face
 
-(defvar haskell-ts-indent-rules
+(setq haskell-ts-indent-rules
   (let ((p-prev-sib
 (lambda (node _ _)
   (let ((n (treesit-node-prev-sibling node)))
@@ -168,7 +168,6 @@
((parent-is "lambda") standalone-parent 2)
 
((parent-is "class_declarations") prev-sibling 0)
-   ;; ((lambda (a b c) (message (treesit-node-type b)) nil))

;; in
((node-is "^in$") parent 0)
@@ -185,7 +184,7 @@
((node-is "quasiquote") grand-parent 2)
((parent-is "quasiquote_body") (lambda (_ _ c) c) 0)
((lambda (node parent bol)
- (let ((n (treesit-node-prev-sibling node)))
+ (if-let ((n (treesit-node-prev-sibling node)))
(while (string= "comment" (treesit-node-type n))
  (setq n (treesit-node-prev-sibling n)))
(string= "do" (treesit-node-type n
@@ -198,10 +197,17 @@
4)
((parent-is "alternatives") ,p-prev-sib 0)
 
-   (no-node prev-adaptive-prefix 0)
+   ;; prev-adaptive-prefix is broken sometimes
+   (no-node
+   (lambda (_ _ _)
+ (save-excursion
+   (goto-char (line-beginning-position 0))
+   (back-to-indentation)
+   (point)))
+   0)

((parent-is "data_constructors") parent 0)
-   
+
;; where
((lambda (node _ _)
  (let ((n (treesit-node-prev-sibling node)))
@@ -213,7 +219,7 @@
3)
((parent-is "local_binds\\|instance_declarations") ,p-prev-sib 0)
((node-is "^where$") parent 4)
-   
+
;; Match
;; ((match "match" nil 2 2 nil) ,p-prev-sib 0)
((lambda (node _ _)
@@ -242,7 +248,6 @@
 (eq pos 0
,p-prev-sib 0)
((parent-is "match") standalone-parent 2)
-   
((parent-is "haskell") column-0 0)
((parent-is "declarations") column-0 0)
 
@@ -421,6 +426,8 @@
 (when (treesit-ready-p 'haskell)
   (add-to-list 'auto-mode-alist '("\\.hs\\'" . haskell-ts-mode)))
 
+
+
 (provide 'haskell-ts-mode)
 
 ;;; haskell-ts-mode.el ends here