[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 226171b 268/399: ivy.el (ivy--occur-insert-lines): Don't h
From: |
Oleh Krehel |
Subject: |
[elpa] master 226171b 268/399: ivy.el (ivy--occur-insert-lines): Don't highlight the file name part |
Date: |
Sat, 20 Jul 2019 14:57:37 -0400 (EDT) |
branch: master
commit 226171b27ff4531cb30d47918162cb0d06619e19
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--occur-insert-lines): Don't highlight the file name part
Fixes #2073
---
ivy.el | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ivy.el b/ivy.el
index 8adafd2..f739b1f 100644
--- a/ivy.el
+++ b/ivy.el
@@ -4380,21 +4380,21 @@ When `ivy-calling' isn't nil, call `ivy-occur-press'."
(defun ivy--occur-insert-lines (cands)
"Insert CANDS into `ivy-occur' buffer."
(font-lock-mode -1)
- (dolist (str cands)
- (setq str (ivy--highlight-fuzzy (copy-sequence str)))
+ (dolist (cand cands)
+ (let ((parts (split-string cand ":[[:digit:]]+:")))
+ (setq cand
+ (if (= 2 (length parts))
+ (concat (propertize (nth 0 parts) 'face 'ivy-grep-info)
+ (ivy--highlight-fuzzy (nth 1 parts)))
+ (ivy--highlight-fuzzy (nth 0 parts)))))
(add-text-properties
- 0 (length str)
+ 0 (length cand)
'(mouse-face
highlight
help-echo "mouse-1: call ivy-action")
- str)
- (insert (if (string-match-p "\\`.[/\\]" str) "" " ")
- str ?\n))
- (goto-char (point-min))
- (forward-line 4)
- (while (re-search-forward "^.*:[[:digit:]]+:" nil t)
- (ivy-add-face-text-property
- (match-beginning 0) (match-end 0) 'ivy-grep-info nil t)))
+ cand)
+ (insert (if (string-match-p "\\`.[/\\]" cand) "" " ")
+ cand ?\n)))
(defun ivy-occur ()
"Stop completion and put the current candidates into a new buffer.
- [elpa] master 2c57036 263/399: ivy.el (ivy-call): Modify the API for ivy-action second arg, (continued)
- [elpa] master 2c57036 263/399: ivy.el (ivy-call): Modify the API for ivy-action second arg, Oleh Krehel, 2019/07/20
- [elpa] master bea44b7 264/399: counsel.el: Fix compiler warnings, Oleh Krehel, 2019/07/20
- [elpa] master a2af29b 271/399: ivy.el (ivy--occur-insert-lines): Fix missing line numbers, Oleh Krehel, 2019/07/20
- [elpa] master 9a9e3e4 251/399: ivy-test.el (swiper--isearch-format): Add test, Oleh Krehel, 2019/07/20
- [elpa] master 76ef143 258/399: swiper.el (swiper-isearch): Fix ivy-occur, Oleh Krehel, 2019/07/20
- [elpa] master c6977eb 266/399: ivy.el (ivy-read): Add :multi-action arg, Oleh Krehel, 2019/07/20
- [elpa] master df0d980 267/399: Modify counsel-unicode-char's copy action to use actual result, Oleh Krehel, 2019/07/20
- [elpa] master 19ff7cf 270/399: counsel.el (counsel-register-action): Tweak error, Oleh Krehel, 2019/07/20
- [elpa] master 4898a5e 272/399: counsel.el (counsel-compile): better handling for counsel--get-build-subdirs, Oleh Krehel, 2019/07/20
- [elpa] master e95a16b 275/399: Shrink ivy window after read action., Oleh Krehel, 2019/07/20
- [elpa] master 226171b 268/399: ivy.el (ivy--occur-insert-lines): Don't highlight the file name part,
Oleh Krehel <=
- [elpa] master e8f9370 273/399: counsel.el (counsel-compile): nreverse recent history, Oleh Krehel, 2019/07/20
- [elpa] master b65cdb5 274/399: counsel.el (counsel-compile): track build dir for the benefit of M-i, Oleh Krehel, 2019/07/20
- [elpa] master a18de2f 269/399: counsel.el (counsel-register): Add, Oleh Krehel, 2019/07/20
- [elpa] master fbf654c 276/399: counsel.el (counsel-company): Rely on company-prefix if company-common is nil, Oleh Krehel, 2019/07/20
- [elpa] master 2410219 284/399: swiper.el (swiper-isearch-highlight-delay): New defcustom, Oleh Krehel, 2019/07/20
- [elpa] master bc2dcbe 279/399: counsel.el (counsel--find-build-subdir): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 13da38a 287/399: ivy.el (ivy-help): Hide Org markup buffer-locally, Oleh Krehel, 2019/07/20
- [elpa] master 0134255 281/399: ivy.el (ivy--highlight-default): Use single face for adjacent groups, Oleh Krehel, 2019/07/20
- [elpa] master b7e9dfd 277/399: counsel.el: Fix a couple of typos, Oleh Krehel, 2019/07/20
- [elpa] master 92d5335 291/399: Add counsel-up-level command, Oleh Krehel, 2019/07/20