Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'

Conflicts:
	libguile/foreign.c
	module/ice-9/psyntax-pp.scm
	module/ice-9/psyntax.scm

diff --cc .gitignore
Simple merge

diff --cc doc/ref/srfi-modules.texi
Simple merge

diff --cc doc/ref/vm.texi
Simple merge

diff --cc libguile/filesys.c
Simple merge

diff --cc libguile/fluids.c
Simple merge

diff --cc libguile/foreign.c
index a734f2d,f8c268d..445ce02
--- 1/libguile/foreign.c
--- 2/libguile/foreign.c
+++ b/libguile/foreign.c
@@@ -266,8 -269,9 +266,9 @@@ SCM_DEFINE (scm_pointer_to_bytevector, 
  
    blen = scm_to_size_t (len);
  
-   ret = scm_c_take_typed_bytevector (ptr + boffset, blen, btype, pointer);
+   ret = scm_c_take_typed_bytevector ((signed char *) ptr + boffset,
 -                                   blen, btype);
 -  register_weak_reference (ret, pointer);
++                                   blen, btype, pointer);
 +
    return ret;
  }
  #undef FUNC_NAME

diff --cc libguile/print.c
Simple merge

diff --cc libguile/strings.c
Simple merge

diff --cc libguile/threads.c
Simple merge

diff --cc libguile/values.c
Simple merge

diff --cc m4/gnulib-cache.m4
Simple merge

diff --cc module/ice-9/boot-9.scm
Simple merge

diff --cc module/ice-9/psyntax.scm
index d96c3cf,be6b2b6..1c6a951
--- 1/module/ice-9/psyntax.scm
--- 2/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@@ -2541,6 -2471,33 +2551,36 @@@
      (set! syntax-source
            (lambda (x) (source-annotation x)))
  
 -                                    (syntax-object-module id)))
+     (set! syntax-local-binding
+           (lambda (id)
+             (arg-check nonsymbol-id? id 'syntax-local-value)
+             (with-transformer-environment
+              (lambda (e r w s rib mod)
+                (define (strip-anti-mark w)
+                  (let ((ms (wrap-marks w)) (s (wrap-subst w)))
+                    (if (and (pair? ms) (eq? (car ms) the-anti-mark))
+                        ;; output is from original text
+                        (make-wrap (cdr ms) (if rib (cons rib (cdr s)) (cdr s)))
+                        ;; output introduced by macro
+                        (make-wrap ms (if rib (cons rib s) s)))))
+                (call-with-values (lambda ()
+                                    (resolve-identifier
+                                     (syntax-object-expression id)
+                                     (strip-anti-mark (syntax-object-wrap id))
+                                     r
++                                    (syntax-object-module id)
++                                    ;; FIXME: come up with a better policy for
++                                    ;; resolve-syntax-parameters
++                                    #t))
+                  (lambda (type value mod)
+                    (case type
+                      ((lexical) (values 'lexical value))
+                      ((macro) (values 'macro value))
+                      ((syntax) (values 'pattern-variable value))
+                      ((displaced-lexical) (values 'displaced-lexical #f))
+                      ((global) (values 'global (cons value mod)))
+                      (else (values 'other #f)))))))))
+ 
      (set! generate-temporaries
            (lambda (ls)
              (arg-check list? ls 'generate-temporaries)