From: John Wiegley <johnw@newartisans.com>
Date: Thu, 8 May 2014 18:25:39 +0000 (-0500)
Subject: Revert "Merge pull request from alexko/master"
X-Git-Tag: emacs-29.0.90~1306^2~15^2~409
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4939e7ef3;p=emacs.git

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
---

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