[elpa] externals/org-transclusion updated (86ff2eaf19 -> 818e2200c0)

[ELPA Syncer]

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

  from  86ff2eaf19 intrnl: update .dir-locals.el to cover org mode
   new  ec1a3da586 intrnl: fix code errors from compilation
   new  818e2200c0 docs: changes for ELPA doc generation


Summary of changes:
 .dir-locals.el |3 +-
 Makefile   |   25 +-
 NEWS   |4 +
 docs/Makefile  |2 +-
 docs/index.html|4 +-
 ...ransclusion.org => org-transclusion-manual.org} |   18 +-
 org-transclusion.el|   14 +-
 org-transclusion.info  | 1695 
 8 files changed, 35 insertions(+), 1730 deletions(-)
 rename docs/{org-transclusion.org => org-transclusion-manual.org} (97%)
 delete mode 100644 org-transclusion.info

[elpa] externals/org-transclusion ec1a3da586 1/2: intrnl: fix code errors from compilation

[ELPA Syncer]

branch: externals/org-transclusion
commit ec1a3da586ac27370b1f34048fe617e2f1ce815c
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: fix code errors from compilation
---
 org-transclusion.el | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/org-transclusion.el b/org-transclusion.el
index 4c05513a3b..093567d446 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -15,9 +15,9 @@
 ;; You should have received a copy of the GNU General Public License along
 ;; with this program.  If not, see .
 
-;; Author: Noboru Ota 
-;; Created: 10 Oct 2020
-;; Last modified: 25 December 2021
+;; Author:Noboru Ota 
+;; Created:   10 October 2020
+;; Last modified: 26 December 2021
 
 ;; URL: https://github.com/nobiot/org-transclusion
 ;; Keywords: org-mode, transclusion, writing
@@ -326,7 +326,7 @@ and variables."
   (add-hook 'kill-buffer-hook #'org-transclusion-before-kill nil t)
   (add-hook 'kill-emacs-hook #'org-transclusion-before-kill nil t)
   (add-hook 'org-export-before-processing-hook
-#'org-transclusion-inhibit-read-only nil t) 
+#'org-transclusion-inhibit-read-only nil t)
   (org-transclusion-yank-excluded-properties-set)
   (org-transclusion-load-extensions-maybe))
 
@@ -340,7 +340,7 @@ This function also removes all the transclusions in the 
current buffer."
   (remove-hook 'kill-buffer-hook #'org-transclusion-before-kill t)
   (remove-hook 'kill-emacs-hook #'org-transclusion-before-kill t)
   (remove-hook 'org-export-before-processing-hook
-   #'org-transclusion-inhibit-read-only nil t)
+   #'org-transclusion-inhibit-read-only t)
   (org-transclusion-yank-excluded-properties-remove))
 
 ;;;###autoload
@@ -1317,8 +1317,8 @@ Case 2. #+transclude inside another transclusion"
 (point) (org-current-line
;; Case 2. #+transclude inside another transclusion
((org-transclusion-within-transclusion-p)
-(user-error (format "Cannot transclude in another transclusion at point 
%d, line %d")
-(point) (org-current-line)))
+(user-error (format "Cannot transclude in another transclusion at point 
%d, line %d"
+(point) (org-current-line
(t
 t)))
 

[elpa] externals/org-transclusion 818e2200c0 2/2: docs: changes for ELPA doc generation

[ELPA Syncer]

branch: externals/org-transclusion
commit 818e2200c0679187c04fded674ee1576bd1848e6
Author: Noboru Ota 
Commit: Noboru Ota 

docs: changes for ELPA doc generation
---
 .dir-locals.el |3 +-
 Makefile   |   25 +-
 NEWS   |4 +
 docs/Makefile  |2 +-
 docs/index.html|4 +-
 ...ransclusion.org => org-transclusion-manual.org} |   18 +-
 org-transclusion.info  | 1695 
 7 files changed, 28 insertions(+), 1723 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 349f1363c1..75fe4f4a01 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -7,6 +7,5 @@
   ;; Need this locale to be "C" or "en_US.UTF-8" or something to standardize 
the
   ;; time stamp with English
   (system-time-locale . "C"))
- (emacs-lisp-mode
   (fill-column . 80)
-  (indent-tabs-mode . nil)))
+  (indent-tabs-mode . nil))
diff --git a/Makefile b/Makefile
index 83c703ce84..e6ea833526 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,12 @@
-
-clean:
-   find . -name "*.elc" -delete
-
+docs/org-transclusion.org: docs/org-transclusion-manual.org
+   emacs --batch -L "$$(pwd)" -l org-transclusion $< \
+ --eval '(progn (org-transclusion-add-all) (write-region nil nil 
"org-transclusion.org"))'
 
 test-compile:
