branch: externals/ivy
commit d9c205331652f1d62d086cca31c0d370af3da657
Merge: 166b3161a3 e9c0fb953d
Author: Basil L. Contovounesios <conto...@tcd.ie>
Commit: Basil L. Contovounesios <conto...@tcd.ie>
Merge branch 'master' into externals/ivy
---
ivy-overlay.el | 4 +++-
ivy.el | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ivy-overlay.el b/ivy-overlay.el
index 2da1306716..b61fcaf093 100644
--- a/ivy-overlay.el
+++ b/ivy-overlay.el
@@ -152,7 +152,9 @@ Hide the minibuffer contents and cursor."
(string-remove-prefix "\n" str)
(+
(if (and (eq major-mode 'org-mode)
- (bound-and-true-p org-indent-mode))
+ (bound-and-true-p org-indent-mode)
+ ;; FIXME: Should this check `org-version'?
+ (< emacs-major-version 28))
(if (org-at-heading-p)
(1- (org-current-level))
(* org-indent-indentation-per-level (or
(org-current-level) 1)))
diff --git a/ivy.el b/ivy.el
index 98f5d4c0d5..d7a23fed96 100644
--- a/ivy.el
+++ b/ivy.el
@@ -4963,6 +4963,7 @@ buffer would modify `ivy-last'.")
(define-key map (kbd "q") 'quit-window)
(define-key map (kbd "R") 'read-only-mode)
(ivy-define-key map (kbd "C-d") 'ivy-occur-delete-candidate)
+ (ivy-define-key map (kbd "F") 'ivy-occur-flush-lines)
map)
"Keymap for Ivy Occur mode.")
@@ -5064,6 +5065,12 @@ When `ivy-calling' isn't nil, call `ivy-occur-press'."
(delete-region (line-beginning-position)
(1+ (line-end-position)))))
+(defun ivy-occur-flush-lines ()
+ "Delete lines matching regex."
+ (interactive)
+ (let ((inhibit-read-only t))
+ (call-interactively 'flush-lines)))
+
(define-derived-mode ivy-occur-grep-mode grep-mode "Ivy-Occur"
"Major mode for output from \\[ivy-occur].
