[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master b528f0f 299/399: ivy-overlay.el (ivy-display-function-over
From: |
Oleh Krehel |
Subject: |
[elpa] master b528f0f 299/399: ivy-overlay.el (ivy-display-function-overlay): Fix org-indent-mode once more |
Date: |
Sat, 20 Jul 2019 14:57:44 -0400 (EDT) |
branch: master
commit b528f0f3aaa86a40fdec06bdb06c603ce1418bcb
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy-overlay.el (ivy-display-function-overlay): Fix org-indent-mode once more
The trick is that the offset is different if we're at heading.
---
ivy-overlay.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ivy-overlay.el b/ivy-overlay.el
index 6bc5270..7f56c6e 100644
--- a/ivy-overlay.el
+++ b/ivy-overlay.el
@@ -79,6 +79,7 @@ Then attach the overlay to the character before point."
(overlay-put ivy-overlay-at 'after-string ""))
(declare-function org-current-level "org")
+(declare-function org-at-heading-p "org")
(defvar org-indent-indentation-per-level)
(defvar ivy-height)
(defvar ivy-last)
@@ -130,7 +131,9 @@ Hide the minibuffer contents and cursor."
(+
(if (and (eq major-mode 'org-mode)
(bound-and-true-p org-indent-mode))
- (* org-indent-indentation-per-level
(org-current-level))
+ (if (org-at-heading-p)
+ (1- (org-current-level))
+ (* org-indent-indentation-per-level
(org-current-level)))
0)
(save-excursion
(when ivy-completion-beg
- [elpa] master af5b594 283/399: ivy.el (ivy--occur-insert-lines): Fix typo bug, (continued)
- [elpa] master af5b594 283/399: ivy.el (ivy--occur-insert-lines): Fix typo bug, Oleh Krehel, 2019/07/20
- [elpa] master 04f56ca 282/399: ivy.el (ivy--recompute-index): Use configured flx candidate limit, Oleh Krehel, 2019/07/20
- [elpa] master e69ddc3 295/399: ivy.el (ivy-sort-function-buffer): Unify prefix and star-prefix matches, Oleh Krehel, 2019/07/20
- [elpa] master f40b08a 293/399: ivy-display-function: obsolete this varible in favor ivy-display-functions-alist, Oleh Krehel, 2019/07/20
- [elpa] master 332f990 285/399: ivy.el: Fix compiler warning, Oleh Krehel, 2019/07/20
- [elpa] master 779db1e 292/399: ivy.el (ivy--occur-insert-lines): Add copy-sequence, Oleh Krehel, 2019/07/20
- [elpa] master a73e24d 288/399: Do not insert initial input if nil, Oleh Krehel, 2019/07/20
- [elpa] master 0b26219 301/399: counsel.el (counsel--file-name-filter): Move ignore-re binding., Oleh Krehel, 2019/07/20
- [elpa] master ef6d3db 297/399: ivy-overlay.el (ivy-display-function-overlay): Bring back org-indent-mode logic, Oleh Krehel, 2019/07/20
- [elpa] master 7feb14f 289/399: ivy.el (ivy-format-functions-alist): New defcustom, obsoletes ivy-format-function, Oleh Krehel, 2019/07/20
- [elpa] master b528f0f 299/399: ivy-overlay.el (ivy-display-function-overlay): Fix org-indent-mode once more,
Oleh Krehel <=
- [elpa] master ef1e8d5 294/399: ivy.el (ivy-read): Don't use ivy-display-function, Oleh Krehel, 2019/07/20
- [elpa] master 57a57d1 302/399: swiper.el (swiper--multi-candidates): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 44b2d7d 300/399: ivy.el (ivy-insert-current-full): Add and bind to "C-M-y", Oleh Krehel, 2019/07/20
- [elpa] master d39f82b 307/399: counsel-yank-pop-height is obselete and doesn't do anything, Oleh Krehel, 2019/07/20
- [elpa] master c11797a 290/399: swiper.el (swiper--line-at-point): Fix swiper-isearch in compilation buffers, Oleh Krehel, 2019/07/20
- [elpa] master 94f107b 304/399: counsel.el (counsel-mark-ring): Add highlight by candidate, Oleh Krehel, 2019/07/20
- [elpa] master 034f3af 306/399: swiper.el (swiper-isearch): Allow char-fold-to-regexp, Oleh Krehel, 2019/07/20
- [elpa] master 5cc1e5c 298/399: swiper.el (swiper-isearch-thing-at-point): Improve, Oleh Krehel, 2019/07/20
- [elpa] master 3b6c898 303/399: counsel.el (counsel-mark-ring): Add preview by candidate, Oleh Krehel, 2019/07/20
- [elpa] master 93616f7 296/399: ivy.el (ivy--regex): Match initial dot in the input as a literal dot, Oleh Krehel, 2019/07/20