projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a better error message in the "go offline" case.
[gnus]
/
lisp
/
earcon.el
diff --git
a/lisp/earcon.el
b/lisp/earcon.el
index
19d3fa5
..
2086f86
100644
(file)
--- a/
lisp/earcon.el
+++ b/
lisp/earcon.el
@@
-1,15
+1,16
@@
;;; earcon.el --- Sound effects for messages
;;; earcon.el --- Sound effects for messages
-;; Copyright (C) 1996, 2000 Free Software Foundation
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Steven L. Baur <steve@miranova.com>
;; This file is part of GNU Emacs.
;; 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
+;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-17,9
+18,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This file provides access to sound effects in Gnus.
;;; Commentary:
;; This file provides access to sound effects in Gnus.
@@
-35,11
+34,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
@@
-55,7
+49,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")
@@
-157,8
+151,7
@@
If N is negative, move backward instead."
(defun earcon-button-push (marker)
;; Push button starting at MARKER.
(defun earcon-button-push (marker)
;; Push button starting at MARKER.
- (save-excursion
- (set-buffer gnus-article-buffer)
+ (with-current-buffer gnus-article-buffer
(goto-char marker)
(let* ((entry (earcon-button-entry))
(inhibit-point-motion-hooks t)
(goto-char marker)
(let* ((entry (earcon-button-entry))
(inhibit-point-motion-hooks t)
@@
-220,8
+213,7
@@
If N is negative, move backward instead."
(defun gnus-earcon-display ()
"Play sounds in message buffers."
(interactive)
(defun gnus-earcon-display ()
"Play sounds in message buffers."
(interactive)
- (save-excursion
- (set-buffer gnus-article-buffer)
+ (with-current-buffer gnus-article-buffer
(goto-char (point-min))
;; Skip headers
(unless (search-forward "\n\n" nil t)
(goto-char (point-min))
;; Skip headers
(unless (search-forward "\n\n" nil t)