diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-05-08 13:25:39 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-05-08 13:25:39 -0500 |
| commit | a4939e7ef349e0faa0a0ec45e50a5d0821c96c07 (patch) | |
| tree | 8d15b51bbcc507859aebc2bc8a8a3506ba57d30d /lisp/use-package/use-package.el | |
| parent | 8c04377608bd9b27d6fc6c37990984185563a907 (diff) | |
| download | emacs-a4939e7ef349e0faa0a0ec45e50a5d0821c96c07.tar.gz emacs-a4939e7ef349e0faa0a0ec45e50a5d0821c96c07.tar.bz2 emacs-a4939e7ef349e0faa0a0ec45e50a5d0821c96c07.zip | |
Revert "Merge pull request from alexko/master"
This reverts commit 8c04377608bd9b27d6fc6c37990984185563a907, reversing
changes made to a9ba368fa79e4c15b624de73e30c87c98475d466.
GitHub-reference: https://github.com/jwiegley/use-package/issues/104
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 51c4dfaae20..0012d26597d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -304,16 +304,7 @@ For full documentation. please see commentary. (name-symbol (if (stringp name) (intern name) name))) ;; force this immediately -- one off cost - (unless - (or (use-package-plist-get args :disabled) - (if (locate-library - name-string nil - (mapcar - (lambda (path) (expand-file-name path user-emacs-directory)) - (cond ((stringp pkg-load-path) (list pkg-load-path)) - ((functionp pkg-load-path) (funcall pkg-load-path)) - (t pkg-load-path)))) nil - (message "Unable to locate %s" name-string))) + (unless (use-package-plist-get args :disabled) (let* ((ensure (use-package-plist-get args :ensure)) (package-name |