[elpa] externals/hyperbole 0325b7583a 1/3: kotl-mode.el - Extend {C-j} kotl-mode:add-cell with 0 and neg. args

[ELPA Syncer]

branch: externals/hyperbole
commit 0325b7583a08811590db4fdc7652252d3dbf2f23
Author: bw 
Commit: bw 

kotl-mode.el - Extend {C-j} kotl-mode:add-cell with 0 and neg. args

kotl-mode.el - Extend supporting commands to take contents plist and
   no-fill args.

hui-mouse.el - Remove outdated View major mode support and update
  View minor mode handler.
---
 ChangeLog   |  45 ++-
 hui-mouse.el|  12 +-
 hywiki.el   |   4 +-
 kotl/EXAMPLE.kotl   |  36 +++--
 kotl/kmenu.el   |   4 +-
 kotl/kotl-mode.el   | 352 +---
 man/hyperbole.texi  |  20 +--
 test/kotl-mode-tests.el |   7 +-
 8 files changed, 327 insertions(+), 153 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e19aeca325..447a989f2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,44 @@
+2025-05-04  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-after-parent): Add back in to add successive
+sibling cells of a parent cell or if at the top-level, as the first cells 
in
+the outline.
+  test/kotl-mode-tests.el (kotl-mode-tests--sanity-check-function-list): Add
+'kotl-mode:add-after-parent'.
+
+2025-05-03  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-cell): Update doc string and handling of
+negative prefix args to add that many cells prior to the current cell.  
Also,
+change 0 arg to add a single cell as the parent's first child.
+(kotl-mode:add-child): Use prefix arg to add a sequence
+of child cells.
+(kotl-mode:add-below-parent): Rename from
+'kotl-mode:add-after-parent'.  Use prefix arg to add a sequence of initial
+children cells below the parent of the current cell.
+(kotl-mode:add-prior-cell): Use prefix arg to add a 
sequence
+of prior sibling cells or with C-u, add as the initial cells at the start 
of
+the current cell level (first children of its parent).
+
+2025-04-29  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-prior-cell): Add optional prefix arg flag
+to add that many prior sibling cells unless on a level 1 cell or when given
+a single C-u prefand when given insert cell as the the parent's first 
child.
+Bind this to {C-c p}.
+   (kotl-mode:add-before-parent): Add prior sibling to parent
+cell.  If on top-level, add first cell at that level.
+  kotl/kmenu.el (kotl-menu-common-body): Add above function to Koutline menu
+as well as 'kotl-mode:add-below-parent'.
+
 2025-04-27  Mats Lidell  
 
-* hywiki.el (hywiki-word-face-at-p):
-* hibtypes.el (smerge): Use or instead of setq. Thanks Stefan Monnier for
+* hywiki.el   (hywiki-word-face-at-p):
+  hibtypes.el (smerge): Use or instead of setq. Thanks Stefan Monnier for
 the suggestion.
 
 * man/hyperbole.texi (Implicit Button Types): smerge ibut.
-(Smart Key - Magit Mode): Merge conflict lines.
+ (Smart Key - Magit Mode): Merge conflict lines.
 
 2025-04-27  Bob Weiner  
 
@@ -144,11 +177,11 @@
 * kotl/kotl-mode.el (kotl-mode:add-prior-cell): Add to insert a cell
 prior to the current cell at the same level as the current cell.
 
-* kotl/kmenu.el (kotl-menu-common-body): Change 'Add-Parent' to
-'Add-After-Parent'.
+* kotl/kmenu.el (kotl-menu-common-body): Change 'Add-Parent' to two
+commands: 'Add-After-Parent and 'Add-Below-Parent'.
 
 * kotl/kotl-mode.el (kotl-mode:add-parent): Rename to
-   'kotl-mode:add-after-parent'.
+   'kotl-mode:add-below-parent'.
 
 2025-04-19  Bob Weiner  
 
