(play-sound): Move to subr.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26e0cd8869cc5844326821a127af982f65a8b996..e32dd2a4c8a6dcb5996cda053c19b905cc20513a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-07  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * subr.el (play-sound): Move here from simple.el.
+
+       * simple.el (play-sound): Move to subr.el.
+
 2002-04-06  Richard M. Stallman  <rms@gnu.org>
 
        * files.el (display-time-string-forms): Mark as risky.

diff --git a/lisp/simple.el b/lisp/simple.el
index da2e352007428f80b311f77609cd71c320c5e1c4..eefac3fce0f4448fa8260d245cf368e622328278 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3355,27 +3355,6 @@ specification for `play-sound'."
     (push 'sound sound)
     (play-sound sound)))
 
-(defun play-sound (sound)
-  "SOUND is a list of the form `(sound KEYWORD VALUE...)'.
-The following keywords are recognized:
-
-  :file FILE - read sound data from FILE.  If FILE isn't an
-absolute file name, it is searched in `data-directory'.
-
-  :data DATA - read sound data from string DATA.
-
-Exactly one of :file or :data must be present.
-
-  :volume VOL - set volume to VOL.  VOL must an integer in the
-range 0..100 or a float in the range 0..1.0.  If not specified,
-don't change the volume setting of the sound device.
-
-  :device DEVICE - play sound on DEVICE.  If not specified,
-a system-dependent default device name is used."
-  (unless (fboundp 'play-sound-internal)
-    (error "This Emacs binary lacks sound support."))
-  (play-sound-internal sound))
-
 (define-key global-map "\e\e\e" 'keyboard-escape-quit)
 
 (defcustom read-mail-command 'rmail