[elpa] externals/m-buffer af3ff20297: Add missing doc-gen.el file

[ELPA Syncer]

branch: externals/m-buffer
commit af3ff20297a861f1280928bb292dc2432882d154
Author: Phillip Lord 
Commit: Phillip Lord 

Add missing doc-gen.el file
---
 dev/doc-gen.el | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/dev/doc-gen.el b/dev/doc-gen.el
new file mode 100644
index 00..771fa527e7
--- /dev/null
+++ b/dev/doc-gen.el
@@ -0,0 +1,10 @@
+(require 'load-relative)
+
+(require-relative "../m-buffer-macro")
+(require-relative "../m-buffer")
+(require-relative "../m-buffer-at")
+
+(require 'lentic-doc)
+
+(defun doc-gen ()
+  (lentic-doc-htmlify-package 'm-buffer))

[elpa] externals/vertico 41f8ed7d23 1/2: README: Update links

[ELPA Syncer]

branch: externals/vertico
commit 41f8ed7d23570201c1ccf5ed155b55187214f7e2
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Update links
---
 README.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index 09081cbcd4..ac9b7399eb 100644
--- a/README.org
+++ b/README.org
@@ -485,8 +485,8 @@ If you want to learn more about Vertico and minibuffer 
completion, check out the
 following resources:
 
 - 
[[https://github.com/hlissner/doom-emacs/tree/develop/modules/completion/vertico][Doom
 Emacs Vertico Module]]: Vertico is Doom's default completion system.
-- 
[[https://github.com/SystemCrafters/crafted-emacs/blob/master/modules/crafted-completion.el][Crafted
 Emacs Completion Module]]: Vertico is used as completion system.
-- 
[[https://protesilaos.com/emacs/dotemacs#h:c110e399-3f43-4555-8427-b1afe44c0779][Prot's
 Emacs configuration]]: Vertico is used as completion system.
+- 
[[https://github.com/SystemCrafters/crafted-emacs/blob/master/modules/crafted-completion.el][Crafted
 Emacs Completion Module]]: Vertico and Corfu are used for completion.
+- 
[[https://git.sr.ht/~protesilaos/dotfiles/tree/master/item/emacs/.emacs.d/][Prot's
 Emacs configuration]]: Vertico and Corfu are used for completion.
 - [[https://www.youtube.com/watch?v=fnE0lXoe7Y0][Emacs Completion Explained]] 
(2022-07-19) by Andrew Tropin.
 - [[https://www.youtube.com/watch?v=w9hHMDyF9V4][Emacs Minibuffer 
Completions]] (2022-02-12) by Greg Yut.
 - [[https://www.youtube.com/watch?v=hPwDbx--Waw][Vertico Extensions for 
Emacs]] (2022-01-08) by Karthik Chikmagalur.

[elpa] externals/vertico 5ec7887de1 2/2: README: Update link

[ELPA Syncer]

branch: externals/vertico
commit 5ec7887de134b298a65ce7fba53c2f043283bc3b
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Update link
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index ac9b7399eb..3c6043b422 100644
--- a/README.org
+++ b/README.org
@@ -484,7 +484,7 @@ There are other interactive completion UIs, which follow a 
similar philosophy:
 If you want to learn more about Vertico and minibuffer completion, check out 
the
 following resources:
 
-- 
[[https://github.com/hlissner/doom-emacs/tree/develop/modules/completion/vertico][Doom
 Emacs Vertico Module]]: Vertico is Doom's default completion system.
+- 
[[https://github.com/doomemacs/doomemacs/tree/master/modules/completion/vertico][Doom
 Emacs Vertico Module]]: Vertico is Doom's default completion system.
 - 
[[https://github.com/SystemCrafters/crafted-emacs/blob/master/modules/crafted-completion.el][Crafted
 Emacs Completion Module]]: Vertico and Corfu are used for completion.
 - 
[[https://git.sr.ht/~protesilaos/dotfiles/tree/master/item/emacs/.emacs.d/][Prot's
 Emacs configuration]]: Vertico and Corfu are used for completion.
 - [[https://www.youtube.com/watch?v=fnE0lXoe7Y0][Emacs Completion Explained]] 
(2022-07-19) by Andrew Tropin.

[elpa] externals/vertico updated (3e04a2aa2f -> 5ec7887de1)

[ELPA Syncer]

elpasync pushed a change to branch externals/vertico.

  from  3e04a2aa2f README: Add link to Prot's config
   new  41f8ed7d23 README: Update links
   new  5ec7887de1 README: Update link


Summary of changes:
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[elpa] externals/m-buffer ecdc612821: Add lentic to dev dependencies

[ELPA Syncer]

branch: externals/m-buffer
commit ecdc61282155739acd6b03233d5733e1ad57da1b
Author: Phillip Lord 
Commit: Phillip Lord 

Add lentic to dev dependencies
---
 Cask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cask b/Cask
index e864ca652d..7b797c6fc0 100644
--- a/Cask
+++ b/Cask
@@ -6,4 +6,5 @@
 
 (development
  (depends-on "htmlize")
+ (depends-on "lentic")
  (depends-on "load-relative"))

[elpa] externals/denote 5d245dfca6 1/2: Fix regexp to read non-ascii characters

[ELPA Syncer]

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

Fix regexp to read non-ascii characters

There were two simultaneous threads about this issue:

1. On the mailing list with Frank Ehmsen and Peter Prevos:
   
.

2. On the GitHub mirror with user hpgisler:
   .

This also relates to issue 57 on the GitHub mirror, with the
participation of pRotOta1p:
.

Thanks to everyone involved!
---
 denote-faces.el | 5 +++--
 denote.el   | 7 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/denote-faces.el b/denote-faces.el
index 48e3f75f9e..b58cc67610 100644
--- a/denote-faces.el
+++ b/denote-faces.el
@@ -82,10 +82,11 @@ and seconds."
   "Face for file name delimiters in Dired buffers."
   :group 'denote-faces)
 
+;; For character classes, evaluate: (info "(elisp) Char Classes")
 (defvar denote-faces--file-name-regexp
   (concat "\\(?1:[0-9]\\{8\\}\\)\\(?2:T[0-9]\\{6\\}\\)"
-  "\\(?:\\(?3:--\\)\\(?4:[0-9A-Za-z-]*\\)\\)?"
-  "\\(?:\\(?5:__\\)\\(?6:[0-9A-Za-z_-]*\\)\\)?"
+  "\\(?:\\(?3:--\\)\\(?4:[[:alnum:]-]*\\)\\)?"
+  "\\(?:\\(?5:__\\)\\(?6:[[:alnum:]_-]*\\)\\)?"
   "\\(?7:\\..*\\)?$")
   "Regexp of file names for fontification.")
 
diff --git a/denote.el b/denote.el
index 45a31c88e1..2152c695a5 100644
--- a/denote.el
+++ b/denote.el
@@ -308,16 +308,17 @@ are described in the doc string of `format-time-string'."
 
  Main variables
 
+;; For character classes, evaluate: (info "(elisp) Char Classes")
 (defconst denote--id-format "%Y%m%dT%H%M%S"
   "Format of ID prefix of a note's filename.")
 
 (defconst denote--id-regexp "\\([0-9]\\{8\\}\\)\\(T[0-9]\\{6\\}\\)"
   "Regular expression to match `denote--id-format'.")
 
-(defconst denote--title-regexp "--\\([0-9A-Za-z-]*\\)"
-  "Regular expression to match keywords.")
+(defconst denote--title-regexp "--\\([[:alnum:]-]*\\)"
+  "Regular expression to match the title field.")
 
-(defconst denote--keywords-regexp "__\\([0-9A-Za-z_-]*\\)"
+(defconst denote--keywords-regexp "__\\([[:alnum:]_-]*\\)"
   "Regular expression to match keywords.")
 
 (defconst denote--extension-regexp "\\.\\(org\\|md\\|txt\\)"

[elpa] externals/denote updated (8381abcfe5 -> d3fae65b78)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  8381abcfe5 Update docs about new front matter rewrite behaviour
   new  5d245dfca6 Fix regexp to read non-ascii characters
   new  d3fae65b78 Update the manual's Acknowledgements for 5d245df


Summary of changes:
 README.org  | 3 ++-
 denote-faces.el | 5 +++--
 denote.el   | 7 ---
 3 files changed, 9 insertions(+), 6 deletions(-)

[elpa] externals/denote d3fae65b78 2/2: Update the manual's Acknowledgements for 5d245df

[ELPA Syncer]

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

Update the manual's Acknowledgements for 5d245df
---
 README.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index a767be7820..d2e1e2907f 100644
--- a/README.org
+++ b/README.org
@@ -1975,7 +1975,8 @@ Denote is meant to be a collective effort.  Every bit of 
help matters.
 + Ideas and/or user feedback :: Abin Simon, Alan Schmitt, Alfredo
   Borrás, Benjamin Kästner, Colin McLear, Damien Cassou, Frank Ehmsen,
   Jack Baty, Kaushal Modi, M. Hadi Timachi, Peter Prevos, Shreyas
-  Ragavan, Summer Emacs, Sven Seebeck, Taoufik, Ypot, pRot0ta1p.
+  Ragavan, Summer Emacs, Sven Seebeck, Taoufik, Ypot, hpgisler,
+  pRot0ta1p.
 
 Special thanks to Peter Povinec who helped refine the file-naming
 scheme, which is the cornerstone of this project.

[elpa] externals/pyim f8a1d82e27: * pyim-page.el (pyim-page-border): Set background to gray.

[ELPA Syncer]

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

* pyim-page.el (pyim-page-border): Set background to gray.
---
 pyim-page.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim-page.el b/pyim-page.el
index 3f46cb3d29..e9ac5c73f1 100644
--- a/pyim-page.el
+++ b/pyim-page.el
@@ -110,7 +110,7 @@ page style."
   "Face used for the pyim page.")
 
 (defface pyim-page-border
-  '((t (:inherit pyim-page)))
+  '((t (:inherit pyim-page :background "gray")))
   "Face used for the pyim page border.
 Only useful when use posframe.")
 

[elpa] externals-release/org a0a078049b 3/4: Fix compiler warnings

[ELPA Syncer]

branch: externals-release/org
commit a0a078049b8c097b61187ccca445ee3cfb187100
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Fix compiler warnings

* lisp/oc-basic.el (org-open-file): Declare function.
---
 lisp/oc-basic.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 9ed1b810fa..8c76e200e4 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -73,6 +73,7 @@
 (require 'seq)
 
 (declare-function org-open-at-point "org" (&optional arg))
+(declare-function org-open-file "org" (path &optional in-emacs line search))
 
 (declare-function org-element-interpret-data "org-element" (data))
 (declare-function org-element-property "org-element" (property element))

[elpa] externals-release/org 1c3a46268f 4/4: Backport from main: Fix compatibility with Emacs 26

[ELPA Syncer]

branch: externals-release/org
commit 1c3a46268f29bcfa35824c6e68607f6feed99023
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Backport from main: Fix compatibility with Emacs 26

* lisp/org-compat.el (org-replace-buffer-contents): Add compatibility
function for `replace-buffer-contents'.

* lisp/org-src.el (org-edit-src-save, org-edit-src-exit): Use
`org-replace-buffer-contents'.
---
 lisp/org-compat.el | 5 +
 lisp/org-src.el| 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index c26eb6f10a..da544a567d 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -113,6 +113,11 @@ the symbol of the calling function, for example."
 
 ;;; Emacs < 27.1 compatibility
 
+(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))
+
 (unless (fboundp 'proper-list-p)
   ;; `proper-list-p' was added in Emacs 27.1.  The function below is
   ;; taken from Emacs subr.el 200195e824b^.
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 54f901252f..89d0c28a43 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1235,7 +1235,7 @@ Throw an error if there is no such buffer."
   (insert (with-current-buffer write-back-buf 
(buffer-string
  (save-restriction
(narrow-to-region beg end)
-   (replace-buffer-contents write-back-buf 0.1 nil)
+   (org-replace-buffer-contents write-back-buf 0.1 nil)
(goto-char (point-max
(when (and expecting-bol (not (bolp))) (insert "\n")))
   (kill-buffer write-back-buf)
@@ -1283,7 +1283,7 @@ Throw an error if there is no such buffer."
   (buffer-string
   (save-restriction
 (narrow-to-region beg end)
-(replace-buffer-contents write-back-buf 0.1 nil)
+(org-replace-buffer-contents write-back-buf 0.1 nil)
 (goto-char (point-max
 (when (and expecting-bol (not (bolp))) (insert "\n")
 (when write-back-buf (kill-buffer write-back-buf))

[elpa] externals/org 22de2e26e7 2/2: Fix Emacs 26 compatibility

[ELPA Syncer]

branch: externals/org
commit 22de2e26e791163bccc87ceb9692fbffbb407b4c
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Fix Emacs 26 compatibility

* lisp/oc-biblatex.el (org-cite-biblatex-export-citation): Do not use
`seq-first'.
* lisp/org-persist.el (org-persist-collection-let): Suppress warnings.
* lisp/ox-latex.el (org-latex-src--engrave-mathescape-p): Do not use
`if-let'.
(org-latex-src--engrave-code): Do not use `string-trim-right'.
* lisp/ox.el (org-export-link-localise): Add require for subr-x for
`thread-first'.
---
 lisp/oc-biblatex.el |  2 +-
 lisp/org-persist.el |  5 ++---
 lisp/ox-latex.el| 10 +-
 lisp/ox.el  |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index 0031ec48b8..6221286eb4 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -363,7 +363,7 @@ INFO is the export state, as a property list."
   (_ nil
 (apply
  #'org-cite-biblatex--command citation info
- (pcase (seq-first candidates)
+ (pcase (seq-elt candidates 0) ;; `seq-first' is not available in Emacs 26.
(`(,_ ,_ . ,command-parameters) command-parameters)
('nil
 (user-error
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index a30c75f38e..ee28fc51d5 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -358,15 +358,14 @@ FORMAT and ARGS are passed to `message'."
   "Bind container and associated from COLLECTION and execute BODY."
   (declare (debug (form body)) (indent 1))
   `(with-no-warnings
- ;; FIXME: We only need to suppress warnings about unused
- ;; let-bindings.  However, it is unclear how to achieve it with
- ;; `with-suppressed-warnings'.
  (let* ((container (plist-get ,collection :container))
 (associated (plist-get ,collection :associated))
 (path (plist-get associated :file))
 (inode (plist-get associated :inode))
 (hash (plist-get associated :hash))
 (key (plist-get associated :key)))
+   ;; Suppress "unused variable" warnings.
+   (ignore container associated path inode hash key)
,@body)))
 
 (defun org-persist--find-index (collection)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 6cd7514090..0d1d05f748 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -3420,10 +3420,10 @@ and FLOAT are extracted from SRC-BLOCK and INFO in 
`org-latex-src-block'."
  (equal '("false") (cdr opt)))
  'no)
 opts
-(if-let ((mathescape (or (funcall mathescape-status default-options)
- (funcall mathescape-status options
-(when (eq mathescape 'yes)
-  (or engrave-faces-latex-mathescape t)
+(let ((mathescape (or (funcall mathescape-status default-options)
+  (funcall mathescape-status options
+  (when (eq mathescape 'yes)
+(or engrave-faces-latex-mathescape t)
 
 (defun org-latex-src--engrave-code (content lang &optional theme options 
inline)
   "Engrave CONTENT to LaTeX in a LANG-mode buffer, and give the result.
@@ -3443,7 +3443,7 @@ to the Verbatim environment or Verb command."
 engrave-faces-current-preset-style))
  (engraved-buffer
   (with-temp-buffer
-(insert (string-trim-right content "\n"))
+(insert (replace-regexp-in-string "\n\\'" "" content))
 (when lang-mode
   (if (functionp lang-mode)
   (funcall lang-mode)
diff --git a/lisp/ox.el b/lisp/ox.el
index 03af47001f..8223940fb6 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -4520,6 +4520,7 @@ Return value can be an object or an element:
 (org-persist-register location-type path
   :write-immediately t
 
+(require 'subr-x) ;; FIXME: For `thread-first' in Emacs 26.
 (defun org-export-link-localise (link)
   "Convert remote LINK to local link.
 If LINK refers to a remote resource, modify it to point to a local

[elpa] externals-release/org 01b0fb14bc 2/4: Backport from main: Escape single left quotes in docstrings

[ELPA Syncer]

branch: externals-release/org
commit 01b0fb14bc9f4e5e253f09f85df2f932c1b96bcf
Author: Robert Pluim 
Commit: Ihor Radchenko 

Backport from main: Escape single left quotes in docstrings

* lisp/ob-core.el (org-babel-default-header-args):
* lisp/ob-julia.el (org-babel-julia-evaluate-external-process):
(org-babel-julia-evaluate-session):
* lisp/ob-lua.el (org-babel-lua-read-string):
* lisp/ob-table.el (org-sbe):
* lisp/oc-basic.el (org-cite-basic--shorten-names):
* lisp/org-agenda.el (org-agenda-sorting-strategy):
(org-agenda--mark-blocked-entry):
(org-agenda-set-restriction-lock):
* lisp/org-fold-core.el (org-fold-core--specs):
(org-fold-core-remove-folding-spec):
(org-fold-core-get-folding-spec):
(org-fold-core--isearch-overlays):
* lisp/org-plot.el (org--plot/prime-factors):
* lisp/org-table.el (org-table-collapse-header):
* lisp/org.el (org-special-ctrl-o):
(org-latex-to-html-convert-command):
* lisp/ox-html.el (org-html--unlabel-latex-environment):
* lisp/ox-publish.el (org-publish-find-property):
Use \\=' when there's a need for a single left quote in a docstring.

The emacs-29 byte compiler complains about such usage.
---
 lisp/ob-core.el| 2 +-
 lisp/ob-julia.el   | 8 
 lisp/ob-lua.el | 2 +-
 lisp/ob-table.el   | 2 +-
 lisp/org-agenda.el | 6 +++---
 lisp/org-plot.el   | 2 +-
 lisp/org-table.el  | 2 +-
 lisp/org.el| 4 ++--
 lisp/ox-html.el| 2 +-
 lisp/ox-publish.el | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 23ef162a7f..37155d4c58 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -480,7 +480,7 @@ value.  The value can either be a string or a closure that
 evaluates to a string.  The closure is evaluated when the source
 block is being evaluated (e.g. during execution or export), with
 point at the source block.  It is not possible to use an
-arbitrary function symbol (e.g. 'some-func), since org uses
+arbitrary function symbol (e.g. \\='some-func), since org uses
 lexical binding.  To achieve the same functionality, call the
 function within a closure (e.g. (lambda () (some-func))).
 
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index abddca3613..be0110f48a 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -250,8 +250,8 @@ end")
 (defun org-babel-julia-evaluate-external-process
 (body result-type result-params column-names-p)
   "Evaluate BODY in external julia process.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals \\='output then return standard output as a
+string.  If RESULT-TYPE equals \\='value then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
@@ -274,8 +274,8 @@ last statement in BODY, as elisp."
 (defun org-babel-julia-evaluate-session
 (session body result-type result-params column-names-p)
   "Evaluate BODY in SESSION.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals \\='output then return standard output as a
+string.  If RESULT-TYPE equals \\='value then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 48de0dbad0..c8c28498e8 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -395,7 +395,7 @@ fd:close()"
 (org-babel-lua-table-or-string results)
 
 (defun org-babel-lua-read-string (string)
-  "Strip 's from around Lua string."
+  "Strip single quotes from around Lua string."
   (org-unbracket-string "'" "'" string))
 
 (provide 'ob-lua)
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 2f092998d8..0f6d41c5e1 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -84,7 +84,7 @@ is the equivalent of the following source code block:
  #+end_src
 
 NOTE: The quotation marks around the function name,
-'source-block', are optional.
+\\='source-block\\=', are optional.
 
 NOTE: By default, string variable names are interpreted as
 references to source-code blocks, to force interpretation of a
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 71aac271f7..4831c66b00 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1615,7 +1615,7 @@ alpha-down Sort headlines alphabetically, 
reversed.
 
 The different possibilities will be tried in sequence, and testing stops
 if one comparison returns a \"not-equal\".  For example, the default
-'(time-up category-keep priority-down)
+\\='(time-up category-keep priority-down)
 means: Pull out all entries having a specified time of day and sort them,
 in order to make a time schedule for the current day the first thing in the
 agenda listing for the day.  Of the entries without a time indication, keep
@@ -4124,7 +4124,7 @@ dimming them."   

[elpa] externals-release/org afe50b7132 1/4: Fix Emacs 26 compatibility

[ELPA Syncer]

branch: externals-release/org
commit afe50b7132cb9e5d5e3209ee91be0683963b072d
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Fix Emacs 26 compatibility

* lisp/org-plot.el (org-plot/gnuplot): Do not use `if-let'.
* lisp/ox-ascii.el (org-ascii--describe-links):
* lisp/ox-md.el (org-md--headline-referred-p): Do not use
`ignore-error'.
* testing/org-test.el (org-test-at-time): Fallback to older definition
of `decode-time' when it cannot accept 3 arguments.
---
 lisp/org-plot.el| 7 ---
 lisp/ox-ascii.el| 7 ---
 lisp/ox-md.el   | 5 +++--
 testing/org-test.el | 9 +++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index bf84c99e04..4183b2af65 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -682,9 +682,10 @@ line directly before or after the table."
  (looking-at "[[:space:]]*#\\+"))
(setf params (org-plot/collect-options params
   ;; Dump table to datafile
-  (if-let ((dump-func (plist-get type :data-dump)))
- (funcall dump-func table data-file num-cols params)
-   (org-plot/gnuplot-to-data table data-file params))
+  (let ((dump-func (plist-get type :data-dump)))
+(if dump-func
+   (funcall dump-func table data-file num-cols params)
+ (org-plot/gnuplot-to-data table data-file params)))
   ;; Check type of ind column (timestamp? text?)
   (when (plist-get params :check-ind-type)
(let* ((ind (1- (plist-get params :ind)))
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 88a75a8156..76a1a71fab 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -950,9 +950,10 @@ channel."
   (org-export-resolve-fuzzy-link link info)
  ;; Ignore broken links.  On broken link,
  ;; `org-export-resolve-id-link' will throw an
- ;; error and `ignore-error' will return nil.
-(ignore-error 'org-link-broken
-   (org-export-resolve-id-link link info)
+ ;; error and we will return nil.
+(condition-case nil
+ (org-export-resolve-id-link link info)
+   (org-link-broken nil)
  (when dest
   (concat
(org-ascii--fill-string
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 91b7ee6571..3551e4184e 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -195,8 +195,9 @@ of contents can refer to headlines."
(lambda (link)
 (equal headline
 ;; Ignore broken links.
-(ignore-error 'org-link-broken
-  (org-export-resolve-link link info
+(condition-case nil
+(org-export-resolve-id-link link info)
+  (org-link-broken nil
info t
 
 (defun org-md--headline-title (style level title &optional anchor tags)
diff --git a/testing/org-test.el b/testing/org-test.el
index 3565dd0cf8..161b2f49ce 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -470,8 +470,13 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
   (apply ,(symbol-function 'current-time-zone)
  (or time ,at) args)))
((symbol-function 'decode-time)
-(lambda (&optional time zone form) (funcall ,(symbol-function 
'decode-time)
-   (or time ,at) zone form)))
+(lambda (&optional time zone form)
+   (condition-case nil
+   (funcall ,(symbol-function 'decode-time)
+   (or time ,at) zone form)
+ (wrong-number-of-arguments
+  (funcall ,(symbol-function 'decode-time)
+  (or time ,at))
((symbol-function 'encode-time)
 (lambda (time &rest args)
   (apply ,(symbol-function 'encode-time) (or time ,at) args)))

[elpa] externals/org updated (127e7fee49 -> 22de2e26e7)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  127e7fee49 ox-latex: Keep obsolete variable values removed in 
97cfb959d
   new  afe50b7132 Fix Emacs 26 compatibility
   new  01b0fb14bc Backport from main: Escape single left quotes in 
docstrings
   new  a0a078049b Fix compiler warnings
   new  1c3a46268f Backport from main: Fix compatibility with Emacs 26
   new  d8133e80d8 Merge branch 'bugfix'
   new  22de2e26e7 Fix Emacs 26 compatibility


Summary of changes:
 lisp/oc-basic.el|  1 +
 lisp/oc-biblatex.el |  2 +-
 lisp/org-persist.el |  5 ++---
 lisp/ox-ascii.el|  7 ---
 lisp/ox-latex.el| 10 +-
 lisp/ox-md.el   |  5 +++--
 lisp/ox.el  |  1 +
 testing/org-test.el | 10 +-
 8 files changed, 22 insertions(+), 19 deletions(-)

[elpa] externals/org d8133e80d8 1/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit d8133e80d8672ad6e636a6e2c12b9ffe1cd11df7
Merge: 127e7fee49 1c3a46268f
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Merge branch 'bugfix'
---
 lisp/oc-basic.el|  1 +
 lisp/ox-ascii.el|  7 ---
 lisp/ox-md.el   |  5 +++--
 testing/org-test.el | 10 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 1dd433cdef..25bbe3784b 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -73,6 +73,7 @@
 (require 'seq)
 
 (declare-function org-open-at-point "org" (&optional arg))
+(declare-function org-open-file "org" (path &optional in-emacs line search))
 
 (declare-function org-element-interpret-data "org-element" (data))
 (declare-function org-element-property "org-element" (property element))
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 3c39225a3c..cfc2bc5fd4 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -953,9 +953,10 @@ channel."
   (org-export-resolve-fuzzy-link link info)
  ;; Ignore broken links.  On broken link,
  ;; `org-export-resolve-id-link' will throw an
- ;; error and `ignore-error' will return nil.
-(ignore-error 'org-link-broken
-   (org-export-resolve-id-link link info)
+ ;; error and we will return nil.
+(condition-case nil
+ (org-export-resolve-id-link link info)
+   (org-link-broken nil)
  (when dest
   (concat
(org-ascii--fill-string
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index c268aa5ddd..50db53910a 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -195,8 +195,9 @@ of contents can refer to headlines."
(lambda (link)
 (equal headline
 ;; Ignore broken links.
-(ignore-error 'org-link-broken
-  (org-export-resolve-link link info
+(condition-case nil
+(org-export-resolve-id-link link info)
+  (org-link-broken nil
info t
 
 (defun org-md--headline-title (style level title &optional anchor tags)
diff --git a/testing/org-test.el b/testing/org-test.el
index d19c7f0447..0520e82f9e 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -471,12 +471,12 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
  (or time ,at) args)))
((symbol-function 'decode-time)
 (lambda (&optional time zone form)
-   (condition-case err
+   (condition-case nil
(funcall ,(symbol-function 'decode-time)
(or time ,at) zone form)
- ;; Fallback for Emacs <27.1.
- (error (funcall ,(symbol-function 'decode-time)
-(or time ,at) zone)
+ (wrong-number-of-arguments
+  (funcall ,(symbol-function 'decode-time)
+  (or time ,at))
((symbol-function 'encode-time)
 (lambda (time &rest args)
   (apply ,(symbol-function 'encode-time) (or time ,at) args)))
@@ -492,7 +492,7 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
   (funcall ,(symbol-function 'set-file-times) file (or time ,at
((symbol-function 'time-add)
 (lambda (a b) (funcall ,(symbol-function 'time-add)
-   (or a ,at) (or b ,at
+  (or a ,at) (or b ,at
((symbol-function 'time-equal-p)
 (lambda (a b) (funcall ,(symbol-function 'time-equal-p)
(or a ,at) (or b ,at

[elpa] externals-release/org updated (e5cf0bc840 -> 1c3a46268f)

[ELPA Syncer]

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

  from  e5cf0bc840 org-export: Do not use broken link handler on non-link 
elements
   new  afe50b7132 Fix Emacs 26 compatibility
   new  01b0fb14bc Backport from main: Escape single left quotes in 
docstrings
   new  a0a078049b Fix compiler warnings
   new  1c3a46268f Backport from main: Fix compatibility with Emacs 26


Summary of changes:
 lisp/ob-core.el | 2 +-
 lisp/ob-julia.el| 8 
 lisp/ob-lua.el  | 2 +-
 lisp/ob-table.el| 2 +-
 lisp/oc-basic.el| 1 +
 lisp/org-agenda.el  | 6 +++---
 lisp/org-compat.el  | 5 +
 lisp/org-plot.el| 9 +
 lisp/org-src.el | 4 ++--
 lisp/org-table.el   | 2 +-
 lisp/org.el | 4 ++--
 lisp/ox-ascii.el| 7 ---
 lisp/ox-html.el | 2 +-
 lisp/ox-md.el   | 5 +++--
 lisp/ox-publish.el  | 2 +-
 testing/org-test.el | 9 +++--
 16 files changed, 42 insertions(+), 28 deletions(-)

[elpa] externals/denote 61e672f492: Replace needless 'when-let*' with 'when-let'

[ELPA Syncer]

branch: externals/denote
commit 61e672f4922b017b4347b8268ec0f0874c9fecb5
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Replace needless 'when-let*' with 'when-let'

This should address the bug reported by hpgisler in issue 62 on the
GitHub mirror: .
---
 denote-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index fde25df671..d990169ee4 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -214,7 +214,7 @@ old name followed by the new one.  This applies to the 
command
 
 (defun denote-dired--rename-buffer (old-name new-name)
   "Rename OLD-NAME buffer to NEW-NAME, when appropriate."
-  (when-let* ((buffer (find-buffer-visiting old-name)))
+  (when-let ((buffer (find-buffer-visiting old-name)))
 (with-current-buffer buffer
   (set-visited-file-name new-name nil t
 

[elpa] externals/org 6de5431acc: org: Refactor rx to concat + regexp-opt

[ELPA Syncer]

branch: externals/org
commit 6de5431acc8b77548e89c61a6ae0ebc1b57540bb
Author: TEC 
Commit: TEC 

org: Refactor rx to concat + regexp-opt

* lisp/org.el (org--confirm-resource-safe): Since Emacs 26 doesn't
support rx's (literal S) construct, use (concat (regexp-opt ...) ...)
instead.
---
 lisp/org.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index f861cefdf2..61a21115f5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4587,11 +4587,11 @@ returns non-nil if any of them match."
   (when (memq char '(?! ?f))
 (customize-push-and-save
  'org-safe-remote-resources
- (list (rx string-start
-   (literal
-(if (and (= char ?f) current-file)
-(concat "file://" current-file) uri))
-   string-end
+ (list (concat "\\`"
+   (regexp-opt
+(if (and (= char ?f) current-file)
+(concat "file://" current-file) uri))
+   "\\'"
   (prog1 (memq char '(?! ?\s ?y ?f))
 (quit-window t)))
 

[elpa] externals/denote 5ab937f1da: Require 'subr-x' at compile time

[ELPA Syncer]

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

Require 'subr-x' at compile time

This is to be sure that Emacs 28 evaluates 'when-let*'.  Otherwise we
will end up with errors such as the one reported by hpgisler in issue 62
on the GitHub mirror: .
---
 denote.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/denote.el b/denote.el
index 2152c695a5..00e264b6a8 100644
--- a/denote.el
+++ b/denote.el
@@ -96,7 +96,9 @@
 ;;; Code:
 
 (require 'seq)
-(eval-when-compile (require 'cl-lib))
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'subr-x))
 
 (defgroup denote ()
   "Simple notes with an efficient file-naming scheme."

[elpa] externals/denote 71b2216912: Use seq instead of cl-lib

[ELPA Syncer]

branch: externals/denote
commit 71b221691200e981167ecc277ec1e5f186713684
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Use seq instead of cl-lib

We are already 'require'ing seq, so we might as well use it in the few
cases where we now call functionality from cl-lib.

Thanks to Philip Kaludercic for pointing this out on the emacs-devel
mailing list: 
.
---
 README.org |  2 +-
 denote.el  | 16 +---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.org b/README.org
index d2e1e2907f..2932dd8009 100644
--- a/README.org
+++ b/README.org
@@ -1970,7 +1970,7 @@ Denote is meant to be a collective effort.  Every bit of 
help matters.
 
 + Contributions to code or the manual :: Benjamin Kästner, Damien
   Cassou, Jack Baty, Jean-Philippe Gagné Guay, Kaushal Modi, Kyle Meyer,
-  Stefan Monnier.
+  Philip Kaludercic, Stefan Monnier.
 
 + Ideas and/or user feedback :: Abin Simon, Alan Schmitt, Alfredo
   Borrás, Benjamin Kästner, Colin McLear, Damien Cassou, Frank Ehmsen,
diff --git a/denote.el b/denote.el
index 00e264b6a8..1d3ef229bd 100644
--- a/denote.el
+++ b/denote.el
@@ -96,9 +96,7 @@
 ;;; Code:
 
 (require 'seq)
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'subr-x))
+(eval-when-compile (require 'subr-x))
 
 (defgroup denote ()
   "Simple notes with an efficient file-naming scheme."
@@ -448,11 +446,9 @@ names that are relative to the variable 
`denote-directory'."
(lambda (s) (denote--file-name-relative-to-denote-directory s))
files
 
-(declare-function cl-find-if "cl-seq" (cl-pred cl-list &rest cl-keys))
-
 (defun denote--get-note-path-by-id (id)
   "Return the absolute path of ID note in variable `denote-directory'."
-  (cl-find-if
+  (seq-find
(lambda (f)
  (string-prefix-p id (file-name-nondirectory f)))
(denote--directory-files :absolute)))
@@ -864,8 +860,6 @@ where the former does not read dates without a time 
component."
  (buffer-file-name buf))
(buffer-list))
 
-(declare-function cl-some "cl-extra" (cl-pred cl-seq &rest cl-rest))
-
 ;; This should only be relevant for `denote-date', otherwise the
 ;; identifier is always unique (we trust that no-one writes multiple
 ;; notes within fractions of a second).
@@ -873,9 +867,9 @@ where the former does not read dates without a time 
component."
   "Return non-nil if IDENTIFIER already exists."
   (let ((current-buffer-name (when (buffer-file-name)
(file-name-nondirectory (buffer-file-name)
-(or (cl-some (lambda (file)
-   (string-match-p (concat "\\`" identifier) file))
- (delete current-buffer-name (denote--buffer-file-names)))
+(or (seq-some (lambda (file)
+(string-match-p (concat "\\`" identifier) file))
+  (delete current-buffer-name (denote--buffer-file-names)))
 (delete current-buffer-name
 (denote--directory-files-matching-regexp
  (concat "\\`" identifier))

[elpa] externals/org 540fcd0193: ox-publish: fix typo in function name

[ELPA Syncer]

branch: externals/org
commit 540fcd01939ee5513aa6e2f9988224a6037fcc33
Author: Paul Eggert 
Commit: Paul Eggert 

ox-publish: fix typo in function name

* lisp/org-compat.el (org-publish-cache-ctime-of-src):
New backward-compatibility alias.
* lisp/ox-publish.el (org-publish-cache-mtime-of-src):
Rename from org-publish-cache-ctime-of-src, since it
has always cached mtime not ctime.  All uses changed.
---
 lisp/org-compat.el |  3 +++
 lisp/ox-publish.el | 20 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 4a2b1c1e6c..823f64a20a 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -876,6 +876,9 @@ context.  See the individual commands for more information."
 
 (define-obsolete-function-alias 'org-get-last-sibling 
'org-get-previous-sibling "9.4")
 
+(define-obsolete-function-alias 'org-publish-cache-ctime-of-src
+  'org-publish-cache-mtime-of-src "9.6")
+
 (define-obsolete-function-alias 'org-truely-invisible-p
   'org-truly-invisible-p "9.6"
   "Compatibility alias for legacy misspelling of `org-truly-invisible-p'.")
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 3283f4b036..9018ce7dde 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -382,7 +382,7 @@ still decide about that independently."
   "Update publishing timestamp for file FILENAME.
 If there is no timestamp, create one."
   (let ((key (org-publish-timestamp-filename filename pub-dir pub-func))
-   (stamp (org-publish-cache-ctime-of-src filename)))
+   (stamp (org-publish-cache-mtime-of-src filename)))
 (org-publish-cache-set key stamp)))
 
 (defun org-publish-remove-all-timestamps ()
@@ -1292,7 +1292,7 @@ the file including them will be republished as well."
   (let* ((key (org-publish-timestamp-filename filename pub-dir pub-func))
 (pstamp (org-publish-cache-get key))
 (org-inhibit-startup t)
-included-files-ctime)
+included-files-mtime)
 (when (equal (file-name-extension filename) "org")
   (let ((case-fold-search t))
(with-temp-buffer
@@ -1313,14 +1313,14 @@ the file including them will be republished as well."
 (substring m 0 (match-beginning 0))
   m)
(when include-filename
- (push (org-publish-cache-ctime-of-src
+ (push (org-publish-cache-mtime-of-src
 (expand-file-name include-filename 
(file-name-directory filename)))
-   included-files-ctime))
+   included-files-mtime))
 (or (null pstamp)
-   (let ((ctime (org-publish-cache-ctime-of-src filename)))
- (or (time-less-p pstamp ctime)
- (cl-some (lambda (ct) (time-less-p ctime ct))
-  included-files-ctime))
+   (let ((mtime (org-publish-cache-mtime-of-src filename)))
+ (or (time-less-p pstamp mtime)
+ (cl-some (lambda (ct) (time-less-p mtime ct))
+  included-files-mtime))
 
 (defun org-publish-cache-set-file-property
 (filename property value &optional project-name)
@@ -1365,8 +1365,8 @@ does not exist."
 (error "`org-publish-cache-set' called, but no cache present"))
   (puthash key value org-publish-cache))
 
-(defun org-publish-cache-ctime-of-src (file)
-  "Get the ctime of FILE as an integer."
+(defun org-publish-cache-mtime-of-src (file)
+  "Get the mtime of FILE as an integer."
   (let ((attr (file-attributes
   (expand-file-name (or (file-symlink-p file) file)
 (file-name-directory file)

[elpa] externals/tempel b4bb7030e9: README: Fix typo (#62)

[ELPA Syncer]

branch: externals/tempel
commit b4bb7030e9fa4a9451b79dfb2e815e0dd796527d
Author: jgart <47760695+jga...@users.noreply.github.com>
Commit: GitHub 

README: Fix typo (#62)
---
 README.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index d1aaac1f98..7870539305 100644
--- a/README.org
+++ b/README.org
@@ -226,7 +226,7 @@ document the important ones here:
 - ~%~ Insert newline if there is only whitespace between point and line end.
 - ~o~ Like ~%~ but leaves the point before newline.
 - ~(s NAME)~ Inserts a named field.
-- ~(p PROMPT  )~ Insert an optionally named field with a prompt.
+- ~(p PROMPT  )~ Insert an optionally named field with a 
prompt.
   The ~PROMPT~ is displayed directly in the buffer as default value. If 
~NOINSERT~
   is non-nil, no field is inserted. Then the minibuffer is used for prompting
   and the value is bound to ~NAME~.
@@ -235,7 +235,7 @@ document the important ones here:
 
 Furthermore Tempel supports syntax extensions:
 
-- ~(p FORM  )~ Like ~p~ described above, but ~FORM~ is evaluated.
+- ~(p FORM  )~ Like ~p~ described above, but ~FORM~ is 
evaluated.
 - ~(FORM ...)~ Other Lisp forms are evaluated. Named fields are lexically 
bound.
 - ~q~ Quits the containing template when jumped to.
 

[elpa] main be84e69edf: Tweak comments

[Stefan Monnier via]

branch: main
commit be84e69edf28ad33a1b7fd39ceff90e60a515656
Author: Stefan Monnier 
Commit: Stefan Monnier 

Tweak comments
---
 elpa-packages | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index d1273cfcb4..e44137ac50 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -69,11 +69,12 @@
  ("auto-correct"   :url nil)
  ;; FIXME: Avy diverged https://github.com/abo-abo/avy/issues/344
  ("avy":url "https://github.com/abo-abo/avy";)
- ;; The BBDB branch in elpa.git is managed directly by hand, with
- ;; a "parallel" history to that of the upstream.
  ("bbdb"   :url "git://git.savannah.nongnu.org/bbdb.git"
   :lisp-dir "lisp"
-  :doc "doc/bbdb.texi")
+  :doc "doc/bbdb.texi"
+  ;; The BBDB branch in elpa.git is managed directly by hand, with
+  ;; a "parallel" history to that of the upstream.
+  :auto-sync nil)
  ("beacon" :url "https://github.com/Malabarba/beacon";
   :auto-sync t)
  ("blist"  :url "https://gitlab.com/mmemmew/blist";
@@ -507,6 +508,9 @@
  ("org-real"   :url "https://gitlab.com/tygrdev/org-real";
   :auto-sync t
   :ignored-files ("LICENSE"))
+ ;; FIXME: Waiting for confirmation from the maintainer.
+ ;; ("org-notify"  :url "https://github.com/p-m/org-notify";
+ ;;  :auto-sync t)
  ("org-remark" :url "https://github.com/nobiot/org-remark";
   :readme "README.org"
   :doc "docs/org-remark.org"
@@ -608,6 +612,9 @@
   :auto-sync t)
  ("repology"   :url nil)
  ("rich-minority"  :url "https://github.com/Malabarba/rich-minority";)
+ ;; FIXME: Missing some paperwork, maybe we should add it to NonGNU.
+ ;; ("rmsbolt" :url "https://gitlab.com/jgkamat/rmsbolt";
+ ;;  :auto-sync t)
  ("rnc-mode"   :url nil)
  ("rt-liberation"  :url "https://git.savannah.nongnu.org/git/rtliber";
   :auto-sync t)

[elpa] main 1492282ca4: Sort with `elpaa--sort-packages`.

[Stefan Monnier via]

branch: main
commit 1492282ca451d86802b31c018327ff5388c2e71f
Author: Stefan Monnier 
Commit: Stefan Monnier 

Sort with `elpaa--sort-packages`.
---
 elpa-packages | 48 
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index e44137ac50..208e947b8c 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -43,30 +43,30 @@
   :release-branch "ada-mode.release")
  ("ada-ref-man":url nil)
  ("adaptive-wrap"  :url nil)
- ("aircon-theme":url "https://git.sr.ht/~chambln/aircon-theme.el";
-  :ignored-files ("README" "COPYING")
-  :readme ignore
-  :auto-sync t)
  ("adjust-parens"  :url nil)
  ("advice-patch"   :url nil)
  ("aggressive-completion" :url nil)
  ("aggressive-indent"  :url 
"https://github.com/Malabarba/aggressive-indent-mode";)
  ("ahungry-theme"  :url "https://github.com/ahungry/color-theme-ahungry";)
+ ("aircon-theme":url "https://git.sr.ht/~chambln/aircon-theme.el";
+  :ignored-files ("README" "COPYING")
+  :readme ignore
+  :auto-sync t)
  ("all":url nil)
  ("ampc"   :url nil)
  ("arbitools"  :url nil)
  ("ascii-art-to-unicode" :url nil)
- ("async"  :url "https://github.com/jwiegley/emacs-async";
-  :auto-sync t)
  ("assess" :url "https://github.com/phillord/assess";
   :doc "assess-doc.org"
   :auto-sync t)
+ ("async"  :url "https://github.com/jwiegley/emacs-async";
+  :auto-sync t)
  ;; AUCTeX is currently sync'd manually and elpa.git isn't quite a mirror :-(
  ("auctex" :url "git://git.sv.gnu.org/auctex.git")
  ("aumix-mode" :url nil)
+ ("auto-correct"   :url nil)
  ("auto-overlays"  :url "http://www.dr-qubit.org/git/predictive.git";
   :doc "docs/auto-overlay-manual.texinfo")
- ("auto-correct"   :url nil)
  ;; FIXME: Avy diverged https://github.com/abo-abo/avy/issues/344
  ("avy":url "https://github.com/abo-abo/avy";)
  ("bbdb"   :url "git://git.savannah.nongnu.org/bbdb.git"
@@ -128,12 +128,12 @@
  ("code-cells" :url "https://github.com/astoff/code-cells.el";
   :ignored-files ("LICENSE")
   :auto-sync t)
+ ("comint-mime":url "https://github.com/astoff/comint-mime";
+  :auto-sync t)
  ;; FIXME: The upstream has incompatible copyrights, so we moved it to NonGNU.
  ;; ("coffee-mode" :url "https://github.com/defunkt/coffee-mode";)
  ("compact-docstrings"  :url 
"https://github.com/cpitclaudel/compact-docstrings";
   :auto-sync t)
- ("comint-mime":url "https://github.com/astoff/comint-mime";
-  :auto-sync t)
  ("company"
   :url "https://github.com/company-mode/company-mode.git";
   :shell-command "cp -R doc/images ."
@@ -166,9 +166,9 @@
  ("cpio-mode"  :url "https://github.com/dlewan/cpio-mode";)
  ("cpupower"   :url "https://gitlab.com/steve-emacs-stuff/cpupower-el";
   :auto-sync t)
- ("crisp"  :url nil)
  ("crdt"   :url "https://code.librehq.com/qhong/crdt.el";
   :auto-sync t)
+ ("crisp"  :url nil)
  ;; ("crossword"   :url 
"https://github.com/Boruch-Baum/emacs-crossword";)
  ("csharp-mode":url 
"https://github.com/emacs-csharp/csharp-mode";
   :readme "README.org"
@@ -204,10 +204,10 @@
  ("devdocs":url "https://github.com/astoff/devdocs.el";
   :auto-sync t)
  ("dict-tree"  :url "http://www.dr-qubit.org/git/predictive.git";)
- ("diffview":url "https://github.com/mgalgs/diffview-mode.git";)
  ("diff-hl"
   :url "https://github.com/dgutov/diff-hl.git";
   :auto-sync t)
+ ("diffview":url "https://github.com/mgalgs/diffview-mode.git";)
  ("diminish":url "https://github.com/myrjola/diminish.el.git";
   :ignored-files ("LICENSE")
   :auto-sync t)
@@ -459,8 +459,8 @@
"doc/misc/modus-themes.org"
"doc/misc/doclicense.texi")
   :doc "modus-themes.org")
- ("multishell" :url "https://github.com/kenmanheimer/EmacsMultishell";)
  ("multi-mode" :url nil)
+ ("multishell" :url "https://github.com/kenmanheimer/EmacsMultishell";)
  ("muse"   :url "https://github.com/alexott/muse";) ;FIXME: Not 
nearly in-sync
  ("myers"  :url nil)
  ("nadvice":url nil)
@@ -496,6 +496,7 @@
   :shell-command "make autoloads info; mv doc/org.info org.info; mv 
doc/orgguide.info orgguide.info"
   :doc ("org.info" "orgguide.info")
   :auto-sync t)
+ ("org-edna"   :url "bzr::https://bzr.savannah.gnu.org/r/org-edna-el";) 
;URL?
  ;; FIXME: Waiting for copyright paperwork from Michael Strey 

  ;;("org-contacts" :url "https://github.com/stardiviner/org-contacts.el";
  ;; :auto-sync t)
@@ -522,15 +523,14 @@
   :auto-sync t)
  ("org-translate"  :url nil)
  ("orgalist":url nil)
- ("org-edna"   :url "bzr::https://bzr.

[nongnu] main baad781689: Sort with `elpaa--sort-packages`.

[Stefan Monnier via]

branch: main
commit baad781689346353a219a786fc68ff476c6e013e
Author: Stefan Monnier 
Commit: Stefan Monnier 

Sort with `elpaa--sort-packages`.
---
 elpa-packages | 84 +--
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index c66f561c51..cbf36842ee 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -49,9 +49,6 @@
   :readme "Readme.md"
   :ignored-files ("LICENSE"))
 
- ("buttercup"  :url "https://github.com/jorgenschaefer/emacs-buttercup";
-  :ignored-files ("LICENSE"))
-
  ("bind-map":url "https://github.com/justbur/emacs-bind-map.git";
   :ignored-files (".travis.yml" "Cask" "LICENSE"))
 
@@ -61,6 +58,9 @@
   :readme "README.md"
   :ignored-files ("COPYING"))
 
+ ("buttercup"  :url "https://github.com/jorgenschaefer/emacs-buttercup";
+  :ignored-files ("LICENSE"))
+
  ("caml"   :url "https://github.com/ocaml/caml-mode";
   ;; The version 4.7.1 from Melpa-stable seems to correspond to
   ;; revision a9134009.
@@ -180,17 +180,6 @@
 
  ("free-keys"   :url "https://github.com/Fuco1/free-keys";)
 
- ("git-commit" :url "https://github.com/magit/magit";
-  :lisp-dir "lisp"
-  :ignored-files
-  ("LICENSE" ".github" ".mailsdopcmap"
-   "docs" "Makefile" "default.mk" "lisp/Makefile" "lisp/*-pkg.el" "test"
-   "README.md" "RelNotes.org"
-   "lisp/git-rebase.el" "lisp/magit-*.el" "lisp/magit.el"))
-
- ("git-modes"  :url "https://github.com/magit/git-modes";
-  :ignored-files ("LICENSE" ".mailmap"))
-
  ("geiser" :url "https://gitlab.com/emacs-geiser/geiser.git";
   :lisp-dir "elisp"
   :readme "readme.org"
@@ -209,6 +198,17 @@
  ("geiser-racket"  :url "https://gitlab.com/emacs-geiser/racket.git";)
  ("geiser-stklos"  :url "https://gitlab.com/emacs-geiser/stklos.git";)
 
+ ("git-commit" :url "https://github.com/magit/magit";
+  :lisp-dir "lisp"
+  :ignored-files
+  ("LICENSE" ".github" ".mailsdopcmap"
+   "docs" "Makefile" "default.mk" "lisp/Makefile" "lisp/*-pkg.el" "test"
+   "README.md" "RelNotes.org"
+   "lisp/git-rebase.el" "lisp/magit-*.el" "lisp/magit.el"))
+
+ ("git-modes"  :url "https://github.com/magit/git-modes";
+  :ignored-files ("LICENSE" ".mailmap"))
+
  ("gnu-apl-mode":url "https://github.com/lokedhs/gnu-apl-mode";
   ;; :doc "texi/gnu-apl-mode.texi" ; the manual is currently empty
   :ignored-files ("Makefile"))
@@ -227,12 +227,12 @@
  ("goto-chg"   :url "https://github.com/emacs-evil/goto-chg";
   :ignored-files ("LICENSE"))
 
- ("gruvbox-theme"   :url 
"https://github.com/greduan/emacs-theme-gruvbox.git";
-  :ignored-files ("images" "palette"))
-
  ("graphql-mode"   :url "https://github.com/davazp/graphql-mode";
   :ignored-files ("test"))
 
+ ("gruvbox-theme"   :url 
"https://github.com/greduan/emacs-theme-gruvbox.git";
+  :ignored-files ("images" "palette"))
+
  ("guru-mode"  :url "https://github.com/bbatsov/guru-mode";)
 
  ("haml-mode"  :url "https://github.com/nex3/haml-mode";
@@ -321,11 +321,14 @@
  ("keycast":url "https://github.com/tarsius/keycast";
   :ignored-files ("Makefile"))
 
+ ("kotlin-mode":url 
"https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode";
+  :ignored-files ("doc" "test" "Cask" "Makefile"))
+
  ("lua-mode"   :url "https://github.com/immerrr/lua-mode/";
   :ignored-files ("COPYING" "test" "travis" "init-tryout.el"))
 
- ("kotlin-mode":url 
"https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode";
-  :ignored-files ("doc" "test" "Cask" "Makefile"))
+ ("macrostep"  :url "https://github.com/joddie/macrostep";
+  :ignored-files ("lib" "macrostep-test.el"))
 
  ("magit"  :url "https://github.com/magit/magit";
   :lisp-dir "lisp"
@@ -362,9 +365,6 @@
"lisp/magit-tag.el" "lisp/magit-transient.el" "lisp/magit-utils.el"
"lisp/magit-wip.el" "lisp/magit-worktree.el"))
 
- ("macrostep"  :url "https://github.com/joddie/macrostep";
-  :ignored-files ("lib" "macrostep-test.el"))
-
  ("markdown-mode"  :url "https://github.com/jrblevin/markdown-mode";
   :readme "README.md"
   :ignored-files ("scripts" "tests" "Makefile" "webpage.sh")
@@ -409,6 +409,11 @@
   :readme "README.org"
   :ignored-files ("License.org"))
 
+ ("org-contrib":url "https://git.sr.ht/~bzg/org-contrib";
+  :lisp-dir "lisp"
+  :readme "README.org"
+  :ignored-files ("COPYING" "README.md"))
+
  ("org-drill"   :url "https://gitlab.com/phillord/org-drill.git";
   :ignored-files (".gitlab-ci.yml" "Cask"))
 
@@ -439,15 +444,15 @@
  ("paredit":url "https://mumble.net/~campbell/git/paredit.git";
   :ignored-files ("COPYING" "check.sh" "genhtml.sh" "test.el"))
 
+ ("parseclj"   :url "https://github.com/clojure-emacs/parseclj";
+  :ignored-files ("LICENSE" "test")
+  :news "CHANGELOG.md")
+
  ("parseedn"   :url "https://github.c

[elpa] elpa-admin 8283500398: * elpa-admin.el (elpaa--sort-packages): New command

[Stefan Monnier via]

branch: elpa-admin
commit 8283500398688134f2a05a7c0a2a8131ec76b8df
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--sort-packages): New command
---
 elpa-admin.el | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/elpa-admin.el b/elpa-admin.el
index ecae2795e2..eab88bd8d4 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2451,5 +2451,31 @@ relative to elpa root."
   (write-region (point-min) (point-max)
 dstfile nil 'silent
 
+;;; Edit support for `elpa-packages'
+
+(defun elpaa--sort-packages ()
+  "Sort packages by alphabetical order."
+  (interactive)
+  (goto-char (point-min))
+  (down-list 1)
+  (sort-subr nil
+ (lambda ()
+   (unless (save-excursion
+ (forward-comment (point-max))
+ (looking-at "("))
+ (goto-char (point-max
+ (lambda ()
+   (forward-sexp 1)
+   (skip-chars-forward " \t")
+   (when (or (eolp) (looking-at ";"))
+ ;; A comment was found between the two entries.
+ ;; Since it's right after the end (on the same line),
+ ;; it belongs to this record, otherwise it belongs
+ ;; to the next.
+ (forward-line 1))
+   (skip-chars-forward " \t\n")
+   (skip-chars-backward " \t"))
+ (lambda () (forward-comment (point-max)
+
 (provide 'elpa-admin)
 ;;; elpa-admin.el ends here

[elpa] externals/eglot 33c464f658 06/15: Per #131, #314: Be more conservative with the LSP identifier guess

[ELPA Syncer]

branch: externals/eglot
commit 33c464f658de70f36c27237d57b9c9858c68bc81
Author: João Távora 
Commit: João Távora 

Per #131, #314: Be more conservative with the LSP identifier guess

If the user is not requesting a prompt, opt for the safer approach
which is to get the location from textDocument/definition, not from
workspace/symbol.  Because of things like function overloading, the
latter is not always successful in finding exactly the definition of
the thing one is invoking M-. on.

This requires using an xref-internal symbol, which is kind of
unfortunate.

* eglot.el (xref-backend-identifier-at-point): Rework.
---
 eglot.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eglot.el b/eglot.el
index 22eff41f53..0b64cd2301 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2458,10 +2458,11 @@ If BUFFER, switch to it before."
 
 (cl-defmethod xref-backend-identifier-at-point ((_backend (eql eglot)))
   (let ((attempt
- (puthash :default
-  (ignore-errors
-(eglot--workspace-symbols (symbol-name (symbol-at-point
-  eglot--workspace-symbols-cache)))
+ (and (xref--prompt-p this-command)
+  (puthash :default
+   (ignore-errors
+ (eglot--workspace-symbols (symbol-name 
(symbol-at-point
+   eglot--workspace-symbols-cache
 (if attempt (car attempt) "LSP identifier at point")))
 
 (defvar eglot--lsp-xref-refs nil

[elpa] externals/eglot a2d9e18945 09/15: Reply more reasonably to server's workspace/applyEdit

[ELPA Syncer]

branch: externals/eglot
commit a2d9e1894573aec19e2fcf9bcc9934e513e96c77
Author: João Távora 
Commit: João Távora 

Reply more reasonably to server's workspace/applyEdit

* eglot.el (eglot-handle-request): Return non-nil
(eglot--apply-workspace-edit): Signal jsonrpc-error, not error.
---
 eglot.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eglot.el b/eglot.el
index caebced529..c3ef543e3d 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2049,6 +2049,7 @@ THINGS are either registrations or unregisterations 
(sic)."
   (_server (_method (eql workspace/applyEdit)) &key _label edit)
   "Handle server request workspace/applyEdit."
   (eglot--apply-workspace-edit edit eglot-confirm-server-initiated-edits))
+  `(:applied t))
 
 (cl-defmethod eglot-handle-request
   (server (_method (eql workspace/workspaceFolders)))
@@ -3025,7 +3026,7 @@ for which LSP on-type-formatting should be requested."
   (unless (y-or-n-p
(format "[eglot] Server wants to edit:\n  %s\n Proceed? "
(mapconcat #'identity (mapcar #'car prepared) "\n  
")))
-(eglot--error "User cancelled server edit")))
+(jsonrpc-error "User cancelled server edit")))
   (cl-loop for edit in prepared
for (path edits version) = edit
do (with-current-buffer (find-file-noselect path)

[elpa] externals/eglot 87e6de3cdf 08/15: Appease byte-compiler warnings about wrong use of quotes

[ELPA Syncer]

branch: externals/eglot
commit 87e6de3cdfa2f8049b2881350f31db31f9df627e
Author: João Távora 
Commit: João Távora 

Appease byte-compiler warnings about wrong use of quotes

* eglot.el (eglot-stay-out-of, eglot--code-action): Just give it
what it wants.
---
 eglot.el | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eglot.el b/eglot.el
index 582ad1fdee..caebced529 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1596,9 +1596,8 @@ However, if you wish for Eglot to stay out of a 
particular Emacs
 facility that you'd like to keep control of add an element to
 this list and Eglot will refrain from setting it.
 
-For example, to keep your Company customization use
-
-(add-to-list 'eglot-stay-out-of 'company)")
+For example, to keep your Company customization, add the symbol
+`company' to this variable.")
 
 (defun eglot--stay-out-of-p (symbol)
   "Tell if EGLOT should stay of of SYMBOL."
@@ -3122,7 +3121,7 @@ at point.  With prefix argument, prompt for ACTION-KIND."
 (defmacro eglot--code-action (name kind)
   "Define NAME to execute KIND code action."
   `(defun ,name (beg &optional end)
- ,(format "Execute '%s' code actions between BEG and END." kind)
+ ,(format "Execute `%s' code actions between BEG and END." kind)
  (interactive (eglot--region-bounds))
  (eglot-code-actions beg end ,kind)))
 

[elpa] externals/eglot ae7261c1fe 02/15: Per #131: Experiment with grouping in xref-backend-identifier-completion-table

[ELPA Syncer]

branch: externals/eglot
commit ae7261c1fea0cda9810ccdb95f77a1b0b52f4115
Author: João Távora 
Commit: João Távora 

Per #131: Experiment with grouping in 
xref-backend-identifier-completion-table

Doesn't look very good.

* eglot.el (xref-backend-identifier-completion-table): Add stuff.
---
 eglot.el | 38 ++
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/eglot.el b/eglot.el
index b17bfd1b5c..eccd67c129 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2416,12 +2416,42 @@ Try to visit the target file for a richer summary line."
   (let* ((cache eglot--workspace-symbols-cache)
  (probe (gethash pat cache :missing)))
 (if (eq probe :missing) (puthash pat (refresh pat) 
cache)
-  probe
+  probe)))
+(container (c)
+  (plist-get (get-text-property
+  0 'eglot--lsp-workspaceSymbol c)
+ :containerName)))
   (lambda (string _pred action)
 (pcase action
-  (`metadata '(metadata
-   (display-sort-function . identity)
-   (category . eglot-indirection-joy)))
+  (`metadata `(metadata
+   (cycle-sort-function
+. ,(lambda (completions)
+ (cl-sort completions
+  #'string-lessp
+  :key (lambda (c)
+ (or (container c)
+ "")
+   (category . eglot-indirection-joy)
+   ;; (annotation-function
+   ;;  . ,(lambda (c)
+   ;;   (plist-get (get-text-property
+   ;;   0 'eglot--lsp-workspaceSymbol 
c)
+   ;;  :containerName)))
+   ;; (affixation-function
+   ;;  . ,(lambda (comps)
+   ;;   (mapcar (lambda (c)
+   ;; (list c
+   ;;   (plist-get 
(get-text-property
+   ;;   0 
'eglot--lsp-workspaceSymbol c)
+   ;;  :containerName)
+   ;;   " bla"))
+   ;;   comps)))
+   (group-function
+. ,(lambda (c transformp)
+ (if (not transformp)
+ (container c)
+   c)))
+   ))
   (`(eglot--lsp-tryc . ,point) `(eglot--lsp-tryc . (,string . 
,point)))
   (`(eglot--lsp-allc . ,_point) `(eglot--lsp-allc . ,(lookup 
string)))
   (_ nil)

[elpa] externals/eglot c962f6e5f6 12/15: Rework table of contents in README.md again

[ELPA Syncer]

branch: externals/eglot
commit c962f6e5f61cf3e1d24607484d310197ebebf259
Author: João Távora 
Commit: João Távora 

Rework table of contents in README.md again

* README.md (top): Provide a link to "Workspace configuration"
  heading.
---
 README.md | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b0b54ad064..3627640321 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,11 @@
 way:
 
 * 📽 Scroll down this README for some [pretty gifs](#animated_gifs)
-* 📚 Read about [servers](#connecting), [commands and
-  keybindings](#commands), and [customization](#customization)
+* 📚 Read about:
+  - [Connecting to a server](#connecting)
+  - [Commands and keybindings](#commands)
+  - [Workspace configuration](#workspace-configuration)
+  - [Customization](#customization)
 * 📣 Read the [NEWS][news] file
 * 🏆 Folks over at Google [seem to like it][gospb].  Thanks!
 
@@ -128,6 +131,7 @@ it be started as a server.  Notice the `:autoport` symbol 
in there: it
 is replaced dynamically by a local port believed to be vacant, so that
 the ensuing TCP connection finds a listening server.
 
+
 ## Workspace configuration
 
 Many servers can guess good defaults and operate nicely

[elpa] externals/eglot 25f6338741 04/15: Per #131: Tweak some details, fix some bugs

[ELPA Syncer]

branch: externals/eglot
commit 25f6338741c04466591cf1ea1825b5f47f91bf0d
Author: João Távora 
Commit: João Távora 

Per #131: Tweak some details, fix some bugs

eglot--recover-workspace-symbol-meta had a bug that still made it
choke on improper lists.

Also, when simply M-. to the thing at point, let's not lose time on
iterating a potentially out-of-date eglot--workspace-symbols-cache.
So clear it early in the pre-command-hook.

* eglot.el (eglot--workspace-symbols-cache): Move up.
(eglot--pre-command-hook): Clear eglot--workspace-symbols-cache here.
(eglot--recover-workspace-symbol-meta): Check for consp.
---
 eglot.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eglot.el b/eglot.el
index 6d3667a84a..6f9c4f50f2 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2101,8 +2101,12 @@ THINGS are either registrations or unregisterations 
(sic)."
   :key #'seq-first
   (eglot-format (point) nil last-input-event
 
+(defvar eglot--workspace-symbols-cache (make-hash-table :test #'equal)
+  "Cache of `workspace/Symbol' results  used by `xref-find-definitions'.")
+
 (defun eglot--pre-command-hook ()
   "Reset some temporary variables."
+  (clrhash eglot--workspace-symbols-cache)
   (setq eglot--last-inserted-char nil))
 
 (defun eglot--CompletionParams ()
@@ -2392,9 +2396,6 @@ Try to visit the target file for a richer summary line."
   (eglot--current-server-or-lose))
 (xref-make-match summary (xref-make-file-location file line column) 
length)))
 
-(defvar eglot--workspace-symbols-cache (make-hash-table :test #'equal)
-  "Cache of `workspace/Symbol' results  used by `xref-find-definitions'.")
-
 (cl-defmethod xref-backend-identifier-completion-table ((_backend (eql eglot)))
   (if (eglot--server-capable :workspaceSymbolProvider)
   (let ((buf (current-buffer)))
@@ -2446,10 +2447,10 @@ Try to visit the target file for a richer summary line."
   "Search `eglot--workspace-symbols-cache' for rich entry of STRING."
   (catch 'found
 (maphash (lambda (_k v)
-   (while v
+   (while (consp v)
  ;; Like mess? Ask minibuffer.el about improper lists.
  (when (equal (car v) string) (throw 'found (car v)))
- (setq v (and (consp v) (cdr v)
+ (setq v (cdr v
  eglot--workspace-symbols-cache)))
 
 (add-to-list 'completion-category-overrides

[elpa] externals/eglot 29690e88e3 13/15: Always default eglot-strict-mode to nil

[ELPA Syncer]

branch: externals/eglot
commit 29690e88e3b1d2f5d5472d7457a56cc363fb2805
Author: João Távora 
Commit: João Távora 

Always default eglot-strict-mode to nil

it's mostly useful for developers/debugger.  It's better to have the
latter remember to set it than users being hindered by it.

See https://github.com/joaotavora/eglot/issues/131#issuecomment-1191997167

* eglot.el (eglot-strict-mode): default to nil.
---
 eglot.el | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/eglot.el b/eglot.el
index f9a7d2d1e7..2e332c470f 100644
--- a/eglot.el
+++ b/eglot.el
@@ -433,14 +433,12 @@ Here's what an element of this alist might look like:
 (Command ((:title . string) (:command . string)) (:arguments))"))
 
 (eval-and-compile
-  (defvar eglot-strict-mode (if load-file-name '()
-  '(disallow-non-standard-keys
-;; Uncomment these two for fun at
-;; compile-time or with flymake-mode.
-;;
-;; enforce-required-keys
-;; enforce-optional-keys
-))
+  (defvar eglot-strict-mode
+'(;; Uncomment next lines for fun and debugging
+  ;; disallow-non-standard-keys
+  ;; enforce-required-keys
+  ;; enforce-optional-keys
+  )
 "How strictly to check LSP interfaces at compile- and run-time.
 
 Value is a list of symbols (if the list is empty, no checks are

[elpa] externals/eglot c64fe76e86 03/15: Per #131: Cosmetic decisions guaranteed to tick off someone somewhere (tm)

[ELPA Syncer]

branch: externals/eglot
commit c64fe76e866d6ab38bb7ff7283b766a48c116440
Author: João Távora 
Commit: João Távora 

Per #131: Cosmetic decisions guaranteed to tick off someone somewhere (tm)

The symbols returned by the LSP server must be converted to unique
strings if Emacs is to present them in a list.  On the other hand, the
search operates on the pattern and is completely controlled by the
backend.  There is not much Eglot, the LSP client, can do about this.

Decided to present the unique string to the user, even though it could
be hidden.  All the manner of :annotation-function,
:affixation-function, :group-funcion etc didn't seem to add much
value.

Grouping was especially useless, since it makes sense to respect the
LSP server's account of sorting score, so that better results bubble
up to the top.

* eglot.el (xref-backend-identifier-completion-table): Uniquify
symbols with containerName and kind.
---
 eglot.el | 55 ---
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/eglot.el b/eglot.el
index eccd67c129..6d3667a84a 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2402,11 +2402,20 @@ Try to visit the target file for a richer summary line."
 (cl-labels ((refresh (pat)
   (mapcar
(lambda (wss)
- (eglot--dbind ((WorkspaceSymbol) name containerName) 
wss
+ (eglot--dbind
+ ((WorkspaceSymbol) name containerName kind) wss
(propertize
-(concat (and (not (zerop (length containerName)))
- (format "%s::" containerName))
-name)
+(format "%s%s %s"
+(if (zerop (length containerName)) ""
+(concat (propertize containerName
+'face 'shadow)
+" "))
+name
+(propertize (alist-get
+ kind
+ eglot--symbol-kind-names
+ "Unknown")
+'face 'shadow))
 'eglot--lsp-workspaceSymbol wss)))
(with-current-buffer buf
  (jsonrpc-request (eglot--current-server-or-lose)
@@ -2417,41 +2426,17 @@ Try to visit the target file for a richer summary line."
  (probe (gethash pat cache :missing)))
 (if (eq probe :missing) (puthash pat (refresh pat) 
cache)
   probe)))
-(container (c)
-  (plist-get (get-text-property
-  0 'eglot--lsp-workspaceSymbol c)
- :containerName)))
+(score (c)
+  (cl-getf (get-text-property
+0 'eglot--lsp-workspaceSymbol c)
+   :score 0)))
   (lambda (string _pred action)
 (pcase action
   (`metadata `(metadata
(cycle-sort-function
 . ,(lambda (completions)
- (cl-sort completions
-  #'string-lessp
-  :key (lambda (c)
- (or (container c)
- "")
-   (category . eglot-indirection-joy)
-   ;; (annotation-function
-   ;;  . ,(lambda (c)
-   ;;   (plist-get (get-text-property
-   ;;   0 'eglot--lsp-workspaceSymbol 
c)
-   ;;  :containerName)))
-   ;; (affixation-function
-   ;;  . ,(lambda (comps)
-   ;;   (mapcar (lambda (c)
-   ;; (list c
-   ;;   (plist-get 
(get-text-property
-   ;;   0 
'eglot--lsp-workspaceSymbol c)
-   ;;  :containerName)
-   ;;   " bla"))
-   ;;   comps)))
-   (group-function
-. ,(lambda (c transformp)
-

[elpa] externals/eglot updated (c558fd6a24 -> 6cc6fcc0fa)

[ELPA Syncer]

elpasync pushed a change to branch externals/eglot.

  from  c558fd6a24 Fix #965: Update link for Fortran language server fortls
   new  2f71de72e3 Fix #131: Make C-u M-. work half decently
   new  ae7261c1fe Per #131: Experiment with grouping in 
xref-backend-identifier-completion-table
   new  c64fe76e86 Per #131: Cosmetic decisions guaranteed to tick off 
someone somewhere (tm)
   new  25f6338741 Per #131: Tweak some details, fix some bugs
   new  f62b641b5c Per #131, #314: Guess the "LSP identifier at point"
   new  33c464f658 Per #131, #314: Be more conservative with the LSP 
identifier guess
   new  1db95974a7 Per #967: eglot-workspace-configuration can be a function
   new  87e6de3cdf Appease byte-compiler warnings about wrong use of quotes
   new  a2d9e18945 Reply more reasonably to server's workspace/applyEdit
   new  eed9a65515 Fix embarrassing paren-matching blunder in eglot.el
   new  a62a388021 Fix README.md typos and rework section about Workspace 
configuration
   new  c962f6e5f6 Rework table of contents in README.md again
   new  29690e88e3 Always default eglot-strict-mode to nil
   new  2387026d67 Tweak bug-reporting templates yet again
   new  6cc6fcc0fa Merge commit 'c558fd6a24' to fix fallout of force-push 
in GNU ELPA


Summary of changes:
 .github/ISSUE_TEMPLATE/bug_report.md | 139 ++--
 .github/ISSUE_TEMPLATE/config.yml|   4 +-
 NEWS.md  |  11 ++-
 README.md|  93 ++-
 eglot.el | 172 +--
 5 files changed, 291 insertions(+), 128 deletions(-)

[elpa] externals/eglot 2f71de72e3 01/15: Fix #131: Make C-u M-. work half decently

[ELPA Syncer]

branch: externals/eglot
commit 2f71de72e3ff7d7763cca141367af8633ad2b3f2
Author: João Távora 
Commit: João Távora 

Fix #131: Make C-u M-. work half decently

* NEWS.md: Mention change.

* eglot.el (eglot--lsp-interface-alist): Add WorkspaceSymbol
(eglot--workspace-symbols-cache): New variable.
(eglot--recover-workspace-meta): New helper.
(xref-backend-identifier-completion-table): Complicate.
(xref-backend-definitions): Complicate.
(completion-category-overrides): Register a category and a style here.
(completion-styles-alist): Add eglot--lsp-backend-style style
(eglot--lsp-backend-style-call): New funtion.
(eglot--lsp-backend-style-all-completions): New function.
(eglot--lsp-backend-style-try-completion): New function.
---
 NEWS.md  |  5 
 eglot.el | 98 
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 9f77dfc398..156fe761bb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # (upcoming)
 
+# C-u M-. lists and completes arbitrary workspace symbols 
[#131][github#131])
+
+A very old request, now made possible by a relatively recent change to
+the `workspace/symbol` RPC method.
+
 # Rework mode-line menus ([#792][github#792])
 
 New menus help discover Eglot's features and show which of them are
diff --git a/eglot.el b/eglot.el
index 1b9c997d25..b17bfd1b5c 100644
--- a/eglot.el
+++ b/eglot.el
@@ -417,7 +417,7 @@ This can be useful when using docker to run a language 
server.")
   (TextEdit (:range :newText))
   (VersionedTextDocumentIdentifier (:uri :version) ())
   (WorkspaceEdit () (:changes :documentChanges))
-  )
+  (WorkspaceSymbol (:name :kind) (:containerName :location :data)))
 "Alist (INTERFACE-NAME . INTERFACE) of known external LSP interfaces.
 
 INTERFACE-NAME is a symbol designated by the spec as
@@ -2102,7 +2102,7 @@ THINGS are either registrations or unregisterations 
(sic)."
   (eglot-format (point) nil last-input-event
 
 (defun eglot--pre-command-hook ()
-  "Reset `eglot--last-inserted-char'."
+  "Reset some temporary variables."
   (setq eglot--last-inserted-char nil))
 
 (defun eglot--CompletionParams ()
@@ -2392,8 +2392,53 @@ Try to visit the target file for a richer summary line."
   (eglot--current-server-or-lose))
 (xref-make-match summary (xref-make-file-location file line column) 
length)))
 
+(defvar eglot--workspace-symbols-cache (make-hash-table :test #'equal)
+  "Cache of `workspace/Symbol' results  used by `xref-find-definitions'.")
+
 (cl-defmethod xref-backend-identifier-completion-table ((_backend (eql eglot)))
-  (eglot--error "Cannot (yet) provide reliable completion table for LSP 
symbols"))
+  (if (eglot--server-capable :workspaceSymbolProvider)
+  (let ((buf (current-buffer)))
+(clrhash eglot--workspace-symbols-cache)
+(cl-labels ((refresh (pat)
+  (mapcar
+   (lambda (wss)
+ (eglot--dbind ((WorkspaceSymbol) name containerName) 
wss
+   (propertize
+(concat (and (not (zerop (length containerName)))
+ (format "%s::" containerName))
+name)
+'eglot--lsp-workspaceSymbol wss)))
+   (with-current-buffer buf
+ (jsonrpc-request (eglot--current-server-or-lose)
+  :workspace/symbol
+  `(:query ,pat)
+(lookup (pat) ;; check cache, else refresh
+  (let* ((cache eglot--workspace-symbols-cache)
+ (probe (gethash pat cache :missing)))
+(if (eq probe :missing) (puthash pat (refresh pat) 
cache)
+  probe
+  (lambda (string _pred action)
+(pcase action
+  (`metadata '(metadata
+   (display-sort-function . identity)
+   (category . eglot-indirection-joy)))
+  (`(eglot--lsp-tryc . ,point) `(eglot--lsp-tryc . (,string . 
,point)))
+  (`(eglot--lsp-allc . ,_point) `(eglot--lsp-allc . ,(lookup 
string)))
+  (_ nil)
+(eglot--error "This LSP server isn't a :workspaceSymbolProvider")))
+
+(defun eglot--recover-workspace-symbol-meta (string)
+  "Search `eglot--workspace-symbols-cache' for rich entry of STRING."
+  (catch 'found
+(maphash (lambda (_k v)
+   (while v
+ ;; Like mess? Ask minibuffer.el about improper lists.
+ (when (equal (car v) string) (throw 'found (car v)))
+ (setq v (and (consp v) (cdr v)
+ eglot--workspace-symbols-cache)))
+
+(add-to-list 'completion-category-overrides
+ '

[elpa] externals/eglot 1db95974a7 07/15: Per #967: eglot-workspace-configuration can be a function

[ELPA Syncer]

branch: externals/eglot
commit 1db95974a7082a9915ad1c14bb17c49253efcc56
Author: João Távora 
Commit: João Távora 

Per #967: eglot-workspace-configuration can be a function

* README.md (Workspace configuration): Renamed from per-project
configuration.  Rework.

* NEWS.md: Mention change.

* eglot.el (eglot-workspace-configuration): Overhaul.
(eglot-signal-didChangeConfiguration): Use new
eglot-workspace-configuration.
---
 NEWS.md   |  6 +-
 README.md | 47 ++-
 eglot.el  | 18 ++
 3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 156fe761bb..47450927ba 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,8 @@
 # (upcoming)
 
-# C-u M-. lists and completes arbitrary workspace symbols 
[#131][github#131])
+# `eglot-workspace-configuration` can be a function ([#967][github#967])
+
+# C-u M-. lists and completes arbitrary workspace symbols 
([#131][github#131])
 
 A very old request, now made possible by a relatively recent change to
 the `workspace/symbol` RPC method.
@@ -322,6 +324,7 @@ and now said bunch of references-->
 [github#121]: https://github.com/joaotavora/eglot/issues/121
 [github#124]: https://github.com/joaotavora/eglot/issues/124
 [github#126]: https://github.com/joaotavora/eglot/issues/126
+[github#131]: https://github.com/joaotavora/eglot/issues/131
 [github#138]: https://github.com/joaotavora/eglot/issues/138
 [github#144]: https://github.com/joaotavora/eglot/issues/144
 [github#154]: https://github.com/joaotavora/eglot/issues/154
@@ -383,3 +386,4 @@ and now said bunch of references-->
 [github#901]: https://github.com/joaotavora/eglot/issues/901
 [github#905]: https://github.com/joaotavora/eglot/issues/905
 [github#922]: https://github.com/joaotavora/eglot/issues/922
+[github#967]: https://github.com/joaotavora/eglot/issues/967
diff --git a/README.md b/README.md
index 8a54156882..2314eb2d32 100644
--- a/README.md
+++ b/README.md
@@ -128,14 +128,14 @@ it be started as a server.  Notice the `:autoport` symbol 
in there: it
 is replaced dynamically by a local port believed to be vacant, so that
 the ensuing TCP connection finds a listening server.
 
-## Per-project server configuration
+## Workspace configuration
 
 Most servers can guess good defaults and will operate nicely
 out-of-the-box, but some need to be configured specially via LSP
 interfaces.  Additionally, in some situations, you may also want a
 particular server to operate differently across different projects.
 
-Per-project settings are realized with Emacs's _directory variables_
+Per-project settings are realized with Emacs's _directory variables
 and the Elisp variable `eglot-workspace-configuration`.  To make a
 particular Python project always enable Pyls's snippet support, put a
 file named `.dir-locals.el` in the project's root:
@@ -147,15 +147,17 @@ file named `.dir-locals.el` in the project's root:
 ```
 
 This tells Emacs that any `python-mode` buffers in that directory
-should have a particular buffer-local value of
-`eglot-workspace-configuration`.  That variable's value should be
-_association list_ of _parameter sections_ which are presumably
-understood by the server.  In this example, we associate section
-`pyls` with the parameters object `(:plugins (:jedi_completion
-(:include_params t)))`.
-
-Now, supposing that you also had some Go code in the very same
-project, you can configure the Gopls server in the same file.  Adding
+should have a particular value of `eglot-workspace-configuration`.
+That variable's value should be _association list_ of _parameter
+sections_ which are presumably understood by the server.
+
+In this above, we associated the _section_ `:pyls` with the parameters
+object `(:plugins (:jedi_completion (:include_params t)))`.
+
+### Multiple workspace configuration for multiple servers
+
+Suppose you also had some Go code in the very same project, you can
+configure the Gopls server in the same `.dir-locals.el' file.  Adding
 a section for `go-mode`, the file's contents become:
 
 ```lisp
@@ -167,9 +169,28 @@ a section for `go-mode`, the file's contents become:
   . ((:gopls . (:usePlaceholders t)))
 ```
 
+As a matter of taste, you might prefer this equivalent setup.
+
+```lisp
+((nil
+  . ((eglot-workspace-configuration
+  . ((:pyls . (:plugins (:jedi_completion (:include_params t
+ (:gopls . (:usePlaceholders t)))
+```
+
+### Setting up without `.dir-locals.el`
+
 If you can't afford an actual `.dir-locals.el` file, or if managing
-these files becomes cumbersome, the Emacs manual teaches you
-programmatic ways to leverage per-directory local variables.
+this file becomes cumbersome, the Emacs manual (49.2.5 Per-Directory
+Local Variables) teaches you programmatic ways to leverage
+per-directory local variables.  Look for the functions
+`dir-locals-set-directory-class` and `dir-locals-set-class-variables`.
+
+### Set

[elpa] externals/eglot eed9a65515 10/15: Fix embarrassing paren-matching blunder in eglot.el

[ELPA Syncer]

branch: externals/eglot
commit eed9a6551562501241ed9ee7eaad24d59a836ff6
Author: João Távora 
Commit: João Távora 

Fix embarrassing paren-matching blunder in eglot.el

* eglot.el (eglot-handle-request workspace/applyEdit): Fix parens.
---
 eglot.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eglot.el b/eglot.el
index c3ef543e3d..f9a7d2d1e7 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2048,7 +2048,7 @@ THINGS are either registrations or unregisterations 
(sic)."
 (cl-defmethod eglot-handle-request
   (_server (_method (eql workspace/applyEdit)) &key _label edit)
   "Handle server request workspace/applyEdit."
-  (eglot--apply-workspace-edit edit eglot-confirm-server-initiated-edits))
+  (eglot--apply-workspace-edit edit eglot-confirm-server-initiated-edits)
   `(:applied t))
 
 (cl-defmethod eglot-handle-request

[elpa] externals/eglot 6cc6fcc0fa 15/15: Merge commit 'c558fd6a24' to fix fallout of force-push in GNU ELPA

[ELPA Syncer]

branch: externals/eglot
commit 6cc6fcc0fabb51671980e52110ad74f2e691e387
Merge: 2387026d67 c558fd6a24
Author: João Távora 
Commit: João Távora 

Merge commit 'c558fd6a24' to fix fallout of force-push in GNU ELPA

[elpa] externals/eglot a62a388021 11/15: Fix README.md typos and rework section about Workspace configuration

[ELPA Syncer]

branch: externals/eglot
commit a62a3880212daef7ac950596e8f425aacdaf9f16
Author: João Távora 
Commit: João Távora 

Fix README.md typos and rework section about Workspace configuration

* README.md (Workspace Configuration): Fix typos and rework
---
 README.md | 67 ---
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 2314eb2d32..b0b54ad064 100644
--- a/README.md
+++ b/README.md
@@ -130,15 +130,29 @@ the ensuing TCP connection finds a listening server.
 
 ## Workspace configuration
 
-Most servers can guess good defaults and will operate nicely
-out-of-the-box, but some need to be configured specially via LSP
-interfaces.  Additionally, in some situations, you may also want a
-particular server to operate differently across different projects.
+Many servers can guess good defaults and operate nicely
+out-of-the-box, but some need to be configured via a special LSP
+`workspace/configuration` RPC call to work at all.  Additionally, you
+may also want a particular server to operate differently across
+different projects.
 
-Per-project settings are realized with Emacs's _directory variables
-and the Elisp variable `eglot-workspace-configuration`.  To make a
-particular Python project always enable Pyls's snippet support, put a
-file named `.dir-locals.el` in the project's root:
+Per-project settings are realized with the Elisp variable
+`eglot-workspace-configuration`. 
+
+Before considering what to set the variable to, one must understand
+_how_ to set it.  `eglot-workspace-configuration` is a
+"directory-local" variable, and setting its variable globally or
+buffer-locally likely makes no sense. It should be set via
+`.dir-locals.el` or equivalent mechanisms.
+
+The variable's value is an _association list_ of _parameter sections_
+to _parameter objects_.  Names and formats of section and parameter
+objects are server specific.
+
+ Simple `eglot-workspace-configuration`
+
+To make a particular Python project always enable Pyls's snippet
+support, put a file named `.dir-locals.el` in the project's root:
 
 ```lisp
 ((python-mode
@@ -148,17 +162,16 @@ file named `.dir-locals.el` in the project's root:
 
 This tells Emacs that any `python-mode` buffers in that directory
 should have a particular value of `eglot-workspace-configuration`.
-That variable's value should be _association list_ of _parameter
-sections_ which are presumably understood by the server.
 
-In this above, we associated the _section_ `:pyls` with the parameters
-object `(:plugins (:jedi_completion (:include_params t)))`.
+Here, the value in question associates section `:pyls` with parameters
+`(:plugins (:jedi_completion (:include_params t)))`.  The parameter
+object is a plist converted to JSON before being sent to the server.
 
-### Multiple workspace configuration for multiple servers
+ Multiple servers in `eglot-workspace-configuration`
 
 Suppose you also had some Go code in the very same project, you can
-configure the Gopls server in the same `.dir-locals.el' file.  Adding
-a section for `go-mode`, the file's contents become:
+configure the Gopls server in the same `.dir-locals.el` file.  Adding
+a section for `go-mode`, the file's contents now become:
 
 ```lisp
 ((python-mode
@@ -169,7 +182,9 @@ a section for `go-mode`, the file's contents become:
   . ((:gopls . (:usePlaceholders t)))
 ```
 
-As a matter of taste, you might prefer this equivalent setup.
+Alternatively, as a matter of taste, you may choose this equivalent
+setup, which sets the variables value in all all major modes of all
+buffers of a given project.
 
 ```lisp
 ((nil
@@ -178,19 +193,22 @@ As a matter of taste, you might prefer this equivalent 
setup.
  (:gopls . (:usePlaceholders t)))
 ```
 
-### Setting up without `.dir-locals.el`
+ `eglot-workspace-configuration` without `.dir-locals.el`
 
 If you can't afford an actual `.dir-locals.el` file, or if managing
-this file becomes cumbersome, the Emacs manual (49.2.5 Per-Directory
-Local Variables) teaches you programmatic ways to leverage
-per-directory local variables.  Look for the functions
+this file becomes cumbersome, the [Emacs
+manual][dir-locals-emacs-manual] teaches you programmatic ways to
+leverage per-directory local variables.  Look for the functions
 `dir-locals-set-directory-class` and `dir-locals-set-class-variables`.
 
-### Setting a dynamic `eglot-workspace-configuration` dynamically
+ Dynamic `eglot-workspace-configuration` as a function
 
-If you need to decide `eglot-workspace-configuration` can be a function, too.  
It is passed
-the `eglot-lsp-server` instance and runs with `default-directory` set
-to the root of your project.
+If you need to determine the workspace configuration base on some
+dynamic context, make `eglot-workspace-configuration` a function.  It
+is passed the `eglot-lsp-server` instance and runs with
+`default-directory` set t

[elpa] externals/eglot 2387026d67 14/15: Tweak bug-reporting templates yet again

[ELPA Syncer]

branch: externals/eglot
commit 2387026d67c68a33cab605bb4e3e64d9928918a3
Author: João Távora 
Commit: João Távora 

Tweak bug-reporting templates yet again
---
 .github/ISSUE_TEMPLATE/bug_report.md | 139 +--
 .github/ISSUE_TEMPLATE/config.yml|   4 +-
 2 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md 
b/.github/ISSUE_TEMPLATE/bug_report.md
index 2829b6cb86..b11c614f81 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,35 +1,35 @@
 ---
-name: 🐞 Bug Report
-about: Something didn't function the way you expected it to
+name: Formal bug report
+about: Something didn't work right, and you've written a perfect MRE recipe
 title: ''
 labels: ''
 assignees: ''
 ---
 
  
 * Server used:   
@@ -42,12 +42,12 @@ assignees: ''
  LSP transcript - M-x eglot-events-buffer (mandatory unless Emacs 
inoperable)
 
+Inside Emacs, you can display that buffer with 'M-x
+eglot-events-buffer'.  It contains the JSONRPC messages exchanged
+between client and server, as well as the messages the server prints
+to stderr.  Copy that text and paste it below as a formatted code
+block
+(https://help.github.com/articles/creating-and-highlighting-code-blocks/)). -->
  
 ```lisp
 ... Paste the events transcript here ...  Try to start from the line that says
@@ -58,10 +58,10 @@ assignees: ''
  Backtrace (mandatory, unless no error message seen or heard):
 
  
 ```lisp
@@ -78,61 +78,60 @@ Debugger entered--Lisp error: (error "oh no")

  Minimum Reproducible Example (mandatory)
 
  
-Make sure to describe:
+Here's how I suggest you structure your recipe:
 
-1. How Emacs is started
+1. How is Emacs started?
 
-3. Where the language server executable lives in the machine and how
-   it is installed
+3. Where does the language server executable live in your machine and
+   how should it be installed?

-4. What project files are needed to demonstrate the problem.  Please
+4. What project files are needed to demonstrate the problem?  Please
don't say "_just open any Zglorb source file_".
 
Don't assume the Eglot maintainers have any time to learn about a
-   specific programming language and its associated toolchain. Attach
+   specific programming language and its associated toolchain.  Attach
the actual file or files, or link to a repository containing them.

-5. How Emacs is operated/configured before you invoke Eglot
+5. How is Emacs operated/configured _before_ you invoke Eglot?
 
-6. How Emacs is operated after you invoke Eglot
+6. How is Emacs operated _after_ you invoke Eglot
 
-7. What actions must be taken for the problem to manifest itself
+7. What actions must be taken for the problem to manifest itself?
 
-8. What the expected behaviour is
+8. What is the expected behaviour?
 
-9. What the observed behaviour is
+9. What is the observed behaviour?
 
-10. IMPORTANT: Double check that doing steps 1-9 all over again by
-   yourself leads to the error.
+10. VERY IMPORTANT: follow your own recipe (steps 1-9) by yourself
+   and verify that it leads to the error.

 You don't HAVE to follow this guide if you are confident you can
 describe your own [COMPLETE, MINIMAL and REPRODUCIBLE][1] recipe.  See
 https://github.com/joaotavora/eglot/issues/696 for a good example of
 an issue following this template.
  
- 
+Having a runnable reproduction not only "proves" your bug to us
+but also allows us to spend all our effort fixing the bug
+instead of struggling to understand your issue.  
+
+If you find that building the MRE takes a lot of work, well, that may
+be so :-) But keep in mind that that work will have to be expended at
+least once by someone to solve your problem, and it's often the most
+time-consuming task.  So it pays if you can do that work upfront.
+
+Thank you very much. -->
 
 [1]: https://stackoverflow.com/help/minimal-reproducible-example
diff --git a/.github/ISSUE_TEMPLATE/config.yml 
b/.github/ISSUE_TEMPLATE/config.yml
index 02577de421..d6ff8d9113 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: "Discuss Eglot, request features, report bugs informally"
+  - name: "Report bugs informally, discuss Eglot, request features"
 url: https://github.com/joaotavora/eglot/discussions
-about: Ask questions, request features, answer questions
+about: Informally and freely report problems, ask questions, etc
   - name: "Additional Support: Emacs Help"
 url: https://lists.gnu.org/mailman/listinfo/help-gnu-emacs
 about: Search, ask and answer questions

[elpa] externals/eglot f62b641b5c 05/15: Per #131, #314: Guess the "LSP identifier at point"

[ELPA Syncer]

branch: externals/eglot
commit f62b641b5c5fb985b9846584a5e02048c7356ca4
Author: João Távora 
Commit: João Távora 

Per #131, #314: Guess the "LSP identifier at point"

* eglot.el (eglot--workspace-symbols): New helper.
(xref-backend-identifier-completion-table): Rework.
(xref-backend-identifier-at-point): Rework.
---
 eglot.el | 101 ---
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/eglot.el b/eglot.el
index 6f9c4f50f2..22eff41f53 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2396,52 +2396,52 @@ Try to visit the target file for a richer summary line."
   (eglot--current-server-or-lose))
 (xref-make-match summary (xref-make-file-location file line column) 
length)))
 
+(defun eglot--workspace-symbols (pat &optional buffer)
+  "Ask for :workspace/symbol on PAT, return list of formatted strings.
+If BUFFER, switch to it before."
+  (with-current-buffer (or buffer (current-buffer))
+(unless (eglot--server-capable :workspaceSymbolProvider)
+  (eglot--error "This LSP server isn't a :workspaceSymbolProvider"))
+(mapcar
+ (lambda (wss)
+   (eglot--dbind ((WorkspaceSymbol) name containerName kind) wss
+ (propertize
+  (format "%s%s %s"
+  (if (zerop (length containerName)) ""
+(concat (propertize containerName 'face 'shadow) " "))
+  name
+  (propertize (alist-get kind eglot--symbol-kind-names 
"Unknown")
+  'face 'shadow))
+  'eglot--lsp-workspaceSymbol wss)))
+ (jsonrpc-request (eglot--current-server-or-lose) :workspace/symbol
+  `(:query ,pat)
+
 (cl-defmethod xref-backend-identifier-completion-table ((_backend (eql eglot)))
-  (if (eglot--server-capable :workspaceSymbolProvider)
-  (let ((buf (current-buffer)))
-(clrhash eglot--workspace-symbols-cache)
-(cl-labels ((refresh (pat)
-  (mapcar
-   (lambda (wss)
- (eglot--dbind
- ((WorkspaceSymbol) name containerName kind) wss
-   (propertize
-(format "%s%s %s"
-(if (zerop (length containerName)) ""
-(concat (propertize containerName
-'face 'shadow)
-" "))
-name
-(propertize (alist-get
- kind
- eglot--symbol-kind-names
- "Unknown")
-'face 'shadow))
-'eglot--lsp-workspaceSymbol wss)))
-   (with-current-buffer buf
- (jsonrpc-request (eglot--current-server-or-lose)
-  :workspace/symbol
-  `(:query ,pat)
-(lookup (pat) ;; check cache, else refresh
-  (let* ((cache eglot--workspace-symbols-cache)
- (probe (gethash pat cache :missing)))
-(if (eq probe :missing) (puthash pat (refresh pat) 
cache)
-  probe)))
-(score (c)
-  (cl-getf (get-text-property
-0 'eglot--lsp-workspaceSymbol c)
-   :score 0)))
-  (lambda (string _pred action)
-(pcase action
-  (`metadata `(metadata
-   (cycle-sort-function
-. ,(lambda (completions)
- (cl-sort completions #'> :key #'score)))
-   (category . eglot-indirection-joy)))
-  (`(eglot--lsp-tryc . ,point) `(eglot--lsp-tryc . (,string . 
,point)))
-  (`(eglot--lsp-allc . ,_point) `(eglot--lsp-allc . ,(lookup 
string)))
-  (_ nil)
-(eglot--error "This LSP server isn't a :workspaceSymbolProvider")))
+  "Yet another tricky connection between LSP and Elisp completion semantics."
+  (let ((buf (current-buffer)) (cache eglot--workspace-symbols-cache))
+(cl-labels ((refresh (pat) (eglot--workspace-symbols pat buf))
+(lookup-1 (pat) ;; check cache, else refresh
+  (let ((probe (gethash pat cache :missing)))
+(if (eq probe :missing) (puthash pat (refresh pat) cache)
+  probe)))
+(lookup (pat)
+  (let ((res (lookup-1 pat))
+(def (and (string= pat "") (gethash :default cache
+(append def 

[elpa] externals/hyperbole d0dd9202d8 06/19: HyRolo search org-directory, org-roam files or with helm-org-rifle

[ELPA Syncer]

branch: externals/hyperbole
commit d0dd9202d89fb753e92ddfef6688c3d8c3039c6b
Author: Bob Weiner 
Commit: Bob Weiner 

HyRolo search org-directory, org-roam files or with helm-org-rifle
---
 ChangeLog |  6 ++
 hyrolo.el | 53 -
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f7af3a5ec2..3c97134d18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,12 @@
   MANIFEST: Added above file.
 
 2022-07-06  Bob Weiner  
+2022-07-02  Bob Weiner  
+
+* hyrolo.el (hyrolo-org, hyrolo-helm-org-rifle, hyrolo-org-roam): Add HyRolo-
+based searching of Org files, helm-based searching of HyRolo files and
+Hyrolo-based searching of Org Roam files.
+
 * hsys-org.el (hsys-org-link-at-p, hsys-org-heading-at-p): Update to use
 'smart-eolp' and 'smart-eobp'.
 
diff --git a/hyrolo.el b/hyrolo.el
index f9863e4b90..1d50f59063 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 7-Jun-89 at 22:08:29
-;; Last-Mod: 18-Jun-22 at 21:53:51 by Mats Lidell
+;; Last-Mod:  3-Jul-22 at 09:46:59 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -279,6 +279,8 @@ entry which begins with the parent string."
 (setq again nil match t)
   (setq buffer-read-only nil)
   (unless match
+   (unless (zerop (current-column))
+ (insert "\n"))
(insert (concat level "*")
(if (string-equal entry-spc "") "   " entry-spc)
name "\n")
@@ -1097,6 +1099,55 @@ otherwise just use the cdr of the item."
 'entry)
token "* "
 
+;;; 
+;;; Org Package Integrations
+;;; 
+
+;;;###autoload
+(defun hyrolo-helm-org-rifle ()
+  "Prompt for a search pattern with helm and interactively show all matches 
from `hyrolo-file-list'."
+  (interactive)
+  (unless (package-installed-p 'helm-org-rifle)
+(package-install 'helm-org-rifle))
+  (require 'helm-org-rifle)
+  (let ((files (seq-filter #'file-readable-p hyrolo-file-list)))
+(save-excursion
+  (mapc (lambda (file)
+ (set-buffer (find-file-noselect file))
+ (org-mode))
+   files))
+(helm-org-rifle-files files)))
+
+;;;###autoload
+(defun hyrolo-org ()
+  "Prompt for patterns and search Org directory files for string or 
logic-based matches."
+  (interactive "sFind Org directory string (or logical expression): \nP")
+  (require 'org)
+  (unless (file-readable-p org-directory)
+(make-directory org-directory))
+  (if (file-readable-p org-directory)
+  (if (fboundp #'helm-org-rifle-org-directory)
+ (helm-org-rifle-org-directory)
+   (let ((hyrolo-file-list (cddr (directory-files org-directory t 
"\\.org$"
+ (hyrolo-fgrep string max-matches)))
+(error "(hyrolo-org): `org-directory', \"%s\", does not exist" 
org-directory)))
+
+;;;###autoload
+(defun hyrolo-org-roam (string &optional max-matches)
+  "Search Org Roam directory files for string or logic-based matches."
+  (interactive "sFind Org Roam directory string (or logical expression): \nP")
+  (unless (package-installed-p 'org-roam)
+(package-install #'org-roam))
+  (require 'org-roam)
+  (unless (file-readable-p org-roam-directory)
+(make-directory org-roam-directory))
+  (unless org-roam-db-autosync-mode
+(org-roam-db-autosync-mode))
+  (if (file-readable-p org-roam-directory)
+  (let ((hyrolo-file-list (cddr (directory-files org-roam-directory t 
"\\.org$"
+   (hyrolo-fgrep string max-matches))
+(error "(hyrolo-org-roam): `org-roam-directory', \"%s\", does not exist" 
org-roam-directory)))
+
 ;;; 
 ;;; Public functions
 ;;; 

[elpa] externals/hyperbole 96deda39db 05/19: demo-tests.el - Use 'sh' instead of 'bash'

[ELPA Syncer]

branch: externals/hyperbole
commit 96deda39dbbcf3045130dd2ca178ce45ce3bd78e
Author: Bob Weiner 
Commit: Bob Weiner 

demo-tests.el - Use 'sh' instead of 'bash'

Replace single backslash with double backslash where appropriate.
Don't kill shell buffer if it exists before the test is invoked.
---
 ChangeLog  |  7 +++
 test/demo-tests.el | 40 +++-
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f04b2fb2b9..f7af3a5ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 2022-07-19  Mats Lidell  
+* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
+  fast-demo-key-series-shell-grep,
+  fast-demo-key-series-shell-apropos):
+Use 'sh' instead of 'bash' for wider applicability.
+Don't kill shell buffer if it exists before the test is invoked.
+
+* hact.el (htype:symbol): Return nil if type-category is invalid.
 
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Add optional
 whitespace after command to accomodate for different versions on
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 895dcc8152..76b9c7b2ac 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:30-Jan-21 at 12:00:00
-;; Last-Mod: 16-Jul-22 at 22:39:47 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 14:31:49 by Bob Weiner
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -531,8 +531,9 @@ enough files with matching mode loaded."
 (ert-deftest fast-demo-key-series-shell-pushd-hyperb-dir ()
   "Action key executes pushd shell command."
   (skip-unless (not noninteractive))
-  (let ((shell-file-name (executable-find "bash"))
-(shell-buffer-name "*shell*"))
+  (let* ((shell-file-name (executable-find "sh"))
+ (shell-buffer-name "*shell*")
+(existing-shell-flag (get-buffer-process shell-buffer-name)))
 (unwind-protect
 (with-temp-buffer
   (insert "{ M-x shell RET M-> (pushd ${hyperb:dir} && echo 
\"PWD=$(pwd)\") RET }")
@@ -546,14 +547,16 @@ enough files with matching mode loaded."
   (while (not (search-forward "PWD=" nil t))
 (accept-process-output (get-buffer-process 
shell-buffer-name
 (should (looking-at-p (directory-file-name hyperb:dir)
-  (set-process-query-on-exit-flag (get-buffer-process shell-buffer-name) 
nil)
-  (kill-buffer shell-buffer-name
+  (unless existing-shell-flag
+   (set-process-query-on-exit-flag (get-buffer-process shell-buffer-name) 
nil)
+   (kill-buffer shell-buffer-name)
 
 (ert-deftest fast-demo-key-series-shell-grep ()
   "Action key executes grep shell command."
   (skip-unless (not noninteractive))
-  (let ((shell-file-name (executable-find "bash"))
-(shell-buffer-name "*shell*"))
+  (let* ((shell-file-name (executable-find "sh"))
+ (shell-buffer-name "*shell*")
+(existing-shell-flag (get-buffer-process shell-buffer-name)))
 (unwind-protect
 (with-temp-buffer
   (insert "{M-x shell RET M-> (export HYPERBOLE_DIR=${hyperb:dir} && 
cd $HYPERBOLE_DIR && grep -n gbut:label-list *.el) RET}")
@@ -562,17 +565,19 @@ enough files with matching mode loaded."
   (hy-test-helpers:consume-input-events)
   (with-current-buffer shell-buffer-name
 (with-timeout (5 (ert-fail "Test timed out"))
-  (while (not (string-match-p 
"\n.*\.el:[0-9]+:.*defun.*gbut:label-list \(\)" (buffer-substring-no-properties 
(point-min) (point-max
+  (while (not (string-match-p 
"\n.*\\.el:[0-9]+:.*defun.*gbut:label-list ()" (buffer-substring-no-properties 
(point-min) (point-max
 (accept-process-output (get-buffer-process 
shell-buffer-name
-(should (string-match-p "\n.*\.el:[0-9]+:.*defun.*gbut:label-list 
\(\)" (buffer-substring-no-properties (point-min) (point-max))
-  (set-process-query-on-exit-flag (get-buffer-process shell-buffer-name) 
nil)
-  (kill-buffer shell-buffer-name
+(should (string-match-p "\n.*\\.el:[0-9]+:.*defun.*gbut:label-list 
()" (buffer-substring-no-properties (point-min) (point-max))
+  (unless existing-shell-flag
+   (set-process-query-on-exit-flag (get-buffer-process shell-buffer-name) 
nil)
+   (kill-buffer shell-buffer-name)
 
 (ert-deftest fast-demo-key-series-shell-apropos ()
   "Action key executes apropos shell command."
   (skip-unless (not noninteractive))
-  (let ((shell-file-name (executable-find "bash"))
-(shell-buffer-name "*shell*"))
+  (let* ((shell-file-name (executable-find "sh"))
+ (shell-buffer-name "*shell*")
+(existing-shell-flag (get-buffer-process shell-buffer-name)))
 (unwind-protect
 (with-temp-buffer
   (insert "{M-x shell RET M-> 

[elpa] externals/hyperbole 2d2fcb97d9 04/19: Add a number of small updates with little functional change

[ELPA Syncer]

branch: externals/hyperbole
commit 2d2fcb97d9444319fb088ab0066b99a9c744a8bf
Author: Bob Weiner 
Commit: Bob Weiner 

Add a number of small updates with little functional change
---
 hactypes.el | 13 ++---
 hmouse-drv.el   |  6 --
 hmouse-sh.el| 10 +-
 hmouse-tag.el   |  4 ++--
 hpath.el|  6 --
 hsys-youtube.el |  9 +++--
 hui-mouse.el| 10 ++
 hui.el  |  8 
 8 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/hactypes.el b/hactypes.el
index f78e204620..2ac2a4d1e8 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:23-Sep-91 at 20:34:36
-;; Last-Mod:  5-Jun-22 at 17:59:19 by Bob Weiner
+;; Last-Mod: 12-Jul-22 at 01:21:40 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -33,7 +33,7 @@
 (defact annot-bib (key)
   "Follow internal ref KEY within an annotated bibliography, delimiters=[]."
   (interactive "sReference key (no []): ")
-  (let ((key-regexp (concat "^[*]*[ \t]*\\\[" (ebut:key-to-label key) "\\\]"))
+  (let ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
citation)
 (if (save-excursion
  (goto-char (point-max))
@@ -61,8 +61,15 @@ Return any non-nil value or t."
 (if result "True" "False") result bool-expr)
 (or result t)))
 
+(defact display-value (value)
+  "Display a message showing VALUE (a symbol) and its value.
+Return any non-nil value or t."
+  (let ((result (eval value)))
+(message "%s" result)
+(or result t)))
+
 (defact display-variable (var)
-  "Display a message showing `var` (a symbol) and its value.
+  "Display a message showing VAR (a symbol) and its value.
 Return any non-nil value or t."
   (message "%s = %s" var (symbol-value var))
   (or (symbol-value var) t))
diff --git a/hmouse-drv.el b/hmouse-drv.el
index ffe56770d1..5a1e952296 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:04-Feb-90
-;; Last-Mod: 18-Jun-22 at 21:55:43 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 23:15:34 by Bob Weiner
 ;;
 ;; Copyright (C) 1989-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -846,7 +846,8 @@ frame instead."
 (defun hkey-debug (pred pred-value hkey-action)
   (message "(HyDebug) %sContext: %s; %s: %s; Buf: %s; Mode: %s; MinibufDepth: 
%s"
   (cond ((eq pred-value 'hbut:current)
- (format "ButType: %s; ButLabel: %s; "
+ (format "ButProps: %S\nButType: %s; ButLabel: %s; "
+ (symbol-plist 'hbut:current)
  (hattr:get 'hbut:current 'categ)
  (hypb:format-quote (hbut:label 'hbut:current
 ((functionp pred-value)
@@ -903,6 +904,7 @@ Return non-nil iff associated help documentation is found."
 (mouse-drag-flag (hmouse-drag-p))
 (hkey-forms (if mouse-flag hmouse-alist hkey-alist))
 (hrule:action 'actype:identity)
+(assist-flag assisting)
 hkey-form pred-value call calls cmd-sym doc)
 (while (and (null pred-value) (setq hkey-form (car hkey-forms)))
   (or (setq pred-value (eval (car hkey-form)))
diff --git a/hmouse-sh.el b/hmouse-sh.el
index 164b74663a..a2aeeed461 100644
--- a/hmouse-sh.el
+++ b/hmouse-sh.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 3-Sep-91 at 21:40:58
-;; Last-Mod:  9-Jul-22 at 16:41:14 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 11:39:09 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -41,6 +41,14 @@
 ;;   right-divider
 ;;   bottom-divider
 
+;; tab-bar sample Smart Mouse setup
+;; (define-key tab-prefix-map [down-mouse-2] #'action-key-depress-emacs)
+;; (define-key tab-prefix-map [mouse-2]  #'action-mouse-key-emacs)
+
+;; tab-line sample Smart Mouse setup
+;; (define-key tab-line-tab-map [tab-line down-mouse-2] 
#'action-key-depress-emacs)
+;; (define-key tab-line-tab-map [tab-line mouse-2]  
#'action-mouse-key-emacs)
+
 (defun hmouse-bind-key-emacs (mouse-key-number depress-cmd release-cmd)
   "Ensure MOUSE-KEY-NUMBER (1-5), e.g. 1 for [mouse-1], is bound to 
DEPRESS-CMD and RELEASE-CMD (includes depresses and drags).
 Use nil as cmd values to unbind a key.  Works under GNU Emacs only."
diff --git a/hmouse-tag.el b/hmouse-tag.el
index a6f88a081c..49ad105f48 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:24-Aug-91
-;; Last-Mod: 15-Jul-22 at 22:07:35 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 09:56:15 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -703,7 +703,7 @@ Use `hpath:display-buffer' to show definition or 
docum

[elpa] externals/hyperbole updated (89913d256c -> 75c9214c35)

[ELPA Syncer]

elpasync pushed a change to branch externals/hyperbole.

  from  89913d256c Doc strings within 80 char limit for hact.el (#212)
   new  c9a58fc673 hsys-youtube.el: Add action button types for Youtube 
videos
   new  694f3110fd hsys-org.el: Activate only if not at eol or eob
   new  c38d137510 Merge branch 'master' of hyperbole
   new  2d2fcb97d9 Add a number of small updates with little functional 
change
   new  96deda39db demo-tests.el - Use 'sh' instead of 'bash'
   new  d0dd9202d8 HyRolo search org-directory, org-roam files or with 
helm-org-rifle
   new  4860da0802 hsettings.el (hyperbole-web-search): Add flag to return 
search expr
   new  e9015341c0 hypb.el: Support devdocs-lookup package
   new  7a86ea33e2 Add ibut:create and allow Assist Key :help for Elisp 
functions
   new  72ca3f0041 hui-mini.el: Multi-line menu support; add To/ and Doc 
a-z menus
   new  d256f195ee Fix major issues with ibut:create but some tests still 
fail
   new  80d1d2dd4c Update tests to work with new ibut:create code
   new  5e6e10dd6e elisp-compiler-msg: Add Smart Key support for ERT "Test 
"
   new  44262d14a7 Resolve all but one test case issues from the latest 
updates
   new  dcc51fb827 Change pushd to cd since /bin/sh does not support pushd
   new  716507c51c Fix a number of issues with ibut attribute handling
   new  dcb0b9e7aa Merge branch 'master' of hyperbole; initial 80-col 
comment fixes
   new  c517641b51 * ibut:create Ensure lbl-key is always set to name, if 
available
   new  75c9214c35 hypb:require-package: Prompt user with y/n query before 
install pkg


Summary of changes:
 ChangeLog| 173 +++-
 FAST-DEMO|   2 +-
 MANIFEST |   1 +
 Makefile |   6 +-
 hact.el  |  10 +-
 hactypes.el  |  15 ++-
 hbut.el  | 199 +---
 hib-debbugs.el   |   4 +-
 hibtypes.el  | 100 +--
 hmouse-drv.el|  11 +-
 hmouse-sh.el |  10 +-
 hmouse-tag.el|   4 +-
 hpath.el |  78 ---
 hsettings.el |  20 ++--
 hsys-org.el  |  47 -
 hsys-youtube.el  | 228 ++
 hui-mini.el  | 233 +++
 hui-mouse.el |  10 +-
 hui.el   |  15 ++-
 hypb.el  |  42 +++-
 hyrolo.el|  53 +-
 test/demo-tests.el   | 114 +++--
 test/hbut-tests.el   |  15 +--
 test/hpath-tests.el  |   9 +-
 test/hui-tests.el|  10 +-
 test/hy-test-dependencies.el |  18 ++--
 test/hy-test-helpers.el  |   7 +-
 27 files changed, 1119 insertions(+), 315 deletions(-)
 create mode 100644 hsys-youtube.el

[elpa] externals/hyperbole c9a58fc673 01/19: hsys-youtube.el: Add action button types for Youtube videos

[ELPA Syncer]

branch: externals/hyperbole
commit c9a58fc6732fb0e8bf8682ca4ea245b16b728c11
Author: Bob Weiner 
Commit: Bob Weiner 

hsys-youtube.el: Add action button types for Youtube videos
---
 ChangeLog   |   7 ++
 MANIFEST|   1 +
 Makefile|   6 +-
 hsys-youtube.el | 223 
 4 files changed, 234 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bac4b4efd..1f23ebcaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,13 @@
 * test/hui-select-tests.el (hui-select--thing): Limit test case to run in
 interactive mode, i.e. make test-all.
 
+2022-07-10  Bob Weiner  
+
+* hsys-youtube.el: Add action button type to play segments of Youtube videos.
+  Makefile (EL_COMPILE, ELc_COMPILE):
+  MANIFEST: Added above file.
+
+2022-07-06  Bob Weiner  
 2022-06-19  Bob Weiner  
 
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Allow optional space
diff --git a/MANIFEST b/MANIFEST
index da46525474..0040fc1e4e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -97,6 +97,7 @@ topwin.py- Python script to find the topmost 
macOS app window at a s
 --- EXTERNAL SYSTEM ENCAPSULATIONS ---
 hsys-org.el  - GNU Hyperbole support functions for Org mode
 hsys-www.el  - GNU Hyperbole support for Emacs W3 World-Wide Web (WWW) 
browsing
+hsys-youtube.el  - Action buttons to play timestamped segments of Youtube 
videos
 
 --- HYPERBOLE TEST CASES ---
 test/MANIFEST- Summary of Hyperbole test case files
diff --git a/Makefile b/Makefile
index 7bb7abadf8..cfa5e2905f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:   Bob Weiner
 #
 # Orig-Date:15-Jun-94 at 03:42:38
-# Last-Mod: 19-Jun-22 at 15:47:27 by Bob Weiner
+# Last-Mod: 10-Jul-22 at 23:40:15 by Bob Weiner
 #
 # Copyright (C) 1994-2022  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -181,7 +181,7 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el 
hbmap.el hbut.el \
 hib-social.el hibtypes.el \
 hinit.el hload-path.el hmail.el hmh.el hmoccur.el hmouse-info.el \
 hmouse-drv.el hmouse-key.el hmouse-mod.el hmouse-sh.el 
hmouse-tag.el \
-hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el hsys-www.el 
htz.el \
+hpath.el hrmail.el hsettings.el hsmail.el hsys-org.el hsys-www.el 
hsys-youtube.el htz.el \
 hycontrol.el hui-jmenu.el hui-menu.el hui-mini.el hui-mouse.el 
hui-select.el \
 hui-treemacs.el hui-window.el hui.el hvar.el hversion.el hvm.el 
hypb.el hyperbole.el \
 hyrolo-demo.el hyrolo-logic.el hyrolo-menu.el hyrolo.el 
hywconfig.el set.el hypb-ert.el \
@@ -196,7 +196,7 @@ ELC_COMPILE =  hactypes.elc hibtypes.elc hib-debbugs.elc 
hib-doc-id.elc hib-kbd.
 hargs.elc hbdata.elc hbmap.elc hbut.elc hgnus.elc hhist.elc \
 hinit.elc hload-path.elc hmail.elc hmh.elc hmoccur.elc 
hmouse-info.elc \
 hmouse-drv.elc hmouse-key.elc hmouse-mod.elc hmouse-sh.elc 
hmouse-tag.elc \
-hpath.elc hrmail.elc hsettings.elc hsmail.elc hsys-org.elc 
hsys-www.elc htz.elc \
+hpath.elc hrmail.elc hsettings.elc hsmail.elc hsys-org.elc 
hsys-www.elc hsys-youtube.elc htz.elc \
 hycontrol.elc hui-jmenu.elc hui-menu.elc hui-mini.elc 
hui-mouse.elc hui-select.elc \
 hui-treemacs.elc hui-window.elc hui.elc hvar.elc hversion.elc 
hvm.elc hypb.elc hyperbole.elc \
 hyrolo-demo.elc hyrolo-logic.elc hyrolo-menu.elc hyrolo.elc 
hywconfig.elc \
diff --git a/hsys-youtube.el b/hsys-youtube.el
new file mode 100644
index 00..e21553cc0c
--- /dev/null
+++ b/hsys-youtube.el
@@ -0,0 +1,223 @@
+;;; hsys-youtube.el --- Action buttons to play timestamped segments of Youtube 
videos
+;;
+;; Author:   Bob Weiner
+;;
+;; Orig-Date:10-Jul-22 at 18:10:56
+;; Last-Mod: 17-Jul-22 at 13:07:05 by Bob Weiner
+;;
+;; Copyright (C) 2022  Free Software Foundation, Inc.
+;; See the "HY-COPY" file for license information.
+;;
+;; This file is part of GNU Hyperbole.
+
+;;; Commentary:
+;;
+;;   Load this library and then you can embed Action Buttons like
+;;   these to play segments of Youtube videos from any of your
+;;   buffers, activating these buttons with the Action Key.
+;;
+;;   All of these do the exact same thing:
+;; 
+;; 
+;; 
+;; 
+;; 
+;; 
+;; https://www.youtube.com/watch?v=WKwZHSbHmPg"; "0h:2m:44s">
+;;
+;;   Add a third parameter to give the end/stop time:
+;; 
+;; 
+
+;;   Additional Action Button types include search:
+;; 
+;;
+;;   and summarizing all of the metadata info associated with a video:
+;; 
+
+;;; Code:
+
+;;; 
+;;; Requirements
+;;; 
+
+(require 'hact) ;; For htype:symbol
+(require 'hsys-www)
+
+;;; **

[elpa] externals/hyperbole 4860da0802 07/19: hsettings.el (hyperbole-web-search): Add flag to return search expr

[ELPA Syncer]

branch: externals/hyperbole
commit 4860da080269d5561a41e68acef8a907db9b9d74
Author: Bob Weiner 
Commit: Bob Weiner 

hsettings.el (hyperbole-web-search): Add flag to return search expr
---
 ChangeLog|  4 
 hsettings.el | 20 +---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c97134d18..5bca1146b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2022-07-19  Mats Lidell  
+* hsettings.el (hyperbole-web-search): Add optional 'return-search-expr-flag'
+to return search expression rather than doing the search.  Use
+with Assist Key.
+
 * test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
   fast-demo-key-series-shell-grep,
   fast-demo-key-series-shell-apropos):
diff --git a/hsettings.el b/hsettings.el
index 3a7f6ac032..c271674daf 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:15-Apr-91 at 00:48:49
-;; Last-Mod: 18-Jun-22 at 21:56:43 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 16:27:17 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -156,7 +156,7 @@ lines"
 (hyperbole-default-web-search-term
 (list service-name search-term)))
 
-(defun hyperbole-web-search (&optional service-name search-term)
+(defun hyperbole-web-search (&optional service-name search-term 
return-search-expr-flag)
   "Search web SERVICE-NAME for SEARCH-TERM.
 Both arguments are optional and are prompted for when not given or when null.
 Uses `hyperbole-web-search-alist' to match each service to its search url.
@@ -170,11 +170,17 @@ package to display search results."
  (lambda (service1 service2)
(equal (downcase service1) (downcase 
service2)))
   (setq search-term (browse-url-url-encode-chars search-term "[*\"()',=;?% 
]"))
-  (cond ((stringp search-pat)
-(browse-url (format search-pat search-term)))
-   ((functionp search-pat)
-(funcall search-pat search-term))
-   (t (user-error "(Hyperbole): Invalid web search service `%s'" 
service-name))
+  (if return-search-expr-flag
+ (cond ((stringp search-pat)
+(format search-pat search-term))
+   ((functionp search-pat)
+(list search-pat search-term))
+   (t (user-error "(Hyperbole): Invalid web search service `%s'" 
service-name)))
+   (cond ((stringp search-pat)
+  (browse-url (format search-pat search-term)))
+ ((functionp search-pat)
+  (funcall search-pat search-term))
+ (t (user-error "(Hyperbole): Invalid web search service `%s'" 
service-name)))
 
 ;; This must be defined before the defcustom `inhbit-hyperbole-messaging'.
 ;;;###autoload

[elpa] externals/hyperbole 72ca3f0041 10/19: hui-mini.el: Multi-line menu support; add To/ and Doc a-z menus

[ELPA Syncer]

branch: externals/hyperbole
commit 72ca3f004175d5121447f184d087a6bf36bbf67c
Author: Bob Weiner 
Commit: Bob Weiner 

hui-mini.el: Multi-line menu support; add To/ and Doc a-z menus
---
 ChangeLog   |  53 --
 hui-mini.el | 233 ++--
 2 files changed, 242 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21b4c9bfe5..1ba09c5ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,19 @@
-2022-07-19  Mats Lidell  
+2022-07-17  Bob Weiner  
+
+* hmouse-drv.el (hkey-debug): Add print of all button properties when on
+a Hyperbole button.
+
 * hsettings.el (hyperbole-web-search): Add optional 'return-search-expr-flag'
 to return search expression rather than doing the search.  Use
 with Assist Key.
 
 * hibtypes.el (action): Call ibut:create to ensure button attributes
 are set properly.
+  hbut.el (ibut:create): Return nil if at end-of-buffer.
+
+* hui-mouse.el (smart-imenu-item-p): Support -99 position value
+that Emacs uses to indicate a rescan should be done.
+
 * test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
   fast-demo-key-series-shell-grep,
   fast-demo-key-series-shell-apropos):
@@ -13,12 +22,12 @@
 
 * hact.el (htype:symbol): Return nil if type-category is invalid.
 
+2022-07-17  Mats Lidell  
+
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Add optional
 whitespace after command to accomodate for different versions on
 apropos.
 
-2022-07-17  Mats Lidell  
-
 * hypb.el (hypb:replace-match-string): Fix obsolete version to 8.0.1.
 
 * kotl/kotl-mode.el (kotl-mode:beginning-of-line): Rename from
@@ -68,11 +77,19 @@
 (hypb:function-symbol-replace, hypb:map-sublists)
 (hypb:constant-vector-symbol-replace): Delete functions.
 
+2022-07-12  Bob Weiner  
+
 * hbut.el (ibut:create): Add, extracted from 'ibut:at-p'; define
 with cl-defun so can optionally use non-positional colon-prefixed
 keyword args to specify specific args.
 
 * hmouse-drv.el (hkey-help): Set 'assist-flag' so matches Assist Key
+behavior in edges cases.
+
+* hactypes.el (display-value): Add to display a value when a get or
+value function returns that value.
+  hibtypes.el (action): Use 'display-value'.
+
 2022-07-12  Mats Lidell  
 
 * test/hpath-tests.el (hpath:auto-variable-alist-load-path-test): Simplify
@@ -121,6 +138,34 @@
 * hsys-org.el (hsys-org-link-at-p, hsys-org-heading-at-p): Update to use
 'smart-eolp' and 'smart-eobp'.
 
+2022-06-26  Bob Weiner  
+
+* hui-mouse.el (hkey-alist): Fix smart-lisp to jump to load, autoload and
+require targets.
+  hmouse-tag.el (smart-lisp-at-load-expression-p): Ensure expr ends with
+whitespace (a full word).
+
+2022-06-25  Bob Weiner  
+
+* hui-mini.el (hui:menu-forward-item, hui:menu-backward-item): Update to
+handle menus without a name> prefix, e.g. a-Z menu.  Also add numeric
+prefix arg handling.
+
+2022-06-20  Bob Weiner  
+
+* hui-mini.el (hui:menu-to-personal-section): Add.
+  (hui:menu-item): Add support for inserting menu item label
+into the action when the action is 'hui:menu-to-personal-section'.
+  (hui:menu-a-z): Add this customizable menu.
+
+* hyrolo.el (hyrolo-add): Add newline before adding entry if point is not
+at the beginning of the line for insertion, i.e. when buffer does not
+end with a newline.
+
+* hui-mini.el (hui:menu-multi-line): Add to change long minibuffer menu lines
+into multi-line menus.
+  (hui:menu-line): Update to use 'hui:menu-multi-line'.
+
 2022-06-19  Bob Weiner  
 
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Allow optional space
@@ -9516,5 +9561,3 @@ V5.06 changes :
  Copyright 1991-2021 Free Software Foundation, Inc.
  Copying and distribution of this file, with or without modification, are
  permitted provided the copyright notice and this notice are preserved.
-
-
diff --git a/hui-mini.el b/hui-mini.el
index 9d50c5dc64..c84bcdb55c 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:15-Oct-91 at 20:13:17
-;; Last-Mod: 15-May-22 at 00:51:30 by Bob Weiner
+;; Last-Mod: 17-Jul-22 at 09:48:06 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -217,16 +217,29 @@ the menu list structure."
(t (setq show-menu nil
 hui:menu-keys))
 
-(defun hui:menu-backward-item ()
-  "Move point back to the previous start of a selectable minibuffer menu item. 
 If on the first item, move to the last."
-  (interactive)
-  (if (save-excursion (not (search-backward ">" nil t)))
-  (goto-char (point-max)))
-  (if (and (re-search-backward "[ \t]+[^> \t\n]" nil t)
-  (save-excursion (search-backward ">" nil t)))
-  (skip-chars-forward " \t")
-(goto-char (point-min))
-(hui:menu-bac

[elpa] externals/hyperbole c38d137510 03/19: Merge branch 'master' of hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit c38d13751096304665e6c3675e2fd235f4a58ac6
Merge: 694f3110fd 988dc73672
Author: Bob Weiner 
Commit: Bob Weiner 

Merge branch 'master' of hyperbole
---
 ChangeLog  |  6 ++
 test/demo-tests.el | 11 ---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38434f30ef..f04b2fb2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-07-19  Mats Lidell  
+
+* test/demo-tests.el (fast-demo-key-series-shell-apropos): Add optional
+whitespace after command to accomodate for different versions on
+apropos.
+
 2022-07-17  Mats Lidell  
 
 * hypb.el (hypb:replace-match-string): Fix obsolete version to 8.0.1.
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 4060d9ce8e..895dcc8152 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:30-Jan-21 at 12:00:00
-;; Last-Mod: 19-Jun-22 at 20:25:19 by Bob Weiner
+;; Last-Mod: 16-Jul-22 at 22:39:47 by Mats Lidell
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -580,12 +580,9 @@ enough files with matching mode loaded."
   (action-key)
   (hy-test-helpers:consume-input-events)
   (with-current-buffer shell-buffer-name
-   (let ((buf-len (point-max)))
- (sleep-for 0.1)
- (while (/= buf-len (point-max))
-   (setq buf-len (point-max))
-   (accept-process-output)
-   (sleep-for 0.1)))
+(with-timeout (5 (ert-fail "Test timed out"))
+  (while (not (string-match-p "\ngrep ?\(1\).*-" 
(buffer-substring-no-properties (point-min) (point-max
+(accept-process-output (get-buffer-process 
shell-buffer-name
 (should (string-match-p "\ngrep ?\(1\).*-" 
(buffer-substring-no-properties (point-min) (point-max))
   (set-process-query-on-exit-flag (get-buffer-process shell-buffer-name) 
nil)
   (kill-buffer shell-buffer-name

[elpa] externals/hyperbole e9015341c0 08/19: hypb.el: Support devdocs-lookup package

[ELPA Syncer]

branch: externals/hyperbole
commit e9015341c0ec57df818ea193751892b06bc0ebca
Author: Bob Weiner 
Commit: Bob Weiner 

hypb.el: Support devdocs-lookup package

hypb.el (hypb:require-package): Add to install a package, if necessary,
   and require its library with the same name.
(hypb:helm-info): Add to require helm package and call helm-info.
---
 ChangeLog | 10 ++
 hypb.el   | 40 +++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5bca1146b9..b68deaa062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,16 @@
   MANIFEST: Added above file.
 
 2022-07-06  Bob Weiner  
+
+* hypb.el (hypb:require-package): Add to install a package, if necessary,
+and require its library with the same name.
+  (hypb:helm-info): Add to require helm package and call helm-info.
+
+2022-07-04  Bob Weiner  
+
+* hypb.el (hypb:devdocs-lookup): Install and load devdocs package and then
+call its 'devdocs-lookup' function.
+
 2022-07-02  Bob Weiner  
 
 * hyrolo.el (hyrolo-org, hyrolo-helm-org-rifle, hyrolo-org-roam): Add HyRolo-
diff --git a/hypb.el b/hypb.el
index 355bd787c1..c8f485a134 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 6-Oct-91 at 03:42:38
-;; Last-Mod: 17-Jul-22 at 10:17:21 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 11:38:43 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -272,6 +272,14 @@ If no matching installation type is found, return a list 
of (\"unknown\" hyperb:
 (goto-char (point-min))
 (forward-line 1)))
 
+;;;###autoload
+(defun hypb:devdocs-lookup ()
+  "Prompt for and display a devdocs.io docset section within Emacs.
+will this install the Emacs devdocs package when needed."
+  (interactive)
+  (hypb:require-package 'devdocs)
+  (devdocs-lookup))
+
 (defun hypb:domain-name ()
   "Return current Internet domain name with '@' prepended or nil if none."
   (let* ((dname-cmd (or (file-exists-p "/usr/bin/domainname")
@@ -415,6 +423,24 @@ With optional SUFFIX string, uses it rather than buffer 
name."
(buffer-name (generate-new-buffer bn))
   (concat hypb:help-buf-prefix bn "*"
 
+;;;###autoload
+(defun hypb:helm-apropos (&optional symbol-name)
+  "Prompt for and display the doc for a command, function, variable or face.
+With optional SYMBOL-NAME non-nil, display the doc for that.
+This will this install the Emacs helm package when needed."
+  (interactive "P")
+  (hypb:require-package 'helm)
+  (helm-apropos symbol-name))
+
+;;;###autoload
+(defun hypb:helm-info (&optional refresh)
+  "Prompt across all Info manuals and display the node selected.
+With optional prefix arg REFRESH non-nil, refresh the cache of Info manuals.
+This will this install the Emacs helm package when needed."
+  (interactive "P")
+  (hypb:require-package 'helm)
+  (helm-info refresh))
+
 (defun hypb:hkey-help-file ()
   "Return the full path to the Hyperbole mouse key help file."
   (cond ((and (fboundp 'locate-data-file)
@@ -574,6 +600,18 @@ that returns a replacement string."
 new))
 (replace-regexp-in-string regexp new str fixedcase literal)))
 
+;;;###autoload
+(defun hypb:require-package (package-name)
+  "Install, if necessary, and require the Emacs PACKAGE-NAME.
+PACKAGE-NAME may be a symbol or a string."
+  (when (stringp package-name)
+(setq package-name (intern package-name)))
+  (unless (symbolp package-name)
+(error "(hypb:require-package): package-name must be a symbol or string, 
not '%s'" package-name))
+  (unless (package-installed-p package-name)
+(package-install package-name))
+  (require package-name))
+
 (defun hypb:return-process-output (program &optional infile &rest args)
   "Return as a string the output from external PROGRAM with INFILE for input.
 Rest of ARGS are passed as arguments to PROGRAM.

[elpa] externals/hyperbole 80d1d2dd4c 12/19: Update tests to work with new ibut:create code

[ELPA Syncer]

branch: externals/hyperbole
commit 80d1d2dd4c4ab7a23cc6f00e4821803d5ab93e93
Author: Bob Weiner 
Commit: Bob Weiner 

Update tests to work with new ibut:create code
---
 ChangeLog| 19 +++
 test/demo-tests.el   | 76 +---
 test/hbut-tests.el   | 15 +
 test/hui-tests.el| 10 +++---
 test/hy-test-dependencies.el | 18 ---
 test/hy-test-helpers.el  |  7 +++-
 6 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ba09c5ca7..3364aafea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+* hib-debbugs.el (debbugs-version-sufficient-p): Handle if version
+is nil due to edebug mocking of 'find-file-noselect'.
+  test/hui-tests.el (hui-gibut-create-link-to-file,
+hui-gibut-create-link-to-file-line,
+hui-gibut-create-link-to-file-line-and-column):
+  test/hbut-tests.el (gbut-program-calls-ebut-program)
+gbut-program-link-to-directory, gbut-program-eval-elisp,
+gbut-program-link-to-file, gbut-program-link-to-file-line,
+gbut-program-link-to-file-line-and-column):
+  Replace mock of 'find-file-noselect' with 'hpath:find-noselect'
+  so tests do not interfere with other calls to 'find-file-noselect'.
+
+* test/hy-test-helpers.el (hy-test-helpers:kill-buffer):
+Add to kill buffers only when they exist.
+  test/demo-tests.el (fast-demo-key-series-shell-apropos):
+Use 'hy-test-helpers:kill-buffer'.
+  test/hy-test-dependencies.el (hy-test-ensure-package-installed):
+Simplified by defining this function.
+
 2022-07-17  Bob Weiner  
 
 * hmouse-drv.el (hkey-debug): Add print of all button properties when on
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 76b9c7b2ac..035599546a 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:30-Jan-21 at 12:00:00
-;; Last-Mod: 17-Jul-22 at 14:31:49 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 19:18:48 by Bob Weiner
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -43,7 +43,7 @@
 (action-key)
 (should (bolp))
 (should (looking-at "^\\* Smart")))
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest demo-smart-mouse-keys-ebut-test ()
   (unwind-protect
@@ -54,7 +54,7 @@
 (action-key)
 (should (bolp))
 (should (looking-at "^ +\\* Smart")))
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest demo-table-of-contents-test ()
   (unwind-protect
@@ -65,7 +65,7 @@
 (action-key)
 (should (bolp))
 (should (looking-at "^* Koutliner")))
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 ;; Smart scrolling
 (ert-deftest demo-smart-scrolling-proportional-test ()
@@ -81,7 +81,7 @@
   (end-of-line)
   (action-key)
   (should (= pos (window-start)
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest demo-smart-scrolling-non-proportional-test ()
   (unwind-protect
@@ -95,32 +95,30 @@
   (end-of-line)
   (action-key)
   (should (< pos (window-start)
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 ;; Hyperbole menus
 
 ;; Help Buffer
 (ert-deftest demo-action-key-help ()
   (let ((help-buffer "*Help: Hyperbole Action Key*"))
-(if (get-buffer help-buffer)
-(kill-buffer help-buffer))
+(hy-test-helpers:kill-buffer help-buffer)
 (unwind-protect
 (with-temp-buffer
   (insert "Text")
   (hkey-help)
   (should (get-buffer help-buffer))
-  (kill-buffer help-buffer)
+  (hy-test-helpers:kill-buffer help-buffer)
 
 (ert-deftest demo-assist-key-help ()
   (let ((help-buffer "*Help: Hyperbole Assist Key*"))
-(if (get-buffer help-buffer)
-(kill-buffer help-buffer))
+(hy-test-helpers:kill-buffer help-buffer)
 (unwind-protect
 (with-temp-buffer
   (insert "Text")
   (hkey-help t)
   (should (get-buffer help-buffer))
-  (kill-buffer help-buffer)
+  (hy-test-helpers:kill-buffer help-buffer)
 
 ;; Hy-control
 (ert-deftest demo-window-grid-22-test ()
@@ -131,7 +129,7 @@
 (should (hact 'kbd-key "C-h h s f @ 22 RET Q"))
 (hy-test-helpers:consume-input-events)
 (should (eq 4 (length (window-list)
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest demo-window-grid-33-test ()
   (skip-unless (not noninteractive))
@@ -141,7 +139,7 @@
 (should (hact 'kbd-key "C-h h s f @ 33 RET Q"))
 (hy-test-helpers:consume-input-events)
 (should (eq 9 (length (window-list)
-(kill-buffer "DEMO")))
+(hy-test-helpers:kill-buffer "DEMO")))
 
 ;; Hy-rolo
 (ert-deftest demo-hy-rolo-test ()
@@ -

[elpa] externals/hyperbole 694f3110fd 02/19: hsys-org.el: Activate only if not at eol or eob

[ELPA Syncer]

branch: externals/hyperbole
commit 694f3110fddd7640254dfc717c3064f37739f7e4
Author: Bob Weiner 
Commit: Bob Weiner 

hsys-org.el: Activate only if not at eol or eob
---
 ChangeLog   |  3 +++
 hsys-org.el | 47 ---
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f23ebcaff..38434f30ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,9 @@
   MANIFEST: Added above file.
 
 2022-07-06  Bob Weiner  
+* hsys-org.el (hsys-org-link-at-p, hsys-org-heading-at-p): Update to use
+'smart-eolp' and 'smart-eobp'.
+
 2022-06-19  Bob Weiner  
 
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Allow optional space
diff --git a/hsys-org.el b/hsys-org.el
index 10e0409d08..2b0da07087 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 2-Jul-16 at 14:54:14
-;; Last-Mod: 22-May-22 at 15:05:49 by Bob Weiner
+;; Last-Mod:  2-Jul-22 at 14:45:35 by Bob Weiner
 ;;
 ;; Copyright (C) 2016-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -197,32 +197,33 @@ Match to all todos if `keyword' is nil or the empty 
string."
 Assume caller has already checked that the current buffer is in `org-mode'
 or are looking for an Org link in another buffer type."
   ;; If any Org test fails, just return nil
-  (condition-case ()
-  (let* ((context
- ;; Only consider supported types, even if they are not
- ;; the closest one.
- (org-element-lineage
-  ;; Next line can trigger an error when `looking-at' is called
-  ;; with a `nil' value of `org-complex-heading-regexp'.
-  (org-element-context)
-  '(clock footnote-definition footnote-reference headline
-  inlinetask link timestamp)
-  t))
-(type (org-element-type context)))
-   (or (eq type 'link)
-   (and (boundp 'org-link-bracket-re)
-(org-in-regexp org-link-bracket-re))
-   (and (boundp 'org-bracket-link-regexp)
-(org-in-regexp org-bracket-link-regexp))
-   (and (boundp 'org-target-link-regexp)
-(not (null org-target-link-regexp))
-(org-in-regexp org-target-link-regexp
-(error nil)))
+  (unless (or (smart-eolp) (smart-eobp))
+(condition-case ()
+   (let* ((context
+   ;; Only consider supported types, even if they are not
+   ;; the closest one.
+   (org-element-lineage
+;; Next line can trigger an error when `looking-at' is called
+;; with a `nil' value of `org-complex-heading-regexp'.
+(org-element-context)
+'(clock footnote-definition footnote-reference headline
+inlinetask link timestamp)
+t))
+  (type (org-element-type context)))
+ (or (eq type 'link)
+ (and (boundp 'org-link-bracket-re)
+  (org-in-regexp org-link-bracket-re))
+ (and (boundp 'org-bracket-link-regexp)
+  (org-in-regexp org-bracket-link-regexp))
+ (and (boundp 'org-target-link-regexp)
+  (not (null org-target-link-regexp))
+  (org-in-regexp org-target-link-regexp
+  (error nil
 
 ;; Assume caller has already checked that the current buffer is in org-mode.
 (defun hsys-org-heading-at-p (&optional _)
   "Non-nil when on a headline."
-  (unless (eolp)
+  (unless (or (smart-eolp) (smart-eobp))
 (outline-on-heading-p t)))
 
 ;; Assume caller has already checked that the current buffer is in org-mode.

[elpa] externals/hyperbole 7a86ea33e2 09/19: Add ibut:create and allow Assist Key :help for Elisp functions

[ELPA Syncer]

branch: externals/hyperbole
commit 7a86ea33e246c66a9e5fdcd98a219d2ec9bb87e9
Author: Bob Weiner 
Commit: Bob Weiner 

Add ibut:create and allow Assist Key :help for Elisp functions
---
 ChangeLog   |  13 ++
 hact.el |   8 ++--
 hbut.el | 129 +---
 hibtypes.el |  55 +-
 4 files changed, 134 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b68deaa062..21b4c9bfe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 to return search expression rather than doing the search.  Use
 with Assist Key.
 
+* hibtypes.el (action): Call ibut:create to ensure button attributes
+are set properly.
 * test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
   fast-demo-key-series-shell-grep,
   fast-demo-key-series-shell-apropos):
@@ -66,6 +68,11 @@
 (hypb:function-symbol-replace, hypb:map-sublists)
 (hypb:constant-vector-symbol-replace): Delete functions.
 
+* hbut.el (ibut:create): Add, extracted from 'ibut:at-p'; define
+with cl-defun so can optionally use non-positional colon-prefixed
+keyword args to specify specific args.
+
+* hmouse-drv.el (hkey-help): Set 'assist-flag' so matches Assist Key
 2022-07-12  Mats Lidell  
 
 * test/hpath-tests.el (hpath:auto-variable-alist-load-path-test): Simplify
@@ -74,6 +81,12 @@
 * test/hui-tests.el (hui-gbut-edit-link-to-file-button): Remove test file
 after test case is completed.
 
+2022-07-11  Bob Weiner  
+
+* hibtypes.el (action:help): Allow for action button assist key :help
+functions, even if the action button type is not a Hyperbole type,
+i.e. a regular function.
+
 2022-07-11  Mats Lidell  
 
 * test/hy-test-helpers.el (hy-test-helpers:should-last-message): Use
diff --git a/hact.el b/hact.el
index edc16f2798..131bf9c22f 100644
--- a/hact.el
+++ b/hact.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 30-May-22 at 13:55:46 by Bob Weiner
+;; Last-Mod: 17-Jul-22 at 12:58:33 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -264,8 +264,10 @@ When optional SYM is given, returns the name for that 
symbol only, if any."
 ;;; 
 
 (defun   htype:symbol (type type-category)
-  "Return possibly new Hyperbole type symbol composed from TYPE and 
TYPE-CATEGORY (both symbols)."
-  (intern (concat (symbol-name type-category) "::" (symbol-name type
+  "Return possibly new Hyperbole type symbol composed from TYPE and 
TYPE-CATEGORY (both symbols).
+TYPE-CATEGORY must be one of `actypes' or `ibtypes'; if not, return nil."
+  (when (memq type-category '(actypes ibtypes))
+(intern (concat (symbol-name type-category) "::" (symbol-name type)
 
 ;;; 
 ;;; action class
diff --git a/hbut.el b/hbut.el
index 10fe130fc0..2f8568b60c 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 15-Jul-22 at 22:07:35 by Mats Lidell
+;; Last-Mod: 17-Jul-22 at 16:26:56 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -17,8 +17,8 @@
 ;;; Other required Elisp libraries
 ;;; 
 
-(eval-and-compile (mapc #'require '(elisp-mode help-mode hversion hmoccur
-   hbmap htz hbdata hact view)))
+(eval-and-compile (mapc #'require '(cl-lib elisp-mode help-mode hversion
+   hmoccur hbmap htz hbdata hact view)))
 
 ;;; 
 ;;; Public declarations
@@ -1519,52 +1519,11 @@ excluding delimiters, not just one."
;; should need that.
(goto-char (min (+ 2 (match-end 0)) (point-max)))
  (goto-char opoint
-
-   ;; Check for an implicit button at current point, record its
-   ;; attributes and return a button symbol for it.
-   (let ((types (htype:category 'ibtypes))
- ;; Global var used in (hact) function, don't delete.
- (hrule:action 'actype:identity)
- (ibpoint (point-marker))
- (itype)
- (args)
- (is-type))
- (unless key-only
-   (hattr:clear 'hbut:current))
- (while (and (not is-type) types)
-   (setq itype (car types))
-   (when (and itype (setq args (funcall itype)))
- (setq is-type itype)
- ;; Any implicit button type check should leave point
- ;; unchanged.

[elpa] externals/hyperbole 44262d14a7 14/19: Resolve all but one test case issues from the latest updates

[ELPA Syncer]

branch: externals/hyperbole
commit 44262d14a73dd69f067224bf48aa88c11cd64042
Author: Bob Weiner 
Commit: Bob Weiner 

Resolve all but one test case issues from the latest updates

Have to make ibut:at-p set lbl-start and lbl-end to ibut text
position even when point is on the ibut's preceding name.
---
 ChangeLog  | 28 +++
 hact.el|  2 +-
 hactypes.el|  6 +++---
 hbut.el| 61 ++
 hib-debbugs.el |  4 ++--
 hibtypes.el|  8 +++-
 hui-mini.el|  4 ++--
 hui.el |  9 +++--
 8 files changed, 82 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 317b847ea9..5ba684c69f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2022-07-23  Bob Weiner  
+
+* hbut.el (ibut:to): Clear any hbut:current attributes before trying
+   to find the matching ibut.
+
+* hibtypes.el (action): Display the result of evaluating the action
+in the minibuffer for all types of expressions.
+  hactypes.el (display-value, display-variable): Fix to display
+Lisp-readable values.
+
+* hui.el (hui:gibut-create): Add (ibut:create) call so 'hbut:current
+stores the attributes of the newly created global button.
+
+* hbut.el (hbut:action): If action defined, return only first
+element to match the return when actype is used.
+  (hbut:act): Use action attribute if defined.
+ (ibut:create): Prevent removal of 1st arg if actype
+is set.
+
 * hibtypes.el (elisp-compiler-msg): Add support for ERT "Test "
 lines to jump to the def of the symbol and for symbol and pathname
 references from backtraces in ERT output.
@@ -21,6 +40,15 @@
   test/hy-test-dependencies.el (hy-test-ensure-package-installed):
 Simplified by defining this function.
 
+2022-07-22  Bob Weiner  
+
+* hmouse-drv.el (hkey-debug): Use 'action' attribute if set, otherwise,
+use 'actype' and 'args'.
+
+* hbut.el (ibut:create): Add 'dir' key parameter and set as hbut:current
+attribute.  Remove '(or args)' as that was preventing set of
+ hbut:current attributes.
+
 2022-07-17  Bob Weiner  
 
 * hmouse-drv.el (hkey-debug): Add print of all button properties when on
diff --git a/hact.el b/hact.el
index 131bf9c22f..9ad080418c 100644
--- a/hact.el
+++ b/hact.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 17-Jul-22 at 12:58:33 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 21:25:44 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
diff --git a/hactypes.el b/hactypes.el
index 2ac2a4d1e8..3e48657192 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:23-Sep-91 at 20:34:36
-;; Last-Mod: 12-Jul-22 at 01:21:40 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 22:25:35 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -65,13 +65,13 @@ Return any non-nil value or t."
   "Display a message showing VALUE (a symbol) and its value.
 Return any non-nil value or t."
   (let ((result (eval value)))
-(message "%s" result)
+(message "%S" result)
 (or result t)))
 
 (defact display-variable (var)
   "Display a message showing VAR (a symbol) and its value.
 Return any non-nil value or t."
-  (message "%s = %s" var (symbol-value var))
+  (message "%s = %S" var (symbol-value var))
   (or (symbol-value var) t))
 
 (defact eval-elisp (lisp-expr)
diff --git a/hbut.el b/hbut.el
index a391c8b86c..9864e3c5b2 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 23-Jul-22 at 01:57:12 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 23:39:56 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -650,7 +650,7 @@ argument.
 
 For interactive creation, use `hui:gbut-create' instead."
   (save-excursion
-(with-current-buffer (find-file-noselect (expand-file-name hbmap:filename 
hbmap:dir-user))
+(with-current-buffer (hpath:find-noselect (expand-file-name hbmap:filename 
hbmap:dir-user))
   (save-excursion
(goto-char (point-max))
(when (not (bolp))
@@ -889,6 +889,7 @@ Default is 'hbut:current."
 (setq hbut 'hbut:current))
   (cond ((hbut:is-p hbut)
 (let ((orig-point (point-marker))
+  (action (hattr:get hbut 'action))
   text-point)
   (when (ibut:is-p hbut)
 ;; Determine whether point is already within hbut; if
@@ -921,12 +922,12 @@ Default is 'hbut:current."
  (>= delim-text-end (point)))
   (ibut:to-text (hattr:get hbut 'lbl-key))
   (setq text-point (point-marker))
-  (prog1 (apply hrule:action
-

[elpa] externals/hyperbole c517641b51 18/19: * ibut:create Ensure lbl-key is always set to name, if available

[ELPA Syncer]

branch: externals/hyperbole
commit c517641b51346ac27137294ab6f5c3a55a242f1a
Author: Bob Weiner 
Commit: Bob Weiner 

* ibut:create Ensure lbl-key is always set to name, if available

Also ensure lbl-start and lbl-end point to the text start and end
for an ibut.
---
 ChangeLog |  4 
 hbut.el   | 41 ++---
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 730e8c9aa8..0e69a0d6c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2022-07-24  Bob Weiner  
 
+* hbut.el (ibut:at-p, ibut:create): Ensure lbl-key is always set to
+name, if available, and lbl-start and lbl-end point to the text
+start and end for an ibut.
+
 * hibtypes.el (action): Ensure actypes:: prefix is added to any action
 attribute that uses a Hyperbole actype.  Also, set args attribute
 to exclude the actype.
diff --git a/hbut.el b/hbut.el
index 44ee56a214..98f8fe7617 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 24-Jul-22 at 10:29:28 by Bob Weiner
+;; Last-Mod: 24-Jul-22 at 11:29:49 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1504,9 +1504,8 @@ excluding delimiters, not just one."
   (unless (eolp)
 (let* ((opoint (point))
   (name-start-end (ibut:label-p t nil nil t t))
-  (name  (nth 0 name-start-end))
-  (start (nth 1 name-start-end))
-  (end   (nth 2 name-start-end))
+  (name   (nth 0 name-start-end))
+  (name-end   (nth 2 name-start-end))
   (lbl-key (or (ibut:label-to-key name)
(ibut:label-p nil "\"" "\"" nil t
   (unwind-protect
@@ -1514,7 +1513,7 @@ excluding delimiters, not just one."
(when (not (hbut:outside-comment-p))
  ;; Skip past any optional name and separators
  (when name-start-end
-   (goto-char end)
+   (goto-char name-end)
(if (looking-at ibut:label-separator-regexp)
;; Move past up to 2 possible characters of ibut
;; delimiters; this prevents recognizing labeled,
@@ -1525,9 +1524,11 @@ excluding delimiters, not just one."
(if key-only
lbl-key
  ;; Check for an implicit button at current point, record its
- ;; attributes and return a button symbol for it.
- (ibut:create :name name :lbl-key lbl-key :lbl-start start
-  :lbl-end end)))
+ ;; attributes and return a button symbol for it.  This call
+ ;; typically writes the text start and end attributes saved as
+ ;; `lbl-start' and `lbl-end' after finding the ibut type at point.
+ ;; So do not pass these attributes in to this call.
+ (ibut:create :name name :lbl-key lbl-key)))
(goto-char opoint)
 
 (defunibut:at-type-p (ibut-type-symbol)
@@ -1552,7 +1553,10 @@ associated arguments from the button."
 Return nil if no implicit button at point."
   ;; :args is ignored unless :categ is also given.
 
-  ;; lbl-start and lbl-end should always be the start and end of the
+  ;; `lbl-key' attribute will be set from the button name, if any;
+  ;; otherwise, from its text.
+
+  ;; `lbl-start' and `lbl-end' will be set from the start and end of the
   ;; ibut text, excluding delimiters, not of its name.
 
   ;; Since the Smart Keys handle end-of-line and end-of-buffer
@@ -1583,14 +1587,14 @@ Return nil if no implicit button at point."
 
   (when is-type
(let ((current-name  (hattr:get 'hbut:current 'name))
- (current-lbl-key   (hattr:get 'hbut:current 'lbl-key))
+ ;; (current-lbl-key   (hattr:get 'hbut:current 'lbl-key))
  (current-lbl-start (hattr:get 'hbut:current 'lbl-start))
  (current-lbl-end   (hattr:get 'hbut:current 'lbl-end))
- (current-categ (hattr:get 'hbut:current 'categ))
+ ;; (current-categ (hattr:get 'hbut:current 'categ))
  (current-loc   (hattr:get 'hbut:current 'loc))
  (current-dir   (hattr:get 'hbut:current 'dir))
  (current-action(hattr:get 'hbut:current 'action))
- (current-actype(hattr:get 'hbut:current 'actype))
+ ;; (current-actype(hattr:get 'hbut:current 'actype))
  (current-args  (hattr:get 'hbut:current 'args)))
 
  (if current-name
@@ -1600,13 +1604,12 @@ Return nil if no implicit button at point."
(when name
  (hattr:set 'hbut:current 'name name)))
 
- (if current-lbl-key
- (setq lbl-key current-lbl-key)
-   (unless lbl-key
- (setq lbl-key (or (ibut:label-to-key name)
-   (ibut:label-p nil "\"" "\""

[elpa] externals/hyperbole d256f195ee 11/19: Fix major issues with ibut:create but some tests still fail

[ELPA Syncer]

branch: externals/hyperbole
commit d256f195ee199383fff83073243cd0f0553c57ca
Author: Bob Weiner 
Commit: Bob Weiner 

Fix major issues with ibut:create but some tests still fail
---
 hbut.el   | 14 --
 hibtypes.el   |  4 ++--
 hmouse-drv.el |  7 ---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hbut.el b/hbut.el
index 2f8568b60c..a391c8b86c 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 17-Jul-22 at 16:26:56 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 01:57:12 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1543,7 +1543,7 @@ associated arguments from the button."
  (funcall ibut-type-symbol))
 
 (cl-defun ibut:create (&optional &key name lbl-key lbl-start lbl-end
-loc categ actype args action)
+loc dir categ actype args action)
   "Return `hbut:current' symbol with attributes of implicit button at point.
 Return nil if no implicit button at point."
   ;; :args is ignored unless :categ is also given.
@@ -1555,7 +1555,7 @@ Return nil if no implicit button at point."
   (unless (or (eolp) (eobp))
 (let* ((types (htype:category 'ibtypes))
   ;; Global var used in (hact) function, don't delete.
-  (hrule:action 'actype:identity)
+  (hrule:action #'actype:identity)
   (name-start-end (ibut:label-p t nil nil t t))
   (ibpoint (point-marker))
   (itype)
@@ -1596,10 +1596,11 @@ Return nil if no implicit button at point."
  (hattr:set 'hbut:current 'lbl-key lbl-key))
(hattr:set 'hbut:current 'loc (or loc (save-excursion
(hbut:key-src 'full
+   (hattr:set 'hbut:current 'dir (or dir (hui:key-dir (current-buffer
(when action
- (hattr:set 'hbut:current 'action action))
-   (or args
-   (hattr:get 'hbut:current 'args)
+ (hattr:set 'hbut:current 'action action)
+ (unless args (setq args action)))
+   (or (hattr:get 'hbut:current 'args)
(not (listp args))
(progn
  (setq args (copy-sequence args))
@@ -1607,6 +1608,7 @@ Return nil if no implicit button at point."
(setq args (cdr args)))
  (hattr:set 'hbut:current 'actype
 (or
+ actype
  ;; Hyperbole action type
  (symtable:actype-p (car args))
  ;; Regular Emacs Lisp function symbol
diff --git a/hibtypes.el b/hibtypes.el
index a366ab30c2..384d0cd858 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:19-Sep-91 at 20:45:31
-;; Last-Mod: 17-Jul-22 at 23:19:27 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 01:30:20 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1370,7 +1370,7 @@ arg1 ... argN '>'.  For example, ."
 ;; at the end of the buffer
 ;; or is followed by a space, punctuation or grouping character.
 (when (and lbl-key (or (null (char-before start-pos))
-(memq (char-syntax (char-before start-pos)) '(?\  
?\> ?\( ?\
+   (memq (char-syntax (char-before start-pos)) '(?\  
?\> ?\( ?\
(not (memq (char-syntax (char-after (1+ start-pos))) '(?\  
?\>)))
(or (null (char-after end-pos))
(memq (char-syntax (char-after end-pos)) '(?\  ?\> ?. ?\( 
?\)))
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 5a1e952296..2e4246791e 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:04-Feb-90
-;; Last-Mod: 17-Jul-22 at 23:15:34 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 01:57:43 by Bob Weiner
 ;;
 ;; Copyright (C) 1989-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -856,8 +856,9 @@ frame instead."
   pred
   (if assist-flag "Assist" "Action")
   (if (hattr:get  'hbut:current 'actype)
-  (cons (hattr:get  'hbut:current 'actype)
-(hattr:get  'hbut:current 'args))
+  (or (hattr:get  'hbut:current 'action)
+  (cons (hattr:get  'hbut:current 'actype)
+(hattr:get  'hbut:current 'args)))
 (hypb:format-quote (format "%s" hkey-action)))
   (current-buffer)
   major-mode

[elpa] externals/hyperbole 75c9214c35 19/19: hypb:require-package: Prompt user with y/n query before install pkg

[ELPA Syncer]

branch: externals/hyperbole
commit 75c9214c359af9fd33960f43477ceea5e170686f
Author: Bob Weiner 
Commit: Bob Weiner 

hypb:require-package: Prompt user with y/n query before install pkg
---
 ChangeLog | 3 +++
 hypb.el   | 8 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e69a0d6c8..ff3a313605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2022-07-24  Bob Weiner  
 
+* hypb.el (hypb:require-package): Prompt user with y/n query before
+installing a package when it is not already installed.
+
 * hbut.el (ibut:at-p, ibut:create): Ensure lbl-key is always set to
 name, if available, and lbl-start and lbl-end point to the text
 start and end for an ibut.
diff --git a/hypb.el b/hypb.el
index c8f485a134..e3e60ad3ae 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 6-Oct-91 at 03:42:38
-;; Last-Mod: 17-Jul-22 at 11:38:43 by Bob Weiner
+;; Last-Mod: 24-Jul-22 at 11:41:00 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -602,14 +602,16 @@ that returns a replacement string."
 
 ;;;###autoload
 (defun hypb:require-package (package-name)
-  "Install, if necessary, and require the Emacs PACKAGE-NAME.
+  "Prompt user to install, if necessary, and require the Emacs PACKAGE-NAME.
 PACKAGE-NAME may be a symbol or a string."
   (when (stringp package-name)
 (setq package-name (intern package-name)))
   (unless (symbolp package-name)
 (error "(hypb:require-package): package-name must be a symbol or string, 
not '%s'" package-name))
   (unless (package-installed-p package-name)
-(package-install package-name))
+(if (y-or-n-p (format "Install package `%s' required by this command?" 
package-name))
+   (package-install package-name)
+  (keyboard-quit)))
   (require package-name))
 
 (defun hypb:return-process-output (program &optional infile &rest args)

[elpa] externals/hyperbole 5e6e10dd6e 13/19: elisp-compiler-msg: Add Smart Key support for ERT "Test "

[ELPA Syncer]

branch: externals/hyperbole
commit 5e6e10dd6e61ae1940dca41114087e9e19db21f3
Author: Bob Weiner 
Commit: Bob Weiner 

elisp-compiler-msg: Add Smart Key support for ERT "Test "

Such lines jump to the def of the symbol.  Also add support for
symbol and pathname references from backtraces in ERT output.
---
 ChangeLog   |  4 
 hibtypes.el | 40 ++--
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3364aafea8..317b847ea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* hibtypes.el (elisp-compiler-msg): Add support for ERT "Test "
+lines to jump to the def of the symbol and for symbol and pathname
+references from backtraces in ERT output.
+
 * hib-debbugs.el (debbugs-version-sufficient-p): Handle if version
 is nil due to edebug mocking of 'find-file-noselect'.
   test/hui-tests.el (hui-gibut-create-link-to-file,
diff --git a/hibtypes.el b/hibtypes.el
index 384d0cd858..ac1811c6f5 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:19-Sep-91 at 20:45:31
-;; Last-Mod: 23-Jul-22 at 01:30:20 by Bob Weiner
+;; Last-Mod: 23-Jul-22 at 18:26:19 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -38,6 +38,7 @@
 (require 'cl-lib) ;; for cl-count
 (require 'subr-x) ;; For string-trim
 (require 'hactypes)
+(require 'thingatpt)
 
 ;;; 
 ;;; Public variables
@@ -1066,23 +1067,42 @@ This works with JavaScript and Python tracebacks, gdb, 
dbx, and xdb.  Such lines
 ;;; 
 
 (defib elisp-compiler-msg ()
-  "Jump to source code for definition associated with an Emacs Lisp error 
message.
-The error may from the Emacs byte compiler, the Emacs Lisp native
+  "Jump to definition of an Emacs Lisp symbol in an error or test message.
+The message may come from the Emacs byte compiler, the Emacs Lisp native
 compiler or the Emacs regression test system (ERT).
-This works when activated anywhere within the file line references."
+This works when activated anywhere within file line references."
   (when (or (member (buffer-name) '("*Compile-Log-Show*" "*Compile-Log*"
 "*compilation*" 
"*Async-native-compile-log*" "*ert*"))
 (save-excursion
   (and (re-search-backward "^[^ \t\n\r]" nil t)
(looking-at "While compiling\\|In \\([^ \n]+\\):$"
-(let (src buffer-p label)
+(let (src buffer-p label start-end
+ lbl-start-end)
   (or
;; Emacs Regression Test (ERT) output lines
-   (save-excursion
-(forward-line 0)
-(when (looking-at 
"\\s-+\\(passed\\|failed\\|skipped\\)\\s-+[0-9]+/[0-9]+\\s-+\\(\\S-+\\)\\s-+(")
-   (setq label (match-string-no-properties 2))
-   (ibut:label-set label (match-beginning 2) (match-end 2))
+   (when (or (save-excursion
+  (forward-line 0)
+  (or (looking-at 
"\\s-+\\(passed\\|failed\\|skipped\\)\\s-+[0-9]+/[0-9]+\\s-+\\(\\S-+\\)\\s-+(")
+  (looking-at 
"\\(Test\\)\\s-+\\(\\S-+\\)\\s-+\\(backtrace\\|condition\\):")))
+;; Handle symbols and pathnames in a backtrace from an ERT 
test exception
+(save-match-data
+  (and (save-excursion
+ (re-search-backward "^$\\|^Test 
\\(\\S-+\\)\\s-+\\(backtrace\\|condition\\):" nil t)
+ (looking-at "Test "))
+   (or
+;; Handle double-quoted pathnames
+(and (setq lbl-start-end 
(hpath:delimited-possible-path nil t)
+   label (nth 0 lbl-start-end))
+ (ibut:label-set label (nth 1 lbl-start-end) (nth 
2 lbl-start-end)))
+;; Handle symbols
+(and (setq label (thing-at-point 'symbol)
+   start-end (bounds-of-thing-at-point 
'symbol))
+ (ibut:label-set label (car start-end) (cdr 
start-end)))
+ (unless label
+  (setq label (match-string-no-properties 2))
+  (ibut:label-set label (match-beginning 2) (match-end 2)))
+(if (hpath:is-p label)
+(hact 'link-to-file label)
;; Remove prefix generated by actype and ibtype definitions.
(setq label (hypb:replace-match-string "[^:]+::" label "" t))
(hact 'smart-tags-display label nil)))

[elpa] externals-release/org 9d29de23cf 3/6: Backport commit b2bce107b from Emacs

[ELPA Syncer]

branch: externals-release/org
commit 9d29de23cf957c56cbda09e8a4714997609ca6c1
Author: Lars Ingebrigtsen 
Commit: Kyle Meyer 

Backport commit b2bce107b from Emacs

* lisp/org.el (org-latex-to-html-convert-command):
* lisp/org-agenda.el (org-agenda-sorting-strategy): Audit use of
various single quotes in Lisp doc strings.

Further audits of single quotes in Lisp doc strings
b2bce107b15d6e0c2b773704179c6bf463525459
Lars Ingebrigtsen
Tue May 24 13:17:53 2022 +0200

[km] Org's bugfix branch is currently receiving commits from emacs-28,
 but this commit comes from Emacs's master branch.  I'm porting it
 because it has conflicts with bugfix's 01b0fb14b (Backport from
 main: Escape single left quotes in docstrings, 2022-07-24) and
 only touches docstrings.
---
 lisp/org-agenda.el | 2 +-
 lisp/org.el| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index dfd5d829db..a43b083d53 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1615,7 +1615,7 @@ alpha-down Sort headlines alphabetically, 
reversed.
 
 The different possibilities will be tried in sequence, and testing stops
 if one comparison returns a \"not-equal\".  For example, the default
-'(time-up category-keep priority-down)
+`(time-up category-keep priority-down)'
 means: Pull out all entries having a specified time of day and sort them,
 in order to make a time schedule for the current day the first thing in the
 agenda listing for the day.  Of the entries without a time indication, keep
diff --git a/lisp/org.el b/lisp/org.el
index 06af12339e..5387ea2f0f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3301,7 +3301,7 @@ Replace format-specifiers in the command as noted below 
and use
 %i: The LaTeX fragment to be converted.
 
 For example, this could be used with LaTeXML as
-\"latexmlc 'literal:%i' --profile=math --preload=siunitx.sty 2>/dev/null\"."
+\"latexmlc \\='literal:%i\\=' --profile=math --preload=siunitx.sty 
2>/dev/null\"."
   :group 'org-latex
   :package-version '(Org . "9.4")
   :type '(choice

[elpa] externals-release/org 6e991f4bb9 6/6: Backport commit 10b691987 from Emacs

[ELPA Syncer]

branch: externals-release/org
commit 6e991f4bb9f922963cc82e7718daa9ce77e3b15c
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit 10b691987 from Emacs

; Fix typos
10b69198708105655c49b62ac7d6185abb7e02a7
Stefan Kangas
Sat Jul 16 10:07:38 2022 +0200
---
 lisp/ol.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index a03d85f618..f9816a187d 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -937,7 +937,7 @@ characters that should be escaped."
 
 (defun org-link-decode (s)
   "Decode percent-encoded parts in string S.
-E.g. \"%C3%B6\" becomes the german o-Umlaut."
+E.g. \"%C3%B6\" becomes the German o-Umlaut."
   (replace-regexp-in-string "\\(%[0-9A-Za-z]\\{2\\}\\)+"
#'org-link--decode-compound s t t))
 

[elpa] externals-release/org updated (1c3a46268f -> 6e991f4bb9)

[ELPA Syncer]

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

  from  1c3a46268f Backport from main: Fix compatibility with Emacs 26
   new  cea0263784 Backport commit bbf389ea6 from Emacs
   new  5fdbf159f2 Backport commit 2d71fd3b0 from Emacs
   new  9d29de23cf Backport commit b2bce107b from Emacs
   new  2e36ac2ac1 Merge single quote fixes from Emacs's master
   new  745bdebe73 Backport commit ba0871bef from Emacs
   new  6e991f4bb9 Backport commit 10b691987 from Emacs


Summary of changes:
 doc/org-manual.org |  4 ++--
 etc/ORG-NEWS   | 20 ++--
 lisp/ob-core.el|  2 +-
 lisp/ob-julia.el   |  8 
 lisp/ob-lua.el |  2 +-
 lisp/ob-table.el   |  2 +-
 lisp/ol.el |  2 +-
 lisp/org-agenda.el |  4 ++--
 lisp/org-table.el  |  2 +-
 lisp/ox-html.el|  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

[elpa] externals/hyperbole dcb0b9e7aa 17/19: Merge branch 'master' of hyperbole; initial 80-col comment fixes

[ELPA Syncer]

branch: externals/hyperbole
commit dcb0b9e7aade7da581edabaa6263fad9b9ae7ca8
Merge: 716507c51c 89913d256c
Author: Bob Weiner 
Commit: Bob Weiner 

Merge branch 'master' of hyperbole; initial 80-col comment fixes
---
 ChangeLog   | 58 -
 hact.el | 32 +--
 hactypes.el | 14 --
 hargs.el| 10 ++
 hbdata.el   | 22 --
 hib-debbugs.el  | 40 ++-
 hmouse-tag.el   |  3 ++-
 kotl/kcell.el   |  9 +
 kotl/kexport.el | 44 ---
 9 files changed, 136 insertions(+), 96 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20459163a1..730e8c9aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,36 +61,28 @@
 attribute.  Remove '(or args)' as that was preventing set of
  hbut:current attributes.
 
-2022-07-17  Bob Weiner  
-
-* hmouse-drv.el (hkey-debug): Add print of all button properties when on
-a Hyperbole button.
-
-* hsettings.el (hyperbole-web-search): Add optional 'return-search-expr-flag'
-to return search expression rather than doing the search.  Use
-with Assist Key.
-
-* hibtypes.el (action): Call ibut:create to ensure button attributes
-are set properly.
-  hbut.el (ibut:create): Return nil if at end-of-buffer.
+2022-07-21  Mats Lidell  
 
-* hui-mouse.el (smart-imenu-item-p): Support -99 position value
-that Emacs uses to indicate a rescan should be done.
+* kotl/kexport.el:
+* kotl/kcell.el: Shorten docs strings to be within 80 char limit.
 
-* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir,
-  fast-demo-key-series-shell-grep,
-  fast-demo-key-series-shell-apropos):
-Use 'sh' instead of 'bash' for wider applicability.
-Don't kill shell buffer if it exists before the test is invoked.
+2022-07-20  Mats Lidell  
 
-* hact.el (htype:symbol): Return nil if type-category is invalid.
+* hact.el:
+* hmouse-tag.el:
+* hbdata.el:
+* hactypes.el:
+* hib-debbugs.el:
+* hargs.el: Shorten docs strings to be within 80 char limit.
 
-2022-07-17  Mats Lidell  
+2022-07-19  Mats Lidell  
 
 * test/demo-tests.el (fast-demo-key-series-shell-apropos): Add optional
 whitespace after command to accomodate for different versions on
 apropos.
 
+2022-07-17  Mats Lidell  
+
 * hypb.el (hypb:replace-match-string): Fix obsolete version to 8.0.1.
 
 * kotl/kotl-mode.el (kotl-mode:beginning-of-line): Rename from
@@ -115,6 +107,30 @@
 (kcell-view:lines-visible, kview:set-cells-status): Use it.
 (label-sep-len):  Mark variable as obsolete. Use kview-label-sep-len.
 
+2022-07-17  Bob Weiner  
+
+* hmouse-drv.el (hkey-debug): Add print of all button properties when on
+a Hyperbole button.
+
+* hsettings.el (hyperbole-web-search): Add optional 'return-search-expr-flag'
+to return search expression rather than doing the search.  Use
+with Assist Key.
+
+* hibtypes.el (action): Call ibut:create to ensure button attributes
+are set properly.
+  hbut.el (ibut:create): Return nil if at end-of-buffer.
+
+* hui-mouse.el (smart-imenu-item-p): Support -99 position value
+that Emacs uses to indicate a rescan should be done.
+
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir,
+  fast-demo-key-series-shell-grep,
+  fast-demo-key-series-shell-apropos):
+Use 'sh' instead of 'bash' for wider applicability.
+Don't kill shell buffer if it exists before the test is invoked.
+
+* hact.el (htype:symbol): Return nil if type-category is invalid.
+
 2022-07-15  Mats Lidell  
 
 * test/hypb-tests.el: Remove test cases for hypb:replace-match-string.
diff --git a/hact.el b/hact.el
index 9ad080418c..5a8ecd3963 100644
--- a/hact.el
+++ b/hact.el
@@ -1,9 +1,9 @@
-;;; hact.el --- GNU Hyperbole button action handling  -*- lexical-binding: t; 
-*-
+;;; hact.el --- GNU Hyperbole button action handling  -*- lexical-binding: t; 
-let*-
 ;;
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 23-Jul-22 at 21:25:44 by Bob Weiner
+;; Last-Mod: 24-Jul-22 at 10:58:30 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -49,11 +49,12 @@ The type categories are either 'actypes or 'ibtypes.")
   (plist-get symtable 'name))
 
 (defsubst symtable:select (type-category)
-  "Inline the return of the symtable for TYPE-CATEGORY, one of 'actypes or 
'ibtypes."
+  "Inline the return of the symtable for TYPE-CATEGORY.
+TYPE-CATEGORY is one of `actypes' or `ibtypes'."
   (plist-get symtable:category-plist type-category))
 
 (defunsymtable:operate (operation symbol-or-name symtable)
-  "Call hash-table function OPERATION with Hyperbole SYMBOL-OR-NAME as key 
upon SYMTABLE.
+  "Call hash-table OPERATION with Hyperbole SYMBOL-OR-NAME key for SYMTABLE.
 Trigger an e

[elpa] externals/hyperbole 716507c51c 16/19: Fix a number of issues with ibut attribute handling

[ELPA Syncer]

branch: externals/hyperbole
commit 716507c51c7435167cc954c2d5d2a1eb38ab81ed
Author: Bob Weiner 
Commit: Bob Weiner 

Fix a number of issues with ibut attribute handling
---
 ChangeLog   |  15 +--
 hbut.el | 117 +---
 hibtypes.el |  15 +--
 hpath.el|  74 +
 test/hpath-tests.el |   9 ++--
 5 files changed, 140 insertions(+), 90 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5617e81393..20459163a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,19 @@
+2022-07-24  Bob Weiner  
+
+* hibtypes.el (action): Ensure actypes:: prefix is added to any action
+attribute that uses a Hyperbole actype.  Also, set args attribute
+to exclude the actype.
+
+* hbut.el (ibut:create): Rewrite to prefer values from hbut:current
+over any passed in individually.
+
 * test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir):
   FAST-DEMO: Change pushd to cd since /bin/sh does not support pushd.
 
-2022-07-23  Bob Weiner  
+* hpath.el (hpath:find): Rename filename arg to pathname and trigger
+an error if not a string.
 
-* hbut.el (ibut:to): Clear any hbut:current attributes before trying
-   to find the matching ibut.
+2022-07-23  Bob Weiner  
 
 * hibtypes.el (action): Display the result of evaluating the action
 in the minibuffer for all types of expressions.
diff --git a/hbut.el b/hbut.el
index 724ecdac73..44ee56a214 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 23-Jul-22 at 23:39:56 by Bob Weiner
+;; Last-Mod: 24-Jul-22 at 10:29:28 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1581,48 +1581,80 @@ Return nil if no implicit button at point."
 
   (set-marker ibpoint nil)
 
-  (unless name
-   (setq name (ibut:label-p t nil nil nil t)))
-  (unless (and lbl-key lbl-start lbl-end)
-   (setq lbl-key-start-end (ibut:label-p nil "\"" "\"" t t)))
-  (unless lbl-key
-   (setq lbl-key (or (ibut:label-to-key name)
- (nth 0 lbl-key-start-end
-  (unless lbl-start
-   (setq lbl-start (nth 1 lbl-key-start-end)))
-  (unless lbl-end
-   (setq lbl-end (nth 2 lbl-key-start-end)))
-
   (when is-type
-   (when name
- (hattr:set 'hbut:current 'name name))
-   (when lbl-start
- (hattr:set 'hbut:current 'lbl-start lbl-start))
-   (when lbl-end
- (hattr:set 'hbut:current 'lbl-end lbl-end))
-   (hattr:set 'hbut:current 'categ is-type)
-   (when lbl-key
- (hattr:set 'hbut:current 'lbl-key lbl-key))
-   (hattr:set 'hbut:current 'loc (or loc (save-excursion
-   (hbut:key-src 'full
-   (hattr:set 'hbut:current 'dir (or dir (hui:key-dir (current-buffer
-   (when action
- (hattr:set 'hbut:current 'action action)
- (unless args (setq args action)))
-   (or (hattr:get 'hbut:current 'args)
-   (not (listp args))
-   (progn
- (setq args (copy-sequence args))
- (when (eq (car args) #'hact)
-   (setq args (cdr args)))
- (hattr:set 'hbut:current 'actype
-(or
- actype
- ;; Hyperbole action type
- (symtable:actype-p (car args))
- ;; Regular Emacs Lisp function symbol
- (car args)))
- (hattr:set 'hbut:current 'args (if actype args (cdr args)
+   (let ((current-name  (hattr:get 'hbut:current 'name))
+ (current-lbl-key   (hattr:get 'hbut:current 'lbl-key))
+ (current-lbl-start (hattr:get 'hbut:current 'lbl-start))
+ (current-lbl-end   (hattr:get 'hbut:current 'lbl-end))
+ (current-categ (hattr:get 'hbut:current 'categ))
+ (current-loc   (hattr:get 'hbut:current 'loc))
+ (current-dir   (hattr:get 'hbut:current 'dir))
+ (current-action(hattr:get 'hbut:current 'action))
+ (current-actype(hattr:get 'hbut:current 'actype))
+ (current-args  (hattr:get 'hbut:current 'args)))
+
+ (if current-name
+ (setq name current-name)
+   (unless name
+ (setq name (ibut:label-p t nil nil nil t)))
+   (when name
+ (hattr:set 'hbut:current 'name name)))
+
+ (if current-lbl-key
+ (setq lbl-key current-lbl-key)
+   (unless lbl-key
+ (setq lbl-key (or (ibut:label-to-key name)
+   (ibut:label-p nil "\"" "\"" nil t
+   (when lbl-key
+ (hattr:set 'hbut:current 'lbl-key lbl-key)))
+
+ (if current-lbl-start
+ (setq lbl

[elpa] externals-release/org cea0263784 1/6: Backport commit bbf389ea6 from Emacs

[ELPA Syncer]

branch: externals-release/org
commit cea02637849b8f17b0cd547f80789acd2e94cbd2
Author: Lars Ingebrigtsen 
Commit: Kyle Meyer 

Backport commit bbf389ea6 from Emacs

* lisp/ox-publish.el (org-publish-find-property):
* lisp/ox-html.el (org-html--unlabel-latex-environment):
* lisp/org-table.el (org-table-collapse-header):
* lisp/org-plot.el (org--plot/prime-factors):
* lisp/org-agenda.el (org-agenda--mark-blocked-entry):
(org-agenda-set-restriction-lock):
* lisp/ob-lua.el (org-babel-lua-read-string):
* lisp/ob-julia.el (org-babel-julia-evaluate-external-process):
(org-babel-julia-evaluate-session):
* lisp/ob-core.el (org-babel-default-header-args): Fix
quoting in doc strings.  In code examples, the ' character is
quoted with \\=, and regularize 'foo to `foo', and quote strings
like "foo" instead of 'foo'.

Audit quoting the quote character in doc strings
bbf389ea6deab229ba18dc519fe712ec982609d1
Lars Ingebrigtsen
Fri Apr 22 16:17:22 2022 +0200

[km] Org's bugfix branch is currently receiving commits from emacs-28,
 but this commit comes from Emacs's master branch.  I'm porting it
 because it has conflicts with bugfix's 01b0fb14b (Backport from
 main: Escape single left quotes in docstrings, 2022-07-24) and
 only touches docstrings.
---
 lisp/ob-core.el| 2 +-
 lisp/ob-julia.el   | 8 
 lisp/ob-lua.el | 2 +-
 lisp/org-agenda.el | 4 ++--
 lisp/org-plot.el   | 2 +-
 lisp/org-table.el  | 2 +-
 lisp/ox-html.el| 2 +-
 lisp/ox-publish.el | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 23ef162a7f..04af84d2e4 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -480,7 +480,7 @@ value.  The value can either be a string or a closure that
 evaluates to a string.  The closure is evaluated when the source
 block is being evaluated (e.g. during execution or export), with
 point at the source block.  It is not possible to use an
-arbitrary function symbol (e.g. 'some-func), since org uses
+arbitrary function symbol (e.g. `some-func'), since org uses
 lexical binding.  To achieve the same functionality, call the
 function within a closure (e.g. (lambda () (some-func))).
 
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index abddca3613..50a44bcf44 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -250,8 +250,8 @@ end")
 (defun org-babel-julia-evaluate-external-process
 (body result-type result-params column-names-p)
   "Evaluate BODY in external julia process.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
@@ -274,8 +274,8 @@ last statement in BODY, as elisp."
 (defun org-babel-julia-evaluate-session
 (session body result-type result-params column-names-p)
   "Evaluate BODY in SESSION.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 48de0dbad0..b6e78fb7fd 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -395,7 +395,7 @@ fd:close()"
 (org-babel-lua-table-or-string results)
 
 (defun org-babel-lua-read-string (string)
-  "Strip 's from around Lua string."
+  "Strip \\=' characters from around Lua string."
   (org-unbracket-string "'" "'" string))
 
 (provide 'ob-lua)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 71aac271f7..dfd5d829db 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4124,7 +4124,7 @@ dimming them."   ;FIXME: The arg isn't 
used, actually!
 
 If the header at `org-hd-marker' is blocked according to
 `org-entry-blocked-p', then if `org-agenda-dim-blocked-tasks' is
-'invisible and the header is not blocked by checkboxes, set the
+`invisible' and the header is not blocked by checkboxes, set the
 text property `org-todo-blocked' to `invisible', otherwise set it
 to t."
   (when (get-text-property 0 'todo-state entry)
@@ -7399,7 +7399,7 @@ Argument ARG is the prefix argument."
 When in a restricted subtree, remove it.
 
 The restriction will span over the entire file if TYPE is `file',
-or if type is '(4), or if the cursor is before the first headline
+or if type is \\='(4), or if the cursor is before the first headline
 in the file.  Otherwise, only apply the restriction to the current
 subtree."
   (interactive "P")
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index bf84c99e04..4507fbe7dd 100644
--- a/lisp/org-plot.el
+++ b

[elpa] externals/org updated (540fcd0193 -> 5a64429b27)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  540fcd0193 ox-publish: fix typo in function name
   new  cea0263784 Backport commit bbf389ea6 from Emacs
   new  5fdbf159f2 Backport commit 2d71fd3b0 from Emacs
   new  9d29de23cf Backport commit b2bce107b from Emacs
   new  2e36ac2ac1 Merge single quote fixes from Emacs's master
   new  745bdebe73 Backport commit ba0871bef from Emacs
   new  6e991f4bb9 Backport commit 10b691987 from Emacs
   new  5a64429b27 Merge branch 'bugfix'


Summary of changes:
 doc/org-manual.org |  4 ++--
 etc/ORG-NEWS   | 20 ++--
 lisp/ob-core.el|  2 +-
 lisp/ob-julia.el   |  8 
 lisp/ob-table.el   |  2 +-
 lisp/ol.el |  2 +-
 lisp/org-agenda.el |  4 ++--
 lisp/org-table.el  |  2 +-
 lisp/ox-html.el|  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

[elpa] externals-release/org 5fdbf159f2 2/6: Backport commit 2d71fd3b0 from Emacs

[ELPA Syncer]

branch: externals-release/org
commit 5fdbf159f27243147983147caae0f2060ba6b097
Author: Lars Ingebrigtsen 
Commit: Kyle Meyer 

Backport commit 2d71fd3b0 from Emacs

* lisp/ob-table.el (org-sbe): Further quoting fixes in doc strings.

Further doc string quoting fixes
2d71fd3b041506c68b5f1cd1e409e09e25778c34
Lars Ingebrigtsen
Fri Apr 22 17:16:42 2022 +0200

[km] Org's bugfix branch is currently receiving commits from emacs-28,
 but this commit comes from Emacs's master branch.  I'm porting it
 because it has conflicts with bugfix's 01b0fb14b (Backport from
 main: Escape single left quotes in docstrings, 2022-07-24) and
 only touches docstrings.
---
 lisp/ob-table.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 2f092998d8..f6729e0ece 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -84,7 +84,7 @@ is the equivalent of the following source code block:
  #+end_src
 
 NOTE: The quotation marks around the function name,
-'source-block', are optional.
+`source-block', are optional.
 
 NOTE: By default, string variable names are interpreted as
 references to source-code blocks, to force interpretation of a

[elpa] externals/hyperbole dcc51fb827 15/19: Change pushd to cd since /bin/sh does not support pushd

[ELPA Syncer]

branch: externals/hyperbole
commit dcc51fb8276c1ed6fd3a40970e2e1d843f73b260
Author: Bob Weiner 
Commit: Bob Weiner 

Change pushd to cd since /bin/sh does not support pushd
---
 ChangeLog  | 9 ++---
 FAST-DEMO  | 2 +-
 hbut.el| 3 +--
 test/demo-tests.el | 8 
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ba684c69f..5617e81393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir):
+  FAST-DEMO: Change pushd to cd since /bin/sh does not support pushd.
+
 2022-07-23  Bob Weiner  
 
 * hbut.el (ibut:to): Clear any hbut:current attributes before trying
@@ -65,7 +68,7 @@
 * hui-mouse.el (smart-imenu-item-p): Support -99 position value
 that Emacs uses to indicate a rescan should be done.
 
-* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir,
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir,
   fast-demo-key-series-shell-grep,
   fast-demo-key-series-shell-apropos):
 Use 'sh' instead of 'bash' for wider applicability.
@@ -300,7 +303,7 @@
 
 2022-06-13  Mats Lidell  
 
-* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir)
+* test/demo-tests.el (fast-demo-key-series-shell-cd-hyperb-dir)
 (fast-demo-key-series-shell-grep, fast-demo-key-series-shell-apropos):
 Tests for shell related key series examples in the fast demo.
 
@@ -420,7 +423,7 @@
 
 * hbut.el (ebut:label-p): Fix handling when point is on final RET and
 have nested lists as in here with braces:
-{ M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+{ M-x shell RET M-> (cd ${hyperb:dir}) RET }
 by adding a (forward-list) call in the first 'while' construct.
 
 2022-05-14  Bob Weiner  
diff --git a/FAST-DEMO b/FAST-DEMO
index 08e604944a..a70feb54a0 100644
--- a/FAST-DEMO
+++ b/FAST-DEMO
@@ -187,7 +187,7 @@
don't forget to reset it to your preferred shell when you are ready
with the demo.
 
-{ M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+{ M-x shell RET M-> (cd ${hyperb:dir}) RET }
 
Move to a directory in a shell based on a Lisp variable.  Sections
within key series surrounded by parentheses maintain spaces between
diff --git a/hbut.el b/hbut.el
index 9864e3c5b2..724ecdac73 100644
--- a/hbut.el
+++ b/hbut.el
@@ -233,7 +233,7 @@ to two lines."
  (setq start t))
start)
  ;; Handle expressions like:
- ;; { M-x shell RET M-> (pushd ${hyperb:dir}) RET }
+ ;; { M-x shell RET M-> (cd ${hyperb:dir}) RET }
  (save-excursion
(when (eq ?\( (char-syntax (preceding-char)))
  (condition-case ()
@@ -1563,7 +1563,6 @@ Return nil if no implicit button at point."
 (let* ((types (htype:category 'ibtypes))
   ;; Global var used in (hact) function, don't delete.
   (hrule:action #'actype:identity)
-  (lbl-key-start-end)
   (ibpoint (point-marker))
   (itype)
   (is-type categ))
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 035599546a..1bbfa6b9e6 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:   Mats Lidell 
 ;;
 ;; Orig-Date:30-Jan-21 at 12:00:00
-;; Last-Mod: 23-Jul-22 at 19:18:48 by Bob Weiner
+;; Last-Mod: 24-Jul-22 at 09:18:04 by Bob Weiner
 ;;
 ;; Copyright (C) 2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -526,15 +526,15 @@ enough files with matching mode loaded."
   (global-set-key (kbd "C-x C-b") old)
   (hy-test-helpers:kill-buffer dir
 
-(ert-deftest fast-demo-key-series-shell-pushd-hyperb-dir ()
-  "Action key executes pushd shell command."
+(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir ()
+  "Action key executes cd shell command."
   (skip-unless (not noninteractive))
   (let* ((shell-file-name (executable-find "sh"))
  (shell-buffer-name "*shell*")
 (existing-shell-flag (get-buffer-process shell-buffer-name)))
 (unwind-protect
 (with-temp-buffer
-  (insert "{ M-x shell RET M-> (pushd ${hyperb:dir} && echo 
\"PWD=$(pwd)\") RET }")
+  (insert "{ M-x shell RET M-> (cd ${hyperb:dir} && echo 
\"PWD=$(pwd)\") RET }")
   (goto-char 5)
   (action-key)
   (hy-test-helpers:consume-input-events)

[elpa] externals-release/org 745bdebe73 5/6: Backport commit ba0871bef from Emacs

[ELPA Syncer]

branch: externals-release/org
commit 745bdebe73d4ebbd254fe45d33b230f82b6baa72
Author: Stefan Kangas 
Commit: Kyle Meyer 

Backport commit ba0871bef from Emacs

; Fix typos: prefer American spelling
ba0871bef1e7d321f1124a6ad20e9be158a976dd
Stefan Kangas
Wed Jul 13 13:04:22 2022 +0200
---
 doc/org-manual.org |  4 ++--
 etc/ORG-NEWS   | 20 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index f3f273ad65..23d4007d2c 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -2866,12 +2866,12 @@ For more information and examples see the 
[[https://orgmode.org/worg/org-tutoria
 - transpose ::
 
   When =y=, =yes=, or =t= attempt to transpose the table data before
-  plotting.  Also recognises the shorthand option =trans=.
+  plotting.  Also recognizes the shorthand option =trans=.
 
 - =type= ::
 
   Specify the type of the plot, by default one of  =2d=, =3d=, =radar=, or 
=grid=.
-  Available types can be customised with ~org-plot/preset-plot-types~.
+  Available types can be customized with ~org-plot/preset-plot-types~.
 
 - =with= ::
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 37a39131d9..3c164b1282 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -293,7 +293,7 @@ with width equal to the pixel-width of the buffer text 
multiplied by 0.7.
 This functionality is implemented in a new function,
 ~org-display-inline-image--width~ which contains the width
 determination logic previously in ~org-display-inline-images~ and the
-new behaviour.
+new behavior.
 
 ** New options
 *** Option ~org-hidden-keywords~ now also applies to #+SUBTITLE:
@@ -311,7 +311,7 @@ descriptions.
 *** New option ~org-id-ts-format~
 
 Earlier, IDs generated using =ts= method had a hard-coded format (i.e. 
=20200923T160237.891616=).
-The new option allows user to customise the format.
+The new option allows user to customize the format.
 Defaults are unchanged.
 
 *** New argument for ~file-desc~ babel header
@@ -503,16 +503,16 @@ heading, except return nil.
 
 *** Faces of all the heading text elements now conform to the headline face
 
-In the past, faces of todo keywords, emphasised text, tags, and
+In the past, faces of todo keywords, emphasized text, tags, and
 priority cookies inherited =default= face.  The resulting headline
 fontification was not always consistent, as discussed in 
[[msg::87h7sawubl@protesilaos.com][this bug
 report]].  Now, the relevant faces adapt to face used to fontify the
 current headline level.
 
-Users who prefer to keep the old behaviour should change their face
-customisation explicitly stating that =default= face is inherited.
+Users who prefer to keep the old behavior should change their face
+customization explicitly stating that =default= face is inherited.
 
-Example of old face customisation:
+Example of old face customization:
 
 #+begin_src emacs-lisp
 (setq org-todo-keyword-faces '(("TODO"
@@ -520,7 +520,7 @@ Example of old face customisation:
 :height 0.75)))
 #+end_src
 
-To preserve the old behaviour the above customisation should be
+To preserve the old behavior the above customization should be
 changed to
 
 #+begin_src emacs-lisp
@@ -543,7 +543,7 @@ The function does not allow for a third optional parameter 
anymore.
 *** LaTeX environment =#+results= are now removed
 
 If a babel src block produces a raw LaTeX environment, it will now be
-recognised as a result, and so replaced when re-evaluated.
+recognized as a result, and so replaced when re-evaluated.
 
 *** Tag completion now uses =completing-read-multiple=
 
@@ -681,7 +681,7 @@ enabled, and point is neither in a table nor on a timestamp 
or a link:
 - =C-j= (bound to the new command ~org-return-and-maybe-indent~)
   merely inserts a newline.
 
-To get the previous behaviour back, disable ~electric-indent-mode~
+To get the previous behavior back, disable ~electric-indent-mode~
 explicitly:
 
 #+begin_src emacs-lisp
@@ -1029,7 +1029,7 @@ Previously all session names had  ~org-babel-session-~ 
prepended.
 *** Forward/backward paragraph functions in line with the rest of Emacs
 
 ~org-forward-paragraph~ and ~org-backward-paragraph~, bound to
-~~ and ~~ functions mimic more closely behaviour of
+~~ and ~~ functions mimic more closely behavior of
 ~forward-paragraph~ and ~backward-paragraph~ functions when
 available.
 

[elpa] externals-release/org 2e36ac2ac1 4/6: Merge single quote fixes from Emacs's master

[ELPA Syncer]

branch: externals-release/org
commit 2e36ac2ac18e6be3986c5fc534fe3d6837b0b20e
Merge: 1c3a46268f 9d29de23cf
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge single quote fixes from Emacs's master

This brings in ports of bbf389ea6de (Audit quoting the quote character
in doc strings, 2022-04-22), 2d71fd3b041 (Further doc string quoting
fixes, 2022-04-22), and b2bce107b15 (Further audits of single quotes
in Lisp doc strings, 2022-05-24) from Emacs's master branch, resolving
conflicts with 01b0fb14b (Backport from main: Escape single left
quotes in docstrings, 2022-07-24).

In all cases, take Emacs's side.  There are two cases where I think
Org's version is preferable, org-babel-lua-read-string and
org-agenda-sorting-strategy.  Don't keep those _on bugfix_ to avoid
conflicts when Emacs's emacs-28 branch is merged to its master branch.
When I merge bugfix to main, I'll keep Org's variant, so they'll
eventually make it to Emacs's tree, just not as part of the Org 9.5.x
to emacs-28 syncing.
---
 lisp/ob-core.el| 2 +-
 lisp/ob-julia.el   | 8 
 lisp/ob-lua.el | 2 +-
 lisp/ob-table.el   | 2 +-
 lisp/org-agenda.el | 4 ++--
 lisp/org-table.el  | 2 +-
 lisp/ox-html.el| 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 37155d4c58..04af84d2e4 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -480,7 +480,7 @@ value.  The value can either be a string or a closure that
 evaluates to a string.  The closure is evaluated when the source
 block is being evaluated (e.g. during execution or export), with
 point at the source block.  It is not possible to use an
-arbitrary function symbol (e.g. \\='some-func), since org uses
+arbitrary function symbol (e.g. `some-func'), since org uses
 lexical binding.  To achieve the same functionality, call the
 function within a closure (e.g. (lambda () (some-func))).
 
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index be0110f48a..50a44bcf44 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -250,8 +250,8 @@ end")
 (defun org-babel-julia-evaluate-external-process
 (body result-type result-params column-names-p)
   "Evaluate BODY in external julia process.
-If RESULT-TYPE equals \\='output then return standard output as a
-string.  If RESULT-TYPE equals \\='value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
@@ -274,8 +274,8 @@ last statement in BODY, as elisp."
 (defun org-babel-julia-evaluate-session
 (session body result-type result-params column-names-p)
   "Evaluate BODY in SESSION.
-If RESULT-TYPE equals \\='output then return standard output as a
-string.  If RESULT-TYPE equals \\='value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (cl-case result-type
 (value
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index c8c28498e8..b6e78fb7fd 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -395,7 +395,7 @@ fd:close()"
 (org-babel-lua-table-or-string results)
 
 (defun org-babel-lua-read-string (string)
-  "Strip single quotes from around Lua string."
+  "Strip \\=' characters from around Lua string."
   (org-unbracket-string "'" "'" string))
 
 (provide 'ob-lua)
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 0f6d41c5e1..f6729e0ece 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -84,7 +84,7 @@ is the equivalent of the following source code block:
  #+end_src
 
 NOTE: The quotation marks around the function name,
-\\='source-block\\=', are optional.
+`source-block', are optional.
 
 NOTE: By default, string variable names are interpreted as
 references to source-code blocks, to force interpretation of a
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 4831c66b00..a43b083d53 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1615,7 +1615,7 @@ alpha-down Sort headlines alphabetically, 
reversed.
 
 The different possibilities will be tried in sequence, and testing stops
 if one comparison returns a \"not-equal\".  For example, the default
-\\='(time-up category-keep priority-down)
+`(time-up category-keep priority-down)'
 means: Pull out all entries having a specified time of day and sort them,
 in order to make a time schedule for the current day the first thing in the
 agenda listing for the day.  Of the entries without a time indication, keep
@@ -4124,7 +4124,7 @@ dimming them."   ;FIXME: The arg isn't 
used, actually!
 
 If the header at `org-hd-marker' is blocked according to
 `org-entry-blocked-p', then if `org-agenda-dim-blocked-tasks' is
-\\='invisible and the header is not blocked by checkboxes, set the
+

[elpa] externals/org 5a64429b27: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 5a64429b2713fd2a5257393882b1aa478eaf9726
Merge: 540fcd0193 6e991f4bb9
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'bugfix'

As mentioned in 2e36ac2ac (Merge single quote fixes from Emacs's
master, 2022-07-24), this merge is keeping Org main's side of
org-babel-lua-read-string and org-agenda-sorting-strategy rather than
the variant introduced in the Emacs repo that's now in bugfix.

Note that for org-agenda-sorting-strategy docstring I think it'd
probably be preferable to change main's

\\='(time-up category-keep priority-down)

to a bare

(time-up category-keep priority-down)

but, at least for this merge, I'm sticking to choosing between the
variables that are in one of the sides.
---
 doc/org-manual.org |  4 ++--
 etc/ORG-NEWS   | 20 ++--
 lisp/ob-core.el|  2 +-
 lisp/ob-julia.el   |  8 
 lisp/ob-table.el   |  2 +-
 lisp/ol.el |  2 +-
 lisp/org-agenda.el |  4 ++--
 lisp/org-table.el  |  2 +-
 lisp/ox-html.el|  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index d5bd9092f2..0da76bfdff 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -2887,12 +2887,12 @@ For more information and examples see the 
[[https://orgmode.org/worg/org-tutoria
 - transpose ::
 
   When =y=, =yes=, or =t= attempt to transpose the table data before
-  plotting.  Also recognises the shorthand option =trans=.
+  plotting.  Also recognizes the shorthand option =trans=.
 
 - =type= ::
 
   Specify the type of the plot, by default one of  =2d=, =3d=, =radar=, or 
=grid=.
-  Available types can be customised with ~org-plot/preset-plot-types~.
+  Available types can be customized with ~org-plot/preset-plot-types~.
 
 - =with= ::
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 4cda357f11..478fcf95c0 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -657,7 +657,7 @@ with width equal to the pixel-width of the buffer text 
multiplied by 0.7.
 This functionality is implemented in a new function,
 ~org-display-inline-image--width~ which contains the width
 determination logic previously in ~org-display-inline-images~ and the
-new behaviour.
+new behavior.
 
 ** New options
 *** Option ~org-hidden-keywords~ now also applies to #+SUBTITLE:
@@ -675,7 +675,7 @@ descriptions.
 *** New option ~org-id-ts-format~
 
 Earlier, IDs generated using =ts= method had a hard-coded format (i.e. 
=20200923T160237.891616=).
-The new option allows user to customise the format.
+The new option allows user to customize the format.
 Defaults are unchanged.
 
 *** New argument for ~file-desc~ babel header
@@ -874,16 +874,16 @@ heading, except return nil.
 
 *** Faces of all the heading text elements now conform to the headline face
 
-In the past, faces of todo keywords, emphasised text, tags, and
+In the past, faces of todo keywords, emphasized text, tags, and
 priority cookies inherited =default= face.  The resulting headline
 fontification was not always consistent, as discussed in 
[[msg::87h7sawubl@protesilaos.com][this bug
 report]].  Now, the relevant faces adapt to face used to fontify the
 current headline level.
 
-Users who prefer to keep the old behaviour should change their face
-customisation explicitly stating that =default= face is inherited.
+Users who prefer to keep the old behavior should change their face
+customization explicitly stating that =default= face is inherited.
 
-Example of old face customisation:
+Example of old face customization:
 
 #+begin_src emacs-lisp
 (setq org-todo-keyword-faces '(("TODO"
@@ -891,7 +891,7 @@ Example of old face customisation:
 :height 0.75)))
 #+end_src
 
-To preserve the old behaviour the above customisation should be
+To preserve the old behavior the above customization should be
 changed to
 
 #+begin_src emacs-lisp
@@ -914,7 +914,7 @@ The function does not allow for a third optional parameter 
anymore.
 *** LaTeX environment =#+results= are now removed
 
 If a babel src block produces a raw LaTeX environment, it will now be
-recognised as a result, and so replaced when re-evaluated.
+recognized as a result, and so replaced when re-evaluated.
 
 *** Tag completion now uses =completing-read-multiple=
 
@@ -1052,7 +1052,7 @@ enabled, and point is neither in a table nor on a 
timestamp or a link:
 - =C-j= (bound to the new command ~org-return-and-maybe-indent~)
   merely inserts a newline.
 
-To get the previous behaviour back, disable ~electric-indent-mode~
+To get the previous behavior back, disable ~electric-indent-mode~
 explicitly:
 
 #+begin_src emacs-lisp
@@ -1400,7 +1400,7 @@ Previously all session names had  ~org-babel-session-~ 
prepended.
 *** Forward/backward paragraph functions in line with the rest of Emacs
 
 ~org-forward-paragraph~ and ~org-backward-paragraph~, bound to
-~~ and ~~ functions mimic more closely behaviour of
+~~ an

[nongnu] elpa/subed updated (badbfb7d20 -> eefe94f308)

[ELPA Syncer]

elpasync pushed a change to branch elpa/subed.

  from  badbfb7d20 Increment the version number to 1.0.6
   new  e871b72c50 Add note about "Service name too long"
   new  eefe94f308 Change default subed-mpv-socket-dir to $TEMP/subed


Summary of changes:
 README.org| 7 +++
 subed/subed-config.el | 2 +-
 subed/subed.el| 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

[nongnu] elpa/subed e871b72c50 1/2: Add note about "Service name too long"

[ELPA Syncer]

branch: elpa/subed
commit e871b72c5060e9c8ddcbdf030a04b3e533f014fe
Author: Sacha Chua 
Commit: Sacha Chua 

Add note about "Service name too long"
---
 README.org | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/README.org b/README.org
index 9951d117e5..bc6581da60 100644
--- a/README.org
+++ b/README.org
@@ -172,6 +172,13 @@ Here's an example setup if you use use-package:
 ~subed-srt-mode~, ~subed-vtt-mode~, and ~subed-ass-mode~. When
 manually loading a mode, use those specific format modes instead of
 ~subed-mode~.
+** Troubleshooting
+*** subed-mpv: Service name too long
+
+If =subed-mpv-client= reports =(error "Service name too long")=, this
+is probably because the path to the socket used to communicate with
+MPV is too long for your operating system. You can use =M-x customize=
+to set =subed-mpv-socket-dir= to a shorter path.
 
 ** Contributions
Contributions would be really appreciated! subed conforms to the 
[[https://reuse.software/spec/][REUSE

[nongnu] elpa/subed eefe94f308 2/2: Change default subed-mpv-socket-dir to $TEMP/subed

[ELPA Syncer]

branch: elpa/subed
commit eefe94f308d7006a498b17fc9acf01790b793bcd
Author: Sacha Chua 
Commit: Sacha Chua 

Change default subed-mpv-socket-dir to $TEMP/subed

* subed/subed-config.el (subed-mpv-socket-dir): Shorten the default
subed-mpv-socket-dir to $TEMP/subed in order to minimize "Service name
too long" errors.
---
 subed/subed-config.el | 2 +-
 subed/subed.el| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/subed/subed-config.el b/subed/subed-config.el
index 715ad02855..4ecf0ea668 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -212,7 +212,7 @@ doing so."
 remembers whether it was originally enabled by the user.")
 
 
-(defcustom subed-mpv-socket-dir (concat (temporary-file-directory) 
"subed-mpv-socket")
+(defcustom subed-mpv-socket-dir (concat (temporary-file-directory) "subed")
   "Path to Unix IPC socket that is passed to mpv's --input-ipc-server option."
   :type 'file
   :group 'subed)
diff --git a/subed/subed.el b/subed/subed.el
index f9af1cf9ec..4b7ad1d11c 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -1,6 +1,6 @@
 ;;; subed.el --- A major mode for editing subtitles  -*- lexical-binding: t; 
-*-
 
-;; Version: 1.0.6
+;; Version: 1.0.7
 ;; Maintainer: Sacha Chua 
 ;; Author: Random User
 ;; Keywords: convenience, files, hypermedia, multimedia

[elpa] externals/denote 36440d7b7d: Refine front matter rewrite

[ELPA Syncer]

branch: externals/denote
commit 36440d7b7dfb975e8a3c87e52208d8a59c213ed3
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Refine front matter rewrite

This should avoid false positives by anchoring the search at the
relevant front matter key.

The code is broken into smaller parts for easier hacking.

This change should address the bug with false positives reported by
hpgisler in issue 63 on the GitHub mirror:
.
---
 denote-dired.el| 28 +---
 denote-retrieve.el |  3 +++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/denote-dired.el b/denote-dired.el
index d990169ee4..8ece6de42b 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -282,6 +282,25 @@ replace what isn't there."
  ;; Heuristic to check if this is one of our notes
  (string= (expand-file-name default-directory) (denote-directory)
 
+;; FIXME 2022-07-25: We should make the underlying regular expressions
+;; that `denote-retrieve--value-title' targets more refined, so that we
+;; capture eveyrhing at once.
+(defun denote-dired--rewrite-title (file old new)
+  "Rewrite OLD front matter of title to NEW value in FILE."
+  (save-excursion
+(goto-char (point-min))
+(re-search-forward denote-retrieve--title-front-matter-key-regexp nil t 1)
+(search-forward old nil t 1)
+(replace-match (concat "\\1" new) t)))
+
+(defun denote-dired--rewrite-keywords (file old new)
+  "Rewrite OLD front matter of keywords to NEW value in FILE."
+  (save-excursion
+(goto-char (point-min))
+(re-search-forward denote-retrieve--keywords-front-matter-key-regexp nil t 
1)
+(search-forward old nil t 1)
+(replace-match (concat "\\1" new) t)))
+
 (defun denote-dired--rewrite-front-matter (file title keywords)
   "Rewrite front matter of note after `denote-dired-rename-file'.
 The FILE, TITLE, and KEYWORDS are passed from the renaming
@@ -302,13 +321,8 @@ appropriate."
  (propertize new-title 'face 'success)
  (propertize old-keywords 'face 'error)
  (propertize new-keywords 'face 'success)))
-  (save-excursion
-(goto-char (point-min))
-(search-forward old-title nil t 1)
-(replace-match (concat "\\1" new-title) t)
-(goto-char (point-min))
-(search-forward old-keywords nil t 1)
-(replace-match (concat "\\1" new-keywords) t)))
+  (denote-dired--rewrite-title file old-title new-title)
+  (denote-dired--rewrite-keywords file old-keywords new-keywords))
 
 (defun denote-dired--add-front-matter (file title keywords id)
   "Add front matter to the beginning of FILE.
diff --git a/denote-retrieve.el b/denote-retrieve.el
index fd21df0453..0e6ef21f86 100644
--- a/denote-retrieve.el
+++ b/denote-retrieve.el
@@ -33,6 +33,9 @@
 (require 'denote)
 (require 'xref)
 
+;; FIXME 2022-07-25: We must review these.  When we need to move in the
+;; buffer, we should capture both the key and its value at once.  Check
+;; `denote-dired--rewrite-front-matter'.
 (defconst denote-retrieve--title-front-matter-key-regexp
   "^\\(?:#\\+\\)?\\(?:title\\)\\s-*[:=]"
   "Regular expression for title key.")

[elpa] externals/denote updated (36440d7b7d -> f525bbd8fa)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  36440d7b7d Refine front matter rewrite
   new  b745cae875 Revert "Refine front matter rewrite"
   new  47073aa2a0 Re-implement commit 36440d7
   new  d3a537d065 Regex to allow for non-ASCII characters in title and tags
   new  0b69904020 Merge branch 'protesilaos:main' into main
   new  19c4fa8b09 Merge pull request #64 from pprevos/main
   new  f525bbd8fa Update Acknowledgements for commit d3a537d


Summary of changes:
 README.org |  2 +-
 denote-dired.el| 29 ++---
 denote-faces.el|  4 ++--
 denote-retrieve.el |  3 ---
 denote.el  |  4 ++--
 5 files changed, 15 insertions(+), 27 deletions(-)

[elpa] externals/denote d3a537d065 2/6: Regex to allow for non-ASCII characters in title and tags

[ELPA Syncer]

branch: externals/denote
commit d3a537d065a9d9a8204b41106d0fcdb760562e74
Author: Peter Prevos 
Commit: Peter Prevos 

Regex to allow for non-ASCII characters in title and tags
---
 denote-faces.el | 4 ++--
 denote.el   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/denote-faces.el b/denote-faces.el
index b58cc67610..25e09fdedd 100644
--- a/denote-faces.el
+++ b/denote-faces.el
@@ -85,8 +85,8 @@ and seconds."
 ;; For character classes, evaluate: (info "(elisp) Char Classes")
 (defvar denote-faces--file-name-regexp
   (concat "\\(?1:[0-9]\\{8\\}\\)\\(?2:T[0-9]\\{6\\}\\)"
-  "\\(?:\\(?3:--\\)\\(?4:[[:alnum:]-]*\\)\\)?"
-  "\\(?:\\(?5:__\\)\\(?6:[[:alnum:]_-]*\\)\\)?"
+  "\\(?:\\(?3:--\\)\\(?4:[[:alnum:][:nonascii:]-]*\\)\\)?"
+  "\\(?:\\(?5:__\\)\\(?6:[[:alnum:][:nonascii:]_-]*\\)\\)?"
   "\\(?7:\\..*\\)?$")
   "Regexp of file names for fontification.")
 
diff --git a/denote.el b/denote.el
index 1d3ef229bd..c0fc3450fb 100644
--- a/denote.el
+++ b/denote.el
@@ -315,10 +315,10 @@ are described in the doc string of `format-time-string'."
 (defconst denote--id-regexp "\\([0-9]\\{8\\}\\)\\(T[0-9]\\{6\\}\\)"
   "Regular expression to match `denote--id-format'.")
 
-(defconst denote--title-regexp "--\\([[:alnum:]-]*\\)"
+(defconst denote--title-regexp "--\\([[:alnum:][:nonascii:]-]*\\)"
   "Regular expression to match the title field.")
 
-(defconst denote--keywords-regexp "__\\([[:alnum:]_-]*\\)"
+(defconst denote--keywords-regexp "__\\([[:alnum:][:nonascii:]_-]*\\)"
   "Regular expression to match keywords.")
 
 (defconst denote--extension-regexp "\\.\\(org\\|md\\|txt\\)"

[elpa] externals/denote 0b69904020 3/6: Merge branch 'protesilaos:main' into main

[ELPA Syncer]

branch: externals/denote
commit 0b69904020edaf0a812b0ce48365c9dade410191
Merge: d3a537d065 b745cae875
Author: Peter Prevos 
Commit: GitHub 

Merge branch 'protesilaos:main' into main
---
 denote-dired.el| 28 +++-
 denote-retrieve.el |  3 ---
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/denote-dired.el b/denote-dired.el
index 8ece6de42b..d990169ee4 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -282,25 +282,6 @@ replace what isn't there."
  ;; Heuristic to check if this is one of our notes
  (string= (expand-file-name default-directory) (denote-directory)
 
-;; FIXME 2022-07-25: We should make the underlying regular expressions
-;; that `denote-retrieve--value-title' targets more refined, so that we
-;; capture eveyrhing at once.
-(defun denote-dired--rewrite-title (file old new)
-  "Rewrite OLD front matter of title to NEW value in FILE."
-  (save-excursion
-(goto-char (point-min))
-(re-search-forward denote-retrieve--title-front-matter-key-regexp nil t 1)
-(search-forward old nil t 1)
-(replace-match (concat "\\1" new) t)))
-
-(defun denote-dired--rewrite-keywords (file old new)
-  "Rewrite OLD front matter of keywords to NEW value in FILE."
-  (save-excursion
-(goto-char (point-min))
-(re-search-forward denote-retrieve--keywords-front-matter-key-regexp nil t 
1)
-(search-forward old nil t 1)
-(replace-match (concat "\\1" new) t)))
-
 (defun denote-dired--rewrite-front-matter (file title keywords)
   "Rewrite front matter of note after `denote-dired-rename-file'.
 The FILE, TITLE, and KEYWORDS are passed from the renaming
@@ -321,8 +302,13 @@ appropriate."
  (propertize new-title 'face 'success)
  (propertize old-keywords 'face 'error)
  (propertize new-keywords 'face 'success)))
-  (denote-dired--rewrite-title file old-title new-title)
-  (denote-dired--rewrite-keywords file old-keywords new-keywords))
+  (save-excursion
+(goto-char (point-min))
+(search-forward old-title nil t 1)
+(replace-match (concat "\\1" new-title) t)
+(goto-char (point-min))
+(search-forward old-keywords nil t 1)
+(replace-match (concat "\\1" new-keywords) t)))
 
 (defun denote-dired--add-front-matter (file title keywords id)
   "Add front matter to the beginning of FILE.
diff --git a/denote-retrieve.el b/denote-retrieve.el
index 0e6ef21f86..fd21df0453 100644
--- a/denote-retrieve.el
+++ b/denote-retrieve.el
@@ -33,9 +33,6 @@
 (require 'denote)
 (require 'xref)
 
-;; FIXME 2022-07-25: We must review these.  When we need to move in the
-;; buffer, we should capture both the key and its value at once.  Check
-;; `denote-dired--rewrite-front-matter'.
 (defconst denote-retrieve--title-front-matter-key-regexp
   "^\\(?:#\\+\\)?\\(?:title\\)\\s-*[:=]"
   "Regular expression for title key.")

[elpa] externals/denote 19c4fa8b09 5/6: Merge pull request #64 from pprevos/main

[ELPA Syncer]

branch: externals/denote
commit 19c4fa8b092f694b69024eed892a7593902194f4
Merge: 47073aa2a0 0b69904020
Author: Protesilaos Stavrou 
Commit: GitHub 

Merge pull request #64 from pprevos/main

Regex to allow for non-ASCII characters in title and tags
---
 denote-faces.el | 4 ++--
 denote.el   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/denote-faces.el b/denote-faces.el
index b58cc67610..25e09fdedd 100644
--- a/denote-faces.el
+++ b/denote-faces.el
@@ -85,8 +85,8 @@ and seconds."
 ;; For character classes, evaluate: (info "(elisp) Char Classes")
 (defvar denote-faces--file-name-regexp
   (concat "\\(?1:[0-9]\\{8\\}\\)\\(?2:T[0-9]\\{6\\}\\)"
-  "\\(?:\\(?3:--\\)\\(?4:[[:alnum:]-]*\\)\\)?"
-  "\\(?:\\(?5:__\\)\\(?6:[[:alnum:]_-]*\\)\\)?"
+  "\\(?:\\(?3:--\\)\\(?4:[[:alnum:][:nonascii:]-]*\\)\\)?"
+  "\\(?:\\(?5:__\\)\\(?6:[[:alnum:][:nonascii:]_-]*\\)\\)?"
   "\\(?7:\\..*\\)?$")
   "Regexp of file names for fontification.")
 
diff --git a/denote.el b/denote.el
index 1d3ef229bd..c0fc3450fb 100644
--- a/denote.el
+++ b/denote.el
@@ -315,10 +315,10 @@ are described in the doc string of `format-time-string'."
 (defconst denote--id-regexp "\\([0-9]\\{8\\}\\)\\(T[0-9]\\{6\\}\\)"
   "Regular expression to match `denote--id-format'.")
 
-(defconst denote--title-regexp "--\\([[:alnum:]-]*\\)"
+(defconst denote--title-regexp "--\\([[:alnum:][:nonascii:]-]*\\)"
   "Regular expression to match the title field.")
 
-(defconst denote--keywords-regexp "__\\([[:alnum:]_-]*\\)"
+(defconst denote--keywords-regexp "__\\([[:alnum:][:nonascii:]_-]*\\)"
   "Regular expression to match keywords.")
 
 (defconst denote--extension-regexp "\\.\\(org\\|md\\|txt\\)"

[elpa] externals/denote b745cae875 1/6: Revert "Refine front matter rewrite"

[ELPA Syncer]

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

Revert "Refine front matter rewrite"

This reverts commit 36440d7b7dfb975e8a3c87e52208d8a59c213ed3.
---
 denote-dired.el| 28 +++-
 denote-retrieve.el |  3 ---
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/denote-dired.el b/denote-dired.el
index 8ece6de42b..d990169ee4 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -282,25 +282,6 @@ replace what isn't there."
  ;; Heuristic to check if this is one of our notes
  (string= (expand-file-name default-directory) (denote-directory)
 
-;; FIXME 2022-07-25: We should make the underlying regular expressions
-;; that `denote-retrieve--value-title' targets more refined, so that we
-;; capture eveyrhing at once.
-(defun denote-dired--rewrite-title (file old new)
-  "Rewrite OLD front matter of title to NEW value in FILE."
-  (save-excursion
-(goto-char (point-min))
-(re-search-forward denote-retrieve--title-front-matter-key-regexp nil t 1)
-(search-forward old nil t 1)
-(replace-match (concat "\\1" new) t)))
-
-(defun denote-dired--rewrite-keywords (file old new)
-  "Rewrite OLD front matter of keywords to NEW value in FILE."
-  (save-excursion
-(goto-char (point-min))
-(re-search-forward denote-retrieve--keywords-front-matter-key-regexp nil t 
1)
-(search-forward old nil t 1)
-(replace-match (concat "\\1" new) t)))
-
 (defun denote-dired--rewrite-front-matter (file title keywords)
   "Rewrite front matter of note after `denote-dired-rename-file'.
 The FILE, TITLE, and KEYWORDS are passed from the renaming
@@ -321,8 +302,13 @@ appropriate."
  (propertize new-title 'face 'success)
  (propertize old-keywords 'face 'error)
  (propertize new-keywords 'face 'success)))
-  (denote-dired--rewrite-title file old-title new-title)
-  (denote-dired--rewrite-keywords file old-keywords new-keywords))
+  (save-excursion
+(goto-char (point-min))
+(search-forward old-title nil t 1)
+(replace-match (concat "\\1" new-title) t)
+(goto-char (point-min))
+(search-forward old-keywords nil t 1)
+(replace-match (concat "\\1" new-keywords) t)))
 
 (defun denote-dired--add-front-matter (file title keywords id)
   "Add front matter to the beginning of FILE.
diff --git a/denote-retrieve.el b/denote-retrieve.el
index 0e6ef21f86..fd21df0453 100644
--- a/denote-retrieve.el
+++ b/denote-retrieve.el
@@ -33,9 +33,6 @@
 (require 'denote)
 (require 'xref)
 
-;; FIXME 2022-07-25: We must review these.  When we need to move in the
-;; buffer, we should capture both the key and its value at once.  Check
-;; `denote-dired--rewrite-front-matter'.
 (defconst denote-retrieve--title-front-matter-key-regexp
   "^\\(?:#\\+\\)?\\(?:title\\)\\s-*[:=]"
   "Regular expression for title key.")

[elpa] externals/denote 47073aa2a0 4/6: Re-implement commit 36440d7

[ELPA Syncer]

branch: externals/denote
commit 47073aa2a031761982513fc6ad4ad51efb72ca8a
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Re-implement commit 36440d7

Sorry for the noise...  The previous code was incomplete.
---
 denote-dired.el | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index d990169ee4..b6649089a8 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -282,6 +282,9 @@ replace what isn't there."
  ;; Heuristic to check if this is one of our notes
  (string= (expand-file-name default-directory) (denote-directory)
 
+;; FIXME 2022-07-25: We should make the underlying regular expressions
+;; that `denote-retrieve--value-title' targets more refined, so that we
+;; capture eveyrhing at once.
 (defun denote-dired--rewrite-front-matter (file title keywords)
   "Rewrite front matter of note after `denote-dired-rename-file'.
 The FILE, TITLE, and KEYWORDS are passed from the renaming
@@ -297,16 +300,18 @@ appropriate."
  keywords (denote-dired--filetype-heuristics file
   (with-current-buffer (find-file-noselect file)
 (when (y-or-n-p (format
- "Replace front matter?\n-%s\n+%s\n\n-%s\n+%s"
+ "Replace front matter?\n-%s\n+%s\n\n-%s\n+%s?"
  (propertize old-title 'face 'error)
  (propertize new-title 'face 'success)
  (propertize old-keywords 'face 'error)
  (propertize new-keywords 'face 'success)))
   (save-excursion
 (goto-char (point-min))
+(re-search-forward denote-retrieve--title-front-matter-key-regexp 
nil t 1)
 (search-forward old-title nil t 1)
 (replace-match (concat "\\1" new-title) t)
 (goto-char (point-min))
+(re-search-forward 
denote-retrieve--keywords-front-matter-key-regexp nil t 1)
 (search-forward old-keywords nil t 1)
 (replace-match (concat "\\1" new-keywords) t)))
 

[elpa] externals/denote f525bbd8fa 6/6: Update Acknowledgements for commit d3a537d

[ELPA Syncer]

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

Update Acknowledgements for commit d3a537d

The change is below the ~15 line threshold and thus does not require
copyright assignment to the Free Software Foundation.
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 2932dd8009..51e6d0c3d6 100644
--- a/README.org
+++ b/README.org
@@ -1970,7 +1970,7 @@ Denote is meant to be a collective effort.  Every bit of 
help matters.
 
 + Contributions to code or the manual :: Benjamin Kästner, Damien
   Cassou, Jack Baty, Jean-Philippe Gagné Guay, Kaushal Modi, Kyle Meyer,
-  Philip Kaludercic, Stefan Monnier.
+  Peter Prevos, Philip Kaludercic, Stefan Monnier.
 
 + Ideas and/or user feedback :: Abin Simon, Alan Schmitt, Alfredo
   Borrás, Benjamin Kästner, Colin McLear, Damien Cassou, Frank Ehmsen,

[elpa] externals/denote 60ec95f803 3/4: Let denote-dired-rename-marked-files rewrite keywords

[ELPA Syncer]

branch: externals/denote
commit 60ec95f80386be7bf9f0905b4d3368803163015a
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Let denote-dired-rename-marked-files rewrite keywords

This is only done if appropriate, i.e. if the underlying file is a
Denote note.
---
 README.org  | 15 ++
 denote-dired.el | 88 -
 2 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/README.org b/README.org
index 51e6d0c3d6..e16fdf59bb 100644
--- a/README.org
+++ b/README.org
@@ -522,19 +522,24 @@ Dired to conform with our file-naming scheme.  The 
operation does the
 following:
 
 - the file's existing file name is retained and becomes the =TITLE=
-  field, per our file-naming scheme;
+  field, per Denote's file-naming scheme;
 
 - the =TITLE= is sluggified and downcased, per our conventions;
 
 - an identifier is prepended to the =TITLE=;
 
-- the file's contents are not touched (no insertion of front
-  matter, no other changes);
-
 - the file's extension is retained;
 
 - a prompt is asked once for the =KEYWORDS= field and the input is
-  applied to all files.
+  applied to all file names;
+
+- if the file is recognized as a Denote note, its front matter is
+  rewritten to include the new keywords.  A confirmation to carry out
+  this step is performed once at the outset.  Note that the affected
+  buffers are not saved.  The user can thus check them to confirm that
+  the new front matter does not cause any problems (e.g. with the
+  command ~diff-buffer-with-file~).  Multiple buffers can be saved with
+  ~save-some-buffers~ (read its doc string).
 
 This command ignores files that comply with Denote's file-naming
 scheme.
diff --git a/denote-dired.el b/denote-dired.el
index ded23fea0f..5addcc9fd2 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -101,20 +101,25 @@
 ;; Dired to conform with our file-naming scheme.  The operation does the
 ;; following:
 ;;
-;; - the file's existing file name is retained and becomes the `TITLE'
-;;   field, per our file-naming scheme;
+;; - the file's existing file name is retained and becomes the TITLE
+;;   field, per Denote's file-naming scheme;
 ;;
-;; - the `TITLE' is sluggified and downcased, per our conventions;
+;; - the TITLE is sluggified and downcased, per our conventions;
 ;;
-;; - an identifier is prepended to the `TITLE';
-;;
-;; - the file's contents are not touched (no insertion of front
-;;   matter, no other changes);
+;; - an identifier is prepended to the TITLE;
 ;;
 ;; - the file's extension is retained;
 ;;
-;; - a prompt is asked once for the `KEYWORDS' field and the input is
-;;   applied to all files.
+;; - a prompt is asked once for the KEYWORDS field and the input is
+;;   applied to all file names;
+;;
+;; - if the file is recognized as a Denote note, rewrite its front
+;;   matter to include the new keywords.  A confirmation to carry out
+;;   this step is performed once at the outset.  Note that the affected
+;;   buffers are not saved.  The user can thus check them to confirm
+;;   that the new front matter does not cause any problems (e.g. with
+;;   the command `diff-buffer-with-file').  Multiple buffers can be
+;;   saved with `save-some-buffers' (read its doc string).
 ;;
 ;; This command ignores files that comply with Denote's file-naming
 ;; scheme.
@@ -315,6 +320,28 @@ appropriate."
   (search-forward old-keywords nil t 1)
   (replace-match (concat "\\1" new-keywords) t)))
 
+(defun denote-dired--rewrite-keywords-no-question (file keywords)
+  "Rewrite KEYWORDS in FILE outright.
+
+Do the same as `denote-dired--rewrite-front-matter' for keywords,
+but do not for confirmation.
+
+This is for use in `denote-dired-rename-marked-files' or related.
+Those commands ask for confirmation once before performing an
+operation on multiple files."
+  (when-let ((denote-dired--edit-front-matter-p file)
+ (old-keywords (denote-retrieve--value-keywords file))
+ (new-keywords (denote--file-meta-keywords
+keywords (denote-dired--filetype-heuristics 
file
+(with-current-buffer (find-file-noselect file)
+  (save-excursion
+(save-restriction
+  (widen)
+  (goto-char (point-min))
+  (re-search-forward denote-retrieve--keywords-front-matter-key-regexp 
nil t 1)
+  (search-forward old-keywords nil t 1)
+  (replace-match (concat "\\1" new-keywords) t))
+
 (defun denote-dired--add-front-matter (file title keywords id)
   "Add front matter to the beginning of FILE.
 The TITLE, KEYWORDS and ID are passed from the renaming
@@ -449,32 +476,41 @@ The operation does the following:
 
 - an identifier is prepended to the TITLE;
 
-- the file's contents are not touched (no insertion of front
-  matter, no other changes);
-
 - the file's extension is retained;
 
 - a prompt is asked once for the KEYWORDS field and the input is
-  applied to al

[elpa] externals/denote b5948bac04 4/4: Clarify denote-dired--add-front-matter doc string

[ELPA Syncer]

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

Clarify denote-dired--add-front-matter doc string
---
 denote-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index 5addcc9fd2..847a00f3d0 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -343,7 +343,7 @@ operation on multiple files."
   (replace-match (concat "\\1" new-keywords) t))
 
 (defun denote-dired--add-front-matter (file title keywords id)
-  "Add front matter to the beginning of FILE.
+  "Prepend front matter to FILE if `denote--only-note-p'.
 The TITLE, KEYWORDS and ID are passed from the renaming
 command and are used to construct a new front matter block if
 appropriate."

[elpa] externals/denote 2080309cd7 1/4: Refine denote-dired--rewrite-front-matter

[ELPA Syncer]

branch: externals/denote
commit 2080309cd765b91e6851f74b35fc366769bfe7e3
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Refine denote-dired--rewrite-front-matter

Remove unused code and make it work with narrowed buffers.
---
 denote-dired.el | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/denote-dired.el b/denote-dired.el
index b6649089a8..ac3f9ff37e 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -290,14 +290,12 @@ replace what isn't there."
 The FILE, TITLE, and KEYWORDS are passed from the renaming
 command and are used to construct a new front matter block if
 appropriate."
-  (when-let* ((denote-dired--edit-front-matter-p file)
-  (id (denote-retrieve--filename-identifier file))
-  (date (denote-retrieve--value-date file)))
-(let ((old-title (denote-retrieve--value-title file))
-  (old-keywords (denote-retrieve--value-keywords file))
-  (new-title title)
-  (new-keywords (denote--file-meta-keywords
- keywords (denote-dired--filetype-heuristics file
+  (when-let ((denote-dired--edit-front-matter-p file)
+ (old-title (denote-retrieve--value-title file))
+ (old-keywords (denote-retrieve--value-keywords file))
+ (new-title title)
+ (new-keywords (denote--file-meta-keywords
+keywords (denote-dired--filetype-heuristics 
file
   (with-current-buffer (find-file-noselect file)
 (when (y-or-n-p (format
  "Replace front matter?\n-%s\n+%s\n\n-%s\n+%s?"
@@ -306,14 +304,16 @@ appropriate."
  (propertize old-keywords 'face 'error)
  (propertize new-keywords 'face 'success)))
   (save-excursion
-(goto-char (point-min))
-(re-search-forward denote-retrieve--title-front-matter-key-regexp 
nil t 1)
-(search-forward old-title nil t 1)
-(replace-match (concat "\\1" new-title) t)
-(goto-char (point-min))
-(re-search-forward 
denote-retrieve--keywords-front-matter-key-regexp nil t 1)
-(search-forward old-keywords nil t 1)
-(replace-match (concat "\\1" new-keywords) t)))
+(save-restriction
+  (widen)
+  (goto-char (point-min))
+  (re-search-forward 
denote-retrieve--title-front-matter-key-regexp nil t 1)
+  (search-forward old-title nil t 1)
+  (replace-match (concat "\\1" new-title) t)
+  (goto-char (point-min))
+  (re-search-forward 
denote-retrieve--keywords-front-matter-key-regexp nil t 1)
+  (search-forward old-keywords nil t 1)
+  (replace-match (concat "\\1" new-keywords) t)))
 
 (defun denote-dired--add-front-matter (file title keywords id)
   "Add front matter to the beginning of FILE.

[elpa] externals/denote 017b9d0f85 2/4: Clarify doc string

[ELPA Syncer]

branch: externals/denote
commit 017b9d0f859e765839c235113686b315f8eb9a8b
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Clarify doc string
---
 denote-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index ac3f9ff37e..ded23fea0f 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -288,7 +288,7 @@ replace what isn't there."
 (defun denote-dired--rewrite-front-matter (file title keywords)
   "Rewrite front matter of note after `denote-dired-rename-file'.
 The FILE, TITLE, and KEYWORDS are passed from the renaming
-command and are used to construct a new front matter block if
+command and are used to construct new front matter values if
 appropriate."
   (when-let ((denote-dired--edit-front-matter-p file)
  (old-title (denote-retrieve--value-title file))

[elpa] externals/denote updated (f525bbd8fa -> b5948bac04)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  f525bbd8fa Update Acknowledgements for commit d3a537d
   new  2080309cd7 Refine denote-dired--rewrite-front-matter
   new  017b9d0f85 Clarify doc string
   new  60ec95f803 Let denote-dired-rename-marked-files rewrite keywords
   new  b5948bac04 Clarify denote-dired--add-front-matter doc string


Summary of changes:
 README.org  |  15 ---
 denote-dired.el | 124 
 2 files changed, 90 insertions(+), 49 deletions(-)

[elpa] externals/denote ca62b258ce: Remove confusing phrase in doc string

[ELPA Syncer]

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

Remove confusing phrase in doc string
---
 README.org  | 3 ---
 denote-dired.el | 8 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.org b/README.org
index e16fdf59bb..938d45c09d 100644
--- a/README.org
+++ b/README.org
@@ -541,9 +541,6 @@ following:
   command ~diff-buffer-with-file~).  Multiple buffers can be saved with
   ~save-some-buffers~ (read its doc string).
 
-This command ignores files that comply with Denote's file-naming
-scheme.
-
 #+findex: denote-dired-rename-marked-files-and-add-front-matters
 The command ~denote-dired-rename-marked-files-and-add-front-matters~ is
 like ~denote-dired-rename-marked-files~ but also adds front matter.  The
diff --git a/denote-dired.el b/denote-dired.el
index 847a00f3d0..3964c9d0da 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -121,9 +121,6 @@
 ;;   the command `diff-buffer-with-file').  Multiple buffers can be
 ;;   saved with `save-some-buffers' (read its doc string).
 ;;
-;; This command ignores files that comply with Denote's file-naming
-;; scheme.
-;;
 ;; The command `denote-dired-rename-marked-files-and-add-front-matters' is
 ;; like `denote-dired-rename-marked-files' but also adds front matter.  The
 ;; additon of front matter takes place only if the file has the appropriate
@@ -488,10 +485,7 @@ The operation does the following:
   to confirm that the new front matter does not cause any
   problems (e.g. with the command `diff-buffer-with-file').
   Multiple buffers can be saved with `save-some-buffers' (read
-  its doc string).
-
-This command ignores files that comply with Denote's file-naming
-scheme."
+  its doc string)."
   (interactive nil dired-mode)
   (if-let ((marks (dired-get-marked-files))
(keywords (denote--keywords-prompt)))

[elpa] externals/denote 23d4ce71e4 3/3: Refine prompt for batch front matter insertion

[ELPA Syncer]

branch: externals/denote
commit 23d4ce71e4692c2276b3848c84040104994bd7b8
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Refine prompt for batch front matter insertion
---
 denote-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index 11ec9ed1b6..38757354a1 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -525,7 +525,7 @@ doc string)."
   (interactive nil dired-mode)
   (if-let ((marks (dired-get-marked-files))
(keywords (denote--keywords-prompt))
-   ((y-or-n-p "Add front matter to all FILES (buffers are not 
saved)?")))
+   ((yes-or-no-p "Add front matter to all relevant files (buffers are 
not saved)?")))
   (progn
 (dolist (file marks)
   (let* ((dir (file-name-directory file))

[elpa] externals/denote c9c9b56a06 1/3: Refine denote-dired--filetype-heuristics

[ELPA Syncer]

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

Refine denote-dired--filetype-heuristics

This guards against unailable front matter while trying to define what
Markdown flavour to use.
---
 denote-dired.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index 3964c9d0da..3063185a23 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -265,7 +265,8 @@ Return t if the file is renamed, nil otherwise."
   "Return likely file type of FILE.
 The return value is for `denote--file-meta-header'."
   (pcase (file-name-extension file)
-("md" (if (string-match-p "title\\s-*=" (denote-retrieve--value-title file 
t))
+("md" (if-let ((title-key (denote-retrieve--value-title file t))
+   ((string-match-p "title\\s-*=" title-key)))
   'markdown-toml
 'markdown-yaml))
 ("txt" 'text)

[elpa] externals/denote updated (ca62b258ce -> 23d4ce71e4)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  ca62b258ce Remove confusing phrase in doc string
   new  c9c9b56a06 Refine denote-dired--filetype-heuristics
   new  3dbbffeef2 Fix denote-dired--add-front-matter 'when' format
   new  23d4ce71e4 Refine prompt for batch front matter insertion


Summary of changes:
 denote-dired.el | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

[elpa] externals/denote 3dbbffeef2 2/3: Fix denote-dired--add-front-matter 'when' format

[ELPA Syncer]

branch: externals/denote
commit 3dbbffeef248013ddd89158522b1f484d3c70fba
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix denote-dired--add-front-matter 'when' format

The previous one did not execute the form but would instead bind
'denote--only-note-p' as a variable with a value of 'file'.

Writing it this way is the same as:

(when (denote--only-note-p file) (let ...))
---
 denote-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/denote-dired.el b/denote-dired.el
index 3063185a23..11ec9ed1b6 100644
--- a/denote-dired.el
+++ b/denote-dired.el
@@ -345,7 +345,7 @@ operation on multiple files."
 The TITLE, KEYWORDS and ID are passed from the renaming
 command and are used to construct a new front matter block if
 appropriate."
-  (when-let* ((denote--only-note-p file)
+  (when-let* (((denote--only-note-p file))
   (filetype (denote-dired--filetype-heuristics file))
   (date (denote--date (date-to-time id)))
   (new-front-matter (denote--file-meta-header title date keywords 
id filetype)))