[nongnu] elpa/aidermacs 43780ca542: Use read-string instead of read-from-minibuffer

[ELPA Syncer]

branch: elpa/aidermacs
commit 43780ca542083e43041ba73b9c04a3a7dee9aea2
Author: Adam Niederer 
Commit: Matthew Zeng 

Use read-string instead of read-from-minibuffer
---
 aidermacs.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aidermacs.el b/aidermacs.el
index bdb02bfa4e..8363940b27 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -604,10 +604,10 @@ Use highlighted region as context unless IGNORE-CONTEXT 
is set to non-nil."
 (format " in %s regarding this section:\n```\n%s\n```\n" 
(buffer-name) region-text)))
  ;; Read user input
  (user-command
-  (read-from-minibuffer
+  (read-string
(concat command " " prompt-prefix context
(when guide (format " (%s)" guide)) ": ")
-   nil nil nil 'aidermacs--read-string-history)))
+   nil 'aidermacs--read-string-history nil nil)))
 ;; Add to history if not already there, removing any duplicates
 (setq aidermacs--read-string-history
   (delete-dups (cons user-command aidermacs--read-string-history)))

[elpa] externals/denote 11726dae4b 4/7: Merge pull request #598 from rytswd/main

[ELPA Syncer]

branch: externals/denote
commit 11726dae4b30b78616c6ba964edb3f8c06f18244
Merge: b54229c724 be2eb704a0
Author: Protesilaos Stavrou 
Commit: GitHub 

Merge pull request #598 from rytswd/main

Add note about denote-use-template duplicate
---
 README.org | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/README.org b/README.org
index 1e47ceb3fb..b9bc32301f 100644
--- a/README.org
+++ b/README.org
@@ -893,6 +893,12 @@ sets the Org file extension for the created note to ensure 
that the
 capture process works as intended, especially for the desired output of
 the ~denote-org-capture-specifiers~.
 
+Also, using ~denote-use-template~ with ~let~ bind could potentially interfere
+with the user option ~denote-org-capture-specifiers~. Along with the ~let~
+bind for ~denote-use-template~, it is advisable to bind
+~denote-org-capture-specifiers~ to nil or an empty string in case of template
+getting duplicated.
+
 [ You may not need ~org-capture~ to do what you want 
([[#h:11946562-7eb0-4925-a3b5-92d75f1f5895][Write your own convenience 
commands]]). ]
 
 ** Create note with specific prompts using Org capture

[elpa] externals/denote 86ee5cbc4a 6/7: Do not mention the 'denote-use-*' in the section about Org capture and link to it instead

[ELPA Syncer]

branch: externals/denote
commit 86ee5cbc4a484a4530867c89dd3e94d83e4102d7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Do not mention the 'denote-use-*' in the section about Org capture and link 
to it instead

Otherwise we might have information in two places that is out of sync
with each other.
---
 README.org | 31 +--
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/README.org b/README.org
index 2919cff2ef..2066af5225 100644
--- a/README.org
+++ b/README.org
@@ -1018,32 +1018,11 @@ of the ~denote-directory~. The following code block 
does exactly that.
  :jump-to-captured t)))
 #+end_src
 
