X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=parser.c;h=4565e3288233975bfa90cf9f4d6d88dbdc719cf7;hp=257eb3e4ed808816d3ee8ca1f0ee8cc4aac48f40;hb=6cab4f8fc3de7f4e4cd5ab5a1989017ea8e695fe;hpb=dd2eafd32cd4da1c5aa816b367073c3f56e67f5c

diff --git a/parser.c b/parser.c
index 257eb3e..4565e32 100644
--- a/parser.c
+++ b/parser.c
@@ -591,9 +591,7 @@ int pcf_range(int ctoken, char *const *pv, int *rtrue) {
   char *ep;
   unsigned long v;
 
-  r= pa_mwsp(); if (r) return r;
   mintoken= pa_numberdollar(&min); if (mintoken == tokv_error) return mintoken;
-  r= pa_mwsp(); if (r) return r;
   maxtoken= pa_numberdollar(&max); if (maxtoken == tokv_error) return maxtoken;
   r= pa_mnl(); if (r) return r;
   for (pp= pv; *pp; pp++) {
@@ -1036,6 +1034,15 @@ x_err:
   return r;
 }
 
+static int oldquote = 0;
+
+int dfg_lookupquotemode(int dtoken) {
+  int r;
+  r= pa_mnl(); if (r) return r;
+  oldquote = dtoken == tokv_word_includelookupquoteold;
+  return r;
+}
+
 int df_includelookup(int dtoken) {
   static char *buildbuf=0;
   int buildbuflen=0;
@@ -1087,9 +1094,11 @@ int df_includelookup(int dtoken) {
 	  if (c=='/') {
 	    *q++= ':';
 	    c= '-';
-	  } else if (!((c >= '0' && c <= '9') ||
+	  } else if (oldquote ?
+		     !((c >= '0' && c <= '9') ||
 		       (c >= 'a' && c <= 'z') ||
-		       c == '-' || c == '_')) {
+		       c == '-' || c == '_') :
+		     (c==':')) {
 	    *q++= ':';
 	  }
 	  *q++= c;