[nongnu] elpa/vc-fossil e059ca466c: vc-fossil.el: Update from Fossil [2009015f0e].

[ELPA Syncer]

branch: elpa/vc-fossil
commit e059ca466cc8914757c6bdb26fa9cc6b0820a9c1
Author: Alfred M. Szmidt 
Commit: Alfred M. Szmidt 

vc-fossil.el: Update from Fossil [2009015f0e].
---
 vc-fossil.el | 28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/vc-fossil.el b/vc-fossil.el
index b632128671..98324bc0a2 100644
--- a/vc-fossil.el
+++ b/vc-fossil.el
@@ -2,7 +2,7 @@
 
 ;; Author: Venkat Iyer 
 ;; Maintainer: Alfred M. Szmidt 
-;; Version: 20220707
+;; Version: 20221120
 
 ;; vc-fossil.el free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
@@ -47,6 +47,7 @@
 ;; - receive-file (file rev)   ??
 ;; - unregister (file) OK
 ;; * checkin (files comment &optional rev) OK
+;; - checkin-patch (patch-string comment)  ??
 ;; * find-revision (file rev buffer)   OK
 ;; * checkout (file &optional rev) OK
 ;; * revert (file &optional contents-done) OK
@@ -87,7 +88,7 @@
 ;; - region-history (file buffer lfrom lto)??
 ;; - region-history-mode ()??
 ;; - mergebase (rev1 &optional rev2)   ??
-;; TAG SYSTEM
+;; TAG/BRANCH SYSTEM
 ;; - create-tag (dir name branchp) OK
 ;; - retrieve-tag (dir name update)OK
 ;; MISCELLANEOUS
@@ -95,7 +96,7 @@
 ;; - root (file)   OK
 ;; - ignore (file &optional directory remove)  ??
 ;; - ignore-completion-table (directory)   ??
-;; - find-ignore-file file OK
+;; - find-ignore-file (file)   OK
 ;; - previous-revision (file rev)  OK
 ;; - next-revision (file rev)  OK
 ;; - log-edit-mode ()  ??
@@ -106,7 +107,8 @@
 ;; - extra-menu () ??
 ;; - extra-dir-menu () ??
 ;; - conflicted-files (dir)??
-;; - repository-url (file-or-dir &optional remote-name) OK
+;; - repository-url (file-or-dir &optional remote-name)OK
+;; - prepare-patch (rev)   ??
 
 ;;; Code:
 
@@ -397,6 +399,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no 
switches."
 comment)
