branch: elpa/helm
commit 3b8e7c108b938b44d71dc0044837d928c3830302
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Fix issues #2517, #2518, #2520 by requiring *global-bindings in helm
and not in helm-core.
When helm-global-bindings was soft required in helm-core, there was no
problems as long as helm was compiled and installed from source in the
same directory. However when installing as a package, helm-core
package was installed first, but because helm-global-bindings is not
part of helm-core, it was not loaded. When helm package was installed later
is was assumed helm-core has been already loaded and
helm-global-bindings never required.
---
helm-config.el | 8 +++-----
helm-core.el | 2 --
helm.el | 1 +
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/helm-config.el b/helm-config.el
index eed4468816..9a83a30bcf 100644
--- a/helm-config.el
+++ b/helm-config.el
@@ -18,14 +18,12 @@
;;; Commentary:
;;
;; Requiring this file is not needed when using a package manager to
-;; install helm as this one will take care of loading the autoload
-;; file.
+;; install helm as this one will take care of creating and loading the
+;; autoload file.
;;; Code:
-;;; Load the autoload file
-;; It should have been generated either by
-;; the package manager or the make file.
+;;; Load the autoload file generated by the make file.
(load "helm-autoloads" nil t)
diff --git a/helm-core.el b/helm-core.el
index 44653feda5..948031b1ce 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -31,8 +31,6 @@
(require 'helm-lib)
(require 'helm-multi-match)
(require 'helm-source)
-;; Soft require this as it is not bundled with helm-core package.
-(require 'helm-global-bindings nil t)
;; Ensure async-bytecomp is used even with helm-core package.
(declare-function async-bytecomp-package-mode "ext:async-bytecomp.el")
diff --git a/helm.el b/helm.el
index a4585d3c0d..191aa538e0 100644
--- a/helm.el
+++ b/helm.el
@@ -36,6 +36,7 @@
;;; Code:
(require 'helm-core)
+(require 'helm-global-bindings)
(provide 'helm)
