Mercurial > hg > xemacs-beta

comparison lisp/sound.el @ 5470:0af042a0c116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents 308d34e9f07d 2a54dfbe434f
children cc6f0266bc36
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
177 ;; some conses in sound-alist might have been dumped with emacs. 177 ;; some conses in sound-alist might have been dumped with emacs.
178 (if old (setq sound-alist (delq old (copy-sequence sound-alist))))) 178 (if old (setq sound-alist (delq old (copy-sequence sound-alist)))))
179 (setq sound-alist (cons 179 (setq sound-alist (cons
180 (nconc (list sound-name) 180 (nconc (list sound-name)
181 (if (and volume (not (eq 0 volume))) 181 (if (and volume (not (eq 0 volume)))
182 (list ':volume volume)) 182 (list :volume volume))
183 (list ':sound data)) 183 (list :sound data))
184 sound-alist))) 184 sound-alist)))
185 sound-name) 185 sound-name)
186 186
187 ;;;###autoload 187 ;;;###autoload
188 (defun load-default-sounds () 188 (defun load-default-sounds ()