branch: externals/embark
commit 9cc6a1aa14b7ac34a6f1c99f82f51c8dea529a8c
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Bump Emacs dependency
Consult and other packages also require Emacs 29.1. Emacs 29.1 is widely
available, e.g., on Debian stable.
---
avy-embark-collect.el | 2 +-
embark-consult.el | 2 +-
embark.el | 21 ++-------------------
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/avy-embark-collect.el b/avy-embark-collect.el
index aba692b111..56f7c354ea 100644
--- a/avy-embark-collect.el
+++ b/avy-embark-collect.el
@@ -6,7 +6,7 @@
;; Keywords: convenience
;; Version: 0.3
;; URL: https://github.com/oantolin/embark
-;; Package-Requires: ((emacs "25.1") (embark "0.9") (avy "0.5"))
+;; Package-Requires: ((emacs "29.1") (embark "1.1") (avy "0.5"))
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/embark-consult.el b/embark-consult.el
index 790effe691..6ef471d50b 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -7,7 +7,7 @@
;; Keywords: convenience
;; Version: 1.1
;; URL: https://github.com/oantolin/embark
-;; Package-Requires: ((emacs "28.1") (compat "30") (embark "1.1") (consult
"3.2"))
+;; Package-Requires: ((emacs "29.1") (compat "30") (embark "1.1") (consult
"3.2"))
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/embark.el b/embark.el
index 8f1b9aa5b9..a4af92df32 100644
--- a/embark.el
+++ b/embark.el
@@ -7,7 +7,7 @@
;; Keywords: convenience
;; Version: 1.1
;; URL: https://github.com/oantolin/embark
-;; Package-Requires: ((emacs "28.1") (compat "30"))
+;; Package-Requires: ((emacs "29.1") (compat "30"))
;; This file is part of GNU Emacs.
@@ -507,11 +507,6 @@ used for other types of action hooks, for more details see
(const :tag "Always" :always))
:value-type hook))
-(static-if (< emacs-major-version 29)
- ;; narrow to target for duration of action
- (setf (alist-get 'repunctuate-sentences embark-around-action-hooks)
- '(embark--narrow-to-target)))
-
(defcustom embark-multitarget-actions '(embark-insert embark-copy-as-kill)
"Commands for which `embark-act-all' should pass a list of targets.
Normally `embark-act-all' runs the same action on each candidate
@@ -4017,16 +4012,6 @@ argument), no quoting is used for strings."
(eval (read (buffer-substring beg end)) lexical-binding)))
(delete-region beg end))))
-(static-if (< emacs-major-version 29)
- (defun embark-elp-restore-package (prefix)
- "Remove instrumentation from functions with names starting with PREFIX."
- (interactive "SPrefix: ")
- (when (fboundp 'elp-restore-list)
- (elp-restore-list
- (mapcar #'intern
- (all-completions (symbol-name prefix)
- obarray 'elp-profilable-p))))))
-
(defmacro embark--define-hash (algorithm)
"Define command which computes hash from a string.
ALGORITHM is the hash algorithm symbol understood by `secure-hash'."
@@ -4569,9 +4554,7 @@ This simply calls RUN with the REST of its arguments
inside
"a" #'package-autoremove
"g" #'package-refresh-contents
"m" #'elp-instrument-package ;; m=measure
- "M" (if (fboundp 'embark-elp-restore-package)
- 'embark-elp-restore-package
- 'elp-restore-package))
+ "M" 'elp-restore-package)
(defvar-keymap embark-bookmark-map
:doc "Keymap for Embark bookmark actions."
