aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2002-01-05 18:54:53 +0000
committerPavel Janík2002-01-05 18:54:53 +0000
commit665e6193d090c4d8fad4756b5b5fdac33c63fb42 (patch)
treea4706c79cfd89ab9aa827d528ec1169cbc9cac7c
parent082d147b669db9be90897ad6ceec3b5e05f22770 (diff)
downloademacs-665e6193d090c4d8fad4756b5b5fdac33c63fb42.tar.gz
emacs-665e6193d090c4d8fad4756b5b5fdac33c63fb42.zip
(eudc-bob-can-display-inline-images)
(eudc-bob-display-jpeg): Use fboundp instead of boundp. (eudc-bob-save-object): Make the buffer unibyte. (eudc-bob-generic-keymap): Add new keybinding `!' to pipe the object to external program.
-rw-r--r--lisp/ChangeLog18
-rw-r--r--lisp/net/eudc-bob.el11
2 files changed, 24 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d090f7d2d37..606e6502cef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
12002-01-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * net/eudc-hotlist.el (eudc-edit-hotlist): Avoid error when
4 editing an empty hotlist.
5
6 * net/ldap.el (ldap-search-internal): Make the buffer unibyte.
7 Use buffer-string instead of buffer-substring for the whole
8 buffer.
9
10 * net/eudc-vars.el (eudc-external-viewers): Do not use xv, it is
11 not free.
12
13 * net/eudc-bob.el (eudc-bob-can-display-inline-images)
14 (eudc-bob-display-jpeg): Use fboundp instead of boundp.
15 (eudc-bob-save-object): Make the buffer unibyte.
16 (eudc-bob-generic-keymap): Add new keybinding `!' to pipe the
17 object to external program.
18
12002-01-05 Andre Spiegel <spiegel@gnu.org> 192002-01-05 Andre Spiegel <spiegel@gnu.org>
2 20
3 * vc.el (vc-branch-part): Return nil if there's no `.' 21 * vc.el (vc-branch-part): Return nil if there's no `.'
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 2b361fad26b..822a6e7db1e 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,6 +1,6 @@
1;;; eudc-bob.el --- Binary Objects Support for EUDC 1;;; eudc-bob.el --- Binary Objects Support for EUDC
2 2
3;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@xemacs.org> 5;; Author: Oscar Figueiredo <oscar@xemacs.org>
6;; Maintainer: Oscar Figueiredo <oscar@xemacs.org> 6;; Maintainer: Oscar Figueiredo <oscar@xemacs.org>
@@ -89,7 +89,7 @@
89 (if eudc-xemacs-p 89 (if eudc-xemacs-p
90 (and (memq (console-type) '(x mswindows)) 90 (and (memq (console-type) '(x mswindows))
91 (fboundp 'make-glyph)) 91 (fboundp 'make-glyph))
92 (and (boundp 'display-graphic-p) 92 (and (fboundp 'display-graphic-p)
93 (display-graphic-p)))) 93 (display-graphic-p))))
94 94
95(defun eudc-bob-make-button (label keymap &optional menu plist) 95(defun eudc-bob-make-button (label keymap &optional menu plist)
@@ -131,7 +131,7 @@ display a button."
131 'start-open t 131 'start-open t
132 'end-open t 132 'end-open t
133 'object-data data)))) 133 'object-data data))))
134 ((boundp 'create-image) 134 ((fboundp 'create-image)
135 (let* ((image (create-image data nil t)) 135 (let* ((image (create-image data nil t))
136 (props (list 'object-data data 'eudc-image image))) 136 (props (list 'object-data data 'eudc-image image)))
137 (when (and inline (image-type-available-p 'jpeg)) 137 (when (and inline (image-type-available-p 'jpeg))
@@ -222,7 +222,6 @@ display a button."
222 (unless (fboundp 'play-sound) 222 (unless (fboundp 'play-sound)
223 (error "Playing sounds not supported on this system")) 223 (error "Playing sounds not supported on this system"))
224 (play-sound (list 'sound :data sound))))))) 224 (play-sound (list 'sound :data sound)))))))
225
226 225
227(defun eudc-bob-play-sound-at-mouse (event) 226(defun eudc-bob-play-sound-at-mouse (event)
228 "Play the sound data contained in the button where EVENT occurred." 227 "Play the sound data contained in the button where EVENT occurred."
@@ -230,7 +229,7 @@ display a button."
230 (save-excursion 229 (save-excursion
231 (eudc-jump-to-event event) 230 (eudc-jump-to-event event)
232 (eudc-bob-play-sound-at-point))) 231 (eudc-bob-play-sound-at-point)))
233 232
234 233
235(defun eudc-bob-save-object () 234(defun eudc-bob-save-object ()
236 "Save the object data of the button at point." 235 "Save the object data of the button at point."
@@ -241,6 +240,7 @@ display a button."
241 (if (fboundp 'set-buffer-file-coding-system) 240 (if (fboundp 'set-buffer-file-coding-system)
242 (set-buffer-file-coding-system 'binary)) 241 (set-buffer-file-coding-system 'binary))
243 (set-buffer buffer) 242 (set-buffer buffer)
243 (set-buffer-multibyte nil)
244 (insert data) 244 (insert data)
245 (save-buffer)) 245 (save-buffer))
246 (kill-buffer buffer))) 246 (kill-buffer buffer)))
@@ -291,6 +291,7 @@ display a button."
291(setq eudc-bob-generic-keymap 291(setq eudc-bob-generic-keymap
292 (let ((map (make-sparse-keymap))) 292 (let ((map (make-sparse-keymap)))
293 (define-key map "s" 'eudc-bob-save-object) 293 (define-key map "s" 'eudc-bob-save-object)
294 (define-key map "!" 'eudc-bob-pipe-object-to-external-program)
294 (define-key map (if eudc-xemacs-p 295 (define-key map (if eudc-xemacs-p
295 [button3] 296 [button3]
296 [down-mouse-3]) 'eudc-bob-popup-menu) 297 [down-mouse-3]) 'eudc-bob-popup-menu)