[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-audio.el [lexbind]

[Miles Bader]

Index: emacs/lisp/gnus/gnus-audio.el
diff -c emacs/lisp/gnus/gnus-audio.el:1.6.8.1 
emacs/lisp/gnus/gnus-audio.el:1.6.8.2
*** emacs/lisp/gnus/gnus-audio.el:1.6.8.1       Tue Oct 14 23:34:50 2003
--- emacs/lisp/gnus/gnus-audio.el       Thu Sep 16 00:12:15 2004
***************
*** 1,5 ****
! ;;; gnus-audio.el --- sound effects for Gnus
! ;; Copyright (C) 1996, 2000 Free Software Foundation
  
  ;; Author: Steven L. Baur <address@hidden>
  ;; Keywords: news, mail, multimedia
--- 1,5 ----
! ;;; gnus-audio.el --- Sound effects for Gnus
! ;; Copyright (C) 1996, 2000, 2003 Free Software Foundation
  
  ;; Author: Steven L. Baur <address@hidden>
  ;; Keywords: news, mail, multimedia
***************
*** 47,61 ****
    :type '(choice directory (const nil))
    :group 'gnus-audio)
  
! (defcustom gnus-audio-au-player "/usr/bin/showaudio"
    "Executable program for playing sun AU format sound files."
    :group 'gnus-audio
!   :type 'string)
  
! (defcustom gnus-audio-wav-player "/usr/local/bin/play"
    "Executable program for playing WAV files."
    :group 'gnus-audio
!   :type 'string)
  
  ;;; The following isn't implemented yet.  Wait for Millennium Gnus.
  ;;(defvar gnus-audio-effects-enabled t
--- 47,61 ----
    :type '(choice directory (const nil))
    :group 'gnus-audio)
  
! (defcustom gnus-audio-au-player (executable-find "play")
    "Executable program for playing sun AU format sound files."
    :group 'gnus-audio
!   :type '(choice file (const nil)))
  
! (defcustom gnus-audio-wav-player (executable-find "play")
    "Executable program for playing WAV files."
    :group 'gnus-audio
!   :type '(choice file (const nil)))
  
  ;;; The following isn't implemented yet.  Wait for Millennium Gnus.
  ;;(defvar gnus-audio-effects-enabled t
***************
*** 93,99 ****
  ;;;###autoload
  (defun gnus-audio-play (file)
    "Play a sound FILE through the speaker."
!   (interactive)
    (let ((sound-file (if (file-exists-p file)
                        file
                      (expand-file-name file gnus-audio-directory))))
--- 93,99 ----
  ;;;###autoload
  (defun gnus-audio-play (file)
    "Play a sound FILE through the speaker."
!   (interactive "fSound file name: ")
    (let ((sound-file (if (file-exists-p file)
                        file
                      (expand-file-name file gnus-audio-directory))))