X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fearcon.el;h=a70e68d9a627e56866419f1f33d28edaf31c3873;hb=61a655be8bb61ea7f30c8a8dafcc2ff3e262bc05;hp=ee2b041e154350c8124352952ea15f09b71ad267;hpb=40c3c84356b403e9c4eb89758009b53c8c180180;p=gnus

diff --git a/lisp/earcon.el b/lisp/earcon.el
index ee2b041e1..a70e68d9a 100644
--- a/lisp/earcon.el
+++ b/lisp/earcon.el
@@ -1,8 +1,9 @@
 ;;; earcon.el --- Sound effects for messages
-;; Copyright (C) 1996 Free Software Foundation
+
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
-;; Keywords: news fun sound
 
 ;; This file is part of GNU Emacs.
 
@@ -18,17 +19,14 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;; This file provides access to sound effects in Gnus.
 
 ;;; Code:
 
-(if (null (boundp 'running-xemacs))
-    (defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version)))
-
 (eval-when-compile (require 'cl))
 (require 'gnus)
 (require 'gnus-audio)
@@ -38,13 +36,8 @@
   "Turn ** sounds ** into noise."
   :group 'gnus-visual)
 
-(defcustom earcon-auto-play nil
-  "When True, automatically play sounds as well as buttonize them."
-  :type 'boolean
-  :group 'earcon)
-
 (defcustom earcon-prefix "**"
-  "String denoting the start of an earcon."
+  "*String denoting the start of an earcon."
   :type 'string
   :group 'earcon)
 
@@ -58,7 +51,7 @@
     ("evil[ \t]+laugh" 1 "Evil_Laugh.au")
     ("gag\\|puke" 1 "Puke.au")
     ("snicker" 1 "Snicker.au")
-    ("meow" 1 "catmeow.au")
+    ("meow" 1 "catmeow.wav")
     ("sob\\|boohoo" 1 "cry.wav")
     ("drum[ \t]*roll" 1 "drumroll.au")
     ("blast" 1 "explosion.au")
@@ -70,17 +63,14 @@
     ("cackle" 1 "witch.au")
     ("yell\\|roar" 1 "yell2.au")
     ("whoop-de-doo" 1 "whistle.au"))
-  "A list of regexps to map earcons to real sounds."
+  "*A list of regexps to map earcons to real sounds."
   :type '(repeat (list regexp
 		       (integer :tag "Match")
 		       (string :tag "Sound")))
   :group 'earcon)
-
 (defvar earcon-button-marker-list nil)
 (make-variable-buffer-local 'earcon-button-marker-list)
 
-
-
 ;;; FIXME!! clone of code from gnus-vis.el FIXME!!
 (defun earcon-article-push-button (event)
   "Check text under the mouse pointer for a callback function.
@@ -89,7 +79,7 @@ call it with the value of the `earcon-data' text property."
   (interactive "e")
   (set-buffer (window-buffer (posn-window (event-start event))))
   (let* ((pos (posn-point (event-start event)))
-         (data (get-text-property pos 'earcon-data))
+	 (data (get-text-property pos 'earcon-data))
 	 (fun (get-text-property pos 'earcon-callback)))
     (if fun (funcall fun data))))
 
@@ -161,7 +151,6 @@ If N is negative, move backward instead."
 	(setq entry nil)))
     entry))
 
-
 (defun earcon-button-push (marker)
   ;; Push button starting at MARKER.
   (save-excursion
@@ -242,4 +231,5 @@ If N is negative, move backward instead."
 
 (run-hooks 'earcon-load-hook)
 
+;;; arch-tag: 844dfeea-980c-4ed0-907f-a30bf139691c
 ;;; earcon.el ends here