---

yaml
---
r: 51626
b: refs/heads/incoming
c: 218093d
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 8604165871d2744ea762f762c95d4aef66e8eba0
+refs/heads/incoming: 218093d912b3725251e7a97d44f03321ba856ce6
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/configure

@@ -406,12 +406,13 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
-    PANDOC_VER=${PANDOC_VER_LINE#pandoc }
-    PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
-    PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
-    PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
-    PV_MINOR=${PV_MINOR%%[.][0-9]*}
+    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
+        # extract the first 2 version fields, ignore everything else
+        sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
+
+    # these patterns are shell globs, *not* regexps
+    PV_MAJOR=${PV_MAJOR_MINOR% *}
+    PV_MINOR=${PV_MAJOR_MINOR#* }
     if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
     then
 		step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"

branches/incoming/src/etc/kate/rust.xml

@@ -18,6 +18,7 @@
 	<list name="keywords">
 		<item> as </item>
 		<item> break </item>
+		<item> const </item>
 		<item> copy </item>
 		<item> do </item>
 		<item> drop </item>
@@ -28,17 +29,18 @@
 		<item> if </item>
 		<item> impl </item>
 		<item> let </item>
+		<item> log </item>
 		<item> loop </item>
 		<item> match </item>
 		<item> mod </item>
 		<item> mut </item>
 		<item> priv </item>
 		<item> pub </item>
+		<item> pure </item>
 		<item> ref </item>
 		<item> return </item>
 		<item> static </item>
 		<item> struct </item>
-		<item> super </item>
 		<item> trait </item>
 		<item> unsafe </item>
 		<item> use </item>