diff options
| author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2018-11-27 05:59:52 +0100 |
|---|---|---|
| committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2018-11-27 05:59:52 +0100 |
| commit | d926c9ff8548ec5b8d39224f55b7c7bb289c1486 (patch) | |
| tree | dc4e1b7f50a765ea921b64ff19651aadc151549b /helm-mode.el | |
| parent | 1bb9b84dc24dc69ba76cff78d8f9b824166c0b67 (diff) | |
Disable only ido-everywhere (#2085)
* helm-mode.el (helm-mode--disable-ido-maybe): Do it.
Diffstat (limited to 'helm-mode.el')
| -rw-r--r-- | helm-mode.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/helm-mode.el b/helm-mode.el index 68d1f5d3..7bba4bce 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -1386,15 +1386,13 @@ Can be used as value for `completion-in-region-function'." (defconst helm--old-completion-in-region-function completion-in-region-function)) (defun helm-mode--disable-ido-maybe (&optional from-hook) - (when (or (and (fboundp 'ido-mode) ido-mode) - (and (boundp 'ido-everywhere) ido-everywhere)) + (when (and (boundp 'ido-everywhere) ido-everywhere) (remove-function read-file-name-function #'ido-read-file-name) (remove-function read-buffer-function #'ido-read-buffer) (setq ido-everywhere nil) - (ido-mode -1) (if from-hook - (user-error "Unable to turn on Ido-mode while helm-mode is enabled") - (user-error "Helm-mode enabled (Ido is incompatible with Helm-mode, disabling it)")))) + (user-error "Unable to turn on Ido-everywhere while Helm-mode is enabled") + (user-error "Helm-mode enabled (Ido-everywhere is incompatible with Helm-mode, disabling it)")))) (defun helm-mode--ido-everywhere-hook () ;; Called only when user calls directly ido-everywhere or ido-mode |