[nongnu] elpa/git-commit 756a4de1c4: Bump compat dependency

[ELPA Syncer]

branch: elpa/git-commit
commit 756a4de1c408ee750405d323659406802e4c7fed
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Bump compat dependency
---
 default.mk| 4 ++--
 lisp/git-commit-pkg.el| 2 +-
 lisp/git-commit.el| 2 +-
 lisp/magit-libgit-pkg.el  | 2 +-
 lisp/magit-libgit.el  | 2 +-
 lisp/magit-pkg.el | 2 +-
 lisp/magit-section-pkg.el | 2 +-
 lisp/magit-section.el | 2 +-
 lisp/magit.el | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/default.mk b/default.mk
index e5cac49f99..4d7455a940 100644
--- a/default.mk
+++ b/default.mk
@@ -115,7 +115,7 @@ VERSION ?= $(shell \
 # TODO Deal with the fact that timestamps are no longer in sync.
 TIMESTAMP = 20230101
 
-COMPAT_VERSION= 29.1.3.3
+COMPAT_VERSION= 29.1.3.4
 DASH_VERSION  = 2.19.1
 GIT_COMMIT_VERSION= $(VERSION)
 LIBGIT_VERSION= 0
@@ -125,7 +125,7 @@ MAGIT_SECTION_VERSION = $(VERSION)
 TRANSIENT_VERSION = 0.3.6
 WITH_EDITOR_VERSION   = 3.0.5
 
-COMPAT_SNAPSHOT  = 29.1.3.3
+COMPAT_SNAPSHOT  = 29.1.3.4
 DASH_MELPA_SNAPSHOT  = 20221013
 GIT_COMMIT_MELPA_SNAPSHOT= $(TIMESTAMP)
 LIBGIT_MELPA_SNAPSHOT= 0
diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el
index 20287bddcd..c2b97ab531 100644
--- a/lisp/git-commit-pkg.el
+++ b/lisp/git-commit-pkg.el
@@ -1,7 +1,7 @@
 (define-package "git-commit" "3.3.0.50-git"
   "Edit Git commit messages."
   '((emacs   "25.1")
-(compat  "29.1.3.3")
+(compat  "29.1.3.4")
 (transient   "20230201")
 (with-editor "20230118"))
   :homepage "https://magit.vc";
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index bd6bd4053c..0a2eb6b7dd 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -14,7 +14,7 @@
 ;; Package-Version: 3.3.0.50-git
 ;; Package-Requires: (
 ;; (emacs "25.1")
-;; (compat "29.1.3.3")
+;; (compat "29.1.3.4")
 ;; (transient "0.3.6")
 ;; (with-editor "3.0.5"))
 
diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el
index 7c04ef3feb..7383681ca4 100644
--- a/lisp/magit-libgit-pkg.el
+++ b/lisp/magit-libgit-pkg.el
@@ -1,7 +1,7 @@
 (define-package "magit-libgit" "3.3.0.50-git"
   "(POC) Teach Magit to use Libgit2."
   '((emacs  "25.1")
-(compat "29.1.3.3")
+(compat "29.1.3.4")
 (libgit "0")
 (magit  "20230101"))
   :homepage "https://magit.vc";
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index 56030e0c52..b4aa2535e3 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -11,7 +11,7 @@
 ;; Package-Version: 3.3.0.50-git
 ;; Package-Requires: (
 ;; (emacs "26.1")
-;; (compat "29.1.3.3")
+;; (compat "29.1.3.4")
 ;; (libgit "0")
 ;; (magit "3.3.0"))
 
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index 5566cf8ad0..412f64dc67 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,7 +1,7 @@
 (define-package "magit" "3.3.0.50-git"
   "A Git porcelain inside Emacs."
   '((emacs "25.1")
-(compat"29.1.3.3")
+(compat"29.1.3.4")
 (dash  "20221013")
 (git-commit"20230101")
 (magit-section "20230101")
diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el
index 5aba5fbad7..8e1fdcbe7d 100644
--- a/lisp/magit-section-pkg.el
+++ b/lisp/magit-section-pkg.el
@@ -1,7 +1,7 @@
 (define-package "magit-section" "3.3.0.50-git"
   "Sections for read-only buffers."
   '((emacs  "25.1")
-(compat "29.1.3.3")
+(compat "29.1.3.4")
 (dash   "20221013"))
   :homepage "https://magit.vc";
   :keywords '("tools"))
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 6fbb3104f6..24434ab856 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -11,7 +11,7 @@
 ;; Package-Version: 3.3.0.50-git
 ;; Package-Requires: (
 ;; (emacs "25.1")
-;; (compat "29.1.3.3")
+;; (compat "29.1.3.4")
 ;; (dash "2.19.1"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/lisp/magit.el b/lisp/magit.el
index 0077d0f1fa..012b76e425 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -20,7 +20,7 @@
 ;; Package-Version: 3.3.0.50-git
 ;; Package-Requires: (
 ;; (emacs "25.1")
-;; (compat "29.1.3.3")
+;; (compat "29.1.3.4")
 ;; (dash "2.19.1")
 ;; (git-commit "3.3.0")
 ;; (magit-section "3.3.0")

[nongnu] elpa/git-modes updated (1533b38a27 -> f0a0154bf4)

[ELPA Syncer]

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

  from  1533b38a27 readme: Add nongnu badge
   new  fbab53c40a Depend on compat package
   new  f0a0154bf4 Use defvar-keymap


Summary of changes:
 Makefile  | 2 +-
 git-modes.el  | 2 +-
 gitattributes-mode.el | 5 +++--
 gitconfig-mode.el | 3 ++-
 gitignore-mode.el | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

[nongnu] elpa/git-modes f0a0154bf4 2/2: Use defvar-keymap

[ELPA Syncer]

branch: elpa/git-modes
commit f0a0154bf48dd1c0c587596cf4cfd3c90f673a05
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use defvar-keymap
---
 gitattributes-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitattributes-mode.el b/gitattributes-mode.el
index ecbfd7b3dc..34c8ce94d7 100644
--- a/gitattributes-mode.el
+++ b/gitattributes-mode.el
@@ -185,8 +185,8 @@ If ARG is omitted or nil, move point backward one field."
 (dotimes (_ (or arg 1))
   (re-search-backward "\\s-[!-]?\\<" nil 'move
 
-(defvar gitattributes-mode-map (make-sparse-keymap)
-  "Keymap for `gitattributes-mode'.")
+(defvar-keymap gitattributes-mode-map
+  :doc "Keymap for `gitattributes-mode'.")
 
 (easy-menu-define gitattributes-mode-menu
   gitattributes-mode-map

[nongnu] elpa/git-modes fbab53c40a 1/2: Depend on compat package

[ELPA Syncer]

branch: elpa/git-modes
commit fbab53c40a41b6b62034a192a2bd9536b46eb13f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Depend on compat package
---
 Makefile  | 2 +-
 git-modes.el  | 2 +-
 gitattributes-mode.el | 1 +
 gitconfig-mode.el | 3 ++-
 gitignore-mode.el | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2d66aab844..5f41cef41a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ELS  += gitconfig-mode.el
 ELS  += gitignore-mode.el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  =
+DEPS  = compat
 
 EMACS  ?= emacs
 EMACS_ARGS ?=
diff --git a/git-modes.el b/git-modes.el
index 3cab81c79a..fd9dc0434a 100644
--- a/git-modes.el
+++ b/git-modes.el
@@ -12,7 +12,7 @@
 ;; Keywords: convenience vc git
 
 ;; Package-Version: 1.4.0.50-git
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "25.1") (compat "29.1.3.4"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
diff --git a/gitattributes-mode.el b/gitattributes-mode.el
index 7d3442d95b..ecbfd7b3dc 100644
--- a/gitattributes-mode.el
+++ b/gitattributes-mode.el
@@ -31,6 +31,7 @@
 
 ;;; Code:
 
+(require 'compat)
 (require 'easymenu)
 (require 'thingatpt)
 
diff --git a/gitconfig-mode.el b/gitconfig-mode.el
index 42b0822c2e..43553ceb00 100644
--- a/gitconfig-mode.el
+++ b/gitconfig-mode.el
@@ -29,8 +29,9 @@
 
 ;;; Code:
 
-(require 'rx)
+(require 'compat)
 (require 'conf-mode)
+(require 'rx)
 
 (defun gitconfig-line-indented-p ()
   "Return t if the current line is indented correctly."
diff --git a/gitignore-mode.el b/gitignore-mode.el
index 3eda7ce864..e5ab98fe43 100644
--- a/gitignore-mode.el
+++ b/gitignore-mode.el
@@ -29,6 +29,7 @@
 
 ;;; Code:
 
+(require 'compat)
 (require 'conf-mode)
 
 (defvar gitignore-mode-font-lock-keywords

[nongnu] elpa/magit updated (2c583fd8ac -> 756a4de1c4)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  2c583fd8ac Bump compat dependency, seq is loaded by Compat
  adds  756a4de1c4 Bump compat dependency

No new revisions were added by this update.

Summary of changes:
 default.mk| 4 ++--
 lisp/git-commit-pkg.el| 2 +-
 lisp/git-commit.el| 2 +-
 lisp/magit-libgit-pkg.el  | 2 +-
 lisp/magit-libgit.el  | 2 +-
 lisp/magit-pkg.el | 2 +-
 lisp/magit-section-pkg.el | 2 +-
 lisp/magit-section.el | 2 +-
 lisp/magit.el | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

[nongnu] elpa/magit-section updated (2c583fd8ac -> 756a4de1c4)

[ELPA Syncer]

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

  from  2c583fd8ac Bump compat dependency, seq is loaded by Compat
  adds  756a4de1c4 Bump compat dependency

No new revisions were added by this update.

Summary of changes:
 default.mk| 4 ++--
 lisp/git-commit-pkg.el| 2 +-
 lisp/git-commit.el| 2 +-
 lisp/magit-libgit-pkg.el  | 2 +-
 lisp/magit-libgit.el  | 2 +-
 lisp/magit-pkg.el | 2 +-
 lisp/magit-section-pkg.el | 2 +-
 lisp/magit-section.el | 2 +-
 lisp/magit.el | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

[nongnu] elpa/with-editor 59867aebe1: Use defvar-keymap

[ELPA Syncer]

branch: elpa/with-editor
commit 59867aebe16454be4d8c0c858f3b00b8a34f3f61
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use defvar-keymap
---
 lisp/with-editor.el | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 9dc95b30f4..66d603a0af 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -400,18 +400,16 @@ And some tools that do not handle $EDITOR properly also 
break."
 
 ;;; Mode
 
-(defvar with-editor-mode-map
-  (let ((map (make-sparse-keymap)))
-(define-key map "\C-c\C-c"   #'with-editor-finish)
-(define-key map [remap server-edit]  #'with-editor-finish)
-(define-key map [remap evil-save-and-close]  #'with-editor-finish)
-(define-key map [remap evil-save-modified-and-close] #'with-editor-finish)
-(define-key map "\C-c\C-k"   #'with-editor-cancel)
-(define-key map [remap kill-buffer]  #'with-editor-cancel)
-(define-key map [remap ido-kill-buffer]  #'with-editor-cancel)
-(define-key map [remap iswitchb-kill-buffer] #'with-editor-cancel)
-(define-key map [remap evil-quit]#'with-editor-cancel)
-map))
+(defvar-keymap with-editor-mode-map
+  "C-c C-c"#'with-editor-finish
+  " "  #'with-editor-finish
+  " "  #'with-editor-finish
+  " " #'with-editor-finish
+  "C-c C-k"#'with-editor-cancel
+  " "  #'with-editor-cancel
+  " "  #'with-editor-cancel
+  " " #'with-editor-cancel
+  " "#'with-editor-cancel)
 
 (define-minor-mode with-editor-mode
   "Edit a file as the $EDITOR of an external process."

[elpa] externals/transient 87f70af5ac 1/2: Use defvar-keymap

[Jonas Bernoulli]

branch: externals/transient
commit 87f70af5ac3417ced782ee4b8ff53a087469e179
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Use defvar-keymap
---
 lisp/transient.el | 224 +-
 1 file changed, 103 insertions(+), 121 deletions(-)

diff --git a/lisp/transient.el b/lisp/transient.el
index 8322e0d86c..57af38d6a1 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -7,7 +7,7 @@
 ;; Keywords: extensions
 
 ;; Package-Version: 0.3.7.50-git
-;; Package-Requires: ((emacs "25.1") (compat "28.1.1.0"))
+;; Package-Requires: ((emacs "25.1") (compat "29.1.3.4"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -1509,18 +1509,8 @@ then just return it.  Otherwise return the symbol whose
 
 ;;; Keymaps
 
-(defvar transient-base-map
-  (let ((map (make-sparse-keymap)))
-(define-key map (kbd "ESC ESC ESC") #'transient-quit-all)
-(define-key map (kbd "C-g")   #'transient-quit-one)
-(define-key map (kbd "C-q")   #'transient-quit-all)
-(define-key map (kbd "C-z")   #'transient-suspend)
-(define-key map (kbd "C-v")   #'transient-scroll-up)
-(define-key map (kbd "C-M-v") #'transient-scroll-down)
-(define-key map [next]#'transient-scroll-up)
-(define-key map [prior]   #'transient-scroll-down)
-map)
-  "Parent of other keymaps used by Transient.
+(defvar-keymap transient-base-map
+  :doc "Parent of other keymaps used by Transient.
 
 This is the parent keymap of all the keymaps that are used in
 all transients: `transient-map' (which in turn is the parent
@@ -1533,40 +1523,42 @@ the latter isn't a proper transient prefix command, it 
can be
 edited using the same functions as used for transients.
 
 If you add a new command here, then you must also add a binding
-to `transient-predicate-map'.")
-
-(defvar transient-map
-  (let ((map (make-sparse-keymap)))
-(set-keymap-parent map transient-base-map)
-(define-key map (kbd "C-u")   #'universal-argument)
-(define-key map (kbd "C--")   #'negative-argument)
-(define-key map (kbd "C-t")   #'transient-show)
-(define-key map (kbd "?") #'transient-help)
-(define-key map (kbd "C-h")   #'transient-help)
-;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
-(define-key map (kbd "C-M-p") #'transient-history-prev)
-(define-key map (kbd "C-M-n") #'transient-history-next)
-map)
-  "Top-level keymap used by all transients.
+to `transient-predicate-map'."
+  "ESC ESC ESC" #'transient-quit-all
+  "C-g" #'transient-quit-one
+  "C-q" #'transient-quit-all
+  "C-z" #'transient-suspend
+  "C-v" #'transient-scroll-up
+  "C-M-v"   #'transient-scroll-down
+  ""  #'transient-scroll-up
+  "" #'transient-scroll-down)
+
+(defvar-keymap transient-map
+  :doc "Top-level keymap used by all transients.
 
 If you add a new command here, then you must also add a binding
-to `transient-predicate-map'.  Also see `transient-base-map'.")
-
-(defvar transient-edit-map
-  (let ((map (make-sparse-keymap)))
-(set-keymap-parent map transient-base-map)
-(define-key map (kbd "?") #'transient-help)
-(define-key map (kbd "C-h")   #'transient-help)
-(define-key map (kbd "C-x l") #'transient-set-level)
-map)
-  "Keymap that is active while a transient in is in \"edit mode\".")
-
-(defvar transient-sticky-map
-  (let ((map (make-sparse-keymap)))
-(set-keymap-parent map transient-base-map)
-(define-key map (kbd "C-g") #'transient-quit-seq)
-map)
-  "Keymap that is active while an incomplete key sequence is active.")
+to `transient-predicate-map'.  Also see `transient-base-map'."
+  :parent transient-base-map
+  "C-u"   #'universal-argument
+  "C--"   #'negative-argument
+  "C-t"   #'transient-show
+  "?" #'transient-help
+  "C-h"   #'transient-help
+  ;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
+  "C-M-p" #'transient-history-prev
+  "C-M-n" #'transient-history-next)
+
+(defvar-keymap transient-edit-map
+  :doc "Keymap that is active while a transient in is in \"edit mode\"."
+  :parent transient-base-map
+  "?" #'transient-help
+  "C-h"   #'transient-help
+  "C-x l" #'transient-set-level)
+
+(defvar-keymap transient-sticky-map
+  :doc "Keymap that is active while an incomplete key sequence is active."
+  :parent transient-base-map
+  "C-g" #'transient-quit-seq)
 
 (defvar transient--common-command-prefixes '(?\C-x))
 
@@ -1606,66 +1598,24 @@ to `transient-predicate-map'.  Also see 
`transient-base-map'.")
  "Show common permanently")))
(list "C-x l" "Show/hide suffixes" #'transient-set-level
 
-(defvar transient-popup-navigation-map
-  (let ((map (make-sparse-keymap)))
-(define-key map (kbd "") #'transient-noop)
-(define-key map (kbd "")   #'transient-backward-button)
-(define-key map (kbd "") #'transient-forward-button)
-(define-key map (kbd "C-r")#'transient-isearch-backward)
-(define-key map (kbd "C-s")#'tr

[elpa] externals/transient updated (c2bdf7e12c -> 8806655538)

[Jonas Bernoulli]

tarsius pushed a change to branch externals/transient.

  from  c2bdf7e12c transient--recursive-edit: Fix trivial bug
   new  87f70af5ac Use defvar-keymap
   new  8806655538 transient-help: Fix regression


Summary of changes:
 lisp/transient.el | 232 +-
 1 file changed, 107 insertions(+), 125 deletions(-)

[elpa] externals/transient 8806655538 2/2: transient-help: Fix regression

[Jonas Bernoulli]

branch: externals/transient
commit 8806655538187d69dd18e7755024af0f56460600
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

transient-help: Fix regression

That is one of those surprise bug fixes.  While investigating why
`transient-help' no longer worked, I noticed that it needlessly used
`called-interactively-p'.  To my surprise, changing that, also fixed
the issue I was about to work on.  oO

As I recently learned, `called-interactively-p' should be avoided if
at all possible.  It is inherently a hack and not guaranteed to always
work correctly.  This commit fixes a regression that was introduced
with [1: 51c68c8], where we started to advise `this-command'; so it
appears the use of around advice is one of the things that can cause
this function to misbehave.

1: 2023-02-08 51c68c87cc66322db2ee3d85b6f5fc8b941a2ed6
   Use around advice to deal with skipped post-command-hook
---
 lisp/transient.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/transient.el b/lisp/transient.el
index 57af38d6a1..cf28afd8be 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -2573,10 +2573,10 @@ transient is active."
 
 (defvar transient-resume-mode)
 
-(defun transient-help ()
-  "Show help for the active transient or one of its suffixes."
-  (interactive)
-  (if (called-interactively-p 'any)
+(defun transient-help (&optional interactive)
+  "Show help for the active transient or one of its suffixes.\n\n(fn)"
+  (interactive (list t))
+  (if interactive
   (setq transient--helpp t)
 (with-demoted-errors "transient-help: %S"
   (when (lookup-key transient--transient-map

[elpa] main 0ba289dbc3: * elpa-packages (beframe): New package

[Protesilaos Stavrou]

branch: main
commit 0ba289dbc3f0363d362a53f5ee83f376d1af3301
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

* elpa-packages (beframe): New package
---
 elpa-packages | 5 +
 1 file changed, 5 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 0d596ed353..eb2d8f7acb 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -91,6 +91,11 @@
   :auto-sync nil)
  (beacon   :url "https://github.com/Malabarba/beacon";
   :auto-sync t)
+ (beframe  :url "https://git.sr.ht/~protesilaos/beframe";
+  :auto-sync t
+  :doc "README.org"
+  :readme "README.md"
+  :ignored-files ("COPYING" "doclicense.texi"))
  (bind-key :core "lisp/use-package/bind-key.el")
  (blist:url "https://gitlab.com/mmemmew/blist";
   :doc "blist.texinfo"

[elpa] externals/beframe 40ddc320eb 08/14: Add bespoke minibuffer history

[ELPA Syncer]

branch: externals/beframe
commit 40ddc320eb743afc41af629ed95f98293805448f
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add bespoke minibuffer history
---
 framed-buffers.el | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index d9973b8b47..a1b17bdfd4 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -87,6 +87,9 @@ it must satisfy `framep'."
 (unless (string-prefix-p " " b)
   (seq-contains-p (framed-buffers--buffer-names frame) b 
#'string-match-p
 
+(defvar framed-buffers-history nil
+  "Minibuffer history of frame specific buffers.")
+
 ;;;###autoload
 (defun framed-buffers-read-buffer (prompt &optional def require-match 
_predicate)
   "The `read-buffer-function' that limits buffers to frames.
@@ -98,7 +101,7 @@ per-frame filter."
#'framed-buffers--read-buffer-p
require-match
nil
-   'buffer-name-history
+   'framed-buffers-history
def))
 
 (defun framed-buffers--buffer-prompt (&optional frame)

[elpa] externals/beframe cfafcda138 13/14: Optional open new projects in their own frame

[ELPA Syncer]

branch: externals/beframe
commit cfafcda13899338f305e8d96d5b7865db4865ed8
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Optional open new projects in their own frame
---
 framed-buffers.el | 35 ---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 838d5209dc..a8c76df008 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -7,7 +7,7 @@
 ;; URL: https://git.sr.ht/~protesilaos/framed-buffers
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/general-issues
 ;; Version: 0.0.0
-;; Package-Requires: ((emacs "27.1"))
+;; Package-Requires: ((emacs "27.1") (compat "29.1.3.2"))
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'compat)
+
 (defgroup framed-buffers ()
   "Isolate buffers per frame WORK-IN-PROGRESS."
   :group 'frames)
@@ -41,8 +43,24 @@ they have not been used by---and thus associated with---the
 current frame.
 
 Otherwise framed buffers are limited to the frame that uses them."
+  :group 'framed-buffers
+  :package-version '(framed-buffers . "0.1.0")
   :type '(repeat string))
 
+(defcustom framed-buffers-project-always-in-frame nil
+  "When non-nil, open projects in new frames with `framed-buffers-mode'.
+
+When the `framed-buffers-mode' is enabled, install advice around
+`project-prompt-project-dir' so that every prompt for a new
+project is prefixed with `other-frame-prefix'."
+  :group 'framed-buffers
+  :package-version '(framed-buffers . "0.1.0")
+  :initialize #'custom-initialize-default
+  :set (lambda (symbol value)
+ (set-default symbol value)
+ (framed-buffers-mode 1))
+  :type 'boolean)
+
 (defun framed-buffers--frame-buffers (&optional frame)
   "Produce list of buffers for either specified or current FRAME."
   (seq-filter
@@ -218,6 +236,14 @@ If FRAME is nil, use the current frame."
 (defvar framed-buffers--read-buffer-function nil
   "Last value of `read-buffer-function'.")
 
+(defun framed-buffers--with-other-frame (&rest app)
+  "Apply APP with `other-frame-prefix'.
+Use this as :around advice to commands that must make a new frame."
+  (funcall (compat-function other-frame-prefix))
+  (apply app))
+
+(declare-function project-prompt-project-dir "project")
+
 ;;;###autoload
 (define-minor-mode framed-buffers-mode
   "Make all buffer prompts limit candidates per frame."
@@ -227,11 +253,14 @@ If FRAME is nil, use the current frame."
 (setq framed-buffers--read-buffer-function read-buffer-function
   read-buffer-function #'framed-buffers-read-buffer)
 (add-hook 'after-make-frame-functions 
#'framed-buffers--frame-predicate)
-(add-hook 'after-make-frame-functions #'framed-buffers--rename-frame))
+(add-hook 'after-make-frame-functions #'framed-buffers--rename-frame)
+(when framed-buffers-project-always-in-frame
+  (advice-add (compat-function project-prompt-project-dir) :around 
#'framed-buffers--with-other-frame)))
 (setq read-buffer-function framed-buffers--read-buffer-function
   framed-buffers--read-buffer-function nil)
 (remove-hook 'after-make-frame-functions #'framed-buffers--frame-predicate)
-(remove-hook 'after-make-frame-functions #'framed-buffers--rename-frame)))
+(remove-hook 'after-make-frame-functions #'framed-buffers--rename-frame)
+(advice-remove (compat-function project-prompt-project-dir) 
#'framed-buffers--with-other-frame)))
 
  Integration with `consult'
 

[elpa] externals/beframe 42e988c5b3 04/14: Add user option framed-buffers-global-buffers

[ELPA Syncer]

branch: externals/beframe
commit 42e988c5b354d37acc22e5075710bf0490a1274d
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add user option framed-buffers-global-buffers
---
 framed-buffers.el | 37 -
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 211441641c..8e1b3948e1 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -34,12 +34,39 @@
   "Isolate buffers per frame WORK-IN-PROGRESS."
   :group 'frames)
 
-(defun framed-buffers-buffer-list (&optional frame)
+(defcustom framed-buffers-global-buffers '("*scratch*" "*Messages*" 
"*Backtrace*")
+  "List of buffer names to include in all frames.
+These buffers are shown in the buffer selection prompts even if
+they have not been used by---and thus associated with---the
+current frame.
+
+Otherwise framed buffers are limited to the frame that uses them."
+  :type '(repeat string))
+
+(defun framed-buffers--frame-buffer-list (&optional frame)
   "Produce list of buffers for either specified or current FRAME."
-  (seq-filter (lambda (buf)
-(and (bufferp buf)
- (not (string-prefix-p " " (buffer-name buf)
-  (frame-parameter frame 'buffer-list)))
+  (seq-filter
+   (lambda (buf)
+ (and (bufferp buf)
+  (not (string-prefix-p " " (buffer-name buf)
+   (frame-parameter frame 'buffer-list)))
+
+(defun framed-buffers--global-buffer-list ()
+  "Return list of `framed-buffers-global-buffers' buffer objects."
+  (mapcar
+   (lambda (name)
+ (get-buffer name))
+   framed-buffers-global-buffers))
+
+(defun framed-buffers-buffer-list (&optional frame)
+  "Return list of buffers that are used by the current frame.
+With optional FRAME as an object that satisfies `framep', return
+the list of buffers that are used by FRAME.
+
+Include `framed-buffers-global-buffers' in the list."
+  (delete-dups
+   (append (framed-buffers--frame-buffer-list frame)
+   (framed-buffers--global-buffer-list
 
 (defun framed-buffers--read-buffer-p (buf &optional frame)
   "Return non-nil if BUF belongs to the current FRAME.

[elpa] externals/beframe 9e102cffac 10/14: Remove obsolete code

[ELPA Syncer]

branch: externals/beframe
commit 9e102cfface611a48889aca0e6bb637ed9b2e6db
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove obsolete code
---
 framed-buffers.el | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 7f288a7245..a69696abc8 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -227,19 +227,11 @@ If FRAME is nil, use the current frame."
 (setq framed-buffers--read-buffer-function read-buffer-function
   read-buffer-function #'framed-buffers-read-buffer)
 (add-hook 'after-make-frame-functions 
#'framed-buffers--frame-predicate)
-(add-hook 'after-make-frame-functions #'framed-buffers--rename-frame)
-;; NOTE 2023-01-30: I prefer not to install an advice.  It is
-;; needed for `consult-buffer' and maybe others, but there may
-;; be a better way.
-;;
-;; (advice-add #'buffer-list :override #'framed-buffers--buffer-list)
-)
+(add-hook 'after-make-frame-functions #'framed-buffers--rename-frame))
 (setq read-buffer-function framed-buffers--read-buffer-function
   framed-buffers--read-buffer-function nil)
 (remove-hook 'after-make-frame-functions #'framed-buffers--frame-predicate)
-(remove-hook 'after-make-frame-functions #'framed-buffers--rename-frame)
-;; (advice-remove #'buffer-list #'framed-buffers--buffer-list)
-))
+(remove-hook 'after-make-frame-functions #'framed-buffers--rename-frame)))
 
  Integration with `consult'
 

[elpa] externals/beframe fa46c2f28f 12/14: Rename internal functions

[ELPA Syncer]

branch: externals/beframe
commit fa46c2f28ffcc8bf7b7de0f9c0eb52056c38de98
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Rename internal functions
---
 framed-buffers.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index f9ac4ec868..838d5209dc 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -43,7 +43,7 @@ current frame.
 Otherwise framed buffers are limited to the frame that uses them."
   :type '(repeat string))
 
-(defun framed-buffers--frame-buffer-list (&optional frame)
+(defun framed-buffers--frame-buffers (&optional frame)
   "Produce list of buffers for either specified or current FRAME."
   (seq-filter
(lambda (buf)
@@ -51,7 +51,7 @@ Otherwise framed buffers are limited to the frame that uses 
them."
   (not (string-prefix-p " " (buffer-name buf)
(frame-parameter frame 'buffer-list)))
 
-(defun framed-buffers--global-buffer-list ()
+(defun framed-buffers--global-buffers ()
   "Return list of `framed-buffers-global-buffers' buffer objects."
   (mapcar
(lambda (name)
@@ -65,8 +65,8 @@ the list of buffers that are used by FRAME.
 
 Include `framed-buffers-global-buffers' in the list."
   (delete-dups
-   (append (framed-buffers--frame-buffer-list frame)
-   (framed-buffers--global-buffer-list
+   (append (framed-buffers--frame-buffers frame)
+   (framed-buffers--global-buffers
 
 (defun framed-buffers--buffer-names (&optional frame)
   "Return list of names of `framed-buffers--buffer-list' as strings.

[elpa] branch externals/beframe created (now 87d0c0cb63)

[ELPA Syncer]

elpasync pushed a change to branch externals/beframe.

at  87d0c0cb63 BREAKING rename project to "reframe"

This branch includes the following new commits:

   new  2bdeb35e98 Add framed-buffers prototype
   new  97f50f5c7e Fix and simplify framed-buffers--rename-frame
   new  0b24283ddc Remove unused declaration of project.el function
   new  42e988c5b3 Add user option framed-buffers-global-buffers
   new  b9173f1efd Clarify that frame selection depends on the window 
manager
   new  2593b0b02d Make stylistic changes for consistency
   new  878cc6a890 Rename private functions for consistency
   new  40ddc320eb Add bespoke minibuffer history
   new  0ea7299ef2 Add 'consult' integration
   new  9e102cffac Remove obsolete code
   new  553acb8a92 Declare consult function to placate the compiler
   new  fa46c2f28f Rename internal functions
   new  cfafcda138 Optional open new projects in their own frame
   new  87d0c0cb63 BREAKING rename project to "reframe"

[elpa] externals/beframe 87d0c0cb63 14/14: BREAKING rename project to "reframe"

[ELPA Syncer]

branch: externals/beframe
commit 87d0c0cb63be0f07e973cf3ebf5bdf41126d3b94
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

BREAKING rename project to "reframe"
---
 framed-buffers.el => reframe.el | 156 
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/framed-buffers.el b/reframe.el
similarity index 60%
rename from framed-buffers.el
rename to reframe.el
index a8c76df008..f4c329bb76 100644
--- a/framed-buffers.el
+++ b/reframe.el
@@ -1,10 +1,10 @@
-;;; framed-buffers.el --- WORK-IN-PROGRESS -*- lexical-binding: t -*-
+;;; reframe.el --- WORK-IN-PROGRESS -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2023  Free Software Foundation, Inc.
 
 ;; Author: Protesilaos Stavrou 
 ;; Maintainer: Protesilaos Stavrou General Issues 
<~protesilaos/general-iss...@lists.sr.ht>
-;; URL: https://git.sr.ht/~protesilaos/framed-buffers
+;; URL: https://git.sr.ht/~protesilaos/reframe
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/general-issues
 ;; Version: 0.0.0
 ;; Package-Requires: ((emacs "27.1") (compat "29.1.3.2"))
@@ -32,36 +32,36 @@
 
 (require 'compat)
 
-(defgroup framed-buffers ()
+(defgroup reframe ()
   "Isolate buffers per frame WORK-IN-PROGRESS."
   :group 'frames)
 
-(defcustom framed-buffers-global-buffers '("*scratch*" "*Messages*" 
"*Backtrace*")
+(defcustom reframe-global-buffers '("*scratch*" "*Messages*" "*Backtrace*")
   "List of buffer names to include in all frames.
 These buffers are shown in the buffer selection prompts even if
 they have not been used by---and thus associated with---the
 current frame.
 
 Otherwise framed buffers are limited to the frame that uses them."
-  :group 'framed-buffers
-  :package-version '(framed-buffers . "0.1.0")
+  :group 'reframe
+  :package-version '(reframe . "0.1.0")
   :type '(repeat string))
 
-(defcustom framed-buffers-project-always-in-frame nil
-  "When non-nil, open projects in new frames with `framed-buffers-mode'.
+(defcustom reframe-project-always-in-frame nil
+  "When non-nil, open projects in new frames with `reframe-mode'.
 
-When the `framed-buffers-mode' is enabled, install advice around
+When the `reframe-mode' is enabled, install advice around
 `project-prompt-project-dir' so that every prompt for a new
 project is prefixed with `other-frame-prefix'."
-  :group 'framed-buffers
-  :package-version '(framed-buffers . "0.1.0")
+  :group 'reframe
+  :package-version '(reframe . "0.1.0")
   :initialize #'custom-initialize-default
   :set (lambda (symbol value)
  (set-default symbol value)
- (framed-buffers-mode 1))
+ (reframe-mode 1))
   :type 'boolean)
 
-(defun framed-buffers--frame-buffers (&optional frame)
+(defun reframe--frame-buffers (&optional frame)
   "Produce list of buffers for either specified or current FRAME."
   (seq-filter
(lambda (buf)
@@ -69,61 +69,61 @@ project is prefixed with `other-frame-prefix'."
   (not (string-prefix-p " " (buffer-name buf)
(frame-parameter frame 'buffer-list)))
 
-(defun framed-buffers--global-buffers ()
-  "Return list of `framed-buffers-global-buffers' buffer objects."
+(defun reframe--global-buffers ()
+  "Return list of `reframe-global-buffers' buffer objects."
   (mapcar
(lambda (name)
  (get-buffer name))
-   framed-buffers-global-buffers))
+   reframe-global-buffers))
 
-(defun framed-buffers--buffer-list (&optional frame)
+(defun reframe--buffer-list (&optional frame)
   "Return list of buffers that are used by the current frame.
 With optional FRAME as an object that satisfies `framep', return
 the list of buffers that are used by FRAME.
 
-Include `framed-buffers-global-buffers' in the list."
+Include `reframe-global-buffers' in the list."
   (delete-dups
-   (append (framed-buffers--frame-buffers frame)
-   (framed-buffers--global-buffers
+   (append (reframe--frame-buffers frame)
+   (reframe--global-buffers
 
-(defun framed-buffers--buffer-names (&optional frame)
-  "Return list of names of `framed-buffers--buffer-list' as strings.
+(defun reframe--buffer-names (&optional frame)
+  "Return list of names of `reframe--buffer-list' as strings.
 With optional FRAME, do it for the given frame name."
   (mapcar
(lambda (buf)
  (buffer-name buf))
-   (framed-buffers--buffer-list frame)))
+   (reframe--buffer-list frame)))
 
-(defun framed-buffers--read-buffer-p (buf &optional frame)
+(defun reframe--read-buffer-p (buf &optional frame)
   "Return non-nil if BUF belongs to the current FRAME.
-BUF is a string or a cons cell, per `framed-buffers-read-buffer'.
+BUF is a string or a cons cell, per `reframe-read-buffer'.
 If optional FRAME is nil, then default to the current one.  Else
 it must satisfy `framep'."
   (let ((b buf))
 (when (consp buf)
   (setq b (car buf)))
 (unless (string-prefix-p " " b)
-  (seq-contains-p (framed-buffers--buffer-names frame) b 
#'string-match-p
+  (seq-contains-p (reframe--buffer-names frame) b #'st

[elpa] externals/beframe 553acb8a92 11/14: Declare consult function to placate the compiler

[ELPA Syncer]

branch: externals/beframe
commit 553acb8a92d8ba75cfdeae7c8f64305351c2079b
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Declare consult function to placate the compiler
---
 framed-buffers.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framed-buffers.el b/framed-buffers.el
index a69696abc8..f9ac4ec868 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -236,6 +236,7 @@ If FRAME is nil, use the current frame."
  Integration with `consult'
 
 (defvar consult-buffer-sources)
+(declare-function consult--buffer-state "consult")
 
 (with-eval-after-load 'consult
   (defface framed-buffers-buffer

[elpa] externals/beframe 2bdeb35e98 01/14: Add framed-buffers prototype

[ELPA Syncer]

branch: externals/beframe
commit 2bdeb35e98c4007a140ceb0ccc9188fe4e1c3c30
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add framed-buffers prototype
---
 .gitignore|   3 +
 COPYING   | 674 ++
 framed-buffers.el | 212 +
 3 files changed, 889 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..cb62d01d0e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.elc
+*-autoloads.el
+*-pkg.el
diff --git a/COPYING b/COPYING
new file mode 100644
index 00..2e63a33302
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified ver

[elpa] externals/beframe b9173f1efd 05/14: Clarify that frame selection depends on the window manager

[ELPA Syncer]

branch: externals/beframe
commit b9173f1efdad5f3701a465e7fa0b31c63afb735b
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Clarify that frame selection depends on the window manager
---
 framed-buffers.el | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 8e1b3948e1..9662649c5f 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -174,7 +174,11 @@ Either bind this command to a key as an alternative to
 `framed-buffers-mode' which makes all buffer prompts limit the
 candidates to those that belong to the selected frame.
 
-Also see `framed-buffers-switch-buffer'."
+Also see `framed-buffers-switch-buffer'.
+
+Raising and then selecting FRAME does not depend solely on Emacs.
+The window manager must permit such an operation.  See bug#61319:
+."
   (interactive
(let ((obj (framed-buffers--frame-object (framed-buffers--frame-prompt
  (list obj (framed-buffers--buffer-prompt obj

[elpa] externals/beframe 878cc6a890 07/14: Rename private functions for consistency

[ELPA Syncer]

branch: externals/beframe
commit 878cc6a890207f73349f32e375cd772c472f9c04
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Rename private functions for consistency
---
 framed-buffers.el | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 93735a39e2..d9973b8b47 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -58,7 +58,7 @@ Otherwise framed buffers are limited to the frame that uses 
them."
  (get-buffer name))
framed-buffers-global-buffers))
 
-(defun framed-buffers-buffer-list (&optional frame)
+(defun framed-buffers--buffer-list (&optional frame)
   "Return list of buffers that are used by the current frame.
 With optional FRAME as an object that satisfies `framep', return
 the list of buffers that are used by FRAME.
@@ -68,6 +68,14 @@ Include `framed-buffers-global-buffers' in the list."
(append (framed-buffers--frame-buffer-list frame)
(framed-buffers--global-buffer-list
 
+(defun framed-buffers--buffer-names (&optional frame)
+  "Return list of names of `framed-buffers--buffer-list' as strings.
+With optional FRAME, do it for the given frame name."
+  (mapcar
+   (lambda (buf)
+ (buffer-name buf))
+   (framed-buffers--buffer-list frame)))
+
 (defun framed-buffers--read-buffer-p (buf &optional frame)
   "Return non-nil if BUF belongs to the current FRAME.
 BUF is a string or a cons cell, per `framed-buffers-read-buffer'.
@@ -93,14 +101,6 @@ per-frame filter."
'buffer-name-history
def))
 
-(defun framed-buffers--buffer-names (&optional frame)
-  "Return list of names of `framed-buffers-buffer-list' as strings.
-With optional FRAME, do it for the given frame name."
-  (mapcar
-   (lambda (buf)
- (buffer-name buf))
-   (framed-buffers-buffer-list frame)))
-
 (defun framed-buffers--buffer-prompt (&optional frame)
   "Prompt for buffer among `framed-buffers--buffer-names'.
 
@@ -204,8 +204,8 @@ Add this to `after-make-frame-functions'."
 
 (defun framed-buffers--frame-parameter-p (buf)
   "Return non-nil if BUF belongs to the current frame.
-BUF is a buffer object among `framed-buffers-buffer-list'."
-  (memq buf (framed-buffers-buffer-list)))
+BUF is a buffer object among `framed-buffers--buffer-list'."
+  (memq buf (framed-buffers--buffer-list)))
 
 (defun framed-buffers--frame-predicate (&optional frame)
   "Set FRAME `buffer-predicate' parameter.
@@ -229,13 +229,13 @@ If FRAME is nil, use the current frame."
 ;; needed for `consult-buffer' and maybe others, but there may
 ;; be a better way.
 ;;
-;; (advice-add #'buffer-list :override #'framed-buffers-buffer-list)
+;; (advice-add #'buffer-list :override #'framed-buffers--buffer-list)
 )
 (setq read-buffer-function framed-buffers--read-buffer-function
   framed-buffers--read-buffer-function nil)
 (remove-hook 'after-make-frame-functions #'framed-buffers--frame-predicate)
 (remove-hook 'after-make-frame-functions #'framed-buffers--rename-frame)
-;; (advice-remove #'buffer-list #'framed-buffers-buffer-list)
+;; (advice-remove #'buffer-list #'framed-buffers--buffer-list)
 ))
 
 (provide 'framed-buffers)

[elpa] externals/beframe 2593b0b02d 06/14: Make stylistic changes for consistency

[ELPA Syncer]

branch: externals/beframe
commit 2593b0b02d741b7165a80913a582f2ba49a9b1b3
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make stylistic changes for consistency
---
 framed-buffers.el | 36 +++-
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index 9662649c5f..93735a39e2 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -96,9 +96,10 @@ per-frame filter."
 (defun framed-buffers--buffer-names (&optional frame)
   "Return list of names of `framed-buffers-buffer-list' as strings.
 With optional FRAME, do it for the given frame name."
-  (mapcar (lambda (buf)
-(buffer-name buf))
-  (framed-buffers-buffer-list frame)))
+  (mapcar
+   (lambda (buf)
+ (buffer-name buf))
+   (framed-buffers-buffer-list frame)))
 
 (defun framed-buffers--buffer-prompt (&optional frame)
   "Prompt for buffer among `framed-buffers--buffer-names'.
@@ -121,20 +122,21 @@ frame name."
 (defun framed-buffers--buffers-with-current ()
   "Return frame list with current one renamed appropriately."
   (let ((frames (make-frame-names-alist)))
-(mapcar (lambda (frame)
-  (let ((name (car frame))
-(obj (cdr frame)))
-(cond
- ((and (eq (selected-frame) obj)
-   (string-prefix-p " " name))
-  (setcar frame "Current frame")
-  frame)
- ((eq (selected-frame) obj)
-  (setcar frame (format "%s (Current frame)" name))
-  frame)
- (t
-  frame
-frames)))
+(mapcar
+ (lambda (frame)
+   (let ((name (car frame))
+ (obj (cdr frame)))
+ (cond
+  ((and (eq (selected-frame) obj)
+(string-prefix-p " " name))
+   (setcar frame "Current frame")
+   frame)
+  ((eq (selected-frame) obj)
+   (setcar frame (format "%s (Current frame)" name))
+   frame)
+  (t
+   frame
+ frames)))
 
 (defun framed-buffers--frame-prompt ()
   "Prompt to select a frame among the list of frames."

[elpa] externals/beframe 0b24283ddc 03/14: Remove unused declaration of project.el function

[ELPA Syncer]

branch: externals/beframe
commit 0b24283ddc78a3f2b0e02c0d3ac934fe31997c66
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove unused declaration of project.el function
---
 framed-buffers.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index ac10970265..211441641c 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -156,8 +156,6 @@ Also see `framed-buffers-switch-buffer'."
 
 ;;; Minor mode setup
 
-(declare-function project-name "project")
-
 (defun framed-buffers--rename-frame (frame)
   "Rename FRAME.
 Add this to `after-make-frame-functions'."

[elpa] externals/beframe 0ea7299ef2 09/14: Add 'consult' integration

[ELPA Syncer]

branch: externals/beframe
commit 0ea7299ef28478d2a4196a0342a98af5f7a8f4ce
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add 'consult' integration
---
 framed-buffers.el | 21 +
 1 file changed, 21 insertions(+)

diff --git a/framed-buffers.el b/framed-buffers.el
index a1b17bdfd4..7f288a7245 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -241,5 +241,26 @@ If FRAME is nil, use the current frame."
 ;; (advice-remove #'buffer-list #'framed-buffers--buffer-list)
 ))
 
+ Integration with `consult'
+
+(defvar consult-buffer-sources)
+
+(with-eval-after-load 'consult
+  (defface framed-buffers-buffer
+'((t :inherit font-lock-string-face))
+"Face for `consult' framed buffers.")
+
+  (defvar framed-buffers--consult-source
+`( :name "Frame-specific buffers (current frame)"
+   :narrow   ?F
+   :category buffer
+   :face framed-buffers-buffer
+   :history  framed-buffers-history
+   :items,#'framed-buffers--buffer-names
+   :action   ,#'switch-to-buffer
+   :state,#'consult--buffer-state))
+
+  (add-to-list 'consult-buffer-sources 'framed-buffers--consult-source))
+
 (provide 'framed-buffers)
 ;;; framed-buffers.el ends here

[elpa] externals/beframe 97f50f5c7e 02/14: Fix and simplify framed-buffers--rename-frame

[ELPA Syncer]

branch: externals/beframe
commit 97f50f5c7e00b5d2f9408cf50881a365494312b7
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix and simplify framed-buffers--rename-frame
---
 framed-buffers.el | 25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/framed-buffers.el b/framed-buffers.el
index c6c154c989..ac10970265 100644
--- a/framed-buffers.el
+++ b/framed-buffers.el
@@ -158,19 +158,18 @@ Also see `framed-buffers-switch-buffer'."
 
 (declare-function project-name "project")
 
-(defun framed-buffers--rename-frame ()
-  "Rename the current frame WORK-IN-PROGRESS."
-  (cond
-   ;; ((and (featurep 'project)
-   ;;   (fboundp 'project-name)
-   ;;   (fboundp 'project-current))
-   ;;  (project-name (project-current nil default-directory)))
-   ((and (not (minibufferp)) (buffer-file-name))
-(format "%s  %s" (buffer-name) default-directory))
-   ((not (minibufferp))
-(buffer-name))
-   (t
-default-directory)))
+(defun framed-buffers--rename-frame (frame)
+  "Rename FRAME.
+Add this to `after-make-frame-functions'."
+  (select-frame frame)
+  (set-frame-name
+   (cond
+((and (not (minibufferp)) (buffer-file-name))
+ (format "%s  %s" (buffer-name) default-directory))
+((not (minibufferp))
+ (buffer-name))
+(t
+ default-directory
 
 (defun framed-buffers--frame-parameter-p (buf)
   "Return non-nil if BUF belongs to the current frame.

[nongnu] elpa/git-commit 308a6cf87f 1/2: magit-menu-set: Fix docstring typo

[ELPA Syncer]

branch: elpa/git-commit
commit 308a6cf87f5482bd2c5060a18e2e426424d99bc8
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-menu-set: Fix docstring typo
---
 lisp/magit-section.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 24434ab856..fa8fa98007 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -612,7 +612,7 @@ lines or else unsightly line wrapping, a definition [remap 
CMD]
 can be written as just [CMD].  As a result KEY might have to be
 a string when otherwise a vector would have worked.
 
-If DESC is a string that contains a support %-spec, substitute
+If DESC is a string that contains a supported %-spec, substitute
 the expression (magit-menu-format-desc DESC) for that.  See
 `magit-menu-format-desc'."
   (declare (indent defun))

[nongnu] elpa/git-commit 0f59780478 2/2: Cleanup uses of magit-menu-get

[ELPA Syncer]

branch: elpa/git-commit
commit 0f597804786272d2a3b21552f1cbe29e365de72f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Cleanup uses of magit-menu-get
---
 lisp/magit-submodule.el | 2 +-
 lisp/magit-worktree.el  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el
index 1c2f55c25d..55e6fa8332 100644
--- a/lisp/magit-submodule.el
+++ b/lisp/magit-submodule.el
@@ -509,7 +509,7 @@ or, failing that, the abbreviated HEAD commit hash."
 
 (defvar magit-modules-section-map
   (let ((map (make-sparse-keymap)))
-(magit-menu-set map [remap magit-visit-thing]
+(magit-menu-set map [magit-visit-thing]
   #'magit-list-submodules "List %t")
 map)
   "Keymap for `modules' sections.")
diff --git a/lisp/magit-worktree.el b/lisp/magit-worktree.el
index 358adddf6e..b955e07681 100644
--- a/lisp/magit-worktree.el
+++ b/lisp/magit-worktree.el
@@ -150,7 +150,7 @@ then show it in Dired instead."
 (magit-menu-set map [magit-visit-thing]  #'magit-worktree-status "Visit 
%s")
 (magit-menu-set map [magit-delete-thing] #'magit-worktree-delete "Delete 
%m")
 (define-key-after map [separator-magit-worktree] menu-bar-separator)
-(magit-menu-set map [magit-worktree ] #'magit-worktree "Worktree 
commands...")
+(magit-menu-set map [magit-worktree] #'magit-worktree "Worktree 
commands...")
 map)
   "Keymap for `worktree' sections.")
 

[nongnu] elpa/git-commit updated (756a4de1c4 -> 0f59780478)

[ELPA Syncer]

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

  from  756a4de1c4 Bump compat dependency
   new  308a6cf87f magit-menu-set: Fix docstring typo
   new  0f59780478 Cleanup uses of magit-menu-get


Summary of changes:
 lisp/magit-section.el   | 2 +-
 lisp/magit-submodule.el | 2 +-
 lisp/magit-worktree.el  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[nongnu] elpa/magit-section updated (756a4de1c4 -> 0f59780478)

[ELPA Syncer]

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

  from  756a4de1c4 Bump compat dependency
  adds  308a6cf87f magit-menu-set: Fix docstring typo
  adds  0f59780478 Cleanup uses of magit-menu-get

No new revisions were added by this update.

Summary of changes:
 lisp/magit-section.el   | 2 +-
 lisp/magit-submodule.el | 2 +-
 lisp/magit-worktree.el  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[nongnu] elpa/magit updated (756a4de1c4 -> 0f59780478)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  756a4de1c4 Bump compat dependency
  adds  308a6cf87f magit-menu-set: Fix docstring typo
  adds  0f59780478 Cleanup uses of magit-menu-get

No new revisions were added by this update.

Summary of changes:
 lisp/magit-section.el   | 2 +-
 lisp/magit-submodule.el | 2 +-
 lisp/magit-worktree.el  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[elpa] externals/phps-mode 99fbd99129 08/12: Passing more advanced case of narrow-to-defun

[Christian Johansson]

branch: externals/phps-mode
commit 99fbd9912997ac1e95494556e7b51c2c37535bac
Author: Christian Johansson 
Commit: Christian Johansson 

Passing more advanced case of narrow-to-defun
---
 phps-mode-lex-analyzer.el   | 57 -
 test/phps-mode-test-lex-analyzer.el |  2 +-
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 634af06d69..deeb62ac47 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1520,7 +1520,7 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
   (while (and found-index (< index iterations))
 (if
 (search-backward-regexp
- "\n[\t ]*function[\t\n ]+[A-Za-Z_[:nonascii:]]"
+ "[\n\t ]+function\\([\t\n ]+\\|(\\)"
  nil
  t)
 (progn
@@ -1542,8 +1542,10 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
   (when (phps-mode-lex-analyzer--beginning-of-defun)
 (let ((beginning (point))
   (bracket-level 0)
-  (found-initial-bracket))
+  (found-initial-bracket)
+  (failed-to-find-ending-quote))
   (while (and
+  (not failed-to-find-ending-quote)
   (or
(not found-initial-bracket)
(not (= bracket-level 0)))
@@ -1557,12 +1559,53 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
((string= match-string "}")
 (setq bracket-level (1- bracket-level)))
((string= match-string "\"")
-
-;; TODO Handle double quoted string here
-)
+(let ((is-escaped)
+  (quote-ending-at))
+  (save-excursion
+(backward-char 2)
+(while (looking-at-p "")
+  (setq is-escaped (not is-escaped))
+  (backward-char)))
+  (unless is-escaped
+(save-excursion
+  (while (and
+  (not quote-ending-at)
+  (search-forward-regexp "\"" nil t))
+(let ((is-escaped-ending))
+  (save-excursion
+(backward-char 2)
+(while (looking-at-p "")
+  (setq is-escaped-ending (not is-escaped-ending))
+  (backward-char)))
+  (unless is-escaped-ending
+(setq quote-ending-at (point)))
+  (if quote-ending-at
+  (goto-char quote-ending-at)
+(setq failed-to-find-ending-quote t
((string= match-string "'")
-;; TODO Handle single-quoted string here
-
+(let ((is-escaped)
+  (quote-ending-at))
+  (save-excursion
+(backward-char 2)
+(while (looking-at-p "")
+  (setq is-escaped (not is-escaped))
+  (backward-char)))
+  (unless is-escaped
+(save-excursion
+  (while (and
+  (not quote-ending-at)
+  (search-forward-regexp "'" nil t))
+(let ((is-escaped-ending))
+  (save-excursion
+(backward-char 2)
+(while (looking-at-p "")
+  (setq is-escaped-ending (not is-escaped-ending))
+  (backward-char)))
+  (unless is-escaped-ending
+(setq quote-ending-at (point)))
+  (if quote-ending-at
+  (goto-char quote-ending-at)
+(setq failed-to-find-ending-quote t)))
   (when (and
  (= bracket-level 0)
  found-initial-bracket)
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index bff8959257..1d0f95a834 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -169,7 +169,7 @@
(should (equal (point-max) 48)))
 
   (phps-mode-test--with-buffer
-   "

[elpa] externals/phps-mode cef3c1b3f7 06/12: More work on end-of-defun implementation

[Christian Johansson]

branch: externals/phps-mode
commit cef3c1b3f7597cc9fc63baed53cf6798c5527a92
Author: christian 
Commit: christian 

More work on end-of-defun implementation
---
 phps-mode-lex-analyzer.el   | 54 -
 test/phps-mode-test-lex-analyzer.el |  1 +
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 660ac3f38f..d594334b0c 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1528,17 +1528,59 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
   (setq found-index (point)))
   (setq found-index nil))
 (setq index (1+ index
-(when found-index
-  (goto-char found-index))
 (if found-index
-t
+(progn
+  (goto-char found-index)
+  t)
   nil)))
 
 (defun phps-mode-lex-analyzer--end-of-defun (&optional arg interactive)
   "Custom implementation of `end-of-defun'."
-  ;; TODO Implement this
-  ;; TODO should start from beginning-of-defun and scan until balance of 
brackets
-  )
+  (let ((found-index))
+(save-excursion
+  (when (phps-mode-lex-analyzer--beginning-of-defun)
+(let ((beginning (point))
+  (bracket-level 0)
+  (found-initial-bracket)
+  (next-bracket (search-forward-regexp "[{}\"']" nil t)))
+  (message "beginning: %S" beginning)
+  (while (and
+  next-bracket
+  (or
+   (not found-initial-bracket)
+   (not (= bracket-level 0
+(let ((match-string (match-string 0)))
+  (message "match-string: %S" match-string)
+  (cond
+   ((string= match-string "{")
+(unless found-initial-bracket
+  (setq found-initial-bracket t))
+(setq bracket-level (1+ bracket-level)))
+   ((string= match-string "}")
+(setq bracket-level (1- bracket-level)))
+   ((string= match-string "\"")
+;; TODO Handle double quoted string here
+)
+   ((string= match-string "'")
+;; TODO Handle single-quoted string here
+)))
+(unless (and
+ found-initial-bracket
+ (= bracket-level 0))
+  (setq
+   next-bracket
+   (search-forward-regexp "[{}\"']" nil t
+  (when (and
+ (= bracket-level 0)
+ found-initial-bracket)
+(setq
+ found-index
+ (point))
+(if found-index
+(progn
+  (goto-char found-index)
+  t)
+  nil)))
 
 (provide 'phps-mode-lex-analyzer)
 
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index 07552ec662..946903be63 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -157,6 +157,7 @@
 
   (phps-mode-test--with-buffer
"

[elpa] externals/phps-mode f197368bb7 04/12: Started custom implementation of beginning-of-defun

[Christian Johansson]

branch: externals/phps-mode
commit f197368bb77b3d2b870a09ee76b41153b621e1c2
Author: christian 
Commit: christian 

Started custom implementation of beginning-of-defun
---
 TODO.md |  2 --
 phps-mode-lex-analyzer.el   | 27 +++
 test/phps-mode-test-lex-analyzer.el | 13 +
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/TODO.md b/TODO.md
index a0231eb4b7..728dd9ec14 100644
--- a/TODO.md
+++ b/TODO.md
@@ -33,6 +33,4 @@
 ## Other
 
 * Support for mmm-mode or similar?
-* Make narrow-to-defun work in case character 26 in
-  

[elpa] externals/phps-mode updated (a32f68a0d4 -> 7619526596)

[Christian Johansson]

cjohansson pushed a change to branch externals/phps-mode.

  from  a32f68a0d4 Updated version to 0.4.37 and date
   new  295cd646d3 Added TODO item
   new  1bb2af276e Started on support for narrow-to-defun
   new  3c0de0167e Merge branch 'master' of git.cvj.se:git/emacs-phps-mode
   new  f197368bb7 Started custom implementation of beginning-of-defun
   new  da43f8d5ad More work on beginning-of-defun
   new  cef3c1b3f7 More work on end-of-defun implementation
   new  34f36e6b43 Passing basic test narrow-to-defun, end-of-defun, 
beginning-of-defun
   new  99fbd99129 Passing more advanced case of narrow-to-defun
   new  8587c24bbd Passing tests for beginning-of-defun, end-of-defun and 
narrow-to-defun
   new  e7c6888248 Improved end-of-defun, beginning-of-defun and 
narrow-to-defun by taking commented out code into account
   new  72eec26571 Made test output more pedagogical
   new  7619526596 Updated version and changelog for 0.4.38


Summary of changes:
 TODO.md |   1 +
 phps-mode-lex-analyzer.el   | 120 
 phps-mode.el|  14 -
 test/phps-mode-test-ast.el  |   2 +-
 test/phps-mode-test-lex-analyzer.el |  58 +
 test/phps-mode-test-parser.el   |  12 ++--
 6 files changed, 197 insertions(+), 10 deletions(-)

[elpa] externals/phps-mode da43f8d5ad 05/12: More work on beginning-of-defun

[Christian Johansson]

branch: externals/phps-mode
commit da43f8d5ad887f741656b936cc0b52ae21873cc9
Author: christian 
Commit: christian 

More work on beginning-of-defun
---
 phps-mode-lex-analyzer.el   | 5 -
 test/phps-mode-test-lex-analyzer.el | 7 ---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 024ab78cf2..660ac3f38f 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1530,11 +1530,14 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
 (setq index (1+ index
 (when found-index
   (goto-char found-index))
-found-index))
+(if found-index
+t
+  nil)))
 
 (defun phps-mode-lex-analyzer--end-of-defun (&optional arg interactive)
   "Custom implementation of `end-of-defun'."
   ;; TODO Implement this
+  ;; TODO should start from beginning-of-defun and scan until balance of 
brackets
   )
 
 (provide 'phps-mode-lex-analyzer)
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index 5480b97282..07552ec662 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -158,9 +158,10 @@
   (phps-mode-test--with-buffer
"

[elpa] externals/phps-mode 1bb2af276e 02/12: Started on support for narrow-to-defun

[Christian Johansson]

branch: externals/phps-mode
commit 1bb2af276e29022c1f8be47e105d72afa34d21e2
Author: Christian Johansson 
Commit: Christian Johansson 

Started on support for narrow-to-defun
---
 phps-mode.el | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/phps-mode.el b/phps-mode.el
index 6c681d3e41..c40503b025 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -52,7 +52,7 @@
 (require 'phps-mode-syntax-table)
 
 (defvar phps-mode-idle-interval 1
-  "Idle seconds before running the incremental lexer.")
+  "Idle seconds before running the incremental parser.")
 
 (defvar phps-mode-use-psr-2 t
   "Whether to use PSR-2 guidelines for white-space or not.")
@@ -206,6 +206,14 @@
imenu-create-index-function
#'phps-mode-lex-analyzer--imenu-create-index)
 
+  ;; Beginning and ending of defun:s
+  (setq-local
+   beginning-of-defun-function
+   #'phps-mode-lex-analyzer--beginning-of-defun)
+  (setq-local
+   end-of-defun-function
+   #'phps-mode-lex-analyzer--end-of-defun)
+
   ;; Should we follow PSR-2?
   (when phps-mode-use-psr-2
 

[elpa] externals/phps-mode 34f36e6b43 07/12: Passing basic test narrow-to-defun, end-of-defun, beginning-of-defun

[Christian Johansson]

branch: externals/phps-mode
commit 34f36e6b43a9a78fd5338632b2f88e76bcb394e9
Author: Christian Johansson 
Commit: Christian Johansson 

Passing basic test narrow-to-defun, end-of-defun, beginning-of-defun
---
 phps-mode-lex-analyzer.el   | 19 ++-
 test/phps-mode-test-lex-analyzer.el | 21 +++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index d594334b0c..634af06d69 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1516,6 +1516,7 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
 (index 0)
 (found-index t))
 (save-excursion
+  (move-end-of-line nil)
   (while (and found-index (< index iterations))
 (if
 (search-backward-regexp
@@ -1541,16 +1542,13 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
   (when (phps-mode-lex-analyzer--beginning-of-defun)
 (let ((beginning (point))
   (bracket-level 0)
-  (found-initial-bracket)
-  (next-bracket (search-forward-regexp "[{}\"']" nil t)))
-  (message "beginning: %S" beginning)
+  (found-initial-bracket))
   (while (and
-  next-bracket
   (or
(not found-initial-bracket)
-   (not (= bracket-level 0
+   (not (= bracket-level 0)))
+  (search-forward-regexp "[{}\"']" nil t))
 (let ((match-string (match-string 0)))
-  (message "match-string: %S" match-string)
   (cond
((string= match-string "{")
 (unless found-initial-bracket
@@ -1559,17 +1557,12 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
((string= match-string "}")
 (setq bracket-level (1- bracket-level)))
((string= match-string "\"")
+
 ;; TODO Handle double quoted string here
 )
((string= match-string "'")
 ;; TODO Handle single-quoted string here
-)))
-(unless (and
- found-initial-bracket
- (= bracket-level 0))
-  (setq
-   next-bracket
-   (search-forward-regexp "[{}\"']" nil t
+
   (when (and
  (= bracket-level 0)
  found-initial-bracket)
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index 946903be63..bff8959257 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -157,12 +157,29 @@
 
   (phps-mode-test--with-buffer
"

[elpa] externals/phps-mode 295cd646d3 01/12: Added TODO item

[Christian Johansson]

branch: externals/phps-mode
commit 295cd646d3e42c9eea8b313b5b6d74ed5613123c
Author: Christian Johansson 
Commit: Christian Johansson 

Added TODO item
---
 TODO.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TODO.md b/TODO.md
index 930248b8a0..a0231eb4b7 100644
--- a/TODO.md
+++ b/TODO.md
@@ -33,3 +33,6 @@
 ## Other
 
 * Support for mmm-mode or similar?
+* Make narrow-to-defun work in case character 26 in
+  

[elpa] externals/phps-mode e7c6888248 10/12: Improved end-of-defun, beginning-of-defun and narrow-to-defun by taking commented out code into account

[Christian Johansson]

branch: externals/phps-mode
commit e7c6888248a228604d8d619200a554017c46abf5
Author: Christian Johansson 
Commit: Christian Johansson 

Improved end-of-defun, beginning-of-defun and narrow-to-defun by taking 
commented out code into account
---
 phps-mode-lex-analyzer.el   | 13 ++---
 test/phps-mode-test-lex-analyzer.el | 13 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index e3b66ba516..33b8826faa 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1554,8 +1554,8 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
 (or
  (not found-initial-bracket)
  (not (= bracket-level 0)))
-(search-forward-regexp "[{}\"']" nil t))
-  (let ((match-string (match-string 0)))
+(search-forward-regexp "\\(/\\*\\|[{}\"'#]\\|//\\)" nil t))
+  (let ((match-string (match-string-no-properties 0)))
 (cond
  ((string= match-string "{")
   (unless found-initial-bracket
@@ -1610,7 +1610,14 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
   (setq quote-ending-at (point)))
 (if quote-ending-at
 (goto-char quote-ending-at)
-  (setq failed-to-find-ending-quote t)))
+  (setq failed-to-find-ending-quote t
+ ((or
+   (string= match-string "#")
+   (string= match-string "//"))
+  (forward-line)
+  )
+ ((string= match-string "/*")
+  (search-forward-regexp "\\*/" nil t)
 (when (and
(= bracket-level 0)
found-initial-bracket)
diff --git a/test/phps-mode-test-lex-analyzer.el 
b/test/phps-mode-test-lex-analyzer.el
index f906f9dc54..02c460054a 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -194,6 +194,19 @@
(should (equal (point-min) 20))
(should (equal (point-max) 58)))
 
+  (phps-mode-test--with-buffer
+   "

[elpa] externals/phps-mode 72eec26571 11/12: Made test output more pedagogical

[Christian Johansson]

branch: externals/phps-mode
commit 72eec265710ff9a2e59d74bab4f75ca6ff042d18
Author: Christian Johansson 
Commit: Christian Johansson 

Made test output more pedagogical
---
 test/phps-mode-test-ast.el|  2 +-
 test/phps-mode-test-parser.el | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/phps-mode-test-ast.el b/test/phps-mode-test-ast.el
index f9934bd37f..b3f65df7ba 100644
--- a/test/phps-mode-test-ast.el
+++ b/test/phps-mode-test-ast.el
@@ -24,7 +24,7 @@
name
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index 654c5f00ad..ff00ce3ad1 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -75,7 +75,7 @@
(lambda()
 
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
@@ -128,7 +128,7 @@
"Advanced echo test with 2 echo sections"
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
@@ -149,7 +149,7 @@
"Simple function defintion"
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
@@ -170,7 +170,7 @@
"Simple function defintion inside un-bracketed namespace"
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
@@ -191,7 +191,7 @@
"Simple function defintion inside bracketed namespace"
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number
@@ -212,7 +212,7 @@
"Simple function defintion and property inside class inside non-bracketed 
namespace"
(lambda()
  (let ((parse (phps-mode-parser-parse)))
-   (message "Left-to-right with right-most derivation:\n%S\n" parse)
+   (message "Left-to-right parse with right-most derivation in 
reverse:\n%S\n" parse)
(dolist (production-number parse)
  (let ((production
 (phps-mode-parser--get-grammar-production-by-number

[elpa] externals/phps-mode 8587c24bbd 09/12: Passing tests for beginning-of-defun, end-of-defun and narrow-to-defun

[Christian Johansson]

branch: externals/phps-mode
commit 8587c24bbddb547d4178b263d9589615cf62ece3
Author: Christian Johansson 
Commit: Christian Johansson 

Passing tests for beginning-of-defun, end-of-defun and narrow-to-defun
---
 phps-mode-lex-analyzer.el   | 165 +++-
 test/phps-mode-test-lex-analyzer.el |  13 +++
 2 files changed, 98 insertions(+), 80 deletions(-)

diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index deeb62ac47..e3b66ba516 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1518,100 +1518,105 @@ of performed operations.  Optionally do it 
FORCE-SYNCHRONOUS."
 (save-excursion
   (move-end-of-line nil)
   (while (and found-index (< index iterations))
-(if
+(setq found-index nil)
+(setq index (1+ index))
+(when
 (search-backward-regexp
  "[\n\t ]+function\\([\t\n ]+\\|(\\)"
  nil
  t)
-(progn
-  (search-forward-regexp
-   "[\n]+")
-  (setq found-index (point)))
-  (setq found-index nil))
-(setq index (1+ index
+  (search-forward-regexp "[\n]*")
+  (move-beginning-of-line nil)
+  (setq found-index (point)
 (if found-index
 (progn
   (goto-char found-index)
   t)
   nil)))
 
-(defun phps-mode-lex-analyzer--end-of-defun (&optional arg interactive)
+(defun phps-mode-lex-analyzer--end-of-defun (&optional arg _interactive)
   "Custom implementation of `end-of-defun'."
-  (let ((found-index))
+  (let ((found-index t)
+(index 0)
+(iterations (if arg arg 1)))
 (save-excursion
-  (when (phps-mode-lex-analyzer--beginning-of-defun)
-(let ((beginning (point))
-  (bracket-level 0)
-  (found-initial-bracket)
-  (failed-to-find-ending-quote))
-  (while (and
-  (not failed-to-find-ending-quote)
-  (or
-   (not found-initial-bracket)
-   (not (= bracket-level 0)))
-  (search-forward-regexp "[{}\"']" nil t))
-(let ((match-string (match-string 0)))
-  (cond
-   ((string= match-string "{")
-(unless found-initial-bracket
-  (setq found-initial-bracket t))
-(setq bracket-level (1+ bracket-level)))
-   ((string= match-string "}")
-(setq bracket-level (1- bracket-level)))
-   ((string= match-string "\"")
-(let ((is-escaped)
-  (quote-ending-at))
-  (save-excursion
-(backward-char 2)
-(while (looking-at-p "")
-  (setq is-escaped (not is-escaped))
-  (backward-char)))
-  (unless is-escaped
+  (while (and
+  found-index
+  (< index iterations))
+(setq found-index nil)
+(setq index (1+ index))
+(when (phps-mode-lex-analyzer--beginning-of-defun)
+  (let ((bracket-level 0)
+(found-initial-bracket)
+(failed-to-find-ending-quote))
+(while (and
+(not failed-to-find-ending-quote)
+(or
+ (not found-initial-bracket)
+ (not (= bracket-level 0)))
+(search-forward-regexp "[{}\"']" nil t))
+  (let ((match-string (match-string 0)))
+(cond
+ ((string= match-string "{")
+  (unless found-initial-bracket
+(setq found-initial-bracket t))
+  (setq bracket-level (1+ bracket-level)))
+ ((string= match-string "}")
+  (setq bracket-level (1- bracket-level)))
+ ((string= match-string "\"")
+  (let ((is-escaped)
+(quote-ending-at))
 (save-excursion
-  (while (and
-  (not quote-ending-at)
-  (search-forward-regexp "\"" nil t))
-(let ((is-escaped-ending))
-  (save-excursion
-(backward-char 2)
-(while (looking-at-p "")
-  (setq is-escaped-ending (not is-escaped-ending))
-  (backward-char)))
-  (unless is-escaped-ending
-(setq quote-ending-at (point)))
-  (if quote-ending-at
-  (goto-char quote-ending-at)
-(setq failed-to-find-ending-quote t
-   ((string= match-string "'")
-(let ((is-escaped)
-  (quote-ending-at))
-  (save-excursi

[elpa] externals/phps-mode 7619526596 12/12: Updated version and changelog for 0.4.38

[Christian Johansson]

branch: externals/phps-mode
commit 76195265965b92a3ce5a6faa178b625799fc3b2b
Author: christian 
Commit: christian 

Updated version and changelog for 0.4.38
---
 phps-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phps-mode.el b/phps-mode.el
index e6aef9f8c1..687fffdac2 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Christian Johansson 
 ;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
-;; Modified: 8 Feb 2023
-;; Version: 0.4.37
+;; Modified: 13 Feb 2023
+;; Version: 0.4.38
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode
 

[nongnu] elpa/sweeprolog 89f05c253f: MODIFIED: sweeprolog-update-dependencies choice of directives

[ELPA Syncer]

branch: elpa/sweeprolog
commit 89f05c253f285064a9bb05853cb2f5cced908811
Author: Eshel Yaron 
Commit: Eshel Yaron 

MODIFIED: sweeprolog-update-dependencies choice of directives

* sweeprolog.el (sweeprolog-dependency-directive): New user option.
Determines which directive to use in...
(sweeprolog-update-dependencies): Fix edge cases in finding where to
insert new directives. Optionally infer directive to add based on
current buffer contents.

* README.org (Managing Dependencies): Update section.
---
 README.org  |  24 +++-
 sweep.pl|   2 +-
 sweeprolog-tests.el | 133 +++-
 sweeprolog.el   | 170 ++--
 4 files changed, 268 insertions(+), 61 deletions(-)

diff --git a/README.org b/README.org
index ccd5355b71..3644f12039 100644
--- a/README.org
+++ b/README.org
@@ -1674,13 +1674,33 @@ sweeprolog-update-dependencies~ bound to ~C-c C-u~.
 - Key: C-c C-u (sweeprolog-update-dependencies) :: Add explicit
   dependencies for implicitly autoloaded predicates in the current
   buffer.
+#+VINDEX: sweeprolog-dependency-directive
+- User Option: sweeprolog-dependency-directive :: Determines which
+  Prolog directive to use in ~sweeprolog-update-dependencies~ when
+  adding new directives.  The value of this user option is one of the
+  symbols ~use-module~, ~autoload~ or ~infer~.  If it is ~use-module~,
+  ~sweeprolog-update-dependencies~ adds ~use_module/2~ directives,
+  ~autoload~ means to add ~autoload/2~ directives, and ~infer~ says to infer
+  which directive to use based on the existing dependency directives
+  in the buffer, if any.  Defaults to ~infer~.
 #+VINDEX: sweeprolog-note-implicit-autoloads
 - User Option: sweeprolog-note-implicit-autoloads :: If non-nil, have
   Flymake complain about implicitly autoloaded predicates in
   ~sweeprolog-mode~ buffers.
 
-This command analyzes the current buffer and adds or updates
-~autoload/2~ and ~use_module/2~ as needed.
+The command ~sweeprolog-update-dependencies~, bound to ~C-c C-u~, analyzes
+the current buffer and adds or updates ~autoload/2~ and ~use_module/2~ as
+needed.
+
+When this command adds a new directive, rather than updating an
+existing one, it can use either ~autoload/2~ or ~use_module/2~ to declare
+the new dependency based on the value of the user option
+~sweeprolog-dependency-directive~.  If you set this option is to
+~use-module~, new dependencies use the ~use_module/2~ directive.  If it's
+~autoload~, new dependencies use ~autoload/2~.  If it's ~infer~, as it is by
+default, new dependencies use ~autoload/2~ unless the buffer already
+contains dependency directives and they are all ~use_module/2~
+directives, in which case they also use ~use_module/2~.
 
 By default, when Flymake integration is enabled (see [[#diagnostics][Examining
 diagnostics]]), calls to implicitly autoloaded predicates are marked
diff --git a/sweep.pl b/sweep.pl
index 48a8c0dc0a..7f0fb340c1 100644
--- a/sweep.pl
+++ b/sweep.pl
@@ -192,7 +192,7 @@ sweep_analyze_region_(OneTerm, Offset, Stream, Path, _) :-
 sweep_handle_fragment(Offset, comment(Kind), Beg, Len) :-
 !,
 Start is Beg + Offset,
-asserta(sweep_current_comment(Kind, Start, Len)).
+assertz(sweep_current_comment(Kind, Start, Len)).
 sweep_handle_fragment(Offset, Col, Beg, Len) :-
 sweep_handle_fragment_(Offset, Col, Beg, Len).
 
diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 6f5f6bf949..42ebabaa3f 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -909,7 +909,7 @@ foo :- Body.
 "
 
 (ert-deftest update-dependencies-no-autoload ()
-  "Tests making adding a use_module/1 directive."
+  "Tests adding a use_module/2 directive."
   (let ((temp (make-temp-file "sweeprolog-test"
   nil
   "pl"
@@ -929,14 +929,12 @@ bar(X) :- arithmetic_function(X).
 (should (string= (buffer-string)
   "
 :- module(foo, [bar/1]).
+:- use_module(library(arithmetic), [arithmetic_function/1]).
 
 /**  Foo
 
 */
 
-:- use_module(library(arithmetic), [ arithmetic_function/1
-   ]).
-
 bar(X) :- arithmetic_function(X).
 "
 
@@ -979,6 +977,120 @@ bar(X) :- permutation(X, [1,2,3]).
 "
  
 
+(ert-deftest update-dependencies-without-inference ()
+  "Tests setting `sweeprolog-dependency-directive' to `autoload'."
+  (let ((temp (make-temp-file "sweeprolog-test"
+  nil
+  "pl"
+  "
+:- module(foo, [bar/1]).
+
+/**  Foo
+
+*/
+
+:- use_module(library(lists), [ member/2
+  ]).
+
+bar(X) :- member(X, [1,2,3]).
+bar(X) :- maplist(X, [1,2,3]).
+"
+  )))
+(find-file-literally temp)
+(sweeprolog-mode)
+(let ((sweeprolog-dependency-directive 'autoload))
+ (call-interact

[elpa] externals/compat c81ff6a92f: compat-29: with-narrowing -> with-restriction, without-restriction

[ELPA Syncer]

branch: externals/compat
commit c81ff6a92f74a4ca47da05db46f6b3f69882271e
Author: Daniel Mendler 
Commit: Daniel Mendler 

compat-29: with-narrowing -> with-restriction, without-restriction
---
 NEWS.org|  2 ++
 compat-29.el| 31 ++---
 compat-tests.el | 22 ++
 compat.texi | 72 +
 4 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 530759cd63..7532f7cb71 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -3,6 +3,8 @@
 * Development
 
 - compat-27: Drop obsolete ~compat-call dired-get-marked-files~.
+- compat-29: Add ~with-restriction~ and ~without-restriction~.
+- compat-29: Drop ~with-narrowing~.
 
 * Release of "Compat" Version 29.1.3.4
 
diff --git a/compat-29.el b/compat-29.el
index 9cf4a76981..d394f0934c 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -294,22 +294,37 @@ in order to restore the state of the local variables set 
via this macro.
   "Delete the current line."
   (delete-region (pos-bol) (pos-bol 2)))
 
-(compat-defmacro with-narrowing (start end &rest rest) ;; 

+(compat-defmacro with-restriction (start end &rest rest) ;; 

   "Execute BODY with restrictions set to START and END.
 
 The current restrictions, if any, are restored upon return.
 
-With the optional :locked TAG argument, inside BODY,
-`narrow-to-region' and `widen' can be used only within the START
-and END limits, unless the restrictions are unlocked by calling
-`narrowing-unlock' with TAG.  See `narrowing-lock' for a more
-detailed description.
+When the optional :label LABEL argument is present, in which
+LABEL is a symbol, inside BODY, `narrow-to-region' and `widen'
+can be used only within the START and END limits.  To gain access
+to other portions of the buffer, use `without-restriction' with the
+same LABEL argument.
 
-\(fn START END [:locked TAG] BODY)"
+\(fn START END [:label LABEL] BODY)"
   `(save-restriction
  (narrow-to-region ,start ,end)
  ;; Locking is ignored
- ,@(if (eq (car rest) :locked) (cddr rest) rest)))
+ ,@(if (eq (car rest) :label) (cddr rest) rest)))
+
+(compat-defmacro without-restriction (&rest rest) ;; 

+  "Execute BODY without restrictions.
+
+The current restrictions, if any, are restored upon return.
+
+When the optional :label LABEL argument is present, the
+restrictions set by `with-restriction' with the same LABEL argument
+are lifted.
+
+\(fn [:label LABEL] BODY)"
+  `(save-restriction
+ (widen)
+ ;; Locking is ignored
+ ,@(if (eq (car rest) :label) (cddr rest) rest)))
 
 (compat-defmacro with-memoization (place &rest code) ;; 

   "Return the value of CODE and stash it in PLACE.
diff --git a/compat-tests.el b/compat-tests.el
index 8ea2ce89b7..ba6cec4263 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -237,16 +237,30 @@
 (should-equal 'h (get-text-property 2 'help-echo))
 (should-equal 'h (get-text-property 6 'help-echo
 
-(ert-deftest with-narrowing ()
+  ;; TODO reenable if Emacs 29 nightly builds are updated
+(compat-tests--if (< emacs-major-version 29) (progn
+(ert-deftest with-restriction ()
   (with-temp-buffer
 (insert "abc")
-(with-narrowing 2 3 :locked 'foo
+(with-restriction 2 3 :label 'foo
   (should-equal "b" (buffer-string)))
 (should-equal "abc" (buffer-string))
-(with-narrowing 2 3
-(should-equal "b" (buffer-string)))
+(with-restriction 2 3
+  (should-equal "b" (buffer-string)))
 (should-equal "abc" (buffer-string
 
+(ert-deftest without-restriction ()
+  (with-temp-buffer
+(insert "abc")
+(narrow-to-region 2 3)
+(without-restriction :label 'foo
+  (should-equal "abc" (buffer-string)))
+(should-equal "b" (buffer-string))
+(without-restriction
+  (should-equal "abc" (buffer-string)))
+(should-equal "b" (buffer-string
+))
+
 (ert-deftest with-memoization ()
   (let ((x (cons nil nil)) y computed)
 (with-memoization (car x)
diff --git a/compat.texi b/compat.texi
index a15b3bd5fb..521ca1102b 100644
--- a/compat.texi
+++ b/compat.texi
@@ -2338,16 +2338,68 @@ evaluated and then stashed in @var{place}.  If 
@var{place}'s value is
 non-@code{nil}, return that value instead of evaluating @var{code}.
 @end defmac
 
-@c based on lisp/subr.el
-@defmac with-narrowing start end [:locked tag] &rest body
-Execute @var{body} with restrictions set to @var{start} and @var{end}.
-The current restrictions, if any, are restored upon return.  With the
-optional :locked @var{tag} argument, inside @var{tag},
-@code{narrow-to-region} and @code{widen} can be used only within the
-@var{start} and @var{end} limits, unless the restrictions are unlocked
-by calling @code{narrowing-unlock} with @var{tag}.  See
-@code{narrowing-lock} for a more detailed description.
-@end defmac
+@c copied from lispref/positions.texi
+@defspec with-restriction start end [:label label] body
+This special form saves the current bounds of the a

[elpa] externals/hyperbole 3bb91af97b: Remove some warnings (#306)

[ELPA Syncer]

branch: externals/hyperbole
commit 3bb91af97bde4636fdaf2b3b805ac10ac3feb6e3
Author: Mats Lidell 
Commit: GitHub 

Remove some warnings (#306)
---
 ChangeLog   | 8 
 hversion.el | 4 ++--
 hyrolo.el   | 4 ++--
 kotl/kexport.el | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e89651468c..de96e001f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-02-13  Mats Lidell  
+
+* hversion.el (id-info-item): Use two args with looking-back.
+
+* hyrolo.el (hyrolo-kill): Set unused lexical var to _level-len
+
+* kotl/kexport.el (kexport:html): Remove unused lexical var is-collapsible.
+
 2023-02-12  Bob Weiner  
 
 * hibtypes.el (grep-msg): Fix problem where filename match includes trailing 
line
diff --git a/hversion.el b/hversion.el
index e526d3c338..a052bc3645 100644
--- a/hversion.el
+++ b/hversion.el
@@ -4,7 +4,7 @@
 ;; Maintainer:   Bob Weiner, Mats Lidell
 ;;
 ;; Orig-Date: 1-Jan-94
-;; Last-Mod:  4-Dec-22 at 03:57:42 by Bob Weiner
+;; Last-Mod: 12-Feb-23 at 22:40:12 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -202,7 +202,7 @@ support is available."
   ;; after the non-indented item definition line. If
   ;; so, move back a line.
   (when (and (looking-at "^[ \t]")
- (looking-back "^[^ \t].*[\n\r]+"))
+ (looking-back "^[^ \t].*[\n\r]+" nil))
 (forward-line -1))
   (recenter 0))
   (error "(id-info-item): Invalid Info index item: `%s'" 
index-item)))
diff --git a/hyrolo.el b/hyrolo.el
index a95ca85707..3fa329c202 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 7-Jun-89 at 22:08:29
-;; Last-Mod: 12-Feb-23 at 23:13:31 by Bob Weiner
+;; Last-Mod: 14-Feb-23 at 00:01:58 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -675,7 +675,7 @@ Return t if entry is killed, nil otherwise."
  (setq file buffer-file-name)
  (if (file-writable-p file)
  (let ((kill-op
-(lambda (start level-len)
+(lambda (start _level-len)
   (kill-region
start (hyrolo-to-entry-end t))
   (setq killed t)
diff --git a/kotl/kexport.el b/kotl/kexport.el
index b06aa94159..c32a06cf4f 100644
--- a/kotl/kexport.el
+++ b/kotl/kexport.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:26-Feb-98
-;; Last-Mod:  5-Feb-23 at 22:45:12 by Mats Lidell
+;; Last-Mod: 12-Feb-23 at 22:15:49 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -462,7 +462,7 @@ used.  Also converts Urls and Klinks into Html hyperlinks.
 ">" ">"
 (replace-regexp-in-string
  "<" "<" (kview:label-separator kview
-  i is-parent is-collapsible is-last-sibling no-sibling-stack 
level label contents)
+  i is-parent is-last-sibling no-sibling-stack level label 
contents)
  (kview:map-tree
   (lambda (_kview)
 (setq level (kcell-view:level)

[elpa] elpa-admin cc282fac33: * elpa-admin.el (elpaa--batch-fetch-and): Obey `:manual-sync`

[Stefan Monnier via]

branch: elpa-admin
commit cc282fac33515235f7e1971ba99b16b9a216b771
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--batch-fetch-and): Obey `:manual-sync`
---
 elpa-admin.el | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index e1b7834009..f4c8430e6c 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2760,9 +2760,11 @@ relative to elpa root."
   (let* ((specs (elpaa--get-specs))
  (pkgs (mapcar #'intern command-line-args-left))
  (show-diverged (not (cdr pkgs)))
- (condition ':))
+ (condition ':)
+ (all nil))
 (setq command-line-args-left nil)
 (when (and (null (cdr pkgs)) (keywordp (car pkgs)))
+  (setq all t)
   (setq show-diverged nil)
   (setq condition (car pkgs))
   (setq pkgs (mapcar #'car specs)))
@@ -2773,7 +2775,10 @@ relative to elpa root."
   (elpaa--spec-get pkg-spec condition))
   ;; (unless (file-directory-p (expand-file-name pkg "packages"))
   ;;   (elpaa--worktree-sync pkg-spec))
-  (elpaa--fetch pkg-spec k show-diverged)))
+  (elpaa--fetch pkg-spec
+(if (and all (elpaa--spec-get pkg-spec :manual-sync))
+#'ignore k)
+show-diverged)))
 
 (defun elpaa-batch-fetch-and-show (&rest _)
   (elpaa--batch-fetch-and #'ignore))

[elpa] main 6e7f81efc8: * elpa-packages: Use `:manual-sync` i.s.o `:auto-sync nil`

[Stefan Monnier via]

branch: main
commit 6e7f81efc808223e8691a7c3a3deb799d94118ce
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages: Use `:manual-sync` i.s.o `:auto-sync nil`
---
 elpa-packages | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index ddd93ff2cb..66eb2c8b61 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -76,7 +76,7 @@
   :auto-sync t)
  (auctex   :url "https://git.savannah.gnu.org/git/auctex.git";
   ;; AUCTeX is currently sync'd manually and elpa.git isn't quite a mirror :-(
-  :auto-sync nil)
+  :manual-sync t)
  (aumix-mode   :url nil)
  (auto-correct :url nil)
  (auto-overlays:url 
"http://www.dr-qubit.org/git/predictive.git";
@@ -90,7 +90,7 @@
   :doc "doc/bbdb.texi"
   ;; The BBDB branch in elpa.git is managed directly by hand, with
   ;; a "parallel" history to that of the upstream.
-  :auto-sync nil)
+  :manual-sync t)
  (beacon   :url "https://github.com/Malabarba/beacon";
   :auto-sync t)
  (beframe  :url "https://git.sr.ht/~protesilaos/beframe";
@@ -143,7 +143,7 @@
  (chess:url 
"https://github.com/jwiegley/emacs-chess.git";
   :doc "chess.texi"
   ;; FIXME: The two versions are badly out of sync.
-  :auto-sync nil)
+  :manual-sync t)
  (cl-generic   :url nil)
  (cl-lib   :url nil)
  ;; The `cl-print' code doesn't try to work outside of Emacs any more.
@@ -304,7 +304,9 @@
   :auto-sync t)
  (engrave-faces:url 
"https://github.com/tecosaur/engrave-faces.git";
   :auto-sync t)
- (enwc :url "hg::https://hg.savannah.nongnu.org/hgweb/enwc/";)
+ (enwc :url "hg::https://hg.savannah.nongnu.org/hgweb/enwc/";
+  ;; The Hg<->Git bridge wasn't working well enough last time I tried.
+  :manual-sync t)
  (epoch-view   :url nil)
  (erc  :core ("lisp/erc/"
"doc/emacs/doclicense.texi"
@@ -542,7 +544,7 @@
   :auto-sync t)
  (org-edna :url "bzr::https://bzr.savannah.gnu.org/r/org-edna-el";
   ;; The Bzr<->Git bridge wasn't working well enough last time I tried.
-  :auto-sync nil)
+  :manual-sync t)
  ;; FIXME: Waiting for copyright paperwork from Brandon Webster.
  ;;(org-drill  :url "https://gitlab.com/phillord/org-drill";
  ;; :auto-sync t)
@@ -574,7 +576,9 @@
   :ignored-files ("LICENSE"))
  (other-frame-window   :url nil)
  (pabbrev  :url "https://github.com/phillord/pabbrev.git";)
- (paced:url 
"bzr::bzr://bzr.savannah.nongnu.org/paced-el/trunk")
+ (paced:url 
"bzr::bzr://bzr.savannah.nongnu.org/paced-el/trunk"
+  ;; The Bzr<->Git bridge wasn't working well enough last time I tried.
+  :manual-sync t)
  (package-fixes:url nil)
  (parsec   :url "https://github.com/cute-jumper/parsec.el.git";)
  (parser-generator :url 
"https://github.com/cjohansson/emacs-parser-generator";
@@ -593,7 +597,7 @@
  (phps-mode:url "https://github.com/cjohansson/emacs-phps-mode";
   ;; Christian Johansson works on a private Git and pushes to both Github
   ;; and elpa.git anyway, so there's no need to auto-sync.
-  :auto-sync nil)
+  :manual-sync t)
  (pinentry :url "https://github.com/ueno/pinentry-el.git";)
  (plz  :url "https://github.com/alphapapa/plz.el.git";
   :ignored-files ("LICENSE")
@@ -783,7 +787,7 @@
  (tramp-theme  :url nil)
  (transcribe   :url nil)
  (transient:url "https://github.com/magit/transient";
-  :auto-sync nil ;;Prefers manual control.
+  :manual-sync t ;;Author prefers manual control.
   :lisp-dir "lisp"
   :renames (("docs/" ""))
   :news "CHANGELOG"

[elpa] main 6c08b29abd: * elpa-packages: Mark swiper's packages as :manual-sync`

[Stefan Monnier via]

branch: main
commit 6c08b29abd528ec252d2c2463a914b9b32204d0a
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages: Mark swiper's packages as :manual-sync`
---
 elpa-packages | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 50f035d6f1..13772dd039 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -415,11 +415,16 @@
   :auto-sync t)
  (iterators:url nil)
  (ivy  :url "https://github.com/abo-abo/swiper";
+  :manual-sync t
   :renames (("doc/" ""))
   :doc "doc/ivy.texi")
- (ivy-avy  :url "https://github.com/abo-abo/swiper";)
+ (ivy-avy  :url "https://github.com/abo-abo/swiper";
+  :manual-sync t
+  )
  (ivy-explorer :url "https://github.com/clemera/ivy-explorer";)
- (ivy-hydra:url "https://github.com/abo-abo/swiper";)
+ (ivy-hydra:url "https://github.com/abo-abo/swiper";
+  :manual-sync t
+  )
  (ivy-posframe :url "https://github.com/tumashu/ivy-posframe";
   :auto-sync t)
  (jarchive :url "https://git.sr.ht/~dannyfreeman/jarchive";
@@ -742,7 +747,9 @@
   :auto-sync t)
  (svg-tag-mode :url "https://github.com/rougier/svg-tag-mode";
   :auto-sync t)
- (swiper   :url "https://github.com/abo-abo/swiper";)
+ (swiper   :url "https://github.com/abo-abo/swiper";
+  :manual-sync t
+  )
  (sxhkdrc-mode :url "https://git.sr.ht/~protesilaos/sxhkdrc-mode";
   :auto-sync t
   :readme "README.md"

[elpa] elpa-admin 2febc25ea6: * elpa-admin.el: Another tweak for `:manual-sync`

[Stefan Monnier via]

branch: elpa-admin
commit 2febc25ea69681f0932355cbe14f2cbcb34ac3a4
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Another tweak for `:manual-sync`

* elpa-admin.el (elpaa--batch-fetch-and): Don't bother fetching
packages that are `:manual-sync` either.
(elpaa--merge): Don't burp on symbols for package names.
---
 elpa-admin.el | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index f4c8430e6c..770006cfdc 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2691,7 +2691,7 @@ relative to elpa root."
  default-directory)
 nil)
 (let* ((pkg (car pkg-spec))
-   (wt (expand-file-name pkg "packages"))
+   (wt (expand-file-name (format "packages/%s" pkg)))
(merge-branch (format "elpa--merge/%s" pkg))
last-release)
   ;; When the upstream changes includes changes to `Version:'), try to
@@ -2771,14 +2771,12 @@ relative to elpa root."
 (dolist (pkg pkgs)
   (let* ((pkg-spec (elpaa--get-package-spec pkg specs)))
 (cond
+ ((and all (elpaa--spec-get pkg-spec :manual-sync)) nil) ;Skip.
  ((or (eq condition ':)
   (elpaa--spec-get pkg-spec condition))
   ;; (unless (file-directory-p (expand-file-name pkg "packages"))
   ;;   (elpaa--worktree-sync pkg-spec))
-  (elpaa--fetch pkg-spec
-(if (and all (elpaa--spec-get pkg-spec :manual-sync))
-#'ignore k)
-show-diverged)))
+  (elpaa--fetch pkg-spec k show-diverged)))
 
 (defun elpaa-batch-fetch-and-show (&rest _)
   (elpaa--batch-fetch-and #'ignore))

[elpa] externals/avy 9ae059deaa 04/31: .github/FUNDING.yml: Add

[ELPA Syncer]

branch: externals/avy
commit 9ae059deaa1b5076096bcbdbf01af763a7278aff
Author: Oleh Krehel 
Commit: Oleh Krehel 

.github/FUNDING.yml: Add
---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00..b9a5b68820
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+liberapay: abo-abo
+patreon: abo_abo

[elpa] externals/avy updated (c4adda8ca5 -> 9b1f0bc427)

[ELPA Syncer]

elpasync pushed a change to branch externals/avy.

  from  c4adda8ca5 * avy/targets/checkdoc.el, ivy/doc/scripts.el: copyright 
tweak
   new  8686845ed9 avy.el (avy-flyspell-correct-function): Add
   new  f91ae613a8 avy.el (avy-goto-line): Call avy-action-goto only when 
avy-action is not set
   new  aadca9308a avy.el (avy-resume): Work better for avy-goto-timer
   new  9ae059deaa .github/FUNDING.yml: Add
   new  343fc42de1 avy.el (avy-process): Return nil on "C-g" and "ESC"
   new  66886e265c avy.el (avy-read): Don't call `avy--key-to-char' too 
early
   new  01a311ca6a avy.el: Get rid of magic char numbers
   new  27d1af3fa6 avy.el (avy-goto-whitespace-end): New command
   new  034de4c0e9 avy.el: Add -above and -below versions of 
avy-goto-whitespace-end
   new  5127f993f9 avy.el (avy-process): Restart on fail for avy-style 
'words
   new  455ebec6f3 avy.el (avy-process): Amend last commit for 
avy-goto-char-timer
   new  5f2eba5f59 avy.el (avy-isearch): Bind avy-case-fold-search to 
case-fold-search
   new  87394c9a88 avy.el (avy-isearch): Return relevant result
   new  f9c15c573c Fix subword commands with custom order.
   new  cf95ba9582 avy.el (avy-with): Fix typo in doc-string
   new  3bf83140fa avy.el (avy-goto-line): Can cancel with ESC
   new  954774d6e9 avy.el (avy-action-yank-line): Add and bind to "Y"
   new  aa35412375 avy.el (avy--line-cands): Don't set temporary-goal-column
   new  509471bad0 avy.el (avy-text): Store the avy-goto-char-timer text
   new  acf553cae2 avy.el (avy--overlay-pre): Fix conflict with 
visual-line-mode
   new  36a48baa2c avy.el (avy-goto-char-2): Allow backspace
   new  f34ff764aa avy.el (avy-escape-chars): Add defcustom
   new  2dde8b71a0 avy.el (avy-process): Add autoload
   new  bbf1e7339e avy.el (avy-order-closest): Work with avy-goto-line
   new  e92cb37457 avy.el (avy-transpose-lines-in-region): Add
   new  6b53033883 Add GNU ELPA badge to README.md
   new  ba5f035be3 Fix two byte-compiler warnings
   new  fd7b02f556 Add `avy-action-oneshot` variable to redefine avy-action 
locally
   new  6f9eefadc9 avy.el (avy-process): Assume avy-action-oneshot will be 
let-bound
   new  955c8dedd6 avy.el (avy--overlay): Avoid error on empty string
   new  9b1f0bc427 Merge remote-tracking branch 
'refs/remotes/upstream/avy/main' into elpa--merge/avy


Summary of changes:
 .github/FUNDING.yml |   2 +
 README.md   |   1 +
 avy.el  | 260 
 3 files changed, 185 insertions(+), 78 deletions(-)
 create mode 100644 .github/FUNDING.yml

[elpa] externals/avy ba5f035be3 27/31: Fix two byte-compiler warnings

[ELPA Syncer]

branch: externals/avy
commit ba5f035be33693d1a136a5cbeedb24327f551a92
Author: Stefan Kangas 
Commit: Oleh Krehel 

Fix two byte-compiler warnings

Fixes #336
---
 avy.el | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/avy.el b/avy.el
index be2432eb65..5d0bc9ebb9 100644
--- a/avy.el
+++ b/avy.el
@@ -494,8 +494,8 @@ KEYS is the path from the root of `avy-tree' to LEAF."
   "Store the current incomplete path during `avy-read'.")
 
 (defun avy-mouse-event-window (char)
-  "If CHAR is a mouse event, return the window of the event if any or the 
selected window.
-Return nil if not a mouse event."
+  "Return the window of mouse event CHAR if any or the selected window.
+Return nil if CHAR is not a mouse event."
   (when (mouse-event-p char)
 (cond ((windowp (posn-window (event-start char)))
(posn-window (event-start char)))
@@ -1605,7 +1605,8 @@ Which one depends on variable `subword-mode'."
 (defvar visual-line-mode)
 
 (defcustom avy-indent-line-overlay nil
-  "When non-nil, `avy-goto-line' will display the line overlay next to the 
first non-whitespace character of each line."
+  "When non-nil, display line overlay next to the first non-whitespace 
character.
+This affects `avy-goto-line'."
   :type 'boolean)
 
 (defun avy--line-cands (&optional arg beg end bottom-up)

[elpa] externals/avy 455ebec6f3 11/31: avy.el (avy-process): Amend last commit for avy-goto-char-timer

[ELPA Syncer]

branch: externals/avy
commit 455ebec6f30964dc124f0574326d1f7367a0c2f2
Author: Oleh Krehel 
Commit: Oleh Krehel 

avy.el (avy-process): Amend last commit for avy-goto-char-timer

Re #283
---
 avy.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avy.el b/avy.el
index 27680da511..546c2aecaf 100644
--- a/avy.el
+++ b/avy.el
@@ -863,7 +863,7 @@ multiple OVERLAY-FN invocations."
 (res (avy--process-1 candidates overlay-fn cleanup-fn)))
 (cond
   ((null res)
-   (if (eq avy-style 'words)
+   (if (and (eq avy-style 'words) candidates)
(avy-process original-cands overlay-fn cleanup-fn)
  (message "zero candidates")
  t))

[elpa] externals/avy 87394c9a88 13/31: avy.el (avy-isearch): Return relevant result

[ELPA Syncer]

branch: externals/avy
commit 87394c9a880104a08d0f0e2d4149ac2d70cc192f
Author: Oleh Krehel 
Commit: Oleh Krehel 

avy.el (avy-isearch): Return relevant result

Fixes #281
---
 avy.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/avy.el b/avy.el
index 3096e3d33f..8f76e293d1 100644
--- a/avy.el
+++ b/avy.el
@@ -1351,11 +1351,12 @@ When ARG is non-nil, do the opposite of 
`avy-all-windows'."
   (avy-with avy-isearch
 (let ((avy-background nil)
   (avy-case-fold-search case-fold-search))
-  (avy-process
-   (avy--regex-candidates (if isearch-regexp
-  isearch-string
-(regexp-quote isearch-string
-  (isearch-done
+  (prog1
+  (avy-process
+   (avy--regex-candidates (if isearch-regexp
+  isearch-string
+(regexp-quote isearch-string
+(isearch-done)
 
 ;;;###autoload
 (defun avy-goto-word-0 (arg &optional beg end)

[elpa] externals/avy 5127f993f9 10/31: avy.el (avy-process): Restart on fail for avy-style 'words

[ELPA Syncer]

branch: externals/avy
commit 5127f993f9d01d032f9339500ae5f8f57ed3a55a
Author: Federico Tedin 
Commit: Oleh Krehel 

avy.el (avy-process): Restart on fail for avy-style 'words

Fixes #283
---
 avy.el | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/avy.el b/avy.el
index c9c261785f..27680da511 100644
--- a/avy.el
+++ b/avy.el
@@ -451,7 +451,8 @@ KEYS is the path from the root of `avy-tree' to LEAF."
   "The default handler for a bad CHAR."
   (let (dispatch)
 (cond ((setq dispatch (assoc char avy-dispatch-alist))
-   (setq avy-action (cdr dispatch))
+   (unless (eq avy-style 'words)
+ (setq avy-action (cdr dispatch)))
(throw 'done 'restart))
   ((memq char '(?\e ?\C-g))
;; exit silently
@@ -862,8 +863,10 @@ multiple OVERLAY-FN invocations."
 (res (avy--process-1 candidates overlay-fn cleanup-fn)))
 (cond
   ((null res)
-   (message "zero candidates")
-   t)
+   (if (eq avy-style 'words)
+   (avy-process original-cands overlay-fn cleanup-fn)
+ (message "zero candidates")
+ t))
   ((eq res 'restart)
(avy-process original-cands overlay-fn cleanup-fn))
   ;; ignore exit from `avy-handler-function'

[elpa] externals/avy aadca9308a 03/31: avy.el (avy-resume): Work better for avy-goto-timer

[ELPA Syncer]

branch: externals/avy
commit aadca9308aab8aa1ac9e7146d999b6e38f764e90
Author: Oleh Krehel 
Commit: Oleh Krehel 

avy.el (avy-resume): Work better for avy-goto-timer

Fixes #277
---
 avy.el | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/avy.el b/avy.el
index a0dbd35288..0990d4994e 100644
--- a/avy.el
+++ b/avy.el
@@ -665,7 +665,9 @@ Set `avy-style' according to COMMMAND as well."
  (setf (symbol-function 'avy-resume)
(lambda ()
  (interactive)
- ,@body))
+ ,@(if (eq command 'avy-goto-char-timer)
+   (cdr body)
+ body)))
  ,@body))
 
 (defun avy-action-goto (pt)
@@ -2061,6 +2063,8 @@ Otherwise, the whole regex is highlighted."
 (delete-overlay ov))
   (avy--done
 
+(defvar avy--old-cands nil)
+
 ;;;###autoload
 (defun avy-goto-char-timer (&optional arg)
   "Read one or many consecutive chars and jump to the first one.
@@ -2070,8 +2074,8 @@ The window scope is determined by `avy-all-windows' (ARG 
negates it)."
  (not avy-all-windows)
avy-all-windows)))
 (avy-with avy-goto-char-timer
-  (avy-process
-   (avy--read-candidates)
+  (setq avy--old-cands (avy--read-candidates))
+  (avy-process avy--old-cands
 
 (defun avy-push-mark ()
   "Store the current point and window."

[elpa] main b59156efa4: * elpa-packages: Mark dr-qubit's packages as :manual-sync`

[Stefan Monnier via]

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

* elpa-packages: Mark dr-qubit's packages as :manual-sync`
---
 elpa-packages | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 66eb2c8b61..50f035d6f1 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -80,6 +80,7 @@
  (aumix-mode   :url nil)
  (auto-correct :url nil)
  (auto-overlays:url 
"http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
   :doc "docs/auto-overlay-manual.texinfo")
  (avy  :url "https://github.com/abo-abo/avy";
   ;; FIXME: Avy diverged https://github.com/abo-abo/avy/issues/344
@@ -233,7 +234,9 @@
   :auto-sync t)
  (devdocs  :url "https://github.com/astoff/devdocs.el";
   :auto-sync t)
- (dict-tree:url "http://www.dr-qubit.org/git/predictive.git";)
+ (dict-tree:url "http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
+  )
  (diff-hl  :url "https://github.com/dgutov/diff-hl.git";
   :auto-sync t)
  (diffview :url "https://github.com/mgalgs/diffview-mode.git";)
@@ -376,7 +379,9 @@
  (guess-language   :url "https://github.com/tmalsburg/guess-language.el";)
  (hcel :url "https://g.ypei.me/hc.el.git";
   :auto-sync t)
- (heap :url "http://www.dr-qubit.org/git/predictive.git";)
+ (heap :url "http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
+  )
  (hiddenquote  :url 
"https://gitlab.com/mauroaranda/hiddenquote/hiddenquote";
   :auto-sync t)
  (highlight-escape-sequences
@@ -639,7 +644,9 @@
   :auto-sync t)
  (python   :core "lisp/progmodes/python.el")
  (quarter-plane:url nil)
- (queue:url 
"http://www.dr-qubit.org/git/predictive.git";)
+ (queue:url 
"http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
+  )
  ;; (rails-routes  :url 
"https://github.com/otavioschwanck/emacs-rails-routes";)
  (rainbow-mode :url nil)
  (rbit :url nil)
@@ -743,7 +750,9 @@
  (system-packages  :url "https://gitlab.com/jabranham/system-packages";
   :auto-sync t)
  (systemd  :url nil)
- (tNFA :url "http://www.dr-qubit.org/git/predictive.git";)
+ (tNFA :url "http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
+  )
  (taxy :url "https://github.com/alphapapa/taxy.el.git";
   :doc "taxy.info"
   :ignored-files ("images")
@@ -793,7 +802,9 @@
   :news "CHANGELOG"
   :doc "docs/transient.texi")
  (transient-cycles :url nil)
- (trie :url "http://www.dr-qubit.org/git/predictive.git";)
+ (trie :url "http://www.dr-qubit.org/git/predictive.git";
+  :manual-sync t ;; The upstream doesn't exist any more!
+  )
  (triples  :url "https://github.com/ahyatt/triples";
   :readme "README.org"
   :auto-sync t)