From 49bc4ac085a40cfd01005b1aeb85b6444f16efa9 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Sun, 8 Jan 2017 16:11:09 -0500 Subject: [PATCH] Squashed 'emacs.d/' changes from 664ba6ab2..c2774bc0d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit c2774bc0d Bump version to 0.200.7 and update CHANGELOG.org 9d180c72d More robust fix for error ‘fuzzy-match’ not supported in async sources d51f61995 Bump version to 0.200.6 and update CHANGELOG.org c3c5b8e5a Fix helm :config: ‘fuzzy-match’ not supported in async sources. git-subtree-dir: emacs.d git-subtree-split: c2774bc0dea3dbc63621709d54685fbbe9212d55 --- CHANGELOG.org | 6 ++++++ init.el | 2 +- layers/+spacemacs/spacemacs-completion/funcs.el | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 86c6465..9773499 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -1,4 +1,10 @@ * Release 0.200.x +** 0.200.7 (2017/01/02) +*** Fixes +- More robust fix for error helm :config: ‘fuzzy-match’ not supported in async sources +** 0.200.6 (2017/01/01) +*** Fixes +- Fix error helm :config: ‘fuzzy-match’ not supported in async sources ** 0.200.5 (2016/11/03) *** Fixes - Removed themes missing from MELPA (=colorsarenice-theme= and =stekene-theme=) diff --git a/init.el b/init.el index d0cd280..6f2df0a 100644 --- a/init.el +++ b/init.el @@ -16,7 +16,7 @@ ;; lower value in your dotfile (function `dotspacemacs/user-config') (setq gc-cons-threshold 100000000) -(defconst spacemacs-version "0.200.5" "Spacemacs version.") +(defconst spacemacs-version "0.200.7" "Spacemacs version.") (defconst spacemacs-emacs-min-version "24.4" "Minimal version of Emacs.") (if (not (version<= spacemacs-emacs-min-version emacs-version)) diff --git a/layers/+spacemacs/spacemacs-completion/funcs.el b/layers/+spacemacs/spacemacs-completion/funcs.el index 0f64588..1d14f28 100644 --- a/layers/+spacemacs/spacemacs-completion/funcs.el +++ b/layers/+spacemacs/spacemacs-completion/funcs.el @@ -39,7 +39,8 @@ "Function to be used as advice to activate fuzzy matching for all sources." (let ((source-type (cadr args)) (props (cddr args))) - (unless (eq source-type 'helm-source-async) + ;; fuzzy matching is not supported in async sources + (unless (child-of-class-p source-type helm-source-async) (plist-put props :fuzzy-match (eq 'always dotspacemacs-helm-use-fuzzy)))) (apply f args))