[elpa] externals/expreg f6f6abcd00 2/2: ; * expreg.el: Bump version.

[ELPA Syncer]

branch: externals/expreg
commit f6f6abcd00960d0b8bb7cc96f9706036ed1956c9
Author: Yuan Fu 
Commit: Yuan Fu 

; * expreg.el: Bump version.
---
 expreg.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expreg.el b/expreg.el
index 5a0fb8cada..e244270134 100644
--- a/expreg.el
+++ b/expreg.el
@@ -5,7 +5,7 @@
 ;; Author: Yuan Fu 
 ;; Maintainer: Yuan Fu 
 ;; URL: https://github.com/casouri/expreg
-;; Version: 1.1.0
+;; Version: 1.2.0
 ;; Keywords: text, editing
 ;; Package-Requires: ((emacs "29.1"))
 ;;

[elpa] externals/expreg 9e6a3289e6 1/2: Make paragraph expander more flexible (bug#65591)

[ELPA Syncer]

branch: externals/expreg
commit 9e6a3289e638fcc9acf30c34063b2dc1fc546293
Author: Yuan Fu 
Commit: Yuan Fu 

Make paragraph expander more flexible (bug#65591)

* expreg.el (expreg-functions): Rename expreg--paragraph
(expreg--paragraph): Rename to expreg--paragraph-defun, and allow
defun and paragraph expansion to coexist.
---
 expreg.el | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/expreg.el b/expreg.el
index eaec3d53f9..5a0fb8cada 100644
--- a/expreg.el
+++ b/expreg.el
@@ -90,7 +90,7 @@
 
 (defvar-local expreg-functions
 '( expreg--subword expreg--word expreg--list expreg--string
-   expreg--treesit expreg--comment expreg--paragraph)
+   expreg--treesit expreg--comment expreg--paragraph-defun)
   "A list of expansion functions.
 
 Each function is called with no arguments and should return a
@@ -611,16 +611,13 @@ current string/comment and get lists inside."
   (setq beg (point))
   `((sentence . ,(cons beg end))
 
-(defun expreg--paragraph ()
+(defun expreg--paragraph-defun ()
   "Return a list of regions containing paragraphs or defuns."
   (condition-case nil
   (let ((orig (point))
 beg end result)
-(cond
- ;; Using defun.
- ((or (derived-mode-p 'prog-mode)
-  beginning-of-defun-function)
 
+(when beginning-of-defun-function
   (when (beginning-of-defun)
 (setq beg (point))
 (end-of-defun)
@@ -630,16 +627,14 @@ current string/comment and get lists inside."
 (unless (eq orig end)
   (push `(paragraph-defun . ,(cons beg end)) result
 
- ;; Use paragraph.
- ((or (derived-mode-p 'text-mode)
-  (eq major-mode 'fundamental-mode))
-
+(when (or (derived-mode-p 'text-mode)
+  (eq major-mode 'fundamental-mode))
   (backward-paragraph)
   (skip-syntax-forward "-")
   (setq beg (point))
   (forward-paragraph)
   (setq end (point))
-  (push `(paragraph . ,(cons beg end)) result)))
+  (push `(paragraph . ,(cons beg end)) result))
 
 result)
 (scan-error nil)))

[elpa] externals/expreg updated (4fc82bbaaf -> f6f6abcd00)

[ELPA Syncer]

elpasync pushed a change to branch externals/expreg.

  from  4fc82bbaaf ; * expreg.el: Bump version.
   new  9e6a3289e6 Make paragraph expander more flexible (bug#65591)
   new  f6f6abcd00 ; * expreg.el: Bump version.


Summary of changes:
 expreg.el | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

[elpa] externals/org d8af9c40e0: org-babel-remove-result-one-or-many: Document the prefix argument

[ELPA Syncer]

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

org-babel-remove-result-one-or-many: Document the prefix argument

* lisp/ob-core.el (org-babel-remove-result-one-or-many): Rename prefix
argument to the conventional ARG and document it in the docstring.
---
 lisp/ob-core.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 08d6e00457..ae221c5467 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2739,12 +2739,12 @@ Leading white space is trimmed."
   (skip-chars-backward " \t\n")
   (point)
 
-(defun org-babel-remove-result-one-or-many (x)
+(defun org-babel-remove-result-one-or-many (arg)
   "Remove the result of the current source block.
-If called with a prefix argument, remove all result blocks
-in the buffer."
+If called with prefix argument ARG, remove all result blocks in the
+buffer."
   (interactive "P")
-  (if x
+  (if arg
   (org-babel-map-src-blocks nil (org-babel-remove-result))
 (org-babel-remove-result)))
 

[elpa] externals/tramp 382733d641: Tramp ELPA version 2.6.1.2 released

[ELPA Syncer]

branch: externals/tramp
commit 382733d64116368ad50e6fbdb848357e9ce1c72d
Author: Michael Albinus 
Commit: Michael Albinus 

Tramp ELPA version 2.6.1.2 released
---
 README  |  6 +++---
 test/tramp-tests.el |  1 +
 texi/trampver.texi  |  2 +-
 tramp-adb.el|  2 ++
 tramp-sh.el | 26 +++---
 tramp-smb.el|  2 ++
 tramp-sshfs.el  |  4 +++-
 tramp.el| 36 
 trampver.el |  6 +++---
 9 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/README b/README
index 1e7331ec56..ae059c78fa 100644
--- a/README
+++ b/README
@@ -22,11 +22,11 @@ installed with, you must recompile the package:
 
• Remove all byte-compiled Tramp files
 
-  $ rm -f ~/.emacs.d/elpa/tramp-2.6.1.1a/tramp*.elc
+  $ rm -f ~/.emacs.d/elpa/tramp-2.6.1.2/tramp*.elc
 
• Start Emacs with Tramp’s source files
 
-  $ emacs -L ~/.emacs.d/elpa/tramp-2.6.1.1a -l tramp
+  $ emacs -L ~/.emacs.d/elpa/tramp-2.6.1.2 -l tramp
 
  This should not give you the error.
 
@@ -40,7 +40,7 @@ Mitigation of a bug in Emacs 29.1
 *
 
 Due to a bug in Emacs 29.1, you must apply the following change prior
-installation or upgrading Tramp 2.6.1.1a from GNU ELPA:
+installation or upgrading Tramp 2.6.1.2 from GNU ELPA:
 
  (when (string-equal emacs-version "29.1")
(with-current-buffer
diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index c090fec8b2..6021eda8df 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -7404,6 +7404,7 @@ This requires restrictions of file name syntax."
   (skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 245s
   (skip-unless (not (tramp--test-rsync-p)))
   (skip-unless (not (tramp--test-rclone-p)))
+  (skip-unless (not (or (eq system-type 'darwin) (tramp--test-macos-p
 
   ;; Newlines, slashes and backslashes in file names are not
   ;; supported.  So we don't test.  And we don't test the tab
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 7070e2c23a..389afe27d0 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -7,7 +7,7 @@
 
 @c In the  Tramp GIT, the version number and the bug report address
 @c are auto-frobbed from configure.ac.
-@set trampver 2.6.1.1a
+@set trampver 2.6.1.2
 @set trampurl https://www.gnu.org/software/tramp/
 @set tramp-bug-report-address tramp-devel@@gnu.org
 @set emacsver 26.1
diff --git a/tramp-adb.el b/tramp-adb.el
index 58c9324533..f16c97a235 100644
--- a/tramp-adb.el
+++ b/tramp-adb.el
@@ -552,6 +552,8 @@ Emacs dired can't find files."
  (set-file-modes tmpfile (logior (or (file-modes tmpfile) 0) #o0600)))
(let (create-lockfiles)
   (write-region start end tmpfile append 'no-message))
+   ;; Now, `last-coding-system-used' has the right value.  Remember it.
+   (setq coding-system-used last-coding-system-used)
(with-tramp-progress-reporter
v 3 (format-message
 "Moving tmp file `%s' to `%s'" tmpfile filename)
diff --git a/tramp-sh.el b/tramp-sh.el
index 9895af9250..5a1e73aab2 100644
--- a/tramp-sh.el
+++ b/tramp-sh.el
@@ -2825,7 +2825,8 @@ the result will be a local, non-Tramp, file name."
 (with-parsed-tramp-file-name name nil
   ;; If connection is not established yet, run the real handler.
   (if (not (tramp-connectable-p v))
- (tramp-run-real-handler #'expand-file-name (list name))
+ (tramp-drop-volume-letter
+  (tramp-run-real-handler #'expand-file-name (list name)))
(unless (tramp-run-real-handler #'file-name-absolute-p (list localname))
  (setq localname (concat "~/" localname)))
;; Tilde expansion if necessary.  This needs a shell which
@@ -3446,15 +3447,6 @@ implementation will be used."
 
(let* ((modes (tramp-default-file-modes
   filename (and (eq mustbenew 'excl) 'nofollow)))
-  ;; We use this to save the value of
-  ;; `last-coding-system-used' after writing the tmp
-  ;; file.  At the end of the function, we set
-  ;; `last-coding-system-used' to this saved value.  This
-  ;; way, any intermediary coding systems used while
-  ;; talking to the remote shell or suchlike won't hose
-  ;; this variable.  This approach was snarfed from
-  ;; ange-ftp.el.
-  coding-system-used
   ;; Write region into a tmp file.  This isn't really
   ;; needed if we use an encoding function, but currently
   ;; we use it always because this makes the logic
@@ -3484,11 +3476,11 @@ implementation will be used."
  ((error quit)
   (setq tramp-temp-buffer-file-name nil)
   (delete-file tmpfile)
-  (signal (car err) (cdr err
+  (signal (car err) (cdr err)
 
-   ;; Now, `last-coding-system-used' has the right value.
-   

[nongnu] elpa/helm-core updated (cf685db090 -> 587bed0f73)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  cf685db090 Don't give properties to separators in affix fns
  adds  f34455d257 Add describe-* fns to *command-categories for emacs 27 
compatibility.
  adds  587bed0f73 Move helm-comint and helm-shell to emacs-helm

No new revisions were added by this update.

Summary of changes:
 helm-comint.el | 226 -
 helm-mode.el   |   4 +
 helm-shell.el  |  38 --
 3 files changed, 4 insertions(+), 264 deletions(-)
 delete mode 100644 helm-comint.el
 delete mode 100644 helm-shell.el

[nongnu] elpa/helm updated (cf685db090 -> 587bed0f73)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  cf685db090 Don't give properties to separators in affix fns
   new  f34455d257 Add describe-* fns to *command-categories for emacs 27 
compatibility.
   new  587bed0f73 Move helm-comint and helm-shell to emacs-helm


Summary of changes:
 helm-comint.el | 226 -
 helm-mode.el   |   4 +
 helm-shell.el  |  38 --
 3 files changed, 4 insertions(+), 264 deletions(-)
 delete mode 100644 helm-comint.el
 delete mode 100644 helm-shell.el

[nongnu] elpa/helm 587bed0f73 2/2: Move helm-comint and helm-shell to emacs-helm

[ELPA Syncer]

branch: elpa/helm
commit 587bed0f735c7955ab385a5fbc2660a61713eb29
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Move helm-comint and helm-shell to emacs-helm
---
 helm-comint.el | 226 -
 helm-shell.el  |  38 --
 2 files changed, 264 deletions(-)

diff --git a/helm-comint.el b/helm-comint.el
deleted file mode 100644
index ec5c1fc947..00
--- a/helm-comint.el
+++ /dev/null
@@ -1,226 +0,0 @@
-;;; helm-comint.el --- Comint prompt navigation for helm. -*- lexical-binding: 
t -*-
-
-;; Copyright (C) 2020 Pierre Neidhardt 
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see .
-
-;;; Commentary:
-;;
-;; You can bind this as follows in .emacs:
-;;
-;; (add-hook 'comint-mode-hook
-;;   (lambda ()
-;;   (define-key comint-mode-map (kbd "M-s f") 
'helm-comint-prompts-all)))
-
-;;; Code:
-(require 'cl-lib)
-(require 'helm)
-(require 'helm-lib)
-(require 'helm-help)
-(require 'helm-elisp)
-
-;;; Comint prompts
-;;
-(defface helm-comint-prompts-promptidx
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-   (:foreground "cyan")))
-  "Face used to highlight comint prompt index."
-  :group 'helm-comint-faces)
-
-(defface helm-comint-prompts-buffer-name
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-   (:foreground "green")))
-  "Face used to highlight comint buffer name."
-  :group 'helm-comint-faces)
-
-(defcustom helm-comint-prompts-promptidx-p t
-  "Show prompt number."
-  :group 'helm-comint
-  :type 'boolean)
-
-(defcustom helm-comint-mode-list '(comint-mode slime-repl-mode sly-mrepl-mode 
sql-interactive-mode)
-  "Supported modes for prompt navigation.
-Derived modes (e.g., Geiser's REPL) are automatically supported."
-  :group 'helm-comint
-  :type '(repeat (choice symbol)))
-
-(defcustom helm-comint-next-prompt-function '((sly-mrepl-mode . (lambda ()
-  
(sly-mrepl-next-prompt)
-  (point
-  "Alist of (MODE . NEXT-PROMPT-FUNCTION) to use.
- If the current major mode is a key in this list, the associated
- function will be used to navigate the prompts.
- The function must return the point after the prompt.
- Otherwise (comint-next-prompt 1) will be used."
-  :group 'helm-comint
-  :type '(alist :key-type symbol :value-type function))
-
-(defcustom helm-comint-max-offset 400
-  "Max number of chars displayed per candidate in comint-input-ring browser.
-When t, don't truncate candidate, show all.
-By default it is approximatively the number of bits contained in
-five lines of 80 chars each i.e 80*5.
-Note that if you set this to nil multiline will be disabled, i.e
-you will not have anymore separators between candidates."
-  :type '(choice (const :tag "Disabled" t)
-  (integer :tag "Max candidate offset"))
-  :group 'helm-misc)
-
-(defvar helm-comint-prompts-keymap
-  (let ((map (make-sparse-keymap)))
-(set-keymap-parent map helm-map)
-(define-key map (kbd "C-c o")   #'helm-comint-prompts-other-window)
-(define-key map (kbd "C-c C-o") #'helm-comint-prompts-other-frame)
-map)
-  "Keymap for `helm-comint-prompt-all'.")
-
-(defun helm-comint-prompts-list (mode &optional buffer)
-  "List the prompts in BUFFER in mode MODE.
-
-Return a list of (\"prompt\" (point) (buffer-name) prompt-index))
-E.g. (\"ls\" 162 \"*shell*\" 3).
-If BUFFER is nil, use current buffer."
-  (with-current-buffer (or buffer (current-buffer))
-(when (derived-mode-p mode)
-  (save-excursion
-(goto-char (point-min))
-(let (result (count 1))
-  (save-mark-and-excursion
-(helm-awhile (and (not (eobp))
-  (helm-aif (alist-get major-mode 
helm-comint-next-prompt-function)
-  (funcall it)
-(comint-next-prompt 1)))
-  (push (list (buffer-substring-no-properties
-   it (pos-eol))
-  it (buffer-name) count)
-result)
-  (setq count (1+ count
-  (nreverse result))
-
-(defun helm-comint-prompts-list-all (mode)
-  "List the prompts of all buffers in mode MODE.
-See `helm-comint-prompts-list'."
-  (cl-loop for b in (buffer-list)
-   append (helm-c

[nongnu] elpa/helm f34455d257 1/2: Add describe-* fns to *command-categories for emacs 27 compatibility.

[ELPA Syncer]

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

Add describe-* fns to *command-categories for emacs 27 compatibility.
---
 helm-mode.el | 4 
 1 file changed, 4 insertions(+)

diff --git a/helm-mode.el b/helm-mode.el
index 019420d50e..b17ea03c1e 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -1026,6 +1026,10 @@ behavior as emacs vanilla.")
 ("customize-set-variable" . symbol-help)
 ("customize-set-value" . symbol-help)
 ("customize-save-variable" . symbol-help)
+("describe-function" . symbol-help); For Emacs-27.
+("describe-variable" . symbol-help); For Emacs-27.
+("describe-symbol" . symbol-help)  ; For Emacs-27.
+("describe-command" . symbol-help) ; For Emacs-27.
 ("set-variable" . symbol-help)
 ("customize-group" . symbol-help)
 ("find-function" . symbol-help)

[nongnu] main 65fc360828: * elpa-packages (mastodon): New package

[Stefan Monnier via]

branch: main
commit 65fc360828018d9283ccc6122c72ee6fa8daf118
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (mastodon): New package
---
 elpa-config   |  3 ++-
 elpa-packages | 12 
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/elpa-config b/elpa-config
index 0e573d85b7..cf2b657da4 100644
--- a/elpa-config
+++ b/elpa-config
@@ -3,10 +3,11 @@
 ((name "NonGNU")
  (gitrepo  "emacs/nongnu.git")
  (url  "https://elpa.nongnu.org/nongnu/";)
+ ;;(dependencies-archive-contents ("archive-devel/archive-contents"))
  ;;(branch-prefix  "elpa/")
  ;;(release-branch-prefix  "elpa-release/")
  ;;(specs-file "elpa-packages")
- ;;(debug  nil)
+ ;; (debug t)
  )
 
 ;; Local Variables:
diff --git a/elpa-packages b/elpa-packages
index 550765b7a0..7927a06165 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -145,7 +145,7 @@
   :news "CHANGELOG.md"
   :ignored-files ("LICENSE" "bin" "ert-tests"))
 
- ;; (el-mock   :url "https://github.com/rejeep/el-mock.el";)
+ (el-mock  :url "https://github.com/rejeep/el-mock.el";)
 
  (elixir-mode  :url "https://github.com/elixir-editors/emacs-elixir";
   :ignored-files ("tests" "Eldev")
@@ -436,8 +436,12 @@
   ;; :dont-release "-dev\\'"
   :news "CHANGES.md")
 
- ;; (mastodon  :url "https://codeberg.org/martianh/mastodon.el";
- ;;  :lisp-dir "lisp")
+ (mastodon :url "https://codeberg.org/martianh/mastodon.el";
+  :branch "develop"
+  :release-branch "main"
+  :lisp-dir "lisp"
+  :doc "mastodon.texi"
+  :readme "README.org")
 
  (material-theme   :url "https://github.com/cpaulik/emacs-material-theme";
   :ignored-files ("*.png")
@@ -573,7 +577,7 @@
  (popup:url "https://github.com/auto-complete/popup-el";
   :ignored-files ("LICENSE"))
 
- ;; (prescient :url "https://github.com/radian-software/prescient.el";)
+ (prescient:url "https://github.com/radian-software/prescient.el";)
 
  (projectile   :url "https://github.com/bbatsov/projectile";
   :ignored-files ("LICENSE" "doc" "test")

[nongnu] main 9a2732a9f1: Undo the e(xtra|rro)neous part of last commit

[Stefan Monnier via]

branch: main
commit 9a2732a9f1be8197fc909e32cc77e91a6e9030bf
Author: Stefan Monnier 
Commit: Stefan Monnier 

Undo the e(xtra|rro)neous part of last commit
---
 elpa-config   | 3 +--
 elpa-packages | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/elpa-config b/elpa-config
index cf2b657da4..0e573d85b7 100644
--- a/elpa-config
+++ b/elpa-config
@@ -3,11 +3,10 @@
 ((name "NonGNU")
  (gitrepo  "emacs/nongnu.git")
  (url  "https://elpa.nongnu.org/nongnu/";)
- ;;(dependencies-archive-contents ("archive-devel/archive-contents"))
  ;;(branch-prefix  "elpa/")
  ;;(release-branch-prefix  "elpa-release/")
  ;;(specs-file "elpa-packages")
- ;; (debug t)
+ ;;(debug  nil)
  )
 
 ;; Local Variables:
diff --git a/elpa-packages b/elpa-packages
index 7927a06165..8faee3ae98 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -145,7 +145,7 @@
   :news "CHANGELOG.md"
   :ignored-files ("LICENSE" "bin" "ert-tests"))
 
- (el-mock  :url "https://github.com/rejeep/el-mock.el";)
+ ;; (el-mock   :url "https://github.com/rejeep/el-mock.el";)
 
  (elixir-mode  :url "https://github.com/elixir-editors/emacs-elixir";
   :ignored-files ("tests" "Eldev")
@@ -577,7 +577,7 @@
  (popup:url "https://github.com/auto-complete/popup-el";
   :ignored-files ("LICENSE"))
 
- (prescient:url "https://github.com/radian-software/prescient.el";)
+ ;; (prescient :url "https://github.com/radian-software/prescient.el";)
 
  (projectile   :url "https://github.com/bbatsov/projectile";
   :ignored-files ("LICENSE" "doc" "test")

[nongnu] elpa/dracula-theme e81012d1e6: 📃 Standardize docs

[ELPA Syncer]

branch: elpa/dracula-theme
commit e81012d1e6a942cbd0f190eac4a50cf62fb323ea
Author: Lucas de França 
Commit: Lucas de França 

📃 Standardize docs
---
 INSTALL.md  |  29 ++---
 README.md   |  22 ++
 dracula-pro.png | Bin 0 -> 366068 bytes
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index a23905b24e..b8cda7fce2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,32 +2,39 @@
 
  Install in Emacs 28+
 
-dracula is available in [NonGNU 
Elpa](https://elpa.nongnu.org/nongnu/dracula-theme.html)
-and thus, will be directly available starting from that version of Emacs.
+Dracula is available in [NonGNU 
Elpa](https://elpa.nongnu.org/nongnu/dracula-theme.html) and thus, will be 
directly available starting from that version of Emacs.
 
-M-x package-install  dracula-theme
+```el
+M-x package-install  dracula-theme
+```
 
  Install using MELPA
 
-First, make sure [to have enabled MELPA repository in your 
configuration](https://melpa.org/#/getting-started).
+First, make sure [to have enabled MELPA repository in your 
configuration](https://melpa.org/#/getting-started);
+
 Then, you will find dracula in the regular package listing.
 
-M-x package-install  dracula-theme
+```el
+M-x package-install  dracula-theme
+```
 
  Install using Homebrew
 
+```bash
 brew install emacs-dracula
+```
 
  Install manually
 
-Add the emacs theme files to `~/.emacs.d/themes`.
+Add the emacs theme files to `~/.emacs.d/themes`;
 
-To load a theme add the following to your init.el
+To load a theme add the following to your `init.el`.
 
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
-(load-theme 'dracula t)
+```el
+(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
+(load-theme 'dracula t)
+```
 
  Configure
 
-Some aspects of this theme are customizable.  You can change them by
-doing `M-x customize-group dracula`.  Then restart Emacs to apply them.
+Some aspects of this theme are customizable. You can change them by doing `M-x 
customize-group dracula`. Then **restart** Emacs to apply them. 💜
diff --git a/README.md b/README.md
index 4aea766fb0..39010a1ae6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ by doing `M-x customize-group dracula` or setting one or more 
of the
 following values in your Emacs init file. Note that these variables
 need to be set before `load-theme` is invoked for Dracula.
 
-```
+```el
 ;; Don't change the font size for some headings and titles (default t)
 (setq dracula-enlarge-headings nil)
 
@@ -45,16 +45,18 @@ This repository contains a small script named 
`start_emacs_test.sh`,
 which helps you to test this color theme in various environment
 (graphical, 256+ colors terminals, 16 colors terminals).
 
-# Graphical test
-./start_emacs_test.sh
+```el
+# Graphical test
+./start_emacs_test.sh
 
-# Full color terminal
-./start_emacs_test.sh -nw 256
+# Full color terminal
+./start_emacs_test.sh -nw 256
 
-# TTY like env
-./start_emacs_test.sh -nw 16
+# TTY like env
+./start_emacs_test.sh -nw 16
+```
 
-This script requires the xterm terminfo files.
+This script requires the **xterm** terminfo files.
 
 ## Team
 
@@ -71,6 +73,10 @@ This theme is maintained by the following person(s) and a 
bunch of
 - [GitHub](https://github.com/dracula/dracula-theme/discussions) - Best for 
asking questions and discussing issues.
 - [Discord](https://draculatheme.com/discord-invite) - Best for hanging out 
with the community.
 
+## Dracula PRO
+
+[![Dracula PRO](./dracula-pro.png)](https://draculatheme.com/pro)
+
 ## License
 
 [MIT License](./LICENSE)
diff --git a/dracula-pro.png b/dracula-pro.png
new file mode 100644
index 00..b19daedebb
Binary files /dev/null and b/dracula-pro.png differ

[nongnu] elpa/markdown-mode updated (c71548a58f -> 50e4452c95)

[ELPA Syncer]

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

  from  c71548a58f Merge pull request #796 from jrblevin/issue/794
   new  193b61605f Update version for v2.6 release
   new  50e4452c95 Update version for new development version


Summary of changes:
 CHANGES.md   |  4 +++-
 README.md| 10 ++
 markdown-mode.el |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

[nongnu] elpa/markdown-mode 50e4452c95 2/2: Update version for new development version

[ELPA Syncer]

branch: elpa/markdown-mode
commit 50e4452c95113df55953cfc310d7e18d8e6205de
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Update version for new development version
---
 CHANGES.md   | 4 +++-
 markdown-mode.el | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2fdaecf798..69bc1cbc96 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,9 @@
-# Markdown Mode 2.6
+# Markdown Mode 2.7
 
 *Under development*
 
+# Markdown Mode 2.6
+
 *   **Breaking changes:**
 - GNU Emacs 27.1 or later is required.
 - Don't allow space between label and text in reference link same as 
CommonMark [GH-774][]
diff --git a/markdown-mode.el b/markdown-mode.el
index b2ef5398a3..cd066a899d 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -6,7 +6,7 @@
 ;; Author: Jason R. Blevins 
 ;; Maintainer: Jason R. Blevins 
 ;; Created: May 24, 2007
-;; Version: 2.6
+;; Version: 2.7-alpha
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: Markdown, GitHub Flavored Markdown, itex
 ;; URL: https://jblevins.org/projects/markdown-mode/
@@ -55,7 +55,7 @@
 
 ;;; Constants =
 
-(defconst markdown-mode-version "2.6"
+(defconst markdown-mode-version "2.7-alpha"
   "Markdown mode version number.")
 
 (defconst markdown-output-buffer-name "*markdown-output*"

[nongnu] elpa/markdown-mode 193b61605f 1/2: Update version for v2.6 release

[ELPA Syncer]

branch: elpa/markdown-mode
commit 193b61605f44c85d261b8bd82e0a213fd8f1ff32
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Update version for v2.6 release
---
 README.md| 10 ++
 markdown-mode.el |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c09411a28b..f2eaa4aee1 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,15 @@
   [leanpub-badge]: https://img.shields.io/badge/leanpub-guide-orange.svg
 
 markdown-mode is a major mode for editing [Markdown][]-formatted
-text.  The latest stable version is markdown-mode 2.5, released on
-Feb 12, 2022.  See the [release notes][] for details.
+text.  The latest stable version is markdown-mode 2.6, released on
+Aug 30, 2023.  See the [release notes][] for details.
 markdown-mode is free software, licensed under the GNU GPL,
 version 3 or later.
 
 ![Markdown Mode 
Screenshot](https://jblevins.org/projects/markdown-mode/screenshots/20170818-001.png)
 
 [Markdown]: http://daringfireball.net/projects/markdown/
-[release notes]: https://github.com/jrblevin/markdown-mode/releases/tag/v2.5
+[release notes]: https://github.com/jrblevin/markdown-mode/releases/tag/v2.6
 
 ## Documentation
 
@@ -113,7 +113,7 @@ to load automatically by adding the following to your init 
file:
   (define-key markdown-mode-map (kbd "C-c C-e") #'markdown-do))
 ```
 
-[markdown-mode.el]: 
https://raw.githubusercontent.com/jrblevin/markdown-mode/v2.5/markdown-mode.el
+[markdown-mode.el]: 
https://raw.githubusercontent.com/jrblevin/markdown-mode/v2.6/markdown-mode.el
 
 **Development Version**
 
@@ -1115,6 +1115,7 @@ first version was released on May 24, 2007.
   * 2017-08-31: [Version 2.3][]
   * 2020-05-30: [Version 2.4][]
   * 2022-02-12: [Version 2.5][]
+  * 2023-08-30: [Version 2.6][]
 
 [Version 1.1]: https://jblevins.org/projects/markdown-mode/rev-1-1
 [Version 1.2]: https://jblevins.org/projects/markdown-mode/rev-1-2
@@ -1132,3 +1133,4 @@ first version was released on May 24, 2007.
 [Version 2.3]: https://jblevins.org/projects/markdown-mode/rev-2-3
 [Version 2.4]: https://github.com/jrblevin/markdown-mode/releases/tag/v2.4
 [Version 2.5]: https://github.com/jrblevin/markdown-mode/releases/tag/v2.5
+[Version 2.6]: https://github.com/jrblevin/markdown-mode/releases/tag/v2.6
diff --git a/markdown-mode.el b/markdown-mode.el
index 0bb4b7ccf3..b2ef5398a3 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -1,12 +1,12 @@
 ;;; markdown-mode.el --- Major mode for Markdown-formatted text -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2007-2022 Jason R. Blevins and markdown-mode
+;; Copyright (C) 2007-2023 Jason R. Blevins and markdown-mode
 ;; contributors (see the commit log for details).
 
 ;; Author: Jason R. Blevins 
 ;; Maintainer: Jason R. Blevins 
 ;; Created: May 24, 2007
-;; Version: 2.6-alpha
+;; Version: 2.6
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: Markdown, GitHub Flavored Markdown, itex
 ;; URL: https://jblevins.org/projects/markdown-mode/
@@ -55,7 +55,7 @@
 
 ;;; Constants =
 
-(defconst markdown-mode-version "2.6-alpha"
+(defconst markdown-mode-version "2.6"
   "Markdown mode version number.")
 
 (defconst markdown-output-buffer-name "*markdown-output*"

[nongnu] elpa/mastodon 6360c8b9d0 03/11: * lisp/mastodon.el: Remove `ts` from `Package-Requires:`

[ELPA Syncer]

branch: elpa/mastodon
commit 6360c8b9d06cdbebaa8254abdbc8f70550c78507
Author: Stefan Monnier 
Commit: Stefan Monnier 

* lisp/mastodon.el: Remove `ts` from `Package-Requires:`

This is/was the main hurdle to be able to include `mastodon.el`
into (Non)GNU ELPA since `ts` is/was not in (Non)GNU ELPA.

Also I think the replacement function is more flexible and gives better
results :-)

* lisp/mastodon-tl.el: Don't require `ts`.
 (mastodon-tl--time-units): New const.
(mastodon-tl--format-poll-expiry): Rewrite.
---
 lisp/mastodon-tl.el | 46 --
 lisp/mastodon.el|  2 +-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1d672a5bc1..8db889cec1 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -32,7 +32,6 @@
 ;;; Code:
 
 (require 'shr)
-(require 'ts)
 (require 'thingatpt) ; for word-at-point
 (require 'time-date)
 (require 'cl-lib)
@@ -1145,25 +1144,36 @@ LONGEST-OPTION is the option whose length determines 
the formatting."
 (propertize str 'face 'font-lock-comment-face))
   "\n"
 
+(defconst mastodon-tl--time-units
+  '("sec"   60.0  ;Use a float to convert `n' to float.
+"min"   60
+"hour"  24
+"day"   7
+"week"  4.345
+"month" 12
+"year"))
+
 (defun mastodon-tl--format-poll-expiry (timestamp)
   "Convert poll expiry TIMESTAMP into a descriptive string."
-  (let ((parsed (ts-human-duration
- (ts-diff (ts-parse timestamp) (ts-now)
-(cond ((> (plist-get parsed :days) 0)
-   (format "%s days, %s hours left"
-   (plist-get parsed :days)
-   (plist-get parsed :hours)))
-  ((> (plist-get parsed :hours) 0)
-   (format "%s hours, %s minutes left"
-   (plist-get parsed :hours)
-   (plist-get parsed :minutes)))
-  ((> (plist-get parsed :minutes) 0)
-   (format "%s minutes left" (plist-get parsed :minutes)))
-  (t ; we failed to guess:
-   (format "%s days, %s hours, %s minutes left"
-   (plist-get parsed :days)
-   (plist-get parsed :hours)
-   (plist-get parsed :minutes))
+  ;; FIXME: Could we document the format of TIMESTAMP here?
+  (let* ((ts (encode-time (parse-time-string timestamp)))
+ (seconds (time-to-seconds (time-subtract nil ts)))
+ (units mastodon-tl--time-units)
+ (n1 seconds) (unit1 (pop units)) n2 unit2
+ next)
+(while (and units (> (truncate (setq next (/ n1 (car units 0))
+  (setq unit2 unit1)
+  (setq n2 (- n1 (* (car units) (truncate n1 (car units)
+  (setq n1 next)
+  (pop units)
+  (setq unit1 (pop units)))
+(setq n1 (truncate n1))
+(if n2 (setq n2 (truncate n2)))
+(if (memq n2 '(nil 0))
+(format "%d %s%s left" n1 unit1 (if (> n1 1) "s" ""))
+  (format "%d %s%s, %d %s%s left"
+  n1 unit1 (if (> n1 1) "s" "")
+  n2 unit2 (if (> n2 1) "s" "")
 
 (defun mastodon-tl--read-poll-option ()
   "Read a poll option to vote on a poll."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index a3b372de9a..1c5e0d5443 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -7,7 +7,7 @@
 ;; Marty Hiatt 
 ;; Maintainer: Marty Hiatt 
 ;; Version: 1.0.0
-;; Package-Requires: ((emacs "27.1") (request "0.3.0") (persist "0.4") (ts 
"0.3"))
+;; Package-Requires: ((emacs "27.1") (request "0.3.0") (persist "0.4"))
 ;; Homepage: https://codeberg.org/martianh/mastodon.el
 
 ;; This file is not part of GNU Emacs.

[nongnu] elpa/mastodon 5640de5f2e 07/11: Misc minor cosmetic changes

[ELPA Syncer]

branch: elpa/mastodon
commit 5640de5f2ee5875313e239c0f4237454e027913c
Author: Stefan Monnier 
Commit: Stefan Monnier 

Misc minor cosmetic changes

Prefer # to quote function names.
Remove some redundant `:group` arguments.
Properly newline-terminate text files.
Fix some ' warnings in docstrings.
---
 .gitignore| 2 +-
 lisp/mastodon-tl.el   | 8 
 lisp/mastodon-toot.el | 8 
 lisp/mastodon.el  | 4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad989023ad..be78d269ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ dist/
 /lisp/mastodon-autoloads.el
 
 # ELSA files
-/lisp/.elsa/
\ No newline at end of file
+/lisp/.elsa/
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 9e86327c7c..7a02a03af8 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -203,8 +203,8 @@ If nil `(point-min)' is used instead.")
 
 (defvar mastodon-tl--link-keymap
   (let ((map (make-sparse-keymap)))
-(define-key map [return] 'mastodon-tl--do-link-action-at-point)
-(define-key map [mouse-2] 'mastodon-tl--do-link-action)
+(define-key map [return] #'mastodon-tl--do-link-action-at-point)
+(define-key map [mouse-2] #'mastodon-tl--do-link-action)
 (define-key map [follow-link] 'mouse-face)
 map)
   "The keymap for link-like things in buffer (except for shr.el generate 
links).
@@ -1594,7 +1594,7 @@ This includes the update profile note buffer, but not the 
preferences one."
   (string-prefix-p "accounts" (mastodon-tl--endpoint nil :no-error)))
 
 (defun mastodon-tl--timeline-proper-p ()
-  "Return non-nil if the current buffer is a 'proper' timeline.
+  "Return non-nil if the current buffer is a \"proper\" timeline.
 A proper timeline excludes notifications, threads, profiles, and
 other toot buffers that aren't strictly mastodon timelines."
   (let ((timeline-buffers
@@ -2284,7 +2284,7 @@ when showing followers or accounts followed."
 (defun mastodon-tl--get-link-header-from-response (headers)
   "Get http Link header from list of http HEADERS."
   ;; pleroma uses "link", so case-insensitive match required:
-  (when-let ((link-headers (alist-get "Link" headers nil nil 'cl-equalp)))
+  (when-let ((link-headers (alist-get "Link" headers nil nil #'cl-equalp)))
 (split-string link-headers ", ")))
 
 (defun mastodon-tl--more ()
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 8170110fc5..d974e043a2 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -222,7 +222,7 @@ Takes its form from `window-configuration-to-register'.")
 (persist-defvar mastodon-toot-draft-toots-list nil
 "A list of toots that have been saved as drafts.
 For the moment we just put all composed toots in here, as we want
-to also capture toots that are 'sent' but that don't successfully
+to also capture toots that are \"sent\" but that don't successfully
 send.")
 
 
@@ -687,7 +687,7 @@ TEXT-ONLY means don't check for attachments or polls."
 ;;; EMOJIS
 
 (defalias 'mastodon-toot--insert-emoji
-  'emojify-insert-emoji
+  #'emojify-insert-emoji
   "Prompt to insert an emoji.")
 
 (defun mastodon-toot--emoji-dir ()
@@ -1623,7 +1623,7 @@ Added to `after-change-functions' in new toot buffers."
 mastodon-toot-draft-toots-list
 nil t)))
 (setq mastodon-toot-draft-toots-list
-  (cl-delete draft mastodon-toot-draft-toots-list :test 'equal))
+  (cl-delete draft mastodon-toot-draft-toots-list :test #'equal))
 (message "Draft deleted!"))
 (message "No drafts to delete.")))
 
@@ -1773,7 +1773,7 @@ Only text that is not one of these faces will be 
spell-checked."
 (add-hook 'mastodon-toot-mode-hook
  (lambda ()
 (setq flyspell-generic-check-word-predicate
-  'mastodon-toot-mode-flyspell-verify)))
+  #'mastodon-toot-mode-flyspell-verify)))
 
 ;;;###autoload
 (add-hook 'mastodon-toot-mode-hook
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 1c5e0d5443..af165790a1 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -224,8 +224,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
 (defcustom mastodon-mode-hook nil
   "Hook run when entering Mastodon mode."
   :type 'hook
-  :options '(provide-discover-context-menu)
-  :group 'mastodon)
+  :options '(provide-discover-context-menu))
 
 (defface mastodon-handle-face
   '((t :inherit default))
@@ -427,7 +426,6 @@ Calls `mastodon-tl--get-buffer-type', which see."
 
 (define-derived-mode mastodon-mode special-mode "Mastodon"
   "Major mode for Mastodon, the federated microblogging network."
-  :group 'mastodon
   (read-only-mode 1))
 
 (provide 'mastodon)

[nongnu] branch elpa-release/mastodon created (now b54fc1b6d4)

[ELPA Syncer]

elpasync pushed a change to branch elpa-release/mastodon.

at  b54fc1b6d4 let* in update-meta-fields-alist

No new revisions were added by this update.

[nongnu] elpa/mastodon 28b12f4eb8 09/11: Merge branch 'scratch/mastodon' into develop

[ELPA Syncer]

branch: elpa/mastodon
commit 28b12f4eb895fe1775cac1ec217733f5fa2ea810
Merge: afb3ac38e0 756096757d
Author: marty hiatt 
Commit: marty hiatt 

Merge branch 'scratch/mastodon' into develop
---
 .gitignore |  2 +-
 lisp/mastodon-auth.el  |  6 ++--
 lisp/mastodon-media.el | 61 ++-
 lisp/mastodon-notifications.el |  9 +++---
 lisp/mastodon-profile.el   |  6 ++--
 lisp/mastodon-tl.el| 72 ++
 lisp/mastodon-toot.el  | 12 +++
 lisp/mastodon-views.el | 18 +--
 lisp/mastodon.el   |  6 ++--
 9 files changed, 102 insertions(+), 90 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad989023ad..be78d269ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ dist/
 /lisp/mastodon-autoloads.el
 
 # ELSA files
-/lisp/.elsa/
\ No newline at end of file
+/lisp/.elsa/
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index eb57368ff5..5069271937 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -172,15 +172,13 @@ When ASK is absent return nil."
 Generate/save token if none known yet."
   (cond (mastodon-auth--token-alist
  ;; user variables are known and initialised.
- (alist-get mastodon-instance-url mastodon-auth--token-alist
-nil nil 'equal))
+ (alist-get mastodon-instance-url mastodon-auth--token-alist))
 ((plist-get (mastodon-client--active-user) :access_token)
  ;; user variables need to be read from plstore.
  (push (cons mastodon-instance-url
  (plist-get (mastodon-client--active-user) :access_token))
mastodon-auth--token-alist)
- (alist-get mastodon-instance-url mastodon-auth--token-alist
-nil nil 'equal))
+ (alist-get mastodon-instance-url mastodon-auth--token-alist))
 ((null mastodon-active-user)
  ;; user not aware of 2FA-related changes and has not set
  ;; `mastodon-active-user'. Make user aware and error out.
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 5cd233ab7e..04cf0c2c05 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -148,40 +148,39 @@ with the image."
   (when (marker-buffer marker) ; if buffer hasn't been killed
 (let ((url-buffer (current-buffer))
   (is-error-response-p (eq :error (car status-plist
-  (unwind-protect
-  (let* ((data (unless is-error-response-p
- (goto-char (point-min))
- (search-forward "\n\n")
- (buffer-substring (point) (point-max
- (image (when data
-  (apply #'create-image data
- (if (version< emacs-version "27.1")
- (when image-options 'imagemagick)
-   nil) ; inbuilt scaling in 27.1
- t image-options
-(when mastodon-media--enable-image-caching
-  (unless (url-is-cached url) ; cache if not already cached
-(url-store-in-cache url-buffer)))
-(with-current-buffer (marker-buffer marker)
-  ;; Save narrowing in our buffer
-  (let ((inhibit-read-only t))
-(save-restriction
-  (widen)
-  (put-text-property marker
- (+ marker region-length) 'media-state 
'loaded)
-  (when image
-;; We only set the image to display if we could load
-;; it; we already have set a default image when we
-;; added the tag.
-(put-text-property marker (+ marker region-length)
-   'display image))
-  ;; We are done with the marker; release it:
-  (set-marker marker nil)))
-  (kill-buffer url-buffer)))
+  (let* ((data (unless is-error-response-p
+ (goto-char (point-min))
+ (search-forward "\n\n")
+ (buffer-substring (point) (point-max
+ (image (when data
+  (apply #'create-image data
+ (if (version< emacs-version "27.1")
+ (when image-options 'imagemagick)
+   nil) ; inbuilt scaling in 27.1
+ t image-options
+(when mastodon-media--enable-image-caching
+  (unless (url-is-cached url)   ; cache if not already cached
+(url-store-in-cache url-buffer)))
+(with-current-buffer (marker-buffer marker)
+  ;; Save narrowing in our buffer
+  (let ((inhibit-read-only t))
+(save-restriction
+  (widen)
+  (put-tex

[nongnu] elpa/mastodon f646c2d512 06/11: Don't refer to obsolete font-lock face variables

[ELPA Syncer]

branch: elpa/mastodon
commit f646c2d5128db8f64c580c9d1133c7e445840800
Author: Stefan Monnier 
Commit: Stefan Monnier 

Don't refer to obsolete font-lock face variables

* lisp/mastodon-profile.el (mastodon-profile--update-user-profile-note):
* lisp/mastodon-tl.el (mastodon-tl--byline, mastodon-tl--toot-stats):
* lisp/mastodon-toot.el (mastodon-toot--view-toot-edits):
* lisp/mastodon-views.el (mastodon-views--minor-view): Quote face names.
---
 lisp/mastodon-profile.el |  4 ++--
 lisp/mastodon-tl.el  | 12 ++--
 lisp/mastodon-toot.el|  4 ++--
 lisp/mastodon-views.el   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 658c371cd3..0a3a236412 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -250,14 +250,14 @@ NO-REBLOGS means do not display boosts in statuses."
 (mastodon-tl--set-buffer-spec (buffer-name buffer) 
"accounts/verify_credentials" nil)
 (setq-local header-line-format
 (propertize msg-str
-'face font-lock-comment-face))
+'face 'font-lock-comment-face))
 (mastodon-profile-update-mode t)
 (insert (propertize (concat (propertize "0"
 'note-counter t
 'display nil)
 "/500 characters")
 'read-only t
-'face font-lock-comment-face
+'face 'font-lock-comment-face
 'note-header t)
 "\n")
 (make-local-variable 'after-change-functions)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index dadc7a87bb..9e86327c7c 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -677,7 +677,7 @@ this just means displaying toot client."
 (propertize
  (format-time-string mastodon-toot-timestamp-format
  edited-parsed)
- 'face font-lock-comment-face
+ 'face 'font-lock-comment-face
  'timestamp edited-parsed
  'display (if mastodon-tl--enable-relative-timestamps
   (mastodon-tl--relative-time-description 
edited-parsed)
@@ -1371,19 +1371,19 @@ To disable showing the stats, customize
 'favourited-p (eq 't .favourited)
 'favourites-field t
 'help-echo (format "%s favourites" 
.favourites_count)
-'face font-lock-comment-face)
-(propertize " | " 'face font-lock-comment-face)
+'face 'font-lock-comment-face)
+(propertize " | " 'face 'font-lock-comment-face)
 (propertize boosts
 'boosted-p (eq 't .reblogged)
 'boosts-field t
 'help-echo (format "%s boosts" .reblogs_count)
-'face font-lock-comment-face)
-(propertize " | " 'face font-lock-comment-face)
+'face 'font-lock-comment-face)
+(propertize " | " 'face 'font-lock-comment-face)
 (propertize replies
 'replies-field t
 'replies-count .replies_count
 'help-echo (format "%s replies" .replies_count)
-'face font-lock-comment-face)))
+'face 'font-lock-comment-face)))
(status
 (concat
  (propertize " "
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index f14aec39e5..8170110fc5 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -905,7 +905,7 @@ instance to edit a toot."
 (insert (propertize (if (= count 1)
 (format "%s [original]:\n" count)
   (format "%s:\n" count))
-'face font-lock-comment-face)
+'face 'font-lock-comment-face)
 (mastodon-toot--insert-toot-iter x)
 "\n")
 (cl-incf count))
@@ -915,7 +915,7 @@ instance to edit a toot."
(format "Edits to toot by %s:"
(alist-get 'username
   (alist-get 'account (car history
-   'face font-lock-comment-face))
+   'face 'font-lock-comment-face))
   (mastodon-tl--set-buffer-spec (buffer-name (current-buffer))
 (format "statuses/%s/history" id)
 nil
diff --git a/lisp/mastodon-views.e

[nongnu] elpa/mastodon afb3ac38e0 02/11: force arg for mastodon-return-credential-account.

[ELPA Syncer]

branch: elpa/mastodon
commit afb3ac38e0e9738d73a5cd1cb5d5b63f059b781a
Author: marty hiatt 
Commit: marty hiatt 

force arg for mastodon-return-credential-account.
---
 lisp/mastodon.el | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index a3b372de9a..63f9a3252d 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -281,7 +281,7 @@ See `mastodon-toot-display-orig-in-reply-buffer'.")
 (string-prefix-p "*mastodon-" (buffer-name 
x))
   (get-buffer x)))
   (buffer-list) ; catch any other masto buffer
-(mastodon-return-credential-account)
+(mastodon-return-credential-account :force)
 (if buffer
 (switch-to-buffer buffer)
   (mastodon-tl--get-home-timeline)
@@ -291,14 +291,22 @@ See `mastodon-toot-display-orig-in-reply-buffer'.")
 
 (defvar mastodon-profile-credential-account nil)
 
-(defun mastodon-return-credential-account ()
+(defun mastodon-return-credential-account (&optional force)
   "Return the CredentialAccount entity.
-Either from `mastodon-profile-credential-account' or from the server."
-  (or mastodon-profile-credential-account
+Either from `mastodon-profile-credential-account' or from the
+server.
+FORCE means to fetch from the server and update
+`mastodon-profile-credential-account'."
+  (if force
   (setq mastodon-profile-credential-account
 (mastodon-http--get-json
  (mastodon-http--api "accounts/verify_credentials")
- nil :silent
+ nil :silent))
+(or mastodon-profile-credential-account
+(setq mastodon-profile-credential-account
+  (mastodon-http--get-json
+   (mastodon-http--api "accounts/verify_credentials")
+   nil :silent)
 
 ;;;###autoload
 (defun mastodon-toot (&optional user reply-to-id reply-json)
@@ -420,7 +428,7 @@ Calls `mastodon-tl--get-buffer-type', which see."
   (when 
mastodon-toot--enable-custom-instance-emoji
 (mastodon-toot--enable-custom-emoji))
   (when mastodon-tl--highlight-current-toot
-(cursor-face-highlight-mode)
+(cursor-face-highlight-mode) ; 29.1
 
 ;;;###autoload
 (add-hook 'mastodon-mode-hook 
#'mastodon-profile--fetch-server-account-settings)

[nongnu] branch elpa/mastodon created (now 8f4b5f5ad8)

[ELPA Syncer]

elpasync pushed a change to branch elpa/mastodon.

at  8f4b5f5ad8 refactor mastodon-return-credential-account

This branch includes the following new commits:

   new  fcebc0d1b3 fix quotation marks in 2 docstrings
   new  afb3ac38e0 force arg for mastodon-return-credential-account.
   new  6360c8b9d0 * lisp/mastodon.el: Remove `ts` from `Package-Requires:`
   new  123c7cf0a5 Simplify calls to `alist-get`
   new  58a5e2deef * lisp/mastodon-notifications.el: Fix dependency
   new  f646c2d512 Don't refer to obsolete font-lock face variables
   new  5640de5f2e Misc minor cosmetic changes
   new  756096757d Merge branch 'scratch/mastodon' of 
git://git.sv.gnu.org/emacs/nongnu into scratch/mastodon
   new  28b12f4eb8 Merge branch 'scratch/mastodon' into develop
   new  1b9686bb2b readme re ts dep gone
   new  8f4b5f5ad8 refactor mastodon-return-credential-account

[nongnu] elpa/mastodon 58a5e2deef 05/11: * lisp/mastodon-notifications.el: Fix dependency

[ELPA Syncer]

branch: elpa/mastodon
commit 58a5e2deef6dff294607cf8d01b27d0ef8a65e4e
Author: Stefan Monnier 
Commit: Stefan Monnier 

* lisp/mastodon-notifications.el: Fix dependency

The file can't be loaded before `mastodon` because it requires
`mastodon-mode-map`, so just require it.  Also make the keymap
definition more standard.

* lisp/mastodon-notifications.el: Require `mastodon`.
(mastodon-mode-map): Remove redundant declaration.
(mastodon-notifications--map): Avoid `copy-keymap` and
`keymap-canonicalize`.
---
 lisp/mastodon-notifications.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index df9612232b..5f6d1badfe 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -31,12 +31,13 @@
 
 ;;; Code:
 
+(require 'mastodon)
+
 (autoload 'mastodon-http--api "mastodon-http")
 (autoload 'mastodon-http--get-params-async-json "mastodon-http")
 (autoload 'mastodon-http--post "mastodon-http")
 (autoload 'mastodon-http--triage "mastodon-http")
 (autoload 'mastodon-media--inline-images "mastodon-media")
-(autoload 'mastodon-notifications-get "mastodon")
 (autoload 'mastodon-tl--byline "mastodon-tl")
 (autoload 'mastodon-tl--byline-author "mastodon-tl")
 (autoload 'mastodon-tl--clean-tabs-and-nl "mastodon-tl")
@@ -55,7 +56,6 @@
 
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--display-media-p)
-(defvar mastodon-mode-map)
 
 (defvar mastodon-notifications--types-alist
   '(("follow" . mastodon-notifications--follow)
@@ -80,11 +80,12 @@
   "Alist of subjects for notification types.")
 
 (defvar mastodon-notifications--map
-  (let ((map (copy-keymap mastodon-mode-map)))
+  (let ((map (make-sparse-keymap)))
+(set-keymap-parent map mastodon-mode-map)
 (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
 (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
 (define-key map (kbd "C-k") #'mastodon-notifications--clear-current)
-(keymap-canonicalize map))
+map)
   "Keymap for viewing notifications.")
 
 (defun mastodon-notifications--byline-concat (message)

[nongnu] elpa/mastodon 756096757d 08/11: Merge branch 'scratch/mastodon' of git://git.sv.gnu.org/emacs/nongnu into scratch/mastodon

[ELPA Syncer]

branch: elpa/mastodon
commit 756096757d13f13f7262ad616e4206ded538566d
Merge: 5640de5f2e db685c21ed
Author: marty hiatt 
Commit: marty hiatt 

Merge branch 'scratch/mastodon' of git://git.sv.gnu.org/emacs/nongnu into 
scratch/mastodon
---
 lisp/mastodon-tl.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 7a02a03af8..c921ba9b65 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -709,6 +709,7 @@ The descriptive string is a human readable version relative 
to
 the current time while the next change timestamp give the first
 time that this description will change in the future.
 TIMESTAMP is assumed to be in the past."
+  ;; FIXME: Use `mastodon-tl--human-duration'!
   (let* ((now (or current-time (current-time)))
  (time-difference (time-subtract now timestamp))
  (seconds-difference (float-time time-difference))
@@ -1157,8 +1158,13 @@ LONGEST-OPTION is the option whose length determines the 
formatting."
   "Convert poll expiry TIMESTAMP into a descriptive string."
   ;; FIXME: Could we document the format of TIMESTAMP here?
   (let* ((ts (encode-time (parse-time-string timestamp)))
- (seconds (time-to-seconds (time-subtract nil ts)))
- (units mastodon-tl--time-units)
+ (seconds (time-to-seconds (time-subtract ts nil
+(concat (mastodon-tl--human-duration (max 0 seconds)) " left")))
+
+(defun mastodon-tl--human-duration (seconds)
+  "Return a string describing SECONDS in a more human-friendly way."
+  (cl-assert (>= seconds 0))
+  (let* ((units mastodon-tl--time-units)
  (n1 seconds) (unit1 (pop units)) n2 unit2
  next)
 (while (and units (> (truncate (setq next (/ n1 (car units 0))
@@ -1170,8 +1176,8 @@ LONGEST-OPTION is the option whose length determines the 
formatting."
 (setq n1 (truncate n1))
 (if n2 (setq n2 (truncate n2)))
 (if (memq n2 '(nil 0))
-(format "%d %s%s left" n1 unit1 (if (> n1 1) "s" ""))
-  (format "%d %s%s, %d %s%s left"
+(format "%d %s%s" n1 unit1 (if (> n1 1) "s" ""))
+  (format "%d %s%s, %d %s%s"
   n1 unit1 (if (> n1 1) "s" "")
   n2 unit2 (if (> n2 1) "s" "")
 

[nongnu] elpa/mastodon 8f4b5f5ad8 11/11: refactor mastodon-return-credential-account

[ELPA Syncer]

branch: elpa/mastodon
commit 8f4b5f5ad8c6dcb867d864ea179934136dfe2640
Author: marty hiatt 
Commit: marty hiatt 

refactor mastodon-return-credential-account
---
 lisp/mastodon.el | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index bc06570b61..1533af04b4 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -296,16 +296,15 @@ Either from `mastodon-profile-credential-account' or from 
the
 server.
 FORCE means to fetch from the server and update
 `mastodon-profile-credential-account'."
-  (if force
-  (setq mastodon-profile-credential-account
-(mastodon-http--get-json
- (mastodon-http--api "accounts/verify_credentials")
- nil :silent))
-(or mastodon-profile-credential-account
-(setq mastodon-profile-credential-account
-  (mastodon-http--get-json
+  (let ((req '(mastodon-http--get-json
(mastodon-http--api "accounts/verify_credentials")
-   nil :silent)
+   nil :silent)))
+(if force
+(setq mastodon-profile-credential-account
+  (eval req))
+  (or mastodon-profile-credential-account
+  (setq mastodon-profile-credential-account
+(eval req))
 
 ;;;###autoload
 (defun mastodon-toot (&optional user reply-to-id reply-json)

[nongnu] elpa/mastodon fcebc0d1b3 01/11: fix quotation marks in 2 docstrings

[ELPA Syncer]

branch: elpa/mastodon
commit fcebc0d1b358ebf64dee5251ac386dd99b1da716
Author: marty hiatt 
Commit: marty hiatt 

fix quotation marks in 2 docstrings
---
 lisp/mastodon-tl.el   | 2 +-
 lisp/mastodon-toot.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1d672a5bc1..df7de7b252 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1584,7 +1584,7 @@ This includes the update profile note buffer, but not the 
preferences one."
   (string-prefix-p "accounts" (mastodon-tl--endpoint nil :no-error)))
 
 (defun mastodon-tl--timeline-proper-p ()
-  "Return non-nil if the current buffer is a 'proper' timeline.
+  "Return non-nil if the current buffer is a \"proper\" timeline.
 A proper timeline excludes notifications, threads, profiles, and
 other toot buffers that aren't strictly mastodon timelines."
   (let ((timeline-buffers
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 14b9d68aa7..abd334036e 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -222,7 +222,7 @@ Takes its form from `window-configuration-to-register'.")
 (persist-defvar mastodon-toot-draft-toots-list nil
 "A list of toots that have been saved as drafts.
 For the moment we just put all composed toots in here, as we want
-to also capture toots that are 'sent' but that don't successfully
+to also capture toots that are \"sent\" but that don't successfully
 send.")
 
 

[nongnu] elpa/mastodon 123c7cf0a5 04/11: Simplify calls to `alist-get`

[ELPA Syncer]

branch: elpa/mastodon
commit 123c7cf0a5ad4ab3f6eb86fd18daefa37e29d253
Author: Stefan Monnier 
Commit: Stefan Monnier 

Simplify calls to `alist-get`

* lisp/mastodon-toot.el (mastodon-toot--set-toot-language):
* lisp/mastodon-tl.el (mastodon-tl--read-rules-ids):
* lisp/mastodon-profile.el (mastodon-profile--remove-from-followers-list):
* lisp/mastodon-auth.el (mastodon-auth--access-token):
* lisp/mastodon-views.el (mastodon-views--add-account-to-list)
(mastodon-views--remove-account-from-list): Remove redundant optional
arg to `alist-get` (`equal` is already the default).
---
 lisp/mastodon-auth.el| 6 ++
 lisp/mastodon-profile.el | 2 +-
 lisp/mastodon-tl.el  | 2 +-
 lisp/mastodon-toot.el| 2 +-
 lisp/mastodon-views.el   | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index eb57368ff5..5069271937 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -172,15 +172,13 @@ When ASK is absent return nil."
 Generate/save token if none known yet."
   (cond (mastodon-auth--token-alist
  ;; user variables are known and initialised.
- (alist-get mastodon-instance-url mastodon-auth--token-alist
-nil nil 'equal))
+ (alist-get mastodon-instance-url mastodon-auth--token-alist))
 ((plist-get (mastodon-client--active-user) :access_token)
  ;; user variables need to be read from plstore.
  (push (cons mastodon-instance-url
  (plist-get (mastodon-client--active-user) :access_token))
mastodon-auth--token-alist)
- (alist-get mastodon-instance-url mastodon-auth--token-alist
-nil nil 'equal))
+ (alist-get mastodon-instance-url mastodon-auth--token-alist))
 ((null mastodon-active-user)
  ;; user not aware of 2FA-related changes and has not set
  ;; `mastodon-active-user'. Make user aware and error out.
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index a5abe5a034..658c371cd3 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -827,7 +827,7 @@ Currently limited to 100 handles. If not found, try
  (response (mastodon-http--get-json url `(("limit" . "100"
  (handles (mastodon-tl--map-alist-vals-to-alist 'acct 'id response))
  (choice (completing-read "Remove from followers: " handles))
- (id (alist-get choice handles nil nil 'equal)))
+ (id (alist-get choice handles)))
 (mastodon-profile--remove-user-from-followers id)))
 
 (defun mastodon-profile--add-private-note-to-account ()
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 8db889cec1..dadc7a87bb 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2201,7 +2201,7 @@ report the account for spam."
"rules [TAB for options, | to separate]: "
alist nil t)))
 (mapcar (lambda (x)
-  (alist-get x alist nil nil 'equal))
+  (alist-get x alist))
 choices)))
 
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 14b9d68aa7..f14aec39e5 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1130,7 +1130,7 @@ Return its two letter ISO 639 1 code."
   (let* ((choice (completing-read "Language for this toot: "
   mastodon-iso-639-1)))
 (setq mastodon-toot--language
-  (alist-get choice mastodon-iso-639-1 nil nil 'equal))
+  (alist-get choice mastodon-iso-639-1))
 (message "Language set to %s" choice)
 (mastodon-toot--update-status-fields)))
 
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index a40603dc4d..00b9467f64 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -391,7 +391,7 @@ If ACCOUNT-ID and HANDLE are provided use them rather than 
prompting."
  (handles (mastodon-tl--map-alist-vals-to-alist 'acct 'id followings))
  (account (or handle (completing-read "Account to add: "
   handles nil t)))
- (account-id (or account-id (alist-get account handles nil nil 
'equal)))
+ (account-id (or account-id (alist-get account handles)))
  (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
  (response (mastodon-http--post url `(("account_ids[]" . 
,account-id)
 (mastodon-views--list-action-triage
@@ -425,7 +425,7 @@ If ID is provided, use that list."
  (handles (mastodon-tl--map-alist-vals-to-alist 'acct 'id accounts))
  (account (completing-read "Account to remove: "
handles nil t))
- (account-id (alist-get account handles nil nil 'equal))
+ (account-id (alist-get account handles))
  (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
  (args (mastodon-http--build-array-params-alist "account_ids[]" 
`(

[nongnu] elpa/mastodon 1b9686bb2b 10/11: readme re ts dep gone

[ELPA Syncer]

branch: elpa/mastodon
commit 1b9686bb2b8b16ae36278f6f162c80d01ab57138
Author: marty hiatt 
Commit: marty hiatt 

readme re ts dep gone
---
 README.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.org b/README.org
index c16fd3351d..dd00f74d13 100644
--- a/README.org
+++ b/README.org
@@ -393,9 +393,8 @@ you can get bookmarks going immediately by using 
[[https://github.com/emacsmirro
 Hard dependencies (should all install with =mastodon.el=):
 - =request= (for uploading attachments), 
[[https://github.com/tkf/emacs-request][emacs-request]]
 - =persist= for storing some settings across sessions
-- =ts= for poll relative expiry times
 
-Optional dependencies:
+Optional dependencies (install yourself, =mastodon.el= can use them):
 - =emojify= for inserting and viewing emojis
 - =mpv= and =mpv.el= for viewing videos and gifs
 - =lingva.el= for translating toots

[nongnu] elpa/annotate bf42792154 1/2: - used line-end-position;

[ELPA Syncer]

branch: elpa/annotate
commit bf42792154c003ac34de794b63aa530d9fdbc22f
Author: cage 
Commit: cage 

- used line-end-position;

- updated NEWS and Changelog files.
---
 Changelog   | 10 ++
 NEWS.org|  4 
 annotate.el |  8 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 1df8c26847..23c390344a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,14 @@
+2023-07-09 cage
+
+* README.org:
+
+- fixed README's layout.
+Merge pull request #155 from cage2/save-db-before-query
+
 2023-07-06 cage
 
+* Changelog,
+* NEWS.org,
 * README.org,
 * annotate.el:
 
@@ -7,6 +16,7 @@
 executing the search query;
 - increased version number.
 - made cosmetic fix to README, also corrected a wrong phrase.
+- updated Changelog and NEWS files.
 
 2023-04-01 cage2
 
diff --git a/NEWS.org b/NEWS.org
index 7ebbeef586..12b4abb09c 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,7 @@
+- 2023-08-09 v2.0.2 cage ::
+
+  This version replaced a procedure with a call to an equivalent library 
function.
+
 - 2023-07-06 v2.0.1 cage ::
 
   This version ensures that querying the database will search in all the 
annotated buffers on the current Emacs session.
diff --git a/annotate.el b/annotate.el
index f12752bcad..0f2cd24048 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold , cage 

 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 2.0.1
+;; Version: 2.0.2
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "2.0.1"
+  :version "2.0.2"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -406,9 +406,7 @@ See `annotate-blacklist-major-mode'."
 (defun annotate-end-of-line-pos ()
  "Get the position of the end of line and rewind the point's
 position (so that it is unchanged after this function is called)."
-  (save-excursion
-(end-of-line)
-(point)))
+ (line-end-position))
 
 (defun annotate-beginning-of-line-pos ()
   "Get the position of the beginning of line and rewind the point's

[nongnu] elpa/annotate dbdd2a4663 2/2: Merge pull request #157 from cage2/replaced-end-line-pos

[ELPA Syncer]

branch: elpa/annotate
commit dbdd2a4663c49581a9bca77d4ea08e6eb98dbdcc
Merge: dd2760d172 bf42792154
Author: cage2 <1257703+ca...@users.noreply.github.com>
Commit: GitHub 

Merge pull request #157 from cage2/replaced-end-line-pos

used line-end-position.
---
 Changelog   | 10 ++
 NEWS.org|  4 
 annotate.el |  8 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 1df8c26847..23c390344a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,14 @@
+2023-07-09 cage
+
+* README.org:
+
+- fixed README's layout.
+Merge pull request #155 from cage2/save-db-before-query
+
 2023-07-06 cage
 
+* Changelog,
+* NEWS.org,
 * README.org,
 * annotate.el:
 
@@ -7,6 +16,7 @@
 executing the search query;
 - increased version number.
 - made cosmetic fix to README, also corrected a wrong phrase.
+- updated Changelog and NEWS files.
 
 2023-04-01 cage2
 
diff --git a/NEWS.org b/NEWS.org
index 7ebbeef586..12b4abb09c 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,7 @@
+- 2023-08-09 v2.0.2 cage ::
+
+  This version replaced a procedure with a call to an equivalent library 
function.
+
 - 2023-07-06 v2.0.1 cage ::
 
   This version ensures that querying the database will search in all the 
annotated buffers on the current Emacs session.
diff --git a/annotate.el b/annotate.el
index f12752bcad..0f2cd24048 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold , cage 

 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 2.0.1
+;; Version: 2.0.2
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "2.0.1"
+  :version "2.0.2"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -406,9 +406,7 @@ See `annotate-blacklist-major-mode'."
 (defun annotate-end-of-line-pos ()
  "Get the position of the end of line and rewind the point's
 position (so that it is unchanged after this function is called)."
-  (save-excursion
-(end-of-line)
-(point)))
+ (line-end-position))
 
 (defun annotate-beginning-of-line-pos ()
   "Get the position of the beginning of line and rewind the point's

[nongnu] elpa/clojure-ts-mode 4e18177a56: Release v0.1.5

[ELPA Syncer]

branch: elpa/clojure-ts-mode
commit 4e18177a568027b464ea794c166d2eb4ebe080fc
Author: Danny Freeman 
Commit: Danny Freeman 

Release v0.1.5

Closes issue #17
---
 CHANGELOG.md   | 6 --
 clojure-ts-mode.el | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 035beaba59..8283f0b5f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ## main (unreleased)
 
-- Disable treesit-transpose-sexps on Emacs 30 in favor of the default 
implementation (#17)
-- Implement clojure-ts-find-ns function (mostly as a demonstration).
+## 0.1.5
+
+- Disable treesit-transpose-sexps on Emacs 30 in favor of the default 
implementation (#17) 
[623c98292f9207a95169cdeae6f8595c016c6320](https://github.com/clojure-emacs/clojure-ts-mode/commit/623c98292f9207a95169cdeae6f8595c016c6320)
+- Implement clojure-ts-find-ns function (mostly as a demonstration). 
[d630cd63af8022d5a1fee0e7aa05450b6e0fd75e](https://github.com/clojure-emacs/clojure-ts-mode/commit/d630cd63af8022d5a1fee0e7aa05450b6e0fd75e)
 
 ## 0.1.4
 
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index 6507f0ef17..a6142243cc 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Danny Freeman 
 ;; URL: http://github.com/clojure-emacs/clojure-ts-mode
 ;; Keywords: languages clojure clojurescript lisp
-;; Version: 0.1.4
+;; Version: 0.1.5
 ;; Package-Requires: ((emacs "29"))
 
 ;; This file is not part of GNU Emacs.

[nongnu] elpa/rainbow-delimiters f40ece58df: Remove new text property in the C++ template syntax test.

[ELPA Syncer]

branch: elpa/rainbow-delimiters
commit f40ece58df8b2f0fb6c8576b527755a552a5e763
Author: Hilton Chain 
Commit: Fanael Linithien 

Remove new text property in the C++ template syntax test.
---
 rainbow-delimiters-test.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rainbow-delimiters-test.el b/rainbow-delimiters-test.el
index 4683a9eb55..b270589981 100644
--- a/rainbow-delimiters-test.el
+++ b/rainbow-delimiters-test.el
@@ -147,7 +147,7 @@
   (should (ert-equal-including-properties
(progn
  (remove-list-of-text-properties
-  (point-min) (point-max) '(category c-type syntax-table))
+  (point-min) (point-max) '(category c-type c-<>-c-types-set 
syntax-table))
  (buffer-string))
#("foo x;"
  0 3 (face font-lock-type-face)

[nongnu] main 16b9d39197: * elpa-packages (sweeprolog): Update ':doc' property

[Philip Kaludercic]

branch: main
commit 16b9d3919745474db543a379943bc54854d189ff
Author: Eshel Yaron 
Commit: Philip Kaludercic 

* elpa-packages (sweeprolog): Update ':doc' property
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 8faee3ae98..6c9c1d9f23 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -690,7 +690,7 @@
 
  (sweeprolog   :url "https://github.com/SWI-Prolog/packages-sweep";
   :ignored-files ("LICENSE")
-  :doc "README.org")
+  :doc "sweep.texi")
 
  (swift-mode   :url "https://github.com/swift-emacs/swift-mode";
   :ignored-files ("COPYING" "scripts" "test" "Eldev" "Makefile"))

[nongnu] elpa-release/mastodon 42bf0c5d4f: bump version

[ELPA Syncer]

branch: elpa-release/mastodon
commit 42bf0c5d4f1b81f8468ac774a5d7f19057510b32
Author: marty hiatt 
Commit: marty hiatt 

bump version
---
 lisp/mastodon.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 1533af04b4..575ca65938 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -6,7 +6,7 @@
 ;; Author: Johnson Denen 
 ;; Marty Hiatt 
 ;; Maintainer: Marty Hiatt 
-;; Version: 1.0.0
+;; Version: 1.0.1
 ;; Package-Requires: ((emacs "27.1") (request "0.3.0") (persist "0.4"))
 ;; Homepage: https://codeberg.org/martianh/mastodon.el
 

[nongnu] elpa-release/mastodon updated (b54fc1b6d4 -> 42bf0c5d4f)

[ELPA Syncer]

elpasync pushed a change to branch elpa-release/mastodon.

  from  b54fc1b6d4 let* in update-meta-fields-alist
  adds  fcebc0d1b3 fix quotation marks in 2 docstrings
  adds  afb3ac38e0 force arg for mastodon-return-credential-account.
  adds  126e2d8642 Fix "empty body" warnings
  adds  6360c8b9d0 * lisp/mastodon.el: Remove `ts` from `Package-Requires:`
  adds  123c7cf0a5 Simplify calls to `alist-get`
  adds  58a5e2deef * lisp/mastodon-notifications.el: Fix dependency
  adds  f646c2d512 Don't refer to obsolete font-lock face variables
  adds  5640de5f2e Misc minor cosmetic changes
  adds  3bb7635c3e * lisp/mastodon.el: Remove `ts` from `Package-Requires:`
  adds  3212f5dd0b Simplify calls to `alist-get`
  adds  d2a893484d * lisp/mastodon-notifications.el: Fix dependency
  adds  1818aeffdc Don't refer to obsolete font-lock face variables
  adds  db685c21ed Misc minor cosmetic changes
  adds  756096757d Merge branch 'scratch/mastodon' of 
git://git.sv.gnu.org/emacs/nongnu into scratch/mastodon
  adds  28b12f4eb8 Merge branch 'scratch/mastodon' into develop
  adds  1b9686bb2b readme re ts dep gone
  adds  8f4b5f5ad8 refactor mastodon-return-credential-account
   new  42bf0c5d4f bump version


Summary of changes:
 .gitignore |  2 +-
 README.org |  3 +-
 lisp/mastodon-auth.el  |  6 ++--
 lisp/mastodon-media.el | 61 +-
 lisp/mastodon-notifications.el |  9 ++---
 lisp/mastodon-profile.el   |  6 ++--
 lisp/mastodon-tl.el| 74 +-
 lisp/mastodon-toot.el  | 14 
 lisp/mastodon-views.el | 18 +-
 lisp/mastodon.el   | 33 +++
 10 files changed, 122 insertions(+), 104 deletions(-)

[nongnu] elpa/mastodon updated (8f4b5f5ad8 -> 42bf0c5d4f)

[ELPA Syncer]

elpasync pushed a change to branch elpa/mastodon.

  from  8f4b5f5ad8 refactor mastodon-return-credential-account
   new  42bf0c5d4f bump version


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

[nongnu] elpa/sweeprolog 7afb48b4da 2/2: * sweep.texi: Minor markup fixes

[ELPA Syncer]

branch: elpa/sweeprolog
commit 7afb48b4da782aab03bdd3ddefb6c28865d3d10b
Author: Eshel Yaron 
Commit: Eshel Yaron 

* sweep.texi: Minor markup fixes
---
 sweep.texi | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sweep.texi b/sweep.texi
index afc33ea750..b0d44c2a09 100644
--- a/sweep.texi
+++ b/sweep.texi
@@ -971,7 +971,7 @@ Minimum number of idle seconds to wait before analyzing a
 @end defopt
 
 At any point in a @code{sweeprolog-mode} buffer, you can use the
-command @code{C-c C-c} (@kbd{M-x sweeprolog-analyze-buffer}) to update
+command @kbd{C-c C-c} (@kbd{M-x sweeprolog-analyze-buffer}) to update
 the cross reference cache and highlight the buffer accordingly.  When
 Sweep's Flymake integration is enabled, this command also updates the
 diagnostics for the current buffer (@pxref{Showing Errors}).  This may
@@ -987,7 +987,7 @@ reanalyzing the buffer highlighting is controlled by 
customizing the
 user option @code{sweeprolog-analyze-buffer-min-interval}.
 
 To view and customize the various faces that Sweep defines and uses
-for semantic highlighting, type @code{M-x customize-group @key{RET}
+for semantic highlighting, type @kbd{M-x customize-group @key{RET}
 sweeprolog-faces @key{RET}}.  @xref{Faces,,,emacs,}, for more
 information about text faces in Emacs.
 
@@ -2009,7 +2009,7 @@ available for listing and jumping between found errors.
 description of these commands.  Additionally, Sweep Prolog mode
 configures the standard command @kbd{M-x next-error} to operate on
 Flymake diagnostics.  This allows for moving to the next (or previous)
-error location with the common @code{M-g n} (or @code{M-g p})
+error location with the common @kbd{M-g n} (or @kbd{M-g p})
 keybinding.  @xref{Compilation Mode,,,emacs,}, for more information
 about these commands.
 
@@ -2266,7 +2266,7 @@ Repeat the last Term Search, searching backward from 
point.
 @end deffn
 
 The command @code{sweeprolog-term-search}, bound by default to
-@code{C-c C-s} in Sweep Prolog mode buffers, prompts for a Prolog term
+@kbd{C-c C-s} in Sweep Prolog mode buffers, prompts for a Prolog term
 to search for and finds terms in the current buffer that the search
 term subsumes.  It highlights all matching terms in the buffer and
 moves the cursor to the beginning of the next match after point.  For
@@ -2843,7 +2843,7 @@ Execute a Prolog goal asynchronously and display its 
output in a
 dedicated buffer (@code{sweeprolog-async-goal}).
 @end table
 
-The command @code{sweeprolog-async-goal}, bound to @code{C-c C-&} in
+The command @code{sweeprolog-async-goal}, bound to @kbd{C-c C-&} in
 Sweep Prolog mode buffers, prompts for a Prolog goal and executes it
 in a new Prolog thread, redirecting its output and error streams to an
 Emacs buffer that gets updated asynchronously.

[nongnu] elpa/sweeprolog updated (44c4671507 -> 7afb48b4da)

[ELPA Syncer]

elpasync pushed a change to branch elpa/sweeprolog.

  from  44c4671507 Prefer plain "Sweep" over "\texttt{sweep}"
   new  b4589ed2a9 Rewrite the manual in Texinfo format
   new  7afb48b4da * sweep.texi: Minor markup fixes


Summary of changes:
 .gitignore|2 +-
 sweep.pl  |2 +-
 sweep.texi| 3291 +
 sweeprolog.el |6 +-
 4 files changed, 3296 insertions(+), 5 deletions(-)
 create mode 100644 sweep.texi

[nongnu] elpa/sweeprolog b4589ed2a9 1/2: Rewrite the manual in Texinfo format

[ELPA Syncer]

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

Rewrite the manual in Texinfo format

* sweep.texi: New file.
* sweep.pl (sweep_match_term/6): Demote expections in user supplied
goal to failure.
* sweeprolog.el (sweeprolog-messages-buffer-name)
(sweeprolog-top-level-mode): Capitalize "Sweep".
---
 .gitignore|2 +-
 sweep.pl  |2 +-
 sweep.texi| 3291 +
 sweeprolog.el |6 +-
 4 files changed, 3296 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd499e604d..2e3a21b10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 /sweep.html
 /sweep.info
 /sweep.info~
-/sweep.texi
+/sweep.texi~
 /sweep.o
 /TODO.org
 /auto/
diff --git a/sweep.pl b/sweep.pl
index 38bdd1bb65..5e8ce0abb4 100644
--- a/sweep.pl
+++ b/sweep.pl
@@ -1243,7 +1243,7 @@ sweep_match_term(Pos, Term0, Term, Goal, From, To) :-
 arg(2, Pos, To),
 subsumes_term(Term, Term0),
 \+ \+ (   Term = Term0,
-  Goal
+  catch(Goal, _, false)
   ).
 sweep_match_term(brace_term_position(_, _, Arg), {Term0}, Term, Goal, From, 
To) :-
 sweep_match_term(Arg, Term0, Term, Goal, From, To).
diff --git a/sweep.texi b/sweep.texi
new file mode 100644
index 00..afc33ea750
--- /dev/null
+++ b/sweep.texi
@@ -0,0 +1,3291 @@
+\input texinfo@c -*- texinfo -*-
+@c %**start of header
+@setfilename sweep.info
+@settitle Sweep: SWI-Prolog Embedded in Emacs
+@documentencoding UTF-8
+@documentlanguage en
+@set MAINTAINERSITE @uref{https://eshelyaron.com,maintainer webpage}
+@set MAINTAINER Eshel Yaron
+@set MAINTAINEREMAIL @email{m...@eshelyaron.com}
+@set MAINTAINERCONTACT @uref{mailto:m...@eshelyaron.com,contact the maintainer}
+@c %**end of header
+
+@copying
+This manual is for Sweep (version 0.23.0), which provides an embedded
+SWI-Prolog runtime inside of Emacs along with an advanced SWI-Prolog
+development environment.
+
+Copyright @copyright{} 2022-2023 Eshel Yaron.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Sweep: (sweep).   SWI-Prolog Embedded in Emacs.
+@end direntry
+
+@finalout
+@titlepage
+@title Sweep: SWI-Prolog Embedded in Emacs
+@author Eshel Yaron (@email{me@@eshelyaron.com})
+@end titlepage
+
+@contents
+
+@ifnottex
+@node Top
+@top Sweep: SWI-Prolog Embedded in Emacs
+
+This manual is for Sweep (version 0.23.0), which provides an embedded
+SWI-Prolog runtime inside of Emacs along with an advanced SWI-Prolog
+development environment.
+
+@end ifnottex
+
+@menu
+* Overview:: Major mode for reading and writing Prolog
+* Installation:: Intructions for installing sweep
+* Getting Started::  First steps with sweep
+* Discovering Sweep::Tips for finding out about Sweep features
+* Initialization::   Functions for starting and stopping the 
embedded Prolog runtime
+* Querying Prolog::  Functions for invoking Prolog predicates and 
consuming their results
+* Editing Prolog Code::  Major mode for reading and writing Prolog
+* Prolog Help::  Commands for displaying detailed Prolog 
documentation
+* The Prolog Top-level:: Executing Prolog queries in a REPL-like 
interface
+* Async Queries::Running goals in seperate threads, 
redirecting their output to Emacs buffers
+* Finding Prolog Code::  Commands for locating and opening Prolog files
+* Quick Access Keymap::  Keymap for useful commands that can be 
invoked from any buffer
+* Prolog Messages::  Messages emitted in the embedded Prolog 
runtime and how to display them
+* Prolog Flags:: Commands for modifying the configuration of 
the embedded Prolog runtime by setting Prolog flags
+* Prolog Packages::  Commands for installing SWI-Prolog add-ons
+* Contributing:: Information for users and hackers looking to 
get involved in the development of this project
+* Things To Do:: Breakdown of topics that deserve more 
attention
+* Indices::
+
+@detailmenu
+--- The Detailed Node Listing ---
+
+Overview
+
+* Main Features::Most important features that Sweep provides
+* Architecture:: Overall structure of this project
+* Alternatives:: Comparing Sweep with other Prolog Emacs 
packages
+
+Querying Prolog
+
+* Elisp to Prolog::  How sweep translates Emacs Lisp to Prolog
+* Prolog to Elisp::  How sweep translates Prolog to Emacs Lisp
+* Example Query::Counting solut

[nongnu] main aba50eda61: * elpa-packages (mastodon): Don't track `develop` for fear of force-pushes

[Stefan Monnier via]

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

* elpa-packages (mastodon): Don't track `develop` for fear of force-pushes
---
 elpa-packages | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 6c9c1d9f23..0d9da00c84 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -437,8 +437,9 @@
   :news "CHANGES.md")
 
  (mastodon :url "https://codeberg.org/martianh/mastodon.el";
-  :branch "develop"
-  :release-branch "main"
+  :branch ;; "develop"
+  ;; :release-branch
+  "main"
   :lisp-dir "lisp"
   :doc "mastodon.texi"
   :readme "README.org")

[elpa] externals/expreg b9fd9f90c6: * expreg.el (expreg--paragraph-defun): Add save-excursion.

[ELPA Syncer]

branch: externals/expreg
commit b9fd9f90c6f00b628a610e556d560d5719a92d7d
Author: Yuan Fu 
Commit: Yuan Fu 

* expreg.el (expreg--paragraph-defun): Add save-excursion.
---
 expreg.el | 32 +---
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/expreg.el b/expreg.el
index e244270134..be49d8b53c 100644
--- a/expreg.el
+++ b/expreg.el
@@ -5,7 +5,7 @@
 ;; Author: Yuan Fu 
 ;; Maintainer: Yuan Fu 
 ;; URL: https://github.com/casouri/expreg
-;; Version: 1.2.0
+;; Version: 1.2.1
 ;; Keywords: text, editing
 ;; Package-Requires: ((emacs "29.1"))
 ;;
@@ -618,23 +618,25 @@ current string/comment and get lists inside."
 beg end result)
 
 (when beginning-of-defun-function
-  (when (beginning-of-defun)
-(setq beg (point))
-(end-of-defun)
-(setq end (point))
-;; If we are at the BOL right below a defun, don’t mark
-;; that defun.
-(unless (eq orig end)
-  (push `(paragraph-defun . ,(cons beg end)) result
+  (save-excursion
+(when (beginning-of-defun)
+  (setq beg (point))
+  (end-of-defun)
+  (setq end (point))
+  ;; If we are at the BOL right below a defun, don’t mark
+  ;; that defun.
+  (unless (eq orig end)
+(push `(paragraph-defun . ,(cons beg end)) result)
 
 (when (or (derived-mode-p 'text-mode)
   (eq major-mode 'fundamental-mode))
-  (backward-paragraph)
-  (skip-syntax-forward "-")
-  (setq beg (point))
-  (forward-paragraph)
-  (setq end (point))
-  (push `(paragraph . ,(cons beg end)) result))
+  (save-excursion
+(backward-paragraph)
+(skip-syntax-forward "-")
+(setq beg (point))
+(forward-paragraph)
+(setq end (point))
+(push `(paragraph . ,(cons beg end)) result)))
 
 result)
 (scan-error nil)))

[nongnu] elpa/editorconfig 2fed9599bc: Support protobuf-mode (#316)

[ELPA Syncer]

branch: elpa/editorconfig
commit 2fed9599bcfea5d1aa9fb57dc9118d0f82b6c999
Author: futpib 
Commit: GitHub 

Support protobuf-mode (#316)
---
 editorconfig.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/editorconfig.el b/editorconfig.el
index 6b52b9c7fd..bda8c57fe6 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -267,6 +267,7 @@ This hook will be run even when there are no matching 
sections in
 ;; for details.
 (php-mode c-basic-offset)
 (pike-mode c-basic-offset)
+(protobuf-mode c-basic-offset)
 (ps-mode ps-mode-tab)
 (pug-mode pug-tab-width)
 (puppet-mode puppet-indent-level)

[nongnu] elpa/sweeprolog 38ebce23cc 2/2: Announce recent changes in NEWS.org and bump version to 0.23.1

[ELPA Syncer]

branch: elpa/sweeprolog
commit 38ebce23cc857a81aba4f10f2bbca5868c0e0112
Author: Eshel Yaron 
Commit: Eshel Yaron 

Announce recent changes in NEWS.org and bump version to 0.23.1
---
 NEWS.org  |  7 +++
 sweep.texi| 12 ++--
 sweeprolog.el |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 99500c2c15..98dd0bf319 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -11,6 +11,13 @@ SWI-Prolog in Emacs.
 For further details, please consult the manual:
 [[https://eshelyaron.com/sweep.html][https://eshelyaron.com/sweep.html]].
 
+* Version 0.23.1 on 2023-08-30
+
+** Documentation improvements and minor bug fixes
+
+This is a maintenance release, including a rewrite of the Sweep manual
+in Texinfo format along with some minor bug fixes and improvements.
+
 * Version 0.23.0 on 2023-08-18
 
 ** Sweep now requires Compat, the forward-compatibility library for Elisp
diff --git a/sweep.texi b/sweep.texi
index 2e10305323..13d558d0ba 100644
--- a/sweep.texi
+++ b/sweep.texi
@@ -11,9 +11,9 @@
 @c %**end of header
 
 @copying
-This manual is for Sweep (version 0.23.0), which provides an embedded
-SWI-Prolog runtime inside of Emacs along with an advanced SWI-Prolog
-development environment.
+This manual is for Sweep (version 0.23.1), an Emacs package providing
+an embedded SWI-Prolog runtime inside of Emacs along with an advanced
+SWI-Prolog development environment.
 
 Copyright @copyright{} 2022-2023 Eshel Yaron.
 
@@ -42,9 +42,9 @@ Invariant Sections, no Front-Cover Texts, and no Back-Cover 
Texts.
 @node Top
 @top Sweep: SWI-Prolog Embedded in Emacs
 
-This manual is for Sweep (version 0.23.0), which provides an embedded
-SWI-Prolog runtime inside of Emacs along with an advanced SWI-Prolog
-development environment.
+This manual is for Sweep (version 0.23.1), an Emacs package providing
+an embedded SWI-Prolog runtime inside of Emacs along with an advanced
+SWI-Prolog development environment.
 
 @end ifnottex
 
diff --git a/sweeprolog.el b/sweeprolog.el
index 6a0dd5b1a8..49cf0d5756 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.23.0
+;; Package-Version: 0.23.1
 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.2"))
 
 ;; This file is NOT part of GNU Emacs.

[nongnu] elpa/sweeprolog 6c77f2a393 1/2: * sweep.texi (Main Features): Refine main features table

[ELPA Syncer]

branch: elpa/sweeprolog
commit 6c77f2a39322cf3c5f8593cd72769de7db278b4d
Author: Eshel Yaron 
Commit: Eshel Yaron 

* sweep.texi (Main Features): Refine main features table
---
 sweep.texi | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/sweep.texi b/sweep.texi
index b0d44c2a09..2e10305323 100644
--- a/sweep.texi
+++ b/sweep.texi
@@ -198,23 +198,25 @@ code in Emacs are:
 
 @itemize
 @item
-@ref{Highlighting, , Semantic highlighting}
+Semantic highlighting, @pxref{Highlighting}.
 @item
-@ref{Indentation, , Automatic indentation}
+Automatic indentation, @ref{Indentation}
 @item
-@ref{Term-based Editing, , Structural editing and navigation}
+Structural editing and navigation, @pxref{Term-based Editing}
 @item
-@ref{Cross References, , Jumping to predicate definitions and references}
+Jumping to predicate definitions and references, @pxref{Cross
+References}
 @item
-@ref{Showing Errors, , On-the-fly diagnostics}
+On-the-fly diagnostics, @pxref{Showing Errors}
 @item
-@ref{Code Completion, , Intelligent code completion}
+Intelligent code completion, @pxref{Code Completion}
 @item
-@ref{Renaming Variables, , Refactoring support}
+Refactoring support, @pxref{Renaming Variables}
 @item
-@ref{The Prolog Top-level, , Integrated SWI-Prolog top-level}
+Integrated SWI-Prolog top-level, @pxref{The Prolog Top-level}
 @item
-@ref{Querying Prolog, , Ability to run Prolog queries directly from Emacs Lisp}
+Ability to run Prolog queries directly from Emacs Lisp, @ref{Querying
+Prolog}
 @end itemize
 
 These features and others are documented in the rest of this manual,

[nongnu] elpa/sweeprolog updated (7afb48b4da -> 38ebce23cc)

[ELPA Syncer]

elpasync pushed a change to branch elpa/sweeprolog.

  from  7afb48b4da * sweep.texi: Minor markup fixes
   new  6c77f2a393 * sweep.texi (Main Features): Refine main features table
   new  38ebce23cc Announce recent changes in NEWS.org and bump version to 
0.23.1


Summary of changes:
 NEWS.org  |  7 +++
 sweep.texi| 32 +---
 sweeprolog.el |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

[nongnu] scratch/mastodon updated (db685c21ed -> 876c67fcf8)

[Stefan Monnier via]

monnier pushed a change to branch scratch/mastodon.

  from  db685c21ed Misc minor cosmetic changes
  adds  fcebc0d1b3 fix quotation marks in 2 docstrings
  adds  afb3ac38e0 force arg for mastodon-return-credential-account.
  adds  6360c8b9d0 * lisp/mastodon.el: Remove `ts` from `Package-Requires:`
  adds  123c7cf0a5 Simplify calls to `alist-get`
  adds  58a5e2deef * lisp/mastodon-notifications.el: Fix dependency
  adds  f646c2d512 Don't refer to obsolete font-lock face variables
  adds  5640de5f2e Misc minor cosmetic changes
  adds  756096757d Merge branch 'scratch/mastodon' of 
git://git.sv.gnu.org/emacs/nongnu into scratch/mastodon
  adds  28b12f4eb8 Merge branch 'scratch/mastodon' into develop
  adds  1b9686bb2b readme re ts dep gone
  adds  8f4b5f5ad8 refactor mastodon-return-credential-account
  adds  42bf0c5d4f bump version
   new  876c67fcf8 (mastodon-tl--relative-time-details): Use 
`mastodon-tl--human-duration`


Summary of changes:
 README.org  |  3 +-
 lisp/mastodon-tl.el | 92 ++---
 lisp/mastodon.el| 27 ++--
 3 files changed, 56 insertions(+), 66 deletions(-)

[nongnu] scratch/mastodon 876c67fcf8: (mastodon-tl--relative-time-details): Use `mastodon-tl--human-duration`

[Stefan Monnier via]

branch: scratch/mastodon
commit 876c67fcf878b2aa32040163706d042d4c0efb01
Author: Stefan Monnier 
Commit: Stefan Monnier 

(mastodon-tl--relative-time-details): Use `mastodon-tl--human-duration`

* lisp/mastodon-tl.el (mastodon-tl--human-duration): Cap the
finest resolution and return a pair to include the resolution used.
(mastodon-tl--format-poll-expiry): Adjust accordingly.
(mastodon-tl--relative-time-details): Rewrite using
`mastodon-tl--human-duration`.
---
 lisp/mastodon-tl.el | 92 ++---
 1 file changed, 38 insertions(+), 54 deletions(-)

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index c921ba9b65..715884b759 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -702,57 +702,18 @@ this just means displaying toot client."
 ;;; TIMESTAMPS
 
 (defun mastodon-tl--relative-time-details (timestamp &optional current-time)
-  "Return cons of (descriptive string . next change) for the TIMESTAMP.
+  "Return cons of (DESCRIPTIVE STRING . NEXT-CHANGE) for the TIMESTAMP.
 Use the optional CURRENT-TIME as the current time (only used for
 reliable testing).
 The descriptive string is a human readable version relative to
 the current time while the next change timestamp give the first
 time that this description will change in the future.
 TIMESTAMP is assumed to be in the past."
-  ;; FIXME: Use `mastodon-tl--human-duration'!
-  (let* ((now (or current-time (current-time)))
- (time-difference (time-subtract now timestamp))
+  (let* ((time-difference (time-subtract current-time timestamp))
  (seconds-difference (float-time time-difference))
- (regular-response
-  (lambda (seconds-difference multiplier unit-name)
-(let ((n (floor (+ 0.5 (/ seconds-difference multiplier)
-  (cons (format "%d %ss ago" n unit-name)
-(* (+ 0.5 n) multiplier)
- (relative-result
-  (cond
-   ((< seconds-difference 60)
-(cons "just now"
-  60))
-   ((< seconds-difference (* 1.5 60))
-(cons "1 minute ago"
-  90)) ;; at 90 secs
-   ((< seconds-difference (* 60 59.5))
-(funcall regular-response seconds-difference 60 "minute"))
-   ((< seconds-difference (* 1.5 60 60))
-(cons "1 hour ago"
-  (* 60 90))) ;; at 90 minutes
-   ((< seconds-difference (* 60 60 23.5))
-(funcall regular-response seconds-difference (* 60 60) "hour"))
-   ((< seconds-difference (* 1.5 60 60 24))
-(cons "1 day ago"
-  (* 1.5 60 60 24))) ;; at a day and a half
-   ((< seconds-difference (* 60 60 24 6.5))
-(funcall regular-response seconds-difference (* 60 60 24) "day"))
-   ((< seconds-difference (* 1.5 60 60 24 7))
-(cons "1 week ago"
-  (* 1.5 60 60 24 7))) ;; a week and a half
-   ((< seconds-difference (* 60 60 24 7 52))
-(if (= 52 (floor (+ 0.5 (/ seconds-difference 60 60 24 7
-(cons "52 weeks ago"
-  (* 60 60 24 7 52))
-  (funcall regular-response seconds-difference (* 60 60 24 7) 
"week")))
-   ((< seconds-difference (* 1.5 60 60 24 365))
-(cons "1 year ago"
-  (* 60 60 24 365 1.5))) ;; a year and a half
-   (t
-(funcall regular-response seconds-difference (* 60 60 24 365.25) 
"year")
-(cons (car relative-result)
-  (time-add timestamp (seconds-to-time (cdr relative-result))
+ (tmp (mastodon-tl--human-duration (max 0 seconds-difference
+(cons (concat (car tmp) " ago")
+  (time-add current-time (cdr tmp)
 
 (defun mastodon-tl--relative-time-description (timestamp &optional 
current-time)
   "Return a string with a human readable TIMESTAMP relative to the current 
time.
@@ -1159,27 +1120,50 @@ LONGEST-OPTION is the option whose length determines 
the formatting."
   ;; FIXME: Could we document the format of TIMESTAMP here?
   (let* ((ts (encode-time (parse-time-string timestamp)))
  (seconds (time-to-seconds (time-subtract ts nil
-(concat (mastodon-tl--human-duration (max 0 seconds)) " left")))
-
-(defun mastodon-tl--human-duration (seconds)
-  "Return a string describing SECONDS in a more human-friendly way."
+;; FIXME: Use the `cdr' to update poll expiry times?
+(concat (car (mastodon-tl--human-duration (max 0 seconds))) " left")))
+
+(defun mastodon-tl--human-duration (seconds &optional resolution)
+  "Return a string describing SECONDS in a more human-friendly way.
+The return format is (STRING . RES) where RES is the resolution of
+this string, in seconds.
+RESOLUTION is the finest resolution, in seconds, to use for the
+second part of the output (defaults to 60, so that seconds are only
+displayed when the duration is smaller than a minut

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

[ELPA Syncer]

branch: externals/org
commit b49275acbe9d60c022dfacd7bad25073d8620859
Merge: d8af9c40e0 c81dba2fb9
Author: Jack Kamm 
Commit: Jack Kamm 

Merge branch 'bugfix'
---
 lisp/ob-python.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index b9dab91b43..6b216ce89a 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -272,7 +272,7 @@ then create.  Return the initialized session."
   ;; multiple prompts during initialization.
   (with-current-buffer py-buffer
 (while (not org-babel-python--initialized)
-  (org-babel-comint-wait-for-output py-buffer)))
+  (sleep-for 0 10)))
   (setq org-babel-python-buffers
(cons (cons session py-buffer)
  (assq-delete-all session org-babel-python-buffers)))

[elpa] externals-release/org c81dba2fb9: ob-python: Fix hanging on second start

[ELPA Syncer]

branch: externals-release/org
commit c81dba2fb9c01240dfe4b0c2b04026f268cd7201
Author: Jack Kamm 
Commit: Jack Kamm 

ob-python: Fix hanging on second start

See: https://list.orgmode.org/87ttsnh5bx.fsf@localhost/T/#t

* lisp/ob-python.el (org-babel-python-initiate-session-by-key): Switch
from `org-babel-comint-wait-for-output' to `sleep-for' while waiting
for `org-babel-python--initialized', to prevent hanging on restarted
Python process.
---
 lisp/ob-python.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index c19af0ab33..6c05d1c8b2 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -235,7 +235,7 @@ then create.  Return the initialized session."
   ;; multiple prompts during initialization.
   (with-current-buffer py-buffer
 (while (not org-babel-python--initialized)
-  (org-babel-comint-wait-for-output py-buffer)))
+  (sleep-for 0 10)))
 (org-babel-comint-wait-for-output py-buffer))
   (setq org-babel-python-buffers
(cons (cons session py-buffer)

[elpa] externals/org updated (d8af9c40e0 -> 8000b11209)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  d8af9c40e0 org-babel-remove-result-one-or-many: Document the prefix 
argument
   new  c81dba2fb9 ob-python: Fix hanging on second start
   new  b49275acbe Merge branch 'bugfix'
   new  8000b11209 test-ob-python: Unit test for restarting session


Summary of changes:
 lisp/ob-python.el  |  2 +-
 testing/lisp/test-ob-python.el | 19 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

[elpa] externals/org 8000b11209 2/2: test-ob-python: Unit test for restarting session

[ELPA Syncer]

branch: externals/org
commit 8000b1120935bd7a9cc56eb6a65c90bc021f42f3
Author: Jack Kamm 
Commit: Jack Kamm 

test-ob-python: Unit test for restarting session

See: https://list.orgmode.org/87ttsnh5bx.fsf@localhost/T/#t

* testing/lisp/test-ob-python.el (test-ob-python/session-restart): New
test for restarting ob-python session process.
---
 testing/lisp/test-ob-python.el | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/testing/lisp/test-ob-python.el b/testing/lisp/test-ob-python.el
index 82fbca36e0..c11e1d0c20 100644
--- a/testing/lisp/test-ob-python.el
+++ b/testing/lisp/test-ob-python.el
@@ -310,6 +310,25 @@ print(list(range(3)))
 #+end_src"
 (should (org-babel-execute-src-block
 
+(ert-deftest test-ob-python/session-restart ()
+  ;; Disable the test on older Emacs as built-in python.el sometimes
+  ;; fail to initialize session.
+  (skip-unless (version<= "28" emacs-version))
+  (should
+   (equal "success"
+  (progn
+(org-test-with-temp-text "#+begin_src python :session :results 
output
+print('start')
+#+end_src"
+(org-babel-execute-src-block))
+(let ((proc (python-shell-get-process)))
+  (python-shell-send-string "exit()")
+  (while (accept-process-output proc)))
+(org-test-with-temp-text "#+begin_src python :session :results 
output
+print('success')
+#+end_src"
+(org-babel-execute-src-block))
+
 (provide 'test-ob-python)
 
 ;;; test-ob-python.el ends here