*** empty log message ***

4 files changed, 20 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08041c2f702..7e7ed0c985d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-10  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
+        * dired-x.el (dired-guess-shell-alist-default): 
+        Suggest xloadimage, which is free, not xv, which isn't.
+
         * ange-ftp.el (ange-ftp-file-name-nondirectory): 
         Don't ever include the host name or user name in the value.
 
diff --git a/lispref/files.texi b/lispref/files.texi
index 03a6276a43c..b313c7f64cc 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2407,9 +2407,10 @@ positions.  All this takes place without modifying the buffer.
 A flag, @code{t} if the encoding function modifies the buffer, and
 @code{nil} if it works by returning a list of annotations.
 
-@item mode
-A mode function to call after visiting a file converted from this
-format.
+@item mode-fn
+A minor-mode function to call after visiting a file converted from this
+format.  The function is called with one argument, the integer 1;
+that tells a minor-mode function to enable the mode.
 @end table
 
 The function @code{insert-file-contents} automatically recognizes file
diff --git a/lispref/os.texi b/lispref/os.texi
index 824d492e07e..9d4ef743f59 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1714,6 +1714,11 @@ This specifies the file containing the sound to play.
 If the file name is not absolute, it is expanded against
 the directory @code{data-directory}.
 
+@item :data @var{data}
+This specifies the sound to play without need to refer to a file.  The
+value, @var{data}, should be a string containing the same bytes as a
+sound file.  We recommend using a unibyte string.
+
 @item :volume @var{volume}
 This specifies how loud to play the sound.  It should be a number in the
 range of 0 to 1.  The default is to use whatever volume has been
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 85c98cbbfa8..ff7fccd1152 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -875,7 +875,7 @@ which is called the associated buffer of the process, or a function
 called the @dfn{filter function} can be called to act on the output.  If
 the process has no buffer and no filter function, its output is
 discarded.
-
+ 
   Output from a subprocess can arrive only while Emacs is waiting: when
 reading terminal input, in @code{sit-for} and @code{sleep-for}
 (@pxref{Waiting}), and in @code{accept-process-output} (@pxref{Accepting
@@ -885,6 +885,13 @@ process and only then specify its buffer or filter function; no output
 can arrive before you finish, if the code in between does not call any
 primitive that waits.
 
+  It is impossible to separate the standard output and standard error
+streams of the subprocess, because Emacs normally spawns the subprocess
+inside a pseudo-TTY, and a pseudo-TTY has only one output channel.  If
+you want to keep the output to those streams separate, you should
+redirect one of them to a file--for example, by using an appropriate
+shell command.
+
   Subprocess output is normally decoded using a coding system before the
 buffer or filter function receives it, much like text read from a file.
 You can use @code{set-process-coding-system} to specify which coding