From 6587097267836aa3e6ac37730d37946ecb0dbd83 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Wed, 24 Jan 2018 11:11:14 +0100
Subject: [PATCH] Fix some yasnippet snippets.

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
 snippets/org-mode/logbook        | 2 +-
 snippets/org-mode/results        | 2 +-
 snippets/org-mode/tablesrcshy    | 3 ++-
 snippets/puppet-mode/filecontent | 9 +++++----
 snippets/puppet-mode/header      | 6 +++---
 snippets/snippet-mode/header     | 7 ++++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/snippets/org-mode/logbook b/snippets/org-mode/logbook
index a01e35fb..17d2b6fe 100644
--- a/snippets/org-mode/logbook
+++ b/snippets/org-mode/logbook
@@ -3,5 +3,5 @@
 # key: logbook_
 # --
 :LOGBOOK:
-${1:`(yank)`}
+${1:`(current-kill 0)`}
 :END:$0
\ No newline at end of file
diff --git a/snippets/org-mode/results b/snippets/org-mode/results
index 1ef39644..1afec474 100644
--- a/snippets/org-mode/results
+++ b/snippets/org-mode/results
@@ -3,4 +3,4 @@
 # key: :res
 # add results parameter to src block
 # --
-:results ${1:$$(yas-choose-value '("verbatim drawer" "table" "list" "silent" "value code :wrap SRC sql" "value code :wrap SRC json"))} $0
\ No newline at end of file
+:results ${1:$$(yas-choose-value '("verbatim drawer" "table" "list" "silent" "value code :wrap SRC sql" "value code :wrap SRC json" "value code :wrap SRC fundamental"))} $0
\ No newline at end of file
diff --git a/snippets/org-mode/tablesrcshy b/snippets/org-mode/tablesrcshy
index ea6a5953..353731cd 100644
--- a/snippets/org-mode/tablesrcshy
+++ b/snippets/org-mode/tablesrcshy
@@ -1,10 +1,11 @@
 # -*- mode: snippet -*-
 # name: tablesrcshy (yank)
 # key: <srcshtabley
+# expand-env: ((yas-triggers-in-field 't))
 # If you want to reference the output in other src blocks you need a name.
 # --
 ${2:#+NAME: ${3:`(replace-regexp-in-string "[: \"]" "_" (replace-regexp-in-string "[][]" "" (replace-regexp-in-string ".*/" "" (org-display-outline-path nil t "/"  t))))`-src}}
-#+BEGIN_SRC sh ${4::session ${5:client}} :var ${6:HOSTS$(upcase (yas-text))}=${1:`(yank)`}[,${7:0}] :cache ${8:$$(yas-choose-value '("yes" "no"))} ${9::res}
+#+BEGIN_SRC sh ${4::session ${5:client}} :var ${6:HOSTS$(upcase (yas-text))}=${1:`(current-kill 0)`}[,${7:0}] :cache ${8:$$(yas-choose-value '("yes" "no"))} ${9::res}
 $6=($$6)
 
 for INDEX in \$\{!$6[@]\}; do
diff --git a/snippets/puppet-mode/filecontent b/snippets/puppet-mode/filecontent
index edc669cc..c716558b 100644
--- a/snippets/puppet-mode/filecontent
+++ b/snippets/puppet-mode/filecontent
@@ -1,11 +1,12 @@
 # -*- mode: snippet -*-
 # name: filecontent
 # key: filecontent
+# expand-env: ((yas/indent-line 'auto) (yas/wrap-around-region 't))
 # --
 file { "$1":
-  ensure => file,
-  owner => ${2:root},
-  group => ${3:$2},
-  mode => '${4:0600}',
+  ensure  => file,
+  owner   => ${2:root},
+  group   => ${3:$2},
+  mode    => '${4:0600}',
   content => template('$5')$0
 }
diff --git a/snippets/puppet-mode/header b/snippets/puppet-mode/header
index dd9603d4..8142047e 100644
--- a/snippets/puppet-mode/header
+++ b/snippets/puppet-mode/header
@@ -1,7 +1,7 @@
 # name: header
-# key: header
+# key: header_
 # --
-# == Class: ${1:name}
+# == Class: ${1:`(file-name-nondirectory (replace-regexp-in-string "/[^/]*/$" "" (file-name-directory (buffer-file-name))))`}
 #
 # ${2:description}
 #
@@ -11,7 +11,7 @@
 #
 # == Authors
 #
-# `(insert-timestamp)`
+# `(or (and (boundp 'user-full-name) user-full-name) (user-full-name))(message " <") (getenv "EMAIL") (message">")`
 #
 # === Copyright
 #
diff --git a/snippets/snippet-mode/header b/snippets/snippet-mode/header
index 8600ec2b..b107a381 100644
--- a/snippets/snippet-mode/header
+++ b/snippets/snippet-mode/header
@@ -3,7 +3,8 @@
 # key: <header
 # --
 # -*- mode: snippet -*-
-# name: ${1:`(insert (buffer-name))`}
-# key: ${2:`(insert (buffer-name))`}
-# --
+# name: ${1:`(print (buffer-name))`}
+# key: ${2:`(print (buffer-name))`}
+${3:# group: $4
+}# --
 $0
\ No newline at end of file
-- 
2.47.3