diff lisp/prim/sound.el @ 124:9b50b4588a93 r20-1b15

Import from CVS: tag r20-1b15
author cvs
date Mon, 13 Aug 2007 09:26:39 +0200
parents 0d2f883870bc
children 34a5b81f86ba
line wrap: on
line diff
--- a/lisp/prim/sound.el	Mon Aug 13 09:26:04 2007 +0200
+++ b/lisp/prim/sound.el	Mon Aug 13 09:26:39 2007 +0200
@@ -35,7 +35,8 @@
 console of a machine with native sound support or running a NetAudio
 server and XEmacs has the necessary sound support compiled in.
 
-The sound file must be in the Sun/NeXT U-LAW format."
+The sound file must be in the Sun/NeXT U-LAW format, except on Linux,
+where .wav files are also supported by the sound card drivers."
   (interactive "fSound file name: \n\
 SSymbol to name this sound: \n\
 nVolume (0 for default): ")
@@ -65,9 +66,10 @@
 
 ;;;###autoload
 (defun load-default-sounds ()
-  "Load and install some sound files as beep-types.
-This only works if you're on display 0 of a Sun SparcStation, SGI machine,
-or HP9000s700, or running a NetAudio server."
+  "Load and install some sound files as beep-types, using
+`load-sound-file'.  This only works if you're on display 0 of the
+console of a machine with native sound support or running a NetAudio
+server and XEmacs has the necessary sound support compiled in."
   (interactive)
   ;; #### - this should do NOTHING if the sounds can't be played.  
   (message "Loading sounds...")