[Emacs-diffs] Changes to emacs/lisp/subr.el

[Richard M. Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.293 emacs/lisp/subr.el:1.294
*** emacs/lisp/subr.el:1.293    Tue Mar 26 04:17:56 2002
--- emacs/lisp/subr.el  Fri Mar 29 18:13:26 2002
***************
*** 456,461 ****
--- 456,462 ----
            (setq inserted t)))
        (setq tail (cdr tail)))))
  
+ 
  (defmacro kbd (keys)
    "Convert KEYS to the internal Emacs key representation.
  KEYS should be a string constant in the format used for
***************
*** 1867,1887 ****
                (nconc found (list (cons toggle keymap)) rest))
            (setq minor-mode-map-alist (cons (cons toggle keymap)
                                             minor-mode-map-alist))))))))
- 
- ;; XEmacs compatibility/convenience.
- (if (fboundp 'play-sound)
-     (defun play-sound-file (file &optional volume device)
-       "Play sound stored in FILE.
- VOLUME and DEVICE correspond to the keywords of the sound
- specification for `play-sound'."
-       (interactive "fPlay sound file: ")
-       (let ((sound (list :file file)))
-       (if volume
-           (plist-put sound :volume volume))
-       (if device
-           (plist-put sound :device device))
-       (push 'sound sound)
-       (play-sound sound))))
  
  ;; Clones ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
--- 1868,1873 ----