Merge branch 'master' of https://github.com/gjanssens/swig into gjanssens-master

* 'master' of https://github.com/gjanssens/swig:
  Guile: make scm to string conversion work with non-ascii strings
  Guile: illustrate bug in non-ascii string handling

Examples/test-suite/guile/li_std_string_runme.scm

@@ -2,4 +2,8 @@
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
 (dynamic-call "scm_init_li_std_string_module" (dynamic-link "./libli_std_string"))
+; Note: when working with non-ascii strings in guile 2
+;       locale must be set explicitly
+;       The setlocale call below takes care of that
+(setlocale LC_ALL "")
 (load "../schemerunme/li_std_string.scm")

Examples/test-suite/schemerunme/li_std_string.scm

@@ -1,4 +1,6 @@
-(define x "hello")
+; The test string has some non-ascii characters added
+; because our guile wrappers had bugs in that area
+(define x "hello - æææ")
 
 (if (not (string=? (test-value x) x))
   (begin (error "Error 1") (exit 1)))