projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to No Gnus 200601131944.
[elisp/gnus.git-]
/
lisp
/
earcon.el
diff --git
a/lisp/earcon.el
b/lisp/earcon.el
index
4302182
..
a2650fd
100644
(file)
--- a/
lisp/earcon.el
+++ b/
lisp/earcon.el
@@
-1,7
+1,12
@@
;;; earcon.el --- Sound effects for messages
;;; earcon.el --- Sound effects for messages
-;; Copyright (C) 1996 Free Software Foundation
+
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; Author: Steven L. Baur <steve@miranova.com>
+
+;; This file is part of GNU Emacs.
+
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
@@
-14,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
;; 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:
;;; 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)
(eval-when-compile (require 'cl))
(require 'gnus)
(require 'gnus-audio)
@@
-34,11
+36,6
@@
"Turn ** sounds ** into noise."
:group 'gnus-visual)
"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."
:type 'string
(defcustom earcon-prefix "**"
"*String denoting the start of an earcon."
:type 'string
@@
-54,7
+51,7
@@
("evil[ \t]+laugh" 1 "Evil_Laugh.au")
("gag\\|puke" 1 "Puke.au")
("snicker" 1 "Snicker.au")
("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")
("sob\\|boohoo" 1 "cry.wav")
("drum[ \t]*roll" 1 "drumroll.au")
("blast" 1 "explosion.au")
@@
-74,8
+71,6
@@
(defvar earcon-button-marker-list nil)
(make-variable-buffer-local 'earcon-button-marker-list)
(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.
;;; 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.
@@
-84,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)))
(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))))
(fun (get-text-property pos 'earcon-callback)))
(if fun (funcall fun data))))
@@
-156,7
+151,6
@@
If N is negative, move backward instead."
(setq entry nil)))
entry))
(setq entry nil)))
entry))
-
(defun earcon-button-push (marker)
;; Push button starting at MARKER.
(save-excursion
(defun earcon-button-push (marker)
;; Push button starting at MARKER.
(save-excursion