[elpa] externals/vundo updated (ecc0e2c367 -> b05dabbb73)

[ELPA Syncer]

elpasync pushed a change to branch externals/vundo.

  from  ecc0e2c367 Add special hook vundo-after-undo-functions
   new  ff2a93174e ; * vundo.el (vundo-mode): Turn off jit-lock-mode the 
right way
   new  b05dabbb73 ; * vundo.el (vundo--calculate-shortest-route): Fix 
docstring.


Summary of changes:
 vundo.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[elpa] externals/vundo b05dabbb73 2/2: ; * vundo.el (vundo--calculate-shortest-route): Fix docstring.

[ELPA Syncer]

branch: externals/vundo
commit b05dabbb73ebf6ab5d883c3fd3bcb7ae53dcb0be
Author: Yuan Fu 
Commit: Yuan Fu 

; * vundo.el (vundo--calculate-shortest-route): Fix docstring.
---
 vundo.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vundo.el b/vundo.el
index 688db49a36..85d4300267 100644
--- a/vundo.el
+++ b/vundo.el
@@ -958,7 +958,7 @@ Roll back changes if `vundo-roll-back-on-quit' is non-nil."
   "Calculate the shortest route from FROM to TO node.
 Return (SOURCE STOP1 STOP2 ... DEST), meaning you should undo the
 modifications from DEST to SOURCE. Each STOP is an intermediate
-stop. Eg, (6 5 4 3). Return nil if no valid route."
+stop. Eg, (6 5 4 3). Return nil if there’s no valid route."
   (let (route-list)
 ;; Find all valid routes.
 (dolist (source (vundo--eqv-list-of from))

[elpa] externals/vundo ff2a93174e 1/2: ; * vundo.el (vundo-mode): Turn off jit-lock-mode the right way

[ELPA Syncer]

branch: externals/vundo
commit ff2a93174e9f5c117f9bcb55e4d5325d4c8e7de4
Author: Yuan Fu 
Commit: Yuan Fu 

; * vundo.el (vundo-mode): Turn off jit-lock-mode the right way
---
 vundo.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vundo.el b/vundo.el
index 4ad828c2d1..688db49a36 100644
--- a/vundo.el
+++ b/vundo.el
@@ -701,7 +701,7 @@ WINDOW is the window that was/is displaying the vundo 
buffer."
   (setq mode-line-format nil
 truncate-lines t
 cursor-type nil)
-  (jit-lock-mode -1)
+  (jit-lock-mode nil)
   (face-remap-add-relative 'default 'vundo-default)
 
   ;; Disable evil-mode, as normal-mode

[elpa] externals/ef-themes updated (302e5ca53f -> 0a659f9a9a)

[ELPA Syncer]

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

  from  302e5ca53f ef-elea-light: make date-common a bit more colourful
   new  a97d77a479 ef-elea-light: tweak fg-dim and fg-alt for consistency
   new  0a659f9a9a Add missing entries to contrast tables


Summary of changes:
 contrast-ratios.org| 6 ++
 ef-elea-light-theme.el | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

[elpa] externals/ef-themes a97d77a479 1/2: ef-elea-light: tweak fg-dim and fg-alt for consistency

[ELPA Syncer]

branch: externals/ef-themes
commit a97d77a479997ad6ef88a25dfd139f7ed6d2c0a7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

ef-elea-light: tweak fg-dim and fg-alt for consistency
---
 ef-elea-light-theme.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index be82ed73ed..f35027e451 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -47,9 +47,9 @@
   (bg-main "#edf5e2")
   (fg-main "#221321")
   (bg-dim  "#e3e9d6")
-  (fg-dim  "#74746f")
+  (fg-dim  "#676470")
   (bg-alt  "#d0d7ca")
-  (fg-alt  "#406f5f")
+  (fg-alt  "#5f5f1f")
 
   (bg-active   "#b0b7aa")
   (bg-inactive "#e8eddc")

[elpa] externals/ef-themes 0a659f9a9a 2/2: Add missing entries to contrast tables

[ELPA Syncer]

branch: externals/ef-themes
commit 0a659f9a9ad3ec44427ef6f914458d55b058fcf4
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add missing entries to contrast tables
---
 contrast-ratios.org | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contrast-ratios.org b/contrast-ratios.org
index 6350c285ac..0c76e38622 100644
--- a/contrast-ratios.org
+++ b/contrast-ratios.org
@@ -715,6 +715,9 @@ work with the overall design of the project.
 
 | Name   | | #222524 | #303332 | #3e4140 | #2b2e2d |
 |+-+-+-+-+-|
+| fg-main| #eaf2ef |   13.58 |   11.21 |9.06 |   12.04 |
+| fg-dim | #969faf |5.80 |4.79 |3.87 |5.14 |
+| fg-alt | #8fcfbb |8.70 |7.18 |5.80 |7.71 |
 | red| #ff656a |5.39 |4.45 |3.60 |4.78 |
 | red-warmer | #ff7a5f |6.04 |4.98 |4.03 |5.36 |
 | red-cooler | #fa7f88 |6.23 |5.14 |4.16 |5.52 |
@@ -777,6 +780,9 @@ work with the overall design of the project.
 
 | Name   | | #edf5e2 | #e3e9d6 | #d0d7ca | #e8eddc |
 |+-+-+-+-+-|
+| fg-main| #221321 |   15.86 |   14.28 |   12.05 |   14.86 |
+| fg-dim | #746470 |4.94 |4.45 |3.75 |4.63 |
+| fg-alt | #60622a |5.72 |5.15 |4.35 |5.36 |
 | red| #c3303a |4.93 |4.44 |3.75 |4.62 |
 | red-warmer | #d0 |5.10 |4.59 |3.87 |4.77 |
 | red-cooler | #b02440 |5.91 |5.32 |4.49 |5.54 |

[nongnu] elpa/git-commit 24f64fd4f8: magit-git-version-assert: Fix typo

[ELPA Syncer]

branch: elpa/git-commit
commit 24f64fd4f8ed4a4a302fd9227febad63507d7287
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-git-version-assert: Fix typo

Closes #4958.
---
 lisp/magit-git.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 984a9a565e..4a589fa36c 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -682,7 +682,7 @@ needs at least MINIMAL, otherwise it defaults to \"Magit\"."
 (let* ((host (file-remote-p default-directory))
(msg (format-spec
  (cond (host "\
-%w requires Git %m or greater, but on %h the version is %m.
+%w requires Git %m or greater, but on %h the version is %v.
 
 If multiple Git versions are installed on the host, then the
 problem might be that TRAMP uses the wrong executable.

[nongnu] elpa/magit updated (9007bcfdb5 -> 24f64fd4f8)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  9007bcfdb5 magit-read-file{,s}: Don't limit to current directory
  adds  24f64fd4f8 magit-git-version-assert: Fix typo

No new revisions were added by this update.

Summary of changes:
 lisp/magit-git.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[nongnu] elpa/magit-section updated (9007bcfdb5 -> 24f64fd4f8)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  9007bcfdb5 magit-read-file{,s}: Don't limit to current directory
  adds  24f64fd4f8 magit-git-version-assert: Fix typo

No new revisions were added by this update.

Summary of changes:
 lisp/magit-git.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[elpa] main fb5c51f09e: * elpa-packages (logos): Include :readme file

[Protesilaos Stavrou]

branch: main
commit fb5c51f09e62a13b347bea109640cdca45e63c83
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

* elpa-packages (logos): Include :readme file
---
 elpa-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/elpa-packages b/elpa-packages
index 4629060654..f298a0cb4e 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -408,6 +408,7 @@
  (loccur   :url "https://github.com/fourier/loccur";)
  (logos:url "https://git.sr.ht/~protesilaos/logos";
   :doc "README.org"
+  :readme "README.md"
   :news "CHANGELOG.org"
   :ignored-files ("COPYING" "doclicense.texi"))
  (luwak:url "https://g.ypei.me/luwak.git";

[elpa] externals/corfu 1fd3865734 2/4: corfu--popup-show: Take posn position information as argument (Fix #338)

[ELPA Syncer]

branch: externals/corfu
commit 1fd386573472f20be53e9da91794b2ca9cf06279
Author: Daniel Mendler 
Commit: Daniel Mendler 

corfu--popup-show: Take posn position information as argument (Fix #338)
---
 corfu.el | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/corfu.el b/corfu.el
index 0ea0d83b4d..67a157f9d5 100644
--- a/corfu.el
+++ b/corfu.el
@@ -715,7 +715,7 @@ FRAME is the existing frame."
   (setq lo (max 1 lo)))
 (when (/= last corfu--total)
   (setq lo (min (- corfu-count bar 2) lo)))
-(corfu--popup-show (+ pos (length corfu--base)) pw width fcands (- 
corfu--index corfu--scroll)
+(corfu--popup-show pos pw width fcands (- corfu--index corfu--scroll)
(and (> corfu--total corfu-count) lo) bar)))
 
 (defun corfu--preview-current (beg end)
@@ -945,7 +945,7 @@ A scroll bar is displayed from LO to LO+BAR."
  (concat (propertize " " 'display `(space :align-to (- 
right (,mr
  (propertize " " 'display `(space :width (,(- mr 
bw
  (propertize " " 'face 'corfu-bar 'display `(space 
:width (,bw))
- (pos (posn-x-y (posn-at-point pos)))
+ (pos (posn-x-y pos))
  (width (+ (* width cw) ml mr))
  ;; XXX HACK: Minimum popup height must be at least 1 line of the
  ;; parent frame (#261).
@@ -1062,16 +1062,15 @@ AUTO is non-nil when initializing auto completion."
 (corfu--done str 'finished)))
  ;; 2) There exist candidates => Show candidates popup.
  (corfu--candidates
-  (corfu--candidates-popup beg)
-  (corfu--preview-current beg end)
-  (redisplay 'force)) ;; XXX HACK Ensure that popup is redisplayed
+  (let ((pos (posn-at-point (+ beg (length corfu--base)
+(corfu--preview-current beg end)
+(corfu--candidates-popup pos)))
  ;; 3) No candidates & corfu-quit-no-match & initialized => Confirmation 
popup.
  ((pcase-exhaustive corfu-quit-no-match
 ('t nil)
 ('nil corfu--input)
 ('separator (seq-contains-p (car corfu--input) corfu-separator)))
-  (corfu--popup-show beg 0 8 '(#("No match" 0 8 (face italic
-  (redisplay 'force)) ;; XXX HACK Ensure that popup is redisplayed
+  (corfu--popup-show (posn-at-point beg) 0 8 '(#("No match" 0 8 (face 
italic)
  ;; 4) No candidates & auto completing or initialized => Quit.
  ((or auto corfu--input) (corfu-quit)
 

[elpa] externals/corfu updated (02fd4846a2 -> 491e4ec33e)

[ELPA Syncer]

elpasync pushed a change to branch externals/corfu.

  from  02fd4846a2 Register corfu-complete and corfu-insert with Eldoc (Fix 
#339)
   new  8557d0cd14 corfu--make-frame: Only set buffer if necessary
   new  1fd3865734 corfu--popup-show: Take posn position information as 
argument (Fix #338)
   new  ffca40cacf corfu--make-frame: Remove some old child frame hack
   new  491e4ec33e Revert "corfu--make-frame: Remove some old child frame 
hack"


Summary of changes:
 corfu.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

[elpa] externals/corfu 491e4ec33e 4/4: Revert "corfu--make-frame: Remove some old child frame hack"

[ELPA Syncer]

branch: externals/corfu
commit 491e4ec33ed028172556a21ac43e649eeba36d1f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Revert "corfu--make-frame: Remove some old child frame hack"

This reverts commit ffca40cacf9155a85a426abe73247f59b8e2a500.
---
 corfu.el | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/corfu.el b/corfu.el
index ada515602b..67a157f9d5 100644
--- a/corfu.el
+++ b/corfu.el
@@ -448,9 +448,25 @@ FRAME is the existing frame."
   ;; Mark window as dedicated to prevent frame reuse (#60)
   (set-window-dedicated-p win t))
 (redirect-frame-focus frame parent)
-(set-frame-size frame width height t)
-(unless (equal (frame-position frame) (cons x y))
-  (set-frame-position frame x y)))
+;; XXX HACK: Child frame popup behavior improved on Emacs 29.
+;; It seems we may not need the Emacs 27/28 hacks anymore.
+(if (eval-when-compile (< emacs-major-version 29))
+(let (inhibit-redisplay)
+  (set-frame-size frame width height t)
+  (if (frame-visible-p frame)
+  ;; XXX HACK Avoid flicker when frame is already visible.
+  ;; Redisplay, wait for resize and then move the frame.
+  (unless (equal (frame-position frame) (cons x y))
+(redisplay 'force)
+(sleep-for 0.01)
+(set-frame-position frame x y))
+;; XXX HACK: Force redisplay, otherwise the popup sometimes does 
not
+;; display content.
+(set-frame-position frame x y)
+(redisplay 'force)))
+  (set-frame-size frame width height t)
+  (unless (equal (frame-position frame) (cons x y))
+(set-frame-position frame x y
   (make-frame-visible frame)
   frame)
 

[elpa] externals/corfu 8557d0cd14 1/4: corfu--make-frame: Only set buffer if necessary

[ELPA Syncer]

branch: externals/corfu
commit 8557d0cd1468b787458f48057608156916cffdf2
Author: Daniel Mendler 
Commit: Daniel Mendler 

corfu--make-frame: Only set buffer if necessary
---
 corfu.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/corfu.el b/corfu.el
index 9e1b38df4d..0ea0d83b4d 100644
--- a/corfu.el
+++ b/corfu.el
@@ -440,7 +440,8 @@ FRAME is the existing frame."
  ,@corfu--frame-parameters
   (modify-frame-parameters frame reset))
 (let ((win (frame-root-window frame)))
-  (set-window-buffer win buffer)
+  (unless (eq (window-buffer win) buffer)
+(set-window-buffer win buffer))
   ;; Disallow selection of root window (#63)
   (set-window-parameter win 'no-delete-other-windows t)
   (set-window-parameter win 'no-other-window t)

[elpa] externals/corfu ffca40cacf 3/4: corfu--make-frame: Remove some old child frame hack

[ELPA Syncer]

branch: externals/corfu
commit ffca40cacf9155a85a426abe73247f59b8e2a500
Author: Daniel Mendler 
Commit: Daniel Mendler 

corfu--make-frame: Remove some old child frame hack
---
 corfu.el | 22 +++---
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/corfu.el b/corfu.el
index 67a157f9d5..ada515602b 100644
--- a/corfu.el
+++ b/corfu.el
@@ -448,25 +448,9 @@ FRAME is the existing frame."
   ;; Mark window as dedicated to prevent frame reuse (#60)
   (set-window-dedicated-p win t))
 (redirect-frame-focus frame parent)
-;; XXX HACK: Child frame popup behavior improved on Emacs 29.
-;; It seems we may not need the Emacs 27/28 hacks anymore.
-(if (eval-when-compile (< emacs-major-version 29))
-(let (inhibit-redisplay)
-  (set-frame-size frame width height t)
-  (if (frame-visible-p frame)
-  ;; XXX HACK Avoid flicker when frame is already visible.
-  ;; Redisplay, wait for resize and then move the frame.
-  (unless (equal (frame-position frame) (cons x y))
-(redisplay 'force)
-(sleep-for 0.01)
-(set-frame-position frame x y))
-;; XXX HACK: Force redisplay, otherwise the popup sometimes does 
not
-;; display content.
-(set-frame-position frame x y)
-(redisplay 'force)))
-  (set-frame-size frame width height t)
-  (unless (equal (frame-position frame) (cons x y))
-(set-frame-position frame x y
+(set-frame-size frame width height t)
+(unless (equal (frame-position frame) (cons x y))
+  (set-frame-position frame x y)))
   (make-frame-visible frame)
   frame)
 

[elpa] externals/emacs-gc-stats updated (cdea9f03ba -> f17fd30098)

[ELPA Syncer]

elpasync pushed a change to branch externals/emacs-gc-stats.

  from  cdea9f03ba Bump version to 1.2.3
   new  4504beaba2 emacs-gc-stats-gc-defaults: Add more details to the 
docstring
   new  459616df26 Make recorded data customizeable
   new  6590469311 emacs-gc-stats-save-session: Fix call to 
`called-interactively-p'
   new  09fc7b985a * emacs-gc-stats.el (emacs-gc-clear): Fix warning
   new  56157c6ff8 * emacs-gc-stats.el (emacs-gc-stats--idle-tic): Improve 
docstring
   new  9687e1d80a New customization: 
emacs-gc-stats-inhibit-command-name-logging
   new  699a89ad4f Add reminder to share data after `emacs-gc-stats-remind' 
days
   new  5de4b6590a Update README
   new  f17fd30098 Bump version to 1.3


Summary of changes:
 README.md |  58 ++
 README.org|  54 
 emacs-gc-stats.el | 104 +++---
 3 files changed, 184 insertions(+), 32 deletions(-)

[elpa] externals/emacs-gc-stats 699a89ad4f 7/9: Add reminder to share data after `emacs-gc-stats-remind' days

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 699a89ad4f34f5f1deffc3a1f150928ddce6d9d0
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Add reminder to share data after `emacs-gc-stats-remind' days

* emacs-gc-stats.el (emacs-gc-stats-remind): New custom variable to
enable reminder about sharing the recorded data.
(emacs-gc-stats--get-repvious-session-data): Factor out getting saved
data into internal function.
(emacs-gc-stats-save-session): Use the new internal function.
(emacs-gc-stats--remind-maybe): New function displaying reminder.
(emacs-gc-stats-mode): Use the new reminder function.
---
 emacs-gc-stats.el | 56 ++-
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index bae18626d1..5f5954a544 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -66,6 +66,16 @@ This setting, when non-nil, will override the existing 
values of
   :type 'boolean
   :package-version '(emacs-gc-stats . 1.3))
 
+(defcustom emacs-gc-stats-remind nil
+  "When non-nil, remind about submitting the data to Emacs devs.
+The value is wither nil (do not remind), t (remind in 3 weeks), or a
+number of days."
+  :type '(choice
+ (const :tag "No reminder" nil)
+  (const :tag "Remind in 3 weeks" t)
+  (integer :tag "Remind after N days"))
+  :package-version '(emacs-gc-stats . 1.3))
+
 (defcustom emacs-gc-stats-setting-vars
   '(gc-cons-threshold
 gc-cons-percentage
@@ -170,15 +180,18 @@ Otherwise, collect symbol."
   emacs-gc-stats-summary-vars)
emacs-gc-stats--data))
 
+(defun emacs-gc-stats--get-repvious-session-data ()
+  "Return previously saved session data."
+  (and (file-readable-p emacs-gc-stats-file)
+   (with-temp-buffer
+ (insert-file-contents emacs-gc-stats-file)
+ (ignore-errors (read (current-buffer))
+
 (defun emacs-gc-stats-save-session ()
   "Save stats to disk."
   (interactive)
   (emacs-gc-stats--collect-end)
-  (let ((previous-sessions
- (and (file-readable-p emacs-gc-stats-file)
-  (with-temp-buffer
-(insert-file-contents emacs-gc-stats-file)
-(ignore-errors (read (current-buffer))
+  (let ((previous-sessions (emacs-gc-stats--get-repvious-session-data))
 (session (reverse emacs-gc-stats--data))
 (write-region-inhibit-fsync t)
 ;; We set UTF-8 here to avoid the overhead from
@@ -250,6 +263,35 @@ Revert original settings when RESTORE is non-nil."
 gc-cons-percentage 0.1))
   (other (error "Unknown value of `emacs-gc-stats-gc-defaults': %S" 
other)
 
+(defun emacs-gc-stats--remind-maybe ()
+  "Show a reminder according to `emacs-gc-stats-remind'."
+  (require 'notifications)
+  (when emacs-gc-stats-remind
+(when-let* ((days-threshold (if (numberp emacs-gc-stats-remind)
+   emacs-gc-stats-remind 21))
+   (first-session (or (car (last 
(emacs-gc-stats--get-repvious-session-data)))
+  (reverse emacs-gc-stats--data)))
+   (first-record (car first-session))
+(first-date-string
+ (if (equal "Initial stats" (car first-record))
+ (cadr first-record) (car first-record)))
+(first-time (parse-time-string first-date-string))
+(days-passed (time-to-number-of-days
+ (time-subtract (current-time)
+(encode-time first-time)
+  (when (> days-passed days-threshold)
+(notifications-notify
+ :title "emacs-gc-stats reminder"
+ :body
+ (format
+  "%.1f days have passed since first record.
+Consider M-x emacs-gc-stats-save-session or reporting back to 
emacs-gc-st...@gnu.org"
+ days-passed))
+(warn
+ "emacs-gc-stats: %.1f days have passed since first record.
+Consider M-x emacs-gc-stats-save-session or reporting back to 
emacs-gc-st...@gnu.org"
+days-passed)
+
 ;;;###autoload
 (define-minor-mode emacs-gc-stats-mode
   "Toggle collecting Emacs GC statistics."
@@ -258,6 +300,8 @@ Revert original settings when RESTORE is non-nil."
   (progn
(emacs-gc-stats--set-gc-defaults)
 (add-hook 'after-init-hook #'emacs-gc-stats--set-gc-defaults)
+(add-hook 'after-init-hook #'emacs-gc-stats--remind-maybe)
+(add-hook 'kill-emacs-hook #'emacs-gc-stats--remind-maybe)
 (unless emacs-gc-stats--data
   (emacs-gc-stats--collect-init))
 ;; 5 minutes counter.
@@ -270,6 +314,8 @@ Revert original settings when RESTORE is non-nil."
 (add-hook 'after-init-hook #'emacs-gc-stats--collect-init-end)
 (add-hook 'kill-emacs-hook #'emacs-gc-stats-save-session))
 (remove-hook 'after-init-hook #'emacs-gc-stats--set-gc-defaults)
+(remove-hook 'after-init-hook #'emacs-gc

[elpa] externals/emacs-gc-stats 4504beaba2 1/9: emacs-gc-stats-gc-defaults: Add more details to the docstring

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 4504beaba25263d27e883229248744bda5e457d7
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

emacs-gc-stats-gc-defaults: Add more details to the docstring
---
 emacs-gc-stats.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index a520778c93..82dd83b873 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -54,7 +54,9 @@
   :type 'file)
 
 (defcustom emacs-gc-stats-gc-defaults nil
-  "GC strategy to be active in `emacs-gc-stats-mode'."
+  "GC strategy to be active in `emacs-gc-stats-mode'.
+This setting, when non-nil, will override the existing values of
+`gc-cons-threshold' and `gc-cons-percentage'."
   :type '(choice
  (const :tag "Do not change existing GC settings" nil)
   (const :tag "Force emacs defaults" emacs-defaults)))

[elpa] externals/emacs-gc-stats f17fd30098 9/9: Bump version to 1.3

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit f17fd30098c284a11feb06d505308d1f85ba2c55
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Bump version to 1.3
---
 emacs-gc-stats.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 5f5954a544..580b9d9424 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -7,7 +7,7 @@
 ;; URL: https://git.sr.ht/~yantar92/emacs-gc-stats
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 1.2.3
+;; Version: 1.3
 
 ;; 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

[elpa] externals/emacs-gc-stats 5de4b6590a 8/9: Update README

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 5de4b6590a978bbc5815251c0e740926c877738b
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Update README

* README.org (Usage): Add new customizations to usage instructions.
Document the reminder functionality.
(Security considerations): Document potential security considerations
and how to control what is being logged.  Update the list of logged
information.
(Version 1.3): Document changes.
---
 README.md  | 58 --
 README.org | 54 --
 2 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index f6443497ab..dbb658f012 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,18 @@ Context:
 
 See the source code for information how to contact the author.
 
-**Usage:**
+
+# Usage
 
 Add
 
 (require 'emacs-gc-stats)
-(setq emacs-gc-stats-gc-defaults 'emacs-defaults) ; optional
+;; Optionally reset Emacs GC settings to default values (recommended)
+(setq emacs-gc-stats-gc-defaults 'emacs-defaults)
+;; Optionally set reminder to upload the stats after 3 weeks.
+(setq emacs-gc-stats-remind t) ; can also be a number of days
+;; Optionally disable logging the command names
+;; (setq emacs-gc-stats-inhibit-command-name-logging t)
 (emacs-gc-stats-mode +1)
 
 to your init file to enable the statistics acquiring.
@@ -22,10 +28,20 @@ to your init file to enable the statistics acquiring.
 When you are ready to share the results, run `M-x emacs-gc-stats-save-session`
 and then share the saved `emacs-gc-stats-file` (defaults to
 `~/.emacs.d/emacs-gc-stats.eld`) by sending an email attachment to
-.
+. You can review the file before
+sharing–it is a text file.
 
-You can use `M-x emacs-gc-stats-clear` to clear the currently collected
-session data.
+Configure `emacs-gc-stats-remind` to make Emacs display a reminder about
+sharing the results.
+
+
+# Security considerations
+
+This package **does not** upload anything automatically.  You will need to
+upload the data manually, by sending email attachment.  If necessary,
+you can review `emacs-gc-stats-file` (defaults to
+`~/.emacs.d/emacs-gc-stats.eld`) before uploading–it is just a text
+file.
 
 The following data is being collected after every command:
 
@@ -35,5 +51,35 @@ The following data is being collected after every command:
 -   Idle time and Emacs uptime
 -   Available OS memory (see `memory-info`)
 -   Emacs memory allocation/GC stats
--   Current command
+-   Current command name (potentially sensitive data, can be disabled)
+-   Timestamp when every GC is finished
+
+Logging the command names can be disabled by setting
+`emacs-gc-stats-inhibit-command-name-logging` customization.
+
+What exactly is being logger is controlled by
+`emacs-gc-stats-setting-vars`, `emacs-gc-stats-command-vars`, and
+`emacs-gc-stats-summary-vars`.
+
+You can use `M-x emacs-gc-stats-clear` to clear the currently collected
+session data.
+
+You can pause the logging any time by disabling `emacs-gc-stats-mode`
+(`M-x emacs-gc-stats-mode`).
+
+
+# News
+
+
+## Version 1.3
+
+-   New customization: `emacs-gc-stats-inhibit-command-name-logging` to
+disable logging current command name.  Logging is enabled by default.
+
+-   New customization: `emacs-gc-stats-remind` to set a reminder to share
+the data.  Reminder is disabled by default.
+
+-   The data being collected is can now be customized using
+`emacs-gc-stats-setting-vars`, `emacs-gc-stats-command-vars`, and
+`emacs-gc-stats-summary-vars`.
 
diff --git a/README.org b/README.org
index 7a4a916c16..4137998dc9 100644
--- a/README.org
+++ b/README.org
@@ -11,12 +11,17 @@ Context:
 
 See the source code for information how to contact the author.
 
-*Usage:*
+* Usage
 
 Add
 #+begin_src emacs-lisp
 (require 'emacs-gc-stats)
-(setq emacs-gc-stats-gc-defaults 'emacs-defaults) ; optional
+;; Optionally reset Emacs GC settings to default values (recommended)
+(setq emacs-gc-stats-gc-defaults 'emacs-defaults)
+;; Optionally set reminder to upload the stats after 3 weeks.
+(setq emacs-gc-stats-remind t) ; can also be a number of days
+;; Optionally disable logging the command names
+;; (setq emacs-gc-stats-inhibit-command-name-logging t)
 (emacs-gc-stats-mode +1)
 #+end_src
 to your init file to enable the statistics acquiring.
@@ -24,10 +29,19 @@ to your init file to enable the statistics acquiring.
 When you are ready to share the results, run =M-x emacs-gc-stats-save-session=
 and then share the saved ~emacs-gc-stats-file~ (defaults to
 =~/.emacs.d/emacs-gc-stats.eld=) by sending an email attachment to
-mailto:emacs-gc-st...@gnu.org.
+mailto:emacs-gc-st...@gnu.org. You can review the file before
+sharing--it is a text file.
 
-You can use =M-x emacs-gc-stats-clear= to clear the currently collected
-session data.
+Configure ~emac

[elpa] externals/emacs-gc-stats 459616df26 2/9: Make recorded data customizeable

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 459616df26bd36e46f8565cf5afa11c02f131d3e
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Make recorded data customizeable

* emacs-gc-stats.el (emacs-gc-stats-inhibit-command-name-logging):
(emacs-gc-stats-setting-vars):
(emacs-gc-stats-command-vars): New custom variables (renamed from
internal variables).
(emacs-gc-stats--collect-init):
(emacs-gc-stats--collect-gc):
(emacs-gc-stats--collect-end):
(emacs-gc-stats--collect-init-end): Use the new variables.
---
 emacs-gc-stats.el | 26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 82dd83b873..fdd382aa11 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -61,7 +61,7 @@ This setting, when non-nil, will override the existing values 
of
  (const :tag "Do not change existing GC settings" nil)
   (const :tag "Force emacs defaults" emacs-defaults)))
 
-(defvar emacs-gc-stats--setting-vars
+(defcustom emacs-gc-stats-setting-vars
   '(gc-cons-threshold
 gc-cons-percentage
 memory-limit
@@ -71,9 +71,11 @@ This setting, when non-nil, will override the existing 
values of
 prelude-tips
 (memory-info)
 (memory-use-counts))
-  "List of variable/function symbols to collect.")
+  "List of variable/function symbols to collect after loading init.el."
+  :type '(list sexp)
+  :package-version '(emacs-gc-stats . 1.3))
 
-(defvar emacs-gc-stats--command-vars
+(defcustom emacs-gc-stats-command-vars
   '(gc-cons-threshold
 gc-cons-percentage
 gcmh-mode
@@ -84,9 +86,11 @@ This setting, when non-nil, will override the existing 
values of
 (memory-info)
 (memory-use-counts)
 emacs-gc-stats--idle-tic)
-  "List of variable/function symbols to collect for each GC or command.")
+  "List of variable/function symbols to collect for each GC or command."
+  :type '(list sexp)
+  :package-version '(emacs-gc-stats . 1.3))
 
-(defvar emacs-gc-stats--summary-vars
+(defcustom emacs-gc-stats-summary-vars
   '(gc-cons-threshold
 gc-cons-percentage
 gc-elapsed
@@ -97,7 +101,9 @@ This setting, when non-nil, will override the existing 
values of
 (memory-use-counts)
 emacs-gc-stats-idle-delay
 emacs-gc-stats--idle-tic)
-  "List of variables to collect at session end.")
+  "List of variables to collect at session end."
+  :type '(list sexp)
+  :package-version '(emacs-gc-stats . 1.3))
 
 (defun emacs-gc-stats--collect (&rest symbols)
   "Collect SYMBOLS values.
@@ -127,7 +133,7 @@ Otherwise, collect symbol."
(apply #'emacs-gc-stats--collect
   "Initial stats"
   (current-time-string)
-  emacs-gc-stats--setting-vars)
+  emacs-gc-stats-setting-vars)
emacs-gc-stats--data))
 
 (defun emacs-gc-stats--collect-gc ()
@@ -135,7 +141,7 @@ Otherwise, collect symbol."
   (push
(apply #'emacs-gc-stats--collect
   (current-time-string)
-  emacs-gc-stats--command-vars)
+  emacs-gc-stats-command-vars)
emacs-gc-stats--data))
 
 (defun emacs-gc-stats--collect-init-end ()
@@ -144,7 +150,7 @@ Otherwise, collect symbol."
(apply #'emacs-gc-stats--collect
   "Init.el stats"
   (current-time-string)
-  emacs-gc-stats--summary-vars)
+  emacs-gc-stats-summary-vars)
emacs-gc-stats--data))
 
 (defun emacs-gc-stats--collect-end ()
@@ -153,7 +159,7 @@ Otherwise, collect symbol."
(apply #'emacs-gc-stats--collect
   "Session end stats"
   (current-time-string)
-  emacs-gc-stats--summary-vars)
+  emacs-gc-stats-summary-vars)
emacs-gc-stats--data))
 
 (defun emacs-gc-stats-save-session ()

[elpa] externals/emacs-gc-stats 09fc7b985a 4/9: * emacs-gc-stats.el (emacs-gc-clear): Fix warning

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 09fc7b985a65603d3ff24707de2fda6d520c186a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

* emacs-gc-stats.el (emacs-gc-clear): Fix warning
---
 emacs-gc-stats.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 89660a94d1..a2ccfb78f1 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -199,6 +199,7 @@ Otherwise, collect symbol."
   (browse-url "mailto:emacs-gc-st...@gnu.org";))
 (message "GC stats saved to \"%s\".  You can share the file by sending 
email to emacs-gc-st...@gnu.org" emacs-gc-stats-file)))
 
+(defvar emacs-gc-stats-mode) ; defined later
 (defun emacs-gc-stats-clear ()
   "Clear GC stats collected so far."
   (interactive)

[elpa] externals/emacs-gc-stats 56157c6ff8 5/9: * emacs-gc-stats.el (emacs-gc-stats--idle-tic): Improve docstring

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 56157c6ff88e778794bb04a41f8964ce605a855a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

* emacs-gc-stats.el (emacs-gc-stats--idle-tic): Improve docstring
---
 emacs-gc-stats.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index a2ccfb78f1..7ff9f12fc9 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -213,7 +213,8 @@ Otherwise, collect symbol."
   "Delay in seconds to count idle time.")
 
 (defvar emacs-gc-stats--idle-tic 0
-  "Idle counter.")
+  "Idle counter.
+Idle time is counted with `emacs-gc-stats-idle-delay' granularity.")
 (defvar emacs-gc-stats--idle-timer nil
   "Time counting idle time.")
 (defun emacs-gc-stats-idle-tic ()

[elpa] externals/emacs-gc-stats 9687e1d80a 6/9: New customization: emacs-gc-stats-inhibit-command-name-logging

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 9687e1d80ae1f2aa6ef72d10e46c4db93cababfb
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

New customization: emacs-gc-stats-inhibit-command-name-logging

* emacs-gc-stats.el (emacs-gc-stats-inhibit-command-name-logging): New
custom variable.
(emacs-gc-stats--collect): Avoid logging command names when the new
variable is set.
---
 emacs-gc-stats.el | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 7ff9f12fc9..bae18626d1 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -61,6 +61,11 @@ This setting, when non-nil, will override the existing 
values of
  (const :tag "Do not change existing GC settings" nil)
   (const :tag "Force emacs defaults" emacs-defaults)))
 
+(defcustom emacs-gc-stats-inhibit-command-name-logging nil
+  "When non-nil, do not collect command names (`this-command')."
+  :type 'boolean
+  :package-version '(emacs-gc-stats . 1.3))
+
 (defcustom emacs-gc-stats-setting-vars
   '(gc-cons-threshold
 gc-cons-percentage
@@ -116,7 +121,10 @@ Otherwise, collect symbol."
   (pcase var
 ((pred keywordp) (push var data))
 ((and (pred symbolp) (pred boundp))
- (push (cons var (symbol-value var)) data))
+ (unless (and emacs-gc-stats-inhibit-command-name-logging
+ (memq var '( this-command real-this-command
+  last-command real-last-command)))
+   (push (cons var (symbol-value var)) data)))
 ((pred functionp)
  (push (cons var (funcall var)) data))
 ((pred listp)

[elpa] externals/emacs-gc-stats 6590469311 3/9: emacs-gc-stats-save-session: Fix call to `called-interactively-p'

[ELPA Syncer]

branch: externals/emacs-gc-stats
commit 65904693115db32cea48b7a1aed84f54854dda3f
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

emacs-gc-stats-save-session: Fix call to `called-interactively-p'
---
 emacs-gc-stats.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index fdd382aa11..89660a94d1 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -193,7 +193,7 @@ Otherwise, collect symbol."
   (push session previous-sessions)))
   (prin1 previous-sessions (current-buffer)))
 (when
-   (and (called-interactively-p)
+   (and (called-interactively-p 'interactive)
 (yes-or-no-p
  (format "GC stats saved to \"%s\".  Send email to 
emacs-gc-st...@gnu.org? " emacs-gc-stats-file)))
   (browse-url "mailto:emacs-gc-st...@gnu.org";))

[elpa] externals/logos 6fbba45fa0 1/6: Rename logos-focus-mode-hook for correctness

[ELPA Syncer]

branch: externals/logos
commit 6fbba45fa0757341d4f44d90b9962255ad79c5fd
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Rename logos-focus-mode-hook for correctness

The 'logos-focus-mode-extra-functions' has the unfortunate connotation
of being an irregular hook, i.e. one that is called with arguments.
Whereas this one is a regular hook that passes no arguments to the
functions it calls.

Quoting from the Emacs Lisp Reference Manual:

   If the hook variable’s name does not end with ‘-hook’, that indicates
it is probably an “abnormal hook”.  These differ from normal hooks in
two ways: they can be called with one or more arguments, and their
return values can be used in some way.  The hook’s documentation says
how the functions are called and how their return values are used.  Any
functions added to an abnormal hook must follow the hook’s calling
convention.  By convention, abnormal hook names end in ‘-functions’.

To read the manual, evaluate:

(info "(elisp) Hooks")
---
 README.org | 37 -
 logos.el   | 19 ---
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/README.org b/README.org
index 417eed974b..7f4c89d578 100644
--- a/README.org
+++ b/README.org
@@ -244,8 +244,8 @@ changes out-of-the-box 
([[#h:2bb57369-352a-43bf-afe3-0bed2fcc7359][Extra tweaks]
   logos-scroll-lock nil
   logos-olivetti nil)
 
-;; Also check this manual for `logos-focus-mode-extra-functions'.  It is
-;; a hook that lets you extend `logos-focus-mode'.
+;; Also check this manual for `logos-focus-mode-hook'.  It lets you
+;; extend `logos-focus-mode'.
 
 (let ((map global-map))
   (define-key map [remap narrow-to-region] #'logos-narrow-dwim)
@@ -472,19 +472,23 @@ end result can look like this:
 (org-mode . ,(format "\\(^\\*\\{1,3\\} +\\|^-\\{5\\}$\\|%s\\)" 
logos--page-delimiter
 #+end_src
 
-** Leverage logos-focus-mode-extra-functions
+** Leverage logos-focus-mode-hook
 :PROPERTIES:
 :CUSTOM_ID: h:a2540f2f-1159-4e5c-a486-e1f2cb63fee8
 :END:
 #+cindex: User-level extensions to logos-focus-mode
 
-#+vindex: logos-focus-mode-extra-functions
-The ~logos-focus-mode-extra-functions~ is a normal hook that runs when
-~logos-focus-mode~ is enabled.  Each function is run without an argument
-and looks like those in =logos.el=.  An example that sets a variable is
-~logos--buffer-read-only~; one that sets a mode is ~logos--scroll-lock~;
-another that sets the mode of an external package is ~logos--olivetti~;
-while ~logos--hide-fringe~ provides yet another useful sample.
+[ ~logos-focus-mode-hook~ replaces ~logos-focus-mode-extra-functions~
+  as part of {{{development-version}}}. ]
+
+#+vindex: logos-focus-mode-hook
+The ~logos-focus-mode-hook~ is a normal hook that runs when
+~logos-focus-mode~ is enabled.  Each function is called without an
+argument and looks like those in =logos.el=.  An example that sets a
+variable is ~logos--buffer-read-only~; one that sets a mode is
+~logos--scroll-lock~; another that sets the mode of an external
+package is ~logos--olivetti~; while ~logos--hide-fringe~ provides yet
+another useful sample.
 
 If a function cannot be like the aforementioned though still needs to
 set its state both when ~logos-focus-mode~ is enabled and disabled, then
@@ -495,9 +499,8 @@ use the ~logos-focus-mode-hook~ instead.
 :CUSTOM_ID: h:ef719925-8d0b-479a-a87e-32b727578bfc
 :END:
 
-Here is a snippet that relies on ~logos-focus-mode-extra-functions~ to
-extend the functionality of ~logos-focus-mode~ at the user level
-([[#h:a2540f2f-1159-4e5c-a486-e1f2cb63fee8][Leverage 
logos-focus-mode-extra-functions]]).
+Here is a snippet that relies on ~logos-focus-mode-hook~ to extend the
+functionality of ~logos-focus-mode~ at the user level 
([[#h:a2540f2f-1159-4e5c-a486-e1f2cb63fee8][Leverage logos-focus-mode-hook]]).
 
 #+begin_src emacs-lisp
 (defvar my-logos-org-indent nil
@@ -511,7 +514,7 @@ extend the functionality of ~logos-focus-mode~ at the user 
level
 ;; `logos--mode' function takes care of the technicalities.
 (logos--mode 'org-indent-mode -1)))
 
-(add-hook 'logos-focus-mode-extra-functions #'my-logos-org-indent)
+(add-hook 'logos-focus-mode-hook #'my-logos-org-indent)
 #+end_src
 
 The ~my-logos-org-indent~ variable lets the user opt in and out of this
@@ -526,7 +529,7 @@ not needed, the following will suffice:
   ;; `logos--mode' function takes care of the technicalities.
   (logos--mode 'org-indent-mode -1))
 
-(add-hook 'logos-focus-mode-extra-functions #'my-logos-org-indent)
+(add-hook 'logos-focus-mode-hook #'my-logos-org-indent)
 #+end_src
 
 *** Disable menu-bar and tool-bar
@@ -543,13 +546,13 @@ to disable the ~menu-bar-mode~ and ~tool-bar-mode~ when 
activating the
 (defun my-logos-hide-menu-bar ()
   (logos--mode 'menu-bar-mode -1))
 
-(add-hook 'logos-focus-mode-extra-functions #'my-l

[elpa] externals/logos updated (273464accc -> 88beb0aa7b)

[ELPA Syncer]

elpasync pushed a change to branch externals/logos.

  from  273464accc Tweak format of the manual's front matter
   new  6fbba45fa0 Rename logos-focus-mode-hook for correctness
   new  af64c193a9 Remove some needless private function notation from the 
manual
   new  fcc13bf490 Make logos-page-delimiter function and variable public
   new  f2a4d5dbca Give more descriptive names to functions that set state
   new  3ccd6b6cf5 Rephrase some statements in the manual
   new  88beb0aa7b Update to version 1.1.0


Summary of changes:
 CHANGELOG.org | 80 
 README.org| 84 +--
 logos.el  | 76 +++--
 3 files changed, 173 insertions(+), 67 deletions(-)

[elpa] externals/logos fcc13bf490 3/6: Make logos-page-delimiter function and variable public

[ELPA Syncer]

branch: externals/logos
commit fcc13bf490673eaa6700c16645f3d90b87350927
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make logos-page-delimiter function and variable public

This is because they may be used in custom code that is defined at the
user level.  We want them to be "public" to suggest that they are safe
to use: their behaviour is predictable, while any breaking changes
will be documented.
---
 README.org | 14 +++---
 logos.el   | 22 --
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/README.org b/README.org
index 72b889fedd..fda7cdeee3 100644
--- a/README.org
+++ b/README.org
@@ -442,12 +442,12 @@ outline and the page delimiters:
 
 #+begin_src emacs-lisp
 (setq logos-outline-regexp-alist
-  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" (default-value 
'page-delimiter)))
-(org-mode . ,(format "\\(^\\*+ +\\|%s\\)" (default-value 
'page-delimiter)
+  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" logos-page-delimiter))
+(org-mode . ,(format "\\(^\\*+ +\\|%s\\)" logos-page-delimiter
 #+end_src
 
-The form =,(format "\\(^;;;+ \\|%s\\)" logos--page-delimiter)= expands
 to ="\\(^;;;+ \\|^\\)"=.
+The form =,(format "\\(^;;;+ \\|%s\\)" logos-page-delimiter)=
 
 For Org it may be better to either not target the =^L= or to also target
 the horizontal rule (five hyphens on a line, else the =^-\\{5\\}$=
@@ -455,8 +455,8 @@ pattern).  Putting it all together:
 
 #+begin_src emacs-lisp
 (setq logos-outline-regexp-alist
-  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" logos--page-delimiter))
-(org-mode . ,(format "\\(^\\*+ +\\|^-\\{5\\}$\\|%s\\)" 
logos--page-delimiter
+  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" logos-page-delimiter))
+(org-mode . ,(format "\\(^\\*+ +\\|^-\\{5\\}$\\|%s\\)" 
logos-page-delimiter
 #+end_src
 
 Another Org-specific tweak is to use heading levels up to a specific
@@ -468,8 +468,8 @@ end result can look like this:
 
 #+begin_src emacs-lisp
 (setq logos-outline-regexp-alist
-  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" logos--page-delimiter))
-(org-mode . ,(format "\\(^\\*\\{1,3\\} +\\|^-\\{5\\}$\\|%s\\)" 
logos--page-delimiter
+  `((emacs-lisp-mode . ,(format "\\(^;;;+ \\|%s\\)" logos-page-delimiter))
+(org-mode . ,(format "\\(^\\*\\{1,3\\} +\\|^-\\{5\\}$\\|%s\\)" 
logos-page-delimiter
 #+end_src
 
 ** Leverage logos-focus-mode-hook
diff --git a/logos.el b/logos.el
index d9ab893980..5f17a89363 100644
--- a/logos.el
+++ b/logos.el
@@ -231,14 +231,19 @@ and disabled, then use the `logos-focus-mode-hook' 
instead."
 
  Page motions
 
-(defconst logos--page-delimiter (default-value 'page-delimiter)
+(define-obsolete-variable-alias
+  'logos--page-delimiter
+  'logos-page-delimiter
+  "1.1.0")
+
+(defconst logos-page-delimiter (default-value 'page-delimiter)
   "The default value of `page-delimiter'.")
 
 (defun logos--outline-or-delimiter ()
   "Return the current `outline-regexp' or page delimiter."
   (if (bound-and-true-p outline-regexp)
   outline-regexp
-logos--page-delimiter))
+logos-page-delimiter))
 
 (defun logos--outline-regexp ()
   "Return page delimiter from `logos-outline-regexp-alist'."
@@ -248,11 +253,16 @@ and disabled, then use the `logos-focus-mode-hook' 
instead."
 (alist-get (get mode 'derived-mode-parent) outline)
 (logos--outline-or-delimiter
 
-(defun logos--page-delimiter ()
+(define-obsolete-function-alias
+  'logos--page-delimiter
+  'logos-page-delimiter
+  "1.1.0")
+
+(defun logos-page-delimiter ()
   "Determine the `page-delimiter'."
   (if logos-outlines-are-pages
   (setq-local page-delimiter (logos--outline-regexp))
-(setq-local page-delimiter logos--page-delimiter)))
+(setq-local page-delimiter logos-page-delimiter)))
 
 (defun logos--narrow-to-page (count &optional back)
   "Narrow to COUNTth page with optional BACK motion."
@@ -294,7 +304,7 @@ See `logos-forward-page-dwim' or 
`logos-backward-page-dwim'.")
 With optional numeric COUNT move by that many pages.  With
 optional BACK perform the motion backwards."
   (let ((cmd (if back #'backward-page #'forward-page)))
-(logos--page-delimiter)
+(logos-page-delimiter)
 (if (buffer-narrowed-p)
 (logos--narrow-to-page count back)
   (funcall cmd count)
@@ -349,7 +359,7 @@ page."
   "Return non-nil if there is a `page-delimiter' in the buffer.
 This function does not use `widen': it only checks the accessible
 portion of the buffer."
-  (let ((delimiter (logos--page-delimiter)))
+  (let ((delimiter (logos-page-delimiter)))
 (or (save-excursion (re-search-forward delimiter nil t))
 (save-excursion (re-search-backward delimiter nil t)
 

[elpa] externals/logos 3ccd6b6cf5 5/6: Rephrase some statements in the manual

[ELPA Syncer]

branch: externals/logos
commit 3ccd6b6cf574471052a8d71f98dd729b7b1eaf17
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Rephrase some statements in the manual
---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index c0dfb45d3b..6a91934a5c 100644
--- a/README.org
+++ b/README.org
@@ -446,8 +446,8 @@ outline and the page delimiters:
 (org-mode . ,(format "\\(^\\*+ +\\|%s\\)" logos-page-delimiter
 #+end_src
 
-to ="\\(^;;;+ \\|^\\)"=.
 The form =,(format "\\(^;;;+ \\|%s\\)" logos-page-delimiter)=
+expands to ="\\(^;;;+ \\|^^L\\)"= where =^L= is the actual control character.
 
 For Org it may be better to either not target the =^L= or to also target
 the horizontal rule (five hyphens on a line, else the =^-\\{5\\}$=
@@ -499,8 +499,8 @@ use the ~logos-focus-mode-hook~ instead.
 :CUSTOM_ID: h:ef719925-8d0b-479a-a87e-32b727578bfc
 :END:
 
-Here is a snippet that relies on ~logos-focus-mode-hook~ to extend the
-functionality of ~logos-focus-mode~ at the user level 
([[#h:a2540f2f-1159-4e5c-a486-e1f2cb63fee8][Leverage logos-focus-mode-hook]]).
+Here is a snippet that relies on the ~logos-focus-mode-hook~ to extend
+the functionality of ~logos-focus-mode~ 
([[#h:a2540f2f-1159-4e5c-a486-e1f2cb63fee8][Leverage logos-focus-mode-hook]]).
 
 #+begin_src emacs-lisp
 (defvar my-logos-org-indent nil

[elpa] externals/logos 88beb0aa7b 6/6: Update to version 1.1.0

[ELPA Syncer]

branch: externals/logos
commit 88beb0aa7ba2d968ab1f21353b38fdd1b226c527
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Update to version 1.1.0
---
 CHANGELOG.org | 80 +++
 README.org|  9 +++
 logos.el  |  2 +-
 3 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index e8d8af4330..5138af81bc 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -6,6 +6,86 @@
 The newest release is at the top.  For further details, please consult
 the manual: .
 
+* Version 1.1.0 on 2023-06-20
+:PROPERTIES:
+:CUSTOM_ID: h:cf39d0d8-9299-4d1a-a625-c918429f9989
+:END:
+
+** The ~logos-focus-mode-extra-functions~ has a new name
+:PROPERTIES:
+:CUSTOM_ID: h:4599c0ac-a01d-4045-be2d-b1c45c92ae39
+:END:
+
+It is now called ~logos-focus-mode-hook~ to conform with the
+conventions surrounding Emacs Lisp packaging.  The old name is
+deprecated and will be removed in the future.  The relevant warnings
+are in place to inform users of the change.
+
+The ~logos-focus-mode-extra-functions~ had the unfortunate connotation
+of being an irregular hook, i.e. one that runs with arguments.
+Whereas this one is a regular hook that passes no arguments to the
+functions it calls.  Quoting from the Emacs Lisp Reference Manual:
+
+#+begin_quote
+If the hook variable’s name does not end with ‘-hook’, that indicates
+it is probably an “abnormal hook”.  These differ from normal hooks in
+two ways: they can be called with one or more arguments, and their
+return values can be used in some way.  The hook’s documentation says
+how the functions are called and how their return values are used.  Any
+functions added to an abnormal hook must follow the hook’s calling
+convention.  By convention, abnormal hook names end in ‘-functions’.
+#+end_quote
+
+To read the manual, evaluate this inside of Emacs:
+
+#+begin_src emacs-lisp
+(info "(elisp) Hooks")
+#+end_src
+
+** The ~logos-page-delimiter~ variable/function is now public
+:PROPERTIES:
+:CUSTOM_ID: h:d1677f40-7392-4433-9a52-a87edd97eb4f
+:END:
+
+Renaming the ~logos-page-delimiter~ function and variable is necessary
+as both can safely be included in user-defined code.
+
+In the context of Elisp packaging, a "private" symbol is denoted by a
+double dash in its name.  Such code is intended for internal use: it
+may be redefined or altogether removed without further notice.
+Whereas a "public" symbol comes with the implicit guarantee that the
+developer will take good care to preserve its behaviour and/or
+document any breaking changes.
+
+** Functions that set state have a more descriptive name
+:PROPERTIES:
+:CUSTOM_ID: h:f06aaf6b-613f-4c48-814f-9143cc2e493e
+:END:
+
+This concerns ~logos--mode~, hereby renamed to ~logos-set-mode-arg~,
+and ~logos--set~, which is now called ~logos-set-buffer-local-value~.
+
+The intent is to make the code public as well as to better describe
+what it does already at the naming level.
+
+As always, the relevant arrangements are in place to notify users of
+the change.
+
+** The Git repository also includes a README.md
+:PROPERTIES:
+:CUSTOM_ID: h:4f49cd65-f04a-4703-bbe6-399e8c5c8326
+:END:
+
+The project has a =README.org= file which contains the project's
+documentation and is exported to the Info page format.  A new
+=README.md= is supplied as well to provide the basics of what ~logos~
+is, link to its video demo, and further resources.
+
+Thanks to Dave Abrahams for asking me to put a video demo in the
+README.  This inspired me to update this repository to be in the style
+of the others I also maintain.  Dave's comment was made in issue 12 on
+the GitHub mirror: .
+
 * Version 1.0.0 on 2022-10-19
 :PROPERTIES:
 :CUSTOM_ID: h:b71866b6-393a-4bff-bb89-e52f5e2fca9d
diff --git a/README.org b/README.org
index 6a91934a5c..9c920ae201 100644
--- a/README.org
+++ b/README.org
@@ -4,9 +4,9 @@
 #+language:  en
 #+options:   ':t toc:nil author:t email:t num:t
 #+startup:   content
-#+macro: stable-version 1.0.0
-#+macro: release-date 2022-10-19
-#+macro: development-version 1.1.0-dev
+#+macro: stable-version 1.1.0
+#+macro: release-date 2023-06-20
+#+macro: development-version 1.2.0-dev
 #+export_file_name:  logos.texi
 #+texinfo_filename:  logos.info
 #+texinfo_dir_category:  Emacs misc features
@@ -478,9 +478,6 @@ end result can look like this:
 :END:
 #+cindex: User-level extensions to logos-focus-mode
 
-[ ~logos-focus-mode-hook~ replaces ~logos-focus-mode-extra-functions~
-  as part of {{{development-version}}}. ]
-
 #+vindex: logos-focus-mode-hook
 The ~logos-focus-mode-hook~ is a normal hook that runs when
 ~logos-focus-mode~ is enabled.  Each function is called without an
diff --git a/logos.el b/logos.el
index e6b3303d9c..b27a5c0759 1

[elpa] externals/logos f2a4d5dbca 4/6: Give more descriptive names to functions that set state

[ELPA Syncer]

branch: externals/logos
commit f2a4d5dbcab0e157c258ce0fa31dae19b0ee9bf2
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Give more descriptive names to functions that set state
---
 README.org | 12 ++--
 logos.el   | 33 ++---
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/README.org b/README.org
index fda7cdeee3..c0dfb45d3b 100644
--- a/README.org
+++ b/README.org
@@ -511,8 +511,8 @@ functionality of ~logos-focus-mode~ at the user level 
([[#h:a2540f2f-1159-4e5c-a
   (when my-logos-org-indent
 ;; Disable `org-indent-mode' when `logos-focus-mode' is enabled and
 ;; restore it when `logos-focus-mode' is disabled.  The
-;; `logos--mode' function takes care of the technicalities.
-(logos--mode 'org-indent-mode -1)))
+;; `logos-set-mode-arg' function takes care of the technicalities.
+(logos-set-mode-arg 'org-indent-mode -1)))
 
 (add-hook 'logos-focus-mode-hook #'my-logos-org-indent)
 #+end_src
@@ -526,8 +526,8 @@ not needed, the following will suffice:
   "Set `my-logos-org-indent' in `logos-focus-mode'."
   ;; Disable `org-indent-mode' when `logos-focus-mode' is enabled and
   ;; restore it when `logos-focus-mode' is disabled.  The
-  ;; `logos--mode' function takes care of the technicalities.
-  (logos--mode 'org-indent-mode -1))
+  ;; `logos-set-mode-arg' function takes care of the technicalities.
+  (logos-set-mode-arg 'org-indent-mode -1))
 
 (add-hook 'logos-focus-mode-hook #'my-logos-org-indent)
 #+end_src
@@ -544,13 +544,13 @@ to disable the ~menu-bar-mode~ and ~tool-bar-mode~ when 
activating the
 #+begin_src emacs-lisp
 ;; Assuming the `menu-bar-mode' is enabled by default...
 (defun my-logos-hide-menu-bar ()
-  (logos--mode 'menu-bar-mode -1))
+  (logos-set-mode-arg 'menu-bar-mode -1))
 
 (add-hook 'logos-focus-mode-hook #'my-logos-hide-menu-bar)
 
 ;; Assuming the `tool-bar-mode' is enabled by default...
 (defun my-logos-hide-tool-bar ()
-  (logos--mode 'tool-bar-mode -1))
+  (logos-set-mode-arg 'tool-bar-mode -1))
 
 (add-hook 'logos-focus-mode-hook #'my-logos-hide-tool-bar)
 #+end_src
diff --git a/logos.el b/logos.el
index 5f17a89363..e6b3303d9c 100644
--- a/logos.el
+++ b/logos.el
@@ -406,11 +406,17 @@ If narrowing is in effect, widen the view."
 
  Optional "focus mode" and utilities
 
-;; I learnt about the method of using `logos--mode' and `logos--set'
-;; from Daniel Mendler: .
+;; I learnt about the method of using `logos-set-mode-arg' and
+;; `logos-set-buffer-local-value' from Daniel Mendler:
+;; .
 (defvar-local logos--restore nil)
 
-(defun logos--mode (mode arg)
+(define-obsolete-function-alias
+  'logos--mode
+  'logos-set-mode-arg
+  "1.1.0")
+
+(defun logos-set-mode-arg (mode arg)
   "Set MODE to ARG.
 ARG is either 1 or -1.  The current value changes to its
 alternate, thus toggling MODE."
@@ -419,7 +425,12 @@ alternate, thus toggling MODE."
   (push (lambda () (funcall mode old)) logos--restore)
   (funcall mode arg
 
-(defun logos--set (var val)
+(define-obsolete-function-alias
+  'logos--set
+  'logos-set-buffer-local-value
+  "1.1.0")
+
+(defun logos-set-buffer-local-value (var val)
   "Set VAR to buffer-local VAL."
   (let ((old (and (boundp var) (symbol-value var
 (unless (equal old val)
@@ -478,22 +489,22 @@ options: `logos-scroll-lock', `logos-variable-pitch',
 (defun logos--variable-pitch ()
   "Set `logos-variable-pitch'."
   (when (and logos-variable-pitch (not (derived-mode-p 'prog-mode)))
-(logos--mode 'variable-pitch-mode 1)))
+(logos-set-mode-arg 'variable-pitch-mode 1)))
 
 (defun logos--scroll-lock ()
   "Set `logos-scroll-lock'."
   (when logos-scroll-lock
-(logos--mode 'scroll-lock-mode 1)))
+(logos-set-mode-arg 'scroll-lock-mode 1)))
 
 (defun logos--indicate-buffer-boundaries ()
   "Set `logos-hide-buffer-boundaries'."
   (when logos-hide-buffer-boundaries
-(logos--set 'indicate-buffer-boundaries nil)))
+(logos-set-buffer-local-value 'indicate-buffer-boundaries nil)))
 
 (defun logos--hide-cursor ()
   "Set `logos-hide-cursor'."
   (when logos-hide-cursor
-(logos--set 'cursor-type nil)))
+(logos-set-buffer-local-value 'cursor-type nil)))
 
 ;; FIXME 2022-03-13: The mode line is not redrawn properly.  Not even
 ;; with `force-mode-line-update', unless something happens like
@@ -509,17 +520,17 @@ options: `logos-scroll-lock', `logos-variable-pitch',
 (defun logos--hide-mode-line ()
   "Set `logos-hide-mode-line'."
   (when logos-hide-mode-line
-(logos--set 'mode-line-format nil)))
+(logos-set-buffer-local-value 'mode-line-format nil)))
 
 (defun logos--buffer-read-only ()
   "Set `logos-buffer-read-only'."
   (when logos-buffer-read-only
-(logos--set 'buffer-read-only t)))
+(logos-set-buffer-local-value 'buffer-read-only t)))
 
 (defun logos--olivetti ()
   "Set `logos-olivetti'."
   (when (and logos-olivetti (require 'olivetti nil t))
-(logos--

[elpa] externals/logos af64c193a9 2/6: Remove some needless private function notation from the manual

[ELPA Syncer]

branch: externals/logos
commit af64c193a9f33ba943d6339f65e3b7768a4b01b6
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove some needless private function notation from the manual
---
 README.org | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.org b/README.org
index 7f4c89d578..72b889fedd 100644
--- a/README.org
+++ b/README.org
@@ -332,7 +332,7 @@ contains subheadings.  The unfolding only applies to the 
current entry.
 This is the relevant snippet from =logos.el=:
 
 #+begin_src emacs-lisp
-(defun logos--reveal-entry ()
+(defun logos-reveal-entry ()
   "Reveal Org or Outline entry."
   (cond
((and (eq major-mode 'org-mode)
@@ -342,16 +342,16 @@ This is the relevant snippet from =logos.el=:
 (bound-and-true-p outline-minor-mode))
 (outline-show-entry
 
-(add-hook 'logos-page-motion-hook #'logos--reveal-entry)
+(add-hook 'logos-page-motion-hook #'logos-reveal-entry)
 #+end_src
 
 Users may prefer to reveal the entire subtree instead of the current
 entry: the heading at point and all of its subheadings.  In this case,
-one may override the definition of ~logos--reveal-entry~:
+one may override the definition of ~logos-reveal-entry~:
 
 #+begin_src emacs-lisp
 ;; glue code to expand an Org/Outline heading
-(defun logos--reveal-entry ()
+(defun logos-reveal-entry ()
   "Reveal Org or Outline entry."
   (cond
((and (eq major-mode 'org-mode)
@@ -374,11 +374,11 @@ placement invoke the ~recenter~ function with a numeric 
argument.
 
 #+begin_src emacs-lisp
 ;; place point at the top when changing pages
-(defun my-logos--recenter-top ()
+(defun my-logos-recenter-top ()
   "Use `recenter' to reposition the view at the top."
   (recenter 0))
 
-(add-hook 'logos-page-motion-hook #'my-logos--recenter-top)
+(add-hook 'logos-page-motion-hook #'my-logos-recenter-top)
 #+end_src
 
 The =0= argument refers to the topmost line.  So =1= points to the line
@@ -391,7 +391,7 @@ accordingly:
 (defvar my-logos-no-recenter-top-modes 
   '(emacs-lisp-mode lisp-interaction-mode))
 
-(defun my-logos--recenter-top ()
+(defun my-logos-recenter-top ()
   "Use `recenter' to reposition the view at the top."
   (unless (memq major-mode my-logos-no-recenter-top-modes)
 (recenter 0)))
@@ -400,7 +400,7 @@ accordingly:
 Or simply exclude all programming modes:
 
 #+begin_src emacs-lisp
-(defun my-logos--recenter-top ()
+(defun my-logos-recenter-top ()
   "Use `recenter' to reposition the view at the top."
   (unless (derived-mode-p 'prog-mode)
 (recenter 0)))

[nongnu] elpa/julia-mode c798df5a4e 2/2: Merge pull request #187 from tpapp/tp/remove-inferior-julia

[ELPA Syncer]

branch: elpa/julia-mode
commit c798df5a4e515b759764468f728f655899ab2196
Merge: b35e668d6b 05f52ad587
Author: Tamas K. Papp 
Commit: GitHub 

Merge pull request #187 from tpapp/tp/remove-inferior-julia

Remove inferior-julia mode.
---
 julia-mode.el | 64 ---
 1 file changed, 64 deletions(-)

diff --git a/julia-mode.el b/julia-mode.el
index 49bd5a8996..7f8f7c171a 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -910,7 +910,6 @@ buffer where the LaTeX symbol starts."
 
 ;; Math insertion in julia. Use it with
 ;; (add-hook 'julia-mode-hook 'julia-math-mode)
-;; (add-hook 'inferior-julia-mode-hook 'julia-math-mode)
 
 (when (featurep 'latex)
   (declare-function LaTeX-math-abbrev-prefix "latex")
@@ -933,69 +932,6 @@ following commands are defined:
   (if julia-math-mode
   (setq-local LaTeX-math-insert-function #'julia-math-insert)
 
-;; Code for `inferior-julia-mode'
-(require 'comint)
-
-(defcustom julia-program "julia"
-  "Path to the program used by `inferior-julia'."
-  :type 'string
-  :group 'julia)
-
-(defcustom julia-arguments '("-i" "--color=yes")
-  "Commandline arguments to pass to `julia-program'."
-  :type '(repeat (string :tag "argument"))
-  :group 'julia)
-
-(defvar julia-prompt-regexp "^\\w*> "
-  "Regexp for matching `inferior-julia' prompt.")
-
-(defvar inferior-julia-mode-map
-  (nconc (make-sparse-keymap) comint-mode-map)
-  "Basic mode map for `inferior-julia-mode'.")
-
-;;;###autoload
-(defun inferior-julia ()
-"Run an inferior instance of julia inside Emacs."
-(interactive)
-(let ((julia-program julia-program))
-  (when (not (comint-check-proc "*Julia*"))
-(apply #'make-comint-in-buffer "Julia" "*Julia*"
-   julia-program nil julia-arguments))
-  (pop-to-buffer-same-window "*Julia*")
-  (inferior-julia-mode)))
-
-(make-obsolete 'inferior-julia
-   "REPL modes are now provided by various third-party packages, 
this will be removed."
-   "2021-08-30")
-
-(defun inferior-julia--initialize ()
-"Helper function to initialize `inferior-julia'."
-(setq comint-use-prompt-regexp t))
-
-(define-derived-mode inferior-julia-mode comint-mode "Julia"
-  "Major mode for `inferior-julia'.
-
-\\"
-  nil "Julia"
-  :abbrev-table julia-mode-abbrev-table
-  (setq-local comint-prompt-regexp julia-prompt-regexp)
-  (setq-local comint-prompt-read-only t)
-  (setq-local font-lock-defaults '(julia-font-lock-keywords t))
-  (setq-local paragraph-start julia-prompt-regexp)
-  (setq-local indent-line-function #'julia-indent-line)
-  (when julia-force-tab-complete
-(setq-local tab-always-indent 'complete))
-  (add-hook 'completion-at-point-functions
-#'julia-mode-latexsub-completion-at-point-before nil t)
-  (add-hook 'completion-at-point-functions
-#'julia-mode-latexsub-completion-at-point-around nil t))
-
-(add-hook 'inferior-julia-mode-hook #'inferior-julia--initialize)
-
-;;;###autoload
-(defalias 'run-julia #'inferior-julia
-  "Run an inferior instance of julia inside Emacs.")
-
 (provide 'julia-mode)
 
 ;; Local Variables:

[nongnu] elpa/julia-mode 05f52ad587 1/2: Remove inferior-julia mode.

[ELPA Syncer]

branch: elpa/julia-mode
commit 05f52ad5879acf911885e75194290fffcea316da
Author: Tamás K. Papp 
Commit: Tamás K. Papp 

Remove inferior-julia mode.

Cf discussion in #109, #144, #161.
---
 julia-mode.el | 64 ---
 1 file changed, 64 deletions(-)

diff --git a/julia-mode.el b/julia-mode.el
index cc8134356f..e045d5fa5d 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -928,7 +928,6 @@ buffer where the LaTeX symbol starts."
 
 ;; Math insertion in julia. Use it with
 ;; (add-hook 'julia-mode-hook 'julia-math-mode)
-;; (add-hook 'inferior-julia-mode-hook 'julia-math-mode)
 
 (when (featurep 'latex)
   (declare-function LaTeX-math-abbrev-prefix "latex")
@@ -951,69 +950,6 @@ following commands are defined:
   (if julia-math-mode
   (setq-local LaTeX-math-insert-function #'julia-math-insert)
 
-;; Code for `inferior-julia-mode'
-(require 'comint)
-
-(defcustom julia-program "julia"
-  "Path to the program used by `inferior-julia'."
-  :type 'string
-  :group 'julia)
-
-(defcustom julia-arguments '("-i" "--color=yes")
-  "Commandline arguments to pass to `julia-program'."
-  :type '(repeat (string :tag "argument"))
-  :group 'julia)
-
-(defvar julia-prompt-regexp "^\\w*> "
-  "Regexp for matching `inferior-julia' prompt.")
-
-(defvar inferior-julia-mode-map
-  (nconc (make-sparse-keymap) comint-mode-map)
-  "Basic mode map for `inferior-julia-mode'.")
-
-;;;###autoload
-(defun inferior-julia ()
-"Run an inferior instance of julia inside Emacs."
-(interactive)
-(let ((julia-program julia-program))
-  (when (not (comint-check-proc "*Julia*"))
-(apply #'make-comint-in-buffer "Julia" "*Julia*"
-   julia-program nil julia-arguments))
-  (pop-to-buffer-same-window "*Julia*")
-  (inferior-julia-mode)))
-
-(make-obsolete 'inferior-julia
-   "REPL modes are now provided by various third-party packages, 
this will be removed."
-   "2021-08-30")
-
-(defun inferior-julia--initialize ()
-"Helper function to initialize `inferior-julia'."
-(setq comint-use-prompt-regexp t))
-
-(define-derived-mode inferior-julia-mode comint-mode "Julia"
-  "Major mode for `inferior-julia'.
-
-\\"
-  nil "Julia"
-  :abbrev-table julia-mode-abbrev-table
-  (setq-local comint-prompt-regexp julia-prompt-regexp)
-  (setq-local comint-prompt-read-only t)
-  (setq-local font-lock-defaults '(julia-font-lock-keywords t))
-  (setq-local paragraph-start julia-prompt-regexp)
-  (setq-local indent-line-function #'julia-indent-line)
-  (when julia-force-tab-complete
-(setq-local tab-always-indent 'complete))
-  (add-hook 'completion-at-point-functions
-#'julia-mode-latexsub-completion-at-point-before nil t)
-  (add-hook 'completion-at-point-functions
-#'julia-mode-latexsub-completion-at-point-around nil t))
-
-(add-hook 'inferior-julia-mode-hook #'inferior-julia--initialize)
-
-;;;###autoload
-(defalias 'run-julia #'inferior-julia
-  "Run an inferior instance of julia inside Emacs.")
-
 (provide 'julia-mode)
 
 ;; Local Variables:

[nongnu] elpa/sweeprolog 2603c88e45: DOC: Extend the "Overview" manual section

[ELPA Syncer]

branch: elpa/sweeprolog
commit 2603c88e4556aab8e94be704aa621cd0e3390ebf
Author: Eshel Yaron 
Commit: Eshel Yaron 

DOC: Extend the "Overview" manual section

* README.org (Main Features)
(Comparison with Emacs's built-in Prolog mode): New subsections.
---
 README.org | 72 --
 1 file changed, 51 insertions(+), 21 deletions(-)

diff --git a/README.org b/README.org
index 6b1cb3b26c..82a029144a 100644
--- a/README.org
+++ b/README.org
@@ -32,6 +32,30 @@ from Emacs Lisp (see [[Querying Prolog]]).  Sweep further 
builds on top of
 this interface and on top of the standard Emacs facilities to provide
 advanced features for developing SWI-Prolog programs in Emacs.
 
+** Main Features
+:PROPERTIES:
+:CUSTOM_ID: main-features
+:DESCRIPTION: Most important features that Sweep provides
+:ALT_TITLE: Main Features
+:END:
+
+Some of the main benefits that Sweep brings to working with Prolog
+code in Emacs are:
+
+- [[#semantic-highlighting][Semantic highlighting]]
+- [[#indentation][Automatic indentation]]
+- [[#term-based-commands][Structural editing and navigation]]
+- [[#sweeprolog-xref][Jumping to predicate definitions and references]]
+- [[#diagnostics][On-the-fly diagnostics]]
+- [[#code-completion][Intelligent code completion]]
+- [[#rename-variable][Refactoring support]]
+- [[#prolog-top-level][Integrated SWI-Prolog top-level]]
+- [[#querying-prolog][Ability to run Prolog queries directly from Emacs Lisp]]
+
+These features and others are documented in the rest of this manual,
+along with many options that Sweep provides for you to customize its
+behavior.
+
 ** High-level Architecture
 :PROPERTIES:
 :CUSTOM_ID: high-level-architecture
@@ -66,6 +90,25 @@ The different parts of Sweep are structured as follows:
   that =sweeprolog.el= invoke through =sweep-module= to facilitate its
   different commands.
 
+** Comparison with Emacs's built-in Prolog mode
+:PROPERTIES:
+:CUSTOM_ID: alternatives
+:DESCRIPTION: Comparing Sweep with other Prolog Emacs packages
+:ALT_TITLE: Alternatives
+:END:
+
+Emacs has a built-in mode for Prolog code, defined in the library
+=prolog.el= that comes bundled with Emacs.  =prolog.el= aims to work
+with a wide variety of Prolog systems and dialects, unlike Sweep that
+is very tightly integrated with SWI-Prolog specifically.
+
+*If you are working with SWI-Prolog, you'll find Sweep to be far more powerful*
+than the built-in =prolog.el=.  This is because Sweep leverages the Prolog
+parser and other analysis tools that SWI-Prolog itself uses, these give Sweep
+access to highly accurate and rich information about SWI-Prolog code.  If 
you're
+using another Prolog implementation, you should stick to =prolog.el= as Sweep
+won't work with other Prolog systems.
+
 * Installation
 :PROPERTIES:
 :CUSTOM_ID: installation
@@ -2694,32 +2737,19 @@ some improvements remain to be pursued:
 :ALT_TITLE: Editing Improvements
 :END:
 
-- Inherit user customizations from ~prolog-mode~ :: Sweep should inherit
-  user customizations from the standard =prolog.el= built into Emacs to
-  accommodate users updating their configs to work with Sweep.
-  Ideally, ~sweeprolog-mode~ should be derived from ~prolog-mode~ instead
-  of the generic ~prog-mode~ to inherit user-set hooks and
-  modifications, but careful consideration is required to make sure
-  ~sweeprolog-mode~ overrides all conflicting ~prolog-mode~ features.
-
 - Make predicate completion aware of module-qualification :: predicate
   completion should detect when the prefix it's trying to complete
   starts with a module-qualification ~foo:ba<|>~ and restrict completion
   to matching candidates in the specified module.
 
-- Respect ~font-lock-maximum-decoration~ :: We should take into account
-  the value of ~font-lock-maximum-decoration~ while highlighting
-  ~sweeprolog-mode~ buffers.  This variable conveys the user's preferred
-  degree of highlighting.  A possible approach would be changing
-  ~sweeprolog--colour-term-to-faces~ such that each color fragment in
-  returned list states its target decoration level (i.e. 1, 2 or 3).
-  ~sweeprolog--colourise~ would then compare this target to the value of
-
-  #+begin_src emacs-lisp
-(font-lock-value-in-major-mode font-lock-maximum-decoration)
-  #+end_src
-
-  And decide whether or not to apply the fragment.
+- Respect ~font-lock-maximum-decoration~ :: We should take into account the
+  value of ~font-lock-maximum-decoration~ while highlighting ~sweeprolog-mode~
+  buffers.  This variable conveys the user's preferred degree of highlighting.
+  A possible approach would be changing ~sweeprolog--colour-term-to-faces~ such
+  that each color fragment in returned list states its target decoration level
+  (i.e. 1, 2 or 3).  ~sweeprolog--colourise~ would then compare this target to
+  the value of ~(font-lock-value-in-major-mode font-lock-maximum-decoration)~
+  and decide whether or not to apply the fragment.
 
 ** General imp

[elpa] externals/consult 0e90f516c8: README: Add link to @mohkale's consult-compile-multi

[ELPA Syncer]

branch: externals/consult
commit 0e90f516c8cae705709a24ea8071a0c2400360d8
Author: Daniel Mendler 
Commit: Daniel Mendler 

README: Add link to @mohkale's consult-compile-multi
---
 README.org | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index 032a305641..eef93ea6b7 100644
--- a/README.org
+++ b/README.org
@@ -1063,8 +1063,9 @@ wider Emacs ecosystem. You may want to install some of 
theses packages depending
 on your preferences and requirements.
 
 - [[https://github.com/yadex205/consult-ag][consult-ag]]: Support for the 
[[https://github.com/ggreer/the_silver_searcher][Silver Searcher]] in the style 
of =consult-grep=.
-- [[https://github.com/mohkale/consult-company][consult-company]]: Completion 
at point using the [[https://github.com/company-mode/company-mode][Company]] 
backends.
 - [[https://github.com/youngker/consult-codesearch.el][consult-codesearch]]: 
Integration with [[https://github.com/google/codesearch][Code Search]].
+- [[https://github.com/mohkale/consult-company][consult-company]]: Completion 
at point using the [[https://github.com/company-mode/company-mode][Company]] 
backends.
+- [[https://github.com/mohkale/consult-compile-multi][consult-compile-multi]]: 
Integration with [[https://github.com/mohkale/compile-multi][compile-multi]].
 - [[https://github.com/karthink/consult-dir][consult-dir]]: Directory jumper 
using Consult multi sources.
 - [[https://codeberg.org/ravi/consult-dash][consult-dash]]: Consult interface 
to [[https://github.com/dash-docs-el/dash-docs][Dash documentation]]
 - [[https://github.com/mohkale/consult-eglot][consult-eglot]]: Integration 
with Eglot (LSP client).
@@ -1229,7 +1230,7 @@ Authors of supplementary =consult-*= packages:
 - [[https://codeberg.org/jao/][Jose A Ortega Ruiz]] 
([[https://codeberg.org/jao/consult-notmuch][consult-notmuch]], 
[[https://codeberg.org/jao/consult-recoll][consult-recoll]], 
[[https://codeberg.org/jao/espotify][consult-spotify]])
 - [[https://github.com/gagbo/][Gerry Agbobada]] 
([[https://github.com/gagbo/consult-lsp][consult-lsp]])
 - [[https://github.com/karthink][Karthik Chikmagalur]] 
([[https://github.com/karthink/consult-dir][consult-dir]])
-- [[https://github.com/mohkale][Mohsin Kaleem]] 
([[https://github.com/mohkale/consult-company][consult-company]], 
[[https://github.com/mohkale/consult-eglot][consult-eglot]], 
[[https://github.com/mohkale/consult-yasnippet][consult-yasnippet]])
+- [[https://github.com/mohkale][Mohsin Kaleem]] 
([[https://github.com/mohkale/consult-company][consult-company]], 
[[https://github.com/mohkale/consult-compile-multi][consult-compile-multi]], 
[[https://github.com/mohkale/consult-eglot][consult-eglot]], 
[[https://github.com/mohkale/consult-yasnippet][consult-yasnippet]])
 - [[https://gitlab.com/OlMon][Marco Pawłowski]] 
([[https://gitlab.com/OlMon/consult-flyspell][consult-flyspell]], 
[[https://gitlab.com/OlMon/consult-projectile][consult-projectile]])
 - [[https://github.com/Qkessler][Enrique Kessler Martínez]] 
([[https://github.com/Qkessler/consult-project-extra][consult-project-extra]])
 - [[https://github.com/jgru][Jan Gru]] 
([[https://github.com/jgru/consult-org-roam][consult-org-roam]])

[elpa] externals/cape 36b3d23dab: Fix cape-interactive

[ELPA Syncer]

branch: externals/cape
commit 36b3d23dab726663af4846a3e45d92198a253b06
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix cape-interactive
---
 cape.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cape.el b/cape.el
index 9b61aec192..8cb83c8546 100644
--- a/cape.el
+++ b/cape.el
@@ -826,7 +826,7 @@ changed.  The function `cape-company-to-capf' is 
experimental."
  (capfs (if ctx (cdr capfs) capfs))
  (completion-at-point-functions
   (if ctx
-  (mapcar (lambda (fun) `(lambda () (let ,ctx (,fun capfs)
+  (mapcar (lambda (f) `(lambda () (let ,ctx (funcall ',f capfs)
 capfs)))
 (unless (completion-at-point)
   (user-error "%s: No completions"

[nongnu] elpa/opam-switch-mode 1a787e286a 4/4: Merge pull request #10 from ProofGeneral/scratch/stefan

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit 1a787e286a36b509ce418fe94141f53795b0c6b6
Merge: ac9ef486e6 578695619c
Author: Erik Martin-Dorel 
Commit: GitHub 

Merge pull request #10 from ProofGeneral/scratch/stefan

Minor tweaks and cleanups
---
 .gitignore  |  3 +++
 README.md   | 15 ---
 opam-switch-mode.el | 74 +
 3 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..18c633ef0c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/opam-switch-mode-autoloads.el
+/opam-switch-mode-pkg.el
+*.elc
diff --git a/README.md b/README.md
index 05c5e410a8..8369676913 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # opam-switch-mode
 
+[![NonGNU 
ELPA](https://elpa.nongnu.org/nongnu/opam-switch-mode-badge.svg)](https://elpa.nongnu.org/nongnu/opam-switch-mode.html)
 
[![MELPA](https://melpa.org/packages/opam-switch-mode-badge.svg)](https://melpa.org/#/opam-switch-mode)
 
 Provide a command `opam-switch-set-switch` to change the opam switch
@@ -13,9 +14,13 @@ entry "reset" to reset the environment to the state when 
Emacs was started.
 
 ## Installing `opam-switch-mode`
 
-The recommended way to install this mode relies on the
-[MELPA](https://melpa.org/) repository of Emacs packages, along with the
-[`use-package`](https://github.com/jwiegley/use-package) macro.
+We recommend to install this mode from either the 
+[NonGNU ELPA](https://elpa.nongnu.org/) or the
+[MELPA](https://melpa.org/) repository of Emacs packages.
+
+If you use the
+[`use-package`](https://github.com/jwiegley/use-package) macro, the
+recommended configuration is:
 Assuming you have already set up those in your `.emacs`, just write:
 
 ```elisp
@@ -25,6 +30,10 @@ Assuming you have already set up those in your `.emacs`, 
just write:
   (coq-mode . opam-switch-mode))
 ```
 
+If you don't use `use-package`, do the following instead:
+
+(add-hook 'coq-mode-hook #'opam-switch-mode)
+
 so that the minor mode is automatically enabled when `coq-mode` is on,
 see also [`opam-switch-mode` aware modes](#opam-switch-mode-aware-modes).
 
diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index 7b7ef88ab4..f947de6f1e 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -60,14 +60,12 @@
 
 (defcustom opam-switch-program-name "opam"
   "Name or path of the opam binary."
-  :group 'opam-switch
   :type 'string)
 
 (defcustom opam-switch-common-options ()
   "Options to be supplied to every opam invocation.
 This must be a list of strings, each member string an option
 accepted by opam."
-  :group 'opam-switch
   :type '(repeat string))
 
 (defcustom opam-switch-common-environment
@@ -81,21 +79,19 @@ element should have the form of ENVVARNAME=VALUE.
 The process environment must ensure that output is plain ascii
 without color, non-ascii arrow symbols and that it is in English.
 Otherwise parsing the output of opam commands won't work."
-  :group 'opam-switch
   :type '(repeat string))
 
 (defcustom opam-switch-change-opam-switch-hook nil
   "Hook run when the opam switch changes.
 This is used, for instance, to let Proof General kill the coq
 background process when the opam switch changes."
-  :group 'opam-switch
-  :type '(repeat function))
+  :type 'hook)
 
 ;;; Code:
 
 (defun opam-switch--run-command-without-stderr (sub-cmd
-&optional switch sexp
-&rest args)
+&optional switch sexp
+&rest args)
   "Run opam SUB-CMD, without capturing error output.
 Run opam SUB-CMD with additional arguments and insert the output
 in the current buffer at point.  Error output (stderr) is
@@ -117,7 +113,7 @@ therfore respect file-name handlers specified via
   (push "--sexp" options))
 ;; (message "run %s %s %s" opam-switch-program-name sub-cmd options)
 (apply #'process-file opam-switch-program-name
-   nil '(t nil) nil sub-cmd options)))
+   nil '(t nil) nil sub-cmd options)))
 
 (defun opam-switch--command-as-string (sub-cmd &optional switch sexp &rest 
args)
   "Run opam SUB-CMD, with additional arguments, without capturing stderr.
@@ -138,14 +134,14 @@ This function  `opam-switch--run-command-without-stderr'."
 
 (defun opam-switch--get-root ()
   "Get the opam root directory.
-This function gets the opam variable 'root'.
+This function gets the opam variable `root'.
 This function should not be called directly; see `opam-switch--root'."
   (let ((root (opam-switch--command-as-string "var" nil nil "root")))
 (unless root
   (error "Command 'opam var root' failed"))
-(when (eq (aref root (1- (length root))) ?\n)
-  (setq root (substring root 0 -1)))
-root))
+(if (eq (aref root (1- (length root))) ?\n)
+(substring root 0 -1)
+  root)))
 
 (defvar opam-switch--root

[nongnu] elpa/opam-switch-mode c6ccd5c2da 2/4: (opam-switch-set-switch): Rename from `opam-switch--set-switch`

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit c6ccd5c2da08c79cc20eced77527ddba78715a80
Author: Stefan Monnier 
Commit: Stefan Monnier 

(opam-switch-set-switch): Rename from `opam-switch--set-switch`

Also reinstate the corresponding autoload that didn't work.
(opam-switch--set-switch): Add compatibility alias, just in case (no
idea if that's needed).
---
 opam-switch-mode.el | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index 8fbbb3c6f3..7f56e53243 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -186,7 +186,7 @@ This function should not be called directly; see 
`opam-switch--root'."
   (nreverse opam-switches
 
 (defvar opam-switch--switch-history nil
-  "Minibuffer history list for `opam-switch--set-switch'.")
+  "Minibuffer history list for `opam-switch-set-switch'.")
 
 (defvar opam-switch--saved-env nil
   "Saved environment variables, overwritten by an opam switch.
@@ -249,7 +249,8 @@ switch overwrote them."
  (file-name-nondirectory current-switch)
   "")))
 
-(defun opam-switch--set-switch (switch-name)
+;;;###autoload
+(defun opam-switch-set-switch (switch-name)
   "Choose and set an opam switch.
 Set opam switch SWITCH-NAME, which must be a valid opam switch
 name.  When called interactively, the switch name must be entered
@@ -272,7 +273,7 @@ runs.  This a can be used to inform other modes that may run
 background processes that depend on the currently active opam
 switch.
 
-For obvious reasons, `opam-switch--set-switch' will only affect Emacs and
+For obvious reasons, `opam-switch-set-switch' will only affect Emacs and
 not any other shells outside Emacs."
   (interactive
(let* ((switches (opam-switch--get-switches))
@@ -297,11 +298,8 @@ not any other shells outside Emacs."
   (opam-switch--set-env opam-env)))
   (run-hooks 'opam-switch-change-opam-switch-hook))
 
-;; FIXME: This autoload didn't work.  If we want to autoload the command,
-;; then we need to place the autoload on the command itself (and arguably
-;; rename it without the "--").
-;; ;;;###autoload
-(defalias 'opam-switch-set-switch #'opam-switch--set-switch)
+(define-obsolete-function-alias 'opam-switch--set-switch
+  #'opam-switch-set-switch "opam-switch-mode 1.1")
 
 ;;; minor mode, keymap and menu
 
@@ -321,13 +319,13 @@ not any other shells outside Emacs."
(mapcar
 (lambda (switch)
   `[,switch
-(opam-switch--set-switch ,switch)
+(opam-switch-set-switch ,switch)
 :active t
 :help ,(concat "select opam switch \"" switch "\"")])
 (opam-switch--get-switches))
;; now reset as last element
'(
- ["reset" (opam-switch--set-switch "")
+ ["reset" (opam-switch-set-switch "")
   :active opam-switch--saved-env
   :help "reset to state when emacs was started"])))
 

[nongnu] elpa/opam-switch-mode 22b852a8a4 1/4: Minor tweaks and cleanups

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit 22b852a8a4427a4999f67a96b20a101e1f459894
Author: Stefan Monnier 
Commit: Stefan Monnier 

Minor tweaks and cleanups

* .gitignore: New file.

* README.md: Add link to NonGNU and insist less on the use
of `use-package`.

* opam-switch-mode.el: Remove redundant `:group` arguments.
(opam-switch-change-opam-switch-hook): Fix `:type`.
(opam-switch--get-root): Avoid unneeded `setq`.
(opam-switch--root): Include the error info in the error message.
(opam-switch--get-switches): Change regexp under the assumption that
switch names don't include newlines nor TABs, and throw away the `.*$`
tail which just wastes time.  Preserve the order of the switches.
(opam-switch-set-switch): Comment out broken autoload cookie.
(opam-switch-mode-map): Rename from `opam-switch--mode-keymap` to
follow the convention.
(opam-switch--setup-opam-switch-mode): Adjust accordingly.
(opam-switch--menu-items): Let backquote worry about `vconcat`.
(opam-switch-mode): Remove redundant keywords.
Try and reset the environment when turning the mode off.
(opam-switch--get-root, opam-switch-mode): Fix incorrect markup.
---
 .gitignore  |  3 +++
 README.md   | 15 +++---
 opam-switch-mode.el | 60 ++---
 3 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..18c633ef0c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/opam-switch-mode-autoloads.el
+/opam-switch-mode-pkg.el
+*.elc
diff --git a/README.md b/README.md
index 05c5e410a8..8369676913 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # opam-switch-mode
 
+[![NonGNU 
ELPA](https://elpa.nongnu.org/nongnu/opam-switch-mode-badge.svg)](https://elpa.nongnu.org/nongnu/opam-switch-mode.html)
 
[![MELPA](https://melpa.org/packages/opam-switch-mode-badge.svg)](https://melpa.org/#/opam-switch-mode)
 
 Provide a command `opam-switch-set-switch` to change the opam switch
@@ -13,9 +14,13 @@ entry "reset" to reset the environment to the state when 
Emacs was started.
 
 ## Installing `opam-switch-mode`
 
-The recommended way to install this mode relies on the
-[MELPA](https://melpa.org/) repository of Emacs packages, along with the
-[`use-package`](https://github.com/jwiegley/use-package) macro.
+We recommend to install this mode from either the 
+[NonGNU ELPA](https://elpa.nongnu.org/) or the
+[MELPA](https://melpa.org/) repository of Emacs packages.
+
+If you use the
+[`use-package`](https://github.com/jwiegley/use-package) macro, the
+recommended configuration is:
 Assuming you have already set up those in your `.emacs`, just write:
 
 ```elisp
@@ -25,6 +30,10 @@ Assuming you have already set up those in your `.emacs`, 
just write:
   (coq-mode . opam-switch-mode))
 ```
 
+If you don't use `use-package`, do the following instead:
+
+(add-hook 'coq-mode-hook #'opam-switch-mode)
+
 so that the minor mode is automatically enabled when `coq-mode` is on,
 see also [`opam-switch-mode` aware modes](#opam-switch-mode-aware-modes).
 
diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index 7b7ef88ab4..8fbbb3c6f3 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -60,14 +60,12 @@
 
 (defcustom opam-switch-program-name "opam"
   "Name or path of the opam binary."
-  :group 'opam-switch
   :type 'string)
 
 (defcustom opam-switch-common-options ()
   "Options to be supplied to every opam invocation.
 This must be a list of strings, each member string an option
 accepted by opam."
-  :group 'opam-switch
   :type '(repeat string))
 
 (defcustom opam-switch-common-environment
@@ -81,21 +79,19 @@ element should have the form of ENVVARNAME=VALUE.
 The process environment must ensure that output is plain ascii
 without color, non-ascii arrow symbols and that it is in English.
 Otherwise parsing the output of opam commands won't work."
-  :group 'opam-switch
   :type '(repeat string))
 
 (defcustom opam-switch-change-opam-switch-hook nil
   "Hook run when the opam switch changes.
 This is used, for instance, to let Proof General kill the coq
 background process when the opam switch changes."
-  :group 'opam-switch
-  :type '(repeat function))
+  :type 'hook)
 
 ;;; Code:
 
 (defun opam-switch--run-command-without-stderr (sub-cmd
-&optional switch sexp
-&rest args)
+&optional switch sexp
+&rest args)
   "Run opam SUB-CMD, without capturing error output.
 Run opam SUB-CMD with additional arguments and insert the output
 in the current buffer at point.  Error output (stderr) is
@@ -117,7 +113,7 @@ therfore respect file-name handlers specified via
   (push "--sexp" options))
 ;; (message "run %s %s %s" opam-switch-program-name sub-cmd options)
 (apply #'

[nongnu] elpa/opam-switch-mode updated (ac9ef486e6 -> 1a787e286a)

[ELPA Syncer]

elpasync pushed a change to branch elpa/opam-switch-mode.

  from  ac9ef486e6 docs(README.md): Improve details
   new  22b852a8a4 Minor tweaks and cleanups
   new  c6ccd5c2da (opam-switch-set-switch): Rename from 
`opam-switch--set-switch`
   new  578695619c opam-switch-mode.el: Capitalize to follow conventions
   new  1a787e286a Merge pull request #10 from ProofGeneral/scratch/stefan


Summary of changes:
 .gitignore  |  3 +++
 README.md   | 15 ---
 opam-switch-mode.el | 74 +
 3 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 .gitignore

[nongnu] elpa/opam-switch-mode 578695619c 3/4: opam-switch-mode.el: Capitalize to follow conventions

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit 578695619c8f913ea7b6ef8f513c38f8e9339538
Author: Stefan Monnier 
Commit: Stefan Monnier 

opam-switch-mode.el: Capitalize to follow conventions

(opam-switch--menu-items): Capitalize tooltips
and grey out the "current switch" non-command.
(opam-switch--setup-opam-switch-mode): Capitalize the menu name, to
follow the convention.
---
 opam-switch-mode.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index 7f56e53243..f947de6f1e 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -311,7 +311,7 @@ not any other shells outside Emacs."
   (append
;; first the current switch as info with a separator
'(["current switch: " nil
-  :active t
+  :active nil
   :suffix (opam-switch--get-current-switch)
   :help "Shows the currently selected opam switch"]
  "---")
@@ -321,13 +321,13 @@ not any other shells outside Emacs."
   `[,switch
 (opam-switch-set-switch ,switch)
 :active t
-:help ,(concat "select opam switch \"" switch "\"")])
+:help ,(concat "Select opam switch \"" switch "\"")])
 (opam-switch--get-switches))
;; now reset as last element
'(
  ["reset" (opam-switch-set-switch "")
   :active opam-switch--saved-env
-  :help "reset to state when emacs was started"])))
+  :help "Reset to state when Emacs was started"])))
 
 (defun opam-switch--setup-opam-switch-mode ()
   "Re-define menu for `opam-switch-mode'.
@@ -341,7 +341,7 @@ is automatically created by `define-minor-mode'."
 opam-switch-mode-map
 "opam mode menu"
 ;; FIXME: Use `:filter'?
-(cons "opam-switch"
+(cons "Opam-switch"
   (opam-switch--menu-items
 
 ;;;###autoload

[nongnu] elpa/opam-switch-mode fe612e2d6c 4/4: docs(release.sh): Add author/year/license

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit fe612e2d6c2a99ad18b5ed84a98a178a17b9f9c5
Author: Erik Martin-Dorel 
Commit: Erik Martin-Dorel 

docs(release.sh): Add author/year/license
---
 release.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.sh b/release.sh
index f1d53834aa..5462292256 100755
--- a/release.sh
+++ b/release.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Author: Erik Martin-Dorel, 2023
+# License for this script: MIT
 
 set -eu
 

[nongnu] elpa/opam-switch-mode updated (1a787e286a -> fe612e2d6c)

[ELPA Syncer]

elpasync pushed a change to branch elpa/opam-switch-mode.

  from  1a787e286a Merge pull request #10 from ProofGeneral/scratch/stefan
   new  b58a37ba5f feat: Add release.sh script
   new  07a3742449 chore: Release 1.1
   new  2312ccd149 chore: Prepare next dev cycle
   new  fe612e2d6c docs(release.sh): Add author/year/license


Summary of changes:
 opam-switch-mode.el |  2 +-
 release.sh  | 38 ++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100755 release.sh

[nongnu] elpa/opam-switch-mode 2312ccd149 3/4: chore: Prepare next dev cycle

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit 2312ccd149cee5b9c43b4bd1ed397440addf7027
Author: Erik Martin-Dorel 
Commit: Erik Martin-Dorel 

chore: Prepare next dev cycle
---
 opam-switch-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index a8cdd0ae7b..05b3a4d193 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer: proof-general-maintain...@groupes.renater.fr
 ;; URL: https://github.com/ProofGeneral/opam-switch-mode
 ;; Package-Requires: ((emacs "25.1"))
-;; Version: 1.1
+;; Version: 1.2-git
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;

[nongnu] elpa/opam-switch-mode 07a3742449 2/4: chore: Release 1.1

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit 07a3742449b6572a842de045135e17c0e9993943
Author: Erik Martin-Dorel 
Commit: Erik Martin-Dorel 

chore: Release 1.1
---
 opam-switch-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index 83528680ae..a8cdd0ae7b 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer: proof-general-maintain...@groupes.renater.fr
 ;; URL: https://github.com/ProofGeneral/opam-switch-mode
 ;; Package-Requires: ((emacs "25.1"))
-;; Version: 1.1-git
+;; Version: 1.1
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;

[nongnu] elpa/opam-switch-mode b58a37ba5f 1/4: feat: Add release.sh script

[ELPA Syncer]

branch: elpa/opam-switch-mode
commit b58a37ba5f10c1c6a034a63982cd349170181513
Author: Erik Martin-Dorel 
Commit: Erik Martin-Dorel 

feat: Add release.sh script
---
 opam-switch-mode.el |  2 +-
 release.sh  | 36 
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/opam-switch-mode.el b/opam-switch-mode.el
index f947de6f1e..83528680ae 100644
--- a/opam-switch-mode.el
+++ b/opam-switch-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer: proof-general-maintain...@groupes.renater.fr
 ;; URL: https://github.com/ProofGeneral/opam-switch-mode
 ;; Package-Requires: ((emacs "25.1"))
-;; Version: 1.0-git
+;; Version: 1.1-git
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
diff --git a/release.sh b/release.sh
new file mode 100755
index 00..f1d53834aa
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -eu
+
+perl_replace() {
+local str1="$1"
+local str2="$2"
+perl -wpe 'BEGIN {$str1=shift @ARGV; $str2=shift @ARGV;}; 
s/$str1/$str2/g;' "$str1" "$str2"
+}
+
+do_release() {
+file=opam-switch-mode.el
+git checkout master
+line=$(grep "$file" -e Version:)
+version=${line/*Version: /}
+release=${version%-git}
+next=$(perl -wne 'my ($major,$minor) = $_ =~ m/^(.+)\.(.+)$/; 
print("$major.", $minor+1, "-git");' <<< "$release")
+line_release=$(perl_replace "$version" "$release" <<<"$line")
+line_next=$(perl_replace "$version" "$next" <<<"$line")
+cp -fv "$file" "$file~"
+
+perl_replace "$line" "$line_release" <"$file~" > "$file"
+git add -vu
+git commit -m "chore: Release $release"
+git tag -s "$release" -m "Version $release"
+
+perl_replace "$line" "$line_next" <"$file~" > "$file"
+git branch -D next || true
+git checkout -b next
+git add -vu
+git commit -m "chore: Prepare next dev cycle"
+git checkout master
+echo >&2 "Ready to: git push $(git remote) master $release"
+echo >&2 "Then, do: git merge next"
+}
+do_release

[elpa] externals/embark c5584469d7 2/2: Add changelog entry for org agenda items

[ELPA Syncer]

branch: externals/embark
commit c5584469d76c9c5fc349611f22d2d026be48586a
Author: Omar Antolín Camarena 
Commit: Omar Antolín Camarena 

Add changelog entry for org agenda items
---
 CHANGELOG.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 690901728f..70f0381976 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,9 @@
   the current buffer (contributed by @minad, thanks!)
 - Renamed =embark-isearch= to =embark-isearch-forward= and added
   =embark-isearch-backward=.
+- Added key bindings for org agenda items consist with those of org
+  headings where possible. Also improved bindings for org targets in
+  general.
 * Version 0.22.1 (2023-04-20)
 ** New feature: selections
 Now users can select several targets to make an ad hoc collection. The

[elpa] externals/embark updated (b48412f62c -> c5584469d7)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark.

  from  b48412f62c Merge pull request #643 from minad/fix-projectless
   new  08b63229da Add bindings for deadlines to heading and agenda item 
maps
   new  c5584469d7 Add changelog entry for org agenda items


Summary of changes:
 CHANGELOG.org | 3 +++
 embark-org.el | 4 +++-
 embark.el | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

[elpa] externals/embark 08b63229da 1/2: Add bindings for deadlines to heading and agenda item maps

[ELPA Syncer]

branch: externals/embark
commit 08b63229da9756fc0c4e3dbf0241da1c55fdf7a7
Author: Omar Antolín Camarena 
Commit: Omar Antolín Camarena 

Add bindings for deadlines to heading and agenda item maps
---
 embark-org.el | 4 +++-
 embark.el | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/embark-org.el b/embark-org.el
index 41d6806139..690c2094bd 100644
--- a/embark-org.el
+++ b/embark-org.el
@@ -369,6 +369,7 @@ bound to i."
   "TAB" #'org-cycle
   "t" #'org-todo
   "s" #'org-schedule
+  "d" #'org-deadline
   "," #'org-priority
   ":" #'org-set-tags-command
   "P" #'org-set-property
@@ -555,13 +556,14 @@ REST are the remaining arguments."
   "t" #'org-agenda-todo
   "k" #'org-agenda-kill
   "u" #'org-agenda-undo
-  "d" #'org-agenda-toggle-deadlines
+  "D" #'org-agenda-toggle-deadlines
   "a" #'org-agenda-archive
   "i" #'org-agenda-clock-in
   "o" #'org-agenda-clock-out
   ":" #'org-agenda-set-tags
   "," #'org-agenda-priority
   "s" #'org-agenda-schedule
+  "d" #'org-agenda-deadline
   "P" #'org-agenda-set-property
   "e" #'org-agenda-set-effort
   "r" #'org-agenda-refile
diff --git a/embark.el b/embark.el
index 4db46adc56..a638a1f5fe 100644
--- a/embark.el
+++ b/embark.el
@@ -4291,8 +4291,8 @@ This simply calls RUN with the REST of its arguments 
inside
   "^" 'outline-move-subtree-up
   "v" 'outline-move-subtree-down
   "u" 'outline-up-heading
-  "s" 'outline-show-subtree
-  "d" 'outline-hide-subtree
+  "+" 'outline-show-subtree
+  "-" 'outline-hide-subtree
   ">" 'outline-demote
   "<" 'outline-promote)
 

[elpa] externals/embark-consult updated (b48412f62c -> c5584469d7)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  b48412f62c Merge pull request #643 from minad/fix-projectless
  adds  08b63229da Add bindings for deadlines to heading and agenda item 
maps
  adds  c5584469d7 Add changelog entry for org agenda items

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.org | 3 +++
 embark-org.el | 4 +++-
 embark.el | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

[elpa] externals/vdiff 872de4d5aa 1/4: Fix diff opts handling (ignore case / whitespace)

[ELPA Syncer]

branch: externals/vdiff
commit 872de4d5aaf61d62bbe54833f987bb85eeef12e1
Author: wwade 
Commit: wwade 

Fix diff opts handling (ignore case / whitespace)

Inside `vdiff-refresh`, when append is used to build up the diff
command, if one of the intermediate args to append is a string and not
a list, append will expand it into the string's character values.

So, "-w" becomes 45 119, and this `Wrong type argument: stringp, 45`
error message is shown.

Added a small helper that converts non-empty strings using
`ensure-list` to avoid this problem. We only want non-empty strings,
though, otherwise an empty diff opt would get added as an explicit
empty string arg which would cause diff to fail, e.g.

diff -w "" -- file1 file2

Where we actually want:

diff -w -- file1 file2

Fixes: #36
---
 vdiff.el | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index ac07e9c36b..092731d623 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -506,6 +506,11 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
   (when vdiff-mode
 (vdiff-refresh)))
 
+(defun vdiff--nonempty-str-to-list (str)
+  "Return a list for a non-empty `STR' or else nil."
+  (unless (string-empty-p str)
+(ensure-list str)))
+
 ;; * Main overlay refresh routine
 
 (defun vdiff-refresh (&optional post-refresh-function)
@@ -524,9 +529,9 @@ POST-REFRESH-FUNCTION is called when the process finishes."
(ses vdiff--session)
(cmd (append
  base-cmd
- (vdiff-session-whitespace-args ses)
+ (vdiff--nonempty-str-to-list (vdiff-session-whitespace-args 
ses))
  (unless (string= (car base-cmd) "git")
-   (vdiff-session-case-args ses))
+   (vdiff--nonempty-str-to-list (vdiff-session-case-args ses)))
  (list "--" tmp-a tmp-b)
  (when tmp-c
(list tmp-c

[elpa] externals/vdiff 170e968c6a 4/4: Merge pull request #38 from wwade/master

[ELPA Syncer]

branch: externals/vdiff
commit 170e968c6a46a572b30c52c1b038232d418734cc
Merge: d5df45f843 1e6e393104
Author: Justin Burkett 
Commit: GitHub 

Merge pull request #38 from wwade/master

Fix diff opts handling (ignore case / whitespace)
---
 vdiff.el | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index ac07e9c36b..33055eea2f 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -296,6 +296,10 @@ because those are handled differently.")
   "Make ARGS into list and remove nils."
   (delq nil (apply #'list args)))
 
+(defun vdiff--maybe-list (str)
+  "Return a list with STR as the sole element, or an empty list if STR is 
empty."
+  (if (string= str "") '() (list str)))
+
 (defun vdiff--buffer-a-p ()
   (when (and
  vdiff--session
@@ -489,7 +493,7 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
 vdiff--case-options)
vdiff--case-options
   (setf (vdiff-session-case-args vdiff--session)
-command-line-arg)
+(vdiff--maybe-list command-line-arg))
   (when vdiff-mode
 (vdiff-refresh)))
 
@@ -502,7 +506,7 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
 vdiff--whitespace-options)
vdiff--whitespace-options
   (setf (vdiff-session-whitespace-args vdiff--session)
-command-line-arg)
+(vdiff--maybe-list command-line-arg))
   (when vdiff-mode
 (vdiff-refresh)))
 
@@ -1901,8 +1905,8 @@ with non-nil USE-FOLDS."
:process-buffer (generate-new-buffer-name " *vdiff* ")
:word-diff-output-buffer (generate-new-buffer-name " *vdiff-word* ")
:folds (make-hash-table :test 'equal :weakness 'value)
-   :case-args ""
-   :whitespace-args ""
+   :case-args nil
+   :whitespace-args nil
:prior-window-config prior-window-config
:on-quit on-quit
:kill-buffers-on-quit kill-buffers-on-quit))
@@ -2359,7 +2363,7 @@ enabled automatically if `vdiff-lock-scrolling' is 
non-nil."
 "on (-i)"))
 
 (defun vdiff--current-whitespace ()
-  (pcase (vdiff-session-whitespace-args vdiff--session)
+  (pcase (car (vdiff-session-whitespace-args vdiff--session))
 ("" "off")
 ("-w" "all (-w)")
 ("-b" "space changes (-b)")

[elpa] externals/vdiff updated (d5df45f843 -> 170e968c6a)

[ELPA Syncer]

elpasync pushed a change to branch externals/vdiff.

  from  d5df45f843 Make vdiff--session permanent-local
   new  872de4d5aa Fix diff opts handling (ignore case / whitespace)
   new  ddc9d92f97 make vdiff-session-whitespace-args a list everywhere
   new  1e6e393104 fix docstring for vdiff--maybe-list
   new  170e968c6a Merge pull request #38 from wwade/master


Summary of changes:
 vdiff.el | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

[elpa] externals/vdiff ddc9d92f97 2/4: make vdiff-session-whitespace-args a list everywhere

[ELPA Syncer]

branch: externals/vdiff
commit ddc9d92f974374878376261e4a0b2390a321c8dd
Author: wwade 
Commit: wwade 

make vdiff-session-whitespace-args a list everywhere

@justbur suggested making vdiff-session-whitespace-args a list
everywhere instead of converting it to a list when it is being used.

I also changed vdiff-session-case-args in the same way.
---
 vdiff.el | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 092731d623..f80ec82d7e 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -296,6 +296,10 @@ because those are handled differently.")
   "Make ARGS into list and remove nils."
   (delq nil (apply #'list args)))
 
+(defun vdiff--maybe-list (str)
+  "Return a list with STR as the sole element, or an empty list."
+  (if (string= str "") '() (list str)))
+
 (defun vdiff--buffer-a-p ()
   (when (and
  vdiff--session
@@ -489,7 +493,7 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
 vdiff--case-options)
vdiff--case-options
   (setf (vdiff-session-case-args vdiff--session)
-command-line-arg)
+(vdiff--maybe-list command-line-arg))
   (when vdiff-mode
 (vdiff-refresh)))
 
@@ -502,15 +506,10 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
 vdiff--whitespace-options)
vdiff--whitespace-options
   (setf (vdiff-session-whitespace-args vdiff--session)
-command-line-arg)
+(vdiff--maybe-list command-line-arg))
   (when vdiff-mode
 (vdiff-refresh)))
 
-(defun vdiff--nonempty-str-to-list (str)
-  "Return a list for a non-empty `STR' or else nil."
-  (unless (string-empty-p str)
-(ensure-list str)))
-
 ;; * Main overlay refresh routine
 
 (defun vdiff-refresh (&optional post-refresh-function)
@@ -529,9 +528,9 @@ POST-REFRESH-FUNCTION is called when the process finishes."
(ses vdiff--session)
(cmd (append
  base-cmd
- (vdiff--nonempty-str-to-list (vdiff-session-whitespace-args 
ses))
+ (vdiff-session-whitespace-args ses)
  (unless (string= (car base-cmd) "git")
-   (vdiff--nonempty-str-to-list (vdiff-session-case-args ses)))
+   (vdiff-session-case-args ses))
  (list "--" tmp-a tmp-b)
  (when tmp-c
(list tmp-c
@@ -1906,8 +1905,8 @@ with non-nil USE-FOLDS."
:process-buffer (generate-new-buffer-name " *vdiff* ")
:word-diff-output-buffer (generate-new-buffer-name " *vdiff-word* ")
:folds (make-hash-table :test 'equal :weakness 'value)
-   :case-args ""
-   :whitespace-args ""
+   :case-args nil
+   :whitespace-args nil
:prior-window-config prior-window-config
:on-quit on-quit
:kill-buffers-on-quit kill-buffers-on-quit))
@@ -2364,7 +2363,7 @@ enabled automatically if `vdiff-lock-scrolling' is 
non-nil."
 "on (-i)"))
 
 (defun vdiff--current-whitespace ()
-  (pcase (vdiff-session-whitespace-args vdiff--session)
+  (pcase (car (vdiff-session-whitespace-args vdiff--session))
 ("" "off")
 ("-w" "all (-w)")
 ("-b" "space changes (-b)")

[elpa] externals/vdiff 1e6e393104 3/4: fix docstring for vdiff--maybe-list

[ELPA Syncer]

branch: externals/vdiff
commit 1e6e39310479ba4fed69019ab933e9a01b212060
Author: wwade 
Commit: wwade 

fix docstring for vdiff--maybe-list
---
 vdiff.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdiff.el b/vdiff.el
index f80ec82d7e..33055eea2f 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -297,7 +297,7 @@ because those are handled differently.")
   (delq nil (apply #'list args)))
 
 (defun vdiff--maybe-list (str)
-  "Return a list with STR as the sole element, or an empty list."
+  "Return a list with STR as the sole element, or an empty list if STR is 
empty."
   (if (string= str "") '() (list str)))
 
 (defun vdiff--buffer-a-p ()