HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Gnus master
[bpt/emacs.git]
/
lisp
/
net
/
eudc-bob.el
diff --git
a/lisp/net/eudc-bob.el
b/lisp/net/eudc-bob.el
index
9997bdb
..
106aab2
100644
(file)
--- a/
lisp/net/eudc-bob.el
+++ b/
lisp/net/eudc-bob.el
@@
-1,11
+1,11
@@
-;;; eudc-bob.el --- Binary Objects Support for EUDC
+;;; eudc-bob.el --- Binary Objects Support for EUDC
-*- coding: utf-8 -*-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Author: Oscar Figueiredo <oscar@cpe.fr>
-;; Maintainer: Pavel Jan
í
k <Pavel@Janik.cz>
+;; Maintainer: Pavel Jan
í
k <Pavel@Janik.cz>
;; Keywords: comm
;; Keywords: comm
+;; Package: eudc
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-46,20
+46,20
@@
(defvar eudc-bob-mail-keymap nil
"Keymap for inline e-mail addresses.")
(defvar eudc-bob-mail-keymap nil
"Keymap for inline e-mail addresses.")
-(def
const
eudc-bob-generic-menu
+(def
var
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]))
'("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]))
-(def
const
eudc-bob-image-menu
+(def
var
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))))
`("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))))
-(def
const
eudc-bob-sound-menu
+(def
var
eudc-bob-sound-menu
`("EUDC Sound Menu"
["---" nil nil]
["Play sound" eudc-bob-play-sound-at-point
`("EUDC Sound Menu"
["---" nil nil]
["Play sound" eudc-bob-play-sound-at-point
@@
-252,7
+252,7
@@
display a button."
(car (cdr viewer))
(cdr (cdr viewer)))
(call-process-region (point-min) (point-max) program)))
(car (cdr viewer))
(cdr (cdr viewer)))
(call-process-region (point-min) (point-max) program)))
- (
t
+ (
error
(kill-buffer buffer)))))
(defun eudc-bob-menu ()
(kill-buffer buffer)))))
(defun eudc-bob-menu ()
@@
-317,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)
(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
(when (not (featurep 'xemacs))
(easy-menu-define eudc-bob-generic-menu
eudc-bob-generic-keymap
@@
-363,5
+365,4
@@
display a button."
"Display a button for the JPEG DATA."
(eudc-bob-display-jpeg data nil))
"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
;;; eudc-bob.el ends here