# HG changeset patch
# User Ziv Scully <ziv@mit.edu>
# Date 1430938269 14400
# Node ID a07b91fa71db16faf7accd1fb9094e3b112dee31
# Parent  67e801cf42c64da6b15d78c545bd738f5bd99dc1# Parent  8ecbd110022764841b0f876a2235ae6d7f12a95a
Merge.

diff -r 67e801cf42c6 -r a07b91fa71db .hgignore
--- a/.hgignore	Wed May 06 14:50:55 2015 -0400
+++ b/.hgignore	Wed May 06 14:51:09 2015 -0400
@@ -34,6 +34,7 @@
 demo/more/demo.*
 
 doc/*.html
+doc/*.out
 
 *.sql
 *mlmon.out
diff -r 67e801cf42c6 -r a07b91fa71db CHANGELOG
--- a/CHANGELOG	Wed May 06 14:50:55 2015 -0400
+++ b/CHANGELOG	Wed May 06 14:51:09 2015 -0400
@@ -1,3 +1,13 @@
+========
+20150412
+========
+
+- Several new infix operators for function composition, etc.
+- Hexadecimal integer literals
+- New HTML events: 'oncontextmenu', 'onmouseenter', and 'onmouseleave'
+- New HTML attributes: 'download'
+- Bug fixes and optimization improvements
+
 ========
 20150214
 ========
diff -r 67e801cf42c6 -r a07b91fa71db configure.ac
--- a/configure.ac	Wed May 06 14:50:55 2015 -0400
+++ b/configure.ac	Wed May 06 14:51:09 2015 -0400
@@ -1,4 +1,4 @@
-AC_INIT([urweb], [20150214])
+AC_INIT([urweb], [20150412])
 WORKING_VERSION=1
 AC_USE_SYSTEM_EXTENSIONS
 
diff -r 67e801cf42c6 -r a07b91fa71db doc/manual.tex
--- a/doc/manual.tex	Wed May 06 14:50:55 2015 -0400
+++ b/doc/manual.tex	Wed May 06 14:51:09 2015 -0400
@@ -9,6 +9,8 @@
 \newcommand{\rcut}{\; \texttt{-{}-} \;}
 \newcommand{\rcutM}{\; \texttt{-{}-{}-} \;}
 
+\usepackage{hyperref}
+
 \begin{document}
 
 \title{The Ur/Web Manual}
diff -r 67e801cf42c6 -r a07b91fa71db src/c/static.c
--- a/src/c/static.c	Wed May 06 14:50:55 2015 -0400
+++ b/src/c/static.c	Wed May 06 14:51:09 2015 -0400
@@ -16,6 +16,10 @@
 
 static uw_loggers loggers = {NULL, log_, log_};
 
+static char *get_header(void *data, const char *h) {
+  return NULL;
+}
+
 int main(int argc, char *argv[]) {
   uw_context ctx;
   failure_kind fk;
@@ -27,6 +31,7 @@
  
   ctx = uw_init(0, &loggers);
   uw_set_app(ctx, &uw_application);
+  uw_set_headers(ctx, get_header, NULL);
   uw_initialize(ctx);
 
   while (1) {
diff -r 67e801cf42c6 -r a07b91fa71db src/monoize.sml
--- a/src/monoize.sml	Wed May 06 14:50:55 2015 -0400
+++ b/src/monoize.sml	Wed May 06 14:51:09 2015 -0400
@@ -4693,8 +4693,8 @@
                                      (L'.EDml (str
                                                    (foldl (fn ((x, _), s) =>
                                                               s ^ ", " ^ Settings.mangleSql x ^ " = NULL")
-                                                          ("UPDATE uw_"
-                                                           ^ tab
+                                                          ("UPDATE "
+                                                           ^ Settings.mangleSql tab
                                                            ^ " SET "
                                                            ^ Settings.mangleSql x
                                                                       ^ " = NULL")
diff -r 67e801cf42c6 -r a07b91fa71db src/settings.sml
--- a/src/settings.sml	Wed May 06 14:50:55 2015 -0400
+++ b/src/settings.sml	Wed May 06 14:51:09 2015 -0400
@@ -880,7 +880,7 @@
 
 fun addFile {Uri, LoadFromFilename} =
     let
-        val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename}
+        val path = OS.Path.concat (!filePath, LoadFromFilename)
     in
         case SM.find (!files, Uri) of
             SOME (path', _) =>