*** empty log message ***

2 files changed, 24 insertions, 7 deletions

diff --git a/lispref/commands.texi b/lispref/commands.texi
index 893dcd3c142..0c1c7669bf9 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -1846,17 +1846,22 @@ from the terminal---not counting those generated by keyboard macros.
   The lowest level functions for command input are those that read a
 single event.
 
-@defun read-event
+@defun read-event &optional prompt suppress-input-method
 This function reads and returns the next event of command input, waiting
 if necessary until an event is available.  Events can come directly from
 the user or from a keyboard macro.
 
-The function @code{read-event} does not display any message to indicate
-it is waiting for input; use @code{message} first, if you wish to
-display one.  If you have not displayed a message, @code{read-event}
+If @var{prompt} is non-@code{nil}, it should be a string to display in
+the echo area as a prompt.  Otherwise, @code{read-event} does not
+display any message to indicate it is waiting for input; instead, it
 prompts by echoing: it displays descriptions of the events that led to
 or were read by the current command.  @xref{The Echo Area}.
 
+If @var{suppress-input-method} is non-@code{nil}, then the current input
+method is disabled for reading this event.  If you want to read an event
+without input-method processing, always do it this way; don't try binding
+@code{input-method-function} (see below).
+
 If @code{cursor-in-echo-area} is non-@code{nil}, then @code{read-event}
 moves the cursor temporarily to the echo area, to the end of any message
 displayed there.  Otherwise @code{read-event} does not move the cursor.
@@ -1917,6 +1922,12 @@ passing the event as an argument.
 @defvar input-method-function
 If this is non-@code{nil}, its value specifies the current input method
 function.
+
+@strong{Note:} Don't bind this variable with @code{let}.  It is often
+buffer-local, and if you bind it around reading input (which is exactly
+when you @emph{would} bind it), switching buffers asynchronously while
+Emacs is waiting will cause the value to be restored in the wrong
+buffer.
 @end defvar
 
   The input method function should return a list of events which should
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 9bd51e2b5c8..fb089fae206 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -606,6 +606,9 @@ value shortly after the function call which stores the value you are
 interested in.
 @end defvar
 
+  The variable @code{selection-coding-system} specifies how to encode
+selections for the window system.  @xref{Window System Selections}.
+
 @node Lisp and Coding Systems
 @subsection Coding Systems in Lisp
 
@@ -985,8 +988,10 @@ decoded text.  To make explicit decoding useful, the contents of
 @subsection Terminal I/O Encoding
 
   Emacs can decode keyboard input using a coding system, and encode
-terminal output.  This kind of decoding and encoding does not set
-@code{last-coding-system-used}.
+terminal output.  This is useful for terminals that transmit or display
+text using a particular encoding such as Latin-1.  Emacs does not set
+@code{last-coding-system-used} for encoding or decoding for the
+terminal.
 
 @defun keyboard-coding-system
 @tindex keyboard-coding-system
@@ -1144,4 +1149,5 @@ told, the arguments to @var{activate-func} are @var{input-method} and
 the @var{args}.
 @end defvar
 
-
+  The fundamental interface to input methods is through the
+variable @code{input-method-function}.  @xref{Reading One Event}.