projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(C7-2B43): Add `ideographic-strokes'.
[chise/xemacs-chise.git]
/
lisp
/
sound.el
diff --git
a/lisp/sound.el
b/lisp/sound.el
index
be24062
..
2857165
100644
(file)
--- a/
lisp/sound.el
+++ b/
lisp/sound.el
@@
-82,7
+82,7
@@
(const :format "" :value :duration)
(integer :tag "Duration"))))))
(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)
'((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
)
: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
"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
(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
(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
;; 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
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
(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))
(setq sound-alist
(append sound-default-alist
sound-alist))