diff --git a/hui-mouse.el b/hui-mouse.el
index 6b926a0103..423eb0e39f 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:04-Feb-89
-;; Last-Mod: 27-Apr-25 at 16:49:19 by Mats Lidell
+;; Last-Mod:  4-May-25 at 10:38:03 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -348,13 +348,13 @@ Its default value is `smart-scroll-down'.  To disable it, 
set it to
. (smart-menu hkey-value)))
 ;;
 ;; View minor mode
-((if (boundp 'view-minor-mode) view-minor-mode)
+((bound-and-true-p view-mode)
  . ((cond ((last-line-p)
   (view-quit))
  ((pos-visible-in-window-p (point-max))
   (goto-char (point-max)))
- (t (scroll-up)))
-   . (scroll-down)))
+ (t (View-scroll-page-forward)))
+   . (View-scroll-page-backward)))
 ;;
 ;; Direct access selection of helm-major-mode completions
 ((setq hkey-value (and (or (eq major-mode 'helm-major-mode)
@@ -381,10 +381,6 @@ Its default value is `smart-scroll-down'.  To disable it, 
set it to
  (equal br-feature-tags-file (hypb:buffer-file-name
  . ((smart-element) . (hkey-help)))
 ;;
-;; View major mode
-((eq major-mode 'view-mode) .
- ((View-scroll-lines-forward) . (View-scroll-lines-backward)))
-;;
 ;; Select or select-and-kill a marku

[elpa] externals/hyperbole 78d905f75b 2/3: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit 78d905f75baa69e593a613baf5a74a844695d216
Merge: 0325b7583a 9ced23a3c8
Author: bw 
Commit: bw 

Merge branch 'master' into rsw
---
 ChangeLog  | 17 +
 man/.dir-locals.el | 19 +++
 man/hyperbole.texi | 50 ++
 test/hbut-tests.el | 27 ++-
 4 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 447a989f2d..d3494418c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,12 @@
 of prior sibling cells or with C-u, add as the initial cells at the start 
of
 the current cell level (first children of its parent).
 
+2025-05-01  Mats Lidell  
+
+* test/hbut-tests.el (hbut-tests--hattr-is-p)
+(hbut-tests--hattr-ibtype-is-p, hbut-tests--hattr-actype-is-p): Unit
+tests.
+
 2025-04-29  Bob Weiner  
 
 * kotl/kotl-mode.el (kotl-mode:add-prior-cell): Add optional prefix arg flag
@@ -31,10 +37,21 @@
   kotl/kmenu.el (kotl-menu-common-body): Add above function to Koutline menu
 as well as 'kotl-mode:add-below-parent'.
 
+2025-04-28  Mats Lidell  
+
+* man/.dir-locals.el: Add before-save-hook for automating date updates.
+
 2025-04-27  Mats Lidell  
 
 * hywiki.el   (hywiki-word-face-at-p):
   hibtypes.el (smerge): Use or instead of setq. Thanks Stefan Monnier for
+
+2025-04-27  Mats Lidell  
+
+* man/hyperbole.texi (Implicit Button Types): Add anchor to all ibtypes.
+
+* hywiki.el (hywiki-word-face-at-p):
+* hibtypes.el (smerge): Use or instead of setq. Thanks Stefan Monnier for
 the suggestion.
 
 * man/hyperbole.texi (Implicit Button Types): smerge ibut.
diff --git a/man/.dir-locals.el b/man/.dir-locals.el
new file mode 100644
index 00..7643932b4d
--- /dev/null
+++ b/man/.dir-locals.el
@@ -0,0 +1,19 @@
+((texinfo-mode
+  . ((before-save-hook
+  . (lambda ()
+  (let ((day (format-time-string "%d" (current-time)))
+(month (capitalize (format-time-string "%B" (current-time
+(year (format-time-string "%Y" (current-time
+(save-excursion
+  (goto-char (point-min))
+  (when (re-search-forward "\\(@set UPDATED [[:word:]]+, 
[[:digit:]]+\\)" nil t)
+(replace-match (format "@set UPDATED %s, %s" month year) nil t 
nil nil))
+  (goto-char (point-min))
+  (when (re-search-forward "\\(@set UPDATED-MONTH [[:word:]]+ 
[[:digit:]]+\\)" nil t)
+(replace-match (format "@set UPDATED-MONTH %s %s" month year) 
nil t nil nil))
+  (goto-char (point-min))
+  (when (re-search-forward "\\(Printed [[:word:]]+ [[:digit:]]+, 
[[:digit:]]+\.\\)" nil t)
+(replace-match (format "Printed %s %s, %s." month day year) 
nil t nil nil))
+  (goto-char (point-min))
+  (when (re-search-forward "\\([[:word:]]+ [[:digit:]]+, 
[[:digit:]]+ @c AUTO-REPLACE-ON-SAVE\\)" nil t)
+(replace-match (format "%s %s, %s @c AUTO-REPLACE-ON-SAVE" 
month day year) nil t nil nil)
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index baf10b4322..743422a2fd 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -2494,6 +2494,7 @@ The following table summarizes the effect of this option 
setting.
 @findex ibtypes doc-id
 @cindex online library
 @cindex document identifier
+@anchor{doc-id}
 @item doc-id
 Display a document from a local document library given its id.  Ids must be
 delimited by @code{doc-id-start} and @code{doc-id-end} and must match the
@@ -2516,12 +2517,14 @@ resolution from within the @code{magit-status-mode}.
 
 @findex ibtypes completion
 @cindex completion
+@anchor{completion}
 @item completion
 Insert the completion at point (from a completions buffer) into the
 minibuffer or the other window.
 
 @findex ibtypes hywiki-existing-word
 @cindex hywiki existing word
+@anchor{hywiki-existing-word}
 @item hywiki-existing-word
 When on a HyWiki word with an existing page, display its page and
 optional section.
@@ -2531,6 +2534,7 @@ optional section.
 @cindex action implicit button
 @cindex function call implicit button
 @cindex variable display implicit button
+@anchor{action}
 @item action
 The Action Button type.  At point, activate any of: an Elisp variable, a
 Hyperbole action-type, or an Elisp function call surrounded by <> rather than
@@ -2539,6 +2543,7 @@ Hyperbole action-type, or an Elisp function call 
surrounded by <> rather than
 @findex ibtypes hyp-source
 @cindex Hyperbole report
 @vindex file, DEMO
+@anchor{hyp-source}
 @item hyp-source
 Turn source location entries following an `@@loc>' line in Hyperbole
 reports into buttons that jump to the associated location.  For
@@ -2549,6 +2554,7 @@ buffer behaves the same as the corresponding button in 
the original
 
 @findex ibtypes hyp-address
 @cindex Hyperbole mail list
+@anchor{hyp-address}
 @item hyp-address
 Within a mail or Usenet news composer window, ma

[elpa] externals/hyperbole d3c7ebdf0f 3/3: Merge pull request #725 from rswgnu/rsw

[ELPA Syncer]

branch: externals/hyperbole
commit d3c7ebdf0f8ca82becf7fae4e7f26672a93a21bf
Merge: 9ced23a3c8 78d905f75b
Author: Robert Weiner 
Commit: GitHub 

Merge pull request #725 from rswgnu/rsw

kotl-mode.el - Extend {C-j} kotl-mode:add-cell with 0 and neg. args
---
 ChangeLog   |  46 ++-
 hui-mouse.el|  12 +-
 hywiki.el   |   4 +-
 kotl/EXAMPLE.kotl   |  36 +++--
 kotl/kmenu.el   |   4 +-
 kotl/kotl-mode.el   | 352 +---
 man/hyperbole.texi  |  20 +--
 test/kotl-mode-tests.el |   7 +-
 8 files changed, 330 insertions(+), 151 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc11070f3d..d3494418c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,53 @@
+2025-05-04  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-after-parent): Add back in to add successive
+sibling cells of a parent cell or if at the top-level, as the first cells 
in
+the outline.
+  test/kotl-mode-tests.el (kotl-mode-tests--sanity-check-function-list): Add
+'kotl-mode:add-after-parent'.
+
+2025-05-03  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-cell): Update doc string and handling of
+negative prefix args to add that many cells prior to the current cell.  
Also,
+change 0 arg to add a single cell as the parent's first child.
+(kotl-mode:add-child): Use prefix arg to add a sequence
+of child cells.
+(kotl-mode:add-below-parent): Rename from
+'kotl-mode:add-after-parent'.  Use prefix arg to add a sequence of initial
+children cells below the parent of the current cell.
+(kotl-mode:add-prior-cell): Use prefix arg to add a 
sequence
+of prior sibling cells or with C-u, add as the initial cells at the start 
of
+the current cell level (first children of its parent).
+
 2025-05-01  Mats Lidell  
 
 * test/hbut-tests.el (hbut-tests--hattr-is-p)
 (hbut-tests--hattr-ibtype-is-p, hbut-tests--hattr-actype-is-p): Unit
 tests.
 
+2025-04-29  Bob Weiner  
+
+* kotl/kotl-mode.el (kotl-mode:add-prior-cell): Add optional prefix arg flag
+to add that many prior sibling cells unless on a level 1 cell or when given
+a single C-u prefand when given insert cell as the the parent's first 
child.
+Bind this to {C-c p}.
+   (kotl-mode:add-before-parent): Add prior sibling to parent
+cell.  If on top-level, add first cell at that level.
+  kotl/kmenu.el (kotl-menu-common-body): Add above function to Koutline menu
+as well as 'kotl-mode:add-below-parent'.
+
 2025-04-28  Mats Lidell  
 
 * man/.dir-locals.el: Add before-save-hook for automating date updates.
 
 2025-04-27  Mats Lidell  
 
+* hywiki.el   (hywiki-word-face-at-p):
+  hibtypes.el (smerge): Use or instead of setq. Thanks Stefan Monnier for
+
+2025-04-27  Mats Lidell  
+
 * man/hyperbole.texi (Implicit Button Types): Add anchor to all ibtypes.
 
 * hywiki.el (hywiki-word-face-at-p):
@@ -17,7 +55,7 @@
 the suggestion.
 
 * man/hyperbole.texi (Implicit Button Types): smerge ibut.
-(Smart Key - Magit Mode): Merge conflict lines.
+ (Smart Key - Magit Mode): Merge conflict lines.
 
 2025-04-27  Bob Weiner  
 
@@ -156,11 +194,11 @@
 * kotl/kotl-mode.el (kotl-mode:add-prior-cell): Add to insert a cell
 prior to the current cell at the same level as the current cell.
 
-* kotl/kmenu.el (kotl-menu-common-body): Change 'Add-Parent' to
-'Add-After-Parent'.
+* kotl/kmenu.el (kotl-menu-common-body): Change 'Add-Parent' to two
+commands: 'Add-After-Parent and 'Add-Below-Parent'.
 
 * kotl/kotl-mode.el (kotl-mode:add-parent): Rename to
-   'kotl-mode:add-after-parent'.
+   'kotl-mode:add-below-parent'.
 
 2025-04-19  Bob Weiner  
 
diff --git a/hui-mouse.el b/hui-mouse.el
index 6b926a0103..423eb0e39f 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:04-Feb-89
-;; Last-Mod: 27-Apr-25 at 16:49:19 by Mats Lidell
+;; Last-Mod:  4-May-25 at 10:38:03 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -348,13 +348,13 @@ Its default value is `smart-scroll-down'.  To disable it, 
set it to
. (smart-menu hkey-value)))
 ;;
 ;; View minor mode
-((if (boundp 'view-minor-mode) view-minor-mode)
+((bound-and-true-p view-mode)
  . ((cond ((last-line-p)
   (view-quit))
  ((pos-visible-in-window-p (point-max))
   (goto-char (point-max)))
- (t (scroll-up)))
-   . (scroll-down)))
+ (t (View-scroll-page-forward)))
+   . (View-scroll-page-backward)))
 ;;
 ;; Direct access selection of helm-major-mode completions
 ((setq hkey-value (and (or (eq major-mode 'helm-major-mode)
@@ -381,10 +381,6 @@ Its default value is `smart-scroll-down'.  To disable it, 
set it to
  (equal br-feature-tags-file (hypb:buffer-file-name
  . ((smart-ele

[elpa] externals/consult ce1d6c025c: consult-compile--error-candidates: Ignore directory messages

[ELPA Syncer]

branch: externals/consult
commit ce1d6c025cceebecbb5a7a535a733c36b4d6d941
Author: Troy Brown 
Commit: Daniel Mendler 

consult-compile--error-candidates: Ignore directory messages

Fixes #1225
---
 consult-compile.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/consult-compile.el b/consult-compile.el
index 417b1880c2..fba09d4e99 100644
--- a/consult-compile.el
+++ b/consult-compile.el
@@ -52,7 +52,8 @@
   (pos (point-min)))
   (save-excursion
 (while (setq pos (compilation-next-single-property-change pos 
'compilation-message))
-  (when-let (msg (get-text-property pos 'compilation-message))
+  (when-let* ((msg (get-text-property pos 'compilation-message))
+  ((compilation--message->loc msg)))
 (goto-char pos)
 (push (propertize
(consult-compile--font-lock (consult--buffer-substring pos 
(pos-eol)))

[elpa] externals/hyperbole updated (9ced23a3c8 -> d3c7ebdf0f)

[ELPA Syncer]

elpasync pushed a change to branch externals/hyperbole.

  from  9ced23a3c8 Unit tests for hattr:{is-p,actype-is-p,ibtype-is-p} 
(#724)
   new  0325b7583a kotl-mode.el - Extend {C-j} kotl-mode:add-cell with 0 
and neg. args
   new  78d905f75b Merge branch 'master' into rsw
   new  d3c7ebdf0f Merge pull request #725 from rswgnu/rsw


Summary of changes:
 ChangeLog   |  46 ++-
 hui-mouse.el|  12 +-
 hywiki.el   |   4 +-
 kotl/EXAMPLE.kotl   |  36 +++--
 kotl/kmenu.el   |   4 +-
 kotl/kotl-mode.el   | 352 +---
 man/hyperbole.texi  |  20 +--
 test/kotl-mode-tests.el |   7 +-
 8 files changed, 330 insertions(+), 151 deletions(-)

[nongnu] elpa/clojure-ts-mode ea1c134245: Introduce cycle privacy refactoring command

[ELPA Syncer]

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

Introduce cycle privacy refactoring command
---
 CHANGELOG.md |   1 +
 README.md|  21 +++--
 clojure-ts-mode.el   |  46 +-
 test/clojure-ts-mode-cycling-test.el | 163 +++
 test/samples/refactoring.clj |  12 +++
 5 files changed, 235 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a45d82723..c8fc91be12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [#88](https://github.com/clojure-emacs/clojure-ts-mode/pull/88): Introduce 
`clojure-ts-unwind` and `clojure-ts-unwind-all`.
 - [#89](https://github.com/clojure-emacs/clojure-ts-mode/pull/89): Introduce 
`clojure-ts-thread`, `clojure-ts-thread-first-all` and
   `clojure-ts-thread-last-all`.
+- [#90](https://github.com/clojure-emacs/clojure-ts-mode/pull/90): Introduce 
`clojure-ts-cycle-privacy`.
 
 ## 0.3.0 (2025-04-15)
 
diff --git a/README.md b/README.md
index c7b8e40590..bf14a33ddf 100644
--- a/README.md
+++ b/README.md
@@ -376,20 +376,26 @@ following customization:
 
 ### Threading macros related features
 
-`clojure-thread`: Thread another form into the surrounding thread. Both
+`clojure-ts-thread`: Thread another form into the surrounding thread. Both
 `->>`/`some->>` and `->`/`some->` variants are supported.
 
-`clojure-unwind`: Unwind a threaded expression. Supports both `->>`/`some->>`
+`clojure-ts-unwind`: Unwind a threaded expression. Supports both 
`->>`/`some->>`
 and `->`/`some->`.
 
-`clojure-thread-first-all`: Introduce the thread first macro (`->`) and rewrite
-the entire form. With a prefix argument do not thread the last form.
+`clojure-ts-thread-first-all`: Introduce the thread first macro (`->`) and
+rewrite the entire form. With a prefix argument do not thread the last form.
 
-`clojure-thread-last-all`: Introduce the thread last macro and rewrite the
+`clojure-ts-thread-last-all`: Introduce the thread last macro and rewrite the
 entire form. With a prefix argument do not thread the last form.
 
-`clojure-unwind-all`: Fully unwind a threaded expression removing the threading
-macro.
+`clojure-ts-unwind-all`: Fully unwind a threaded expression removing the
+threading macro.
+
+### Cycling things
+
+`clojure-ts-cycle-privacy`: Cycle privacy of `def`s or `defn`s. Use metadata
+explicitly with setting `clojure-ts-use-metadata-for-defn-privacy` to `t` for
+`defn`s too.
 
 ### Default keybindings
 
@@ -400,6 +406,7 @@ macro.
 | `C-c C-r u` / `C-c C-r C-u` | `clojure-ts-unwind`   |
 | `C-c C-r f` / `C-c C-r C-f` | `clojure-ts-thread-first-all` |
 | `C-c C-r l` / `C-c C-r C-l` | `clojure-ts-thread-last-all`  |
+| `C-c C-r p` / `C-c C-r C-p` | `clojure-ts-cycle-privacy`|
 
 ### Customize refactoring commands prefix
 
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index 45dcc62b6c..a110d2f78d 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -160,6 +160,14 @@ current sexp."
   :safe #'booleanp
   :type 'boolean)
 
+(defcustom clojure-ts-use-metadata-for-defn-privacy nil
+  "If nil, `clojure-ts-cycle-privacy' will use (defn- f []).
+
+If t, it will use (defn ^:private f [])."
+  :package-version '(clojure-ts-mode . "0.4.0")
+  :safe #'booleanp
+  :type 'boolean)
+
 (defcustom clojure-ts-align-reader-conditionals nil
   "Whether to align reader conditionals, as if they were maps."
   :package-version '(clojure-ts-mode . "0.4")
@@ -1480,6 +1488,21 @@ If JUSTIFY is non-nil, justify as well as fill the 
paragraph."
 "map_lit" "ns_map_lit" "vec_lit" "set_lit")
   "A regular expression that matches nodes that can be treated as lists.")
 
+(defun clojure-ts--defun-node-p (node)
+  "Return TRUE if NODE is a function or a var definition."
+  (and (clojure-ts--list-node-p node)
+   (let ((sym (clojure-ts--node-child-skip-metadata node 0)))
+ (string-match-p (rx bol
+ (or "def"
+ "defn"
+ "defn-"
+ "definline"
+ "defrecord"
+ "defmacro"
+ "defmulti")
+ eol)
+ (clojure-ts--named-node-text sym)
+
 (defconst clojure-ts--markdown-inline-sexp-nodes
   '("inline_link" "full_reference_link" "collapsed_reference_link"
 "uri_autolink" "email_autolink" "shortcut_link" "image"
@@ -1490,7 +1513,8 @@ If JUSTIFY is non-nil, justify as well as fill the 
paragraph."
   `((clojure
  (sexp ,(regexp-opt clojure-ts--sexp-nodes))
  (list ,(regexp-opt clojure-ts--list-nodes))
- (text ,(regexp-opt '("comment"
+ (text ,(regexp-opt '("comment")))
+ (defun ,#'clojure-ts--defun-node-p))
 (when clojure-ts-use-markdown-inline
   (markdown-inline
  

[elpa] externals/diff-hl 0a378d0357: diff-hl-show-hunk-posframe: Fix error on repeated next/previous iteration

[ELPA Syncer]

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

diff-hl-show-hunk-posframe: Fix error on repeated next/previous iteration
---
 diff-hl-show-hunk-posframe.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diff-hl-show-hunk-posframe.el b/diff-hl-show-hunk-posframe.el
index 735fcd5e88..331c4bb3fe 100644
--- a/diff-hl-show-hunk-posframe.el
+++ b/diff-hl-show-hunk-posframe.el
@@ -192,7 +192,7 @@ The button calls an ACTION."
'keymap diff-hl-show-hunk-posframe--transient-mode-map)))
 
   (setq posframe-mouse-banish nil)
-  (setq diff-hl-show-hunk--original-frame last-event-frame)
+  (setq diff-hl-show-hunk--original-frame (selected-frame))
 
   (let* ((hunk-overlay diff-hl-show-hunk--original-overlay)
  (position (overlay-end hunk-overlay)))

[nongnu] elpa/haskell-ts-mode 24ae2278f5 2/2: Indent fix

[ELPA Syncer]

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

Indent fix

Now finally we have proper indentation while editing, but I used kind
of an ugly method to do it.  Oh well
---
 haskell-ts-mode.el | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 7301f50578..ef347faf2c 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Pranshu Sharma 
 ;; URL: https://codeberg.org/pranshu/haskell-ts-mode
 ;; Package-Requires: ((emacs "29.3"))
-;; Version: 1.1.2
+;; Version: 1.1.3
 ;; Keywords: languages, haskell
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -290,7 +290,7 @@ when `haskell-ts-prettify-words' is non-nil.")
((node-is "^then$") parent 2)
((node-is "^else$") parent 2)
 
-   ((parent-is "^apply$") haskell-ts--stand-alone-parent 1)
+   ((parent-is "^apply$") haskell-ts--stand-alone-parent 2)
((node-is "^quasiquote$") grand-parent 2)
((parent-is "^quasiquote_body$") (lambda (_ _ c) c) 0)
((lambda (node parent bol)
@@ -334,8 +334,8 @@ when `haskell-ts-prettify-words' is non-nil.")
  (treesit-node-type (funcall ,p-n-prev node)
 standalone-parent 2)
 
-   ((node-is "match") ,p-prev-sib 0)
-   ((parent-is "match") standalone-parent 2)
+   ((node-is "match") ,p-prev-sib 1)
+   ((parent-is "match") haskell-ts--stand-alone-parent 2)
 
((parent-is "^haskell$") column-0 0)
((parent-is "^declarations$") column-0 0)
@@ -443,6 +443,7 @@ when `haskell-ts-prettify-words' is non-nil.")
   (when haskell-ts-use-indent
 (setq-local treesit-simple-indent-rules haskell-ts-indent-rules)
 (setq-local indent-tabs-mode nil))
+  (setq-local electric-indent-functions '(haskell-ts-indent-after-newline))
   ;; Comment
   (setq-local comment-start "-- ")
   (setq-local comment-use-syntax t)
@@ -481,6 +482,15 @@ when `haskell-ts-prettify-words' is non-nil.")
   haskell-ts-font-lock-feature-list)
   (treesit-major-mode-setup))
 
+(defun haskell-ts-indent-after-newline (c)
+  (when (eq c ?\n)
+  (let ((previous-line-width
+(save-excursion
+  (goto-char (line-end-position 0))
+  (current-column
+   (insert (make-string previous-line-width ?\s
+  t)
+
 (defun haskell-ts--fontify-func (node face)
   (if (string= "variable" (treesit-node-type node))
   (put-text-property

[nongnu] elpa/haskell-ts-mode 8aa01ed435 1/2: adding support for standalone deriving statments

[ELPA Syncer]

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

adding support for standalone deriving statments

Fixes https://codeberg.org/pranshu/haskell-ts-mode/issues/32
---
 haskell-ts-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/haskell-ts-mode.el b/haskell-ts-mode.el
index 279e45a14a..7301f50578 100644
--- a/haskell-ts-mode.el
+++ b/haskell-ts-mode.el
@@ -172,7 +172,9 @@ when `haskell-ts-prettify-words' is non-nil.")
  (declarations (type_synomym (name) @font-lock-type-face))
  (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 "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 (0f93e445d3 -> 24ae2278f5)

[ELPA Syncer]

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

  from  0f93e445d3 Adding more syntax highlihgitng
   new  8aa01ed435 adding support for standalone deriving statments
   new  24ae2278f5 Indent fix


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

[elpa] externals/org updated (1724419b70 -> ffb1652c4a)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  1724419b70 lisp/org.el: Fix computation of the DPI for multiple 
monitors
   new  2555800d2a org-capture-templates: Clarify file specification in 
targets
   new  29aac5cd5c org-manual: Clarify file specification in targets
   new  f2ec3c2eb5 ox-html: Always wrap exported src block with  tag
   new  ffb1652c4a Remove stray legacy submodule


Summary of changes:
 doc/org-manual.org  | 28 ++--
 etc/ORG-NEWS|  9 +
 lisp/org-capture.el | 27 +--
 lisp/ox-html.el |  2 +-
 testing/.gitignore  |  5 -
 testing/jump|  1 -
 6 files changed, 37 insertions(+), 35 deletions(-)
 delete mode 100644 testing/.gitignore
 delete mode 16 testing/jump

[elpa] externals/org ffb1652c4a 4/4: Remove stray legacy submodule

[ELPA Syncer]

branch: externals/org
commit ffb1652c4ada9595dc74773d3ccd409ec10280a1
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Remove stray legacy submodule

testing/jump is not used for anything and Bastien confirmed that it is
nothing of relevance.
---
 testing/.gitignore | 5 -
 testing/jump   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/testing/.gitignore b/testing/.gitignore
deleted file mode 100644
index 284c8dfef4..00
--- a/testing/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# in case anyone wants to keep ert in the testing directory, e.g., for
-# old versions of Emacs
-ert
-.org-test-id-locations
-.test-org-id-locations
\ No newline at end of file
diff --git a/testing/jump b/testing/jump
deleted file mode 16
index 820bb7d81b..00
--- a/testing/jump
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 820bb7d81bf08cee6f2610965ca97e96a1fe561d

[elpa] externals/org 2555800d2a 1/4: org-capture-templates: Clarify file specification in targets

[ELPA Syncer]

branch: externals/org
commit 2555800d2aa05cb69f1a0e9f44f485ad5954dea5
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-capture-templates: Clarify file specification in targets

* lisp/org-capture.el (org-capture-templates): Clarify that users may
use additional ways to specify the file target; not just file path.

Reported-by: Kristoffer Balintona 
Link: https://orgmode.org/list/87bjsagcea.fsf@localhost
---
 lisp/org-capture.el | 27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index cc940e501d..23201dccd8 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -187,6 +187,7 @@ target   Specification of where the captured item 
should be placed.
  become children of this node, other types will be added to the
  table or list in the body of this node.
 
+ 
  Most target specifications contain a file name.  If that file
  name is the empty string, it defaults to `org-default-notes-file'.
  A file can also be given as a variable or as a function called
@@ -195,37 +196,35 @@ target   Specification of where the captured item 
should be placed.
 
  Valid values are:
 
- (file \"path/to/file\")
+ (file )
  Text will be placed at the beginning or end of that file
 
  (id \"id of existing Org entry\")
  File as child of this entry, or in the body of the entry
 
- (file+headline \"path/to/file\" \"node headline\")
- (file+headline \"path/to/file\" function-returning-string)
- (file+headline \"path/to/file\" symbol-containing-string)
+ (file+headline  \"node headline\")
+ (file+headline  function-returning-string)
+ (file+headline  symbol-containing-string)
  Fast configuration if the target heading is unique in the file
 
- (file+olp \"path/to/file\" \"Level 1 heading\" \"Level 2\" ...)
- (file+olp \"path/to/file\" function-returning-list-of-strings)
- (file+olp \"path/to/file\" symbol-containing-list-of-strings)
+ (file+olp  \"Level 1 heading\" \"Level 2\" ...)
+ (file+olp  function-returning-list-of-strings)
+ (file+olp  symbol-containing-list-of-strings)
  For non-unique headings, the full outline path is safer
 
- (file+regexp  \"path/to/file\" \"regexp to find location\")
+ (file+regexp   \"regexp to find location\")
  File to the entry matching regexp
 
- (file+olp+datetree \"path/to/file\" \"Level 1 heading\" ...)
- (file+olp+datetree
-   \"path/to/file\" function-returning-list-of-strings)
- (file+olp+datetree
-   \"path/to/file\" symbol-containing-list-of-strings)
+ (file+olp+datetree  \"Level 1 heading\" ...)
+ (file+olp+datetree  function-returning-list-of-strings)
+ (file+olp+datetree  symbol-containing-list-of-strings)
  Will create a heading in a date tree for today's date.
  If no heading is given, the tree will be on top level.
  To prompt for date instead of using TODAY, use the
  :time-prompt property.  To create a week-tree, use the
  :tree-type property.
 
- (file+function \"path/to/file\" function-finding-location)
+ (file+function  function-finding-location)
  A function to find the right location in the file
 
  (clock)

[elpa] externals/org 29aac5cd5c 2/4: org-manual: Clarify file specification in targets

[ELPA Syncer]

branch: externals/org
commit 29aac5cd5caedebbf46de91b4cb353cbac194c5a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-manual: Clarify file specification in targets

* doc/org-manual.org (Template elements): Clarify that users may use
additional ways to specify the file target; not just file path.

Reported-by: Kristoffer Balintona 
Link: https://orgmode.org/list/87bjsagcea.fsf@localhost
---
 doc/org-manual.org | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 709edfc8f2..d5d92b749d 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -8093,15 +8093,15 @@ Now lets look at the elements of a template definition. 
 Each entry in
   Specification of where the captured item should be placed.  In Org
   files, targets usually define a node.  Entries will become children
   of this node.  Other types will be added to the table or list in the
-  body of this node.  Most target specifications contain a file name.
-  If that file name is the empty string, it defaults to
+  body of this node.  Most target specifications contain a
+  ==.  If it is the empty string, it defaults to
   ~org-default-notes-file~.  A file can also be given as a variable or
   as a function called with no argument.  When an absolute path is not
   specified for a target, it is taken as relative to ~org-directory~.
 
   Valid values are:
 
-  - =(file "path/to/file")= ::
+  - =(file )= ::
 
 Text will be placed at the beginning or end of that file.
 
@@ -8109,31 +8109,31 @@ Now lets look at the elements of a template definition. 
 Each entry in
 
 Filing as child of this entry, or in the body of the entry.
 
-  - =(file+headline "filename" "node headline")= ::
+  - =(file+headline  "node headline")= ::
 
-  - =(file+headline "filename" function-returning-string)= ::
+  - =(file+headline  function-returning-string)= ::
 
-  - =(file+headline "filename" symbol-containing-string)= ::
+  - =(file+headline  symbol-containing-string)= ::
 
 Fast configuration if the target heading is unique in the file.
 
-  - =(file+olp "filename" "Level 1 heading" "Level 2" ...)= ::
+  - =(file+olp  "Level 1 heading" "Level 2" ...)= ::
 
-  - =(file+olp "filename" function-returning-list-of-strings)= ::
+  - =(file+olp  function-returning-list-of-strings)= ::
 
-  - =(file+olp "filename" symbol-containing-list-of-strings)= ::
+  - =(file+olp  symbol-containing-list-of-strings)= ::
 
 For non-unique headings, the full path is safer.
 
-  - =(file+regexp "filename" "regexp to find location")= ::
+  - =(file+regexp  "regexp to find location")= ::
 
 Use a regular expression to position point.
 
-  - =(file+olp+datetree "filename" [ "Level 1 heading" ...])= ::
+  - =(file+olp+datetree  [ "Level 1 heading" ...])= ::
 
-  - =(file+olp+datetree "filename" function-returning-list-of-strings)= ::
+  - =(file+olp+datetree  function-returning-list-of-strings)= ::
 
-  - =(file+olp+datetree "filename" symbol-containing-list-of-strings)= ::
+  - =(file+olp+datetree  symbol-containing-list-of-strings)= ::
 
 This target[fn:30] creates a heading in a date tree[fn:31] for
 today's date.  If the optional outline path is given, the tree
@@ -8141,7 +8141,7 @@ Now lets look at the elements of a template definition.  
Each entry in
 level.  Check out the ~:time-prompt~ and ~:tree-type~ properties
 below for additional options.
 
-  - =(file+function "filename" function-finding-location)= ::
+  - =(file+function  function-finding-location)= ::
 
 A function to find the right location in the file.
 

[elpa] externals/org f2ec3c2eb5 3/4: ox-html: Always wrap exported src block with tag

[ELPA Syncer]

branch: externals/org
commit f2ec3c2eb58cc208f5159ca689b1aab1967b38ff
Author: Nikolaos Chatzikonstantinou 
Commit: Ihor Radchenko 

ox-html: Always wrap exported src block with  tag

* lisp/org/ox-html.el (org-html-src-block): Add HTML code element inside
pre element for Org source blocks exported to HTML.
* etc/ORG-NEWS (HTML export wraps ~~ around all the exported src 
blocks):
Announce the change.
---
 etc/ORG-NEWS| 9 +
 lisp/ox-html.el | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index cd1a4cb9ad..a2c01979fe 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -479,6 +479,15 @@ capture ~:tree-type~ options]], the internal variable
 undocumented helper function ~org-datetree-insert-line~.
 
 ** Miscellaneous
+*** HTML export wraps ~~ around all the exported src blocks
+
+HTML export always uses ~~ tag around exported src blocks.
+In addition, previously, HTML export used ~~ tag around src
+blocks when ~org-html-klipsify-src~ is non-nil.
+
+Now, both ~~ and ~~ tags are *always* wrapped around the
+export src blocks.
+
 *** ~org-element-org-data-parser~ now returns syntax node with ~:pre-blank~ 
property
 
 Previously, parsing ~org-data~ syntax node did not record information
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 026a937359..0ed16eb003 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -3709,7 +3709,7 @@ contextual information."
  " data-editor-type=\"html\""
"")
  code)
-   (format "%s"
+   (format "%s"
 ;; Lang being nil is OK.
 lang label code))
 

[nongnu] elpa/vm 313a3df00b 1/2: Fixed require order problems with autoload generation created by the previous fix. This required moving the version functions to vm.el, with the remainder of vm-versio

[ELPA Syncer]

branch: elpa/vm
commit 313a3df00b500edf61507255645eaa1802cfa0fe
Author: Mark Diekhans 
Commit: Mark Diekhans 

Fixed require order problems with autoload generation created by the 
previous fix. This required moving the version functions to vm.el, with the 
remainder of vm-version.el merged into vm-misc.el
---
 README.md  |   7 +--
 dev-docs/releasing.org |   8 +++
 lisp/Makefile.in   |   4 +-
 lisp/vm-avirtual.el|   2 +-
 lisp/vm-build.el   |   2 +-
 lisp/vm-misc.el| 111 +
 lisp/vm-ps-print.el|   2 +-
 lisp/vm-rfaddons.el|   2 -
 lisp/vm-serial.el  |   1 -
 lisp/vm-vars.el|   1 -
 lisp/vm-version.el | 166 -
 lisp/vm-w3.el  |   2 +-
 lisp/vm-w3m.el |   2 +-
 lisp/vm.el |  53 +++-
 14 files changed, 156 insertions(+), 207 deletions(-)

diff --git a/README.md b/README.md
index f05ab3c8fb..8da333a03c 100644
--- a/README.md
+++ b/README.md
@@ -36,14 +36,13 @@ Alternatively, bugs can be reported report in VM using the 
VM function.
 M-x vm-submit-bug-report
 ```
 
-This function create a mail message that includes your VM configuration
-information. If you are creating an issue, this information maybe pasted
-into the GitLab issue instead of sending.
-
 However, this function currently sends an e-mail to a mailing list,
 which makes the issue hard to track, hence the Gitlab issue tracker
 normally is a better option.
 
+The mail message includes your VM configuration information. If you are
+creating an issue, this information maybe pasted into the GitLab issue.
+
 Please include information about how to reproduce the problem. Please
 report any problems or bugs, otherwise they cannot be fixed!
 
diff --git a/dev-docs/releasing.org b/dev-docs/releasing.org
index f74ac2c40f..efd046c1eb 100644
--- a/dev-docs/releasing.org
+++ b/dev-docs/releasing.org
@@ -1,3 +1,11 @@
 Releasing VM
 
+* pre-release testing:
+(package-vc-install '("https://gitlab.com/USER/REPO.git"; :rev "v1.2.3"))
+
+
+
+* post-release testing
+(package-vc-install '("https://gitlab.com/USER/REPO.git"; :rev "v1.2.3"))
+
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index aea42e8409..f5a3c8521f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -54,7 +54,6 @@ SOURCES += vm-undo.el
 SOURCES += vm-user.el
 SOURCES += vm-vars.el
 SOURCES += vm-vcard.el
-SOURCES += vm-version.el
 SOURCES += vm-virtual.el
 SOURCES += vm-window.el
 SOURCES += vm-w3m.el
@@ -155,7 +154,8 @@ vm-autoloads.el: $(SOURCES:%=@srcdir@/%)
echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
echo "(require 'vm-vars)" | tr -d '\015' >> $@
-   echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@
+   echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@.tmp
+   mv -f $@.tmp $@
 
 vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
$(EMACS_COMP) -f vm-custom-make-dependencies .
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index 1899a4c388..e033c5f851 100644
--- a/lisp/vm-avirtual.el
+++ b/lisp/vm-avirtual.el
@@ -132,7 +132,7 @@
 
 ;;
 (eval-and-compile
-  (require 'vm-version)
+  (require 'vm-misc)
   (require 'regexp-opt)
   (require 'time-date)
 
diff --git a/lisp/vm-build.el b/lisp/vm-build.el
index e7927fc4ca..ef330de065 100644
--- a/lisp/vm-build.el
+++ b/lisp/vm-build.el
@@ -63,7 +63,7 @@
 ;; now add VM source dirs to load-path and preload some
 (setq load-path (append '("." "./lisp") load-path))
 (require 'vm-macro)
-(require 'vm-version)
+(require 'vm-misc)
 (require 'vm-message)
 (require 'vm-vars)
 
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 4a91c6ee05..1393d7e076 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -49,30 +49,6 @@
 (declare-function vm-su-subject "vm-summary" (message))
 
 (require 'vm-vars)
-;; (defvar vm-chop-full-name-function)
-;; (defvar vm-current-warning)
-;; (defvar vm-default-new-folder-line-ending-type)
-;; (defvar vm-delete-duplicates-obarray)
-;; (defvar vm-fill-paragraphs-containing-long-lines)
-;; (defvar vm-folder-type)
-;; (defvar vm-folders-summary-buffer)
-;; (defvar vm-index-file-suffix)
-;; (defvar vm-mail-buffer)
-;; (defvar vm-message-list)
-;; (defvar vm-message-pointer)
-;; (defvar vm-parse-date-workspace)
-;; (defvar vm-paragraph-fill-column)
-;; (defvar vm-presentation-buffer)
-;; (defvar vm-presentation-buffer-handle)
-;; (defvar vm-search-other-frames)
-;; (defvar vm-sortable-date-alist)
-;; (defvar vm-startup-with-summary)
-;; (defvar vm-summary-buffer)
-;; (defvar vm-temp-file-directory)
-;; (defvar vm-tempfile-counter)
-;; (defvar vm-verbosity)
-;; (defvar vm-verbal-time)
-;; (defvar vm-word-wrap-paragraphs)
 
 ;; This file contains various low-level operations that address
 ;; incomaptibilities between Gnu and XEmacs.  Expect compil

[nongnu] elpa/vm 85359a6095 2/2: Merge branch 'main' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit 85359a6095b8c0ef20994376549bb2d7096f3519
Merge: a5a676ce48 313a3df00b
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'main' into 'main'

Fixed require order problems with autoload generation created by the 
previous...

Closes #504

See merge request emacs-vm/vm!44
---
 README.md  |   7 +--
 dev-docs/releasing.org |   8 +++
 lisp/Makefile.in   |   4 +-
 lisp/vm-avirtual.el|   2 +-
 lisp/vm-build.el   |   2 +-
 lisp/vm-misc.el| 111 +
 lisp/vm-ps-print.el|   2 +-
 lisp/vm-rfaddons.el|   2 -
 lisp/vm-serial.el  |   1 -
 lisp/vm-vars.el|   1 -
 lisp/vm-version.el | 166 -
 lisp/vm-w3.el  |   2 +-
 lisp/vm-w3m.el |   2 +-
 lisp/vm.el |  53 +++-
 14 files changed, 156 insertions(+), 207 deletions(-)

diff --git a/README.md b/README.md
index f05ab3c8fb..8da333a03c 100644
--- a/README.md
+++ b/README.md
@@ -36,14 +36,13 @@ Alternatively, bugs can be reported report in VM using the 
VM function.
 M-x vm-submit-bug-report
 ```
 
-This function create a mail message that includes your VM configuration
-information. If you are creating an issue, this information maybe pasted
-into the GitLab issue instead of sending.
-
 However, this function currently sends an e-mail to a mailing list,
 which makes the issue hard to track, hence the Gitlab issue tracker
 normally is a better option.
 
+The mail message includes your VM configuration information. If you are
+creating an issue, this information maybe pasted into the GitLab issue.
+
 Please include information about how to reproduce the problem. Please
 report any problems or bugs, otherwise they cannot be fixed!
 
diff --git a/dev-docs/releasing.org b/dev-docs/releasing.org
index f74ac2c40f..efd046c1eb 100644
--- a/dev-docs/releasing.org
+++ b/dev-docs/releasing.org
@@ -1,3 +1,11 @@
 Releasing VM
 
+* pre-release testing:
+(package-vc-install '("https://gitlab.com/USER/REPO.git"; :rev "v1.2.3"))
+
+
+
+* post-release testing
+(package-vc-install '("https://gitlab.com/USER/REPO.git"; :rev "v1.2.3"))
+
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index aea42e8409..f5a3c8521f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -54,7 +54,6 @@ SOURCES += vm-undo.el
 SOURCES += vm-user.el
 SOURCES += vm-vars.el
 SOURCES += vm-vcard.el
-SOURCES += vm-version.el
 SOURCES += vm-virtual.el
 SOURCES += vm-window.el
 SOURCES += vm-w3m.el
@@ -155,7 +154,8 @@ vm-autoloads.el: $(SOURCES:%=@srcdir@/%)
echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
echo "(require 'vm-vars)" | tr -d '\015' >> $@
-   echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@
+   echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@.tmp
+   mv -f $@.tmp $@
 
 vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
$(EMACS_COMP) -f vm-custom-make-dependencies .
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index 1899a4c388..e033c5f851 100644
--- a/lisp/vm-avirtual.el
+++ b/lisp/vm-avirtual.el
@@ -132,7 +132,7 @@
 
 ;;
 (eval-and-compile
-  (require 'vm-version)
+  (require 'vm-misc)
   (require 'regexp-opt)
   (require 'time-date)
 
diff --git a/lisp/vm-build.el b/lisp/vm-build.el
index e7927fc4ca..ef330de065 100644
--- a/lisp/vm-build.el
+++ b/lisp/vm-build.el
@@ -63,7 +63,7 @@
 ;; now add VM source dirs to load-path and preload some
 (setq load-path (append '("." "./lisp") load-path))
 (require 'vm-macro)
-(require 'vm-version)
+(require 'vm-misc)
 (require 'vm-message)
 (require 'vm-vars)
 
diff --git a/lisp/vm-misc.el b/lisp/vm-misc.el
index 4a91c6ee05..1393d7e076 100644
--- a/lisp/vm-misc.el
+++ b/lisp/vm-misc.el
@@ -49,30 +49,6 @@
 (declare-function vm-su-subject "vm-summary" (message))
 
 (require 'vm-vars)
-;; (defvar vm-chop-full-name-function)
-;; (defvar vm-current-warning)
-;; (defvar vm-default-new-folder-line-ending-type)
-;; (defvar vm-delete-duplicates-obarray)
-;; (defvar vm-fill-paragraphs-containing-long-lines)
-;; (defvar vm-folder-type)
-;; (defvar vm-folders-summary-buffer)
-;; (defvar vm-index-file-suffix)
-;; (defvar vm-mail-buffer)
-;; (defvar vm-message-list)
-;; (defvar vm-message-pointer)
-;; (defvar vm-parse-date-workspace)
-;; (defvar vm-paragraph-fill-column)
-;; (defvar vm-presentation-buffer)
-;; (defvar vm-presentation-buffer-handle)
-;; (defvar vm-search-other-frames)
-;; (defvar vm-sortable-date-alist)
-;; (defvar vm-startup-with-summary)
-;; (defvar vm-summary-buffer)
-;; (defvar vm-temp-file-directory)
-;; (defvar vm-tempfile-counter)
-;; (defvar vm-verbosity)
-;; (defvar vm-verbal-time)
-;; (defvar vm-word-wrap-paragraphs)
 
 ;; This file contains various low-level operations that address
 ;; incomaptibilities between Gnu and XEma

[elpa] externals/org b768752d2e 10/19: Backport commit a669e6a37 from Emacs

[ELPA Syncer]

branch: externals/org
commit b768752d2e5f9047739a17ed4b620ee0c9c8956e
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit a669e6a37 from Emacs

* lisp/ob-core.el (org-babel-process-params):
* lisp/org-agenda.el (org-agenda-span-to-ndays):
* lisp/org-capture.el (org-capture-set-target-location):
* lisp/org.el (org-set-effort): Don't use cl-caaar, cl-caadr,
etc. compatibility macros in Org.  We don't need to use them, since
Org requires Emacs 26.1.

Avoid cl-caaar etc. compatibility macros in Org
a669e6a37610f78115f473176f3914cea4c20fb2
Stefan Kangas
Wed Feb 12 21:30:47 2025 +0100
---
 lisp/ob-core.el | 2 +-
 lisp/org-agenda.el  | 4 ++--
 lisp/org-capture.el | 2 +-
 lisp/org.el | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 88d2f26df0..7d5677da5d 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -1822,7 +1822,7 @@ HEADER-ARGUMENTS is an alist of all the arguments."
   (cons :colname-names (or (cdr (assq :colname-names params))
   (cadr  vars-and-names)))
   (cons :rowname-names (or (cdr (assq :rowname-names params))
-  (cl-caddr vars-and-names)))
+   (caddr vars-and-names)))
   (cons :result-params result-params)
   (cons :result-type  (cond ((member "output" result-params) 'output)
((member "value" result-params) 'value)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8fdd998fc5..50dbb6dbed 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4603,10 +4603,10 @@ START-DAY is an absolute time value."
((eq span 'fortnight) 14)
((eq span 'month)
 (let ((date (calendar-gregorian-from-absolute start-day)))
-  (calendar-last-day-of-month (car date) (cl-caddr date
+   (calendar-last-day-of-month (car date) (caddr date
((eq span 'year)
 (let ((date (calendar-gregorian-from-absolute start-day)))
-  (if (calendar-leap-year-p (cl-caddr date)) 366 365)
+   (if (calendar-leap-year-p (caddr date)) 366 365)
 
 (defun org-agenda-span-name (span)
   "Return a SPAN name."
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 9c4a4619bb..0720ad53cc 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1100,7 +1100,7 @@ Store them in the capture property list."
 (org-encode-time
  (apply #'list
 0 0 org-extend-today-until
-(cl-cdddr (decode-time prompt-time))
+(cdddr (decode-time prompt-time))
 (time-to-days prompt-time)))
  (t
   ;; Current date, possibly corrected for late night
diff --git a/lisp/org.el b/lisp/org.el
index ab5316a0b1..56a8d11e1a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12800,7 +12800,7 @@ variables is set."
  (cond
   (increment
(unless allowed (user-error "Allowed effort values are not set"))
-   (or (cl-caadr (member (list current) allowed))
+(or (caadr (member (list current) allowed))
(user-error "Unknown value %S among allowed values" current)))
   (value
(if (stringp value) value

[elpa] externals/org 303aa80220 18/19: Backport commit 6bcf41c31 from Emacs

[ELPA Syncer]

branch: externals/org
commit 303aa80220872aa2d812a81b1919610e3f8a9167
Author: Stefan Monnier 
Commit: Kyle Meyer 

Backport commit 6bcf41c31 from Emacs

* lisp/org-compat.el (org-replace-buffer-contents): Delete function.
(org-replace-region-contents): New function.
* lisp/org-src.el (org-edit-src-save, org-edit-src-exit): Use it.

Org: Use new `replace-region-contents`
6bcf41c311b220e84f4eb423700f36ac1ddfffa7
Stefan Monnier
Sat Mar 29 17:49:49 2025 -0400

[ km: This commit is applied here for bookkeeping/traceability
  purposes.  It introduces a regression for the issue fixed by
  2d9e70b80 and will be reverted when merged to main.  See
  .]
---
 lisp/org-compat.el | 18 ++
 lisp/org-src.el| 21 ++---
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 59d34b661c..297e8f0604 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -292,10 +292,20 @@ older than 27.1"
   (if tree (push tree elems))
   (nreverse elems
 
-(if (version< emacs-version "27.1")
-(defsubst org-replace-buffer-contents (source &optional _max-secs 
_max-costs)
-  (replace-buffer-contents source))
-  (defalias 'org-replace-buffer-contents #'replace-buffer-contents))
+(defalias 'org-replace-region-contents
+  (if (> emacs-major-version 30)
+  #'replace-region-contents
+;; The `replace-region-contents' in Emacs<31 does not accept a buffer
+;; as SOURCE argument and does not preserve the position well enough.
+(lambda (beg end source &optional max-secs max-costs)
+  (save-restriction
+(narrow-to-region beg end)
+(let ((eobp (eobp)))
+  (with-no-warnings
+(if (< emacs-major-version 27)
+(replace-buffer-contents source)
+  (replace-buffer-contents source max-secs max-costs)))
+  (if eobp (goto-char (point-max
 
 (unless (fboundp 'proper-list-p)
   ;; `proper-list-p' was added in Emacs 27.1.  The function below is
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 302c27ac86..d8a928b1f9 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1414,13 +1414,9 @@ EVENT is passed to `mouse-set-point'."
   ;; insert new contents.
   (delete-overlay overlay)
   (let ((expecting-bol (bolp)))
-   (if (version< emacs-version "27.1")
-   (progn (delete-region beg end)
-  (insert (with-current-buffer write-back-buf 
(buffer-string
- (save-restriction
-   (narrow-to-region beg end)
-   (org-replace-buffer-contents write-back-buf 0.1 nil)
-   (goto-char (point-max
+(goto-char end)
+(org-replace-region-contents beg end write-back-buf 0.1 nil)
+(cl-assert (= (point) (+ beg (buffer-size write-back-buf
(when (and expecting-bol (not (bolp))) (insert "\n")))
   (kill-buffer write-back-buf)
   (save-buffer)
@@ -1461,14 +1457,9 @@ EVENT is passed to `mouse-set-point'."
(undo-boundary)
(goto-char beg)
(let ((expecting-bol (bolp)))
-(if (version< emacs-version "27.1")
-(progn (delete-region beg end)
-   (insert (with-current-buffer write-back-buf
-  (buffer-string
-  (save-restriction
-(narrow-to-region beg end)
-(org-replace-buffer-contents write-back-buf 0.1 nil)
-(goto-char (point-max
+ (goto-char end)
+ (org-replace-region-contents beg end write-back-buf 0.1 nil)
+ (cl-assert (= (point) (+ beg (buffer-size write-back-buf
 (when (and expecting-bol (not (bolp))) (insert "\n")
 (when write-back-buf (kill-buffer write-back-buf))
 ;; If we are to return to source buffer, put point at an

[elpa] externals/org 7c19c4d433 11/19: Backport commit 9efd11e5f from Emacs

[ELPA Syncer]

branch: externals/org
commit 7c19c4d4333be7a6e7f23c1f3f0191aafd8f788f
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 9efd11e5f from Emacs

* lisp/org-capture.el (org-capture-escaped-%):
* lisp/org-element-ast.el (org-element-create):
* lisp/org-macro.el (org-macro-extract-arguments):
* lisp/org-persist.el (org-persist--get-collection):
* lisp/ox-odt.el (org-odt-get-table-cell-styles):
* lisp/ox.el (org-export--dispatch-ui): Prefer 'cl-evenp/'cl-oddp' to
free-coding them in some files that already depend on cl-lib in
run-time.

Prefer cl-evenp/cl-oddp in some places
9efd11e5fd4324fb1686b802c15ae36046b0939a
Stefan Kangas
Mon Feb 17 02:00:51 2025 +0100
---
 lisp/org-capture.el | 2 +-
 lisp/org-element-ast.el | 2 +-
 lisp/org-macro.el   | 2 +-
 lisp/org-persist.el | 2 +-
 lisp/ox-odt.el  | 8 
 lisp/ox.el  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 0720ad53cc..d4ae0207c3 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1920,7 +1920,7 @@ placeholder to check."
 (goto-char (match-beginning 0))
 (let ((n (abs (skip-chars-backward ""
   (delete-char (/ (1+ n) 2))
-  (= (% n 2) 1
+  (cl-oddp n
 
 (defun org-capture-expand-embedded-elisp (&optional mark)
   "Evaluate embedded elisp %(sexp) and replace with the result.
diff --git a/lisp/org-element-ast.el b/lisp/org-element-ast.el
index b91cf9fc65..2322bc69fc 100644
--- a/lisp/org-element-ast.el
+++ b/lisp/org-element-ast.el
@@ -734,7 +734,7 @@ string.  Alternatively, TYPE can be a string.  When TYPE is 
nil or
   (cl-assert
;; FIXME: Just use `plistp' from Emacs 29 when available.
(let ((len (proper-list-p props)))
- (and len (zerop (% len 2)
+ (and len (cl-evenp len
   ;; Assign parray.
   (when (and props (not (stringp type)) (not (eq type 'plain-text)))
 (let ((node (list 'dummy props)))
diff --git a/lisp/org-macro.el b/lisp/org-macro.el
index 66ae4d7af6..500dfbc545 100644
--- a/lisp/org-macro.el
+++ b/lisp/org-macro.el
@@ -329,7 +329,7 @@ Return a list of arguments, as strings.  This is the 
opposite of
 (lambda (str)
   (let ((len (length (match-string 1 str
(concat (make-string (/ len 2) ?\\)
-   (if (zerop (mod len 2)) "\000" ","
+   (if (cl-evenp len) "\000" ","
 s nil t)
"\000"))
 
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 104ad86d52..16ac13ae87 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -594,7 +594,7 @@ MISC, if non-nil will be appended to the collection.  It 
must be a plist."
   (unless (and (listp container) (listp (car container)))
 (setq container (list container)))
   (setq associated (org-persist--normalize-associated associated))
-  (when (and misc (or (not (listp misc)) (= 1 (% (length misc) 2
+  (when (and misc (or (not (listp misc)) (cl-oddp (length misc
 (error "org-persist: Not a plist: %S" misc))
   (or (org-persist--find-index
`( :container ,(org-persist--normalize-container container)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index ba8b4d9d3b..04c70c5b56 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3293,13 +3293,13 @@ styles congruent with the ODF-1.2 specification."
 (= (1+ r) (car table-dimensions)))
"LastRow")
   ((and (cdr (assq 'use-banding-rows-styles cell-style-selectors))
-(= (% r 2) 1)) "EvenRow")
+(cl-oddp r)) "EvenRow")
   ((and (cdr (assq 'use-banding-rows-styles cell-style-selectors))
-(= (% r 2) 0)) "OddRow")
+(cl-evenp r)) "OddRow")
   ((and (cdr (assq 'use-banding-columns-styles 
cell-style-selectors))
-(= (% c 2) 1)) "EvenColumn")
+(cl-oddp c)) "EvenColumn")
   ((and (cdr (assq 'use-banding-columns-styles 
cell-style-selectors))
-(= (% c 2) 0)) "OddColumn")
+(cl-evenp c)) "OddColumn")
   (t ""
(concat template-name cell-type)
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 7f3f66a6f2..a2a21a72c4 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -7287,14 +7287,14 @@ back to standard interface."
 (lambda (sub-entry)
   (cl-incf index)
   (format
-   (if (zerop (mod index 2)) "[%s] %-26s"
+   (if (cl-evenp index) "[%s] %-26s"
  "[%s] %s\n")
(funcall fontify-key
 (char-to-string (car sub-entry))
 top-key)
(nth 1 sub-entry)))
 sub

[elpa] externals/org 9daee7038d 07/19: Backport commit 375befcac from Emacs

[ELPA Syncer]

branch: externals/org
commit 9daee7038d353ea301a2e6a9ccad041eaba85daf
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 375befcac from Emacs

* lisp/org-faces.el (org-drawer, org-tag, org-list-dt, org-todo)
(org-done, org-headline-todo, org-formula, org-agenda-structure)
(org-scheduled, org-scheduled-today, org-scheduled-previously)
(org-upcoming-deadline): Prefer defface attribute
':weight bold' to its obsolete alias ':bold t'.  See also Bug#73552.

Prefer defface's ':weight bold' to obsolete alias ':bold t'
375befcacc8e7c37ec490145aa6ff9737ad102a1
Stefan Kangas
Tue Jan 21 09:29:09 2025 +0100
---
 lisp/org-faces.el | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index f3a484ee55..1f206b9114 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -103,8 +103,8 @@ color of the frame."
 (((class color) (min-colors 88) (background dark)) (:foreground 
"LightSkyBlue"))
 (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
 (((class color) (min-colors 16) (background dark)) (:foreground 
"LightSkyBlue"))
-(((class color) (min-colors 8)) (:foreground "blue" :bold t))
-(t (:bold t)))
+(((class color) (min-colors 8)) (:foreground "blue" :weight bold))
+(t (:weight bold)))
   "Face used for drawers."
   :group 'org-faces)
 
@@ -228,30 +228,30 @@ calendar."
   "Face for diary-like sexp date specifications."
   :group 'org-faces)
 
-(defface org-tag '((t (:bold t)))
+(defface org-tag '((t (:weight bold)))
   "Default face for tags.
 Note that the variable `org-tag-faces' can be used to overrule this face for
 specific tags."
   :group 'org-faces)
 
-(defface org-list-dt '((t (:bold t)))
+(defface org-list-dt '((t (:weight bold)))
   "Default face for definition terms in lists."
   :group 'org-faces)
 
 (defface org-todo   ;Copied from `font-lock-warning-face'
-  'class color) (min-colors 16) (background light)) (:foreground "Red1" 
:bold t))
-(((class color) (min-colors 16) (background dark))  (:foreground "Pink" 
:bold t))
-(((class color) (min-colors 8)  (background light)) (:foreground "red"  
:bold t))
-(((class color) (min-colors 8)  (background dark))  (:foreground "red"  
:bold t))
-(t (:inverse-video t :bold t)))
+  'class color) (min-colors 16) (background light)) (:foreground "Red1" 
:weight bold))
+(((class color) (min-colors 16) (background dark))  (:foreground "Pink" 
:weight bold))
+(((class color) (min-colors 8)  (background light)) (:foreground "red"  
:weight bold))
+(((class color) (min-colors 8)  (background dark))  (:foreground "red"  
:weight bold))
+(t (:inverse-video t :weight bold)))
   "Face for TODO keywords."
   :group 'org-faces)
 
 (defface org-done  ;Copied from `font-lock-type-face'
-  'class color) (min-colors 16) (background light)) (:foreground 
"ForestGreen" :bold t))
-(((class color) (min-colors 16) (background dark)) (:foreground 
"PaleGreen" :bold t))
+  'class color) (min-colors 16) (background light)) (:foreground 
"ForestGreen" :weight bold))
+(((class color) (min-colors 16) (background dark)) (:foreground 
"PaleGreen" :weight bold))
 (((class color) (min-colors 8)) (:foreground "green"))
-(t (:bold t)))
+(t (:weight bold)))
   "Face used for todo keywords that indicate DONE items."
   :group 'org-faces)
 
@@ -271,7 +271,7 @@ of the frame, for example."
 (defface org-headline-todo   ;Copied from `font-lock-string-face'
   'class color) (min-colors 16) (background light)) (:foreground "Red4"))
 (((class color) (min-colors 16) (background dark)) (:foreground "Pink2"))
-(((class color) (min-colors 8)  (background light)) (:bold t)))
+(((class color) (min-colors 8)  (background light)) (:weight bold)))
   "Face used to indicate that a headline is marked as TODO.
 This face is only used if `org-fontify-todo-headline' is set.  If applies
 to the part of the headline after the TODO keyword."
@@ -404,7 +404,7 @@ changes."
 (((class color) (min-colors 88) (background dark)) (:foreground 
"chocolate1"))
 (((class color) (min-colors 8)  (background light)) (:foreground "red"))
 (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
-(t (:bold t :italic t)))
+(t (:weight bold :italic t)))
   "Face for formulas."
   :group 'org-faces)
 
@@ -509,8 +509,8 @@ content of these blocks will still be treated as Org 
syntax."
 (((class color) (min-colors 88) (background dark)) (:foreground 
"LightSkyBlue"))
 (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
 (((class color) (min-colors 16) (background dark)) (:foreground 
"LightSkyBlue"))
-(((class color) (min-colors 8)) (:foreground "blue" :bold t))
-(t (:bold t)))
+(((class color) (min-colors 8)) (:foreground "blue" :weight bold))
+(t

[elpa] externals/org 6d51edc0f9 19/19: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit 6d51edc0f938b6a049c1e23c0d1b24bd27cb5833
Merge: ffb1652c4a 303aa80220
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'km/from-emacs-master'
---
 doc/doc-setup.org   |  1 -
 etc/ORG-NEWS|  2 +-
 lisp/ob-core.el |  2 +-
 lisp/ob-exp.el  |  2 +-
 lisp/ob-processing.el   |  1 -
 lisp/ol-eshell.el   |  4 ++--
 lisp/org-agenda.el  |  6 +++---
 lisp/org-capture.el |  4 ++--
 lisp/org-element-ast.el |  8 
 lisp/org-faces.el   | 46 +++---
 lisp/org-feed.el|  1 -
 lisp/org-macro.el   |  2 +-
 lisp/org-persist.el |  2 +-
 lisp/org-table.el   |  5 ++---
 lisp/org.el |  6 --
 lisp/ox-odt.el  |  8 
 lisp/ox-publish.el  |  2 +-
 lisp/ox.el  |  6 +++---
 18 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/doc/doc-setup.org b/doc/doc-setup.org
index fffacbd993..9b76485238 100644
--- a/doc/doc-setup.org
+++ b/doc/doc-setup.org
@@ -50,4 +50,3 @@
 # The "kbd" macro turns KBD into @kbd{KBD}.  Additionally, it
 # encloses case-sensitive special keys (SPC, RET...) within @key{...}.
 #+macro: kbd (eval (org-texinfo-kbd-macro $1))
-
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index a2c01979fe..4e9440b519 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -6194,7 +6194,7 @@ the end of the string.
 
 *** Function ~org-info-export~ changes.
 
-HTML links created from certain info links now point to =gnu.org= URL's rather
+HTML links created from certain info links now point to =gnu.org= URLs rather
 than just to local files. For example info links such as =info:emacs#List
 Buffers= used to be converted to HTML links like this:
 
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 10992d61dd..326a9a8572 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -1851,7 +1851,7 @@ HEADER-ARGUMENTS is an alist of all the arguments."
   (cons :colname-names (or (cdr (assq :colname-names params))
   (cadr  vars-and-names)))
   (cons :rowname-names (or (cdr (assq :rowname-names params))
-  (cl-caddr vars-and-names)))
+   (caddr vars-and-names)))
   (cons :result-params result-params)
   (cons :result-type  (cond ((member "output" result-params) 'output)
((member "value" result-params) 'value)
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 83b6be8e24..ab99541ab9 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -65,7 +65,7 @@ to avoid evaluating code on export should use the header 
argument
 Source is located in `org-babel-exp-reference-buffer'.  The value
 returned is the value of the last form in BODY.  Assume that
 point is at the beginning of the Babel block."
-  (declare (indent 1) (debug body))
+  (declare (indent 1) (debug (body)))
   `(let ((source (get-text-property (point) 'org-reference)))
  ;; Source blocks created during export process (e.g., by other
  ;; source blocks) are not referenced.  In this case, do not move
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index e1d1edd5c6..81b7f7ee4d 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -56,7 +56,6 @@
 (org-assert-version)
 
 (require 'ob)
-(require 'sha1)
 
 (declare-function processing-sketch-run "ext:processing-mode" ())
 
diff --git a/lisp/ol-eshell.el b/lisp/ol-eshell.el
index fe22fb2104..6e54d0e3ca 100644
--- a/lisp/ol-eshell.el
+++ b/lisp/ol-eshell.el
@@ -51,9 +51,9 @@ followed by a colon."
 (if (get-buffer eshell-buffer-name)
 (pop-to-buffer
  eshell-buffer-name
- (if (boundp 'display-comint-buffer-action) ; Emacs >= 29
+ (if (boundp 'display-comint-buffer-action) ; Emacs >= 29, <= 30
  display-comint-buffer-action
-   '(display-buffer-same-window (inhibit-same-window
+   '(display-buffer-same-window (inhibit-same-window) (category . 
comint
   (eshell))
 (goto-char (point-max))
 (eshell-kill-input)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 87a9a462a4..187cacad42 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4595,10 +4595,10 @@ START-DAY is an absolute time value."
((eq span 'fortnight) 14)
((eq span 'month)
 (let ((date (calendar-gregorian-from-absolute start-day)))
-  (calendar-last-day-of-month (car date) (cl-caddr date
+   (calendar-last-day-of-month (car date) (caddr date
((eq span 'year)
 (let ((date (calendar-gregorian-from-absolute start-day)))
-  (if (calendar-leap-year-p (cl-caddr date)) 366 365)
+   (if (calendar-leap-year-p (caddr date)) 366 365)
 
 (defun org-agenda-span-name (span)
   "Return a SPAN name."
@@ -8210,7 +8210,7 @@ FLAG specifies the type of completion operation to 
perform.  This
 function is passed as a collection function to `completing-read',
 which see."
   (

[elpa] externals/org 21726c7b89 09/19: Backport commit 0e76716c5 from Emacs

[ELPA Syncer]

branch: externals/org
commit 21726c7b899445456b37813df14d32069c2371d2
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 0e76716c5 from Emacs

* lisp/org-agenda.el (org-agenda-filter-completion-function):
* lisp/org-table.el (org-table-eval-formula):
* lisp/org.el (org-set-regexps-and-options):
* lisp/ox.el (org-export--get-inbuffer-options): Delete redundant
lambdas around unary functions.  (Bug#66816)

Delete redundant lambdas around unary functions
0e76716c5faa5e91ac3913b02ba4dc690cf5df83
Stefan Kangas
Tue Feb 11 19:04:00 2025 +0100
---
 lisp/org-agenda.el | 2 +-
 lisp/org-table.el  | 3 +--
 lisp/org.el| 2 +-
 lisp/ox.el | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 87eda4700b..8fdd998fc5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8186,7 +8186,7 @@ FLAG specifies the type of completion operation to 
perform.  This
 function is passed as a collection function to `completing-read',
 which see."
   (let ((completion-ignore-case t) ;tags are case-sensitive
-   (confirm (lambda (x) (stringp x)))
+(confirm #'stringp)
(prefix "")
(operator "")
table
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 22eecd5536..59e1b49f92 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2539,8 +2539,7 @@ location of point."
;; replace fields with duration values if relevant
(if duration
(setq fields
- (mapcar (lambda (x) (org-table-time-string-to-seconds x))
- fields)))
+  (mapcar #'org-table-time-string-to-seconds fields)))
(if (eq numbers t)
(setq fields (mapcar
  (lambda (x)
diff --git a/lisp/org.el b/lisp/org.el
index a11eee9429..ab5316a0b1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4283,7 +4283,7 @@ related expressions."
  '("ARCHIVE" "CATEGORY" "COLUMNS" "PRIORITIES"
   ;; Startup options.  Get this early since it does change
   ;; behavior for other options (e.g., tags).
-  (let ((startup (cl-mapcan (lambda (value) (split-string value))
+  (let ((startup (cl-mapcan #'split-string
(cdr (assoc "STARTUP" alist)
(dolist (option startup)
  (pcase (assoc-string option org-startup-options t)
diff --git a/lisp/ox.el b/lisp/ox.el
index cc50d03176..7f3f66a6f2 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1552,7 +1552,7 @@ Assume buffer is in Org mode.  Narrowing, if any, is 
ignored."
  (newline
   (mapconcat #'identity values "\n"))
  (split
-  (cl-mapcan (lambda (v) (split-string v)) values))
+   (cl-mapcan #'split-string values))
  ((t)
   (org-last values))
  (otherwise

[elpa] externals/org b702412f1f 04/19: Backport commit d1bde7b5c from Emacs

[ELPA Syncer]

branch: externals/org
commit b702412f1f2b7c335d7622503cf62216daace9a0
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit d1bde7b5c from Emacs

Don't use obsolete filter-buffer-substring-functions in Org
d1bde7b5cb727d6b0559d99669719d5eb832c186
Stefan Kangas
Fri Dec 13 00:05:08 2024 +0100

[ km: This was independently covered on the main branch with
  b9637ef14.  It's applied here for bookkeeping/traceability
  purposes. ]
---
 lisp/org-agenda.el | 10 ++
 lisp/org-indent.el | 20 
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index fb75c36169..87eda4700b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2375,14 +2375,8 @@ The following commands are available:
   (add-hook 'post-command-hook #'org-agenda-update-agenda-type nil 'local)
   (add-hook 'pre-command-hook #'org-unhighlight nil 'local)
   ;; Make sure properties are removed when copying text
-  (if (boundp 'filter-buffer-substring-functions)
-  (add-hook 'filter-buffer-substring-functions
-   (lambda (fun start end delete)
-  (substring-no-properties (funcall fun start end delete)))
-   nil t)
-;; Emacs >= 24.4.
-(add-function :filter-return (local 'filter-buffer-substring-function)
-  #'substring-no-properties))
+  (add-function :filter-return (local 'filter-buffer-substring-function)
+#'substring-no-properties)
   (unless org-agenda-keep-modes
 (setq org-agenda-follow-mode org-agenda-start-with-follow-mode
  org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index e0d99c646d..dea2f69ce9 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -193,15 +193,8 @@ during idle time."
 (when org-indent-mode-turns-on-hiding-stars
   (setq-local org-hide-leading-stars t))
 (org-indent--compute-prefixes)
-(if (boundp 'filter-buffer-substring-functions)
-   (add-hook 'filter-buffer-substring-functions
- (lambda (fun start end delete)
-   (org-indent-remove-properties-from-string
-(funcall fun start end delete)))
- nil t)
-  ;; Emacs >= 24.4.
-  (add-function :filter-return (local 'filter-buffer-substring-function)
-   #'org-indent-remove-properties-from-string))
+(add-function :filter-return (local 'filter-buffer-substring-function)
+  #'org-indent-remove-properties-from-string)
 (add-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local)
 (add-hook 'before-change-functions
  'org-indent-notify-modified-headline nil 'local)
@@ -224,13 +217,8 @@ during idle time."
   (set-marker org-indent--initial-marker nil))
 (when (local-variable-p 'org-hide-leading-stars)
   (kill-local-variable 'org-hide-leading-stars))
-(if (boundp 'filter-buffer-substring-functions)
-   (remove-hook 'filter-buffer-substring-functions
-(lambda (fun start end delete)
-  (org-indent-remove-properties-from-string
-   (funcall fun start end delete
-  (remove-function (local 'filter-buffer-substring-function)
-  #'org-indent-remove-properties-from-string))
+(remove-function (local 'filter-buffer-substring-function)
+ #'org-indent-remove-properties-from-string)
 (remove-hook 'after-change-functions 'org-indent-refresh-maybe 'local)
 (remove-hook 'before-change-functions
 'org-indent-notify-modified-headline 'local)

[elpa] externals/org 1d866923e1 02/19: Backport commit d35430099 from Emacs

[ELPA Syncer]

branch: externals/org
commit 1d866923e1a59c5deb21e70902ffc430c751fd34
Author: Sean Whitton 
Commit: Kyle Meyer 

Backport commit d35430099 from Emacs

lisp/org: Backport org-mode.git fix for if-let/when-let obsolescence
d354300993e6a48e2d3e72a7e89348cc06b326fb
Sean Whitton
Sun Oct 27 11:06:40 2024 +0800

[ km: This was independently covered on the bugfix branch with
  ac73e594c and on the main branch with bc7033f2d.  It's applied here
  for bookkeeping/traceability purposes. ]
---
 lisp/ob-R.el|  2 +-
 lisp/ob-clojure.el  |  4 ++--
 lisp/ob-core.el |  2 +-
 lisp/ob-exp.el  |  2 +-
 lisp/ob-julia.el|  2 +-
 lisp/ob-python.el   |  2 +-
 lisp/ol.el  |  2 +-
 lisp/org-attach.el  |  2 +-
 lisp/org-clock.el   |  2 +-
 lisp/org-compat.el  |  8 
 lisp/org-element-ast.el |  8 
 lisp/org-element.el | 10 +-
 lisp/org-goto.el|  2 +-
 lisp/org-lint.el|  8 
 lisp/org-macs.el|  2 +-
 lisp/org-persist.el |  8 
 lisp/org-table.el   |  2 +-
 lisp/org.el |  4 ++--
 lisp/ox-html.el |  6 +++---
 lisp/ox-latex.el|  2 +-
 lisp/ox.el  |  4 ++--
 21 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 80be9fbd5d..47ee08c2df 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -288,7 +288,7 @@ Use PARAMS to set default directory when creating a new 
session."
   "Associate R code buffer with an R session.
 Make SESSION be the inferior ESS process associated with the
 current code buffer."
-  (when-let ((process (get-buffer-process session)))
+  (when-let* ((process (get-buffer-process session)))
 (setq ess-local-process-name (process-name process))
 (ess-make-buffer-current))
   (setq-local ess-gen-proc-buffer-name-function (lambda (_) session)))
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index c5b36a57b1..2339a2ddcb 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -120,14 +120,14 @@
   :package-version '(Org . "9.6"))
 
 (defcustom ob-clojure-nbb-command (or (executable-find "nbb")
-  (when-let (npx (executable-find "npx"))
+  (when-let* ((npx (executable-find 
"npx")))
 (concat npx " nbb")))
   "Nbb command used by the ClojureScript `nbb' backend."
   :type '(choice string (const nil))
   :group 'org-babel
   :package-version '(Org . "9.7"))
 
-(defcustom ob-clojure-cli-command (when-let (cmd (executable-find "clojure"))
+(defcustom ob-clojure-cli-command (when-let* ((cmd (executable-find 
"clojure")))
 (concat cmd " -M"))
   "Clojure CLI command used by the Clojure `clojure-cli' backend."
   :type '(choice string (const nil))
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index d93a4d6e53..88d2f26df0 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -870,7 +870,7 @@ guess will be made."
 (default-directory
  (cond
   ((not dir) default-directory)
-   ((when-let ((session (org-babel-session-buffer info)))
+   ((when-let* ((session (org-babel-session-buffer info)))
   (buffer-local-value 'default-directory (get-buffer 
session
   ((member mkdirp '("no" "nil" nil))
(file-name-as-directory (expand-file-name dir)))
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 0af6a489a6..83b6be8e24 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -441,7 +441,7 @@ replaced with its value."
  ("header-args"
   .
   ,(org-babel-exp--at-source
-   (when-let ((params (org-element-property :parameters 
(org-element-context
+   (when-let* ((params (org-element-property :parameters 
(org-element-context
  (concat " " params
  ,@(mapcar (lambda (pair)
 (cons (substring (symbol-name (car pair)) 1)
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index a09dafe4f7..3e1e790b1b 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -75,7 +75,7 @@
   "Associate R code buffer with an R session.
 Make SESSION be the inferior ESS process associated with the
 current code buffer."
-  (when-let ((process (get-buffer-process session)))
+  (when-let* ((process (get-buffer-process session)))
 (setq ess-local-process-name (process-name process))
 (ess-make-buffer-current))
   (setq-local ess-gen-proc-buffer-name-function (lambda (_) session)))
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 97bfa4be35..eb85beb152 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -269,7 +269,7 @@ results as a string."
   "Return non-nil if the last prompt matches input prompt.
 Backport of `python-util-comint-end-of-output-p' to emacs28.  To
 be removed after minimum supported version reaches emacs29."
-  (when-le

[elpa] externals/org 263f337598 17/19: Backport commit 60c0524ad from Emacs

[ELPA Syncer]

branch: externals/org
commit 263f337598ac5165f2b2bd2e11238e5fdc87ba1f
Author: Sean Whitton 
Commit: Kyle Meyer 

Backport commit 60c0524ad from Emacs

* lisp/org-capture.el (org-capture):
* lisp/org.el (org-category, org-todo):
* lisp/ox.el (org-export-async-start): Fix capitalization ELisp ->
Elisp.

Fix capitalization ELisp -> Elisp
60c0524ad28eaeae968603010831bcacca2a5180
Sean Whitton
Wed Mar 12 09:38:33 2025 +0800

[ km: This was independently covered on the bugfix branch with
  f86e17e38.  It's applied here for bookkeeping/traceability
  purposes. ]
---
 lisp/org-capture.el | 2 +-
 lisp/org.el | 8 
 lisp/ox.el  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d4ae0207c3..9f737893e6 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -658,7 +658,7 @@ When called with a `C-0' (zero) prefix, insert a template 
at point.
 When called with a `C-1' (one) prefix, force prompting for a date when
 a datetree entry is made.
 
-ELisp programs can set KEYS to a string associated with a template
+Elisp programs can set KEYS to a string associated with a template
 in `org-capture-templates'.  In this case, interactive selection
 will be bypassed.
 
diff --git a/lisp/org.el b/lisp/org.el
index 56a8d11e1a..9051bf6c8c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3157,16 +3157,16 @@ There are multiple ways to set the category.  One way 
is to set
 it in the document property drawer.  For example:
 
 :PROPERTIES:
-:CATEGORY: ELisp
+:CATEGORY: Elisp
 :END:
 
 Other ways to define it is as an Emacs file variable, for example
 
-#   -*- mode: org; org-category: \"ELisp\"
+#   -*- mode: org; org-category: \"Elisp\"
 
 or for the file to contain a special line:
 
-#+CATEGORY: ELisp
+#+CATEGORY: Elisp
 
 If the file does not specify a category, then file's base name
 is used instead.")
@@ -9422,7 +9422,7 @@ With numeric prefix arg, switch to the Nth state.
 With a numeric prefix arg of 0, inhibit note taking for the change.
 With a numeric prefix arg of -1, cancel repeater to allow marking as DONE.
 
-When called through ELisp, arg is also interpreted in the following way:
+When called through Elisp, arg is also interpreted in the following way:
 `none'-> empty state
 \"\"-> switch to empty state
 `done'-> switch to DONE
diff --git a/lisp/ox.el b/lisp/ox.el
index a2a21a72c4..6b62d8bae7 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6660,7 +6660,7 @@ to `:default' encoding.  If it fails, return S."
   "Call function FUN on the results returned by BODY evaluation.
 
 FUN is an anonymous function of one argument.  BODY should be a valid
-ELisp source expression.  BODY evaluation happens in an asynchronous process,
+Elisp source expression.  BODY evaluation happens in an asynchronous process,
 from a buffer which is an exact copy of the current one.
 
 Use `org-export-add-to-stack' in FUN in order to register results

[elpa] externals/org e6ad6f06a6 14/19: Backport commit 8c1658349 from Emacs

[ELPA Syncer]

branch: externals/org
commit e6ad6f06a67d12b7716b443c2676fd18d6507e8e
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 8c1658349 from Emacs

; Whitespace fixes to silence git hooks
8c165834913bb0dca214acc4b82ba1d9d4ac0a82
Stefan Kangas
Wed Feb 26 18:11:22 2025 +0100
---
 doc/doc-setup.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/doc-setup.org b/doc/doc-setup.org
index 192159539f..d0ed4272db 100644
--- a/doc/doc-setup.org
+++ b/doc/doc-setup.org
@@ -50,4 +50,3 @@
 # The "kbd" macro turns KBD into @kbd{KBD}.  Additionally, it
 # encloses case-sensitive special keys (SPC, RET...) within @key{...}.
 #+macro: kbd (eval (org-texinfo-kbd-macro $1))
-

[elpa] externals/org 72d61165fc 05/19: Backport commit 3d3c10946 from Emacs

[ELPA Syncer]

branch: externals/org
commit 72d61165fcb0f5f064792c13579b7a109347ca0f
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 3d3c10946 from Emacs

* lisp/org-table.el (org-table-edit-formulas): Don't use above
obsolete variables.

Make font-lock face variables obsolete
3d3c1094604ceb6133a15226aec9b568f7923ee7
Stefan Kangas
Wed Dec 18 03:48:35 2024 +0100

[ km: This was independently covered on the main branch with
  e38b5e4c1.  It's applied here for bookkeeping/traceability
  purposes. ]
---
 lisp/org-table.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index a5a5c54be6..22eecd5536 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3412,7 +3412,7 @@ Parameters get priority."
  (when title
(unless (bobp) (insert "\n"))
(insert
-(org-add-props (cdr title) nil 'face font-lock-comment-face))
+ (org-add-props (cdr title) nil 'face 'font-lock-comment-face))
(setq titles (remove title titles)))
  (when (equal key (car entry)) (setq startline (org-current-line)))
  (let ((s (concat

[elpa] externals/org fb9b315665 01/19: Backport commit 0e591a911 from Emacs

[ELPA Syncer]

branch: externals/org
commit fb9b3156650b97638936f7f144f15d5f340206e4
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 0e591a911 from Emacs

* lisp/ob-processing.el (sha1):
* lisp/org-feed.el (sha1): Don't require features
that are built-in, and always provided.

Remove redundant `require`s
0e591a9112c15bfe7bd19c06fa117cfc9e87f8b5
Stefan Kangas
Thu Jul 4 23:55:16 2024 +0200
---
 lisp/ob-processing.el | 1 -
 lisp/org-feed.el  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index e1d1edd5c6..81b7f7ee4d 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -56,7 +56,6 @@
 (org-assert-version)
 
 (require 'ob)
-(require 'sha1)
 
 (declare-function processing-sketch-run "ext:processing-mode" ())
 
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index 67be5274de..88a393ae6f 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -92,7 +92,6 @@
 (org-assert-version)
 
 (require 'org)
-(require 'sha1)
 
 (declare-function url-retrieve-synchronously "url"
   (url &optional silent inhibit-cookies timeout))

[elpa] externals/org 0f06cf6d4e 13/19: Backport commit 702cb123f from Emacs

[ELPA Syncer]

branch: externals/org
commit 0f06cf6d4ea03d0a1cbadba7926958df002f181d
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 702cb123f from Emacs

; Fix typos
702cb123faf1bdbacf555188ae4997d6be3765fe
Stefan Kangas
Sat Feb 22 14:48:29 2025 +0100
---
 etc/ORG-NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 7f791de198..1a73eea5c9 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5568,7 +5568,7 @@ the end of the string.
 
 *** Function ~org-info-export~ changes.
 
-HTML links created from certain info links now point to =gnu.org= URL's rather
+HTML links created from certain info links now point to =gnu.org= URLs rather
 than just to local files. For example info links such as =info:emacs#List
 Buffers= used to be converted to HTML links like this:
 

[elpa] externals/org 8b5339035b 08/19: Backport commit 64d314e0f from Emacs

[ELPA Syncer]

branch: externals/org
commit 8b5339035b3d60249398bbc004c69c6402780cb1
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 64d314e0f from Emacs

* lisp/org-faces.el (org-formula, org-agenda-date-today)
(org-scheduled, org-scheduled-today): Prefer defface attribute ':slant
italic' to its obsolete alias ':italic t'.  See also Bug#73552.

Prefer defface's ':slant italic' to obsolete alias ':italic t'
64d314e0f6495de6fcf4f4c51e710b597a237e4f
Stefan Kangas
Tue Jan 21 09:56:59 2025 +0100
---
 lisp/org-faces.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 1f206b9114..7fb04bb9fd 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -404,7 +404,7 @@ changes."
 (((class color) (min-colors 88) (background dark)) (:foreground 
"chocolate1"))
 (((class color) (min-colors 8)  (background light)) (:foreground "red"))
 (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
-(t (:weight bold :italic t)))
+(t (:weight bold :slant italic)))
   "Face for formulas."
   :group 'org-faces)
 
@@ -529,7 +529,7 @@ it (e.g. if that is assigned a different font height or 
family)."
   :group 'org-faces)
 
 (defface org-agenda-date-today
-  '((t (:inherit org-agenda-date :weight bold :italic t)))
+  '((t (:inherit org-agenda-date :weight bold :slant italic)))
   "Face used in agenda for today."
   :group 'org-faces)
 
@@ -552,7 +552,7 @@ which days belong to the weekend."
   'class color) (min-colors 88) (background light)) (:foreground 
"DarkGreen"))
 (((class color) (min-colors 88) (background dark)) (:foreground 
"PaleGreen"))
 (((class color) (min-colors 8)) (:foreground "green"))
-(t (:weight bold :italic t)))
+(t (:weight bold :slant italic)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 
@@ -560,7 +560,7 @@ which days belong to the weekend."
   'class color) (min-colors 88) (background light)) (:foreground 
"DarkGreen"))
 (((class color) (min-colors 88) (background dark)) (:foreground 
"PaleGreen"))
 (((class color) (min-colors 8)) (:foreground "green"))
-(t (:weight bold :italic t)))
+(t (:weight bold :slant italic)))
   "Face for items scheduled for a certain day."
   :group 'org-faces)
 

[elpa] externals/org 12d9929716 06/19: Backport commit 7eb8596ff from Emacs

[ELPA Syncer]

branch: externals/org
commit 12d99297161cb0edda2ef9c56cf332e42ad3b951
Author: Eli Zaretskii 
Commit: Kyle Meyer 

Backport commit 7eb8596ff from Emacs

* lisp/org.el (dnd-open-local-file): Declare.

; Fix warnings in a tty-only build on MS-Windows
7eb8596ff5f1964f91664a6b7cac3199a5af5ba7
Eli Zaretskii
Sun Jan 5 11:03:07 2025 +0200
---
 lisp/org.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/org.el b/lisp/org.el
index 6a8a45a9e4..a11eee9429 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20917,6 +20917,8 @@ URLS is a list of file URL."
 
 (put 'org--dnd-multi-local-file-handler 'dnd-multiple-handler t)
 
+(declare-function dnd-open-local-file "dnd" (uri action))
+
 (defun org--dnd-local-file-handler (url action &optional separator)
   "Handle file URL as per ACTION.
 SEPARATOR is the string to insert after each link.  It may be nil

[elpa] externals/org c60006864a 16/19: Backport commit 7905ea761 from Emacs

[ELPA Syncer]

branch: externals/org
commit c60006864a5a26c878f6f317d4ade4bf7cd004af
Author: Michael Heerdegen 
Commit: Kyle Meyer 

Backport commit 7905ea761 from Emacs

* lisp/ob-exp.el (org-babel-exp--at-source): Fix broken edebug specs
(debug body) -> (debug (body)).

Correct (debug body) edebug specs
7905ea761ac8405628993708b4c1d4516370067c
Michael Heerdegen
Sat Mar 8 18:35:07 2025 +0100
---
 lisp/ob-exp.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 83b6be8e24..ab99541ab9 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -65,7 +65,7 @@ to avoid evaluating code on export should use the header 
argument
 Source is located in `org-babel-exp-reference-buffer'.  The value
 returned is the value of the last form in BODY.  Assume that
 point is at the beginning of the Babel block."
-  (declare (indent 1) (debug body))
+  (declare (indent 1) (debug (body)))
   `(let ((source (get-text-property (point) 'org-reference)))
  ;; Source blocks created during export process (e.g., by other
  ;; source blocks) are not referenced.  In this case, do not move

[elpa] externals/org 9194ad5dc6 03/19: Backport commit d706be4b3 from Emacs

[ELPA Syncer]

branch: externals/org
commit 9194ad5dc64e93fc1209a0de0e1df7ac6fec59ce
Author: Juri Linkov 
Commit: Kyle Meyer 

Backport commit d706be4b3 from Emacs

* lisp/ol-eshell.el (org-eshell-open): Add '(category . comint)'.

Remove obsolete 'display-comint-buffer-action' (bug#74361)
d706be4b345f3e2d242c4f2ffb5e566845b2935d
Juri Linkov
Wed Dec 4 09:40:33 2024 +0200
---
 lisp/ol-eshell.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/ol-eshell.el b/lisp/ol-eshell.el
index fe22fb2104..6e54d0e3ca 100644
--- a/lisp/ol-eshell.el
+++ b/lisp/ol-eshell.el
@@ -51,9 +51,9 @@ followed by a colon."
 (if (get-buffer eshell-buffer-name)
 (pop-to-buffer
  eshell-buffer-name
- (if (boundp 'display-comint-buffer-action) ; Emacs >= 29
+ (if (boundp 'display-comint-buffer-action) ; Emacs >= 29, <= 30
  display-comint-buffer-action
-   '(display-buffer-same-window (inhibit-same-window
+   '(display-buffer-same-window (inhibit-same-window) (category . 
comint
   (eshell))
 (goto-char (point-max))
 (eshell-kill-input)

[elpa] externals/org updated (ffb1652c4a -> 6d51edc0f9)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  ffb1652c4a Remove stray legacy submodule
   new  fb9b315665 Backport commit 0e591a911 from Emacs
   new  1d866923e1 Backport commit d35430099 from Emacs
   new  9194ad5dc6 Backport commit d706be4b3 from Emacs
   new  b702412f1f Backport commit d1bde7b5c from Emacs
   new  72d61165fc Backport commit 3d3c10946 from Emacs
   new  12d9929716 Backport commit 7eb8596ff from Emacs
   new  9daee7038d Backport commit 375befcac from Emacs
   new  8b5339035b Backport commit 64d314e0f from Emacs
   new  21726c7b89 Backport commit 0e76716c5 from Emacs
   new  b768752d2e Backport commit a669e6a37 from Emacs
   new  7c19c4d433 Backport commit 9efd11e5f from Emacs
   new  0e937ba364 Backport commit b417c0abe from Emacs
   new  0f06cf6d4e Backport commit 702cb123f from Emacs
   new  e6ad6f06a6 Backport commit 8c1658349 from Emacs
   new  05825473f3 Backport commit becdfb11a from Emacs
   new  c60006864a Backport commit 7905ea761 from Emacs
   new  263f337598 Backport commit 60c0524ad from Emacs
   new  303aa80220 Backport commit 6bcf41c31 from Emacs
   new  6d51edc0f9 Merge branch 'km/from-emacs-master'


Summary of changes:
 doc/doc-setup.org   |  1 -
 etc/ORG-NEWS|  2 +-
 lisp/ob-core.el |  2 +-
 lisp/ob-exp.el  |  2 +-
 lisp/ob-processing.el   |  1 -
 lisp/ol-eshell.el   |  4 ++--
 lisp/org-agenda.el  |  6 +++---
 lisp/org-capture.el |  4 ++--
 lisp/org-element-ast.el |  8 
 lisp/org-faces.el   | 46 +++---
 lisp/org-feed.el|  1 -
 lisp/org-macro.el   |  2 +-
 lisp/org-persist.el |  2 +-
 lisp/org-table.el   |  5 ++---
 lisp/org.el |  6 --
 lisp/ox-odt.el  |  8 
 lisp/ox-publish.el  |  2 +-
 lisp/ox.el  |  6 +++---
 18 files changed, 53 insertions(+), 55 deletions(-)

[elpa] externals/org 0e937ba364 12/19: Backport commit b417c0abe from Emacs

[ELPA Syncer]

branch: externals/org
commit 0e937ba36494d999063925d838f052cbd99adfdd
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit b417c0abe from Emacs

* lisp/org-element-ast.el (org-element-create): Address FIXME.

Address FIXME in org-element-create
b417c0abebfa68d37dd07160b81ce5f7da6dd431
Stefan Kangas
Mon Feb 17 02:22:28 2025 +0100
---
 lisp/org-element-ast.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/org-element-ast.el b/lisp/org-element-ast.el
index 2322bc69fc..60ecf34108 100644
--- a/lisp/org-element-ast.el
+++ b/lisp/org-element-ast.el
@@ -731,10 +731,10 @@ a newly created one.
 When TYPE is `plain-text', CHILDREN must contain a single node -
 string.  Alternatively, TYPE can be a string.  When TYPE is nil or
 `anonymous', PROPS must be nil."
-  (cl-assert
-   ;; FIXME: Just use `plistp' from Emacs 29 when available.
-   (let ((len (proper-list-p props)))
- (and len (cl-evenp len
+  (cl-assert (if (fboundp 'plistp) ; Emacs 29.1
+ (plistp props)
+   (let ((len (proper-list-p props)))
+ (and len (cl-evenp len)
   ;; Assign parray.
   (when (and props (not (stringp type)) (not (eq type 'plain-text)))
 (let ((node (list 'dummy props)))

[elpa] externals/org 05825473f3 15/19: Backport commit becdfb11a from Emacs

[ELPA Syncer]

branch: externals/org
commit 05825473f3669d419501d33111a91ab09e188749
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit becdfb11a from Emacs

* lisp/ox-publish.el (org-publish-timestamp-filename): Remove Emacs 23
compat code.

Remove Emacs 23 compat code from ox-publish.el
becdfb11a5b13bc773729236763e99e513806451
Stefan Kangas
Fri Feb 28 03:05:30 2025 +0100
---
 lisp/ox-publish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index bb9e0bd2e3..f324f0d881 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -365,7 +365,7 @@ The timestamp file name is constructed using FILENAME, 
publishing
 directory PUB-DIR, and PUB-FUNC publishing function."
   (setq filename (concat filename "::" (or pub-dir "") "::"
 (format "%s" (or pub-func ""
-  (concat "X" (if (fboundp 'sha1) (sha1 filename) (md5 filename
+  (concat "X" (sha1 filename)))
 
 (defun org-publish-needed-p
 (filename &optional pub-dir pub-func _true-pub-dir base-dir)

[nongnu] elpa/dirvish updated (e8ec5765da -> 33e957900a)

[ELPA Syncer]

elpasync pushed a change to branch elpa/dirvish.

  from  e8ec5765da refactor(core): remove redundant `revert-buffer` during 
selecting
   new  1e4c2c1be9 fix(core): do not reuse peek session
   new  3043bc2976 refactor: remove hack for `zoom-mode`
   new  33e957900a fix(extras): obsolete `dirvish-fd-jump` command (#337)


Summary of changes:
 dirvish-extras.el |  5 +++--
 dirvish.el| 11 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

[nongnu] elpa/dirvish 3043bc2976 2/3: refactor: remove hack for `zoom-mode`

[ELPA Syncer]

branch: elpa/dirvish
commit 3043bc2976c330b74df71e6446d32cef4fa84a7b
Author: Alex Lu 
Commit: Alex Lu 

refactor: remove hack for `zoom-mode`

This hack results in a misaligned side buffer.
---
 dirvish.el | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dirvish.el b/dirvish.el
index f7c11e6a3a..452c3b3f9b 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -1129,9 +1129,7 @@ Optionally, use CURSOR as the enabled cursor type."
 (defun dirvish-pre-redisplay-h (window)
   "Record root WINDOW and redisplay sessions in selected frame."
   (setq dirvish--selected-window (frame-selected-window))
-  (let* ((dv (dirvish-curr)) (lyt (dv-curr-layout dv)) (sf (dv-size-fixed dv)))
-(setf (dv-root-window dv) window)
-(when (and (not lyt) sf) (setq window-size-fixed sf)))
+  (when-let* ((dv (dirvish-curr))) (setf (dv-root-window dv) window))
   (dirvish--redisplay))
 
 (defun dirvish-post-command-h ()
@@ -1393,11 +1391,12 @@ Dirvish sets `revert-buffer-function' to this function."
(window-parameters . ((no-other-window . t))
  (w-order (and layout (dirvish--window-split-order)))
  (window-safe-min-height 0) (window-resize-pixelwise t)
- (lh (line-pixel-height)) (gui? (display-graphic-p))
+ (lh (line-pixel-height)) (gui? (display-graphic-p)) sf
  (mh (dirvish--mode-line-height t)) (hh (dirvish--mode-line-height t 
t)))
 (setf (dv-index dv) (cons (dirvish-prop :root) (current-buffer)))
 ;; only refresh window config before creating fullframe layout
 (setf (dv-winconf dv) (when layout (or conf 
(current-window-configuration
+(and (not layout) (setq sf (dv-size-fixed dv)) (setq window-size-fixed sf))
 (when layout (dirvish--init-special-buffers dv))
 (dirvish--setup-mode-line dv)
 (when w-order (let ((ignore-window-parameters t)) (delete-other-windows)))

[nongnu] elpa/dirvish 1e4c2c1be9 1/3: fix(core): do not reuse peek session

[ELPA Syncer]

branch: elpa/dirvish
commit 1e4c2c1be931e87b812e073b30331f8b7e7ff2a0
Author: Alex Lu 
Commit: Alex Lu 

fix(core): do not reuse peek session

Prevent *embark-export-dired* using the peek session
---
 dirvish.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dirvish.el b/dirvish.el
index 9ce9cf6c64..f7c11e6a3a 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -1474,7 +1474,9 @@ With optional NOSELECT just find files but do not select 
them."
   "Return buffer for DIR-OR-LIST with FLAGS, FN is `dired-noselect'."
   (let* ((dir (if (consp dir-or-list) (car dir-or-list) dir-or-list))
  (key (file-name-as-directory (expand-file-name dir)))
- (dv (or (dirvish-curr) (dirvish--get-session) (dirvish--new)))
+ (dvc (dirvish-curr))
+ (dv (if (and dvc (not (eq (dv-type dvc) 'peek))) dvc
+   (or (dirvish--get-session) (dirvish--new
  (bname buffer-file-name) (remote (file-remote-p dir))
  (flags (or flags (dv-ls-switches dv)))
  (mc dirvish-large-directory-threshold)

[nongnu] elpa/dirvish 33e957900a 3/3: fix(extras): obsolete `dirvish-fd-jump` command (#337)

[ELPA Syncer]

branch: elpa/dirvish
commit 33e957900a2c8089f473927338f4dcb1b9f608c9
Author: Alex Lu 
Commit: Alex Lu 

fix(extras): obsolete `dirvish-fd-jump` command (#337)
---
 dirvish-extras.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dirvish-extras.el b/dirvish-extras.el
index 2981aa752a..40b84d9bd4 100644
--- a/dirvish-extras.el
+++ b/dirvish-extras.el
@@ -416,8 +416,9 @@ current layout defined in `dirvish-layout-recipes'."
"" "Actions & Essential commands"
("u" "User interface setup"   dirvish-setup-menu)
("c" "Dired cheatsheet"   dirvish-dired-cheatsheet)
-   ("/" "Perform fd search"  dirvish-fd)
-   ("@" "Find all dirs by fd"dirvish-fd-jump)
+   ("/" "Run fd search here" dirvish-fd)
+   ("#" "Search everything in ~" (lambda () (interactive)
+   (dirvish-fd "~" "") (dirvish-narrow)))
("R" "Rsync marked files" dirvish-rsync)
("n" "Live narrowing" dirvish-narrow)
"Transient commands"

[nongnu] elpa/helm b16f1e63b2 1/3: New user var helm-ff-drag-and-drop-default-directories

[ELPA Syncer]

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

New user var helm-ff-drag-and-drop-default-directories

Allow setting up a list of directories where to drag-and-drop files
when no suitable target directory is found.

Make obsolete helm-ff-drag-and-drop-default-directory.
---
 helm-files.el | 33 -
 helm-help.el  | 31 +++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index 33dc1909d4..cd0982325e 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -948,6 +948,21 @@ present in this list."
 (defcustom helm-ff-dim-prompt-on-update t
   "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 nil
+  "A list of directories 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."
+  :type '(repeat (choice string)))
 
 ;;; Faces
 ;;
@@ -5584,12 +5599,6 @@ Show the first `helm-ff-history-max-length' elements of
   "Default action when dragging files.
 Possible values are `copy', `rsync' or `rename'.")
 
-(defvar helm-ff-drag-and-drop-default-directory nil
-  "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.")
-
 (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.
@@ -5597,7 +5606,7 @@ 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-directory' if set."
+`helm-ff-drag-and-drop-default-directories' if set."
   (interactive "e")
   (cl-assert (memq helm-ff-drag-mouse-1-default-action
'(copy rsync rename)))
@@ -5624,11 +5633,17 @@ When no suitable place to drop is found ask to drop to
  collect (cons  dir dir))
 ((and (eql (window-buffer (car windows))
helm-current-buffer)
-  helm-ff-drag-and-drop-default-directory)
+  (or helm-ff-drag-and-drop-default-directories
+  helm-ff-drag-and-drop-default-directory))
  (x-popup-menu
   t (list "Choose target"
   (cons ""
-(list (cons it it))
+(if (listp it)
+(cl-loop for fname in it
+ collect (cons fname 
fname))
+  ;; Handle obsolete
+  ;; 
helm-ff-drag-and-drop-default-directory.
+  (list (cons it it)))
 ((car windows)
  (with-selected-window it default-directory)
 (if (memq helm-ff-drag-mouse-1-default-action '(copy rsync))
diff --git a/helm-help.el b/helm-help.el
index 11e6a0abb9..85bc0779a0 100644
--- a/helm-help.el
+++ b/helm-help.el
@@ -881,6 +881,37 @@ automatically \"-e 'ssh -p '\" to the rsync command 
line
 unless you have specified yourself the \"-e\" option by editing
 rsync command line with a prefix arg (see above).
 
+*** Drag and drop files from Helm
+
+When mouse support is enabled in Helm (which is the default, see
+`helm-allow-mouse') you can drag and drop files to `default-directory'
+of the buffer you drag-and-drop in.  When you drag and drop outside of
+an emacs frame, the target directory is defined by the variable
+`helm-ff-drag-and-drop-default-directories' which is a list of
+directories you can choose from, it is nil by default, customize it to
+your needs.  Tip: To trigger this from an Emacs full frame, drag to the
+border of the Emacs frame.
+
+Drag-and-drop to external applications is not supported in Helm, to
+achieve this y

[nongnu] elpa/helm 3c8d9b1810 3/3: Make a defcustom for helm-ff-drag-mouse-1-default-action

[ELPA Syncer]

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

Make a defcustom for helm-ff-drag-mouse-1-default-action
---
 helm-files.el | 12 
 helm-help.el  |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index 66e479a86f..0867943208 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -963,6 +963,14 @@ You want generally to set this to your home desktop 
directory.")
 It is used when no suitable directory is found at drop place,
 generally when dropping outside of an emacs frame."
   :type '(repeat (choice string)))
+
+(defcustom helm-ff-drag-mouse-1-default-action 'copy
+  "Default action when dragging files.
+Possible values are `copy', `rsync' or `rename'."
+  :type '(choice
+  (const :tag "Copy" copy)
+  (const :tag "Rsync" rsync)
+  (const :tag "Move" rename)))
 
 ;;; Faces
 ;;
@@ -5595,10 +5603,6 @@ Show the first `helm-ff-history-max-length' elements of
 helm-ff-history
 (put 'helm-find-files-history 'helm-only t)
 
-(defvar helm-ff-drag-mouse-1-default-action 'copy
-  "Default action when dragging files.
-Possible values are `copy', `rsync' or `rename'.")
-
 (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.
diff --git a/helm-help.el b/helm-help.el
index 85bc0779a0..2278c681ad 100644
--- a/helm-help.el
+++ b/helm-help.el
@@ -892,6 +892,9 @@ directories you can choose from, it is nil by default, 
customize it to
 your needs.  Tip: To trigger this from an Emacs full frame, drag to the
 border of the Emacs frame.
 
+By default Helm copy files when using drag-and-drop, you can customize
+`helm-ff-drag-mouse-1-default-action' to modify this.
+
 Drag-and-drop to external applications is not supported in Helm, to
 achieve this you will have to install external application 
[[https://github.com/mwh/dragon][Dragon]]
 and use it as follow:

[nongnu] elpa/helm e6e7b6d78f 2/3: Prevent marking when moving mouse

[ELPA Syncer]

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

Prevent marking when moving mouse
---
 helm-files.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helm-files.el b/helm-files.el
index cd0982325e..66e479a86f 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5610,6 +5610,8 @@ When no suitable place to drop is found ask to drop to
   (interactive "e")
   (cl-assert (memq helm-ff-drag-mouse-1-default-action
'(copy rsync rename)))
+  ;; Prevent marking when moving mouse.
+  (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

[nongnu] elpa/helm updated (820812045a -> 3c8d9b1810)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  820812045a Make obsolete helm-make-type and associated
   new  b16f1e63b2 New user var helm-ff-drag-and-drop-default-directories
   new  e6e7b6d78f Prevent marking when moving mouse
   new  3c8d9b1810 Make a defcustom for helm-ff-drag-mouse-1-default-action


Summary of changes:
 helm-files.el | 47 ++-
 helm-help.el  | 34 ++
 2 files changed, 68 insertions(+), 13 deletions(-)

[nongnu] elpa/vm updated (9cbccaa5e5 -> a5a676ce48)

[ELPA Syncer]

elpasync pushed a change to branch elpa/vm.

  from  9cbccaa5e5 Merge branch 'main' into 'main'
   new  e98da70ce1 fixed pop handler reference to underfined function in 
elisp moderization that was not updated
   new  970517dfb0 Merge branch vm:main into main
   new  a5a676ce48 Merge branch 'main' into 'main'


Summary of changes:
 lisp/vm-pop.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[nongnu] elpa/vm 970517dfb0 2/3: Merge branch vm:main into main

[ELPA Syncer]

branch: elpa/vm
commit 970517dfb0f53f39dce482c4e143cb3d209ff759
Merge: e98da70ce1 9cbccaa5e5
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch vm:main into main

[nongnu] elpa/vm a5a676ce48 3/3: Merge branch 'main' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit a5a676ce4815db147ca55ecabfef82d760256b9c
Merge: 9cbccaa5e5 970517dfb0
Author: Mark Diekhans 
Commit: Mark Diekhans 

Merge branch 'main' into 'main'

Merge bug fixes

See merge request emacs-vm/vm!43
---
 lisp/vm-pop.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index 5ea662ef94..f91a173587 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -112,7 +112,7 @@ a POP server, find its cache file on the file system"
   (let ((process nil)
(m-per-session vm-pop-messages-per-session)
(b-per-session vm-pop-bytes-per-session)
-   (handler (vm-find-file-name-handler source 'vm-pop-move-mail))
+   (handler (find-file-name-handler source 'vm-pop-move-mail))
(popdrop (or (vm-pop-find-name-for-spec source)
 (vm-safe-popdrop-string source)))
(statblob nil)
@@ -268,7 +268,7 @@ a POP server, find its cache file on the file system"
 
 (defun vm-pop-check-mail (source)
   (let ((process nil)
-   (handler (vm-find-file-name-handler source 'vm-pop-check-mail))
+   (handler (find-file-name-handler source 'vm-pop-check-mail))
(retrieved vm-pop-retrieved-messages)
(popdrop (vm-popdrop-sans-password source))
(count 0)

[nongnu] elpa/vm e98da70ce1 1/3: fixed pop handler reference to underfined function in elisp moderization that was not updated

[ELPA Syncer]

branch: elpa/vm
commit e98da70ce135dc1f177f92d79ab139ea355e5170
Author: Mark Diekhans 
Commit: Mark Diekhans 

fixed pop handler reference to underfined function in elisp moderization 
that was not updated
---
 lisp/vm-pop.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index 5ea662ef94..f91a173587 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -112,7 +112,7 @@ a POP server, find its cache file on the file system"
   (let ((process nil)
(m-per-session vm-pop-messages-per-session)
(b-per-session vm-pop-bytes-per-session)
-   (handler (vm-find-file-name-handler source 'vm-pop-move-mail))
+   (handler (find-file-name-handler source 'vm-pop-move-mail))
(popdrop (or (vm-pop-find-name-for-spec source)
 (vm-safe-popdrop-string source)))
(statblob nil)
@@ -268,7 +268,7 @@ a POP server, find its cache file on the file system"
 
 (defun vm-pop-check-mail (source)
   (let ((process nil)
-   (handler (vm-find-file-name-handler source 'vm-pop-check-mail))
+   (handler (find-file-name-handler source 'vm-pop-check-mail))
(retrieved vm-pop-retrieved-messages)
(popdrop (vm-popdrop-sans-password source))
(count 0)

[elpa] externals/denote 354d29db27 6/9: Make small change to the doc string of denote-query-sorting

[ELPA Syncer]

branch: externals/denote
commit 354d29db272ba8fa3c381f261a843bb4b158ff34
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make small change to the doc string of denote-query-sorting

The functionality to sort query buffers was introduced by Lucas
Quintana in pull request 594: 
.

Lucas has assigned copyright to the Free Software Foundation.
---
 denote.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/denote.el b/denote.el
index bd198ac8ac..1397bdb73d 100644
--- a/denote.el
+++ b/denote.el
@@ -5136,9 +5136,8 @@ files in a custom manner.  The value is passed as the 
COMPONENT argument
 to the `denote-sort-files' function.  That means it can be a symbol
 among `denote-sort-components' or a function which performs the sorting.
 
-The user can also call the function `denote-query-sort-last-search' in
-order to sort file names interactively and temporarily in the query
-buffer."
+The user can also call the command `denote-query-sort-last-search' in
+order to sort file names interactively in the query buffer."
   :type '(radio
   (const :tag "Don't sort (default)" nil)
   (const :tag "Sort by identifier" identifier)

[elpa] externals/denote 14259e58ca 7/9: Document denote-query-sorting and denote-query-sort-last-search

[ELPA Syncer]

branch: externals/denote
commit 14259e58ca7d13640c49f898edaf9b3d1a1934e8
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Document denote-query-sorting and denote-query-sort-last-search

The functionality to sort query buffers was introduced by Lucas
Quintana in pull request 594: 
.

Lucas has assigned copyright to the Free Software Foundation.
---
 README.org | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/README.org b/README.org
index 70cbafe36f..6b2e5571a5 100644
--- a/README.org
+++ b/README.org
@@ -3698,6 +3698,14 @@ of files that were returned by whichever command 
produced the buffer
 #+findex: denote-query-clear-all-filters
 - ~denote-query-clear-all-filters~ :: Clear all the applied filters.
 
+#+findex: denote-query-sort-last-search
+- ~denote-query-sort-last-search~ :: Change the sorting of files from
+  the last search. The user option ~denote-query-sorting~ controlls
+  the default sort ([[#h:ec3d009a-518b-439f-a3e5-38342b1c13fe][Control the 
default sort of a query buffer]]).
+
+  [ Both the command ~denote-query-sorting~ and the user option
+~denote-query-sorting~ are part of {{{development-version}}}. ]
+
 Remember that these are easy to use even without knowledge of regular
 expressions, thanks to the efficiency of the Denote file-naming scheme
 ([[#h:1a953736-86c2-420b-b566-fb22c97df197][Features of the file-naming scheme 
for searching or filtering]]). For
@@ -3712,6 +3720,40 @@ provided by the Xref infrastructure. Users can do =M-x 
describe-mode=
 (=C-h m= with default key bindings) to learn about all the actions
 they can perform.
 
+** Control the default sort of a query buffer
+:PROPERTIES:
+:CUSTOM_ID: h:ec3d009a-518b-439f-a3e5-38342b1c13fe
+:END:
+
+[ Part of {{{development-version}}}. ]
+
+#+vindex: denote-query-sorting
+The user option ~denote-query-sorting~ controls the order of matching
+files in a query buffer (buffers that use the ~denote-query-mode~. The
+applies to the buffer that is produced by query links, backlinks, and
+the ~denote-grep~ command:
+
+- [[#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]].
+
+By default, no sorting of matching files is performed. They appear in
+the query buffer in the order they were retrieved.
+
+The ~denote-query-sorting~ can be set to a symbol among =title=,
+=keywords=, =signature=, or =identifier= to sort by the given file
+name component ([[#h:4e9c7512-84dc-4dfb-9fa9-e15d51178e5d][The file-naming 
scheme]]). The symbol =random= produces
+a random order each time.
+
+The ~denote-query-sorting~ can also be set to the symbol of a
+function. In that case, the given function is used to perform the
+sorting. This is for advanced users, who may refer to the
+documentation of the ~denote-sort-files~ for the technicalities.
+
+Whatever the value of ~denote-query-sorting~, users may change the
+sort of query buffers by calling the command ~denote-query-sort-last-search~
+([[#h:435592bc-e896-429f-a599-9f1bcd5ab9b8][Interact with the links buffer]]).
+
 * Minibuffer histories
 :PROPERTIES:
 :CUSTOM_ID: h:82dc1203-d689-44b2-9a6c-b37776209651

[elpa] externals/denote fcf83579a6 1/9: Fix small issues with query buffers

[ELPA Syncer]

branch: externals/denote
commit fcf83579a6564c94be5ac80c4ad8a58ce3c701f6
Author: Lucas Quintana 
Commit: Lucas Quintana 

Fix small issues with query buffers

- Clearing filters and excluding/including files should always replace
current window and reuse buffer name.

- As query buffers are special buffers, they should be enclosed with
asterisks (we already do that for backlink buffers).
---
 denote.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/denote.el b/denote.el
index 60d6d7b616..ab898c13b3 100644
--- a/denote.el
+++ b/denote.el
@@ -5211,7 +5211,7 @@ Optional DISPLAY-BUFFER-ACTION is a `display-buffer' 
action and
 concomitant alist, such as `denote-backlinks-display-buffer-action'."
   (let* ((inhibit-read-only t)
  (file buffer-file-name)
- (buffer (or buffer-name (format-message "Denote query for `%s'" 
query)))
+ (buffer (or buffer-name (format-message "*Denote query for `%s'*" 
query)))
  ;; We retrieve results in absolute form and change the
  ;; absolute path to a relative path below. We could add a
  ;; suitable function and the results would be automatically
@@ -5307,7 +5307,9 @@ see `denote-query-exclude-files-with-keywords'."
file)
 (push file final-files)))
 (if final-files
-(denote-make-links-buffer denote-query--last-query final-files)
+(denote-make-links-buffer denote-query--last-query final-files
+  (and (eq major-mode 'denote-query-mode) 
(buffer-name))
+  '(display-buffer-same-window))
   (user-error "No remaining files when applying that filter"))
 (message "Excluding files matching `%s'" regexp)))
 
@@ -5329,7 +5331,9 @@ when REGEXP is a list."
  file)
 (push file final-files)))
 (if final-files
-(denote-make-links-buffer denote-query--last-query final-files)
+(denote-make-links-buffer denote-query--last-query final-files
+  (and (eq major-mode 'denote-query-mode) 
(buffer-name))
+  '(display-buffer-same-window))
   (user-error "No remaining files when applying that filter"))
 (message "Only including files matching `%s'" regexp)))
 
@@ -5368,7 +5372,9 @@ means of e.g. `denote-query-exclude-files')."
   (interactive nil denote-query-mode)
   (unless (derived-mode-p 'denote-query-mode)
 (user-error "Only use this command inside the `denote-query-mode'"))
-  (denote-make-links-buffer denote-query--last-query)
+  (denote-make-links-buffer denote-query--last-query nil
+(and (eq major-mode 'denote-query-mode) 
(buffer-name))
+'(display-buffer-same-window))
   (message "Cleared all filters"))
 
 ;; Additional features for searching file contents

[elpa] externals/denote a9621ff851 4/9: Merge pull request #594 from lmq-10/sort-query-buffer

[ELPA Syncer]

branch: externals/denote
commit a9621ff851346964bf418953c3b41e7c1357aaf4
Merge: f543f305ad 8a61780089
Author: Protesilaos Stavrou 
Commit: GitHub 

Merge pull request #594 from lmq-10/sort-query-buffer

Add support for sorting files in query buffers
---
 denote.el | 77 ++-
 1 file changed, 66 insertions(+), 11 deletions(-)

diff --git a/denote.el b/denote.el
index 60d6d7b616..5dd63d48a4 100644
--- a/denote.el
+++ b/denote.el
@@ -2495,13 +2495,20 @@ regular expression, which means to use the text files 
in the variable
 
 If FILES is not given, use all text files as returned by
 `denote-directory-files'."
-  (let ((xref-file-name-display 'abs))
-(xref--analyze
- (xref-matches-in-files
-  query
-  (if (and files (listp files))
-  files
-(denote-directory-files files denote-query--omit-current 
:text-only))
+  (let* ((xref-file-name-display 'abs)
+ (data
+  (xref--analyze
+   (xref-matches-in-files
+query
+(if (and files (listp files))
+files
+  (denote-directory-files files denote-query--omit-current 
:text-only))
+(if (not denote-query-sorting)
+data
+  ;; Sort results
+  (let* ((files-matched (mapcar #'car data))
+ (files-sorted (denote-sort-files files-matched 
denote-query-sorting)))
+(mapcar (lambda (x) (assoc x data)) files-sorted)
 
  New note
 
@@ -5070,6 +5077,7 @@ file's title.  This has the same meaning as in 
`denote-link'."
 (define-key map "j" #'outline-next-heading)
 (define-key map "o" #'delete-other-windows)
 (define-key map "s" #'denote-grep)
+(define-key map "S" #'denote-query-sort-last-search)
 (define-key map "v" #'outline-cycle)
 (define-key map "x" #'denote-query-exclude-files)
 (define-key map "i" #'denote-query-only-include-files)
@@ -5111,6 +5119,34 @@ This is used by the commands `denote-backlinks', 
`denote-grep',
   "Integration between Denote and Xref for grep/query/backlink buffers."
   :group 'denote)
 
+(defcustom denote-query-sorting nil
+  "How to sort files in query buffers.
+
+This applies to buffers generated by `denote-grep' and query links, as
+well as backlinks.
+
+By default, no sorting is performed, so matching files are displayed as
+they are returned by the search program (which often, but not always,
+means they are sorted by file name).
+
+The user can set this variable to a non-nil value in order to sort the
+files in a custom manner.  The value is passed as the COMPONENT argument
+to the `denote-sort-files' function.  That means it can be a symbol
+among `denote-sort-components' or a function which performs the sorting.
+
+The user can also call the function `denote-query-sort-last-search' in
+order to sort file names interactively and temporarily in the query
+buffer."
+  :type '(radio
+  (const :tag "Don't sort (default)" nil)
+  (const :tag "Sort by identifier" identifier)
+  (const :tag "Sort by title" title)
+  (const :tag "Sort by keywords" keywords)
+  (const :tag "Sort by signature" signature)
+  (const :tag "Random order" random))
+  :package-version '(denote . "4.1.0")
+  :group 'denote-query)
+
 (defcustom denote-backlinks-display-buffer-action
   '((display-buffer-reuse-mode-window display-buffer-below-selected)
 (mode . denote-query-mode)
@@ -5211,7 +5247,7 @@ Optional DISPLAY-BUFFER-ACTION is a `display-buffer' 
action and
 concomitant alist, such as `denote-backlinks-display-buffer-action'."
   (let* ((inhibit-read-only t)
  (file buffer-file-name)
- (buffer (or buffer-name (format-message "Denote query for `%s'" 
query)))
+ (buffer (or buffer-name (format-message "*Denote query for `%s'*" 
query)))
  ;; We retrieve results in absolute form and change the
  ;; absolute path to a relative path below. We could add a
  ;; suitable function and the results would be automatically
@@ -5307,7 +5343,9 @@ see `denote-query-exclude-files-with-keywords'."
file)
 (push file final-files)))
 (if final-files
-(denote-make-links-buffer denote-query--last-query final-files)
+(denote-make-links-buffer denote-query--last-query final-files
+  (and (eq major-mode 'denote-query-mode) 
(buffer-name))
+  '(display-buffer-same-window))
   (user-error "No remaining files when applying that filter"))
 (message "Excluding files matching `%s'" regexp)))
 
@@ -5329,7 +5367,9 @@ when REGEXP is a list."
  file)
 (push file final-files)))
 (if final-files
-(denote-make-links-buffer denote-query--last-query final-files)
+(denote-make-links-buffer denote-query--last-query final-files
+  (and (eq major-mode 'denote-query-mode) 
(buffer-nam

[elpa] externals/denote 5ce665d9e4 8/9: Make stylistic change to denote-retrieve-xref-alist

[ELPA Syncer]

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

Make stylistic change to denote-retrieve-xref-alist

The functionality to sort query buffers was introduced by Lucas
Quintana in pull request 594: 
.

Lucas has assigned copyright to the Free Software Foundation.
---
 denote.el | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/denote.el b/denote.el
index 1397bdb73d..900668d235 100644
--- a/denote.el
+++ b/denote.el
@@ -2505,12 +2505,11 @@ If FILES is not given, use all text files as returned by
 (if (and files (listp files))
 files
   (denote-directory-files files denote-query--omit-current 
:text-only))
-(if (not denote-query-sorting)
-data
-  ;; Sort results
-  (let* ((files-matched (mapcar #'car data))
- (files-sorted (denote-sort-files files-matched 
denote-query-sorting)))
-(mapcar (lambda (x) (assoc x data)) files-sorted)
+(if-let* ((sort denote-query-sorting)
+  (files-matched (mapcar #'car data))
+  (files-sorted (denote-sort-files files-matched sort)))
+(mapcar (lambda (x) (assoc x data)) files-sorted)
+  data)))
 
  New note
 

[elpa] externals/denote a6925b1edf 9/9: Tweak the doc string of denote-query-sort-last-search

[ELPA Syncer]

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

Tweak the doc string of denote-query-sort-last-search

The functionality to sort query buffers was introduced by Lucas
Quintana in pull request 594: 
.

Lucas has assigned copyright to the Free Software Foundation.
---
 denote.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/denote.el b/denote.el
index 900668d235..9ff12ab102 100644
--- a/denote.el
+++ b/denote.el
@@ -5414,12 +5414,12 @@ means of e.g. `denote-query-exclude-files')."
   (message "Cleared all filters"))
 
 (defun denote-query-sort-last-search (component)
-  "Sort the files matched by the last search according to COMPONENT.
+  "Sort files matched by the last search according to COMPONENT.
 
-Interactively, prompt for COMPONENT among `denote-sort-components'.
+When called interactively, prompt for COMPONENT among `denote-sort-components'.
 
-When called from Lisp, any argument as accepted by `denote-sort-files'
-is allowed."
+When called from Lisp, COMPONENT has the same meaning as in the function
+`denote-sort-files'."
   (interactive (list (denote-sort-component-prompt)))
   (let ((denote-query-sorting component))
 (denote-make-links-buffer denote-query--last-query denote-query--last-files

[nongnu] elpa/dirvish d877433f95: chore: melpazoid warnings

[ELPA Syncer]

branch: elpa/dirvish
commit d877433f957a363ad78b228e13a8e5215f2d6593
Author: Alex Lu 
Commit: Alex Lu 

chore: melpazoid warnings
---
 dirvish-extras.el  |  3 ++-
 dirvish-fd.el  |  2 +-
 dirvish.el |  2 +-
 extensions/dirvish-yank.el | 14 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dirvish-extras.el b/dirvish-extras.el
index 40b84d9bd4..88c1c5c430 100644
--- a/dirvish-extras.el
+++ b/dirvish-extras.el
@@ -412,7 +412,8 @@ current layout defined in `dirvish-layout-recipes'."
   [:description
(lambda () (dirvish--format-menu-heading
   "Dirvish main menu"
-  "NOTICE: these commands require relevant Dirvish extensions"))
+  "NOTICE: these commands require relevant Dirvish extensions")
+ (declare-function dirvish-narrow "dirvish-narrow"))
"" "Actions & Essential commands"
("u" "User interface setup"   dirvish-setup-menu)
("c" "Dired cheatsheet"   dirvish-dired-cheatsheet)
diff --git a/dirvish-fd.el b/dirvish-fd.el
index 8a18ae7ef2..bc30008fcd 100644
--- a/dirvish-fd.el
+++ b/dirvish-fd.el
@@ -21,7 +21,7 @@
   :type 'string :group 'dirvish)
 
 (defun dirvish-fd--find-fd-program (&optional remote)
-  "Find fd programm on a local or `REMOTE' host ."
+  "Find fd programm on a local or REMOTE host ."
   (let ((fd (executable-find "fd" remote))
 (fdfind (executable-find "fdfind" remote)))
 (cond (fd fd)
diff --git a/dirvish.el b/dirvish.el
index 452c3b3f9b..062279d9a5 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -466,7 +466,7 @@ Set process's SENTINEL and PUTS accordingly."
  Session Struct
 
 (cl-defstruct (dirvish (:conc-name dv-))
-  "Define dirvish session (`DV' for short) struct."
+  "Define dirvish session (DV for short) struct."
   (id (make-temp-name "") :documentation "is the unique key of DV 
stored in `dirvish--sessions'.")
   (timestamp (dirvish--timestamp) :documentation "is the last access 
timestamp of DV.")
   (type 'default  :documentation "is the type of DV.")
diff --git a/extensions/dirvish-yank.el b/extensions/dirvish-yank.el
index 25355ad8c6..31d050395d 100644
--- a/extensions/dirvish-yank.el
+++ b/extensions/dirvish-yank.el
@@ -251,13 +251,13 @@ is t."
for help-form = (format-message "\
 File `%s' exists, type one of the following keys to continue.
 
-- `y' or SPC to overwrite this file WITHOUT backup
-- `!' answer `y' (overwrite) for all remaining files
-- `n' or DEL to skip this file
-- `N' answer `n' (skip) for all remaining files
-- `b' to overwrite and backup this files
-- `B' answer `b' (overwrite and backup) for all remaining files
-- `q' or ESC to abort the task" src)
+- y or SPC to overwrite this file WITHOUT backup
+- ! answer y for all remaining files
+- n or DEL to skip this file
+- N answer n for all remaining files
+- b to overwrite and backup this files
+- B answer b for all remaining files
+- q or ESC to abort the task" src)
for base = (file-name-nondirectory src)
for collision = (member base dfiles) do
(cond ((equal src (concat dest base))

[elpa] externals/denote 4abffa78c3 5/9: Declare denote-query-sorting before its first use

[ELPA Syncer]

branch: externals/denote
commit 4abffa78c3516fb65f2e3480ab79a69beacf09c7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Declare denote-query-sorting before its first use

The functionality to sort query buffers was introduced by Lucas
Quintana in pull request 594: 
.

Lucas has assigned copyright to the Free Software Foundation.
---
 denote.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/denote.el b/denote.el
index 5dd63d48a4..bd198ac8ac 100644
--- a/denote.el
+++ b/denote.el
@@ -2487,6 +2487,8 @@ pass it to `denote-directory-files'."
 (defvar denote-query--omit-current t
   "When non-nil `denote-make-links-buffer' omits the current file.")
 
+(defvar denote-query-sorting)
+
 (defun denote-retrieve-xref-alist (query &optional files)
   "Return xref alist of absolute file paths with location of matches for QUERY.
 Optional FILES can be a list of files to search for.  It can also be a

[elpa] externals/denote updated (f543f305ad -> a6925b1edf)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  f543f305ad Add annotation function to denote-sort-component-prompt
   new  fcf83579a6 Fix small issues with query buffers
   new  921cb936f3 Add support for sorting query buffers
   new  8a61780089 Use denote-query--last-files instead of all files when 
sorting
   new  a9621ff851 Merge pull request #594 from lmq-10/sort-query-buffer
   new  4abffa78c3 Declare denote-query-sorting before its first use
   new  354d29db27 Make small change to the doc string of 
denote-query-sorting
   new  14259e58ca Document denote-query-sorting and 
denote-query-sort-last-search
   new  5ce665d9e4 Make stylistic change to denote-retrieve-xref-alist
   new  a6925b1edf Tweak the doc string of denote-query-sort-last-search


Summary of changes:
 README.org | 42 ++
 denote.el  | 77 +-
 2 files changed, 108 insertions(+), 11 deletions(-)

[elpa] externals/denote 8a61780089 3/9: Use denote-query--last-files instead of all files when sorting

[ELPA Syncer]

branch: externals/denote
commit 8a617800891e0a46ac75df8db415e186a02768d5
Author: Lucas Quintana 
Commit: Lucas Quintana 

Use denote-query--last-files instead of all files when sorting
---
 denote.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote.el b/denote.el
index 5035b501c9..5dd63d48a4 100644
--- a/denote.el
+++ b/denote.el
@@ -5422,7 +5422,7 @@ When called from Lisp, any argument as accepted by 
`denote-sort-files'
 is allowed."
   (interactive (list (denote-sort-component-prompt)))
   (let ((denote-query-sorting component))
-(denote-make-links-buffer denote-query--last-query nil
+(denote-make-links-buffer denote-query--last-query denote-query--last-files
   (and (eq major-mode 'denote-query-mode) 
(buffer-name))
   '(display-buffer-same-window
 

[elpa] externals/denote 921cb936f3 2/9: Add support for sorting query buffers

[ELPA Syncer]

branch: externals/denote
commit 921cb936f3d545667c2ca861a6ade9bcbc982c67
Author: Lucas Quintana 
Commit: Lucas Quintana 

Add support for sorting query buffers
---
 denote.el | 63 ---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/denote.el b/denote.el
index ab898c13b3..5035b501c9 100644
--- a/denote.el
+++ b/denote.el
@@ -2495,13 +2495,20 @@ regular expression, which means to use the text files 
in the variable
 
 If FILES is not given, use all text files as returned by
 `denote-directory-files'."
-  (let ((xref-file-name-display 'abs))
-(xref--analyze
- (xref-matches-in-files
-  query
-  (if (and files (listp files))
-  files
-(denote-directory-files files denote-query--omit-current 
:text-only))
+  (let* ((xref-file-name-display 'abs)
+ (data
+  (xref--analyze
+   (xref-matches-in-files
+query
+(if (and files (listp files))
+files
+  (denote-directory-files files denote-query--omit-current 
:text-only))
+(if (not denote-query-sorting)
+data
+  ;; Sort results
+  (let* ((files-matched (mapcar #'car data))
+ (files-sorted (denote-sort-files files-matched 
denote-query-sorting)))
+(mapcar (lambda (x) (assoc x data)) files-sorted)
 
  New note
 
@@ -5070,6 +5077,7 @@ file's title.  This has the same meaning as in 
`denote-link'."
 (define-key map "j" #'outline-next-heading)
 (define-key map "o" #'delete-other-windows)
 (define-key map "s" #'denote-grep)
+(define-key map "S" #'denote-query-sort-last-search)
 (define-key map "v" #'outline-cycle)
 (define-key map "x" #'denote-query-exclude-files)
 (define-key map "i" #'denote-query-only-include-files)
@@ -5111,6 +5119,34 @@ This is used by the commands `denote-backlinks', 
`denote-grep',
   "Integration between Denote and Xref for grep/query/backlink buffers."
   :group 'denote)
 
+(defcustom denote-query-sorting nil
+  "How to sort files in query buffers.
+
+This applies to buffers generated by `denote-grep' and query links, as
+well as backlinks.
+
+By default, no sorting is performed, so matching files are displayed as
+they are returned by the search program (which often, but not always,
+means they are sorted by file name).
+
+The user can set this variable to a non-nil value in order to sort the
+files in a custom manner.  The value is passed as the COMPONENT argument
+to the `denote-sort-files' function.  That means it can be a symbol
+among `denote-sort-components' or a function which performs the sorting.
+
+The user can also call the function `denote-query-sort-last-search' in
+order to sort file names interactively and temporarily in the query
+buffer."
+  :type '(radio
+  (const :tag "Don't sort (default)" nil)
+  (const :tag "Sort by identifier" identifier)
+  (const :tag "Sort by title" title)
+  (const :tag "Sort by keywords" keywords)
+  (const :tag "Sort by signature" signature)
+  (const :tag "Random order" random))
+  :package-version '(denote . "4.1.0")
+  :group 'denote-query)
+
 (defcustom denote-backlinks-display-buffer-action
   '((display-buffer-reuse-mode-window display-buffer-below-selected)
 (mode . denote-query-mode)
@@ -5377,6 +5413,19 @@ means of e.g. `denote-query-exclude-files')."
 '(display-buffer-same-window))
   (message "Cleared all filters"))
 
+(defun denote-query-sort-last-search (component)
+  "Sort the files matched by the last search according to COMPONENT.
+
+Interactively, prompt for COMPONENT among `denote-sort-components'.
+
+When called from Lisp, any argument as accepted by `denote-sort-files'
+is allowed."
+  (interactive (list (denote-sort-component-prompt)))
+  (let ((denote-query-sorting component))
+(denote-make-links-buffer denote-query--last-query nil
+  (and (eq major-mode 'denote-query-mode) 
(buffer-name))
+  '(display-buffer-same-window
+
 ;; Additional features for searching file contents
 
 (defvar denote-grep-history nil