From: Pavel Janík Date: Wed, 16 Jan 2002 08:05:19 +0000 (+0000) Subject: New maintainer. Change author's address. X-Git-Tag: ttn-vms-21-2-B4~17122 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=774f6cf41f05df5c979ea1b8151a69e1b644d916;p=emacs.git New maintainer. Change author's address. (eudc-bob-mail-keymap): New keymap for e-mail addresses. (eudc-display-mail): New function. (eudc-bob-play-sound-at-point): Remove XEmacs case. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0a400ae6dd6..ddb737f5ae6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2002-01-16 Pavel Jan,Bm(Bk + + * net/eudc-export.el: New maintainer. Change author's address. + + * net/eudc-bob.el: New maintainer. Change author's address. + (eudc-bob-mail-keymap): New keymap for e-mail addresses. + (eudc-display-mail): New function. + (eudc-bob-play-sound-at-point): Remove XEmacs case. + 2002-01-15 Richard M. Stallman * emacs-lisp/autoload.el (make-autoload): diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index bd1060d5026..78593fe5c19 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -2,8 +2,8 @@ ;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. -;; Author: Oscar Figueiredo -;; Maintainer: Oscar Figueiredo +;; Author: Oscar Figueiredo +;; Maintainer: Pavel Janík ;; Keywords: comm ;; This file is part of GNU Emacs. @@ -44,6 +44,9 @@ (defvar eudc-bob-url-keymap nil "Keymap for inline urls.") +(defvar eudc-bob-mail-keymap nil + "Keymap for inline e-mail addresses.") + (defconst eudc-bob-generic-menu '("EUDC Binary Object Menu" ["---" nil nil] @@ -206,22 +209,9 @@ display a button." (let (sound) (if (null (setq sound (eudc-bob-get-overlay-prop 'object-data))) (error "No sound data available here") - (cond (eudc-xemacs-p - (if (not (and (boundp 'sound-alist) - sound-alist)) - (error "Don't know how to play sound on this Emacs version") - (setq sound-alist - (cons (list 'eudc-sound - :sound sound) - sound-alist)) - (condition-case nil - (play-sound 'eudc-sound) - (t - (setq sound-alist (cdr sound-alist)))))) - (t - (unless (fboundp 'play-sound) - (error "Playing sounds not supported on this system")) - (play-sound (list 'sound :data sound))))))) + (unless (fboundp 'play-sound) + (error "Playing sounds not supported on this system")) + (play-sound (list 'sound :data sound))))) (defun eudc-bob-play-sound-at-mouse (event) "Play the sound data contained in the button where EVENT occurred." @@ -230,7 +220,6 @@ display a button." (eudc-jump-to-event event) (eudc-bob-play-sound-at-point))) - (defun eudc-bob-save-object () "Save the object data of the button at point." (interactive) @@ -318,6 +307,14 @@ display a button." [down-mouse-2]) 'browse-url-at-mouse) map)) +(setq eudc-bob-mail-keymap + (let ((map (make-sparse-keymap))) + (define-key map [return] 'goto-address-at-point) + (define-key map (if eudc-xemacs-p + [button2] + [down-mouse-2]) 'goto-address-at-mouse) + map)) + (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap) (set-keymap-parent eudc-bob-sound-keymap eudc-bob-generic-keymap) @@ -347,6 +344,12 @@ display a button." (require 'browse-url) (eudc-bob-make-button url eudc-bob-url-keymap)) +;;;###autoload +(defun eudc-display-mail (mail) + "Display e-mail address and make it clickable." + (require 'goto-addr) + (eudc-bob-make-button mail eudc-bob-mail-keymap)) + ;;;###autoload (defun eudc-display-sound (data) "Display a button to play the sound DATA."