Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel:
  Release 1.3.2.
  skelrc.sod: Add skeleton for Sod.

Conflicts:
	debian/changelog -- two 1.3.2 releases!

diff --git a/Makefile.am b/Makefile.am
index a609a0f..6a8990a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ skel_DATA             += skelrc.m
 skel_DATA              += skelrc.cs
 skel_DATA              += skelrc.java
 skel_DATA              += skelrc.scala
+skel_DATA              += skelrc.rs
 skel_DATA              += skelrc.js
 skel_DATA              += skelrc.S
 

diff --git a/debian/changelog b/debian/changelog
index 0d906ab..d6fb804 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-skel (1.3.2) experimental; urgency=medium
+skel (1.3.2x) experimental; urgency=medium
+
+  * Add template for Rust.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Thu, 14 Feb 2019 13:15:56 +0000
+
+skel (1.3.2y) experimental; urgency=medium
 
   * Add template for Sod.
 

diff --git a/skelrc.rs b/skelrc.rs
new file mode 100644 (file)
index 0000000..07f9592
--- /dev/null
+++ b/skelrc.rs
@@ -0,0 +1,20 @@
+;;; -*-emacs-lisp-*-
+
+(skelrc-force-mode 'rust-mode)
+
+(setq skel-alist
+      (append
+       '((new-comment . "/*")
+        (cont-comment . " *")
+        (end-comment . " */")
+        (block-start . "/*")
+        (block-banner-knob . "* ")
+        (block-banner-end . "*/")
+        (block-end . "\n */")
+        (preamble . "[[preliminaries]][[main-code]]")
+        (preliminaries . "[[preliminaries-banner]]\n\n[[crates]]")
+        (preliminaries-banner . (skelrc-banner "Preliminaries"))
+        (crates . "")
+        (main-code . "[[main-code-banner]]\n\n")
+        (main-code-banner . (skelrc-banner "Main code")))
+       skel-alist))