From 98e7bf38ad41c535e15aca91fede2f57d3879773 Mon Sep 17 00:00:00 2001 From: duianto Date: Mon, 14 Oct 2019 10:30:27 +0200 Subject: [PATCH] [ivy] Rename counsel-more-chars to ivy-more-chars counsel-more-chars was renamed to ivy-more-chars a year ago: Move counsel-more-chars-alist and counsel-more-chars to ivy.el. https://github.com/abo-abo/swiper/commit/4461ef302a98cda5a9bf4412eb317c2eb593df86 with an alias to counsel-more-chars. The alias was removed 2 days ago: ivy.el: Clean up obsolete aliases https://github.com/abo-abo/swiper/commit/1a9002bf4be4863bbafd5d42089eb652171775d8 --- CHANGELOG.develop | 2 ++ layers/+completion/ivy/funcs.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index e3dab2d32..96f4b01b1 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1834,6 +1834,8 @@ Other: - Fixed typos in spacemacs/search-dir* bindings (thanks to yuhan0) - Added =ivy-ret-visits-directory= variable (thanks to bb2020) - Fixed definitions of extra actions R and D for recentf (thanks to madand) +- Renamed =counsel-more-chars= to =ivy-more-chars= to match upstream + (thanks to duianto) **** Imenu-list - Changed ~SPC b i~ to ~SPC b t~ for =imenu= tree view (thansk to Sylvain Benner) diff --git a/layers/+completion/ivy/funcs.el b/layers/+completion/ivy/funcs.el index 6ea13b175..0a6710b3a 100644 --- a/layers/+completion/ivy/funcs.el +++ b/layers/+completion/ivy/funcs.el @@ -71,9 +71,9 @@ (cdr (assoc-string tool spacemacs--counsel-commands)))) (lambda (string &optional _pred &rest _unused) "Grep in the current directory for STRING." - ;; `counsel-more-chars' returns non-nil when more chars are needed, - ;; minimal chars count is configurable via `counsel-more-chars-alist' - (or (counsel-more-chars) + ;; `ivy-more-chars' returns non-nil when more chars are needed, + ;; minimal chars count is configurable via `ivy-more-chars-alist' + (or (ivy-more-chars) (let* ((default-directory (ivy-state-directory ivy-last)) (args (if (string-match-p " -- " string) (let ((split (split-string string " -- ")))