diff options
author | Andy Wingo <wingo@pobox.com> | 2016-05-22 20:15:09 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2016-05-22 20:21:49 +0200 |
commit | 2badbd06f695127039e8772f56e9ba44ec875896 (patch) | |
tree | af8b65cfe476fa4f783b491a6fd920a4e0a90782 /doc/ref/api-memory.texi | |
parent | fd17cf9f72bcfc1832775c848e678e695d05dbd8 (diff) | |
parent | a7d0a0de2fa5fd99f001b1c6d42c0ae497a2cb1f (diff) | |
download | guile-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-memory.texi')
-rw-r--r-- | doc/ref/api-memory.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ref/api-memory.texi b/doc/ref/api-memory.texi index 0e37d16fc..a2a27e43b 100644 --- a/doc/ref/api-memory.texi +++ b/doc/ref/api-memory.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2013, 2014 +@c Copyright (C) 1996, 1997, 2000-2004, 2009, 2010, 2012-2016 @c Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @@ -36,7 +36,7 @@ explicitly. It is called automatically when appropriate. Protects @var{obj} from being freed by the garbage collector, when it otherwise might be. When you are done with the object, call @code{scm_gc_unprotect_object} on the object. Calls to -@code{scm_gc_protect}/@code{scm_gc_unprotect_object} can be nested, and +@code{scm_gc_protect_object}/@code{scm_gc_unprotect_object} can be nested, and the object remains protected until it has been unprotected as many times as it was protected. It is an error to unprotect an object more times than it has been protected. Returns the SCM object it was passed. |