X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fsound.el;h=2857165bbc7e69f9da736df86a01926bcc1a6ac0;hb=a0532ab033c0895e03ca85d032bebea29a7d32f3;hp=be240625ec2a56502bf77f4279da842cd0294079;hpb=72a705551741d6f85a40eea486c222bac482d8dc;p=chise%2Fxemacs-chise.git

diff --git a/lisp/sound.el b/lisp/sound.el
index be24062..2857165 100644
--- a/lisp/sound.el
+++ b/lisp/sound.el
@@ -82,7 +82,7 @@
 				       (const :format "" :value :duration)
 				       (integer :tag "Duration"))))))
 
-(defcustom sound-load-alist
+(defcustom sound-load-list
   '((load-sound-file "drum-beep"	'drum)
     (load-sound-file "quiet-beep"	'quiet)
     (load-sound-file "bass-snap"	'bass 80)
@@ -105,9 +105,10 @@
   :type 'directory
   )
 
-(defcustom sound-ext (if (or (eq system-type 'cygwin32)
-			     (eq system-type 'windows-nt))
-			 ".wav:" ".au:")
+;; #### This should really be a list.  --hniksic
+(defcustom sound-extension-list (if (or (eq system-type 'cygwin32)
+					(eq system-type 'windows-nt))
+				    ".wav:" ".au:")
   "Filename extensions to complete sound file name with. If more than one
    extension is used, they should be separated by \":\". "
   :group 'sound
@@ -144,7 +145,8 @@ nVolume (0 for default): ")
     (error "volume not an integer or nil"))
   (let (buf
 	data
-	(file (locate-file filename  default-sound-directory-list  sound-ext)))
+	(file (locate-file filename default-sound-directory-list
+			   sound-extension-list)))
     (unless file
       (error "Couldn't load sound file %s" filename))
     (unwind-protect
@@ -161,12 +163,11 @@ nVolume (0 for default): ")
       ;; some conses in sound-alist might have been dumped with emacs.
       (if old (setq sound-alist (delq old (copy-sequence sound-alist)))))
     (setq sound-alist (cons
-			(purecopy
-			 (nconc (list sound-name)
-				(if (and volume (not (eq 0 volume)))
-				    (list ':volume volume))
-			       (list ':sound data)))
-			sound-alist)))
+		       (nconc (list sound-name)
+			      (if (and volume (not (eq 0 volume)))
+				  (list ':volume volume))
+			      (list ':sound data))
+		       sound-alist)))
   sound-name)
 
 ;;;###autoload
@@ -180,7 +181,7 @@ server and XEmacs has the necessary sound support compiled in."
   (message "Loading sounds...")
   (setq sound-alist nil)
   ;; this is where the calls to load-sound-file get done
-  (mapc 'eval sound-load-alist)
+  (mapc 'eval sound-load-list)
   (setq sound-alist
 	(append sound-default-alist
 		sound-alist))