masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-08 13:19:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request from alexko/master"

Browse source 
This reverts commit 8c04377608, reversing
changes made to a9ba368fa7.
GitHub-reference: https://github.com/jwiegley/use-package/issues/104
This commit is contained in:
John Wiegley 2014-05-08 13:25:39 -05:00
parent 8c04377608
commit a4939e7ef3
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/use-package/use-package.el
View file

@ -304,16 +304,7 @@ For full documentation. please see commentary.
(name-symbol (if (stringp name) (intern name) name))) (name-symbol (if (stringp name) (intern name) name)))
;; force this immediately -- one off cost ;; force this immediately -- one off cost
(unless (unless (use-package-plist-get args :disabled)
(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)))
(let* ((ensure (use-package-plist-get args :ensure)) (let* ((ensure (use-package-plist-get args :ensure))
(package-name (package-name