(vc-switches 'Fossil 'checkin
 
+;; - checkin-patch (patch-string comment)
+
 (defun vc-fossil-find-revision (file rev buffer)
   (apply #'vc-fossil--command buffer 0 file
 "cat"
@@ -466,7 +470,7 @@ This prompts for a branch to merge from."
(apply #'vc-fossil--command buffer 0 nil "timeline"
   (nconc
(when start-revision (list "before" start-revision))
-   (when limit (list "-n" (number-to-string limit)))
+   (when (numberp limit) (list "-n" (number-to-string limit)))
(list "-p" (file-relative-name (expand-file-name file))
   (goto-char (point-min)
 
@@ -524,7 +528,8 @@ This prompts for a branch to merge from."
 (rev1 (list "--from" rev1)))
(vc-switches 'Fossil 'diff)
 
-;; - revision-completion-table (files)
+(defun vc-fossil-revision-completion-table (_files)
+  (vc-fossil--branches))
 
 (defconst vc-fossil-annotate-re
   "\\([[:word:]]+\\)\\s-+\\([-0-9]+\\)\\s-+[0-9]+: ")
@@ -552,7 +557,14 @@ This prompts for a branch to merge from."
 
 ;; - region-history-mode ()
 
-;; - mergebase (rev1 &optional rev2)
+(defun vc-fossil-mergebase (rev1 &optional rev2)
+  (unless rev2 (setq rev2 "trunk"))
+  (let* ((pivot (vc-fossil--run "test-find-pivot" rev1 rev2))
+(_pos (string-match "pivot=\\([0-9a-fA-F]+\\)" pivot))
+(base (match-string 1 pivot)))
+(if base
+base
+  (error "No common ancestor for merge base"
 
 ;; TAG SYSTEM
 
@@ -637,6 +649,8 @@ This prompts for a branch to merge from."
 (defun vc-fossil-repository-url (file-or-dir &optional remote-name)
   (let ((default-directory (vc-fossil-root file-or-dir)))
 (cadr (assoc (or remote-name "default") (vc-fossil--remotes)
+
+;; - prepare-patch (rev)
 
 ;; Useful functions for interacting with Fossil
 

[elpa] externals/corfu fde6bb3347: corfu-popupinfo: Fix margin computation

[ELPA Syncer]

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

corfu-popupinfo: Fix margin computation
---
 extensions/corfu-popupinfo.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el
index 1839eeaf18..c08ab30669 100644
--- a/extensions/corfu-popupinfo.el
+++ b/extensions/corfu-popupinfo.el
@@ -204,8 +204,8 @@ all values are in pixels relative to the origin. See
 (defun corfu-popupinfo--size ()
   "Return popup size as pair."
   (let* ((cw (default-font-width))
- (margin (* cw (+ (alist-get 'left-margin-width 
corfu--buffer-parameters)
-  (alist-get 'right-margin-width 
corfu--buffer-parameters
+ (margin (* cw (+ (alist-get 'left-margin-width 
corfu-popupinfo--buffer-parameters)
+  (alist-get 'right-margin-width 
corfu-popupinfo--buffer-parameters
  (max-height (* (default-line-height) corfu-popupinfo-max-height))
  (max-width (+ margin (* cw corfu-popupinfo-max-width
 (if corfu-popupinfo-resize

[elpa] externals/corfu 4bd40f82f1: corfu-popupinfo: Work around yet another Emacs quirk

[ELPA Syncer]

branch: externals/corfu
commit 4bd40f82f112f6ad510cd3f81afe2f0db4fa2fa0
Author: Daniel Mendler 
Commit: Daniel Mendler 

corfu-popupinfo: Work around yet another Emacs quirk
---
 extensions/corfu-popupinfo.el | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el
index c08ab30669..3890f45dd6 100644
--- a/extensions/corfu-popupinfo.el
+++ b/extensions/corfu-popupinfo.el
@@ -356,14 +356,22 @@ the candidate popup, its value is 'bottom, 'top, 'right 
or 'left."
(and (not doc-changed)
 (- (frame-pixel-width corfu-popupinfo--frame) 
border border))
(and (not doc-changed)
-(- (frame-pixel-height corfu-popupinfo--frame) 
border border)
+(- (frame-pixel-height corfu-popupinfo--frame) 
border border
+ (margin-quirk (not corfu-popupinfo--frame)))
   (setq corfu-popupinfo--frame
 (corfu--make-frame corfu-popupinfo--frame
area-x area-y area-w area-h
" *corfu-popupinfo*")
 corfu-popupinfo--direction area-d
 corfu-popupinfo--candidate candidate
-corfu-popupinfo--coordinates new-coords))
+corfu-popupinfo--coordinates new-coords)
+  ;; HACK: Force margin update. For some reason, the call to
+  ;; `set-window-buffer' in `corfu--make-frame' is not effective the
+  ;; first time. Why does Emacs have all these quirks?
+  (when margin-quirk
+(set-window-buffer
+ (frame-root-window corfu-popupinfo--frame)
+ " *corfu-popupinfo*")))
 
 (defun corfu-popupinfo--hide ()
   "Clear the info popup buffer content and hide it."

[nongnu] elpa/git-commit 744818a3be 2/2: Fix two typos

[ELPA Syncer]

branch: elpa/git-commit
commit 744818a3be01034a8577063e061e9b9e53ccf890
Author: Stefan Kangas 
Commit: Jonas Bernoulli 

Fix two typos
---
 lisp/magit-git.el   | 2 +-
 lisp/magit-reset.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 6a14819f50..30e299239c 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2041,7 +2041,7 @@ PATH has to be relative to the super-repository."
;; directory instead of the worktree, which isn't
;; what it is supposed to do and not what we want.
;; However, if the worktree has been removed, then
-   ;; we want to return it anway; instead of nil.
+   ;; we want to return it anyway; instead of nil.
(setq path (or (magit-toplevel path) path))
(setq worktree (list path nil nil nil))
(push worktree worktrees)))
diff --git a/lisp/magit-reset.el b/lisp/magit-reset.el
index e201c3dd23..9c968154d4 100644
--- a/lisp/magit-reset.el
+++ b/lisp/magit-reset.el
@@ -1,4 +1,4 @@
-;;; magit-reset.el --- Reset fuctionality  -*- lexical-binding:t -*-
+;;; magit-reset.el --- Reset functionality  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2008-2022 The Magit Project Contributors
 

[nongnu] elpa/git-commit updated (0c78be0687 -> 744818a3be)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  0c78be0687 make: Fix previous commit
   new  048d001aa3 magit-rev-format: Cosmetics
   new  744818a3be Fix two typos


Summary of changes:
 lisp/magit-git.el   | 6 +++---
 lisp/magit-reset.el | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[nongnu] elpa/git-commit 048d001aa3 1/2: magit-rev-format: Cosmetics

[ELPA Syncer]

branch: elpa/git-commit
commit 048d001aa33f0e66c801f73cd846dff58dd07446
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-rev-format: Cosmetics
---
 lisp/magit-git.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 502b5f0e73..6a14819f50 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2178,8 +2178,8 @@ Return a list of two integers: (A>B B>A)."
(concat "--format=" format) args
(if rev (magit--rev-dereference rev) "HEAD")
"--")))
-(unless (string-equal str "")
-  str)))
+(and (not (string-equal str ""))
+ str)))
 
 (defun magit-rev-insert-format (format &optional rev args)
   ;; Prefer `git log --no-walk' to `git show --no-patch' because it

[nongnu] elpa/magit-section updated (0c78be0687 -> 744818a3be)

[ELPA Syncer]

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

  from  0c78be0687 make: Fix previous commit
  adds  048d001aa3 magit-rev-format: Cosmetics
  adds  744818a3be Fix two typos

No new revisions were added by this update.

Summary of changes:
 lisp/magit-git.el   | 6 +++---
 lisp/magit-reset.el | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[nongnu] elpa/magit updated (0c78be0687 -> 744818a3be)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  0c78be0687 make: Fix previous commit
  adds  048d001aa3 magit-rev-format: Cosmetics
  adds  744818a3be Fix two typos

No new revisions were added by this update.

Summary of changes:
 lisp/magit-git.el   | 6 +++---
 lisp/magit-reset.el | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[elpa] externals/eev 7a2f5d42bc: New intro: (find-edit-index-intro).

[ELPA Syncer]

branch: externals/eev
commit 7a2f5d42bcf70e0f27a645be6a2b21072543e688
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

New intro: (find-edit-index-intro).
---
 ChangeLog |  11 +++
 VERSION   |   4 +-
 eepitch.el|   5 +-
 eev-hydras.el | 196 +-
 eev-intro.el  | 244 --
 5 files changed, 307 insertions(+), 153 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db4721f0bc..50194c617b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-11-20  Eduardo Ochs  
+
+   * eev-hydras.el (eev-index-edit): renamed to `ee-edit-index'.
+   (eev-index-replace): renamed to `ee-edit-index-replace'.
+   (hydra-eev-index-edit): renamed to `ee-edit-index-hydra'.
+   (find-eev-index-edit-intro): deleted.
+
+   * eev-intro.el (find-edit-index-intro): new function.
+
+   * eepitch.el (eepitch-gnuplot): use `ee-with-pager-cat'.
+
 2022-11-19  Eduardo Ochs  
 
* eev-intro.el (find-kla-intro): several new sections.
diff --git a/VERSION b/VERSION
index 2bef090546..0cb121e4cd 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sat Nov 19 03:58:17 GMT 2022
-Sat Nov 19 00:58:17 -03 2022
+Sun Nov 20 18:26:26 GMT 2022
+Sun Nov 20 15:26:26 -03 2022
diff --git a/eepitch.el b/eepitch.el
index 00b1d63512..102e725715 100644
--- a/eepitch.el
+++ b/eepitch.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20221101
+;; Version:20221120
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eepitch.el>
@@ -1014,7 +1014,8 @@ The arguments are explained here:
 ;; We force GhostScript's resolution to make its window fit on the screen.
 (defun eepitch-gs () (interactive) (eepitch-comint "gs" "gs -r45"))
 (defun eepitch-gs () (interactive) (eepitch-comint "gs" "gs -r60"))
-(defun eepitch-gnuplot () (interactive) (eepitch-comint "gnuplot" "gnuplot"))
+(defun eepitch-gnuplot () (interactive)
+  (eepitch '(ee-with-pager-cat '(find-comintprocess "gnuplot" "gnuplot"
 
 ;; Java-based languages:
 (defun eepitch-bsh () (interactive)
diff --git a/eev-hydras.el b/eev-hydras.el
index da9151fe91..479d018ad6 100644
--- a/eev-hydras.el
+++ b/eev-hydras.el
@@ -47,7 +47,7 @@
 ;; run its tutorial - i.e., execute these two sexps:
 ;;
 ;;   (require 'eev-hydras)
-;;   (find-eev-index-edit-intro)
+;;   (find-edit-index-intro)
 ;;
 ;; This code will probably change a LOT in the next months.
 ;; Update: I recorded a video, it's here:
@@ -57,10 +57,8 @@
 
 
 
-;; «.hydra-eev-index-edit» (to "hydra-eev-index-edit")
-;; «.find-eev-index-edit-intro»(to "find-eev-index-edit-intro")
-
-
+;; «.ei»   (to "ei")
+;; «.ee-edit-index-hydra»  (to "ee-edit-index-hydra")
 
 ;; See: https://github.com/abo-abo/hydra
 ;;  (find-epackage-links 'hydra "hydra" t)
@@ -68,28 +66,50 @@
 ;;
 (require 'hydra)
 
-
-
-(defalias 'ei 'eev-index-edit)
-
-(defun eev-index-edit ()
-  "Call `eev-index-edit/body' to edit the index."
-  (interactive)
-  (hydra-eev-index-edit/body))
-
-(defun eev-index-replace (from-string to-string)
+(defun ee-edit-index-replace (from-string to-string)
   "Replace FROM-STRING to TO-STRING in the current line."
+  (eek "C-a")
   (search-forward from-string (ee-eol))
   (replace-match to-string)
   (eek "C-a"))
 
 
 
-;; «hydra-eev-index-edit»  (to ".hydra-eev-index-edit")
-;; Try: (find-eapropos"hydra-eev-index-edit")
-;;  (find-ekeymapdescr hydra-eev-index-edit/keymap)
+;;;  __  __  _ 
+;;; |  \/  |__  __   ___(_)
+;;; | |\/| |\ \/ /  / _ \ |
+;;; | |  | |_>  <  |  __/ |
+;;; |_|  |_|/_/\_\  \___|_|
+;;;
+;; «ei»  (to ".ei")
+;; This file is not loaded by default, but if you run
+;;   (require 'eev-hydras)
+;; this will define `M-x ei' as an alias for `M-x ee-edit-index'.
+(defalias 'ei 'ee-edit-index)
+
+(defun ee-edit-index ()
+  "Call `ee-edit-index-hydra/body' to edit the index."
+  (interactive)
+  (ee-edit-index-hydra/body))
+
+
+
+;;;  _   _   _   
+;;; | | | |_   _  __| |_ __ __ _ 
+;;; | |_| | | | |/ _` | '__/ _` |
+;;; |  _  | |_| | (_| | | | (_| |
+;;; |_| |_|\__, |\__,_|_|  \__,_|
+;;;|___/ 
 ;;
-(defhydra hydra-eev-index-edit (:color green :hint nil)
+;; «ee-edit-index-hydra»  (to ".ee-edit-index-hydra")
+;; Running a `defhydra' defines many functions.
+;; You can inspect them with:
+;;   (find-eapropos   "ee-edit-index-hydra")
+;;   (find-ekeymapdescree-edit-index-hydra/keymap)
+;;   (find-e

[nongnu] elpa/sweeprolog e10568cfba 2/3: Have sweeprolog-top-level-signal-current call trace/0 by default

[ELPA Syncer]

branch: elpa/sweeprolog
commit e10568cfba65678440470c0471128cf39149a4f7
Author: Eshel Yaron 
Commit: Eshel Yaron 

Have sweeprolog-top-level-signal-current call trace/0 by default

* sweeprolog.el (sweeprolog-top-level-signal-default-goal): new user
option, set to "trace" by default.
(sweeprolog-top-level-signal-current): use it.
---
 README.org| 14 +++---
 sweeprolog.el | 19 ---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index 6f7d38d0e3..41c48128cc 100644
--- a/README.org
+++ b/README.org
@@ -1235,16 +1235,24 @@ When executing long running Prolog queries in the 
top-level, there may
 arise a need to interrupt the query, either to inspect the state of
 the top-level or to free it for running other queries.  To signal a
 =sweep= top-level that it should stop executing the current query and do
-something else instead, use the command ~M-x
-sweeprolog-top-level-signal~.  This command prompts for an active =sweep=
+something else instead, use the command
+~sweeprolog-top-level-signal~. This command prompts for an active =sweep=
 top-level buffer followed by a Prolog goal, and interrupts the
 top-level causing it to run the specified goal.
 
 #+KINDEX: C-c C-c (sweeprolog-top-level-mode)
+#+KINDEX: C-u C-c C-c (sweeprolog-top-level-mode)
 #+FINDEX: sweeprolog-top-level-signal-current
+#+VINDEX: sweeprolog-top-level-signal-default-goal
 In ~sweeprolog-top-level-mode~ buffers, the command
 ~sweeprolog-top-level-signal-current~ is available for signaling the
-current top-level.  It is bound by default to ~C-c C-c~.
+current top-level.  It is bound by default to ~C-c C-c~.  Normally, this
+command signals the goal specified by the user option
+~sweeprolog-top-level-signal-default-goal~, which is set by default to
+~trace~, causing the top-level thread to enter trace mode (see 
[[https://www.swi-prolog.org/pldoc/man?section=trace-summary-trace-mode][Trace
+Mode in the SWI-Prolog manual]]).  When called with a prefix argument
+(~C-u C-c C-c~), ~sweeprolog-top-level-signal-current~ instead prompts for
+a goal similarly to ~sweeprolog-top-level-signal~.
 
 It is also possible to signal top-levels from the =sweep= Top-level Menu
 buffer with the command ~sweeprolog-top-level-menu-signal~ with point at
diff --git a/sweeprolog.el b/sweeprolog.el
index 567ee3babb..37698e8cdc 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -49,6 +49,8 @@
 
 (defvar sweeprolog-read-module-history nil)
 
+(defvar sweeprolog-top-level-signal-goal-history nil)
+
 (defvar sweeprolog-insert-term-functions
   '(sweeprolog-maybe-insert-next-clause
 sweeprolog-maybe-define-predicate)
@@ -323,7 +325,11 @@ buffer where the new predicate defintion should be 
inserted."
  (function :tag "Custom Function"))
   :group 'sweeprolog)
 
-
+(defcustom sweeprolog-top-level-signal-default-goal "trace"
+  "Prolog goal used by default for signaling top-level threads."
+  :package-version '((sweeprolog "0.8.10"))
+  :type 'string
+  :group 'sweeprolog-top-level)
 
  Keymaps
 
@@ -2314,8 +2320,15 @@ Interactively, a prefix arg means to prompt for BUFFER."
 goal))
 
 (defun sweeprolog-top-level-signal-current (goal)
-  "Signal the current top-level thread to run GOAL."
-  (interactive "MSignal goal: ?- " sweeprolog-top-level-mode)
+  "Signal the current top-level thread to run GOAL.
+
+Interactively, when called with a prefix argument, prompt for
+GOAL.  Otherwise, GOAL is set to a default value specified by
+`sweeprolog-top-level-signal-default-goal'."
+  (interactive (list (if current-prefix-arg
+ (read-string "Signal goal: ?- " nil
+  sweeprolog-top-level-signal-goal-history)
+   sweeprolog-top-level-signal-default-goal)))
   (sweeprolog-signal-thread sweeprolog-top-level-thread-id goal))
 
 ;;;###autoload

[nongnu] elpa/sweeprolog updated (7dfb85c88f -> f3e34cd23f)

[ELPA Syncer]

elpasync pushed a change to branch elpa/sweeprolog.

  from  7dfb85c88f Announce recent changes in NEWS.org and bump version to 
0.8.9
   new  96f8a765d2 Support DCG and SSU rules in 
sweeprolog-insert-next-clause
   new  e10568cfba Have sweeprolog-top-level-signal-current call trace/0 by 
default
   new  f3e34cd23f Announce recent changes in NEWS.org and bump version to 
0.8.10


Summary of changes:
 NEWS.org| 19 +++
 README.org  | 14 +++---
 sweeprolog-tests.el | 43 +--
 sweeprolog.el   | 53 ++---
 4 files changed, 109 insertions(+), 20 deletions(-)

[nongnu] elpa/sweeprolog f3e34cd23f 3/3: Announce recent changes in NEWS.org and bump version to 0.8.10

[ELPA Syncer]

branch: elpa/sweeprolog
commit f3e34cd23f205161d8d07337837ba65657956743
Author: Eshel Yaron 
Commit: Eshel Yaron 

Announce recent changes in NEWS.org and bump version to 0.8.10
---
 NEWS.org  | 19 +++
 sweeprolog.el |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/NEWS.org b/NEWS.org
index c8a854cb6d..8bc9bff191 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -11,6 +11,25 @@ SWI-Prolog in Emacs.
 For further details, please consult the manual:
 .
 
+* Version 0.8.10 on 2022-11-21
+
+** ~sweeprolog-top-level-signal-current~ now calls ~trace/0~ by default
+
+Calling ~sweeprolog-top-level-signal-current~ (e.g. with ~C-c C-c~) now
+signals the top-level thread with the goal specified by the user
+option ~sweeprolog-top-level-signal-default-goal~, instead of prompting
+for a goal.  By default this user option is set to ~"trace"~, causing
+the top-level thread to enter trace mode.  To have
+~sweeprolog-top-level-signal-current~ prompt for a different goal on
+invocation, call it with a prefix argument, i.e. ~C-u C-c C-c~.
+
+** Fixes
+
+- Fixed insertion of new clauses with ~sweeprolog-insert-term-dwim~ when
+  the predicate at point is a DCG non-terminal or a predicate defined
+  with SSU rules.  ~sweeprolog-insert-term-dwim~ now detects and inserts
+  the correct neck (~:-~, ~-->~ or ~=>~) based on the previous clauses.
+
 * Version 0.8.9 on 2022-11-19
 
 ** Predicate completions now use holes for arguments
diff --git a/sweeprolog.el b/sweeprolog.el
index 37698e8cdc..dc489791ca 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Eshel Yaron <~eshel/d...@lists.sr.ht>
 ;; Keywords: prolog languages extensions
 ;; URL: https://git.sr.ht/~eshel/sweep
-;; Package-Version: 0.8.9
+;; Package-Version: 0.8.10
 ;; Package-Requires: ((emacs "28.1"))
 
 ;; This file is NOT part of GNU Emacs.

[nongnu] elpa/sweeprolog 96f8a765d2 1/3: Support DCG and SSU rules in sweeprolog-insert-next-clause

[ELPA Syncer]

branch: elpa/sweeprolog
commit 96f8a765d2783fae32368eee47c22f6d852354b0
Author: Eshel Yaron 
Commit: Eshel Yaron 

Support DCG and SSU rules in sweeprolog-insert-next-clause

* sweeprolog.el (sweeprolog-definition-at-point): also return kind of
neck.
(sweeprolog-maybe-insert-next-clause): pass it to...
(sweeprolog-insert-next-clause): new argument NECK used instead of
hardcoded ":-", use "Body" for clause body instead of "_".
(sweeprolog-identifier-at-point): handle raw meta goals.
* sweeprolog-tests.el: add tests for sweeprolog-insert-term-dwim
inserting clauses with different neck kinds.
---
 sweeprolog-tests.el | 43 +--
 sweeprolog.el   | 32 +---
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 59af86f546..4fa1a4f87e 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -326,7 +326,7 @@ foo(Bar).
 (goto-char (point-max))
 (backward-word)
 (should (equal (sweeprolog-definition-at-point)
-   '(1 "foo" 1 21)
+   '(1 "foo" 1 21 ":-")
 
 (ert-deftest syntax-errors ()
   "Test clearing syntax error face after errors are fixed."
@@ -382,6 +382,45 @@ bar(Bar) :- baz(Bar).
   (should fsap)
   (should (string= "lists" (file-name-base fsap))
 
+(ert-deftest dwim-next-clause-fact ()
+  "Tests inserting a new clause after a fact."
+  (with-temp-buffer
+(sweeprolog-mode)
+(insert "
+foo.")
+(sweeprolog-insert-term-dwim)
+(should (string= (buffer-string)
+ "
+foo.
+foo :- Body.
+"
+
+(ert-deftest dwim-next-clause-dcg ()
+  "Tests inserting a non-terminal with `sweeprolog-insert-term-dwim'."
+  (with-temp-buffer
+(sweeprolog-mode)
+(insert "
+foo --> bar.")
+(sweeprolog-insert-term-dwim)
+(should (string= (buffer-string)
+ "
+foo --> bar.
+foo --> Body.
+"
+
+(ert-deftest dwim-next-clause-ssu ()
+  "Tests inserting an SSU rule with `sweeprolog-insert-term-dwim'."
+  (with-temp-buffer
+(sweeprolog-mode)
+(insert "
+foo => bar.")
+(sweeprolog-insert-term-dwim)
+(should (string= (buffer-string)
+ "
+foo => bar.
+foo => Body.
+"
+
 (ert-deftest dwim-next-clause ()
   "Tests inserting a new clause with `sweeprolog-insert-term-dwim'."
   (with-temp-buffer
@@ -392,7 +431,7 @@ foo :- bar.")
 (should (string= (buffer-string)
  "
 foo :- bar.
-foo :- _.
+foo :- Body.
 "
 
 (ert-deftest dwim-define-predicate ()
diff --git a/sweeprolog.el b/sweeprolog.el
index 89e2eccfed..567ee3babb 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -872,7 +872,8 @@ module name, F is a functor name and N is its arity."
 `("head" ,_ ,f ,a)
 `("goal" ,_ ,f ,a))
 (setq id-at-point (list f a)))
-(when id-at-point
+(when (and id-at-point
+   (not (eq (car id-at-point) 'variable)))
   (sweeprolog--query-once "sweep" "sweep_functor_arity_pi"
   id-at-point))
 
@@ -2583,8 +2584,9 @@ instead."
   'sweeprolog-hole t
   'rear-sticky '(sweeprolog-hole)))
 
-(defun sweeprolog-insert-clause (functor arity)
-  (let ((point nil))
+(defun sweeprolog-insert-clause (functor arity &optional neck)
+  (let ((point nil)
+(neck (or neck ":-")))
 (combine-after-change-calls
   (insert "\n" functor)
   (setq point (point))
@@ -2593,19 +2595,22 @@ instead."
 (dotimes (_ (1- arity))
   (insert (sweeprolog--hole) ", "))
 (insert (sweeprolog--hole) ")"))
-  (insert " :- " (sweeprolog--hole) ".\n"))
+  (insert " " neck " " (sweeprolog--hole "Body") ".\n"))
 (goto-char point)
 (sweeprolog-forward-hole)))
 
 (defun sweeprolog-maybe-insert-next-clause (point kind beg end)
   (when-let ((current-predicate (and (eq kind 'operator)
  (string= "." 
(buffer-substring-no-properties beg end))
- (cdr (sweeprolog-definition-at-point 
point
- (functor (car current-predicate))
- (arity (cadr current-predicate)))
+ (sweeprolog-definition-at-point point)))
+ (functor (nth 1 current-predicate))
+ (arity   (nth 2 current-predicate))
+ (neck(nth 4 current-predicate)))
 (goto-char end)
 (end-of-line)
-(sweeprolog-insert-clause functor arity)
+(sweeprolog-insert-clause functor
+  (- arity (if (string= neck "-->") 2 0))
+  neck)
 t))
 
 (defun sweeprolog-default-new-predicate-location (_pred)
@@ -2657,18 +2662,23 @@ of them signal success by returning non-nil."
 (defun sweeprolog-definition-at-point (&optional point)
   (save-excursion
 (wh

[elpa] externals/org 46c4335e44: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 46c4335e44f59e77d74c7f6ec432cf70ae2d35b0
Merge: 1d985406d8 225d58341b
Author: Bastien 
Commit: Bastien 

Merge branch 'bugfix'
---
 doc/org-manual.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 25e06fe2ae..667c2884db 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7482,7 +7482,7 @@ its location in the outline tree, but behaves in the 
following way:
   #+vindex: org-cycle-open-archived-trees
   It does not open when you attempt to do so with a visibility cycling
   command (see [[*Visibility Cycling]]).  You can force cycling archived
-  subtrees with {{{kbd(C-TAB)}}}, or by setting the option
+  subtrees with {{{kbd(C-c C-TAB)}}}, or by setting the option
   ~org-cycle-open-archived-trees~.  Also normal outline commands, like
   ~org-show-all~, open archived subtrees.
 

[elpa] externals/org updated (1d985406d8 -> 46c4335e44)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  1d985406d8 Revert "ob-core: Do not limit table size in babel output"
   new  225d58341b doc/org-manual.org: Fix keybinding
   new  46c4335e44 Merge branch 'bugfix'


Summary of changes:
 doc/org-manual.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[elpa] externals-release/org 225d58341b: doc/org-manual.org: Fix keybinding

[ELPA Syncer]

branch: externals-release/org
commit 225d58341b4601b0bb90cd6722c323b5ec38ed8b
Author: Giovanni Ridolfi 
Commit: Bastien 

doc/org-manual.org: Fix keybinding

* doc/org-manual.org (Internal archiving): Fix keybinding.

TINYCHANGE
---
 doc/org-manual.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 7e2bd1e8f9..dc0d6010be 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7360,7 +7360,7 @@ its location in the outline tree, but behaves in the 
following way:
   #+vindex: org-cycle-open-archived-trees
   It does not open when you attempt to do so with a visibility cycling
   command (see [[*Visibility Cycling]]).  You can force cycling archived
-  subtrees with {{{kbd(C-TAB)}}}, or by setting the option
+  subtrees with {{{kbd(C-c C-TAB)}}}, or by setting the option
   ~org-cycle-open-archived-trees~.  Also normal outline commands, like
   ~outline-show-all~, open archived subtrees.
 

[elpa] externals/org 62e1513b5a: ox-html: Update from MathJax 2 to MathJax 3+

[ELPA Syncer]

branch: externals/org
commit 62e1513b5aa32d04ce1e7229e676093f55388ecd
Author: Rudolf Adamkovič 
Commit: Ihor Radchenko 

ox-html: Update from MathJax 2 to MathJax 3+

* lisp/ox-html.el (
org-html-mathjax-options,
org-html-mathjax-template,
org-html--build-mathjax-config
): Update from MathJax 2 to 3 while maintaining compatibility.  All
legacy options should continue to work, except for the 'path' option
which must now point to MathJax 3 or later.
* testing/lisp/test-ox-html.el (
ox-html/mathjax-path-none,
ox-html/mathjax-path-default,
ox-html/mathjax-path-custom,
ox-html/mathjax-path-in-buffer,
ox-html/mathjax-options-default,
ox-html/mathjax-options-custom,
ox-html/mathjax-options-in-buffer,
ox-html/mathjax-legacy-scale-default,
ox-html/mathjax-legacy-scale-custom,
ox-html/mathjax-legacy-scale-in-buffer,
ox-html/mathjax-legacy-scale-message,
ox-html/mathjax-legacy-scale-message-in-buffer,
ox-html/mathjax-legacy-scale-ignore,
ox-html/mathjax-legacy-autonumber-ams,
ox-html/mathjax-legacy-autonumber-ams-in-buffer,
ox-html/mathjax-legacy-autonumber-none,
ox-html/mathjax-legacy-autonumber-none-in-buffer,
ox-html/mathjax-legacy-autonumber-all,
ox-html/mathjax-legacy-autonumber-all-in-buffer,
ox-html/mathjax-legacy-autonumber-message,
ox-html/mathjax-legacy-autonumber-message-in-buffer,
ox-html/mathjax-legacy-font-tex,
ox-html/mathjax-legacy-font-tex-in-buffer,
ox-html/mathjax-legacy-font-stix-web,
ox-html/mathjax-legacy-font-stix-web-in-buffer,
ox-html/mathjax-legacy-font-asana-math,
ox-html/mathjax-legacy-font-asana-math-in-buffer,
ox-html/mathjax-legacy-font-neo-euler,
ox-html/mathjax-legacy-font-neo-euler-in-buffer,
ox-html/mathjax-legacy-font-gyre-pagella,
ox-html/mathjax-legacy-font-gyre-pagella-in-buffer,
ox-html/mathjax-legacy-font-gyre-termes,
ox-html/mathjax-legacy-font-gyre-termes-in-buffer,
ox-html/mathjax-legacy-font-latin-modern,
ox-html/mathjax-legacy-font-latin-modern-in-buffer,
ox-html/mathjax-legacy-line-breaks-true,
ox-html/mathjax-legacy-line-breaks-true-in-buffer,
ox-html/mathjax-legacy-line-breaks-false,
ox-html/mathjax-legacy-line-breaks-false-in-buffer,
ox-html/mathjax-legacy-line-breaks-message,
ox-html/mathjax-legacy-line-breaks-message-in-buffer): Test MathJax in
general and also the conversion of legacy options from MathJax 2 to 3.
* testing/org-test.el (org-test-capture-messages): Add a new macro
useful for testing the messages put in the echo area.
* etc/ORG-NEWS: Document MathJax 2 to 3 upgrade, highlighting the
benefits of the new version but also mentioning the fact that the user
may need to update the `path' option in `org-html-mathjax-options'.
* doc/org-manual.org (Math formatting in HTML export): Update the link
to the MathJax CDN and the example of how to use `+HTML_MATHJAX' with
MathJax 3.  Also, remove the note on MathJax extensions, as they did
not work (and do not work) as documented.

Link: https://list.orgmode.org/orgmode/m2a667n4ax@me.com/
---
 doc/org-manual.org   |  20 +-
 etc/ORG-NEWS |  38 ++
 lisp/ox-html.el  | 257 ++
 testing/lisp/test-ox-html.el | 818 +++
 testing/org-test.el  |  11 +
 5 files changed, 1063 insertions(+), 81 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 667c2884db..a1c648b61a 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -13231,24 +13231,20 @@ as-is.
 LaTeX math snippets (see [[*LaTeX fragments]]) can be displayed in two
 different ways on HTML pages.  The default is to use the
 [[https://www.mathjax.org][MathJax]], which should work out of the box
-with Org[fn:: By default Org loads MathJax from
-[[https://cdnjs.com][cdnjs.com]] as recommended by
-[[https://www.mathjax.org][MathJax]].][fn:46].  Some MathJax display
-options can be configured via ~org-html-mathjax-options~, or in the
-buffer.  For example, with the following settings,
+with Org[fn:: By default, Org loads MathJax from
+[[https://www.jsdelivr.com/][jsDelivr]], as recommended in
+[[https://docs.mathjax.org/en/latest/web/start.html][Getting Started
+with MathJax Components]].][fn:46].  Some MathJax display options can
+be configured via ~org-html-mathjax-options~, or in the buffer.  For
+example, with the following settings,
 
 #+begin_example
-,#+HTML_MATHJAX: align: left indent: 5em tagside: left font: Neo-Euler
-,#+HTML_MATHJAX: cancel.js noErrors.js
+,#+HTML_MATHJAX: align: left indent: 5em tagside: left
 #+end_example
 
 #+texinfo: @noindent
 equation labels are displayed on the left margin and equations are
-five em from the left margin.  In addition, it loads the two MathJax
-extensions =cancel.js= and =noErrors.js=[fn:: See
-[[https://docs.mathjax.org/en/latest/input/tex/extensions.html#

[elpa] externals/denote updated (e20511b0fe -> 69824125b9)

[ELPA Syncer]

elpasync pushed a change to branch externals/denote.

  from  e20511b0fe Update manual on Org Dynamic blocks
   new  5af62d948b Add link to new publication by Jeremy Friesen
   new  69824125b9 Use consistent style for references to publications


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

[elpa] externals/denote 69824125b9 2/2: Use consistent style for references to publications

[ELPA Syncer]

branch: externals/denote
commit 69824125b9f66d39fccd7c059af6aacafa1221a7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Use consistent style for references to publications
---
 README.org | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index d195fd1391..e74606992f 100644
--- a/README.org
+++ b/README.org
@@ -3108,26 +3108,26 @@ includes publications that show how people configure 
their note-taking
 setup.  If you have a blog post, video, or configuration file about
 Denote, feel welcome to tell us about it 
([[#h:1ebe4865-c001-4747-a6f2-0fe45aad71cd][Contributing]]).
 
-+ David Wilson (SystemCrafters), /Generating a Blog Site from Denote
++ David Wilson (SystemCrafters): /Generating a Blog Site from Denote
   Entries/, 2022-09-09, .
 
-+ David Wilson (SystemCrafters), /Trying Out Prot's Denote, an Org
++ David Wilson (SystemCrafters): /Trying Out Prot's Denote, an Org
   Roam Alternative?/, 2022-07-15, 
.
 
-+ Jeremy Friesen, /Denote Emacs Configuration/, 2022-10-02,
++ Jeremy Friesen: /Denote Emacs Configuration/, 2022-10-02,
   
 
-+ Jeremy Friesen, /Exploring the Denote Emacs Package/, 2022-10-01,
++ Jeremy Friesen: /Exploring the Denote Emacs Package/, 2022-10-01,
   
 
-+ Jeremy Friesen, /Migration Plan for Org-Roam Notes to Denote/,
++ Jeremy Friesen: /Migration Plan for Org-Roam Notes to Denote/,
   2022-10-02, 

 
 + Jeremy Friesen: /Project Dispatch Menu with Org Mode Metadata,
   Denote, and Transient/, 2022-11-19,
   

 
-+ Peter Prevos, /Simulating Text Files with R to Test the Emacs Denote
++ Peter Prevos: /Simulating Text Files with R to Test the Emacs Denote
   Package/, 2022-07-28, 
.
 
 * Alternatives to Denote

[elpa] externals/denote 5af62d948b 1/2: Add link to new publication by Jeremy Friesen

[ELPA Syncer]

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

Add link to new publication by Jeremy Friesen

Read the discussion on the mailing list:

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

diff --git a/README.org b/README.org
index da2d9d6ab4..d195fd1391 100644
--- a/README.org
+++ b/README.org
@@ -3123,6 +3123,10 @@ Denote, feel welcome to tell us about it 
([[#h:1ebe4865-c001-4747-a6f2-0fe45aad7
 + Jeremy Friesen, /Migration Plan for Org-Roam Notes to Denote/,
   2022-10-02, 

 
++ Jeremy Friesen: /Project Dispatch Menu with Org Mode Metadata,
+  Denote, and Transient/, 2022-11-19,
+  

+
 + Peter Prevos, /Simulating Text Files with R to Test the Emacs Denote
   Package/, 2022-07-28, 
.
 

[elpa] externals/ef-themes f7e85a4812: Expand deftheme with appropriate data

[ELPA Syncer]

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

Expand deftheme with appropriate data

This is for Emacs 29.  I tested it on Emacs 27 and there is no problem
with it.
---
 ef-autumn-theme.el | 6 +-
 ef-bio-theme.el| 6 +-
 ef-cherie-theme.el | 6 +-
 ef-cyprus-theme.el | 6 +-
 ef-dark-theme.el   | 6 +-
 ef-day-theme.el| 6 +-
 ef-deuteranopia-dark-theme.el  | 6 +-
 ef-deuteranopia-light-theme.el | 6 +-
 ef-duo-dark-theme.el   | 6 +-
 ef-duo-light-theme.el  | 6 +-
 ef-frost-theme.el  | 6 +-
 ef-light-theme.el  | 6 +-
 ef-night-theme.el  | 6 +-
 ef-spring-theme.el | 6 +-
 ef-summer-theme.el | 6 +-
 ef-trio-dark-theme.el  | 6 +-
 ef-trio-light-theme.el | 6 +-
 ef-tritanopia-dark-theme.el| 6 +-
 ef-tritanopia-light-theme.el   | 6 +-
 ef-winter-theme.el | 6 +-
 20 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 8c8b88a60a..6c006014b5 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-autumn "Legible dark theme with warm, varied colors (red, 
yellow, green, teal).")
+  (deftheme ef-autumn
+"Legible dark theme with warm, varied colors (red, yellow, green, teal)."
+:background-mode 'dark
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-autumn-palette
 '(;; Basic tones
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index e172d1da70..9824946bdd 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-bio "Legible dark theme with green, teal, blue, purple colors.")
+  (deftheme ef-bio
+"Legible dark theme with green, teal, blue, purple colors."
+:background-mode 'dark
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-bio-palette
 '(;; Basic tones
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index dcc3198f0c..def64cb00d 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-cherie "Legible dark theme with warm colors (mostly pink, 
magenta, gold)")
+  (deftheme ef-cherie
+"Legible dark theme with warm colors (mostly pink, magenta, gold)"
+:background-mode 'dark
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-cherie-palette
 '(;; Basic tones
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index 83d9aaaf39..815a85d1a1 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-cyprus "Legible light theme with green, yellow, teal, red 
colors.")
+  (deftheme ef-cyprus
+"Legible light theme with green, yellow, teal, red colors."
+:background-mode 'light
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-cyprus-palette
 '(;; Basic tones
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index 0775bc112c..9646f53ed2 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-dark "Legible dark theme with blue, magenta, cyan, purple 
colors.")
+  (deftheme ef-dark
+"Legible dark theme with blue, magenta, cyan, purple colors."
+:background-mode 'dark
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-dark-palette
 '(;; Basic tones
diff --git a/ef-day-theme.el b/ef-day-theme.el
index 50f8d0f9a9..962ee85e7e 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -37,7 +37,11 @@
 (eval-and-compile
   (require 'ef-themes)
 
-  (deftheme ef-day "Legible light theme with warm, varied colors (yellow, red, 
green, purple).")
+  (deftheme ef-day
+"Legible light theme with warm, varied colors (yellow, red, green, 
purple)."
+:background-mode 'light
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-day-palette
 '(;; Basic tones
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 8ec026978b..30a7381435 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -40,7 +40,11 @@
   ;; Most of the colors here, like the red and green hues, are defined
   ;; simply to preserve compatibility with the rest of the project.  We
   ;; don't actually rely on them for anything critical.
-  (deftheme ef-deuteranopia-dark "Legible dark theme, optimized for red-green 
color deficiency.")
+  (deftheme ef-deuteranopia-dark
+"Legible dark theme, optimized for red-green color deficiency."
+:background-mode 'dark
+:kind 'color-scheme
+:family 'ef)
 
   (defconst ef-deuteranopia-dark-palette
 '(;; Basic tones
diff --git a/ef-deuteranopia

[elpa] externals/org aed55381bd 5/5: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit aed55381bde797a3cabb27c5f47ad5bcd70c7ffe
Merge: 62e1513b5a 257df88645
Author: Kyle Meyer 
Commit: Kyle Meyer 

Merge branch 'km/from-emacs-master'
---
 doc/org-manual.org | 2 +-
 etc/ORG-NEWS   | 8 
 lisp/ol.el | 2 +-
 lisp/org-faces.el  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index a1c648b61a..4f877d3715 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -17021,7 +17021,7 @@ identifying a reference in the bibliography.
 
 - Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
   a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or 
necessary
-  fo the comprehension of the citation but not included in the
+  for the comprehension of the citation but not included in the
   reference.
 
 - A single citation can cite more than one reference ; the keys are
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index c03bbb76ec..1f79f8ae59 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -3539,7 +3539,7 @@ can pass the converted path to the =sqlcmd= tool.
 
  Improved support of header arguments for postgresql
 
-The postgresql engine in a sql code block supports now ~:dbport~ nd
+The postgresql engine in a sql code block now supports ~:dbport~ and
 ~:dbpassword~ as header arguments.
 
  Support for additional plantuml output formats
@@ -6455,7 +6455,7 @@ that Calc formulas can operate on them.
  org-ctags.el (Paul Sexton)
 
  Targets like =<>= can now be found by Emacs' etag
- functionality, and Org-mode links can be used to to link to
+ functionality, and Org-mode links can be used to link to
  etags, also in non-Org-mode files.  For details, see the file
  /org-ctags.el/.
 
@@ -6812,7 +6812,7 @@ that Calc formulas can operate on them.
 code that is actually evaluated comprises the code block contents,
 augmented with the extra code which assigns the referenced data to
 variables. It is now possible to preview expanded contents, and
-also to expand code during during tangling. This expansion takes
+also to expand code during tangling. This expansion takes
 into account all header arguments, and variables.
 
 A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
@@ -6927,7 +6927,7 @@ that Calc formulas can operate on them.
 
  Localized clock tables
 
- Clock tables now support a new new =:lang= parameter, allowing
+ Clock tables now support a new =:lang= parameter, allowing
  the user to customize the localization of the table headers.  See
  the variable =org-clock-clocktable-language-setup= which controls
  available translated strings.
diff --git a/lisp/ol.el b/lisp/ol.el
index 20169691b3..0b4457b003 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -357,7 +357,7 @@ another window."
 (defcustom org-link-search-must-match-exact-headline 'query-to-create
   "Non-nil means internal fuzzy links can only match headlines.
 
-When nil, the a fuzzy link may point to a target or a named
+When nil, the fuzzy link may point to a target or a named
 construct in the document.  When set to the special value
 `query-to-create', offer to create a new headline when none
 matched.
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index afc8c609e5..0effa13a1d 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -140,7 +140,7 @@ The following faces apply, with this priority.
 
 Since column view works by putting overlays with a display property
 over individual characters in the buffer, the face of the underlining
-character (this might for example be the a TODO keyword) might still
+character (this might for example be the TODO keyword) might still
 shine through in some properties.  So when your column view looks
 funny, with \"random\" colors, weight, strike-through, try to explicitly
 set the properties in the `org-column' face.  For example, set

[elpa] externals/org 3d76d2ffbf 2/5: Backport commit 93036209f from Emacs

[ELPA Syncer]

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

Backport commit 93036209f from Emacs

; Fix typos (duplicate words)
93036209fae87dc620b27b2ce2e0146e6252113c
Stefan Kangas
Thu Nov 17 09:34:24 2022 +0100
---
 etc/ORG-NEWS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 3c164b1282..9df9a4b652 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5763,7 +5763,7 @@ that Calc formulas can operate on them.
  org-ctags.el (Paul Sexton)
 
  Targets like =<>= can now be found by Emacs' etag
- functionality, and Org-mode links can be used to to link to
+ functionality, and Org-mode links can be used to link to
  etags, also in non-Org-mode files.  For details, see the file
  /org-ctags.el/.
 
@@ -6120,7 +6120,7 @@ that Calc formulas can operate on them.
 code that is actually evaluated comprises the code block contents,
 augmented with the extra code which assigns the referenced data to
 variables. It is now possible to preview expanded contents, and
-also to expand code during during tangling. This expansion takes
+also to expand code during tangling. This expansion takes
 into account all header arguments, and variables.
 
 A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
@@ -6235,7 +6235,7 @@ that Calc formulas can operate on them.
 
  Localized clock tables
 
- Clock tables now support a new new =:lang= parameter, allowing
+ Clock tables now support a new =:lang= parameter, allowing
  the user to customize the localization of the table headers.  See
  the variable =org-clock-clocktable-language-setup= which controls
  available translated strings.

[elpa] externals/org c53d752e61 1/5: Backport commit 623db40dd from Emacs

[ELPA Syncer]

branch: externals/org
commit c53d752e614e4ec40661f9e8f671343eb180ff22
Author: Juanma Barranquero 
Commit: Kyle Meyer 

Backport commit 623db40dd from Emacs

* lisp/ol.el (org-link-search-must-match-exact-headline):
* lisp/org-faces.el (org-column): Fix typos in docstrings.

; * lisp/*.el: Fix typos in docstrings
623db40dd1cd21623c5cecdc0abbf3ce885f92b1
Juanma Barranquero
Thu Nov 17 08:48:02 2022 +0100
---
 lisp/ol.el| 2 +-
 lisp/org-faces.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 4ad1f6d345..108f031cde 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -339,7 +339,7 @@ another window."
 (defcustom org-link-search-must-match-exact-headline 'query-to-create
   "Non-nil means internal fuzzy links can only match headlines.
 
-When nil, the a fuzzy link may point to a target or a named
+When nil, the fuzzy link may point to a target or a named
 construct in the document.  When set to the special value
 `query-to-create', offer to create a new headline when none
 matched.
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index d96898372f..78148a1b6d 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -137,7 +137,7 @@ The following faces apply, with this priority.
 
 Since column view works by putting overlays with a display property
 over individual characters in the buffer, the face of the underlining
-character (this might for example be the a TODO keyword) might still
+character (this might for example be the TODO keyword) might still
 shine through in some properties.  So when your column view looks
 funny, with \"random\" colors, weight, strike-through, try to explicitly
 set the properties in the `org-column' face.  For example, set

[elpa] externals/org 257df88645 4/5: Backport commit 16318bfb5 from Emacs

[ELPA Syncer]

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

Backport commit 16318bfb5 from Emacs

; Fix typos
16318bfb518aa7bc06e502e6fad7e53ec91067f9
Stefan Kangas
Sun Nov 20 12:59:39 2022 +0100
---
 doc/org-manual.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 617919fdfe..96bf4a92ab 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -16569,7 +16569,7 @@ identifying a reference in the bibliography.
 
 - Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
   a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or 
necessary
-  fo the comprehension of the citation but not included in the
+  for the comprehension of the citation but not included in the
   reference.
 
 - A single citation can cite more than one reference ; the keys are

[elpa] externals/org 2e0fcc14e2 3/5: Backport commit ba485eb94 from Emacs

[ELPA Syncer]

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

Backport commit ba485eb94 from Emacs

; Fix typos
ba485eb949ddec53b1d7b5d78f3fcfbe2be60d7d
Stefan Kangas
Fri Nov 18 16:02:19 2022 +0100
---
 etc/ORG-NEWS  | 2 +-
 lisp/ob-tangle.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 9df9a4b652..3b6ab2e2ad 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -2847,7 +2847,7 @@ can pass the converted path to the =sqlcmd= tool.
 
  Improved support of header arguments for postgresql
 
-The postgresql engine in a sql code block supports now ~:dbport~ nd
+The postgresql engine in a sql code block now supports ~:dbport~ and
 ~:dbpassword~ as header arguments.
 
  Support for additional plantuml output formats
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 525d27bc07..d9814a7aa6 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -433,7 +433,7 @@ non-nil, return the full association list to be used by
   ;; The created link is transient.  Using ID is
   ;; not necessary, but could have side-effects if
   ;; used.  An ID property may be added to
-  ;; existing entries thus creatin unexpected file
+  ;; existing entries thus creating unexpected file
   ;; modifications.
   (org-id-link-to-org-use-id nil)
   (l (org-no-properties (org-store-link nil
@@ -525,7 +525,7 @@ by `org-babel-get-src-block-info'."
("link" . ,(let (;; The created link is transient.  
Using ID is
  ;; not necessary, but could have 
side-effects if
  ;; used.  An ID property may be added 
to
- ;; existing entries thus creatin 
unexpected file
+ ;; existing entries thus creating 
unexpected file
  ;; modifications.
  (org-id-link-to-org-use-id nil))
  (org-no-properties (org-store-link nil

[elpa] externals/org updated (62e1513b5a -> aed55381bd)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  62e1513b5a ox-html: Update from MathJax 2 to MathJax 3+
   new  c53d752e61 Backport commit 623db40dd from Emacs
   new  3d76d2ffbf Backport commit 93036209f from Emacs
   new  2e0fcc14e2 Backport commit ba485eb94 from Emacs
   new  257df88645 Backport commit 16318bfb5 from Emacs
   new  aed55381bd Merge branch 'km/from-emacs-master'


Summary of changes:
 doc/org-manual.org | 2 +-
 etc/ORG-NEWS   | 8 
 lisp/ol.el | 2 +-
 lisp/org-faces.el  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

[elpa] externals/eev 1cdfd41fbc: Small fixes.

[ELPA Syncer]

branch: externals/eev
commit 1cdfd41fbc320205f1ad820bdb60dcdec7b2cb51
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Small fixes.
---
 ChangeLog |  5 +
 VERSION   |  4 ++--
 eev-hydras.el |  8 
 eev-intro.el  | 22 +-
 eev-kla.el| 12 ++--
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50194c617b..e136cfae5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-21  Eduardo Ochs  
+
+   * eev-kla.el (ee-kl-sexp-kla, ee-kl-sexp-klas, ee-kl-sexp-klf):
+   fixed the missing ":fname" arguments.
+
 2022-11-20  Eduardo Ochs  
 
* eev-hydras.el (eev-index-edit): renamed to `ee-edit-index'.
diff --git a/VERSION b/VERSION
index 0cb121e4cd..9a6bb527f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sun Nov 20 18:26:26 GMT 2022
-Sun Nov 20 15:26:26 -03 2022
+Mon Nov 21 05:36:44 GMT 2022
+Mon Nov 21 02:36:44 -03 2022
diff --git a/eev-hydras.el b/eev-hydras.el
index 479d018ad6..ff33385d6e 100644
--- a/eev-hydras.el
+++ b/eev-hydras.el
@@ -128,8 +128,10 @@ Use `_,_'s and `_._'s between the `_i_' and the `_0_' to 
adjust the `(to ...)'.\
   ("q" nil)
   ;;
   ;; Reindent:
-  ("," (ee-edit-index-replace "\t(to "   "(to "))
-  ("." (ee-edit-index-replace   "(to " "\t(to "))
+  ("" (eek ""))
+  (""   (eek ""))
+  (","   (ee-edit-index-replace "\t(to "   "(to "))
+  ("."   (ee-edit-index-replace   "(to " "\t(to "))
   ;;
   ;; Next anchor and previous anchor:
   ("n" (re-search-forward  (ee-tag-re)))
@@ -137,8 +139,6 @@ Use `_,_'s and `_._'s between the `_i_' and the `_0_' to 
adjust the `(to ...)'.\
   ("j" (re-search-forward  (ee-tag-re)))
   ;;
   ;; Other keys:
-  ("" (eek ""))
-  (""   (eek ""))
   ("<"  (eek "M-<"))
   ("M-<"(eek "M-<"))
   ("1"  (eek "C-x 1"))
diff --git a/eev-intro.el b/eev-intro.el
index ae13e173b3..761e43cd5a 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -1470,6 +1470,11 @@ beginning of the file, as explained here:
 
   (find-escripts-intro)
 
+Another way of moving the index line to the index section is
+described here:
+
+  (find-edit-index-intro)
+
 
 
 
@@ -3722,7 +3727,8 @@ This was split from:
 Pre-requisites:
   (find-here-links-intro)
   (find-refining-intro)
-
+See also:
+  (find-kla-intro)
 
 
 
@@ -14829,6 +14835,20 @@ The keyword arguments for `cl-defun' are explained 
here:
   (find-clnode \"Argument Lists\" \"&key ((KEYWORD VAR) INITFORM SVAR)\")
   (find-clnode \"Argument Lists\" \"&key c d (e 17)\")
 
+Some functions in eev-kla.el use a trick to make nil arguments be
+ignored. For example, try:
+
+  ;; «aaa»
+  (ee-kl-sexp-klt)
+  (ee-kl-sexp-klt :anchor nil)
+  (ee-kl-sexp-klt :anchor \"bbb\")
+
+The source code for `ee-kl-sexp-klt' is here:
+
+  (find-eev \"eev-kla.el\" \"generate-sexps\")
+  (find-eev \"eev-kla.el\" \"generate-sexps\" \"ee-kl-sexp-klt\")
+
+
 
 
 7. The default `c', `d', and `r'
diff --git a/eev-kla.el b/eev-kla.el
index dcd7c27ba1..d17da91c7d 100644
--- a/eev-kla.el
+++ b/eev-kla.el
@@ -447,8 +447,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's, 
return nil."
 (cl-defun ee-kl-sexp-kla (&key fname c r anchor)
   "ill ink to nchor - make sexp."
   (setq fname  (or fname  (ee-kl-fname))
-   c  (or c  (ee-kl-c))
-   r  (or r  (ee-kl-r))
+   c  (or c  (ee-kl-c :fname fname))
+   r  (or r  (ee-kl-r :fname fname))
anchor (or anchor (ee-kl-anchor)))
   (list (ee-kl-find-c   :fname fname :c c)
(ee-kl-shorterfname :fname fname :c c :r r)
@@ -457,8 +457,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's, 
return nil."
 (cl-defun ee-kl-sexp-klas (&key fname c r anchor region)
   "ill ink to nchor and tring - make sexp."
   (setq fname  (or fname  (ee-kl-fname))
-   c  (or c  (ee-kl-c))
-   r  (or r  (ee-kl-r))
+   c  (or c  (ee-kl-c :fname fname))
+   r  (or r  (ee-kl-r :fname fname))
anchor (or anchor (ee-kl-anchor))
region (or region (ee-kl-region)))
   (list (ee-kl-find-c   :fname fname :c c)
@@ -469,8 +469,8 @@ If (ee-kl-lrcds FNAME) doesn't return any matching `lrcd's, 
return nil."
 (cl-defun ee-kl-sexp-klf (&key fname c r)
   "ill ink to ile - make sexp."
   (setq fname (or fname (ee-kl-fname))
-   c (or c (ee-kl-c))
-   r (or r (ee-kl-r)))
+   c (or c (ee-kl-c :fname fname))
+   r (or r (ee-kl-r :fname fname)))
   (list (ee-kl-find-cfile :fname fname :c c)
(ee-kl-shortfname :fname fname :c c :r r)))