Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.

[bpt/emacs.git] / lisp / net / eudc-bob.el

diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 0ba4d14..5847a2d 100644 (file)
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,18 +1,18 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: comm
+;; Package: eudc
 
 ;; 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
-;; the Free Software Foundation; either version 3, 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
@@ -20,9 +20,7 @@
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -48,20 +46,20 @@
 (defvar eudc-bob-mail-keymap nil
   "Keymap for inline e-mail addresses.")
 
-(defconst eudc-bob-generic-menu
+(defvar eudc-bob-generic-menu
   '("EUDC Binary Object Menu"
     ["---" nil nil]
     ["Pipe to external program" eudc-bob-pipe-object-to-external-program t]
     ["Save object" eudc-bob-save-object t]))
 
-(defconst eudc-bob-image-menu
+(defvar eudc-bob-image-menu
   `("EUDC Image Menu"
     ["---" nil nil]
     ["Toggle inline display" eudc-bob-toggle-inline-display
      (eudc-bob-can-display-inline-images)]
     ,@(cdr (cdr eudc-bob-generic-menu))))
 
-(defconst eudc-bob-sound-menu
+(defvar eudc-bob-sound-menu
   `("EUDC Sound Menu"
     ["---" nil nil]
     ["Play sound" eudc-bob-play-sound-at-point
@@ -254,7 +252,7 @@ display a button."
                                   (car (cdr viewer))
                                   (cdr (cdr viewer)))
            (call-process-region (point-min) (point-max) program)))
-      (t
+      (error
        (kill-buffer buffer)))))
 
 (defun eudc-bob-menu ()
@@ -319,6 +317,8 @@ display a button."
 (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap)
 (set-keymap-parent eudc-bob-sound-keymap eudc-bob-generic-keymap)
 
+;; If the first arguments can be nil here, then these 3 can be
+;; defconsts once more.
 (when (not (featurep 'xemacs))
   (easy-menu-define eudc-bob-generic-menu
     eudc-bob-generic-keymap
@@ -365,5 +365,4 @@ display a button."
   "Display a button for the JPEG DATA."
   (eudc-bob-display-jpeg data nil))
 
-;;; arch-tag: 8f1853df-c9b6-4c5a-bdb1-d94dbd651fb3
 ;;; eudc-bob.el ends here