X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fearcon.el;h=faa38c5a21bc718123cfe375a8d9919685340729;hp=ee2b041e154350c8124352952ea15f09b71ad267;hb=7855c28b8ddeb14a6f637bcae5048f28d764271e;hpb=40c3c84356b403e9c4eb89758009b53c8c180180 diff --git a/lisp/earcon.el b/lisp/earcon.el index ee2b041e1..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 -;; Keywords: news fun sound ;; This file is part of GNU Emacs. @@ -26,9 +26,6 @@ ;;; 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 +35,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) @@ -70,17 +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. @@ -89,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)))) @@ -161,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