2017-10-17: merge

merge

diff --git a/.hgsigs b/.hgsigs
--- a/.hgsigs
+++ b/.hgsigs
@@ -32,3 +32,4 @@ 203262567504525465ccfc0cc42b200296740090
 dcac1620611cfcc6dd37d907b0be026edd611a4e 0 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
+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
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -39,3 +39,4 @@ 7a6f1a55af314540efb68e109b9d15ccdfddeb96
 b536803e2a7ce03e08088861e4f663dfcb2a01ea v0.9.4
 5559a51f3d32539e4ff6d182b5c514fb6ecc495a v0.9.5
 167fa001cabbf80d2d6a9d570a989227e0dbccc1 v0.9.6
+56044ce725b7d803100d58881e60e63668b6edb8 v0.9.7
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUFFIXES = .w .scm .sh
 
 sitedir = $(GUILE_SITE)
-site_DATA = wisp-scheme.scm
+site_DATA = language/wisp.scm
 
 langdir = ${datarootdir}/guile/site/$(GUILE_EFFECTIVE_VERSION)/language/wisp
 lang_DATA = language/wisp/spec.scm language/wisp.scm
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 wisp ():
 
+wisp 0.9.7:
+- FIX: install language/wisp.scm instead of wisp-scheme.scm
+
 wisp 0.9.6:
 - Add a warning with undefined indentation levels: they can
   produce surprising behaviour when changing existing code.
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [0.9.6],
+AC_INIT([wisp], [0.9.7],
         [arne_bab@web.de])
 # Add macros in m4/ to ensure that wisp builds without having Guile in the aclocal path
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/examples/benchmark.w b/examples/benchmark.w
--- a/examples/benchmark.w
+++ b/examples/benchmark.w
@@ -77,10 +77,10 @@ define* : benchmark-run fun
           : res : list-ec (: i sampling-steps) : benchmark-run-single fun #:min-seconds min-seconds
             std : stddev-unbiased-normal res
             mean : / (apply + res) sampling-steps
-           ;; pretty-print : list mean '± std min-seconds sampling-steps
-           if : or {sampling-steps > max-iterations} : and {std < {mean * max-relative-uncertainty}} {std < max-absolute-uncertainty-seconds}
-              . mean
-              lp (* 2 min-seconds) (* 2 sampling-steps) ;; should decrease σ by factor 2 or √2 (for slow functions)
+          ;; pretty-print : list mean '± std min-seconds sampling-steps
+          if : or {sampling-steps > max-iterations} : and {std < {mean * max-relative-uncertainty}} {std < max-absolute-uncertainty-seconds}
+             . mean
+             lp (* 2 min-seconds) (* 2 sampling-steps) ;; should decrease σ by factor 2 or √2 (for slow functions)
 
 define loopcost
   benchmark-run (λ() #f)
diff --git a/wisp-scheme.w b/wisp-scheme.w
--- a/wisp-scheme.w
+++ b/wisp-scheme.w
@@ -532,7 +532,7 @@ define* : wisp-scheme-indentation-to-par
                             values processed unprocessed
                             begin ;; not yet used level! TODO: maybe throw an error here instead of a warning.
                                 let : : linenumber : - (length lines) (length unprocessed)
-                                    format (current-error-port) ";;; WARNING:~A: used lower but undefined indentation level (line ~A of the current chunk: ~S). This makes refactoring much more error-prone, therefore it might become an error in a later version of Wisp.\n" linenumber : cdr current-line
+                                    format (current-error-port) ";;; WARNING:~A: used lower but undefined indentation level (line ~A of the current chunk: ~S). This makes refactoring much more error-prone, therefore it might become an error in a later version of Wisp.\n" (source-property current-line 'line) linenumber (cdr current-line)
                                 loop
                                   . processed
                                   . unprocessed