Merge remote-tracking branch 'origin/with-profile-symmetry'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

leiningen-core/src/leiningen/core/project.clj

@@ -411,7 +411,7 @@
     (warn-user-profile profiles)
     profiles))
 
-(defn- read-profiles
+(defn read-profiles
   "Read profiles from a variety of sources.
 
   We check Leiningen's defaults, system-level profiles (usually in

src/leiningen/show_profiles.clj

@@ -1,18 +1,12 @@
 (ns leiningen.show-profiles
   (:require [clojure.string]
             [clojure.pprint :as pprint]
-            [leiningen.core.project :as project]
-            [leiningen.core.user :as user]))
-
-(defn- all-profiles [project]
-  (merge @project/default-profiles
-         (user/profiles)
-         (:profiles project)))
+            [leiningen.core.project :as project]))
 
 (defn ^:no-project-needed show-profiles
   "List all available profiles or display one if given an argument."
   ([project]
-     (->> (all-profiles project)
+     (->> (project/read-profiles project)
           (keys)
           (map name)
           (sort)

src/leiningen/with_profile.clj

@@ -8,7 +8,9 @@
   "Apply the given task with a comma-separated profile list."
   [project profiles task-name args]
   (hooke/with-scope
-    (let [project (and project (project/set-profiles project profiles))
+    (let [project (and project (project/set-profiles
+                                 (project/project-with-profiles project)
+                                 profiles))
           task-name (main/lookup-alias task-name project)]
       (main/apply-task task-name project args))))