X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fearcon.el;h=faa38c5a21bc718123cfe375a8d9919685340729;hp=d308709912c89e0f5a237d0f6658ed2856d25359;hb=7855c28b8ddeb14a6f637bcae5048f28d764271e;hpb=83d810b5c6197e8abbae3df32b869da831e0cd2c

diff --git a/lisp/earcon.el b/lisp/earcon.el
index d30870991..faa38c5a2 100644
--- a/lisp/earcon.el
+++ b/lisp/earcon.el
@@ -1,8 +1,8 @@
 ;;; earcon.el --- Sound effects for messages
-;; Copyright (C) 1996 Free Software Foundation
+
+;; Copyright (C) 1996, 2000, 2001 Free Software Foundation
 
 ;; Author: Steven L. Baur <steve@miranova.com>
-;; Keywords: news fun sound
 
 ;; This file is part of GNU Emacs.
 
@@ -26,23 +26,26 @@
 
 ;;; Code:
 
-(if (null (boundp 'running-xemacs))
-    (defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version)))
-
-(require 'gnus)
-(require 'gnus-sound)
 (eval-when-compile (require 'cl))
+(require 'gnus)
+(require 'gnus-audio)
+(require 'gnus-art)
 
-(defvar earcon-auto-play nil
-  "When True, automatially play sounds as well as buttonize them.")
+(defgroup earcon nil
+  "Turn ** sounds ** into noise."
+  :group 'gnus-visual)
 
-(defvar earcon-prefix "**"
-  "The start of an earcon")
+(defcustom earcon-prefix "**"
+  "*String denoting the start of an earcon."
+  :type 'string
+  :group 'earcon)
 
-(defvar earcon-suffix "**"
-  "The end of an earcon")
+(defcustom earcon-suffix "**"
+  "String denoting the end of an earcon."
+  :type 'string
+  :group 'earcon)
 
-(defvar earcon-regexp-alist
+(defcustom earcon-regexp-alist
   '(("boring" 1 "Boring.au")
     ("evil[ \t]+laugh" 1 "Evil_Laugh.au")
     ("gag\\|puke" 1 "Puke.au")
@@ -59,13 +62,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.
@@ -74,7 +78,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))))
 
@@ -127,7 +131,7 @@ If N is negative, move backward instead."
        gnus-article-button-face
        (gnus-overlay-put (gnus-make-overlay from to)
 			 'face gnus-article-button-face))
-  (gnus-add-text-properties 
+  (gnus-add-text-properties
    from to
    (nconc (and gnus-article-mouse-face
 	       (list gnus-mouse-face-prop gnus-article-mouse-face))
@@ -146,7 +150,6 @@ If N is negative, move backward instead."
 	(setq entry nil)))
     entry))
 
-
 (defun earcon-button-push (marker)
   ;; Push button starting at MARKER.
   (save-excursion
@@ -154,7 +157,7 @@ If N is negative, move backward instead."
     (goto-char marker)
     (let* ((entry (earcon-button-entry))
 	   (inhibit-point-motion-hooks t)
-	   (fun 'gnus-sound-play)
+	   (fun 'gnus-audio-play)
 	   (args (list (nth 2 entry))))
       (cond
        ((fboundp fun)
@@ -193,10 +196,10 @@ If N is negative, move backward instead."
       (setq beg (point))
       (while (setq entry (pop alist))
 	(setq regexp (concat (regexp-quote earcon-prefix)
-			      ".*\\("
-			      (car entry)
-			      "\\).*"
-			      (regexp-quote earcon-suffix)))
+			     ".*\\("
+			     (car entry)
+			     "\\).*"
+			     (regexp-quote earcon-suffix)))
 	(goto-char beg)
 	(while (re-search-forward regexp nil t)
 	  (let* ((start (and entry (match-beginning 1)))
@@ -206,7 +209,7 @@ If N is negative, move backward instead."
 	     start end 'earcon-button-push
 	     (car (push (set-marker (make-marker) from)
 			earcon-button-marker-list)))
-	    (gnus-sound-play (caddr entry))))))))
+	    (gnus-audio-play (caddr entry))))))))
 
 ;;;###autoload
 (defun gnus-earcon-display ()