Fix license snippets

2 files changed, 1 insertions, 19 deletions

diff --git a/snippets/all.snippets b/snippets/all.snippets
index ef6ca73..9546dfd 100644
--- a/snippets/all.snippets
+++ b/snippets/all.snippets
@@ -30,7 +30,6 @@ snippet GPL2
 
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
-	${0}
 snippet LGPL2
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -46,7 +45,6 @@ snippet LGPL2
 
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
-	${0}
 snippet GPL3
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -62,7 +60,6 @@ snippet GPL3
 
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	${0}
 snippet LGPL3
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -78,7 +75,6 @@ snippet LGPL3
 
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
-	${0}
 snippet AGPL3
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -94,7 +90,6 @@ snippet AGPL3
 
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	${0}
 snippet GMGPL linking exception
 	As a special exception, if other files instantiate generics from
 	this unit, or you link this unit with other files to produce an
@@ -102,8 +97,6 @@ snippet GMGPL linking exception
 	executable to be covered by the GNU General Public License.
 	This exception does not however invalidate any other reasons why the
 	executable file might be covered by the GNU Public License.
-
-	${0}
 snippet BSD2
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 	All rights reserved.
@@ -130,7 +123,6 @@ snippet BSD2
 	The views and conclusions contained in the software and documentation
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressed or implied, of $1.
-	${0}
 snippet BSD3
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 	All rights reserved.
@@ -156,7 +148,6 @@ snippet BSD3
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	${0}
 snippet BSD4
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 	All rights reserved.
@@ -185,7 +176,6 @@ snippet BSD4
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	${0}
 snippet MIT
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -206,7 +196,6 @@ snippet MIT
 	DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 	OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	${0}
 snippet APACHE
 	Copyright `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -221,7 +210,6 @@ snippet APACHE
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 	See the License for the specific language governing permissions and
 	limitations under the License.
-	${0}
 snippet BEERWARE
 	Copyright `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -229,7 +217,6 @@ snippet BEERWARE
 	$1 wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
 	this stuff is worth it, you can buy me a beer or coffee in return
-	${0}
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 					Version 2, December 2004
@@ -244,13 +231,10 @@ snippet WTFPL
 	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 	 0. You just DO WHAT THE FUCK YOU WANT TO.
-
-	${0}
 snippet MPL2
 	This Source Code Form is subject to the terms of the Mozilla Public
 	License, v. 2.0. If a copy of the MPL was not distributed with this
 	file, You can obtain one at http://mozilla.org/MPL/2.0/.
-	${0}
 snippet AGPL
 	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`} <${2:`g:snips_mail`}>
 
@@ -280,4 +264,3 @@ snippet ISC
 	LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 	OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 	PERFORMANCE OF THIS SOFTWARE.
-	${0}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 805d31a..590e1d4 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -45,9 +45,8 @@ snippet #if
 		${0:${VISUAL}}
 	#endif
 # header include guard
-snippet once
+snippet guard
 	#ifndef ${1:`toupper(vim_snippets#Filename('$1_H', 'UNTITLED_H'))`}
-
 	#define $1
 
 	${0}