-The values one may predefine in this way are via these variables 
([[#h:c916d8c5-540a-409f-b780-6ccbd90e088e][For developers or advanced users]]):
-
-#+findex: denote-use-date
-+ ~denote-use-date~
-
-#+findex: denote-use-directory
-+ ~denote-use-directory~
-
-#+findex: denote-use-file-type
-+ ~denote-use-file-type~
-
-#+findex: denote-use-keywords
-+ ~denote-use-keywords~
-
-#+findex: denote-use-signature
-+ ~denote-use-signature~
-
-#+findex: denote-use-template
-+ ~denote-use-template~
-
-#+findex: denote-use-title
-+ ~denote-use-title~
-
-When there exists a binding for the aforementioned variables, the
-corresponding prompt is always skipped. It is thus paramount to never
-set those variables outside the scope of a ~let~ (or equivalent).
+The values one may predefine in this way are described elsewhere in
+this manual ([[#h:a8b9082c-8bd5-492d-8da7-4f41ee493d59][Predefined note values 
for developers or advanced users]]).
+When there exists a binding for those variables, the corresponding
+prompt is always skipped. It is thus paramount to never set those
+variables outside the scope of a ~let~ (or equivalent).
 
 With those granted, here is another example scenario where the user
 wants to have a constant value for the subdirectory but also be

[elpa] externals/denote updated (8f7099eeb8 -> d7c4046f16)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  8f7099eeb8 Document the new user option denote-buffer-name-prefix
   new  6c2295e75e De-duplicate code in ‘denote-format-buffer-name’
   new  b54229c724 Merge pull request #599 from mjkalyan/prefix
   new  be2eb704a0 Add note about denote-use-template duplicate
   new  11726dae4b Merge pull request #598 from rytswd/main
   new  5a0cfd07dc Document the 'denote-use-*' variables in their own 
section of the manual
   new  86ee5cbc4a Do not mention the 'denote-use-*' in the section about 
Org capture and link to it instead
   new  d7c4046f16 Reword the note about 'denote-use-template' with regard 
to 'denote-org-capture-specifiers'


Summary of changes:
 README.org | 127 +
 denote.el  |   4 +-
 2 files changed, 61 insertions(+), 70 deletions(-)

[elpa] externals/denote d7c4046f16 7/7: Reword the note about 'denote-use-template' with regard to 'denote-org-capture-specifiers'

[ELPA Syncer]

branch: externals/denote
commit d7c4046f16e687ab46494279d8961ac228641d68
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Reword the note about 'denote-use-template' with regard to 
'denote-org-capture-specifiers'

The original was provided by Ryota in pull request 598:
.
---
 README.org | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.org b/README.org
index 2066af5225..4cddb8c50d 100644
--- a/README.org
+++ b/README.org
@@ -893,11 +893,10 @@ sets the Org file extension for the created note to 
ensure that the
 capture process works as intended, especially for the desired output of
 the ~denote-org-capture-specifiers~.
 
-Also, using ~denote-use-template~ with ~let~ bind could potentially interfere
-with the user option ~denote-org-capture-specifiers~. Along with the ~let~
-bind for ~denote-use-template~, it is advisable to bind
-~denote-org-capture-specifiers~ to nil or an empty string in case of template
-getting duplicated.
+Developers or advanced users who ~let~ bind the ~denote-use-template~
+must consider setting ~denote-org-capture-specifiers~ to nil or an
+appropriate string ([[#h:a8b9082c-8bd5-492d-8da7-4f41ee493d59][Predefined note 
values for developers or advanced users]]).
+Otherwise the contents of the new note may contain duplicates.
 
 [ You may not need ~org-capture~ to do what you want 
([[#h:11946562-7eb0-4925-a3b5-92d75f1f5895][Write your own convenience 
commands]]). ]
 
@@ -6377,12 +6376,12 @@ Denote is meant to be a collective effort.  Every bit 
of help matters.
   Kai von Fintel, Kierin Bell, Kostas Andreadis, Kristoffer Balintona,
   Kyle Meyer, Laurent Gatto, Lucas Quintana, Maikol Solis, Marc
   Fargas, Matthew Lemon, Noboru Ota (nobiot), Norwid Behrnd, Octavian,
-  Peter Prevos, Philip Kaludercic, Quiliro Ordóñez, Stephen R. Kifer,
-  Stefan Monnier, Stefan Thesing, Thibaut Benjamin, Tomasz Hołubowicz,
-  TomoeMami , Vedang Manerikar, Wesley Harvey, Zhenxu Xu, arsaber101,
-  bryanrinders, eum3l, experimental-code-86, ezchi, jarofromel,
-  leinfink (Henrik), l-o-l-h (Lincoln), mattyonweb, maxbrieiev,
-  mentalisttraceur, pmenair, relict007, skissue.
+  Peter Prevos, Philip Kaludercic, Ryota, Quiliro Ordóñez, Stephen R.
+  Kifer, Stefan Monnier, Stefan Thesing, Thibaut Benjamin, Tomasz
+  Hołubowicz, TomoeMami , Vedang Manerikar, Wesley Harvey, Zhenxu Xu,
+  arsaber101, bryanrinders, eum3l, experimental-code-86, ezchi,
+  jarofromel, leinfink (Henrik), l-o-l-h (Lincoln), mattyonweb,
+  maxbrieiev, mentalisttraceur, pmenair, relict007, skissue.
 
 + Ideas and/or user feedback :: Abin Simon, Aditya Yadav, Alan
   Schmitt, Aleksandr Vityazev, Alex Griffin, Alex Hirschfeld, Alexis

[elpa] externals/denote be2eb704a0 1/7: Add note about denote-use-template duplicate

[ELPA Syncer]

branch: externals/denote
commit be2eb704a01b7dae3803173e7749a1a4fbd51cfe
Author: Ryota 
Commit: Ryota 

Add note about denote-use-template duplicate

This fixes #545.
---
 README.org | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/README.org b/README.org
index 1e47ceb3fb..b9bc32301f 100644
--- a/README.org
+++ b/README.org
@@ -893,6 +893,12 @@ sets the Org file extension for the created note to ensure 
that the
 capture process works as intended, especially for the desired output of
 the ~denote-org-capture-specifiers~.
 
+Also, using ~denote-use-template~ with ~let~ bind could potentially interfere
+with the user option ~denote-org-capture-specifiers~. Along with the ~let~
+bind for ~denote-use-template~, it is advisable to bind
+~denote-org-capture-specifiers~ to nil or an empty string in case of template
+getting duplicated.
+
 [ You may not need ~org-capture~ to do what you want 
([[#h:11946562-7eb0-4925-a3b5-92d75f1f5895][Write your own convenience 
commands]]). ]
 
 ** Create note with specific prompts using Org capture

[elpa] externals/denote 6c2295e75e 2/7: De-duplicate code in ‘denote-format-buffer-name’

[ELPA Syncer]

branch: externals/denote
commit 6c2295e75e73cdc462984d4b0a55da71bf6a471e
Author: James Kalyan 
Commit: James Kalyan 

De-duplicate code in ‘denote-format-buffer-name’

i.e. Just make the format string conditional, not the whole format.
---
 denote.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/denote.el b/denote.el
index 5f10a985b1..8497dce0fa 100644
--- a/denote.el
+++ b/denote.el
@@ -1415,9 +1415,7 @@ Return the absolute path to the matching file."
   "Use STRING to return a Denote buffer name with `denote-buffer-name-prefix'.
 With optional SPECIAL, wrap the name in asterisks, signifying that this
 is a special buffer."
-  (if special
-  (format "*%s%s*" denote-buffer-name-prefix string)
-(format "%s%s" denote-buffer-name-prefix string)))
+  (format (if special "*%s%s*" "%s%s") denote-buffer-name-prefix string))
 
  The sort mechanism
 

[elpa] externals/auctex a085165d4c: ; * latex.el (LaTeX-xparse-macro-parse): Fix comments.

[ELPA Syncer]

branch: externals/auctex
commit a085165d4c264ca13c37e4356e29287e3d51d44d
Author: Arash Esbati 
Commit: Arash Esbati 

; * latex.el (LaTeX-xparse-macro-parse): Fix comments.
---
 latex.el | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/latex.el b/latex.el
index 3a32c4e7de..797513f29a 100644
--- a/latex.el
+++ b/latex.el
@@ -2091,10 +2091,8 @@ TYPE is one of the symbols mac or env."
 (t nil
   (if (eq type 'env)
   ;; Parsed enviroments: If we are Renew'ing or Delare'ing, we
-  ;; delete the enviroment first from `LaTeX-environment-list'
-  ;; before adding the new one.  We have to sort the value of
-  ;; `LaTeX-environment-list' by running the function of the
-  ;; same name:
+  ;; delete the enviroment first from `LaTeX-auto-environment'
+  ;; before adding the new one:
   (progn
 (when (member what '("Renew" "Declare"))
   (setq LaTeX-auto-environment
@@ -2105,9 +2103,8 @@ TYPE is one of the symbols mac or env."
  `(,name LaTeX-env-args ,@(reverse args))
(list name
 ;; Parsed macros: If we are Renew'ing or Delare'ing, we delete
-;; the macros first from `TeX-symbol-list' before adding the
-;; new ones.  We have to sort the value of `TeX-symbol-list'
-;; by running the function of the same name:
+;; the macros first from `TeX-auto-symbol' before adding the new
+;; ones:
 (when (member what '("Renew" "Declare"))
   (setq TeX-auto-symbol
 (assq-delete-all (car (assoc name TeX-auto-symbol))

[nongnu] elpa/annotate updated (7b1c5aa531 -> fdf41ed93a)

[ELPA Syncer]

elpasync pushed a change to branch elpa/annotate.

  from  7b1c5aa531 Merge pull request #168 from 
cage2/optimize-searching-for-annotations
   new  634a953ea0 - increased version number;
   new  3d07ffee9d - bound 'annotate-annotation-expansion-map' to the empty 
string, to remove code used during development.
   new  d516a62ae6 - bound 'annotate-autosave' to non nil, enabling the 
autosave feature as default.
   new  65338aff67 - improved expansion map to include a swith to enable 
trimming of commands' output.
   new  fdf41ed93a Merge pull request #169 from cage2/master


Summary of changes:
 Changelog   |  9 +
 NEWS.org|  8 
 README.org  | 13 +
 annotate.el | 41 +
 4 files changed, 67 insertions(+), 4 deletions(-)

[nongnu] elpa/annotate d516a62ae6 3/5: - bound 'annotate-autosave' to non nil, enabling the autosave feature as default.

[ELPA Syncer]

branch: elpa/annotate
commit d516a62ae6afe67ce07fd5c5bae42ffdf7a5c723
Author: cage 
Commit: cage 

- bound 'annotate-autosave' to non nil, enabling the autosave feature as 
default.
---
 annotate.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/annotate.el b/annotate.el
index 1da5fb735a..69176f4656 100644
--- a/annotate.el
+++ b/annotate.el
@@ -251,7 +251,7 @@ of lines. The center of the region is the position of the
 annotation as defined in the database."
   :type 'number)
 
-(defcustom annotate-autosave nil
+(defcustom annotate-autosave t
   "Whether annotations should be saved after each user action,
 e.g. new annotation created, existing one amended or deleted."
   :type 'boolean)

[nongnu] elpa/aidermacs 8ad2ec9ece 3/3: Don't start aider just to stop it when not running

[ELPA Syncer]

branch: elpa/aidermacs
commit 8ad2ec9ece03b07ec2c95824f6991d170698bd7a
Author: Adam Niederer 
Commit: Matthew Zeng 

Don't start aider just to stop it when not running
---
 aidermacs.el | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aidermacs.el b/aidermacs.el
index 21aa3bf1cf..bdb02bfa4e 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -438,8 +438,10 @@ If the current buffer is already the aidermacs buffer, do 
nothing."
 (defun aidermacs-exit ()
   "Send the command \"/exit\" to the aidermacs buffer."
   (interactive)
-  (aidermacs--cleanup-temp-buffers)
-  (aidermacs--send-command "/exit" t))
+  (when (get-buffer (aidermacs-get-buffer-name))
+(aidermacs--cleanup-temp-buffers)
+(when (aidermacs--live-p (aidermacs-get-buffer-name))
+  (aidermacs--send-command "/exit" t
 
 (defun aidermacs--process-message-if-multi-line (str)
   "Process multi-line chat messages for proper formatting.

[nongnu] elpa/aidermacs updated (4c514f65a5 -> 8ad2ec9ece)

[ELPA Syncer]

elpasync pushed a change to branch elpa/aidermacs.

  from  4c514f65a5 Do not require exact matches when selecting models
   new  b52e987d5f Don't send commands to aider if it's not ready for them
   new  88d2864454 Use read-from-minibuffer instead of completing-read for 
prompts
   new  8ad2ec9ece Don't start aider just to stop it when not running


Summary of changes:
 aidermacs-backend-comint.el |  3 +++
 aidermacs-backend-vterm.el  |  5 +++-
 aidermacs.el| 61 ++---
 3 files changed, 43 insertions(+), 26 deletions(-)

[nongnu] elpa/annotate 3d07ffee9d 2/5: - bound 'annotate-annotation-expansion-map' to the empty string, to remove code used during development.

[ELPA Syncer]

branch: elpa/annotate
commit 3d07ffee9d7302d80117639bcb21fd5cc3e091e2
Author: cage 
Commit: cage 

- bound 'annotate-annotation-expansion-map' to the empty string, to remove 
code used during development.
---
 annotate.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/annotate.el b/annotate.el
index 3c1310fefc..1da5fb735a 100644
--- a/annotate.el
+++ b/annotate.el
@@ -256,7 +256,7 @@ annotation as defined in the database."
 e.g. new annotation created, existing one amended or deleted."
   :type 'boolean)
 
-(defcustom annotate-annotation-expansion-map '(("%d" . "date +%Y-%m-%d"))
+(defcustom annotate-annotation-expansion-map '()
   "The expansion map for the annotation text. If a substring  in the 
annotation text matches the string in the car value of each cons cell of this 
alist, it is expanded with the results of  passing the cdr of each cell to a 
system shell. Example below.
 
 The expression:

[nongnu] elpa/annotate fdf41ed93a 5/5: Merge pull request #169 from cage2/master

[ELPA Syncer]

branch: elpa/annotate
commit fdf41ed93a31386a8b4fddaf01f15ee256e2f91f
Merge: 7b1c5aa531 65338aff67
Author: cage2 <1257703+ca...@users.noreply.github.com>
Commit: GitHub 

Merge pull request #169 from cage2/master

Added annotation's text expansion feature
---
 Changelog   |  9 +
 NEWS.org|  8 
 README.org  | 13 +
 annotate.el | 41 +
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index d7f4f7d05e..a471f96bcf 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,19 @@
+2025-03-20 cage
+
+   Merge pull request #168 from cage2/optimize-searching-for-annotations
+
 2025-03-19 cage
 
+   * Changelog,
+   * NEWS.org,
* annotate.el:
 
- optimized 'annotate-annotations-overlay-in-range' by jumping from an
annotation to another, instead of scanning every single character of
the buffer.
+   - increased version number;
+   - updated NEWS file and changelog;
+   - fixed docstring.
 
 2025-03-06 cage
 
diff --git a/NEWS.org b/NEWS.org
index 95ea04b051..daa4ad8b37 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,11 @@
+- 2025-04-23 v2.4.0 cage ::
+
+  This version adds annotation's text expansion feature:
+
+  #+BEGIN_SRC text
+  "%d foo" → "2025-04-23 foo"
+  #+END_SRC
+
 - 2025-03-05 v2.3.1 cage ::
 
   This version optimizes a function that searches for annotations in a buffer; 
this changes should speed up commands like 
~annotate-toggle-all-annotations-text~.
diff --git a/README.org b/README.org
index 5a36f2574f..036c875cbd 100644
--- a/README.org
+++ b/README.org
@@ -221,6 +221,19 @@ Shows or hides the annotation's text in the whole buffer.
 **  annotate-autosave
 Whether annotations should be saved after each user action, e.g. new 
annotation created, existing one amended or deleted. Boolean value, default is 
~nil~ i.e. do not perform autosave and update the annotations in a buffer, just 
after killing buffer or quitting Emacs.
 
+** annotate-annotation-expansion-map
+
+The expansion map for the annotation text. If a substring in the annotation 
text matches the string in the first item of each element of this list, it will 
be expanded with the results of passing the second item — as a command — to a 
system shell, if the third item is not null, the output string of the command's 
results will be trimmed (spaces or some others non printable characters will be 
removed from both ends, see: `string-trim'). Example below.
+
+The expression:
+
+#+BEGIN_SRC lisp
+  (setf annotate-annotation-expansion-map
+   '((\"%d\" \"date +%Y-%m-%d\" t)))
+#+END_SRC
+
+Will expand any occurrence of \"%d\" in the annotation's text with the current 
date (format: \"-MM-DD\"), moreover the results will be trimmed.
+
 * More documentation
 
 Please check ~M-x customize-group RET annotate~ as there is extensive 
documentation for each customizable variable.
diff --git a/annotate.el b/annotate.el
index b666ae1533..fbaa32b382 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold , cage 

 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 2.3.1
+;; Version: 2.4.0
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "2.3.1"
+  :version "2.4.0"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -251,11 +251,22 @@ of lines. The center of the region is the position of the
 annotation as defined in the database."
   :type 'number)
 
-(defcustom annotate-autosave nil
+(defcustom annotate-autosave t
   "Whether annotations should be saved after each user action,
 e.g. new annotation created, existing one amended or deleted."
   :type 'boolean)
 
+(defcustom annotate-annotation-expansion-map '()
+  "The expansion map for the annotation text. If a substring in the annotation 
text matches the string in the first item of each element of this list, it is 
expanded with the results of  passing the second item — as a command — to a 
system shell, if the third item is not null, the output string of the command's 
results are trimmed (spaces or some others non printable characters are removed 
from both ends, see: `string-trim'). Example below.
+
+The expression:
+
+(setf annotate-annotation-expansion-map
+  '((\"%d\" \"date +%Y-%m-%d\" t)))
+
+Will expand any occurrence of \"%d\" in the annotation's text with the current 
date (format: \"-MM-DD\"), moreover the results will be trimmed"
+  :type '(repeat (list string string boolean)))
+
 (defconst annotate-prop-chain-position
   'position)
 
@@ -727,6 +738,27 @@ specified by `FROM' and `TO'."
   (cl-count-if (lambda (a) (char-equal a ?\n))
(buffer-substring-no-properties from to)))
 
+(defun annotate--expand-annotation-text (annotation-text)
+  (cl-flet ((regex (expansion-item)
+  (cl-first expansion-item))
+

[nongnu] elpa/aidermacs b52e987d5f 1/3: Don't send commands to aider if it's not ready for them

[ELPA Syncer]

branch: elpa/aidermacs
commit b52e987d5f7f275b12e048766e1cb150c1c9a9b0
Author: Adam Niederer 
Commit: Matthew Zeng 

Don't send commands to aider if it's not ready for them

This can occur when e.g. the autoupdate prompt runs - we send a command, 
aider
is expecting a yes/no, the command doesn't run and comint sometimes throws 
some
error. Instead, ask the user to resolve whatever aider is asking of them 
first.
---
 aidermacs-backend-comint.el |  3 +++
 aidermacs-backend-vterm.el  |  5 -
 aidermacs.el| 39 ++-
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/aidermacs-backend-comint.el b/aidermacs-backend-comint.el
index 92d3c020c6..c72924dde6 100644
--- a/aidermacs-backend-comint.el
+++ b/aidermacs-backend-comint.el
@@ -124,6 +124,7 @@ are next states.")
 ;; Check if the output contains a prompt
 (when (string-match-p aidermacs-prompt-regexp 
aidermacs--comint-output-temp)
   (aidermacs--store-output aidermacs--comint-output-temp)
+  (setq-local aidermacs--ready t)
   ;; Check if any files were edited and show ediff if needed
   (let ((edited-files (aidermacs--detect-edited-files)))
 (if edited-files
@@ -316,6 +317,7 @@ BUFFER-NAME is the name for the aidermacs buffer."
 (unless (comint-check-proc buffer-name)
   (apply #'make-comint-in-buffer "aidermacs" buffer-name program nil args)
   (with-current-buffer buffer-name
+(setq-local aidermacs--ready nil)
 (aidermacs-comint-mode)
 (setq aidermacs--syntax-work-buffer
   (get-buffer-create (concat " *aidermacs-syntax" 
buffer-name)))
@@ -326,6 +328,7 @@ BUFFER is the target buffer.  COMMAND is the text to send."
   (with-current-buffer buffer
 (let ((process (get-buffer-process buffer))
   (inhibit-read-only t))
+  (setq-local aidermacs--ready nil)
   (goto-char (process-mark process))
   (aidermacs-reset-font-lock-state)
   (insert (propertize command
diff --git a/aidermacs-backend-vterm.el b/aidermacs-backend-vterm.el
index a7dbc53f5b..4cc23ac2cd 100644
--- a/aidermacs-backend-vterm.el
+++ b/aidermacs-backend-vterm.el
@@ -110,6 +110,7 @@ If the finish sequence is detected, store the output via
 ;; If we found a shell prompt indicating output finished
 (when (string-match-p expected prompt-line)
   (aidermacs--store-output (string-trim output))
+  (setq-local aidermacs--ready t)
   (let ((edited-files (aidermacs--detect-edited-files)))
 ;; Check if any files were edited and show ediff if needed
 (if edited-files
@@ -250,7 +251,8 @@ BUFFER-NAME is the name for the vterm buffer."
   (with-current-buffer (vterm-other-window)
 (setq-local vterm-max-scrollback 1000
 aidermacs--vterm-active-timer nil
-aidermacs--vterm-last-check-point nil)
+aidermacs--vterm-last-check-point nil
+aidermacs--ready t)
 (aidermacs-vterm-mode 1)
 ;; Add cleanup hook
 (add-hook 'kill-buffer-hook #'aidermacs--vterm-cleanup nil t
@@ -260,6 +262,7 @@ BUFFER-NAME is the name for the vterm buffer."
   "Send command to the aidermacs vterm buffer.
 BUFFER is the target buffer to send to.  COMMAND is the text to send."
   (with-current-buffer buffer
+(setq-local aidermacs--ready nil)
 ;; Cancel any existing timer to prevent resource leaks
 (aidermacs--maybe-cancel-active-timer)
 ;; Only process if we have a non-empty command
diff --git a/aidermacs.el b/aidermacs.el
index 93bca39f4c..c883c75cc0 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -55,6 +55,10 @@
   "Buffer-local variable to track the current aidermacs mode.
 Possible values: `code', `ask', `architect', `help'.")
 
+(defvar-local aidermacs--ready nil
+  "Buffer-local variable to track whether aider is ready to accept
+commands: `nil', `t'")
+
 (defcustom aidermacs-use-architect-mode nil
   "If non-nil, use separate Architect/Editor mode."
   :type 'boolean)
@@ -266,6 +270,11 @@ If supplied, SUFFIX is appended to the buffer name within 
the earmuffs."
   (file-truename display-root)
   (or suffix "")
 
+(defun aidermacs--live-p (buffer-name)
+  "Return t if the aider buffer is availble and process is currently running"
+  (and (get-buffer buffer-name)
+   (process-live-p (get-buffer-process (or buffer-name 
(aidermacs-get-buffer-name))
+
 ;;;###autoload
 (defun aidermacs-run ()
   "Run aidermacs process using the selected backend.
@@ -330,8 +339,7 @@ This function sets up the appropriate arguments and 
launches the process."
'("--subtree-only")
  ;; Take the original aidermacs-extra-args instead of the flat ones
  (final-args (append backend-args aidermacs-extra-args)))
-(if (and (get-buffer buffer-name)
-(process-live-p (g

[nongnu] elpa/annotate 65338aff67 4/5: - improved expansion map to include a swith to enable trimming of commands' output.

[ELPA Syncer]

branch: elpa/annotate
commit 65338aff67b235671b92475bb62642fd69c5bf45
Author: cage 
Commit: cage 

- improved expansion map to include a swith to enable trimming of commands' 
output.
---
 README.org  |  7 +++
 annotate.el | 25 -
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/README.org b/README.org
index b8a0b7faf4..036c875cbd 100644
--- a/README.org
+++ b/README.org
@@ -223,17 +223,16 @@ Whether annotations should be saved after each user 
action, e.g. new annotation
 
 ** annotate-annotation-expansion-map
 
-The Expansion map for the annotation text. If a substring  in the annotation 
text matches the string in the car value of each cons cell of this alist, it is 
expanded with the results of  passing the cdr of each cell to a system shell. 
Example below.
+The expansion map for the annotation text. If a substring in the annotation 
text matches the string in the first item of each element of this list, it will 
be expanded with the results of passing the second item — as a command — to a 
system shell, if the third item is not null, the output string of the command's 
results will be trimmed (spaces or some others non printable characters will be 
removed from both ends, see: `string-trim'). Example below.
 
 The expression:
 
 #+BEGIN_SRC lisp
   (setf annotate-annotation-expansion-map
-   '(("%d" . "date +%Y-%m-%d")))
+   '((\"%d\" \"date +%Y-%m-%d\" t)))
 #+END_SRC
 
-Will expand any occurrence of "%d" in the annotation's text with
-the current date (format: "-MM-DD").
+Will expand any occurrence of \"%d\" in the annotation's text with the current 
date (format: \"-MM-DD\"), moreover the results will be trimmed.
 
 * More documentation
 
diff --git a/annotate.el b/annotate.el
index 69176f4656..fbaa32b382 100644
--- a/annotate.el
+++ b/annotate.el
@@ -257,16 +257,15 @@ e.g. new annotation created, existing one amended or 
deleted."
   :type 'boolean)
 
 (defcustom annotate-annotation-expansion-map '()
-  "The expansion map for the annotation text. If a substring  in the 
annotation text matches the string in the car value of each cons cell of this 
alist, it is expanded with the results of  passing the cdr of each cell to a 
system shell. Example below.
+  "The expansion map for the annotation text. If a substring in the annotation 
text matches the string in the first item of each element of this list, it is 
expanded with the results of  passing the second item — as a command — to a 
system shell, if the third item is not null, the output string of the command's 
results are trimmed (spaces or some others non printable characters are removed 
from both ends, see: `string-trim'). Example below.
 
 The expression:
 
 (setf annotate-annotation-expansion-map
-  '((\"%d\" . \"date +%Y-%m-%d\")))
+  '((\"%d\" \"date +%Y-%m-%d\" t)))
 
-Will expand any occurrence of \"%d\" in the annotation's text with
-the current date (format: \"-MM-DD\")"
-  :type  '(alist :key-type string :value-type string))
+Will expand any occurrence of \"%d\" in the annotation's text with the current 
date (format: \"-MM-DD\"), moreover the results will be trimmed"
+  :type '(repeat (list string string boolean)))
 
 (defconst annotate-prop-chain-position
   'position)
@@ -740,17 +739,25 @@ specified by `FROM' and `TO'."
(buffer-substring-no-properties from to)))
 
 (defun annotate--expand-annotation-text (annotation-text)
+  (cl-flet ((regex (expansion-item)
+  (cl-first expansion-item))
+   (trimp (expansion-item)
+  (cl-third expansion-item))
+   (command (expansion-item)
+(cl-second expansion-item)))
   (cl-loop with results = annotation-text
   for expansion in annotate-annotation-expansion-map
-  when (string-match-p (car expansion) results)
-  do (let ((expansion-results (string-trim (shell-command-to-string 
(cdr expansion)
+  when (string-match-p (regex expansion) results)
+  do (let ((expansion-results (shell-command-to-string (command 
expansion
+   (when (trimp expansion)
+ (setf expansion-results (string-trim expansion-results)))
(setf results
- (replace-regexp-in-string (car expansion)
+ (replace-regexp-in-string (regex expansion)
expansion-results
results
t
t)))
-  finally (return results)))
+  finally (return results
 
 (defun annotate-annotate (&optional color-index)
   "Create, modify, or delete annotation.

[nongnu] elpa/annotate 634a953ea0 1/5: - increased version number;

[ELPA Syncer]

branch: elpa/annotate
commit 634a953ea018edd55e4cf51343c306e5b39a472f
Author: cage 
Commit: cage 

- increased version number;

- added code to implement annotation's text expansion;

- updated README, changelog and NEWS files.
---
 Changelog   |  9 +
 NEWS.org|  8 
 README.org  | 14 ++
 annotate.el | 32 +---
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index d7f4f7d05e..a471f96bcf 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,19 @@
+2025-03-20 cage
+
+   Merge pull request #168 from cage2/optimize-searching-for-annotations
+
 2025-03-19 cage
 
+   * Changelog,
+   * NEWS.org,
* annotate.el:
 
- optimized 'annotate-annotations-overlay-in-range' by jumping from an
annotation to another, instead of scanning every single character of
the buffer.
+   - increased version number;
+   - updated NEWS file and changelog;
+   - fixed docstring.
 
 2025-03-06 cage
 
diff --git a/NEWS.org b/NEWS.org
index 95ea04b051..daa4ad8b37 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,11 @@
+- 2025-04-23 v2.4.0 cage ::
+
+  This version adds annotation's text expansion feature:
+
+  #+BEGIN_SRC text
+  "%d foo" → "2025-04-23 foo"
+  #+END_SRC
+
 - 2025-03-05 v2.3.1 cage ::
 
   This version optimizes a function that searches for annotations in a buffer; 
this changes should speed up commands like 
~annotate-toggle-all-annotations-text~.
diff --git a/README.org b/README.org
index 5a36f2574f..b8a0b7faf4 100644
--- a/README.org
+++ b/README.org
@@ -221,6 +221,20 @@ Shows or hides the annotation's text in the whole buffer.
 **  annotate-autosave
 Whether annotations should be saved after each user action, e.g. new 
annotation created, existing one amended or deleted. Boolean value, default is 
~nil~ i.e. do not perform autosave and update the annotations in a buffer, just 
after killing buffer or quitting Emacs.
 
+** annotate-annotation-expansion-map
+
+The Expansion map for the annotation text. If a substring  in the annotation 
text matches the string in the car value of each cons cell of this alist, it is 
expanded with the results of  passing the cdr of each cell to a system shell. 
Example below.
+
+The expression:
+
+#+BEGIN_SRC lisp
+  (setf annotate-annotation-expansion-map
+   '(("%d" . "date +%Y-%m-%d")))
+#+END_SRC
+
+Will expand any occurrence of "%d" in the annotation's text with
+the current date (format: "-MM-DD").
+
 * More documentation
 
 Please check ~M-x customize-group RET annotate~ as there is extensive 
documentation for each customizable variable.
diff --git a/annotate.el b/annotate.el
index b666ae1533..3c1310fefc 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold , cage 

 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 2.3.1
+;; Version: 2.4.0
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "2.3.1"
+  :version "2.4.0"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -256,6 +256,18 @@ annotation as defined in the database."
 e.g. new annotation created, existing one amended or deleted."
   :type 'boolean)
 
+(defcustom annotate-annotation-expansion-map '(("%d" . "date +%Y-%m-%d"))
+  "The expansion map for the annotation text. If a substring  in the 
annotation text matches the string in the car value of each cons cell of this 
alist, it is expanded with the results of  passing the cdr of each cell to a 
system shell. Example below.
+
+The expression:
+
+(setf annotate-annotation-expansion-map
+  '((\"%d\" . \"date +%Y-%m-%d\")))
+
+Will expand any occurrence of \"%d\" in the annotation's text with
+the current date (format: \"-MM-DD\")"
+  :type  '(alist :key-type string :value-type string))
+
 (defconst annotate-prop-chain-position
   'position)
 
@@ -727,6 +739,19 @@ specified by `FROM' and `TO'."
   (cl-count-if (lambda (a) (char-equal a ?\n))
(buffer-substring-no-properties from to)))
 
+(defun annotate--expand-annotation-text (annotation-text)
+  (cl-loop with results = annotation-text
+  for expansion in annotate-annotation-expansion-map
+  when (string-match-p (car expansion) results)
+  do (let ((expansion-results (string-trim (shell-command-to-string 
(cdr expansion)
+   (setf results
+ (replace-regexp-in-string (car expansion)
+   expansion-results
+   results
+   t
+   t)))
+  finally (return results)))
+
 (defun annotate-annotate (&optional color-index)
   "Create, modify, or delete annotation.
 if `COLOR-INDEX' is not null must be an index that adresses an ele

[nongnu] elpa/aidermacs 88d2864454 2/3: Use read-from-minibuffer instead of completing-read for prompts

[ELPA Syncer]

branch: elpa/aidermacs
commit 88d2864454546360ed0ae52b9884634fc3cfd13b
Author: Adam Niederer 
Commit: Matthew Zeng 

Use read-from-minibuffer instead of completing-read for prompts

completing-read doesn't let the user enter a prompt that isn't in
aidermacs--common-prompts
---
 aidermacs.el | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/aidermacs.el b/aidermacs.el
index c883c75cc0..21aa3bf1cf 100644
--- a/aidermacs.el
+++ b/aidermacs.el
@@ -600,16 +600,12 @@ Use highlighted region as context unless IGNORE-CONTEXT 
is set to non-nil."
 (buffer-substring-no-properties (region-beginning) 
(region-end
  (context (when region-text
 (format " in %s regarding this section:\n```\n%s\n```\n" 
(buffer-name) region-text)))
- ;; Create completion table from common prompts and history
- (completion-candidates
-  (delete-dups (append aidermacs-common-prompts
-   aidermacs--read-string-history)))
- ;; Read user input with completion
- (user-command (completing-read
-(concat command " " prompt-prefix context
-(when guide (format " (%s)" guide)) ": ")
-completion-candidates nil nil nil
-'aidermacs--read-string-history)))
+ ;; Read user input
+ (user-command
+  (read-from-minibuffer
+   (concat command " " prompt-prefix context
+   (when guide (format " (%s)" guide)) ": ")
+   nil nil nil 'aidermacs--read-string-history)))
 ;; Add to history if not already there, removing any duplicates
 (setq aidermacs--read-string-history
   (delete-dups (cons user-command aidermacs--read-string-history)))

[nongnu] elpa/gptel updated (1aa5f1c10d -> a7dde728eb)

[ELPA Syncer]

elpasync pushed a change to branch elpa/gptel.

  from  1aa5f1c10d gptel-gemini: Filter schema attributes in tools (#827)
   new  8ad60c57f7 gptel-gemini: add gemini-2.5-pro-preview-05-06 (#829)
   new  a7dde728eb gptel: Fix bug with navigating responses


Summary of changes:
 NEWS|  2 ++
 gptel-gemini.el |  9 +
 gptel.el| 16 
 3 files changed, 19 insertions(+), 8 deletions(-)

[nongnu] elpa/gptel a7dde728eb 2/2: gptel: Fix bug with navigating responses

[ELPA Syncer]

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

gptel: Fix bug with navigating responses

* gptel.el (gptel-end-of-response): Fix bug where a literal "?"
was searched for when the prompt-prefix and response-prefix
strings were empty or blank.
---
 gptel.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gptel.el b/gptel.el
index bc3615ac82..eadf9088a6 100644
--- a/gptel.el
+++ b/gptel.el
@@ -954,15 +954,15 @@ Note: This will move the cursor."
 (dotimes (_ (abs arg))
   (funcall search 'gptel 'response t)
   (if (> arg 0)
-  (when (looking-at (concat "\n\\{1,2\\}"
-(regexp-quote
- (gptel-prompt-prefix-string))
-"?"))
+  (when-let* ((prefix (gptel-prompt-prefix-string))
+  ((not (string-empty-p prefix)))
+  ((looking-at (concat "\n\\{1,2\\}"
+   (regexp-quote prefix) "?"
 (goto-char (match-end 0)))
-(when (looking-back (concat (regexp-quote
- (gptel-response-prefix-string))
-"?")
-(point-min))
+(when-let* ((prefix (gptel-response-prefix-string))
+((not (string-empty-p prefix)))
+((looking-back (concat (regexp-quote prefix) "?")
+   (point-min
   (goto-char (match-beginning 0)))
 
 (defmacro gptel--at-word-end (&rest body)

[nongnu] elpa/gptel 8ad60c57f7 1/2: gptel-gemini: add gemini-2.5-pro-preview-05-06 (#829)

[ELPA Syncer]

branch: elpa/gptel
commit 8ad60c57f74648dce4f43fdb952d94ece3031a07
Author: Savva Surenkov 
Commit: GitHub 

gptel-gemini: add gemini-2.5-pro-preview-05-06 (#829)

gptel-gemini.el (gptel--gemini-models):
Add support for gemini-2.5-pro-preview-05-6
---
 NEWS| 2 ++
 gptel-gemini.el | 9 +
 2 files changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index f6dc4a6827..1fc03422f0 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@
 
 - Add support for ~gemini-2.5-flash-preview-04-17~.
 
+- Add support for ~gemini-2.5-pro-preview-05-06~.
+
 ** New features and UI changes
 
 - The new option ~gptel-curl-extra-args~ can be used to specify extra
diff --git a/gptel-gemini.el b/gptel-gemini.el
index 49c071bb71..fe42a1b019 100644
--- a/gptel-gemini.el
+++ b/gptel-gemini.el
@@ -462,6 +462,15 @@ files in the context."
  :input-cost 0.15
  :output-cost 0.60 ; 3.50 for thinking
  :cutoff-date "2025-01")
+(gemini-2.5-pro-preview-05-06
+ :description "Most powerful Gemini thinking model with maximum response 
accuracy and state-of-the-art performance"
+ :capabilities (tool-use json media)
+ :mime-types ("image/png" "image/jpeg" "image/webp" "image/heic" 
"image/heif"
+  "application/pdf" "text/plain" "text/csv" "text/html")
+ :context-window 1000
+ :input-cost 1.25 ; 2.50 for >200k tokens
+ :output-cost 10.00 ; 15 for >200k tokens
+ :cutoff-date "2025-01")
 (gemini-2.0-flash-thinking-exp
  :description "DEPRECATED: Please use gemini-2.0-flash-thinking-exp-01-21 
instead."
  :capabilities (tool-use media)

[nongnu] elpa/haskell-ts-mode 4c3ca560f8: electric indent fix

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 4c3ca560f8d8ae91720576b13a136d370594b71b
Author: Pranshu Sharma 
Commit: Pranshu Sharma 

electric indent fix

Other charecters were hooked to electic indent like '=' and would fuck
up the indentation.

Like if you were trying to write:
func :: Ord => a -> [a] -> a
There as soon as you type the '=' after 'ord' it would do:
  func :: Ord =

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

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 36d83ee8d8..65b26e3dc0 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -488,7 +488,7 @@ when `haskell-ts-prettify-words' is non-nil.")
   (goto-char (line-end-position 0))
   (current-column
(insert (make-string previous-line-width ?\s
-  t)
+  nil)
 
 (defun haskell-ts--fontify-func (node face)
   (if (string= "variable" (treesit-node-type node))

[nongnu] elpa/helm 6e218b6100 3/4: Remove support for drag and drop for emacs<29.1

[ELPA Syncer]

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

Remove support for drag and drop for emacs<29.1

HFF use now dnd for its drag-and-drop fn (helm-ff-mouse-drag).

The variables helm-ff-drag-and-drop-default-directory and
helm-ff-drag-and-drop-default-directories have been removed.
---
 helm-core.el  |   2 +-
 helm-files.el | 113 --
 helm-help.el  |  14 ++--
 3 files changed, 26 insertions(+), 103 deletions(-)

diff --git a/helm-core.el b/helm-core.el
index 4c143fd263..da63503ae1 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -5427,7 +5427,7 @@ specified as respectively `helm-cand-num' and 
`helm-cur-source'."
   (let ((inhibit-read-only t)
 (map (get-text-property pos 'keymap)))
 (when map
-  (define-key map [drag-mouse-1] helm-drag-mouse-1-fn)
+  (define-key map [down-mouse-1] helm-drag-mouse-1-fn)
   (define-key map [mouse-2] 'helm-maybe-exit-minibuffer)
   (put-text-property
helm-selection-point
diff --git a/helm-files.el b/helm-files.el
index fdc11b258b..15f20e6b48 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -97,6 +97,7 @@
 (declare-function helm-epa-collect-keys-from-candidates "helm-epa")
 (declare-function async-byte-compile-file "async-bytecomp.el")
 (declare-function async-byte-recompile-directory "async-bytecomp.el")
+(declare-function dnd-begin-drag-files "dnd.el")
 
 (defvar term-char-mode-point-at-process-mark)
 (defvar term-char-mode-buffer-read-only)
@@ -949,34 +950,13 @@ present in this list."
   "When non nil dim prompt while updating."
   :type 'boolean)
 
-(defvaralias 'helm-ff-drag-and-drop-default-directory 
'helm-ff-drag-and-drop-default-directories
-  "Default directory where to drop files on a drag-and-drop action.
-It is used when no suitable directory is found at drop place,
-generally when dropping outside of an emacs frame.
-You want generally to set this to your home desktop directory.")
-(make-obsolete-variable 'helm-ff-drag-and-drop-default-directory
-'helm-ff-drag-and-drop-default-directories
-"4.0.3")
-
-(defcustom helm-ff-drag-and-drop-default-directories '(history . 10)
-  "Directories where to drop files on a drag-and-drop action.
-Can be a list of directories, or a cons cell (history . ) where  is the
-first  directories of `helm-ff-history'.
-It is used when no suitable directory is found at drop place,
-generally when dropping outside of an emacs frame."
-  :type '(choice
-  (cons
-   (const :tag "History" history)
-   integer)
-  (repeat string)))
-
 (defcustom helm-ff-drag-mouse-1-default-action 'copy
   "Default action when dragging files.
-Possible values are `copy', `rsync' or `rename'."
+Possible values are `copy', `move' or `link'."
   :type '(choice
   (const :tag "Copy" copy)
-  (const :tag "Rsync" rsync)
-  (const :tag "Move" rename)))
+  (const :tag "Move" move)
+  (const :tag "Link" link)))
 
 ;;; Faces
 ;;
@@ -5610,73 +5590,23 @@ Show the first `helm-ff-history-max-length' elements of
 helm-ff-history
 (put 'helm-find-files-history 'helm-only t)
 
-(defun helm-ff-drag-mouse-1-fn (event)
-  "Drag-and-drop function for `helm-find-files'.
-Allows dropping marked files to another frame or window.
-When dropping to another frame (i.e. not the selected one where helm
-is running), you are asked for which directory you want to drop to when frame
-displays more than one window.
-When no suitable place to drop is found ask to drop to
-`helm-ff-drag-and-drop-default-directories' if set."
+;; The `helm-drag-mouse-1-fn' for helm-find-files, see
+;; `helm--bind-mouse-for-selection'. It react when dropping, not dragging so
+;; `helm-drag-mouse-1-fn' is bound to  and not .
+(defun helm-ff-mouse-drag (_event)
+  "The drag-an-drop function for helm-find-files.
+
+Drag-and-drop marked files."
   (interactive "e")
-  (cl-assert (memq helm-ff-drag-mouse-1-default-action
-   '(copy rsync rename)))
-  ;; Prevent marking when moving mouse.
+  (require 'dnd)
   (when mark-active (deactivate-mark))
-  (let* ((win-or-frame (posn-window (event-end event)))
- (target-frame (when (framep win-or-frame)
- (car (mouse-pixel-position
- (target   (with-selected-window
-   (if target-frame
-   (frame-selected-window target-frame)
- win-or-frame)
- default-directory))
- (windows  (and target-frame
-(remove (helm-window)
-(window-list target-frame 1)
-(when windows
-  (setq target
-(helm-acond ((cdr windows)
- (x-popup-menu
-  t (list "Choose target"
- 

[nongnu] elpa/helm updated (fde69a9a38 -> 08e8cfcc46)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  fde69a9a38 Retrieve minibuffer focus after dropping
   new  9188403248 Ensure minibuffer focus is restored
   new  47575ad6ab Force mode-line update after dropping
   new  6e218b6100 Remove support for drag and drop for emacs<29.1
   new  08e8cfcc46 Update NEWS


Summary of changes:
 NEWS.org  |   4 +++
 helm-core.el  |   2 +-
 helm-files.el | 112 --
 helm-help.el  |  14 ++--
 4 files changed, 30 insertions(+), 102 deletions(-)

[nongnu] elpa/helm 47575ad6ab 2/4: Force mode-line update after dropping

[ELPA Syncer]

branch: elpa/helm
commit 47575ad6ab551827ae2f11b127dcf7060195b1eb
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Force mode-line update after dropping
---
 helm-files.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helm-files.el b/helm-files.el
index be646868b4..fdc11b258b 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5672,7 +5672,8 @@ When no suitable place to drop is found ask to drop to
   helm-ff-drag-mouse-1-default-action target)
   ;; Retrieve focus after dropping
   (with-selected-frame helm-initial-frame
-(select-window (minibuffer-window
+(select-window (minibuffer-window))
+(force-mode-line-update t)))
   (helm-run-after-exit
#'helm-find-files-do-action
helm-ff-drag-mouse-1-default-action target

[nongnu] elpa/helm 08e8cfcc46 4/4: Update NEWS

[ELPA Syncer]

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

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

diff --git a/NEWS.org b/NEWS.org
index 31a73cd86a..1130cff795 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -2,6 +2,10 @@
 
 * NEWS
 ** Version 4.0.3
+*** Remove drag-and-drop support in helm-find-files for emacs<29
+Use now dnd.el for the new drag-and-drop function.
+This allows drag-and-drop in external applications in addition to emacs
+frames.
 *** Add a new completion metadata category command-help
 Handle helm-M-x prefix arg integration in this category.
 *** Allow filtering sources in current session

[nongnu] elpa/racket-mode a23104e156: racket-logger-mode: Don't font-lock strings/comments

[ELPA Syncer]

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

racket-logger-mode: Don't font-lock strings/comments

Similar to recent commit 2eec63c for #751 in racket-repl-mode.

As suggested by @bogdanp.
---
 racket-logger.el | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/racket-logger.el b/racket-logger.el
index c8db261a4c..d9ad9fc7d2 100644
--- a/racket-logger.el
+++ b/racket-logger.el
@@ -1,6 +1,6 @@
 ;;; racket-logger.el -*- lexical-binding: t; -*-
 
-;; Copyright (c) 2013-2022 by Greg Hendershott.
+;; Copyright (c) 2013-2025 by Greg Hendershott.
 ;; Portions Copyright (C) 1985-1986, 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: Greg Hendershott
@@ -70,7 +70,9 @@ For more information see:
 
 \\{racket-logger-mode-map}
 "
-  (setq-local font-lock-defaults (list racket-logger-font-lock-keywords))
+  (setq-local font-lock-defaults
+  (list racket-logger-font-lock-keywords
+t)) ;keywords-only #751
   (setq-local truncate-lines t)
   (setq-local buffer-undo-list t) ;disable undo
   (setq-local window-point-insertion-type t))

[nongnu] elpa/helm 9188403248 1/4: Ensure minibuffer focus is restored

[ELPA Syncer]

branch: elpa/helm
commit 91884032484d2321ed419abf4f2d4cffce895d24
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Ensure minibuffer focus is restored

in any cases.
---
 helm-files.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index d8cca64ade..be646868b4 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5667,9 +5667,9 @@ When no suitable place to drop is found ask to drop to
 ((car windows)
  (with-selected-window it default-directory)
 (if (memq helm-ff-drag-mouse-1-default-action '(copy rsync))
-(progn
-  (helm-find-files-do-action
-   helm-ff-drag-mouse-1-default-action target)
+(unwind-protect
+ (helm-find-files-do-action
+  helm-ff-drag-mouse-1-default-action target)
   ;; Retrieve focus after dropping
   (with-selected-frame helm-initial-frame
 (select-window (minibuffer-window

[nongnu] elpa/yasnippet-snippets aa5f9b98ba: FIX: Python arguments. (#509)

[ELPA Syncer]

branch: elpa/yasnippet-snippets
commit aa5f9b98ba6ff8fa614b3e553cb38a6bf3c1295c
Author: quazgar 
Commit: GitHub 

FIX: Python arguments. (#509)

* FIX: Python arguments.

This should fix #505 "Any snippet using python-args-to-docstring returns 
Wrong type argument: listp"
and also adds type hints to the docstring again.

* FIX: More relaxed regexes.

* ENH: Removing `self` from python arguments in docstring.

-

Co-authored-by: Daniel 
---
 snippets/python-mode/.yas-setup.el | 111 +
 1 file changed, 101 insertions(+), 10 deletions(-)

diff --git a/snippets/python-mode/.yas-setup.el 
b/snippets/python-mode/.yas-setup.el
index e9145efd73..52ea2da77e 100644
--- a/snippets/python-mode/.yas-setup.el
+++ b/snippets/python-mode/.yas-setup.el
@@ -1,22 +1,71 @@
 ;;; -*- lexical-binding: t -*-
+
+; Copyright (C) miscellaneous contributors, see git history
+; Copyright (C) 2024 Daniel Hornung 
+;
+; This program 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 program 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 program. If not, see .
+
 (require 'yasnippet)
 (defvar yas-text)
 
-(defvar python-split-arg-arg-regex
-"\\([[:alnum:]*]+\\)\\(:[[:blank:]]*[[:alpha:]]*\\)?\\([[:blank:]]*=[[:blank:]]*[[:alnum:]]*\\)?"
+(defvar yas-python-regex-identifier "[[:alnum:]_]+" "Simplified Python 
identifier.")
+(defvar yas-python-regex-quoted-or-identifier (concat
+   "\\("
+   yas-python-regex-identifier
+   "\\)"
+   "\\|" "\".*\""
+   "\\|" "'.*'"
+   )
+  "Simplified Python identifier or quoted string.
+Does not work well with multiple or escaped quotes")
+
+(defvar python-split-arg-regex
+  (concat
+   "\\(" yas-python-regex-identifier "\\)" ; name
+   "\\(:[[:blank:]]*\\([][:alpha:]_[]*\\)\\)?" ; type
+   "\\([[:blank:]]*=[[:blank:]]*\\("
+   yas-python-regex-quoted-or-identifier   ; default
+   "\\)\\)?"
+   )
 "Regular expression matching an argument of a python function.
-First group should give the argument name.")
+Groups:
+- 1: the argument name
+- 3: the type
+- 5: the default value")
 
 (defvar python-split-arg-separator
 "[[:space:]]*,[[:space:]]*"
 "Regular expression matching the separator in a list of argument.")
 
 (defun python-split-args (arg-string)
-  "Split a python argument string ARG-STRING into a tuple of argument names."
-  (mapcar (lambda (x)
-(when (string-match python-split-arg-arg-regex x)
-  (match-string-no-properties 1 x)))
-  (split-string arg-string python-split-arg-separator t)))
+  "Split python argument string ARG-STRING.
+
+The result is a list ((name, type, default), ...) of argument names, types and
+default values.  An argument named `self` is omitted."
+  (remove
+   nil
+   (mapcar (lambda (x)   ; organize output
+ (when (and
+(not (equal "self" x))
+(string-match python-split-arg-regex x)
+)
+   (list
+(match-string-no-properties 1 x) ; name
+(match-string-no-properties 3 x) ; type
+(match-string-no-properties 5 x) ; default
+)))
+   (split-string arg-string python-split-arg-separator t
 
 (defun python-args-to-docstring ()
   "Return docstring format for the python arguments in yas-text."
@@ -26,7 +75,9 @@ First group should give the argument name.")
  (formatted-args (mapconcat
   (lambda (x)
 (concat (nth 0 x) (make-string (- max-len (length 
(nth 0 x))) ? ) " -- "
-(if (nth 1 x) (concat "\(default " (nth 1 
x) "\)"
+(if (nth 1 x) (concat (nth 1 x) ": "))
+(if (nth 2 x) (concat "\(default " (nth 2 
x) "\)"))
+))
   args
   indent)))
 (unless (string= formatted-args "")
@@ -36,7 +87,11 @@ First group should give the argument name.")
   "return docstring format for the python arguments in yas-text"
   (let* ((args (python-split-args yas-text))
  (format-arg (lambda

[elpa] externals/denote 5a0cfd07dc 5/7: Document the 'denote-use-*' variables in their own section of the manual

[ELPA Syncer]

branch: externals/denote
commit 5a0cfd07dcbcddad70ce0aee2ba3003505e7a315
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Document the 'denote-use-*' variables in their own section of the manual

This way it is easier to find them.
---
 README.org | 79 ++
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/README.org b/README.org
index b9bc32301f..2919cff2ef 100644
--- a/README.org
+++ b/README.org
@@ -5116,44 +5116,14 @@ The following sections cover the specifics.
   ~denote-directory~ accepts a directory-local value for what we call
   "silos" ([[#h:15719799-a5ff-4e9a-9f10-4ca03ef8f6c5][Maintain separate 
directories for notes]]).
 
-** File path interface for developers or advanced users
+** Predefined note values for developers or advanced users
 :PROPERTIES:
-:CUSTOM_ID: h:08e696e4-c9e1-48b4-8349-e53451aed1df
+:CUSTOM_ID: h:a8b9082c-8bd5-492d-8da7-4f41ee493d59
 :END:
 
-#+findex: denote-file-name-relative-to-denote-directory
-+ Function ~denote-file-name-relative-to-denote-directory~ :: Return
-  name of =FILE= relative to the variable ~denote-directory~.  =FILE=
-  must be an absolute path.
-
-#+findex: denote-slug-keep-only-ascii
-+ Function ~denote-slug-keep-only-ascii~ :: Remove all non-ASCII
-  characters from =STR= and replace them with spaces. This is useful
-  as a helper function to construct ~denote-file-name-slug-functions~
-  ([[#h:d1e4eb5b-e7f2-4a3b-9243-e1c653817a4a][Custom sluggification to remove 
non-ASCII characters]]).
-
-#+findex: denote-sluggify
-+ Function ~denote-sluggify~ :: Make =STR= an appropriate slug for
-  file name =COMPONENT= 
([[#h:ae8b19a1-7f67-4258-96b3-370a72c43f4e][Sluggification of file name 
components]]).
-  Apply the function specified in ~denote-file-name-slug-function~ to
-  =COMPONENT= which is one of =title=, =signature=, =keyword=. If the
-  resulting string still contains consecutive =-=,=_= or ~=~, they are
-  replaced by a single occurence of the character, if necessary
-  according to =COMPONENT=. If =COMPONENT= is ~keyword~, remove
-  underscores from =STR= as they are used as the keywords separator in
-  file names.
-
-#+findex: denote-sluggify-keyword
-+ Function ~denote-sluggify-keyword~ :: Sluggify =STR= while joining
-  separate words.
-
-#+findex: denote-sluggify-signature
-+ Function ~denote-sluggify-signature~ :: Make =STR= an appropriate
-  slug for signatures 
([[#h:ae8b19a1-7f67-4258-96b3-370a72c43f4e][Sluggification of file name 
components]]).
-
-#+findex: denote-sluggify-keywords
-+ Function ~denote-sluggify-keywords~ :: Sluggify =KEYWORDS=, which is
-  a list of strings ([[#h:ae8b19a1-7f67-4258-96b3-370a72c43f4e][Sluggification 
of file name components]]).
+In custom code, it is possible to override what the ~denote~ command
+is reading by specifying a value for the following. In that case,
+there will be no corresponding prompt.
 
 #+findex: denote-use-date
 + Function ~denote-use-date~ :: The date to be used in a note creation
@@ -5204,6 +5174,45 @@ The following sections cover the specifics.
   otherwise the title will always be the same and the title prompt
   will be skipped.
 
+** File path interface for developers or advanced users
+:PROPERTIES:
+:CUSTOM_ID: h:08e696e4-c9e1-48b4-8349-e53451aed1df
+:END:
+
+#+findex: denote-file-name-relative-to-denote-directory
++ Function ~denote-file-name-relative-to-denote-directory~ :: Return
+  name of =FILE= relative to the variable ~denote-directory~.  =FILE=
+  must be an absolute path.
+
+#+findex: denote-slug-keep-only-ascii
++ Function ~denote-slug-keep-only-ascii~ :: Remove all non-ASCII
+  characters from =STR= and replace them with spaces. This is useful
+  as a helper function to construct ~denote-file-name-slug-functions~
+  ([[#h:d1e4eb5b-e7f2-4a3b-9243-e1c653817a4a][Custom sluggification to remove 
non-ASCII characters]]).
+
+#+findex: denote-sluggify
++ Function ~denote-sluggify~ :: Make =STR= an appropriate slug for
+  file name =COMPONENT= 
([[#h:ae8b19a1-7f67-4258-96b3-370a72c43f4e][Sluggification of file name 
components]]).
+  Apply the function specified in ~denote-file-name-slug-function~ to
+  =COMPONENT= which is one of =title=, =signature=, =keyword=. If the
+  resulting string still contains consecutive =-=,=_= or ~=~, they are
+  replaced by a single occurence of the character, if necessary
+  according to =COMPONENT=. If =COMPONENT= is ~keyword~, remove
+  underscores from =STR= as they are used as the keywords separator in
+  file names.
+
+#+findex: denote-sluggify-keyword
++ Function ~denote-sluggify-keyword~ :: Sluggify =STR= while joining
+  separate words.
+
+#+findex: denote-sluggify-signature
++ Function ~denote-sluggify-signature~ :: Make =STR= an appropriate
+  slug for signatures 
([[#h:ae8b19a1-7f67-4258-96b3-370a72c43f4e][Sluggification of file name 
components]]).
+
+#+findex: denote-sluggify-keywords
++ Function ~denote-sluggify-keywords~ :: Sluggify =KEYWO

[elpa] externals/denote b54229c724 3/7: Merge pull request #599 from mjkalyan/prefix

[ELPA Syncer]

branch: externals/denote
commit b54229c7240256b5c47252f7a78c85f367c107e8
Merge: 8f7099eeb8 6c2295e75e
Author: Protesilaos Stavrou 
Commit: GitHub 

Merge pull request #599 from mjkalyan/prefix

De-duplicate code in ‘denote-format-buffer-name’
---
 denote.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/denote.el b/denote.el
index 5f10a985b1..8497dce0fa 100644
--- a/denote.el
+++ b/denote.el
@@ -1415,9 +1415,7 @@ Return the absolute path to the matching file."
   "Use STRING to return a Denote buffer name with `denote-buffer-name-prefix'.
 With optional SPECIAL, wrap the name in asterisks, signifying that this
 is a special buffer."
-  (if special
-  (format "*%s%s*" denote-buffer-name-prefix string)
-(format "%s%s" denote-buffer-name-prefix string)))
+  (format (if special "*%s%s*" "%s%s") denote-buffer-name-prefix string))
 
  The sort mechanism
 

[elpa] externals/matlab-mode a55c2dd658 2/2: README.org: minor help update

[ELPA Syncer]

branch: externals/matlab-mode
commit a55c2dd658905b5f0ad39ef9c9ebf5fcd40ffca5
Author: John Ciolfi 
Commit: John Ciolfi 

README.org: minor help update
---
 README.org | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index c499f6a076..6edf015c8d 100644
--- a/README.org
+++ b/README.org
@@ -12,13 +12,13 @@
- Edit MATLAB code with syntax highlighting and smart indentation.
- Lint MATLAB code with fix-it's using the MATLAB Code Analyzer.
 
-2. *~M-x matlab-shell~* for running and debugging MATLAB within Emacs 
(Unix-only).
+2. *M-x matlab-shell* for running and debugging MATLAB within Emacs 
(Unix-only).
 
- matlab-shell uses company-mode for completions.
 
-3. *Code sections* support. MATLAB script code files often contain many 
commands and lines
-   of text.  You typically focus your efforts on a single part of your code at 
a time, working with
-   the code and related text in sections.  You demarcate sections using /"%% 
description"/ comments.
+3. *Code sections* support. MATLAB script code files often contain many 
commands and lines of text.
+   You typically focus your efforts on a single part of your code at a time, 
working with the code
+   and related text in sections.  You demarcate sections using /"%% 
description"/ header comments.
 
- After visiting a MATLAB script, you have the *"MATLAB -> Code Sections"* 
menu and key
  bindings which lets you can navigate, run, and move code sections.

[elpa] externals/matlab-mode updated (2111fe1752 -> a55c2dd658)

[ELPA Syncer]

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

  from  2111fe1752 add mailing list to faq
   new  1d935b364d Remove font-lock-constant-face from help comments
   new  a55c2dd658 README.org: minor help update


Summary of changes:
 README.org   |  8 
 matlab.el| 22 +++---
 tests/fontlock.m |  2 +-
 3 files changed, 8 insertions(+), 24 deletions(-)

[elpa] externals/matlab-mode 1d935b364d 1/2: Remove font-lock-constant-face from help comments

[ELPA Syncer]

branch: externals/matlab-mode
commit 1d935b364dd90449a9dfa9a8743e275359096289
Author: John Ciolfi 
Commit: John Ciolfi 

Remove font-lock-constant-face from help comments

A general guidline for help comments is to capitalize functions such as 
PLOT as references and we
used to make these a font-lock-constant-face inside of comments. However, 
often capital items are
not references and make comments look bad, so removed these. Likewise, 
there were other uses of
font-lock-constant-face that look odd, so removed these.

See https://github.com/mathworks/Emacs-MATLAB-Mode/issues/28

Also removed some older code that was needed before Emacs 20 regarding 
regexp-opt.
---
 matlab.el| 22 +++---
 tests/fontlock.m |  2 +-
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/matlab.el b/matlab.el
index 9df901a0a0..7772eab202 100644
--- a/matlab.el
+++ b/matlab.el
@@ -888,8 +888,7 @@ Customizing this variable is only useful if `regexp-opt' is 
available."
 (defcustom matlab-debug-list '("dbstop" "dbclear" "dbcont" "dbdown" "dbmex"
"dbstack" "dbstatus" "dbstep" "dbtype" "dbup"
"dbquit")
-  "List of debug commands used in highlighting.
-Customizing this variable is only useful if `regexp-opt' is available."
+  "List of debug commands used in highlighting."
   :group 'matlab
   :type '(repeat (string :tag "Debug Keyword: ")))
 
@@ -912,12 +911,9 @@ Customizing this variable is only useful if `regexp-opt' 
is available."
   :type '(repeat (string :tag "Debug Keyword: ")))
 
 (defun matlab-font-lock-regexp-opt (keywordlist)
-  "Create a font-lock usable KEYWORDLIST matching regular expression.
-Uses `regex-opt' if available.  Otherwise creates a dumb expression."
+  "Create a font-lock usable KEYWORDLIST matching regular expression."
   (concat "\\_<\\("
-  (if (fboundp 'regexp-opt)
-  (regexp-opt keywordlist)
-(mapconcat (lambda (s) s) keywordlist "\\|"))
+  (regexp-opt keywordlist)
   "\\)\\_>"))
 
 ;;; Font lock keyword handlers
@@ -1182,18 +1178,6 @@ This matcher will handle a range of variable features."
   1 font-lock-builtin-face)
 ;; highlight transpose
 '("[]A-Za-z0-9_\"})']\\('+\\)" 1 font-lock-builtin-face)
-;; How about references in the HELP text.
-(list (concat "^" matlab-comment-line-s "\\s-*"
-  "\\(\\([A-Z]+\\s-*=\\s-+\\|\\[[^]]+]\\s-*=\\s-+\\|\\)"
-  "\\([A-Z][0-9A-Z]+\\)\\(([^)\n]+)\\| \\)\\)")
-  '(1 font-lock-constant-face prepend))
-(list (concat "^" matlab-comment-line-s "\\s-*"
-  "See also\\s-+")
-  '("\\([A-Z][A-Z0-9]+\\)\\([,.]\\| and\\|$\\) *" nil  nil
-(1 font-lock-constant-face prepend)))
-(list (concat "^" matlab-comment-line-s "\\s-*"
-  "\\(\\$" "Revision" "[^\n$]+\\$\\)")
-  '(1 font-lock-constant-face prepend))
 ;; Debugging Keywords
 (list (matlab-font-lock-regexp-opt matlab-debug-list)
   '(0 'bold))
diff --git a/tests/fontlock.m b/tests/fontlock.m
index faf884744d..43431782c7 100644
--- a/tests/fontlock.m
+++ b/tests/fontlock.m
@@ -151,7 +151,7 @@ end
 
 function helptest()
 % HELPTEXT has fancy fonts in it.
-%^  ^cn
+%^  ^co
 
 end
 

[nongnu] elpa/yasnippet-snippets 48e968d555: comment out tests for no

[ELPA Syncer]

branch: elpa/yasnippet-snippets
commit 48e968d555afe8bf64829da364d5c8915980cc32
Author: Andrea Crotti 
Commit: Andrea Crotti 

comment out tests for no
---
 snippets/python-mode/.yas-setup.el | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/snippets/python-mode/.yas-setup.el 
b/snippets/python-mode/.yas-setup.el
index 52ea2da77e..3029c80e44 100644
--- a/snippets/python-mode/.yas-setup.el
+++ b/snippets/python-mode/.yas-setup.el
@@ -102,24 +102,23 @@ default values.  An argument named `self` is omitted."
 
 
 ;; Tests
+;; (ert-deftest test-split ()
+;;   "For starters, only test a single string for expected output."
+;;   (should (equal
+;;(python-split-args "_foo='this', bar: int = 2, baz: 
Optional[My_Type], foobar")
+;;(list '("_foo" nil "'this'")
+;;  '("bar" "int" "2")
+;;  '("baz" "Optional[My_Type]" nil)
+;;  '("foobar" nil nil)))
+;;   ))
 
-(ert-deftest test-split ()
-  "For starters, only test a single string for expected output."
-  (should (equal
-   (python-split-args "_foo='this', bar: int = 2, baz: 
Optional[My_Type], foobar")
-   (list '("_foo" nil "'this'")
- '("bar" "int" "2")
- '("baz" "Optional[My_Type]" nil)
- '("foobar" nil nil)))
-  ))
-
-(ert-deftest test-argument-self ()
-  "If an argument is called `self`, it must be omitted"
-  (should (equal
-   (python-split-args "self, _foo=\"this\"")
-   (list '("_foo" nil "\"this\"")
- ))
-  ))
+;; (ert-deftest test-argument-self ()
+;;   "If an argument is called `self`, it must be omitted"
+;;   (should (equal
+;;(python-split-args "self, _foo=\"this\"")
+;;(list '("_foo" nil "\"this\"")
+;;  ))
+;;   ))
 
 ;; For manual testing and development:
 

[elpa] externals/diff-hl c2852b0e4b: diff-hl-temporary-directory: New variable

[ELPA Syncer]

branch: externals/diff-hl
commit c2852b0e4b9d8b3b499b5df72d1fc549838a646e
Author: Dmitry Gutov 
Commit: Dmitry Gutov 

diff-hl-temporary-directory: New variable

Resolves #236
---
 diff-hl.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/diff-hl.el b/diff-hl.el
index fb8ffe2fe7..f06f318e66 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -1118,6 +1118,11 @@ the user should be returned."
 
 (declare-function diff-no-select "diff")
 
+(defvar diff-hl-temporary-directory (if (and (eq system-type 'gnu/linux)
+ (file-directory-p "/dev/shm/"))
+"/dev/shm/"
+  temporary-file-directory))
+
 (defun diff-hl-diff-buffer-with-reference (file &optional dest-buffer backend 
context-lines)
   "Compute the diff between the current buffer contents and reference in 
BACKEND.
 The diffs are computed in the buffer DEST-BUFFER. This requires
@@ -1128,10 +1133,7 @@ CONTEXT-LINES is the size of the unified diff context, 
defaults to 0."
   (save-current-buffer
 (let* ((dest-buffer (or dest-buffer 
"*diff-hl-diff-buffer-with-reference*"))
(backend (or backend (vc-backend file)))
-   (temporary-file-directory
-(if (and (eq system-type 'gnu/linux) (file-directory-p 
"/dev/shm/"))
-"/dev/shm/"
-  temporary-file-directory))
+   (temporary-file-directory diff-hl-temporary-directory)
(rev
 (if (and (eq backend 'Git)
  (not diff-hl-reference-revision)

[elpa] externals/debbugs 22fc3c2322: Fix regex for determining Emacs version

[Robert Pluim]

branch: externals/debbugs
commit 22fc3c232241afabcd909ba336b43b4e3586a732
Author: Robert Pluim 
Commit: Robert Pluim 

Fix regex for determining Emacs version

* debbugs-gnu.el (debbugs-gnu-announce-commit): Account for
configure.ac now having square brackets in AC_INIT.
---
 debbugs-gnu.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index b0f20e14c6..c0ac0f8116 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -2422,7 +2422,7 @@ Optionally call `debbugs-gnu-make-control-message' to 
close BUGNUM."
   (with-temp-buffer
 (insert-file-contents "configure.ac")
 (and (re-search-forward "\
-^ *AC_INIT(GNU Emacs, *\\([0-9.]+\\), *bug-gnu-em...@gnu.org"
+^ *AC_INIT(\\[?GNU Emacs\\]?, *\\[?\\([0-9.]+\\)\\]?, 
*\\[?bug-gnu-em...@gnu.org"
 nil t)
  (match-string 1))
 (debbugs-gnu-make-control-message

[elpa] externals/ess updated (d19efaae12 -> 09df73c091)

[ELPA Syncer]

elpasync pushed a change to branch externals/ess.

  from  d19efaae12 Ensure a compatible version of lintr is installed
   new  9f5cced1b0 drop one ' fixing #1285
   new  cf20fa0a6e warnings
   new  09df73c091 Merge branch 'master' of github.com:emacs-ess/ESS


Summary of changes:
 lisp/ess-bugs-l.el   |  4 ++--
 lisp/ess-custom.el   |  2 +-
 lisp/ess-help.el |  2 +-
 lisp/ess-r-mode.el   | 12 ++--
 lisp/ess-rdired.el   |  2 +-
 lisp/ess-sas-d.el|  2 +-
 lisp/ess-tracebug.el |  6 +++---
 lisp/essd-els.el |  2 +-
 test/etest/etest.el  |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

[nongnu] elpa/haskell-ts-mode 8dcdf855af 2/2: Adding suggested packages

[ELPA Syncer]

branch: elpa/haskell-ts-mode
commit 8dcdf855af44d63877693ece3fa13ad94ab34415
Author: Pranshu Sharma 
Commit: Pranshu Sharma 

Adding suggested packages
---
 README.md | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index b846f7d900..169a1e9779 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,20 @@ Add this into your init.el:
 That is all.  This will install the grammars if not already installed.
 However, you might need to update the grammar version in the future.
 
+## Other recommended packages
+
+Unlike `haskell-mode`, this mode has a limited scope to just worrying
+about haskell.  There are other packages that I find help a lot with
+development:
+- [consult-hoogle](https://codeberg.org/rahguzar/consult-hoogle) great
+  interface for `hoogle`.
+- [dante](https://github.com/jyp/dante)
+- [hindent](https://github.com/mihaimaruseac/hindent) If you want to
+  outsource the indentation and formatting to another haskell package.
+- [ormolu](https://github.com/vyorkin/ormolu.el) hindent alternative
+- [hcel](https://github.com/emacsmirror/hcel) Codebase navigator, if
+  you want a lighter alternaitve to a full blown LSP.
+
 # Customization
 
 ## How to disable `haskell-ts-mode` indentation

[elpa] externals/auctex 723ac2826f: ; * NEWS.org (Changed): Fix formatting.

[ELPA Syncer]

branch: externals/auctex
commit 723ac2826f4771ccac592a9e9e9d0e4263df05d2
Author: Arash Esbati 
Commit: Arash Esbati 

; * NEWS.org (Changed): Fix formatting.
---
 NEWS.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.org b/NEWS.org
index 8917727bf2..d0653240c5 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -16,7 +16,7 @@
 ** Changed
 
 - AUCTeX now requires GNU Emacs 28.1 or higher.
-- Replace $..$ with \[..\] in ~LaTeX-mode~ and any derived mode when
+- Replace =$..$= with =\[..\]= in LaTeX mode and any derived mode when
   hitting =$= repeatedly where ~TeX-electric-math~ is non-~nil~.
 
 ** Fixed

[elpa] externals/ess cf20fa0a6e 1/3: warnings

[ELPA Syncer]

branch: externals/ess
commit cf20fa0a6e204b26a2c61527edac530d6913b2b4
Author: musvaage 
Commit: Martin Mächler 

warnings
---
 lisp/ess-bugs-l.el   |  4 ++--
 lisp/ess-help.el |  2 +-
 lisp/ess-r-mode.el   | 12 ++--
 lisp/ess-rdired.el   |  2 +-
 lisp/ess-sas-d.el|  2 +-
 lisp/ess-tracebug.el |  6 +++---
 lisp/essd-els.el |  2 +-
 test/etest/etest.el  |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lisp/ess-bugs-l.el b/lisp/ess-bugs-l.el
index 5cb707f303..1123ef154b 100644
--- a/lisp/ess-bugs-l.el
+++ b/lisp/ess-bugs-l.el
@@ -64,8 +64,8 @@ Users whose default is not \\='sh, but are accessing a remote 
machine with
 `telnet' or `ssh', should have the following in their init file:
(setq-default ess-bugs-batch-method \\='sh)"
   :group 'ess-bugs
-  :type '(choice (const sh :tag "Bourne/C-like Unix Shell")
- (const dos :tag "DOS-like Windows shell")))
+  :type '(choice (const :tag "Bourne/C-like Unix Shell" sh)
+ (const :tag "DOS-like Windows shell" dos)))
 
 (defcustom ess-bugs-batch-post-command
   (if (equal ess-bugs-batch-method 'sh) "&" " ")
diff --git a/lisp/ess-help.el b/lisp/ess-help.el
index 0b2ccd13f9..7c9970838f 100644
--- a/lisp/ess-help.el
+++ b/lisp/ess-help.el
@@ -714,7 +714,7 @@ nil otherwise."
   (save-excursion
 (goto-char (point-min))
 (while (search-forward "_" nil t)
-  (backward-delete-char 2)
+  (delete-char -2)
   (put-text-property (point) (1+ (point)) 'face 'underline
 
 ;;*;; Link to Info
diff --git a/lisp/ess-r-mode.el b/lisp/ess-r-mode.el
index 47165c2bcf..f2f533a7e9 100644
--- a/lisp/ess-r-mode.el
+++ b/lisp/ess-r-mode.el
@@ -72,9 +72,9 @@ Fetching happens once per new ESSR version. The archive is 
stored
 in ~/.config/ESSR/ESSRv[VERSION].rds file. You can download and
 place it there manually if the remote has restricted network
 access."
-  :type '(choice (const nil :tag "Never")
- (const ess-remote :tag "With ess-remote only")
- (const t :tag "Always"))
+  :type '(choice (const :tag "Never" nil)
+ (const :tag "With ess-remote only" ess-remote)
+ (const :tag "Always" t))
   :group 'ess-R)
 
 ;; Silence the byte compiler
@@ -573,7 +573,7 @@ blocking commands will throw an error.")
 
 ;;;###autoload
 (defun run-ess-r (&optional start-args)
-  "Call 'R', the 'GNU S' system from the R Foundation.
+  "Call \\='R\\=', the \\='GNU S\\=' system from the R Foundation.
 Optional prefix (\\[universal-argument]) allows to set command line arguments, 
such as
 --vsize.  This should be OS agnostic.
 If you have certain command line arguments that should always be passed
@@ -2918,10 +2918,10 @@ needed."
 (defun ess-rutils-html-docs (&optional remote)
   "Use `browse-url' to navigate R html documentation.
 Documentation is produced by a modified help.start(), that
-returns the URL produced by GNU R's http server. If called with a
+returns the URL produced by GNU R\\='s http server. If called with a
 prefix, the modified help.start() is called with update=TRUE. The
 optional REMOTE argument should be a string with a valid URL for
-the 'R_HOME' directory on a remote server (defaults to NULL)."
+the \\='R_HOME\\=' directory on a remote server (defaults to NULL)."
   (interactive)
   (let* ((update (if current-prefix-arg "update=TRUE" "update=FALSE"))
  (remote (if (or (and remote (not (string= "" remote
diff --git a/lisp/ess-rdired.el b/lisp/ess-rdired.el
index efc7fa1d59..e025a5fd12 100644
--- a/lisp/ess-rdired.el
+++ b/lisp/ess-rdired.el
@@ -87,7 +87,7 @@
 
 (defcustom ess-rdired-auto-update-interval 5
   "Seconds between refreshes of the `ess-rdired' buffer."
-  :type '(choice (const nil :tag "No auto updates") (integer :tag "Seconds"))
+  :type '(choice (const :tag "No auto updates" nil) (integer :tag "Seconds"))
   :group 'ess-R
   :package-version '(ess . "19.04"))
 
diff --git a/lisp/ess-sas-d.el b/lisp/ess-sas-d.el
index 98afed49e7..5cf147b94d 100644
--- a/lisp/ess-sas-d.el
+++ b/lisp/ess-sas-d.el
@@ -287,7 +287,7 @@ indent line."
 (SAS)))
 
 (defun SAS ()
-  "Call 'SAS', from SAS Institute."
+  "Call \\='SAS\\=', from SAS Institute."
   (interactive)
   (let* ((temp-dialect "SAS")) ;(cdr (rassoc ess-dialect 
SAS-customize-alist
 (ess-write-to-dribble-buffer
diff --git a/lisp/ess-tracebug.el b/lisp/ess-tracebug.el
index 0a17d556f8..f7f2698f73 100644
--- a/lisp/ess-tracebug.el
+++ b/lisp/ess-tracebug.el
@@ -555,9 +555,9 @@ If \\='strip, remove all such instances.  Otherwise, if 
non-nil, `+
 `ess-long+replacement'.
 This variable can be process-local but not buffer-local."
   :group 'ess-tracebug
-  :type '(choice (const nil :tag "No replacement")
- (const strip :tag "Replace all")
- (const t :tag "Replace 3 or more +")))
+  :type '(choice (const :tag "No replacement" nil)
+ (const :tag "Replace all" strip)
+ (const :tag "Replace 3 

[elpa] externals/denote afa3b9495f 1/2: Reword the doc string of denote-buffer-name-prefix

[ELPA Syncer]

branch: externals/denote
commit afa3b9495f5da5965148388878bd2d7d3d224dd3
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Reword the doc string of denote-buffer-name-prefix

This builds on top of commit 8e1341d by James Kalyan, which was done
in pull request 597: .

James is in the process of assigning copyright to the Free Software
Foundation.
---
 denote.el | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/denote.el b/denote.el
index ffe0396d0a..5f10a985b1 100644
--- a/denote.el
+++ b/denote.el
@@ -778,7 +778,11 @@ and `denote-link-after-creating-with-command'."
 This includes the query links, backlinks, `denote-grep', `denote-dired'
 buffers, as well as all the regular Denote files whose buffer name gets
 updated when `denote-rename-buffer-mode' is enabled (that mode uses the
-`denote-rename-buffer-format')."
+`denote-rename-buffer-format').
+
+By default, the value of `denote-buffer-name-prefix' is \"[D] \".
+Users can set it to any string they want, such as \" \", or
+even an empty string to not have any such prefix."
   :type 'string
   :package-version '(denote . "4.1.0")
   :group 'denote)

[elpa] externals/denote updated (ffb65405e7 -> 8f7099eeb8)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  ffb65405e7 Acknowledge James Kalyan for commit 8e1341d
   new  afa3b9495f Reword the doc string of denote-buffer-name-prefix
   new  8f7099eeb8 Document the new user option denote-buffer-name-prefix


Summary of changes:
 README.org | 45 +
 denote.el  |  6 +-
 2 files changed, 42 insertions(+), 9 deletions(-)

[elpa] externals/denote 8f7099eeb8 2/2: Document the new user option denote-buffer-name-prefix

[ELPA Syncer]

branch: externals/denote
commit 8f7099eeb8af5b0e9165a6ed1af58078e04ecb2a
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Document the new user option denote-buffer-name-prefix

This builds on top of commit 8e1341d by James Kalyan, which was done
in pull request 597: .

James is in the process of assigning copyright to the Free Software
Foundation.
---
 README.org | 45 +
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/README.org b/README.org
index bc9345fdf7..1e47ceb3fb 100644
--- a/README.org
+++ b/README.org
@@ -3310,7 +3310,30 @@ multimedia in a systematic way (and, perhaps, use them 
as attachments
 for the notes Denote produces if you are writing Org notes and are using
 its standand attachments' facility).
 
-* Automatically rename Denote buffers
+* Set the prefix of all Denote buffers
+:PROPERTIES:
+:CUSTOM_ID: h:a3a1a2af-a0b8-420c-acb1-855a7d113e69
+:END:
+
+[ This is part of {{{development-version}}}. ]
+
+#+vindex: denote-buffer-name-prefix
+The user option ~denote-buffer-name-prefix~ specifies the text used as
+a prefix of all buffer names generated by Denote. This applies to the
+buffer of query links, backlinks, ~denote-grep~, ~denote-dired~, as
+well as those affected by ~denote-rename-buffer-mode~:
+
+- [[#h:d9a84289-2f73-4ef9-b4f0-9a0aa3e9bf0d][Add a query link]].
+- [[#h:c73f1f68-e214-49d5-b369-e694f6a5d708][The backlinks' buffer]].
+- [[#h:e71c9d14-7e88-4386-91d0-9ad249947077][Use ~denote-grep~ to search 
inside files]].
+- [[#h:9fe01e63-f34f-4479-8713-f162a5ca865e][Display filtered and sorted files 
with ~denote-sort-dired~ or ~denote-dired~]].
+- [[#h:3ca4db16-8f26-4d7d-b748-bac48ae32d69][Automatically rename Denote file 
buffers]].
+
+By default, the value of ~denote-buffer-name-prefix~ is ="[D] "=.
+Users can set it to any string they want, such as =" "=, or
+even an empty string to not have any such prefix.
+
+* Automatically rename Denote file buffers
 :PROPERTIES:
 :CUSTOM_ID: h:3ca4db16-8f26-4d7d-b748-bac48ae32d69
 :END:
@@ -3331,10 +3354,11 @@ file. This applies both to existing Denote files as 
well as new ones
 Buffers are named by applying the function specified in the user
 option ~denote-rename-buffer-function~. The default function is
 ~denote-rename-buffer~: it renames the buffer based on the template
-set in the user option ~denote-rename-buffer-format~. By default, the
-formatting template targets only the =TITLE= component of the file
-name ([[#h:4e9c7512-84dc-4dfb-9fa9-e15d51178e5d][The file-naming scheme]]). 
Other fields are explained elsewhere in
-this manual ([[#h:35507c18-35b1-41b9-9d80-52f54fcef3cb][The 
denote-rename-buffer-format]]).
+set in the user option ~denote-rename-buffer-format~, combined with
+the ~denote-buffer-name-prefix~ 
([[#h:a3a1a2af-a0b8-420c-acb1-855a7d113e69][Set the prefix of all Denote 
buffers]]).
+Other fields are explained elsewhere in this manual 
([[#h:35507c18-35b1-41b9-9d80-52f54fcef3cb][The denote-rename-buffer-format]]).
+
+[ The ~denote-buffer-name-prefix~ is part of {{{development-version}}}. ]
 
 Note that renaming a buffer is not the same as renaming a file
 ([[#h:532e8e2a-9b7d-41c0-8f4b-3c5cbb7d4dca][Renaming files]]). The former is 
just for convenience inside of Emacs.
@@ -3348,10 +3372,15 @@ available to all programs.
 
 The user option ~denote-rename-buffer-format~ controls how the
 function ~denote-rename-buffer~ chooses the name of the
-buffer-to-be-renamed.
+buffer-to-be-renamed. It also affects the ~denote-rename-buffer-mode~
+([[#h:3ca4db16-8f26-4d7d-b748-bac48ae32d69][Automatically rename Denote file 
buffers]]).
+
+The value of this user option is a string that gets combined with the
+~denote-buffer-name-prefix~ ([[#h:a3a1a2af-a0b8-420c-acb1-855a7d113e69][Set 
the prefix of all Denote buffers]]).
+The following specifiers are placeholders for Denote file name
+components ([[#h:4e9c7512-84dc-4dfb-9fa9-e15d51178e5d][The file-naming 
scheme]]):
 
-The value of this user option is a string. The following specifiers
-are placeholders for Denote file name components 
([[#h:4e9c7512-84dc-4dfb-9fa9-e15d51178e5d][The file-naming scheme]]):
+[ The ~denote-buffer-name-prefix~ is part of {{{development-version}}}. ]
 
 #+vindex: denote-rename-buffer-backlinks-indicator
 - The =%t= is the Denote =TITLE= in the front matter or the file name.

[elpa] externals/ess 9f5cced1b0 2/3: drop one ' fixing #1285

[ELPA Syncer]

branch: externals/ess
commit 9f5cced1b00266e74184a126f26c40afb6e229e6
Author: Martin Maechler 
Commit: Martin Maechler 

drop one ' fixing #1285
---
 lisp/ess-custom.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ess-custom.el b/lisp/ess-custom.el
index f81b67872c..32e69eaf6b 100644
--- a/lisp/ess-custom.el
+++ b/lisp/ess-custom.el
@@ -329,7 +329,7 @@ process. If a symbol, the symbol's value should be a 
directory.
 For example, the following setting would always start the process
 in the directory of the current file:
 
-   (setq ess-startup-directory ''default-directory)
+   (setq ess-startup-directory 'default-directory)
 
 If `ess-startup-directory' is nil (the default) and
 `ess-startup-directory-function' is non-nil, the value returned

[nongnu] elpa/haskell-ts-mode a4659226f6 1/2: fix standalone deriving block

[ELPA Syncer]

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

fix standalone deriving block

deals with bug https://codeberg.org/pranshu/haskell-ts-mode/issues/32
---
 haskell-ts-mode.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index ef347faf2c..36d83ee8d8 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -173,8 +173,7 @@ when `haskell-ts-prettify-words' is non-nil.")
  (declarations (data_type name: (name) @font-lock-type-face))
  (declarations (newtype name: (name) @font-lock-type-face))
  (deriving "deriving" @font-lock-keyword-face (name) @font-lock-type-face)
- (deriving "deriving" @font-lock-keyword-face (name) @font-lock-type-face)
- (deriving_instance "deriving" @font-lock-keyword-face (name) 
@font-lock-type-face))
+ (deriving_instance "deriving" @font-lock-keyword-face name: (_) 
@font-lock-type-face))
 
:language 'haskell
:feature 'match

[nongnu] elpa/haskell-ts-mode updated (24ae2278f5 -> 8dcdf855af)

[ELPA Syncer]

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

  from  24ae2278f5 Indent fix
   new  a4659226f6 fix standalone deriving block
   new  8dcdf855af Adding suggested packages


Summary of changes:
 README.md  | 14 ++
 haskell-ts-mode.el |  3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

[elpa] externals/ess 09df73c091 3/3: Merge branch 'master' of github.com:emacs-ess/ESS

[ELPA Syncer]

branch: externals/ess
commit 09df73c091a28db530628e444dbfe843f9f019ff
Merge: 9f5cced1b0 cf20fa0a6e
Author: Martin Maechler 
Commit: Martin Maechler 

Merge branch 'master' of github.com:emacs-ess/ESS
---
 lisp/ess-bugs-l.el   |  4 ++--
 lisp/ess-help.el |  2 +-
 lisp/ess-r-mode.el   | 12 ++--
 lisp/ess-rdired.el   |  2 +-
 lisp/ess-sas-d.el|  2 +-
 lisp/ess-tracebug.el |  6 +++---
 lisp/essd-els.el |  2 +-
 test/etest/etest.el  |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lisp/ess-bugs-l.el b/lisp/ess-bugs-l.el
index 5cb707f303..1123ef154b 100644
--- a/lisp/ess-bugs-l.el
+++ b/lisp/ess-bugs-l.el
@@ -64,8 +64,8 @@ Users whose default is not \\='sh, but are accessing a remote 
machine with
 `telnet' or `ssh', should have the following in their init file:
(setq-default ess-bugs-batch-method \\='sh)"
   :group 'ess-bugs
-  :type '(choice (const sh :tag "Bourne/C-like Unix Shell")
- (const dos :tag "DOS-like Windows shell")))
+  :type '(choice (const :tag "Bourne/C-like Unix Shell" sh)
+ (const :tag "DOS-like Windows shell" dos)))
 
 (defcustom ess-bugs-batch-post-command
   (if (equal ess-bugs-batch-method 'sh) "&" " ")
diff --git a/lisp/ess-help.el b/lisp/ess-help.el
index 0b2ccd13f9..7c9970838f 100644
--- a/lisp/ess-help.el
+++ b/lisp/ess-help.el
@@ -714,7 +714,7 @@ nil otherwise."
   (save-excursion
 (goto-char (point-min))
 (while (search-forward "_" nil t)
-  (backward-delete-char 2)
+  (delete-char -2)
   (put-text-property (point) (1+ (point)) 'face 'underline
 
 ;;*;; Link to Info
diff --git a/lisp/ess-r-mode.el b/lisp/ess-r-mode.el
index 47165c2bcf..f2f533a7e9 100644
--- a/lisp/ess-r-mode.el
+++ b/lisp/ess-r-mode.el
@@ -72,9 +72,9 @@ Fetching happens once per new ESSR version. The archive is 
stored
 in ~/.config/ESSR/ESSRv[VERSION].rds file. You can download and
 place it there manually if the remote has restricted network
 access."
-  :type '(choice (const nil :tag "Never")
- (const ess-remote :tag "With ess-remote only")
- (const t :tag "Always"))
+  :type '(choice (const :tag "Never" nil)
+ (const :tag "With ess-remote only" ess-remote)
+ (const :tag "Always" t))
   :group 'ess-R)
 
 ;; Silence the byte compiler
@@ -573,7 +573,7 @@ blocking commands will throw an error.")
 
 ;;;###autoload
 (defun run-ess-r (&optional start-args)
-  "Call 'R', the 'GNU S' system from the R Foundation.
+  "Call \\='R\\=', the \\='GNU S\\=' system from the R Foundation.
 Optional prefix (\\[universal-argument]) allows to set command line arguments, 
such as
 --vsize.  This should be OS agnostic.
 If you have certain command line arguments that should always be passed
@@ -2918,10 +2918,10 @@ needed."
 (defun ess-rutils-html-docs (&optional remote)
   "Use `browse-url' to navigate R html documentation.
 Documentation is produced by a modified help.start(), that
-returns the URL produced by GNU R's http server. If called with a
+returns the URL produced by GNU R\\='s http server. If called with a
 prefix, the modified help.start() is called with update=TRUE. The
 optional REMOTE argument should be a string with a valid URL for
-the 'R_HOME' directory on a remote server (defaults to NULL)."
+the \\='R_HOME\\=' directory on a remote server (defaults to NULL)."
   (interactive)
   (let* ((update (if current-prefix-arg "update=TRUE" "update=FALSE"))
  (remote (if (or (and remote (not (string= "" remote
diff --git a/lisp/ess-rdired.el b/lisp/ess-rdired.el
index efc7fa1d59..e025a5fd12 100644
--- a/lisp/ess-rdired.el
+++ b/lisp/ess-rdired.el
@@ -87,7 +87,7 @@
 
 (defcustom ess-rdired-auto-update-interval 5
   "Seconds between refreshes of the `ess-rdired' buffer."
-  :type '(choice (const nil :tag "No auto updates") (integer :tag "Seconds"))
+  :type '(choice (const :tag "No auto updates" nil) (integer :tag "Seconds"))
   :group 'ess-R
   :package-version '(ess . "19.04"))
 
diff --git a/lisp/ess-sas-d.el b/lisp/ess-sas-d.el
index 98afed49e7..5cf147b94d 100644
--- a/lisp/ess-sas-d.el
+++ b/lisp/ess-sas-d.el
@@ -287,7 +287,7 @@ indent line."
 (SAS)))
 
 (defun SAS ()
-  "Call 'SAS', from SAS Institute."
+  "Call \\='SAS\\=', from SAS Institute."
   (interactive)
   (let* ((temp-dialect "SAS")) ;(cdr (rassoc ess-dialect 
SAS-customize-alist
 (ess-write-to-dribble-buffer
diff --git a/lisp/ess-tracebug.el b/lisp/ess-tracebug.el
index 0a17d556f8..f7f2698f73 100644
--- a/lisp/ess-tracebug.el
+++ b/lisp/ess-tracebug.el
@@ -555,9 +555,9 @@ If \\='strip, remove all such instances.  Otherwise, if 
non-nil, `+
 `ess-long+replacement'.
 This variable can be process-local but not buffer-local."
   :group 'ess-tracebug
-  :type '(choice (const nil :tag "No replacement")
- (const strip :tag "Replace all")
- (const t :tag "Replace 3 or more +")))
+  :type '(choice (const :tag "No replacement" nil)
+