From ca4909ef812928ab20d00d43a28803d06311ff3c Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Fri, 21 Sep 2018 23:57:42 -0400
Subject: snakemake-popup: Add --use-conda

---
 NEWS         | 1 +
 snakemake.el | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 523dccc..5f5452a 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ NEWS -- history of user-visible changes             -*- mode: org; -*-
 
 ** New features
 
+- ~snakemake-popup~ now includes ~--use-conda~.
 - The 'group' keyword (new in Snakemake v5.0) is now recognized.
 
 * v1.4.0
diff --git a/snakemake.el b/snakemake.el
index d5ff0c8..bb98773 100644
--- a/snakemake.el
+++ b/snakemake.el
@@ -731,7 +731,8 @@ $ snakemake [ARGS] -- <targets>"
 (magit-define-popup snakemake-popup
   "Popup console for running Snakemake."
   :switches
-  '((?f "Force" "--force")
+  '((?c "Use conda" "--use-conda")
+    (?f "Force" "--force")
     (?i "Ignore temp()" "--notemp")
     (?n "Dry run" "--dryrun")
     (?p "Print shell commands" "-p")
-- 
cgit v1.2.3