diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2016-05-30 17:33:12 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-05-30 17:33:12 -0400 |
commit | a3e471e933945dcfb54873cb20c691a193b55671 (patch) | |
tree | 70ba7ffe26a589f0b97aec7016c171261c54c9e2 /src/demo.sml | |
parent | 5ca6148aaf7b930a8868d0543f1a307d40532243 (diff) | |
parent | 359c1ca68f97181dada92e28440c7336fc88fff5 (diff) |
Merge branch 'upstream' into dfsg_clean20160515+dfsg
Diffstat (limited to 'src/demo.sml')
-rw-r--r-- | src/demo.sml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/demo.sml b/src/demo.sml index 17de80ee..0d9f0f4f 100644 --- a/src/demo.sml +++ b/src/demo.sml @@ -118,6 +118,7 @@ fun make' {prefix, dirname, guided} = filterRequest = #filterRequest combined @ #filterRequest urp, filterResponse = #filterResponse combined @ #filterResponse urp, filterEnv = #filterEnv combined @ #filterEnv urp, + filterMeta = #filterMeta combined @ #filterMeta urp, protocol = mergeWith #2 (#protocol combined, #protocol urp), dbms = mergeWith #2 (#dbms combined, #dbms urp), sigFile = mergeWith #2 (#sigFile combined, #sigFile urp), @@ -318,12 +319,13 @@ fun make' {prefix, dirname, guided} = Posix.FileSys.ST.mtime htmlSt) end handle OS.SysErr _ => true - val cmd = "emacs --eval \"(progn " + val cmd = "emacs -no-init-file --eval \"(progn " ^ "(global-font-lock-mode t) " ^ "(add-to-list 'load-path \\\"" ^ !Settings.configSitelisp ^ "/\\\") " ^ "(load \\\"urweb-mode-startup\\\") " + ^ "(load \\\"htmlize\\\") " ^ "(urweb-mode) " ^ "(find-file \\\"" ^ src |