@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1994, 1998-1999, 2001-2012 Free Software Foundation, Inc.
+@c Copyright (C) 1990-1994, 1998-1999, 2001-2015 Free Software
+@c Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Read and Print
@chapter Reading and Printing Lisp Objects
@end example
@end defun
-@defun terpri &optional stream
+@defun terpri &optional stream ensure
@cindex newline in print
-This function outputs a newline to @var{stream}. The name stands
-for ``terminate print''.
+This function outputs a newline to @var{stream}. The name stands for
+``terminate print''. If @var{ensure} is non-@code{nil} no newline is printed
+if @var{stream} is already at the beginning of a line. Note in this
+case @var{stream} can not be a function and an error is signalled if
+it is. This function returns @code{t} if a newline is printed.
@end defun
@defun write-char character &optional stream
@defvar print-quoted
If this is non-@code{nil}, that means to print quoted forms using
-abbreviated reader syntax, e.g.@: @code{(quote foo)} prints as
+abbreviated reader syntax, e.g., @code{(quote foo)} prints as
@code{'foo}, and @code{(function foo)} as @code{#'foo}.
@end defvar
@end defvar
@defvar float-output-format
-This variable specifies how to print floating point numbers. The
+This variable specifies how to print floating-point numbers. The
default is @code{nil}, meaning use the shortest output
that represents the number without losing information.