aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/strings.texi
diff options
context:
space:
mode:
authorStefan Monnier2011-03-21 12:42:16 -0400
committerStefan Monnier2011-03-21 12:42:16 -0400
commitcafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch)
tree7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /doc/lispref/strings.texi
parenta08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff)
parent4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff)
downloademacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz
emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip
Merge from trunk
Diffstat (limited to 'doc/lispref/strings.texi')
-rw-r--r--doc/lispref/strings.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index ce080bc221f..d062c215952 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -554,8 +554,8 @@ strings and integers. @code{format} (@pxref{Formatting Strings}) and
554@code{prin1-to-string} (@pxref{Output Functions}) can also convert 554@code{prin1-to-string} (@pxref{Output Functions}) can also convert
555Lisp objects into strings. @code{read-from-string} (@pxref{Input 555Lisp objects into strings. @code{read-from-string} (@pxref{Input
556Functions}) can ``convert'' a string representation of a Lisp object 556Functions}) can ``convert'' a string representation of a Lisp object
557into an object. The functions @code{string-make-multibyte} and 557into an object. The functions @code{string-to-multibyte} and
558@code{string-make-unibyte} convert the text representation of a string 558@code{string-to-unibyte} convert the text representation of a string
559(@pxref{Converting Representations}). 559(@pxref{Converting Representations}).
560 560
561 @xref{Documentation}, for functions that produce textual descriptions 561 @xref{Documentation}, for functions that produce textual descriptions