(struct window): New member height_fixed_p.

[bpt/emacs.git] / lispref / loading.texi

diff --git a/lispref/loading.texi b/lispref/loading.texi
index 0936443..b5b03ab 100644 (file)
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -317,7 +317,7 @@ appropriately.
 multibyte strings should not be noticeable, since inserting them in
 unibyte buffers converts them to unibyte automatically.  However, if
 this does make a difference, you can force a particular Lisp file to be
-interpreted as unibyte by writing @samp{-*-coding: raw-text;-*-} in a
+interpreted as unibyte by writing @samp{-*-unibyte: t;-*-} in a
 comment on the file's first line.  With that designator, the file will
 be unconditionally be interpreted as unibyte, even in an ordinary
 multibyte Emacs session.
@@ -640,7 +640,7 @@ error in the evaluating its contents, any function definitions or
 @xref{Autoload}.
 @end defun
 
-@defun require feature &optional filename
+@defun require feature &optional filename noerror
 This function checks whether @var{feature} is present in the current
 Emacs session (using @code{(featurep @var{feature})}; see below).  The
 argument @var{feature} must be a symbol.
@@ -654,7 +654,7 @@ used.
 
 If loading the file fails to provide @var{feature}, @code{require}
 signals an error, @samp{Required feature @var{feature} was not
-provided}.
+provided}, unless @var{noerror} is non-@code{nil}.
 @end defun
 
 @defun featurep feature