summaryrefslogtreecommitdiff
path: root/doc/ref/api-macros.texi
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-05-22 20:15:09 +0200
committerAndy Wingo <wingo@pobox.com>2016-05-22 20:21:49 +0200
commit2badbd06f695127039e8772f56e9ba44ec875896 (patch)
treeaf8b65cfe476fa4f783b491a6fd920a4e0a90782 /doc/ref/api-macros.texi
parentfd17cf9f72bcfc1832775c848e678e695d05dbd8 (diff)
parenta7d0a0de2fa5fd99f001b1c6d42c0ae497a2cb1f (diff)
downloadguile-2badbd06f695127039e8772f56e9ba44ec875896.tar.gz
Merge from stable-2.0
This cherry-picks changes from stable-2.0, starting from acd2c8e36a25d77e9e9c9b6782780b23a1764973 and ending in 461b62efc90135d3ca8719ba0f3b6ced4ad13754, inclusively. I did not cherry-pick patches that were already on master and did not cherry-pick ones that don't make sense on master (for example because of the port re-write). I did pick all tests though. I also did not cherry-pick the "Revert foreign objects" patch from ff98cbb643d43c9f8c6ee0e0b4e1bad72aced62e; further discussion necessary.
Diffstat (limited to 'doc/ref/api-macros.texi')
-rw-r--r--doc/ref/api-macros.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ref/api-macros.texi b/doc/ref/api-macros.texi
index 9964e6b06..ef0621415 100644
--- a/doc/ref/api-macros.texi
+++ b/doc/ref/api-macros.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
-@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011,
-@c 2012, 2013, 2014 Free Software Foundation, Inc.
+@c Copyright (C) 1996, 1997, 2000-2004, 2009-2015
+@c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@node Macros
@@ -618,9 +618,9 @@ won't have access to the binding of @code{it}.
But they can, if we explicitly introduce a binding via @code{datum->syntax}.
-@deffn {Scheme Procedure} datum->syntax for-syntax datum
+@deffn {Scheme Procedure} datum->syntax template-id datum
Create a syntax object that wraps @var{datum}, within the lexical context
-corresponding to the syntax object @var{for-syntax}.
+corresponding to the identifier @var{template-id}.
@end deffn
For completeness, we should mention that it is possible to strip the metadata