-   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
-(byte-compile-file 
\"org-transclusion.el\"))"
-   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
-(byte-compile-file 
\"text-clone.el\"))"
-   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
-(byte-compile-file 
\"org-transclusion-indent-mode.el\"))"
-   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
-(byte-compile-file 
\"org-transclusion-src-lines.el\"))"
-   emacs --quick --batch --eval "(progn (add-to-list 'load-path 
default-directory) \
-(byte-compile-file 
\"org-transclusion-font-lock.el\"))"
-   # Check declare-function
-   emacs --quick --batch --eval "(check-declare-directory 
default-directory)"
+   emacs --batch --eval "(add-to-list 'load-path default-directory)" \
+  -f batch-byte-compile ./*.el
+# Check declare-function
+   emacs --batch --eval "(check-declare-directory default-directory)"
 
+clean:
+   find . -name "*.elc" -delete
diff --git a/NEWS b/NEWS
index 8a254c3f1b..e5865c9865 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 * Current
 
 - fix:add-all not to stop with error in one trasclusion
+- fix:Remove extra space/line added to Org elements transcluded
+- add:inhibit-read-only: fix:Org export errors with read-only
+  With this, noweb expansion seems to work now
+- README, Info doc user manual, online user manual
 
 * Version 1.0.1
 
diff --git a/docs/Makefile b/docs/Makefile
index 7acd7e8dce..f91c03deb5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -13,7 +13,7 @@ run: html install clear
 
 manual:
@printf "\n\n### Generating manual .texi and .info files \n\n"
-   $(EMACS) --batch -L ../ --file org-transclusion.org \
+   $(EMACS) --batch -L ../ --file org-transclusion-manual.org \
  --eval="(progn (require 
'org-transclusion)(org-transclusion-add-all)(org-texinfo-export-to-info))"
 
 html:
diff --git a/docs/index.html b/docs/index.html
index bca88161ae..e411895f5f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -60,9 +60,9 @@ Next: 
 Org-transclusion User Manual
 
 
-This manual is for Org-transclusion 1.0.x.
+This manual is for Org-transclusion {{{version:}}}.
 
-Last updated 24 December 2021.
+Last updated: {{{modified:}}}.
 
 Org-transclusion lets you insert a copy of text content via a file link or 
ID link within an Org file. It lets you have the same content present in 
different buffers at the same time without copy-and-pasting it. Edit the source 
of the content, and you can refresh the transcluded copies to the up-to-date 
state. Org-transclusion keeps your files clear of the transcluded copies, 
leaving only the links to the original content.
 Copyright (C) 2021  Free Software Foundation, Inc.
diff --git a/docs/org-transclusion.org b/docs/org-transclusion-manual.org
similarity index 97%
rename from docs/org-transclusion.org
rename to docs/org-transclusion-manual.org
index e35347918f..4500434d4f 100644
--- a/docs/org-transclusion.org
+++ b/docs/org-transclusion-manual.org
@@ -1,5 +1,8 @@
 #+title: Org-transclusion User Manual
 #+author: Noboru Ota 
+#+macro: version 1.0.x
+#+macro: modified 26 December 2021
+
 #+language: en
 #

[elpa] externals/marginalia acbaad4bda: Compute minimum width of windows which display the minibuffer

[ELPA Syncer]

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

Compute minimum width of windows which display the minibuffer
---
 marginalia.el | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index 319778dcd3..3ec1edca6d 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -574,11 +574,10 @@ keybinding since CAND includes it."
 (propertize "#" 'face 'marginalia-null))
((and marginalia-censor-variables
  (let ((name (symbol-name sym)))
-   (seq-find (lambda (r)
-   (if (symbolp r)
-   (eq r sym)
- (string-match-p r name)))
- marginalia-censor-variables)))
+   (cl-loop for r in marginalia-censor-variables
+thereis (if (symbolp r)
+(eq r sym)
+  (string-match-p r name)
 (propertize "*" 'face 'marginalia-null))
(t (let ((val (symbol-value sym)))
 (pcase val
@@ -979,7 +978,12 @@ looking for a regexp that matches the prompt."
 ;; Take the window width of the current window (minibuffer window!)
 `(let ((marginalia--metadata ,metadata)
(,c marginalia--cache)
-   (,w (window-width))
+   ;; Compute minimum width of windows, which display the minibuffer.
+   ;; vertico-buffer displays the minibuffer in different windows. We 
may
+   ;; want to generalize this and detect other types of completion
+   ;; buffers, e.g., Embark Collect or the default completion buffer.
+   (,w (cl-loop for win in (get-buffer-window-list)
+minimize (window-width win)))
;; Compute marginalia-align-offset. If the right-fringe-width is
;; zero, use an additional offset of 1 by default! See
;; https://github.com/minad/marginalia/issues/42 for the discussion

[elpa] externals/org-transclusion a0f3464377 4/4: intrnl:Makefile edit

[ELPA Syncer]

branch: externals/org-transclusion
commit a0f3464377c6b07208ae03653f745e0af11bffaf
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl:Makefile edit
---
 Makefile | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e6ea833526..80c44f7564 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
 docs/org-transclusion.org: docs/org-transclusion-manual.org
-   emacs --batch -L "$$(pwd)" -l org-transclusion $< \
- --eval '(progn (org-transclusion-add-all) (write-region nil nil 
"org-transclusion.org"))'
+   -emacs --batch -L "$$(pwd)" -l org-transclusion $< \
+  --eval '(progn (org-transclusion-add-all) (write-region nil nil 
"org-transclusion.org"))'
 
+
+.PHONY: test-compile
 test-compile:
emacs --batch --eval "(add-to-list 'load-path default-directory)" \
-  -f batch-byte-compile ./*.el
-# Check declare-function
+ -f batch-byte-compile ./*.el
+   # Check declare-function
emacs --batch --eval "(check-declare-directory default-directory)"
 
+.PHONY: clean
 clean:
find . -name "*.elc" -delete
+

[elpa] externals/org-transclusion c69a4eda9b 2/4: docs: remove badges for testing

[ELPA Syncer]

branch: externals/org-transclusion
commit c69a4eda9bd11b54a77a5b48522bf42018e27b5c
Author: Noboru Ota 
Commit: Noboru Ota 

docs: remove badges for testing

GitHub does not update the badges?
---
 README.org | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.org b/README.org
index b8a1321776..7a79633e45 100644
--- a/README.org
+++ b/README.org
@@ -4,8 +4,6 @@
 #+options: toc:nil
 
 #+html: https://www.gnu.org/software/emacs/";>https://img.shields.io/static/v1?logo=gnuemacs&logoColor=fafafa&label=Made%20for&message=GNU%20Emacs&color=7F5AB6&style=flat"/>
-#+html: http://elpa.gnu.org/packages/org-transclusion.html";>https://elpa.gnu.org/packages/org-transclusion.svg"/>
-#+html: http://elpa.gnu.org/devel/org-transclusion.html";>https://elpa.gnu.org/devel/org-transclusion.svg"/>
 #+html: https://img.shields.io/badge/License-GPLv3-blue.svg";>
 
 Org-transclusion lets you insert a copy of text content via a file link or ID 
link within an Org file. It lets you have the same content present in different 
buffers at the same time without copy-and-pasting it. Edit the source of the 
content, and you can refresh the transcluded copies to the up-to-date state. 
Org-transclusion keeps your files clear of the transcluded copies, leaving only 
the links to the original content.<>

[elpa] externals/org-transclusion updated (818e2200c0 -> a0f3464377)

[ELPA Syncer]

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

  from  818e2200c0 docs: changes for ELPA doc generation
   new  4074b9c0d9 docs:Installation: add instruction for ELPA-devel
   new  c69a4eda9b docs: remove badges for testing
   new  de008fcce8 docs: badges back on
   new  a0f3464377 intrnl:Makefile edit


Summary of changes:
 Makefile   | 12 
 README.org | 23 +--
 2 files changed, 25 insertions(+), 10 deletions(-)

[elpa] externals/org-transclusion de008fcce8 3/4: docs: badges back on

[ELPA Syncer]

branch: externals/org-transclusion
commit de008fcce8c9ed7ae566b112a4d03dcba7c167cf
Author: Noboru Ota 
Commit: Noboru Ota 

docs: badges back on
---
 README.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.org b/README.org
index 7a79633e45..b8a1321776 100644
--- a/README.org
+++ b/README.org
@@ -4,6 +4,8 @@
 #+options: toc:nil
 
 #+html: https://www.gnu.org/software/emacs/";>https://img.shields.io/static/v1?logo=gnuemacs&logoColor=fafafa&label=Made%20for&message=GNU%20Emacs&color=7F5AB6&style=flat"/>
+#+html: http://elpa.gnu.org/packages/org-transclusion.html";>https://elpa.gnu.org/packages/org-transclusion.svg"/>
+#+html: http://elpa.gnu.org/devel/org-transclusion.html";>https://elpa.gnu.org/devel/org-transclusion.svg"/>
 #+html: https://img.shields.io/badge/License-GPLv3-blue.svg";>
 
 Org-transclusion lets you insert a copy of text content via a file link or ID 
link within an Org file. It lets you have the same content present in different 
buffers at the same time without copy-and-pasting it. Edit the source of the 
content, and you can refresh the transcluded copies to the up-to-date state. 
Org-transclusion keeps your files clear of the transcluded copies, leaving only 
the links to the original content.<>

[elpa] externals/org-transclusion 4074b9c0d9 1/4: docs:Installation: add instruction for ELPA-devel

[ELPA Syncer]

branch: externals/org-transclusion
commit 4074b9c0d9f565641708350f48264dc05e2844b1
Author: Noboru Ota 
Commit: Noboru Ota 

docs:Installation: add instruction for ELPA-devel
---
 README.org | 23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index 1de764dd14..b8a1321776 100644
--- a/README.org
+++ b/README.org
@@ -80,15 +80,24 @@ Main Features:
 :CUSTOM_ID: installation
 :END:
 
-This package is available on 
[[https://elpa.gnu.org/packages/org-transclusion.html][GNU ELPA]]. You can do 
=M-x package-install RET
-org-transclusion= to install it.  After installation, you can start using
-Org-transclusion.
+This package is available on:
+
+- [[https://elpa.gnu.org/packages/org-transclusion.html][GNU ELPA]] (releases 
only; equivalent to MELPA-Stable)
+- [[https://elpa.gnu.org/devel/org-transclusion.html][GNU-devel ELPA]] 
(unreleased development branch; equivalent to MELPA)
 
-Below are some example keybindings that can be put into your Emacs 
configuration.
+GNU ELPA should be already set up in your Emacs by default. If you wish to add 
GNU-devel ELPA, simply add its URL to =package-archives= like this:
 
 #+BEGIN_SRC elisp
-(define-key global-map (kbd "") #'org-transclusion-add)
-(define-key global-map (kbd "C-n t") #'org-transclusion-mode)
+  (add-to-list 'package-archives '("gnu-devel" . 
"https://elpa.gnu.org/devel/";) t)
+#+END_SRC
+
+Refresh the archive with =M-x package-refresh-contents RET= and you can do 
=M-x package-install RET org-transclusion= to install it. Alternatively, you 
can use =package-list-packages=. 
+
+After installation, you can start using Org-transclusion with no additional 
configuration. Below are some example keybindings that can be put into your 
Emacs configuration.
+
+#+BEGIN_SRC elisp
+  (define-key global-map (kbd "") #'org-transclusion-add)
+  (define-key global-map (kbd "C-n t") #'org-transclusion-mode)
 #+END_SRC
 
 For Doom users, you would need to do something like this below to install the 
package and configure the keybindings. 
@@ -111,6 +120,7 @@ For Doom users, you would need to do something like this 
below to install the pa
 #+END_SRC
 
 * Contributing
+
 - Get involved in a discussion in 
[[https://org-roam.discourse.group/t/prototype-transclusion-block-reference-with-emacs-org-mode/830][Org-roam
 forum]] (the package is originally aimed for its users, me included)
 
 - Create issues, discussion, and/or pull requests. All welcome.
@@ -120,4 +130,5 @@ Org-transclusion is part of GNU ELPA and thus copyrighted 
by the [[http://fsf.or
 Thank you.
 
 * License
+
 Org-transclusion is licensed under a GPLv3 license. For a full copy of the 
license, refer to [[./LICENSE][LICENSE]].

[elpa] externals/org-transclusion 3eff991fbd 2/3: fix:add-all better message for success/"user-error"

[ELPA Syncer]

branch: externals/org-transclusion
commit 3eff991fbd43c42aab64db6303ce4e50c08c7913
Author: Noboru Ota 
Commit: Noboru Ota 

fix:add-all better message for success/"user-error"
---
 .gitignore  | 3 ++-
 org-transclusion.el | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69c2b4fac2..9339d6c8eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 test/
 refile/
-*.elc
\ No newline at end of file
+*.elc
+/docs/org-transclusion.org
diff --git a/org-transclusion.el b/org-transclusion.el
index 7a821471d3..c5ef94687d 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -494,7 +494,8 @@ the rest of the buffer unchanged."
 ;; Demoted-errors so that one error does not stop the whole process
 (with-demoted-errors
 "Not transcluded. Continue to next: %S"
-  (org-transclusion-add)
+  (when (org-transclusion-add)
+(message (format "Transcluded at %d %d" (point) 
(org-current-line
   (goto-char marker)
   (move-marker marker nil) ; point nowhere for GC
   t)))

[elpa] externals/org-transclusion 4a3dcdfef5 3/3: fix:add-all message

[ELPA Syncer]

branch: externals/org-transclusion
commit 4a3dcdfef5d14201b61cdaaddb77847fc20a1a5a
Author: Noboru Ota 
Commit: Noboru Ota 

fix:add-all message
---
 org-transclusion.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-transclusion.el b/org-transclusion.el
index c5ef94687d..89ea7ba3d3 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -495,7 +495,7 @@ the rest of the buffer unchanged."
 (with-demoted-errors
 "Not transcluded. Continue to next: %S"
   (when (org-transclusion-add)
-(message (format "Transcluded at %d %d" (point) 
(org-current-line
+(message (format "Transcluded at point %d, line %d" (point) 
(org-current-line
   (goto-char marker)
   (move-marker marker nil) ; point nowhere for GC
   t)))

[elpa] externals/org-transclusion updated (a0f3464377 -> 4a3dcdfef5)

[ELPA Syncer]

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

  from  a0f3464377 intrnl:Makefile edit
   new  81ef8afce0 add: Somewhat better message for add-all
   new  3eff991fbd fix:add-all better message for success/"user-error"
   new  4a3dcdfef5 fix:add-all message


Summary of changes:
 .gitignore  | 3 ++-
 org-transclusion.el | 7 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

[elpa] externals/vertico updated (eedcb84786 -> 3e6bff477e)

[ELPA Syncer]

elpasync pushed a change to branch externals/vertico.

  from  eedcb84786 Fix use package declaration
   new  e46cf425bb Replace vertico-grid-rows with vertico-count
   new  dd1f5e58a3 Fix typos in commentary
   new  d0df8c9ce6 Improve vertico-buffer
   new  3e6bff477e Add vertico-multiform extension


Summary of changes:
 README.org  |  19 +++---
 extensions/vertico-buffer.el| 132 +---
 extensions/vertico-grid.el  |  20 +++---
 extensions/vertico-indexed.el   |   2 +-
 extensions/vertico-multiform.el | 116 +++
 extensions/vertico-repeat.el|   4 +-
 6 files changed, 209 insertions(+), 84 deletions(-)
 create mode 100644 extensions/vertico-multiform.el

[elpa] externals/vertico 3e6bff477e 4/4: Add vertico-multiform extension

[ELPA Syncer]

branch: externals/vertico
commit 3e6bff477e2d9511e429e07ac65dc8ac618fc5cd
Author: Daniel Mendler 
Commit: Daniel Mendler 

Add vertico-multiform extension

The extension allows you to configure per-command or
per-completion category minibuffer modes.

(setq vertico-multiform-commands
  '((consult-line buffer)
(consult-imenu reverse buffer)
(execute-extended-command flat)))

(setq vertico-multiform-categories
  '((file buffer grid)))

(vertico-multiform-mode)
---
 README.org  |  19 +++
 extensions/vertico-multiform.el | 116 
 2 files changed, 126 insertions(+), 9 deletions(-)

diff --git a/README.org b/README.org
index 5ac9018a44..211ea011b0 100644
--- a/README.org
+++ b/README.org
@@ -231,15 +231,16 @@
   extensions. Currently the following extensions come with the Vertico ELPA
   package:
 
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-buffer.el][vertico-buffer]]:
 =vertico-buffer-mode= to display Vertico in a separate buffer
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-directory.el][vertico-directory]]:
 Commands for Ido-like directory navigation
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-flat.el][vertico-flat]]:
 =vertico-flat-mode= to enable a flat, horizontal display
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-grid.el][vertico-grid]]:
 =vertico-grid-mode= to enable a grid display
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-indexed.el][vertico-indexed]]:
 =vertico-indexed-mode= to select indexed candidates with prefix arguments
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-mouse.el][vertico-mouse]]:
 =vertico-mouse-mode= to support for scrolling and candidate selection
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-quick.el][vertico-quick]]:
 Commands to select using Avy-style quick keys
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-repeat.el][vertico-repeat]]:
 The command =vertico-repeat= repeats the last completion session
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-reverse.el][vertico-reverse]]:
 =vertico-reverse-mode= to reverse the display
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-buffer.el][vertico-buffer]]:
 =vertico-buffer-mode= to display Vertico in a separate buffer.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-directory.el][vertico-directory]]:
 Commands for Ido-like directory navigation.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-flat.el][vertico-flat]]:
 =vertico-flat-mode= to enable a flat, horizontal display.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-grid.el][vertico-grid]]:
 =vertico-grid-mode= to enable a grid display.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-indexed.el][vertico-indexed]]:
 =vertico-indexed-mode= to select indexed candidates with prefix arguments.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-mouse.el][vertico-mouse]]:
 =vertico-mouse-mode= to support for scrolling and candidate selection.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-multiform.el][vertico-multiform]]:
 Configure Vertico modes per command or completion category..
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-quick.el][vertico-quick]]:
 Commands to select using Avy-style quick keys.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-repeat.el][vertico-repeat]]:
 The command =vertico-repeat= repeats the last completion session.
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-reverse.el][vertico-reverse]]:
 =vertico-reverse-mode= to reverse the display.
 
   With these extensions it is possible to adapt Vertico such that it matches
   your preference or behaves similar to other familiar UIs. For example, the
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
new file mode 100644
index 00..f0a2f22646
--- /dev/null
+++ b/extensions/vertico-multiform.el
@@ -0,0 +1,116 @@
+;;; vertico-multiform.el --- Configure Vertico in different forms per command 
-*- lexical-binding: t -*-
+
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;; Author: Daniel Mendler 
+;; Maintainer: Daniel Mendler 
+;; Created: 2021
+;; Version: 0.1
+;; Package-Requires: ((emacs "27.1") (vertico "0.17"))
+;; Homepage: https://github.com/minad/vertico
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope t

[elpa] externals/org-transclusion 81ef8afce0 1/3: add: Somewhat better message for add-all

[ELPA Syncer]

branch: externals/org-transclusion
commit 81ef8afce0a76bdea66d3c545ef11e07536eab51
Author: Noboru Ota 
Commit: Noboru Ota 

add: Somewhat better message for add-all
---
 org-transclusion.el | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/org-transclusion.el b/org-transclusion.el
index 093567d446..7a821471d3 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -492,7 +492,9 @@ the rest of the buffer unchanged."
   (plist-get (org-transclusion-keyword-string-to-plist)
  :disable-auto))
 ;; Demoted-errors so that one error does not stop the whole process
-(with-demoted-errors (org-transclusion-add)
+(with-demoted-errors
+"Not transcluded. Continue to next: %S"
+  (org-transclusion-add)
   (goto-char marker)
   (move-marker marker nil) ; point nowhere for GC
   t)))
@@ -1313,7 +1315,7 @@ Case 2. #+transclude inside another transclusion"
((let ((elm (org-element-at-point)))
   (not (and (string= "keyword" (org-element-type elm))
 (string= "TRANSCLUDE" (org-element-property :key elm)
-(user-error (format "Not at a transclude keyword at point %d, line %d"
+(user-error (format "Not at a transclude keyword or transclusion in a 
block at point %d, line %d"
 (point) (org-current-line
;; Case 2. #+transclude inside another transclusion
((org-transclusion-within-transclusion-p)

[elpa] externals/vertico dd1f5e58a3 2/4: Fix typos in commentary

[ELPA Syncer]

branch: externals/vertico
commit dd1f5e58a32b39231a97923a4dbbdf48192836b3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix typos in commentary
---
 extensions/vertico-buffer.el  | 4 ++--
 extensions/vertico-indexed.el | 2 +-
 extensions/vertico-repeat.el  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 1397b2fbc1..2e3a89b169 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -26,8 +26,8 @@
 
 ;;; Commentary:
 
-;; This package is a Vertico extension, which allows to display Vertico
-;; in a buffer instead of the minibuffer. The buffer display can be enabled
+;; This package is a Vertico extension, which displays Vertico in a
+;; buffer instead of the minibuffer. The buffer display can be enabled
 ;; by the `vertico-buffer-mode'.
 
 ;;; Code:
diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el
index 304651da36..787ec53965 100644
--- a/extensions/vertico-indexed.el
+++ b/extensions/vertico-indexed.el
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;; This package is a Vertico extension, which prefixes candidates with
-;; indices and allows selection using prefix arguments.
+;; indices and allows you to select with prefix arguments.
 
 ;;; Code:
 
diff --git a/extensions/vertico-repeat.el b/extensions/vertico-repeat.el
index 4fbb72cf4c..031a98071f 100644
--- a/extensions/vertico-repeat.el
+++ b/extensions/vertico-repeat.el
@@ -26,8 +26,8 @@
 
 ;;; Commentary:
 
-;; This package is a Vertico extension, which allows to repeat the last
-;; Vertico session via the `vertico-repeat' command.
+;; This package is a Vertico extension, which enables repetition of the
+;; last Vertico session via the `vertico-repeat' command.
 ;;
 ;; (global-set-key "\M-r" #'vertico-repeat)
 ;;

[elpa] externals/vertico e46cf425bb 1/4: Replace vertico-grid-rows with vertico-count

[ELPA Syncer]

branch: externals/vertico
commit e46cf425bb1744d5feeb70e74887f02cb70cb606
Author: Daniel Mendler 
Commit: Daniel Mendler 

Replace vertico-grid-rows with vertico-count

vertico-count is a bit of a misnomer, it should be called vertico-height.
---
 extensions/vertico-grid.el | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el
index ea4e77d268..a7729269e3 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -73,7 +73,7 @@ When scrolling beyond this limit, candidates may be 
truncated."
 (max 1 (min vertico-grid-max-columns
 (floor (window-width) (+ w (length 
vertico-grid-separator
   (let* ((sep (length vertico-grid-separator))
- (count (* vertico-grid-rows vertico-grid--columns))
+ (count (* vertico-count vertico-grid--columns))
  (start (* count (floor (max 0 vertico--index) count)))
  (width (- (/ (window-width) vertico-grid--columns) sep))
  (cands
@@ -94,16 +94,16 @@ When scrolling beyond this limit, candidates may be 
truncated."
  vertico--total)
  (width (make-vector vertico-grid--columns 0)))
 (dotimes (col vertico-grid--columns)
-  (dotimes (row vertico-grid-rows)
+  (dotimes (row vertico-count)
 (aset width col (max
  (aref width col)
- (string-width (or (nth (+ row (* col 
vertico-grid-rows)) cands) ""))
+ (string-width (or (nth (+ row (* col vertico-count)) 
cands) ""))
 (dotimes (col (1- vertico-grid--columns))
   (cl-incf (aref width (1+ col)) (+ (aref width col) sep)))
-(cl-loop for row from 0 to (1- vertico-grid-rows) collect
+(cl-loop for row from 0 to (1- vertico-count) collect
  (let ((line (list "\n")))
(cl-loop for col from (1- vertico-grid--columns) downto 0 do
-(when-let (cand (nth (+ row (* col vertico-grid-rows)) 
cands))
+(when-let (cand (nth (+ row (* col vertico-count)) 
cands))
   (push cand line)
   (when (> col 0)
 (push vertico-grid-separator line)
@@ -119,16 +119,16 @@ When scrolling beyond this limit, candidates may be 
truncated."
 (defun vertico-grid-right (&optional n)
   "Move N columns to the right in the grid."
   (interactive "p")
-  (let* ((page (* vertico-grid-rows vertico-grid--columns))
+  (let* ((page (* vertico-count vertico-grid--columns))
  (p (/ vertico--index page))
  (q (mod vertico--index page))
- (x (/ q vertico-grid-rows))
- (y (mod q vertico-grid-rows))
+ (x (/ q vertico-count))
+ (y (mod q vertico-count))
  (z (+ (* p page) (* vertico-grid--columns y) x (or n 1
 (setq x (mod z vertico-grid--columns)
   y (/ z vertico-grid--columns))
-(vertico--goto (+ (* x vertico-grid-rows) (mod y vertico-grid-rows)
-  (* (/ y vertico-grid-rows) page)
+(vertico--goto (+ (* x vertico-count) (mod y vertico-count)
+  (* (/ y vertico-count) page)
 
 ;;;###autoload
 (define-minor-mode vertico-grid-mode

[elpa] externals/vertico d0df8c9ce6 3/4: Improve vertico-buffer

[ELPA Syncer]

branch: externals/vertico
commit d0df8c9ce6f4e2d4f47919bcc7edc43b5cf24172
Author: Daniel Mendler 
Commit: Daniel Mendler 

Improve vertico-buffer

- Compute vertico-count based on window size
- Show minibuffer in separate window
- Add vertico-buffer-hide-prompt
---
 extensions/vertico-buffer.el | 128 +++
 1 file changed, 68 insertions(+), 60 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 2e3a89b169..c840fae98d 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -35,12 +35,15 @@
 (require 'vertico)
 
 (defvar-local vertico-buffer--overlay nil)
-(defvar-local vertico-buffer--buffer nil)
+(defvar-local vertico-buffer--window nil)
+
+(defcustom vertico-buffer-hide-prompt t
+  "Hide prompt in the minibuffer."
+  :group 'vertico
+  :type 'boolean)
 
 (defcustom vertico-buffer-display-action
-  `(display-buffer-in-side-window
-(window-height . ,(+ 3 vertico-count))
-(side . top))
+  '(display-buffer-reuse-window)
   "Display action for the Vertico buffer."
   :group 'vertico
   :type `(choice
@@ -70,61 +73,66 @@
   (side . bottom)))
   (sexp :tag "Other")))
 
-(defun vertico-buffer--display (lines)
-  "Display LINES in buffer."
-  (set-window-vscroll nil 100)
-  (let ((count (vertico--format-count))
-(prompt (minibuffer-prompt))
-(content (minibuffer-contents)))
-(with-current-buffer vertico-buffer--buffer
-  (with-silent-modifications
-(erase-buffer)
-(insert (propertize (concat count prompt) 'face 'minibuffer-prompt)
-content "\n" (string-join lines
-(let ((win (or (get-buffer-window vertico-buffer--buffer)
-   (display-buffer vertico-buffer--buffer 
vertico-buffer-display-action
-  (overlay-put vertico--candidates-ov 'window win)
-  (when vertico--count-ov
-(overlay-put vertico--count-ov 'window win))
-  (set-window-point win (max (+ 1 (length prompt) (length count))
- (+ (point) (length count
-  (with-current-buffer vertico-buffer--buffer
-(setq-local truncate-lines (< (window-point win) (* 0.8 (window-width 
win
-
-(defun vertico-buffer--select (_)
-  "Ensure that cursor is only shown if minibuffer is selected."
-  (with-current-buffer (buffer-local-value 'vertico-buffer--buffer
-   (window-buffer 
(active-minibuffer-window)))
-(if (eq (selected-window) (active-minibuffer-window))
-(setq-local cursor-in-non-selected-windows 'box)
-  (setq-local cursor-in-non-selected-windows nil)
-  (goto-char (point-min)
-
-(defun vertico-buffer--destroy ()
-  "Destroy Vertico buffer."
-  (set-window-vscroll nil 0)
-  (kill-buffer vertico-buffer--buffer))
+(defun vertico-buffer--redisplay (win)
+  "Redisplay window WIN."
+  (when-let (mbwin (active-minibuffer-window))
+(when (eq (window-buffer mbwin) (current-buffer))
+  (let ((old cursor-in-non-selected-windows)
+(new (and (eq (selected-window) mbwin) 'box)))
+(unless (eq new old)
+  (setq-local cursor-in-non-selected-windows new)
+  (force-mode-line-update t)))
+  (when (eq win vertico-buffer--window)
+(setq-local truncate-lines (< (window-point vertico-buffer--window)
+  (* 0.8 (window-width 
vertico-buffer--window
+(set-window-point vertico-buffer--window (point))
+(when vertico-buffer-hide-prompt
+  (set-window-vscroll mbwin 100))
 
 (defun vertico-buffer--setup ()
   "Setup minibuffer overlay, which pushes the minibuffer content down."
-  (add-hook 'window-selection-change-functions 'vertico-buffer--select nil 
'local)
-  (add-hook 'minibuffer-exit-hook 'vertico-buffer--destroy nil 'local)
-  (setq-local cursor-type '(bar . 0))
-  (setq vertico-buffer--overlay (make-overlay (point-max) (point-max) nil t t))
-  (overlay-put vertico-buffer--overlay 'window (selected-window))
-  (overlay-put vertico-buffer--overlay 'priority 1000)
-  (overlay-put vertico-buffer--overlay 'before-string "\n\n")
-  (setq vertico-buffer--buffer (get-buffer-create
-(if (= 1 (recursion-depth))
-" *Vertico*"
-  (format " *Vertico-%s*" (1- 
(recursion-depth))
-  (with-current-buffer vertico-buffer--buffer
-(add-hook 'window-selection-change-functions 'vertico-buffer--select nil 
'local)
-(setq-local display-line-numbers nil
-truncate-lines t
-show-trailing-whitespace nil
-buffer-read-only t
-cursor-in-non-selected-windows 'box)))
+  (add-hook 'pre-redisplay-functions 'vertico-buffer--redisplay nil 'local)
+  (let ((temp (generate-new-buffer "*vertico*")))
+(setq vertico-buffer--window (display-buffer temp 
vertico-

[elpa] externals/org-transclusion d987dddca9: intrnl:.eplaignore update

[ELPA Syncer]

branch: externals/org-transclusion
commit d987dddca9017eb497f5b0ff2db3379ccdb39d7d
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl:.eplaignore update
---
 .elpaignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.elpaignore b/.elpaignore
index 63f6881593..a66ed6cda3 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -3,5 +3,6 @@ docs
 resources
 Makefile
 .gitignore
+.elpaignore
 text-clone-docs
-.dir-local.el
\ No newline at end of file
+.dir-locals.el
\ No newline at end of file

[elpa] externals/shell-command+ 8a88742105: Use :bind-into instead of :with-feature+:bind in README

[ELPA Syncer]

branch: externals/shell-command+
commit 8a88742105fa9ab67a5d33299f267efd65b901bc
Author: Philip Kaludercic 
Commit: Philip Kaludercic 

Use :bind-into instead of :with-feature+:bind in README
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cc9ce445fa..353833f83a 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,7 @@ Using [`setup`][setup] I configure `shell-command+` as so:
 ~~~elisp
 (setup (:package shell-command+)
   (:option shell-command+-prompt "$ ")
-  (:with-feature dired
-(:bind "M-!" shell-command+))
+  (:bind-into dired "M-!" shell-command+)
   (:global "M-!" shell-command+))
 ~~~
 

[elpa] externals/vertico updated (3e6bff477e -> df315d6765)

[ELPA Syncer]

elpasync pushed a change to branch externals/vertico.

  from  3e6bff477e Add vertico-multiform extension
   new  3fd19b49f3 vertico-multiform: Add settings variable, rename modes
   new  4e984005dd Document vertico-multiform
   new  487fa022df Minor cleanup
   new  df315d6765 vertico-buffer: Use mode-line-buffer-id face


Summary of changes:
 README.org  | 61 ++---
 extensions/vertico-buffer.el|  2 +-
 extensions/vertico-multiform.el | 87 +++--
 3 files changed, 106 insertions(+), 44 deletions(-)

[elpa] externals/vertico df315d6765 4/4: vertico-buffer: Use mode-line-buffer-id face

[ELPA Syncer]

branch: externals/vertico
commit df315d6765fa83eeca7338134dc3f431eebcfd03
Author: Daniel Mendler 
Commit: Daniel Mendler 

vertico-buffer: Use mode-line-buffer-id face
---
 extensions/vertico-buffer.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index c840fae98d..f547aaddae 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -127,7 +127,7 @@
   truncate-lines t
   mode-line-format
   (list (format " %s %s "
-(propertize "*Vertico*" 'face 'bold)
+(propertize "*Vertico*" 'face 'mode-line-buffer-id)
 (string-remove-suffix ": " (minibuffer-prompt)))
 '(:eval (vertico--format-count)))
   cursor-in-non-selected-windows 'box

[elpa] externals/vertico 487fa022df 3/4: Minor cleanup

[ELPA Syncer]

branch: externals/vertico
commit 487fa022dfd157f043c018a0fd3442221f2d4330
Author: Daniel Mendler 
Commit: Daniel Mendler 

Minor cleanup
---
 extensions/vertico-multiform.el | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index ef76a78860..c2c7df6bd7 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -100,18 +100,14 @@ APP is the original function call."
   (if (fboundp v) v m)))
   (or (and cat (alist-get cat 
vertico-multiform-category-modes))
   (alist-get this-command 
vertico-multiform-command-modes))
-(cond
- ((= depth (recursion-depth))
-  (mapc (lambda (f) (funcall f 1)) modes))
- ((= (1+ depth) (recursion-depth))
-  (mapc (lambda (f) (funcall f -1)) modes)
+(pcase (- (recursion-depth) depth)
+  (0 (mapc (lambda (f) (funcall f 1)) modes))
+  (1 (mapc (lambda (f) (funcall f -1)) modes)
 (fset exit
   (lambda ()
-(cond
- ((= depth (recursion-depth))
-  (mapc (lambda (f) (funcall f -1)) modes))
- ((= (1+ depth) (recursion-depth))
-  (mapc (lambda (f) (funcall f 1)) modes)
+(pcase (- (recursion-depth) depth)
+  (0 (mapc (lambda (f) (funcall f -1)) modes))
+  (1 (mapc (lambda (f) (funcall f 1)) modes)
 ;; NOTE: The setup/exit nesting is only correct for shallow recursions.
 ;; Hopefully nobody is crazy enough to work at recursion level 99.
 (add-hook 'minibuffer-setup-hook setup (+ -99 depth))

[elpa] externals/vertico 4e984005dd 2/4: Document vertico-multiform

[ELPA Syncer]

branch: externals/vertico
commit 4e984005dd854dd00bc9e3767fb9d1d4cefe4fc5
Author: Daniel Mendler 
Commit: Daniel Mendler 

Document vertico-multiform

The `vertico-multiform` extension solves an issue I wanted to have fixed for
quite some time: It makes it possible to configure the Vertico display or
arbitrary modes per command or completion category, e.g., turning on the
`vertico-grid-mode` only for the command `find-file`. Until now it has only 
been
possible to turn on `vertico-grid-mode` or `vertico-buffer-mode` globally, 
which
wastes a lot of flexibility. The `vertico-multiform` package is still
experimental - turning modes on and off when entering and leaving recursive
minibuffers may introduce edge cases.

There is an interesting use case described by @abcdw described in
https://github.com/minad/consult/issues/486. Andrew uses @protesilaos' Mct 
and
configures it separately for each command. For commands like 
`consult-imenu`,
`consult-outline`, etc. he prefers a separate large buffer since the 
command is
meant to navigate within the current buffer. For buffer switching commands 
like
`find-file`, `switch-to-buffer` the selected window can be reused instead, 
keeping
the window layout intact.
---
 README.org | 61 +++--
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index 211ea011b0..fbff202ed1 100644
--- a/README.org
+++ b/README.org
@@ -237,7 +237,7 @@
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-grid.el][vertico-grid]]:
 =vertico-grid-mode= to enable a grid display.
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-indexed.el][vertico-indexed]]:
 =vertico-indexed-mode= to select indexed candidates with prefix arguments.
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-mouse.el][vertico-mouse]]:
 =vertico-mouse-mode= to support for scrolling and candidate selection.
-  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-multiform.el][vertico-multiform]]:
 Configure Vertico modes per command or completion category..
+  - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-multiform.el][vertico-multiform]]:
 Configure Vertico modes per command or completion category.
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-quick.el][vertico-quick]]:
 Commands to select using Avy-style quick keys.
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-repeat.el][vertico-repeat]]:
 The command =vertico-repeat= repeats the last completion session.
   - 
[[https://github.com/minad/vertico/blob/main/extensions/vertico-reverse.el][vertico-reverse]]:
 =vertico-reverse-mode= to reverse the display.
@@ -246,8 +246,9 @@
   your preference or behaves similar to other familiar UIs. For example, the
   combination =vertico-flat= plus =vertico-directory= resembles Ido in look and
   feel. For an interface similar to Helm, the extension =vertico-buffer= allows
-  you to configure more freely where the completion buffer opens, instead of
-  growing the minibuffer.
+  you to configure freely where the completion buffer opens, instead of growing
+  the minibuffer. Furthermore =vertico-buffer= will adjust the number of 
displayed
+  candidates according to the buffer height.
 
   Configuration example for =vertico-directory=:
 
@@ -265,6 +266,55 @@
   :hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
   #+end_src
 
+** Configure Vertico per-command or completion category
+
+Vertico offers the =vertico-multiform-mode= which allows you to configure 
Vertico
+per command or per completion category. The =vertico-buffer-mode= enables a
+Helm-like buffer display, which takes more space but also displays more
+candidates. This verbose display mode is useful for commands like 
~consult-imenu~
+or ~consult-outline~ since the buffer display allows you to get a better 
overview
+over the entire current buffer.
+
+#+begin_src emacs-lisp
+  ;; Enable vertico-multiform
+  (vertico-multiform-mode)
+
+  ;; Configure the display per command.
+  ;; Use a buffer with indices for imenu
+  ;; and a flat (Ido-like) menu for M-x.
+  (setq vertico-multiform-command-modes
+'((consult-imenu buffer indexed)
+  (execute-extended-command flat)))
+
+  ;; Configure the display per completion category.
+  ;; Use the grid display for files and a buffer
+  ;; for the consult-grep commands.
+  (setq vertico-multiform-category-modes
+'((file grid)
+  (consult-grep buffer)))
+#+end_src
+
+You can use your own functions or even lambdas to configure the per command (or
+per category) completion behavior. The function must have the same calling
+convention as a mode, i.e., it takes a single argument, which is either 1 to
+turn on the mode and -1 to turn off the mode.
+
+#+begin_src emacs-lisp
+  ;; Configure `consult-outline

[elpa] externals/vertico 3fd19b49f3 1/4: vertico-multiform: Add settings variable, rename modes

[ELPA Syncer]

branch: externals/vertico
commit 3fd19b49f337e906a399efe25c6909ecc0a3b23e
Author: Daniel Mendler 
Commit: Daniel Mendler 

vertico-multiform: Add settings variable, rename modes
---
 extensions/vertico-multiform.el | 71 +
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index f0a2f22646..ef76a78860 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -34,13 +34,13 @@
 ;;
 ;; Example:
 ;;
-;;(setq vertico-multiform-commands
-;;'((consult-line buffer)
-;; (consult-imenu reverse buffer)
-;; (execute-extended-command flat)))
+;;(setq vertico-multiform-command-modes
+;;  '((consult-line buffer)
+;;(consult-imenu reverse buffer)
+;;(execute-extended-command flat)))
 ;;
-;;(setq vertico-multiform-categories
-;; '((file buffer grid)))
+;;(setq vertico-multiform-category-modes
+;;  '((file buffer grid)))
 ;;
 ;;(vertico-multiform-mode)
 
@@ -48,17 +48,31 @@
 
 (require 'vertico)
 
-(defcustom vertico-multiform-commands nil
+(defcustom vertico-multiform-command-modes nil
   "Alist of commands and list of modes to turn on per command.
-Takes precedence over `vertico-multiform-categories'."
+Takes precedence over `vertico-multiform-category-modes'."
   :group 'vertico
-  :type '(repeat (list symbol)))
+  :type '(alist :key-type symbol :value-type (repeat symbol)))
 
-(defcustom vertico-multiform-categories nil
-  "Alist of categories and list of modes to turn on per categories.
-Has lower precedence than `vertico-multiform-commands'."
+(defcustom vertico-multiform-category-modes nil
+  "Alist of categories and list of modes to turn on per category.
+Has lower precedence than `vertico-multiform-command-modes'."
   :group 'vertico
-  :type '(repeat (list symbol)))
+  :type '(alist :key-type symbol :value-type (repeat symbol)))
+
+(defcustom vertico-multiform-command-settings nil
+  "Alist of commands and alist of variables to set per command.
+Takes precedence over `vertico-multiform-category-settings'."
+  :group 'vertico
+  :type '(alist :key-type symbol
+:value-type (alist :key-type symbol :value-type sexp)))
+
+(defcustom vertico-multiform-category-settings nil
+  "Alist of categories and alist of variables to set per category.
+Has lower precedence than `vertico-multiform-command-settings'."
+  :group 'vertico
+  :type '(alist :key-type symbol
+:value-type (alist :key-type symbol :value-type sexp)))
 
 (defun vertico-multiform--advice (&rest app)
   "Advice for `vertico--advice' switching modes on and off.
@@ -69,22 +83,25 @@ APP is the original function call."
 (depth (1+ (recursion-depth
 (fset setup
   (lambda ()
+(when (eq modes 'init)
+  (let ((cat (completion-metadata-get
+  (completion-metadata
+   (buffer-substring (minibuffer-prompt-end)
+ (max (minibuffer-prompt-end) 
(point)))
+   minibuffer-completion-table
+   minibuffer-completion-predicate)
+  'category)))
+(dolist (setting (or (and cat (alist-get cat 
vertico-multiform-category-settings))
+ (alist-get this-command 
vertico-multiform-command-settings)))
+  (set (make-local-variable (car setting)) (cdr setting)))
+(setq modes
+  (mapcar (lambda (m)
+(let ((v (intern (format "vertico-%s-mode" 
m
+  (if (fboundp v) v m)))
+  (or (and cat (alist-get cat 
vertico-multiform-category-modes))
+  (alist-get this-command 
vertico-multiform-command-modes))
 (cond
  ((= depth (recursion-depth))
-  (when (eq modes 'init)
-(let ((cat (completion-metadata-get
-(completion-metadata
- (buffer-substring (minibuffer-prompt-end)
-   (max (minibuffer-prompt-end) 
(point)))
- minibuffer-completion-table
- minibuffer-completion-predicate)
-'category)))
-  (setq modes
-(mapcar (lambda (m)
-  (let ((v (intern (format "vertico-%s-mode" 
m
-(if (fboundp v) v m)))
-(or (and cat (alist-get cat 
vertico-multiform-categories))
-(alist-get this-command 
vertico-multiform-commands))
   (mapc (lambda (f) (funcall f 1)) modes))

[elpa] externals/eev a0cfda8ee7: Added `find-2021ffllvideo'.

[ELPA Syncer]

uot;plic bletch")
- (find-find-links-links-new)
  ;; Convention: the first sexp always regenerates the buffer.
  (find-efunction 'find-find-links-links-new)
  ""
@@ -1891,19 +1891,24 @@ and: (find-video-links-intro \\\"7. 
`find-eev-video'\\\")
 ;;; |_| |_|_| |_|\__,_| |_|\__,_|\__\___/_/\_\|_|_|_| |_|_|\_\___/
 ;;;   
 ;; «find-latex-links» (to ".find-latex-links")
-;; See:
-;;   (find-eev-quick-intro "7.5. `find-latex-links'")
-
+;; Skel: (find-find-links-links-new "latex" "stem" "stem-")
+;; Tests: (find-latex-links)
+;;(find-latex-links "/tmp/foo")
+;;(find-latex-links "/tmp/foo" 2)
+;;(find-latex-links "/tmp/foo" 2 "copy-rest")
+;;   See: (find-eev-quick-intro "7.5. `find-latex-links'")
+;;
 (defun find-latex-links (&optional stem &rest pos-spec-list)
 "Visit a temporary buffer containing a template for creating a LaTeX document."
   (interactive)
   (setq stem (or stem "{stem}"))
-  (let ((stem- (file-name-nondirectory stem)))
-(apply 'find-elinks
+  (let* ((stem- (file-name-nondirectory stem)))
+(apply
+ 'find-elinks
  `((find-latex-links ,stem ,@pos-spec-list)
(find-latex-links "/tmp/test")
;; Convention: the first sexp always regenerates the buffer.
-   ;; (find-efunction 'find-latex-links)
+   (find-efunction 'find-latex-links)
(find-eev-quick-intro "7.5. `find-latex-links'")
(find-eev-quick-intro "7.5. `find-latex-links'" "change the \"{stem}\"")
(find-eev-quick-intro "7.5. `find-latex-links'" "top line")
@@ -1923,14 +1928,11 @@ and: (find-video-links-intro \\\"7. 
`find-eev-video'\\\")
 \\documentclass{<}article{>}
 \\begin{<}document{>}
 
-\\end{<}document{>}")
+\\end{<}document{>}
+")
)
  pos-spec-list)))
 
-;; Tests: (find-latex-links)
-;;(find-latex-links "/tmp/foo")
-;;(find-latex-links "/tmp/foo" 2)
-;;(find-latex-links "/tmp/foo" 2 "copy-rest")
 
 
 
diff --git a/eev-videolinks.el b/eev-videolinks.el
index 8ce4435a7a..746e228b8e 100644
--- a/eev-videolinks.el
+++ b/eev-videolinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20211211
+;; Version:20211226
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-videolinks.el>
@@ -54,6 +54,7 @@
 ;;   «.find-2021workshop5video»(to "find-2021workshop5video")
 ;;   «.find-2021workshop6video»(to "find-2021workshop6video")
 ;;   «.find-2021orgfornonusersvideo»   (to "find-2021orgfornonusersvideo")
+;;   «.find-2021ffllvideo» (to "find-2021ffllvideo")
 ;; «.more-info»(to "more-info")
 ;; «.ee-1stclassvideos-info»   (to "ee-1stclassvideos-info")
 ;;   «.eev2019»(to "eev2019")
@@ -73,6 +74,7 @@
 ;;   «.2021workshop5»  (to "2021workshop5")
 ;;   «.2021workshop6»  (to "2021workshop6")
 ;;   «.2021orgfornonusers» (to "2021orgfornonusers")
+;;   «.2021ffll»   (to "2021ffll")
 ;; «.ee-1stclassvideos-field»  (to "ee-1stclassvideos-field")
 ;; «.second-class-videos»  (to "second-class-videos")
 ;;   «.code-eevvideo»  (to "code-eevvideo")
@@ -524,6 +526,21 @@ and: (find-video-links-intro \"7. \" \"find-eev-video\")
   (interactive)
   (find-eev-video "2021-org-for-non-users" "Eh5Wz9Vh_XM" time))
 
+;; «find-2021ffllvideo»  (to ".find-2021ffllvideo")
+;; Skel: (find-1stclassvideo-links "2021ffll")
+;; Tests: (find-2021ffllvideo "0:00")
+;;(find-efunctiondescr 'find-2021ffllvideo)
+(defun find-2021ffllvideo (&optional time &rest rest)
+  "Play one of the video tutorials of eev starting at TIME.
+See: (find-eev \"eev-videolinks.el\" \"2021ffll\")
+ http://angg.twu.net/eev-current/eev-videolinks.el.html#eev2020
+ for more info on this particular video,
+and: (find-video-links-intro \"7. \" \"find-eev-video\")
+ or: http://angg.twu.net/eev-intros/find-video-links-intro.html#7
+ for more info on these video tutorials."
+  (interactive)
+  (find-eev-video "2021-ffll" "h1CEL2fmkyc" time))
+
 
 
 
@@ -637,35 +654,35 @@ and: (find-video-links-intro \"7. \" \"find-e

[elpa] externals/org-transclusion 31125510e9: intrnl: update ELPA deployment files

[ELPA Syncer]

branch: externals/org-transclusion
commit 31125510e9c58c83903057848ac4c6fe0ff55276
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: update ELPA deployment files
---
 .elpaignore |  3 ++-
 Makefile|  3 ++-
 dir | 19 ---
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.elpaignore b/.elpaignore
index a66ed6cda3..3f79899a1c 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -5,4 +5,5 @@ Makefile
 .gitignore
 .elpaignore
 text-clone-docs
-.dir-locals.el
\ No newline at end of file
+.dir-locals.el
+org-transclusion.org
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 80c44f7564..c32bb7ebbe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-docs/org-transclusion.org: docs/org-transclusion-manual.org
+org-transclusion.org: docs/org-transclusion-manual.org
-emacs --batch -L "$$(pwd)" -l org-transclusion $< \
   --eval '(progn (org-transclusion-add-all) (write-region nil nil 
"org-transclusion.org"))'
+   mv docs/org-transclusion.org org-transclusion.org
 
 
 .PHONY: test-compile
diff --git a/dir b/dir
deleted file mode 100644
index a3a6852083..00
--- a/dir
+++ /dev/null
@@ -1,19 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir, Node: Top   This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "H" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs" visits the Emacs manual, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu:
-
-Emacs
-* Org-transclusion: (org-transclusion).
-Transclusion in Org mode.

[elpa] externals/mct 9d204c6f70: Remove obsolete code

[ELPA Syncer]

branch: externals/mct
commit 9d204c6f70a9c8c9694120478a36403893b52f2e
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove obsolete code
---
 mct.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mct.el b/mct.el
index e525d9f0f4..3cf5ea97e9 100644
--- a/mct.el
+++ b/mct.el
@@ -416,12 +416,7 @@ Apply APP by first setting up the minibuffer to work with 
Mct."
   (let ((display-buffer-alist
  (cons (cons mct-completion-windows-regexp mct-display-buffer-action)
display-buffer-alist)))
-(save-excursion (minibuffer-completion-help)))
-  ;; ;; NOTE 2021-12-09: We should no longer have a need for this, as we
-  ;; ;; pass an after advice to `minibuffer-completion-help'.
-  ;;
-  ;; (mct--fit-completions-window)
-  )
+(save-excursion (minibuffer-completion-help
 
 ;;;###autoload
 (defun mct-focus-mini-or-completions ()

[elpa] externals/vertico 3dd5288c0d: More robust vertico-multiform and vertico-buffer

[ELPA Syncer]

branch: externals/vertico
commit 3dd5288c0d3b5da329d2f28c56e531aff15e410f
Author: Daniel Mendler 
Commit: Daniel Mendler 

More robust vertico-multiform and vertico-buffer
---
 README.org  |  2 +-
 extensions/vertico-buffer.el| 14 +++
 extensions/vertico-multiform.el | 87 ++---
 3 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/README.org b/README.org
index fbff202ed1..fc6baa572d 100644
--- a/README.org
+++ b/README.org
@@ -302,7 +302,7 @@ turn on the mode and -1 to turn off the mode.
 #+begin_src emacs-lisp
   ;; Configure `consult-outline' as a scaled down TOC in a separate buffer
   (setq vertico-multiform-command-modes
-'((consult-outline buffer (lambda (_) (text-scale-decrease 1)
+'((consult-outline buffer (lambda (_) (text-scale-set -1)
 #+end_src
 
 Furthermore you can tune buffer-local settings per command (or category).
diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index f547aaddae..516985f735 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -97,18 +97,18 @@
 (set-window-buffer vertico-buffer--window (current-buffer))
 (kill-buffer temp))
   (let ((sym (make-symbol "vertico-buffer--destroy"))
-(mbwin (active-minibuffer-window))
 (depth (recursion-depth))
 (now (window-parameter vertico-buffer--window 'no-other-window))
 (ndow (window-parameter vertico-buffer--window 
'no-delete-other-windows)))
 (fset sym (lambda ()
 (when (= depth (recursion-depth))
-  (when (window-live-p vertico-buffer--window)
-(set-window-parameter vertico-buffer--window 
'no-other-window now)
-(set-window-parameter vertico-buffer--window 
'no-delete-other-windows ndow))
-  (when vertico-buffer-hide-prompt
-(set-window-vscroll mbwin 0))
-  (remove-hook 'minibuffer-exit-hook sym
+  (with-selected-window (active-minibuffer-window)
+(when (window-live-p vertico-buffer--window)
+  (set-window-parameter vertico-buffer--window 
'no-other-window now)
+  (set-window-parameter vertico-buffer--window 
'no-delete-other-windows ndow))
+(when vertico-buffer-hide-prompt
+  (set-window-vscroll nil 0))
+(remove-hook 'minibuffer-exit-hook sym)
 ;; NOTE: We cannot use a buffer-local minibuffer-exit-hook here.
 ;; The hook will not be called when abnormally exiting the minibuffer
 ;; from another buffer via `keyboard-escape-quit'.
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index c2c7df6bd7..dce1b30a4d 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -74,55 +74,60 @@ Has lower precedence than 
`vertico-multiform-command-settings'."
   :type '(alist :key-type symbol
 :value-type (alist :key-type symbol :value-type sexp)))
 
+(defvar vertico-multiform--stack nil)
+
+(defun vertico-multiform--toggle (arg)
+  "Toggle modes from stack depending on ARG."
+  (when-let (win (active-minibuffer-window))
+(with-selected-window win
+  (dolist (f (car vertico-multiform--stack))
+(funcall f arg)
+
+(defun vertico-multiform--setup ()
+  "Enable modes at minibuffer setup."
+  (let ((cat (completion-metadata-get
+  (completion-metadata
+   (buffer-substring (minibuffer-prompt-end)
+ (max (minibuffer-prompt-end) (point)))
+   minibuffer-completion-table
+   minibuffer-completion-predicate)
+  'category))
+(exit (make-symbol "vertico-multiform--exit"))
+(depth (recursion-depth)))
+(fset exit (lambda ()
+ (when (= depth (recursion-depth))
+   (remove-hook 'minibuffer-exit-hook exit)
+   (vertico-multiform--toggle -1)
+   (pop vertico-multiform--stack
+(add-hook 'minibuffer-exit-hook exit)
+(dolist (x (or (and cat (alist-get cat 
vertico-multiform-category-settings))
+   (alist-get this-command 
vertico-multiform-command-settings)))
+  (set (make-local-variable (car x)) (cdr x)))
+(push (mapcar (lambda (m)
+(let ((v (intern (format "vertico-%s-mode" m
+  (if (fboundp v) v m)))
+  (or (and cat (alist-get cat 
vertico-multiform-category-modes))
+  (alist-get this-command 
vertico-multiform-command-modes)))
+  vertico-multiform--stack)
+(vertico-multiform--toggle 1)
+(vertico--setup)))
+
 (defun vertico-multiform--advice (&rest app)
-  "Advice for `vertico--advice' switching modes on and off.
+  "Override advice for `vertico--advice' switching modes on and off.
 APP is the origina

[nongnu] elpa/rust-mode b83b34e82d 1/2: Add a face for the ampersand reference mark

[ELPA Syncer]

branch: elpa/rust-mode
commit b83b34e82d366e52324f675de9829ae96fd065b1
Author: Christophe Troestler 
Commit: Christophe Troestler 

Add a face for the ampersand reference mark

Customizing this face may improve code readability for some users.
By default nothing is set for backward compatibility.
---
 rust-mode-tests.el | 1 +
 rust-mode.el   | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index 9c23ed40b2..24c26823f7 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1699,6 +1699,7 @@ this_is_not_a_string();)"
  "foo" font-lock-type-face
  "x" font-lock-variable-name-face
  ;; This union is the name of a lifetime.
+ "&" rust-ampersand-face
  "union" font-lock-variable-name-face
  "bar" font-lock-type-face)))
 
diff --git a/rust-mode.el b/rust-mode.el
index fca9e9f3fa..57feaaa59a 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -101,6 +101,11 @@ to the function arguments.  When nil, `->' will be 
indented one level."
   "Face for the question mark operator."
   :group 'rust-mode)
 
+(defface rust-ampersand-face
+  '((t :inherit default))
+  "Face for the ampersand reference mark."
+  :group 'rust-mode)
+
 (defface rust-builtin-formatting-macro
   '((t :inherit font-lock-builtin-face))
   "Face for builtin formatting macros (print! &c.)."
@@ -437,6 +442,7 @@ Does not match type annotations of the form \"foo::<\"."
 
  ;; Question mark operator
  ("\\?" . 'rust-question-mark)
+ ("\\(&\\)'?\\<" 1 'rust-ampersand-face)
  )
 
;; Ensure we highlight `Foo` in `struct Foo` as a type.

[nongnu] elpa/rust-mode 65f96278b2 2/2: Merge pull request #428 from Chris00/ampersand

[ELPA Syncer]

branch: elpa/rust-mode
commit 65f96278b24b89c13e79b38a071a98824d108bb8
Merge: b017f74650 b83b34e82d
Author: brotzeit 
Commit: GitHub 

Merge pull request #428 from Chris00/ampersand

Add a face for the ampersand reference mark
---
 rust-mode-tests.el | 1 +
 rust-mode.el   | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index 9c23ed40b2..24c26823f7 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1699,6 +1699,7 @@ this_is_not_a_string();)"
  "foo" font-lock-type-face
  "x" font-lock-variable-name-face
  ;; This union is the name of a lifetime.
+ "&" rust-ampersand-face
  "union" font-lock-variable-name-face
  "bar" font-lock-type-face)))
 
diff --git a/rust-mode.el b/rust-mode.el
index fca9e9f3fa..57feaaa59a 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -101,6 +101,11 @@ to the function arguments.  When nil, `->' will be 
indented one level."
   "Face for the question mark operator."
   :group 'rust-mode)
 
+(defface rust-ampersand-face
+  '((t :inherit default))
+  "Face for the ampersand reference mark."
+  :group 'rust-mode)
+
 (defface rust-builtin-formatting-macro
   '((t :inherit font-lock-builtin-face))
   "Face for builtin formatting macros (print! &c.)."
@@ -437,6 +442,7 @@ Does not match type annotations of the form \"foo::<\"."
 
  ;; Question mark operator
  ("\\?" . 'rust-question-mark)
+ ("\\(&\\)'?\\<" 1 'rust-ampersand-face)
  )
 
;; Ensure we highlight `Foo` in `struct Foo` as a type.

[elpa] main 07b687e651: * elpa-packages (org-transclusion): Adjust to new doc arrangement

[Stefan Monnier via]

branch: main
commit 07b687e6515140618bc1406f007e7ebf1d4e7920
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (org-transclusion): Adjust to new doc arrangement

Also update the URL for `undo-tree`.
---
 elpa-packages | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index a8f074ce7c..43b0f18d3e 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -362,9 +362,10 @@
  ;; :auto-sync t)
  ("org-real"   :url "https://gitlab.com/tygrdev/org-real";
   :auto-sync t)
- ;; FIXME: Waiting for the author's copyright paperwork.
  ("org-transclusion"   :url "https://github.com/nobiot/org-transclusion";
-  :doc "README.org"
+  :make "org-transclusion.org"
+  :doc "org-transclusion.org"
+  :readme "README.org"
   :auto-sync t)
  ("org-translate"  :url nil)
  ("orgalist":url nil)
@@ -497,7 +498,7 @@
   :news "docs/CHANGELOG"
   :doc "docs/transient.texi")
  ("trie"   :url "http://www.dr-qubit.org/git/predictive.git";)
- ("undo-tree"  :url "http://www.dr-qubit.org/git/undo-tree.git";)
+ ("undo-tree"  :url "https://gitlab.com/tsc25/undo-tree";)
  ("uni-confusables":url nil)
  ("uniquify-files" :url nil)
  ("url-http-ntlm"  :url nil)

[elpa] externals/vertico 0c97ef8097: Quasiquote to please the Emacs overlords

[ELPA Syncer]

branch: externals/vertico
commit 0c97ef8097874a23c0337193243ffba14cafb96c
Author: Daniel Mendler 
Commit: Daniel Mendler 

Quasiquote to please the Emacs overlords
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index fc6baa572d..81466a0622 100644
--- a/README.org
+++ b/README.org
@@ -302,7 +302,7 @@ turn on the mode and -1 to turn off the mode.
 #+begin_src emacs-lisp
   ;; Configure `consult-outline' as a scaled down TOC in a separate buffer
   (setq vertico-multiform-command-modes
-'((consult-outline buffer (lambda (_) (text-scale-set -1)
+`((consult-outline buffer ,(lambda (_) (text-scale-set -1)
 #+end_src
 
 Furthermore you can tune buffer-local settings per command (or category).

[nongnu] elpa/rust-mode updated (65f96278b2 -> eba544147a)

[ELPA Syncer]

elpasync pushed a change to branch elpa/rust-mode.

  from  65f96278b2 Merge pull request #428 from Chris00/ampersand
   new  959bfce215 Enable the use of prettify-symbols-mode
   new  f14fa86a5c Add an entry to the README to mention prettifying
   new  eba544147a Merge pull request #429 from Chris00/prettify


Summary of changes:
 README.md| 15 +++
 rust-mode.el | 23 +++
 2 files changed, 38 insertions(+)

[nongnu] elpa/rust-mode 959bfce215 1/3: Enable the use of prettify-symbols-mode

[ELPA Syncer]

branch: elpa/rust-mode
commit 959bfce215c342c83d72650b2b35201de263edfe
Author: Christophe Troestler 
Commit: Christophe Troestler 

Enable the use of prettify-symbols-mode
---
 rust-mode.el | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/rust-mode.el b/rust-mode.el
index fca9e9f3fa..3bb1f8d41e 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -41,6 +41,12 @@ This variable might soon be remove again.")
   :type 'function
   :group 'rust-mode)
 
+(defvar rust-prettify-symbols-alist
+  '(("&&" . ?∧) ("||" . ?∨)
+("<=" . ?≤)  (">=" . ?≥) ("!=" . ?≠)
+("INFINITY" . ?∞) ("->" . ?→) ("=>" . ?⇒))
+  "Alist of symbol prettifications used for `prettify-symbols-alist'.")
+
 ;;; Customization
 
 (defgroup rust-mode nil
@@ -204,6 +210,20 @@ Use idomenu (imenu with `ido-mode') for best mileage.")
 table)
   "Syntax definitions and helpers.")
 
+;;; Prettify
+
+(defun rust--prettify-symbols-compose-p (start end match)
+  "Return true iff the symbol MATCH should be composed.
+See `prettify-symbols-compose-predicate'."
+  (and (fboundp 'prettify-symbols-default-compose-p)
+   (prettify-symbols-default-compose-p start end match)
+   ;; Make sure there is a space before || as it is also used for
+   ;; functions with 0 arguments.
+   (not (and (string= match "||")
+ (save-excursion
+   (goto-char start)
+   (looking-back "\\(?:\\

[nongnu] elpa/rust-mode eba544147a 3/3: Merge pull request #429 from Chris00/prettify

[ELPA Syncer]

branch: elpa/rust-mode
commit eba544147aa6769f4f0e153e9f7373801dd2db89
Merge: 65f96278b2 f14fa86a5c
Author: brotzeit 
Commit: GitHub 

Merge pull request #429 from Chris00/prettify

Enable the use of prettify-symbols-mode
---
 README.md| 15 +++
 rust-mode.el | 23 +++
 2 files changed, 38 insertions(+)

diff --git a/README.md b/README.md
index 46c48ea93b..e20d7e4f20 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,21 @@ on save:
 (setq rust-format-on-save t)
 ```
 
+### Prettifying
+
+You can toggle prettification of your code by running `M-x
+prettify-symbols-mode`.  If you'd like to automatically enable this
+for all rust files, add the following to your init.el.
+
+```elisp
+(add-hook 'rust-mode-hook
+  (lambda () (prettify-symbols-mode)))
+```
+
+You can add your own prettifications to `rust-prettify-symbols-alist`.
+For example, to display `x.add(y)` as `x∔(y)`, simply add to your init
+file `(push '(".add" . ?∔) rust-prettify-symbols-alist)`.
+
 ### Running / testing / compiling code
 
 The `rust-run`, `rust-test`, `rust-compile` and `rust-check` functions
diff --git a/rust-mode.el b/rust-mode.el
index 57feaaa59a..eec6057fb0 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -41,6 +41,12 @@ This variable might soon be remove again.")
   :type 'function
   :group 'rust-mode)
 
+(defvar rust-prettify-symbols-alist
+  '(("&&" . ?∧) ("||" . ?∨)
+("<=" . ?≤)  (">=" . ?≥) ("!=" . ?≠)
+("INFINITY" . ?∞) ("->" . ?→) ("=>" . ?⇒))
+  "Alist of symbol prettifications used for `prettify-symbols-alist'.")
+
 ;;; Customization
 
 (defgroup rust-mode nil
@@ -209,6 +215,20 @@ Use idomenu (imenu with `ido-mode') for best mileage.")
 table)
   "Syntax definitions and helpers.")
 
+;;; Prettify
+
+(defun rust--prettify-symbols-compose-p (start end match)
+  "Return true iff the symbol MATCH should be composed.
+See `prettify-symbols-compose-predicate'."
+  (and (fboundp 'prettify-symbols-default-compose-p)
+   (prettify-symbols-default-compose-p start end match)
+   ;; Make sure there is a space before || as it is also used for
+   ;; functions with 0 arguments.
+   (not (and (string= match "||")
+ (save-excursion
+   (goto-char start)
+   (looking-back "\\(?:\\

[nongnu] elpa/rust-mode f14fa86a5c 2/3: Add an entry to the README to mention prettifying

[ELPA Syncer]

branch: elpa/rust-mode
commit f14fa86a5c0a3b8563a24437549693ee07b9a95f
Author: Christophe Troestler 
Commit: Christophe Troestler 

Add an entry to the README to mention prettifying
---
 README.md | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 46c48ea93b..e20d7e4f20 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,21 @@ on save:
 (setq rust-format-on-save t)
 ```
 
+### Prettifying
+
+You can toggle prettification of your code by running `M-x
+prettify-symbols-mode`.  If you'd like to automatically enable this
+for all rust files, add the following to your init.el.
+
+```elisp
+(add-hook 'rust-mode-hook
+  (lambda () (prettify-symbols-mode)))
+```
+
+You can add your own prettifications to `rust-prettify-symbols-alist`.
+For example, to display `x.add(y)` as `x∔(y)`, simply add to your init
+file `(push '(".add" . ?∔) rust-prettify-symbols-alist)`.
+
 ### Running / testing / compiling code
 
 The `rust-run`, `rust-test`, `rust-compile` and `rust-check` functions

[elpa] externals/svg-lib 567e1b6da0 1/2: Take line spacing into account for tag height computation.

[ELPA Syncer]

branch: externals/svg-lib
commit 567e1b6da0f9c05b8fc4340c9a7c28e288bd3d05
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Take line spacing into account for tag height computation.
---
 svg-lib.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/svg-lib.el b/svg-lib.el
index 17ab8b474f..3be68ad238 100644
--- a/svg-lib.el
+++ b/svg-lib.el
@@ -242,6 +242,9 @@ and style elements ARGS."
 
  (txt-char-width  (window-font-width))
  (txt-char-height (window-font-height))
+ (txt-char-height (if line-spacing
+  (+ txt-char-height line-spacing)
+  txt-char-height))
  (font-info   (font-info (format "%s-%d" font-family font-size)))
  (ascent  (aref font-info 8))
  (tag-char-width  (aref font-info 11))

[elpa] externals/svg-lib 9d4a97dd32 2/2: Set default margin to 0 and bumped version.

[ELPA Syncer]

branch: externals/svg-lib
commit 9d4a97dd32fcc322618ee8aeb47515b465c6ceb6
Author: Nicolas P. Rougier 
Commit: Nicolas P. Rougier 

Set default margin to 0 and bumped version.
---
 svg-lib.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/svg-lib.el b/svg-lib.el
index 3be68ad238..c4aca0c779 100644
--- a/svg-lib.el
+++ b/svg-lib.el
@@ -4,7 +4,7 @@
 
 ;; Maintainer: Nicolas P. Rougier 
 ;; URL: https://github.com/rougier/svg-lib
-;; Version: 0.2.2
+;; Version: 0.2.3
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: svg, icons, tags, convenience
 
@@ -146,7 +146,7 @@ to the default face)."
   :foreground,foreground
 
   :padding   1  ;; In characters (tag and icons) or pixels 
(progress)
-  :margin1  ;; In characters
+  :margin0  ;; In characters
   :stroke2  ;; In pixels
   :radius3  ;; In pixels
   :alignment 0.5;; Horizontal alignment (in fraction of margin)

[elpa] externals/svg-lib updated (7f5f8068de -> 9d4a97dd32)

[ELPA Syncer]

elpasync pushed a change to branch externals/svg-lib.

  from  7f5f8068de Added a crop left/right parameter for tags collage
   new  567e1b6da0 Take line spacing into account for tag height 
computation.
   new  9d4a97dd32 Set default margin to 0 and bumped version.


Summary of changes:
 svg-lib.el | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

[elpa] externals/vertico d6e4ddc69c: README: Add more extensive buffer display action example

[ELPA Syncer]

branch: externals/vertico
commit d6e4ddc69c7f8ac8b1b24f5163ec20abdf1bda6a
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Add more extensive buffer display action example
---
 README.org | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/README.org b/README.org
index 81466a0622..4e00474842 100644
--- a/README.org
+++ b/README.org
@@ -315,6 +315,33 @@ Furthermore you can tune buffer-local settings per command 
(or category).
 '((symbol (vertico-sort-function . vertico-sort-alpha
 #+end_src
 
+Combining these features allows us to fine-tune the completion display per
+command by adjusting the ~vertico-buffer-display-action~. We can for example 
reuse
+the current window for commands of the ~consult-grep~ category (~consult-grep~,
+~consult-git-grep~ and ~consult-ripgrep~). We have to define a display action
+function, which uses the ~(minibuffer-selected-window)~. Note that this
+configuration is incompatible with Consult preview, since the previewed buffer
+is usually shown in exactly this window. Nevertheless this snippet demonstrates
+the amount of flexibility of the configuration system.
+
+#+begin_src emacs-lisp
+  (defun display-buffer-in-selected (buffer alist)
+"Show the buffer in the latest selected window, before the minibuffer 
started."
+(window--display-buffer buffer (minibuffer-selected-window) 'reuse alist))
+
+  ;; Configure the display action
+  (setq vertico-multiform-category-settings
+'((consult-grep
+   (vertico-display-buffer-action . (display-buffer-in-selected)
+
+  ;; Configure the buffer display
+  (setq vertico-multiform-category-modes
+'((consult-grep buffer)))
+
+  ;; Disable preview for consult-grep commands
+  (consult-customize consult-ripgrep consult-git-grep consult-grep 
:preview-key nil)
+#+end_src
+
 * Complementary packages
   :properties:
   :custom_id: complementary-packages

[elpa] main 78e668fb25: * elpa-packages (svg-tag-mode): New package

[Stefan Monnier via]

branch: main
commit 78e668fb2574eef586f6175618ed482553c3
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (svg-tag-mode): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 43b0f18d3e..d4cee7d06a 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -468,6 +468,8 @@
  ("svg-clock"  :url nil)
  ("svg-lib":url "https://github.com/rougier/svg-lib";
   :auto-sync t)
+ ("svg-tag-mode"   :url "https://github.com/rougier/svg-tag-mode";
+  :auto0sync t)
  ("swiper" :url "https://github.com/abo-abo/swiper";)
  ("system-packages":url "https://gitlab.com/jabranham/system-packages";)
  ("systemd":url nil)

[elpa] externals/vertico 490cf0d789: vertico-buffer: Add recursion indicator

[ELPA Syncer]

branch: externals/vertico
commit 490cf0d78911cee4d31d1d670e5a5be818f9e9aa
Author: Daniel Mendler 
Commit: Daniel Mendler 

vertico-buffer: Add recursion indicator
---
 extensions/vertico-buffer.el | 44 +++-
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 516985f735..e1c6b98501 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -112,27 +112,29 @@
 ;; NOTE: We cannot use a buffer-local minibuffer-exit-hook here.
 ;; The hook will not be called when abnormally exiting the minibuffer
 ;; from another buffer via `keyboard-escape-quit'.
-(add-hook 'minibuffer-exit-hook sym))
-  (set-window-parameter vertico-buffer--window 'no-other-window t)
-  (set-window-parameter vertico-buffer--window 'no-delete-other-windows t)
-  (when vertico-buffer-hide-prompt
-(overlay-put vertico--candidates-ov 'window vertico-buffer--window)
-(when vertico--count-ov
-  (overlay-put vertico--count-ov 'window vertico-buffer--window))
-(setq vertico-buffer--overlay (make-overlay (point-max) (point-max) nil t 
t))
-(overlay-put vertico-buffer--overlay 'window (selected-window))
-(overlay-put vertico-buffer--overlay 'priority 1000)
-(overlay-put vertico-buffer--overlay 'before-string "\n\n"))
-  (setq-local show-trailing-whitespace nil
-  truncate-lines t
-  mode-line-format
-  (list (format " %s %s "
-(propertize "*Vertico*" 'face 'mode-line-buffer-id)
-(string-remove-suffix ": " (minibuffer-prompt)))
-'(:eval (vertico--format-count)))
-  cursor-in-non-selected-windows 'box
-  vertico-count (- (/ (window-pixel-height vertico-buffer--window)
-  (default-line-height)) 2)))
+(add-hook 'minibuffer-exit-hook sym)
+(set-window-parameter vertico-buffer--window 'no-other-window t)
+(set-window-parameter vertico-buffer--window 'no-delete-other-windows t)
+(when vertico-buffer-hide-prompt
+  (overlay-put vertico--candidates-ov 'window vertico-buffer--window)
+  (when vertico--count-ov
+(overlay-put vertico--count-ov 'window vertico-buffer--window))
+  (setq vertico-buffer--overlay (make-overlay (point-max) (point-max) nil 
t t))
+  (overlay-put vertico-buffer--overlay 'window (selected-window))
+  (overlay-put vertico-buffer--overlay 'priority 1000)
+  (overlay-put vertico-buffer--overlay 'before-string "\n\n"))
+(setq-local show-trailing-whitespace nil
+truncate-lines t
+mode-line-format
+(list (format " %s %s "
+  (propertize
+   (format (if (< depth 2) "*Vertico*" 
"*Vertico[%s]*") depth)
+   'face 'mode-line-buffer-id)
+  (string-remove-suffix ": " (minibuffer-prompt)))
+  '(:eval (vertico--format-count)))
+cursor-in-non-selected-windows 'box
+vertico-count (- (/ (window-pixel-height 
vertico-buffer--window)
+(default-line-height)) 2
 
 ;;;###autoload
 (define-minor-mode vertico-buffer-mode

[nongnu] main 20aa074412: .gitignore: Add `other-packages`

[Stefan Monnier via]

branch: main
commit 20aa07441230f456d5f9066447e63e3dcecd8704
Author: Stefan Monnier 
Commit: Stefan Monnier 

.gitignore: Add `other-packages`
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 065973e4ae..df55f6045a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ core
 /emacs
 /.pkg-descs.mk
 /packages/
+/other-packages
 /archive/
 /archive-devel/
 /admin

[elpa] externals/setup e8d5595ade: Mark some functions as internal

[ELPA Syncer]

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

Mark some functions as internal

The user is never expected to use these, so they are renamed to make
this intention explicit.
---
 setup.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.el b/setup.el
index 0b09445a43..e4445ff7c0 100644
--- a/setup.el
+++ b/setup.el
@@ -107,7 +107,7 @@ Do not modify this variable by hand.  Instead use
 `setup-define.'")
 
 ;;;###autoload
-(defun setup-make-docstring ()
+(defun setup--make-docstring ()
   "Return a docstring for `setup'."
   (with-temp-buffer
 (insert (documentation (symbol-function 'setup) 'raw)
@@ -160,7 +160,7 @@ NAME may also be a macro, if it can provide a symbol."
 body))
 
 ;;;###autoload
-(put 'setup 'function-documentation '(setup-make-docstring))
+(put 'setup 'function-documentation '(setup--make-docstring))
 
 (defun setup-define (name fn &rest opts)
   "Define `setup'-local macro NAME using function FN.
@@ -272,13 +272,13 @@ functions `func'.  Any other value is invalid."
  (cons '&rest spec))
 (t spec)
 
-(defun setup-xref-def-function (symbol)
+(defun setup--xref-def-function (symbol)
   "Return an elisp xref location for SYMBOL."
   (and (assq symbol setup-macros)
(let ((file (get symbol 'setup-definition-file)))
  (list (elisp--xref-make-xref nil symbol file)
 
-(add-to-list 'elisp-xref-find-def-functions
+(add-to-list 'elisp--xref-find-def-functions
  #'setup-xref-def-function)
 
 

[elpa] externals/pyim e655b3468f: * pyim-candidates.el (pyim-candidates-create:xingma): delete-dups output.

[ELPA Syncer]

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

* pyim-candidates.el (pyim-candidates-create:xingma): delete-dups output.
---
 pyim-candidates.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim-candidates.el b/pyim-candidates.el
index b3aba1130d..18a1e1646f 100644
--- a/pyim-candidates.el
+++ b/pyim-candidates.el
@@ -87,7 +87,7 @@ IMOBJS 获得候选词条。"
(list str
   (setq result (append result output3
   (when (car result)
-result
+(delete-dups result)
 
 (defun pyim-candidates-create:quanpin (imobjs scheme-name &optional async)
   "`pyim-candidates-create' 处理全拼输入法的函数."

[elpa] externals/pyim d273b67dcd 1/2: * tests/pyim-tests.el (pyim-tests-pyim-entered): New test.

[ELPA Syncer]

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

* tests/pyim-tests.el (pyim-tests-pyim-entered): New test.
---
 tests/pyim-tests.el | 12 
 1 file changed, 12 insertions(+)

diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 1a9652332e..06c5ba03fe 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -301,6 +301,18 @@
 (should (equal (pyim-punctuation-return-proper-punct '("'" "‘" "’")) "‘"))
 (should (equal (pyim-punctuation-return-proper-punct '("'" "‘" "’")) 
"’"
 
+;; ** pyim-entered 相关单元测试
+(ert-deftest pyim-tests-pyim-entered ()
+  (pyim-entered-with-entered-buffer
+(erase-buffer)
+(insert "nihao")
+(backward-char 3))
+  (should (equal (pyim-entered-get) "nihao"))
+  (should (equal (pyim-entered-get 'point-before) "ni"))
+  (should (equal (pyim-entered-get 'point-after) "hao"))
+  (pyim-entered-erase-buffer)
+  (should (equal (pyim-entered-get) "")))
+
 ;; ** pyim-impobjs 相关单元测试
 (ert-deftest pyim-tests-pyim-imobjs ()
   (let ((pyim-pinyin-fuzzy-alist '(("en" "eng")

[elpa] externals/pyim updated (e655b3468f -> 9695dc5b0c)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  e655b3468f * pyim-candidates.el (pyim-candidates-create:xingma): 
delete-dups output.
   new  d273b67dcd * tests/pyim-tests.el (pyim-tests-pyim-entered): New 
test.
   new  9695dc5b0c v4.0.0


Summary of changes:
 pyim.el |  2 +-
 tests/pyim-tests.el | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)

[elpa] externals/pyim 9695dc5b0c 2/2: v4.0.0

[ELPA Syncer]

branch: externals/pyim
commit 9695dc5b0c52622d4400af038da1fb56d1892a61
Author: Feng Shu 
Commit: Feng Shu 

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

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