Don't concatenate adjacent strings in configuration files.

* grecs: Upgrade.
* src/pies.h: Fix include paths.
* src/piesctl.c: Likewise.

* NEWS: Document changes.
* doc/pies.texi: Likewise.

5 files changed, 12 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 55cead2..78d2ff2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-GNU Pies NEWS -- history of user-visible changes. 2016-03-15
+GNU Pies NEWS -- history of user-visible changes. 2016-07-16
 Copyright (C) 2009-2016 Sergey Poznyakoff
@@ -42,2 +42,8 @@ input to be open (e.g. pppd nodetach).
 
+** String concatenation
+
+The adjacent string concatenation feature proved to create more
+problems than solutions (in particular, with the "env" statement)
+and was removed.
+
 
diff --git a/doc/pies.texi b/doc/pies.texi
index 0e8af70..7428d2b 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -478,2 +478,3 @@ above, the backslash is ignored and a warning is issued.
 
+@ignore
   Two or more adjacent quoted strings are concatenated, which gives
@@ -489,3 +490,3 @@ example above:
 @end example
-
+@end ignore
 @anchor{here-document}
diff --git a/grecs b/grecs
-Subproject 8241dc04501f62b613f17f5c165f915a216ba30
+Subproject 1c1e7a987f643aae50bf8b45928650bb384e5c6
diff --git a/src/pies.h b/src/pies.h
index b0cc746..851a8ff 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -58,3 +58,3 @@
 #include "libpies.h"
-#include "json.h"
+#include "grecs/json.h"
 
diff --git a/src/piesctl.c b/src/piesctl.c
index aa6150a..9391d4b 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -29,4 +29,4 @@
 #include <grecs.h>
-#include <grecs-locus.h>
-#include <json.h>
+#include <grecs/locus.h>
+#include <grecs/json.h>
 #include <wordsplit.h>