branch: externals/embark
commit 5d0459d27aa7cf738b5af36cf862723a62bef955
Merge: d0964131fb 831f504f43
Author: Omar AntolĂn Camarena <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #520 from minad/fix-recentf
Fix recentf
---
embark-consult.el | 10 ----------
embark.el | 8 +++++---
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/embark-consult.el b/embark-consult.el
index 1d47de96fe..05c467d4d4 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -78,16 +78,6 @@
(add-hook 'consult--completion-candidate-hook
#'embark-consult--collect-candidate)
-(define-obsolete-function-alias
- 'embark-consult-preview-minor-mode
- 'consult-preview-at-point-mode
- "0.11")
-
-(define-obsolete-function-alias
- 'embark-consult-preview-at-point
- 'consult-preview-at-point
- "0.11")
-
;;; Support for consult-location
(defun embark-consult--strip (string)
diff --git a/embark.el b/embark.el
index 19f431b608..715dbf0183 100644
--- a/embark.el
+++ b/embark.el
@@ -148,7 +148,7 @@
(heading embark-heading-map)
(t embark-general-map))
"Alist of action types and corresponding keymaps.
-The special key `t' is associated with the default keymap to use.
+The special key t is associated with the default keymap to use.
Each value can be either a single symbol whose value is a keymap,
or a list of such symbols."
:type '(alist :key-type (symbol :tag "Target type")
@@ -3476,8 +3476,10 @@ Sorting and history are disabled. PROMPT is the prompt
message."
"Remove FILE from the list of recent files."
(interactive (list (embark--read-from-history
"Remove recent file: " recentf-list 'file)))
- (embark-history-remove file)
- (setq recentf-list (delete (expand-file-name file) recentf-list)))
+ (embark-history-remove (expand-file-name file))
+ (embark-history-remove (abbreviate-file-name file))
+ (when (and (boundp 'recentf-list) (fboundp 'recentf-expand-file-name))
+ (setq recentf-list (delete (recentf-expand-file-name file) recentf-list))))
(defun embark-history-remove (str)
"Remove STR from `minibuffer-history-variable'.