summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helm-lib.el2
-rw-r--r--helm-mode.el6
2 files changed, 4 insertions, 4 deletions
diff --git a/helm-lib.el b/helm-lib.el
index 445c07aa..a1b53578 100644
--- a/helm-lib.el
+++ b/helm-lib.el
@@ -1364,7 +1364,7 @@ Example:
"
(lambda ()
;; FIXME: not working with other old syles, see comment in
- ;; helm-completion-in-region--fix-completion-styles.
+ ;; helm-completion-in-region--set-completion-styles.
(let* ((completion-styles (cond ((memq 'flex completion-styles)
'(flex helm))
((memq 'helm-flex completion-styles)
diff --git a/helm-mode.el b/helm-mode.el
index aef967bc..10427728 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -838,7 +838,7 @@ This handler use dynamic matching which allow honouring `completion-styles'."
;; INIT is a cons cell.
(`(,l . ,_ll) l)))
(completion-flex-nospace t)
- (completion-styles (helm-completion-in-region--fix-completion-styles))
+ (completion-styles (helm-completion-in-region--set-completion-styles))
(metadata (or (completion-metadata (or input "") collection predicate)
'(metadata)))
(afun (or (plist-get completion-extra-properties :annotation-function)
@@ -1534,7 +1534,7 @@ Actually do nothing."
(delete (assq 'helm-flex completion-styles-alist)
completion-styles-alist))))
-(defun helm-completion-in-region--fix-completion-styles ()
+(defun helm-completion-in-region--set-completion-styles ()
"Add helm style to `completion-styles' and filter out incompatibles styles."
(if (memq helm-completion-style '(helm helm-fuzzy))
'(basic partial-completion emacs22)
@@ -1599,7 +1599,7 @@ Actually do nothing."
(unwind-protect
(let* ((enable-recursive-minibuffers t)
(completion-flex-nospace t)
- (completion-styles (helm-completion-in-region--fix-completion-styles))
+ (completion-styles (helm-completion-in-region--set-completion-styles))
(input (buffer-substring-no-properties start end))
;; FIXME: Should I use prefix instead of input for
;; initial completion? And use input for final insertion?