From c77ba18e7193269bfe278980af64549f2db77eba Mon Sep 17 00:00:00 2001
From: TEC <tec@tecosaur.com>
Date: Fri, 4 Jun 2021 22:34:34 +0800
Subject: [PATCH] Org: Tweak header arg snippets

- Re-prioritise lower-case "s": silent is more common than session
- The $0 doesn't actually seem to change the final cursor position, and
  if the snippet is cancelled it is left behind as clutter.
- Fix incorrect labelling with NoWeb snippet
---
 snippets/org-mode/header-arg-eval    | 2 +-
 snippets/org-mode/header-arg-export  | 2 +-
 snippets/org-mode/header-arg-noweb   | 2 +-
 snippets/org-mode/header-arg-results | 2 +-
 snippets/org-mode/header-arg-session | 2 +-
 snippets/org-mode/header-arg-silent  | 2 +-
 snippets/org-mode/header-arg-wrap    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/snippets/org-mode/header-arg-eval b/snippets/org-mode/header-arg-eval
index b405582..aec104a 100644
--- a/snippets/org-mode/header-arg-eval
+++ b/snippets/org-mode/header-arg-eval
@@ -3,4 +3,4 @@
 # key: v
 # condition: (+yas/org-src-header-p)
 # --
-`(let ((out (+yas/org-prompt-header-arg :eval "Evaluate: " '("no" "query" "no-export" "query-export")))) (if out (concat ":eval " out " ") ""))`$0
\ No newline at end of file
+`(let ((out (+yas/org-prompt-header-arg :eval "Evaluate: " '("no" "query" "no-export" "query-export")))) (if out (concat ":eval " out " ") ""))`
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-export b/snippets/org-mode/header-arg-export
index 71109ec..f8a1cfa 100644
--- a/snippets/org-mode/header-arg-export
+++ b/snippets/org-mode/header-arg-export
@@ -3,4 +3,4 @@
 # key: e
 # condition: (+yas/org-src-header-p)
 # --
-`(let ((out (+yas/org-prompt-header-arg :exports "Exports: " '("code" "results" "both" "none")))) (if out (concat ":exports " out " ") ""))`$0
\ No newline at end of file
+`(let ((out (+yas/org-prompt-header-arg :exports "Exports: " '("code" "results" "both" "none")))) (if out (concat ":exports " out " ") ""))`
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-noweb b/snippets/org-mode/header-arg-noweb
index ba9b002..3c92444 100644
--- a/snippets/org-mode/header-arg-noweb
+++ b/snippets/org-mode/header-arg-noweb
@@ -3,4 +3,4 @@
 # key: n
 # condition: (+yas/org-src-header-p)
 # --
-`(let ((out (+yas/org-prompt-header-arg :noweb "Evaluate: " '("no" "yes" "tangle" "no-export" "strip-export" "eval")))) (if out (concat ":noweb " out " ") ""))`$0
\ No newline at end of file
+`(let ((out (+yas/org-prompt-header-arg :noweb "NoWeb: " '("no" "yes" "tangle" "no-export" "strip-export" "eval")))) (if out (concat ":noweb " out " ") ""))`
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-results b/snippets/org-mode/header-arg-results
index ee0b1aa..662d56a 100644
--- a/snippets/org-mode/header-arg-results
+++ b/snippets/org-mode/header-arg-results
@@ -12,4 +12,4 @@
   (+yas/org-prompt-header-arg :results "Result output: " '("silent " "replace " "append " "prepend "))))))
   (if (string= out "") ""
   (concat ":results " out " ")))
-`$0
\ No newline at end of file
+`
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-session b/snippets/org-mode/header-arg-session
index 5d396ee..046ca31 100644
--- a/snippets/org-mode/header-arg-session
+++ b/snippets/org-mode/header-arg-session
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: Header arg - session
-# key: s
+# key: S
 # condition: (+yas/org-src-header-p)
 # --
 :session "${1:`(file-name-base (or (buffer-file-name) "unnnamed"))`-session}" $0
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-silent b/snippets/org-mode/header-arg-silent
index 2b383d6..d193e66 100644
--- a/snippets/org-mode/header-arg-silent
+++ b/snippets/org-mode/header-arg-silent
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: Header arg - silent
-# key: S
+# key: s
 # condition: (+yas/org-src-header-p)
 # --
 :results silent $0
\ No newline at end of file
diff --git a/snippets/org-mode/header-arg-wrap b/snippets/org-mode/header-arg-wrap
index ef333ce..1716a81 100644
--- a/snippets/org-mode/header-arg-wrap
+++ b/snippets/org-mode/header-arg-wrap
@@ -3,4 +3,4 @@
 # key: w
 # condition: (+yas/org-src-header-p)
 # --
-`(let ((out (+yas/org-prompt-header-arg :noweb "Wrap: " '("example" "export" "comment" "src")))) (if out (concat ":wrap " out " ") ""))`$0
\ No newline at end of file
+`(let ((out (+yas/org-prompt-header-arg :noweb "Wrap: " '("example" "export" "comment" "src")))) (if out (concat ":wrap " out " ") ""))`
\ No newline at end of file